diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..969e613536b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,24 @@ +# EditorConfig configuration for nixpkgs +# http://EditorConfig.org + +# Top-most EditorConfig file +root = true + +# Unix-style newlines with a newline ending every file, utf-8 charset +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 + +# see https://nixos.org/nixpkgs/manual/#chap-conventions + +# Match nix/ruby files, set indent to spaces with width of two +[*.{nix,rb}] +indent_style = space +indent_size = 2 + +# Match shell/python/perl scripts, set indent to spaces with width of four +[*.{sh,py,pl}] +indent_style = space +indent_size = 4 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index fb8c6b53cb5..92676378936 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -28,5 +28,8 @@ under the terms of [COPYING](../COPYING), which is an MIT-like license. * Not start with the package name * Not have a dot at the end -See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-submitting-changes). +See the nixpkgs manual for more details on how to [Submit changes to nixpkgs](https://nixos.org/nixpkgs/manual/#chap-submitting-changes). +## Reviewing contributions + +See the nixpkgs manual for more details on how to [Review contributions](http://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/download-by-type/doc/manual#chap-reviewing-contributions). diff --git a/.mention-bot b/.mention-bot index 64f0ed854c4..8aeeedace10 100644 --- a/.mention-bot +++ b/.mention-bot @@ -4,7 +4,8 @@ "jhasse" ], "alwaysNotifyForPaths": [ - { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] } + { "name": "FRidh", "files": ["pkgs/top-level/python-packages.nix", "pkgs/development/interpreters/python/*", "pkgs/development/python-modules/*" ] }, + { "name": "copumpkin", "files": ["pkgs/stdenv/darwin/*", "pkgs/os-specific/darwin/apple-source-releases/*"] } ], "fileBlacklist": ["pkgs/top-level/all-packages.nix"] } diff --git a/README.md b/README.md index 88610f17388..002caa3a171 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,6 @@ [![Build Status](https://travis-ci.org/NixOS/nixpkgs.svg?branch=master)](https://travis-ci.org/NixOS/nixpkgs) [![Code Triagers Badge](https://www.codetriage.com/nixos/nixpkgs/badges/users.svg)](https://www.codetriage.com/nixos/nixpkgs) -[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/pr?style=flat)](http://www.issuestats.com/github/nixos/nixpkgs) -[![Issue Stats](http://www.issuestats.com/github/nixos/nixpkgs/badge/issue?style=flat)](http://www.issuestats.com/github/nixos/nixpkgs) Nixpkgs is a collection of packages for the [Nix](https://nixos.org/nix/) package manager. It is periodically built and tested by the [hydra](http://hydra.nixos.org/) @@ -15,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.03` for the latest +custom changes on top of one of the channels, e.g. `nixos-16.09` for the latest release and `nixos-unstable` for the latest successful build of master: ``` % git remote update channels -% git rebase channels/nixos-16.03 +% git rebase channels/nixos-16.09 ``` For pull-requests, please rebase onto nixpkgs `master`. @@ -34,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.03 release](https://hydra.nixos.org/jobset/nixos/release-16.03) +* [Continuous package builds for 16.09 release](https://hydra.nixos.org/jobset/nixos/release-16.09) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for 16.03 release](https://hydra.nixos.org/job/nixos/release-16.03/tested#tabs-constituents) +* [Tests for 16.09 release](https://hydra.nixos.org/job/nixos/release-16.09/tested#tabs-constituents) Communication: diff --git a/doc/default.nix b/doc/default.nix index f4f467b1f5a..625c716b031 100644 --- a/doc/default.nix +++ b/doc/default.nix @@ -60,6 +60,10 @@ pkgs.stdenv.mkDerivation { inputFile = ../pkgs/development/idris-modules/README.md; outputFile = "languages-frameworks/idris.xml"; } + + toDocbook { + inputFile = ../pkgs/development/node-packages/README.md; + outputFile = "languages-frameworks/node.xml"; + } + toDocbook { inputFile = ../pkgs/development/r-modules/README.md; outputFile = "languages-frameworks/r.xml"; @@ -93,7 +97,9 @@ pkgs.stdenv.mkDerivation { cp -r $dst/images $dst/epub/OEBPS echo "application/epub+zip" > mimetype - zip -0Xq "$dst/Nixpkgs Contributors Guide - NixOS community.epub" mimetype - zip -Xr9D "$dst/Nixpkgs Contributors Guide - NixOS community.epub" $dst/epub/* + manual="$dst/nixpkgs-manual.epub" + zip -0Xq "$manual" mimetype + cd $dst/epub && zip -Xr9D "$manual" * + rm -rf $dst/epub ''; } diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index e56d7dd389d..026acb4e8fb 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -24,7 +24,7 @@ deis = buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildFlags = "--tags release"; } @@ -56,7 +56,9 @@ the following arguments are of special significance to the function: goDeps is where the Go dependencies of a Go program are listed - in a JSON format described below. + as a list of package source identified by Go import path. + It could be imported as a separate deps.nix file for + readability. The dependency data structure is described below. @@ -70,23 +72,32 @@ the following arguments are of special significance to the function: -The goDeps attribute should point to a JSON file that defines which Go libraries - are needed and should be included in GOPATH for buildPhase. - +The goDeps attribute can be imported from a separate + nix file that defines which Go libraries are needed and should + be included in GOPATH for buildPhase. -deps.json +deps.nix [ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } ] diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 8076c33f1b3..81352ec2a9a 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -21,6 +21,7 @@ such as Perl or Haskell. These are described in this chapter. + diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml index 0bbb9ef8be3..b7a363c750e 100644 --- a/doc/multiple-output.xml +++ b/doc/multiple-output.xml @@ -45,34 +45,48 @@ File type groups The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase. Each group of file types has an outputFoo variable specifying the output name where they should go. If that variable isn't defined by the derivation writer, it is guessed – a default output name is defined, falling back to other possibilities if the output isn't defined. + $outputDev is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files. They go to dev or out by default. - + + + $outputBin is meant for user-facing binaries, typically residing in bin/. They go to bin or out by default. - + + $outputLib is meant for libraries, typically residing in lib/ and libexec/. They go to lib or out by default. - + + $outputDoc is for user documentation, typically residing in share/doc/. It goes to doc or out by default. - + + - $outputDocdev - is for developer documentation. Currently we count gtk-doc and man3 pages in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. - + $outputDevdoc + is for developer documentation. Currently we count gtk-doc in there. It goes to devdoc or is removed (!) by default. This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users. + + $outputMan is for man pages (except for section 3). They go to man or doc or $outputBin by default. - + + + + $outputDevman + is for section 3 man pages. They go to devman or $outputMan by default. + + $outputInfo is for info pages. They go to info or doc or $outputMan by default. - + + @@ -88,4 +102,3 @@ - diff --git a/doc/stdenv.xml b/doc/stdenv.xml index c17d7c51ae2..68441ea9393 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -27,7 +27,7 @@ stdenv.mkDerivation { name = "libfoo-1.2.3"; src = fetchurl { url = http://example.org/libfoo-1.2.3.tar.bz2; - md5 = "e1ec107956b6ddcb0b8b0679367e9ac9"; + sha256 = "0x2g1jqygyr5wiwg4ma1nd7w4ydpy82z9gkcv8vh2v8dn3y58v5m"; }; } @@ -988,6 +988,41 @@ set debug-file-directory ~/.nix-profile/lib/debug +
The installCheck phase + +The installCheck phase checks whether the package was installed +correctly by running its test suite against the installed directories. +The default installCheck calls make +installcheck. + + + Variables controlling the installCheck phase + + + doInstallCheck + If set to a non-empty string, the installCheck phase is + executed, otherwise it is skipped (default). Thus you should set + + doInstallCheck = true; + + in the derivation to enable install checks. + + + + preInstallCheck + Hook executed at the start of the installCheck + phase. + + + + postInstallCheck + Hook executed at the end of the installCheck + phase. + + + + +
The distribution phase @@ -1196,13 +1231,12 @@ echo @foo@ stripHash path Strips the directory and hash part of a store - path, storing the name part in the environment variable - strippedName. For example: + path, outputting the name part to stdout. + For example: -stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" # prints coreutils-8.24 -echo $strippedName +stripHash "/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" If you wish to store the result in another variable, then the @@ -1210,7 +1244,7 @@ echo $strippedName name="/nix/store/9s9r019176g7cvn2nvcw41gsp862y6b4-coreutils-8.24" -someVar=$(stripHash $name; echo $strippedName) +someVar=$(stripHash $name) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 686e125f100..1f381c5e721 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -296,12 +296,17 @@ rec { /* Converts a store path to a fake derivation. */ toDerivation = path: - let path' = builtins.storePath path; in - { type = "derivation"; - name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path')); - outPath = path'; - outputs = [ "out" ]; - }; + let + path' = builtins.storePath path; + res = + { type = "derivation"; + name = builtins.unsafeDiscardStringContext (builtins.substring 33 (-1) (baseNameOf path')); + outPath = path'; + outputs = [ "out" ]; + out = res; + outputName = "out"; + }; + in res; /* If `cond' is true, return the attribute set `as', @@ -455,7 +460,7 @@ rec { getDev = getOutput "dev"; /* Pick the outputs of packages to place in buildInputs */ - chooseDevOutputs = drvs: builtins.map (drv: if drv.outputUnspecified or false then drv.dev or drv else drv) drvs; + chooseDevOutputs = drvs: builtins.map getDev drvs; /*** deprecated stuff ***/ diff --git a/lib/default.nix b/lib/default.nix index 32ac0c58af6..cb9a9b0bd4d 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,27 +1,46 @@ -let +let + # trivial, often used functions trivial = import ./trivial.nix; + + # datatypes + attrsets = import ./attrsets.nix; lists = import ./lists.nix; strings = import ./strings.nix; stringsWithDeps = import ./strings-with-deps.nix; - attrsets = import ./attrsets.nix; + + # packaging + customisation = import ./customisation.nix; + maintainers = import ./maintainers.nix; + meta = import ./meta.nix; sources = import ./sources.nix; + + # module system modules = import ./modules.nix; options = import ./options.nix; types = import ./types.nix; - meta = import ./meta.nix; - debug = import ./debug.nix; - misc = import ./deprecated.nix; - maintainers = import ./maintainers.nix; + + # constants + licenses = import ./licenses.nix; platforms = import ./platforms.nix; systems = import ./systems.nix; - customisation = import ./customisation.nix; - licenses = import ./licenses.nix; + + # misc + debug = import ./debug.nix; + misc = import ./deprecated.nix; + + # domain-specific sandbox = import ./sandbox.nix; + fetchers = import ./fetchers.nix; in - { inherit trivial lists strings stringsWithDeps attrsets sources options - modules types meta debug maintainers licenses platforms systems sandbox; + { inherit trivial + attrsets lists strings stringsWithDeps + customisation maintainers meta sources + modules options types + licenses platforms systems + debug misc + sandbox fetchers; } # !!! don't include everything at top-level; perhaps only the most # commonly used functions. diff --git a/lib/fetchers.nix b/lib/fetchers.nix new file mode 100644 index 00000000000..19d89d6c407 --- /dev/null +++ b/lib/fetchers.nix @@ -0,0 +1,12 @@ +# snippets that can be shared by mutliple fetchers (pkgs/build-support) +{ + + proxyImpureEnvVars = [ + # We borrow these environment variables from the caller to allow + # easy proxy configuration. This is impure, but a fixed-output + # derivation like fetchurl is allowed to do so since its result is + # by definition pure. + "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" + ]; + +} diff --git a/lib/licenses.nix b/lib/licenses.nix index a106e072726..b62f4f0a5bb 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -65,6 +65,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Boost Software License 1.0"; }; + beerware = spdx { + spdxId = "Beerware"; + fullName = ''Beerware License''; + }; + bsd2 = spdx { spdxId = "BSD-2-Clause"; fullName = ''BSD 2-clause "Simplified" License''; @@ -105,6 +110,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Creative Commons Attribution Non Commercial Share Alike 4.0"; }; + cc-by-nd-30 = spdx { + spdxId = "CC-BY-ND-3.0"; + fullName = "Creative Commons Attribution-No Derivative Works v3.00"; + }; + cc-by-sa-25 = spdx { spdxId = "CC-BY-SA-2.5"; fullName = "Creative Commons Attribution Share Alike 2.5"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0e5740a6c32..79f50a94a07 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -12,6 +12,7 @@ abbradar = "Nikolay Amiantov "; aboseley = "Adam Boseley "; abuibrahim = "Ruslan Babayev "; + acowley = "Anthony Cowley "; adev = "Adrien Devresse "; Adjective-Object = "Maxwell Huang-Hobbs "; adnelson = "Allen Nelson "; @@ -36,6 +37,7 @@ andsild = "Anders Sildnes "; aneeshusa = "Aneesh Agrawal "; antono = "Antono Vasiljev "; + apeyroux = "Alexandre Peyroux "; ardumont = "Antoine R. Dumont "; aristid = "Aristid Breitkreuz "; arobyn = "Alexei Robyn "; @@ -48,6 +50,7 @@ auntie = "Jonathan Glines "; avnik = "Alexander V. Nikolaev "; aycanirican = "Aycan iRiCAN "; + bachp = "Pascal Bach "; badi = "Badi' Abdul-Wahid "; balajisivaraman = "Balaji Sivaraman"; Baughn = "Svein Ove Aas "; @@ -86,14 +89,17 @@ cko = "Christine Koppelt "; cleverca22 = "Michael Bishop "; cmcdragonkai = "Roger Qiu "; + cmfwyp = "cmfwyp "; coconnor = "Corey O'Connor "; codsl = "codsl "; codyopel = "Cody Opel "; colemickens = "Cole Mickens "; copumpkin = "Dan Peebles "; + corngood = "David McFarland "; coroa = "Jonas Hörsch "; couchemar = "Andrey Pavlov "; cransom = "Casey Ransom "; + cryptix = "Henry Bubert "; CrystalGamma = "Jona Stubbe "; cstrahan = "Charles Strahan "; cwoac = "Oliver Matthews "; @@ -102,6 +108,7 @@ danbst = "Danylo Hlynskyi "; davidak = "David Kleuker "; davidrusu = "David Rusu "; + davorb = "Davor Babic "; dbohdan = "Danyil Bohdan "; dbrock = "Daniel Brockman "; deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>"; @@ -112,6 +119,7 @@ dezgeg = "Tuomas Tynkkynen "; dfoxfranke = "Daniel Fox Franke "; dgonyeo = "Derek Gonyeo "; + dipinhora = "Dipin Hora "; dmalikov = "Dmitry Malikov "; dochang = "Desmond O. Chang "; doublec = "Chris Double "; @@ -162,12 +170,15 @@ giogadi = "Luis G. Torres "; gleber = "Gleb Peregud "; globin = "Robin Gloster "; + gnidorah = "Alex Ivanov "; goibhniu = "Cillian de Róiste "; + goodrone = "Andrew Trachenko "; Gonzih = "Max Gonzih "; gpyh = "Yacine Hmito "; grahamc = "Graham Christensen "; gridaphobe = "Eric Seidel "; guibert = "David Guibert "; + hakuch = "Jesse Haber-Kucharsky "; havvy = "Ryan Scheel "; hbunke = "Hendrik Bunke "; hce = "Hans-Christian Esperer "; @@ -195,6 +206,7 @@ joelmo = "Joel Moberg "; joelteon = "Joel Taylor "; joko = "Ioannis Koutras "; + jonafato = "Jon Banafato "; jpbernardy = "Jean-Philippe Bernardy "; jraygauthier = "Raymond Gauthier "; juliendehos = "Julien Dehos "; @@ -205,6 +217,7 @@ kampfschlaefer = "Arnold Krille "; kevincox = "Kevin Cox "; khumba = "Bryan Gardiner "; + KibaFox = "Kiba Fox "; kkallio = "Karn Kallio "; koral = "Koral "; kovirobi = "Kovacsics Robert "; @@ -223,12 +236,14 @@ linquize = "Linquize "; linus = "Linus Arver "; lnl7 = "Daiderd Jordan "; + loskutov = "Ignat Loskutov "; lovek323 = "Jason O'Conal "; lowfatcomputing = "Andreas Wagner "; lsix = "Lancelot SIX "; + lucas8 = "Luc Chabassier "; ludo = "Ludovic Courtès "; luispedro = "Luis Pedro Coelho "; - lukasepple = "Lukas Epple "; + sternenseemann = "Lukas Epple "; lukego = "Luke Gorrie "; lw = "Sergey Sofeychuk "; madjar = "Georges Dubus "; @@ -261,6 +276,7 @@ mingchuan = "Ming Chuan "; mirdhyn = "Merlin Gaillard "; mirrexagon = "Andrew Abbott "; + mlieberman85 = "Michael Lieberman "; modulistic = "Pablo Costa "; mog = "Matthew O'Gorman "; moosingin3space = "Nathan Moos "; @@ -270,6 +286,7 @@ mounium = "Katona László "; MP2E = "Cray Elliott "; mpscholten = "Marc Scholten "; + mpsyco = "Francis St-Amour "; msackman = "Matthew Sackman "; mschristiansen = "Mikkel Christiansen "; msteen = "Matthijs Steen "; @@ -283,6 +300,7 @@ nckx = "Tobias Geerinckx-Rice "; nequissimus = "Tim Steinbach "; nfjinjing = "Jinjing Wang "; + nhooyr = "Anmol Sethi "; nico202 = "Nicolò Balzarotti "; notthemessiah = "Brian Cohen "; NikolaMandic = "Ratko Mladic "; @@ -321,6 +339,7 @@ pmahoney = "Patrick Mahoney "; pmiddend = "Philipp Middendorf "; prikhi = "Pavan Rikhi "; + primeos = "Michael Weiss "; profpatsch = "Profpatsch "; proglodyte = "Proglodyte "; pshendry = "Paul Hendry "; @@ -338,6 +357,7 @@ redbaron = "Maxim Ivanov "; redvers = "Redvers Davies "; refnil = "Martin Lavoie "; + regnat = "Théophane Hufschmitt "; relrod = "Ricky Elrod "; renzo = "Renzo Carbonara "; retrry = "Tadas Barzdžius "; @@ -351,6 +371,7 @@ roblabla = "Robin Lambertz "; roconnor = "Russell O'Connor "; romildo = "José Romildo Malaquias "; + ronny = "Ronny Pfannschmidt "; rszibele = "Richard Szibele "; rushmorem = "Rushmore Mushambi "; rvl = "Rodney Lorrimar "; @@ -364,6 +385,7 @@ samuelrivas = "Samuel Rivas "; sander = "Sander van der Burg "; schmitthenner = "Fabian Schmitthenner "; + schneefux = "schneefux "; schristo = "Scott Christopher "; scolobb = "Sergiu Ivanov "; sepi = "Raffael Mancini "; @@ -380,8 +402,8 @@ skeidel = "Sven Keidel "; skrzyp = "Jakub Skrzypnik "; sleexyz = "Sean Lee "; - smironov = "Sergey Mironov "; solson = "Scott Olson "; + smironov = "Sergey Mironov "; spacefrogg = "Michael Raitza "; spencerjanssen = "Spencer Janssen "; spinus = "Tomasz Czyż "; @@ -416,6 +438,7 @@ ttuegel = "Thomas Tuegel "; tv = "Tomislav Viljetić "; tvestelind = "Tomas Vestelind "; + tvorog = "Marsel Zaripov "; twey = "James ‘Twey’ Kay "; uralbash = "Svintsov Dmitry "; urkud = "Yury G. Kudryashov "; @@ -449,4 +472,5 @@ zohl = "Al Zohali "; zoomulator = "Kim Simmons "; amiloradovsky = "Andrew Miloradovsky "; + yochai = "Yochai "; } diff --git a/lib/modules.nix b/lib/modules.nix index 6f08a49399a..8db17c60579 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -1,4 +1,5 @@ with import ./lists.nix; +with import ./strings.nix; with import ./trivial.nix; with import ./attrsets.nix; with import ./options.nix; @@ -545,6 +546,84 @@ rec { use = builtins.trace "Obsolete option `${showOption from}' is used. It was renamed to `${showOption to}'."; }; + /* Return a module that causes a warning to be shown if any of the "from" + option is defined; the defined values can be used in the "mergeFn" to set + the "to" value. + This function can be used to merge multiple options into one that has a + different type. + + "mergeFn" takes the module "config" as a parameter and must return a value + of "to" option type. + + mkMergedOptionModule + [ [ "a" "b" "c" ] + [ "d" "e" "f" ] ] + [ "x" "y" "z" ] + (config: + let value = p: getAttrFromPath p config; + in + if (value [ "a" "b" "c" ]) == true then "foo" + else if (value [ "d" "e" "f" ]) == true then "bar" + else "baz") + + - options.a.b.c is a removed boolean option + - options.d.e.f is a removed boolean option + - options.x.y.z is a new str option that combines a.b.c and d.e.f + functionality + + This show a warning if any a.b.c or d.e.f is set, and set the value of + x.y.z to the result of the merge function + */ + mkMergedOptionModule = from: to: mergeFn: + { config, options, ... }: + { + options = foldl recursiveUpdate {} (map (path: setAttrByPath path (mkOption { + visible = false; + # To use the value in mergeFn without triggering errors + default = "_mkMergedOptionModule"; + })) from); + + config = { + warnings = filter (x: x != "") (map (f: + let val = getAttrFromPath f config; + opt = getAttrFromPath f options; + in + optionalString + (val != "_mkMergedOptionModule") + "The option `${showOption f}' defined in ${showFiles opt.files} has been changed to `${showOption to}' that has a different type. Please read `${showOption to}' documentation and update your configuration accordingly." + ) from); + } // setAttrByPath to (mkMerge + (optional + (any (f: (getAttrFromPath f config) != "_mkMergedOptionModule") from) + (mergeFn config))); + }; + + /* Single "from" version of mkMergedOptionModule. + Return a module that causes a warning to be shown if the "from" option is + defined; the defined value can be used in the "mergeFn" to set the "to" + value. + This function can be used to change an option into another that has a + different type. + + "mergeFn" takes the module "config" as a parameter and must return a value of + "to" option type. + + mkChangedOptionModule [ "a" "b" "c" ] [ "x" "y" "z" ] + (config: + let value = getAttrFromPath [ "a" "b" "c" ] config; + in + if value > 100 then "high" + else "normal") + + - options.a.b.c is a removed int option + - options.x.y.z is a new str option that supersedes a.b.c + + This show a warning if a.b.c is set, and set the value of x.y.z to the + result of the change function + */ + mkChangedOptionModule = from: to: changeFn: + mkMergedOptionModule [ from ] to changeFn; + /* Like ‘mkRenamedOptionModule’, but doesn't show a warning. */ mkAliasOptionModule = from: to: doRename { inherit from to; diff --git a/lib/trivial.nix b/lib/trivial.nix index 25ce35570fd..dac8b8d0106 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -53,6 +53,27 @@ rec { # argument, but it's nice this way if several uses of `extends` are cascaded. extends = f: rattrs: self: let super = rattrs self; in super // f self super; + # Create an overridable, recursive attribute set. For example: + # + # nix-repl> obj = makeExtensible (self: { }) + # + # nix-repl> obj + # { __unfix__ = «lambda»; extend = «lambda»; } + # + # nix-repl> obj = obj.extend (self: super: { foo = "foo"; }) + # + # nix-repl> obj + # { __unfix__ = «lambda»; extend = «lambda»; foo = "foo"; } + # + # nix-repl> obj = obj.extend (self: super: { foo = super.foo + " + "; bar = "bar"; foobar = self.foo + self.bar; }) + # + # nix-repl> obj + # { __unfix__ = «lambda»; bar = "bar"; extend = «lambda»; foo = "foo + "; foobar = "foo + bar"; } + makeExtensible = rattrs: + fix' rattrs // { + extend = f: makeExtensible (extends f rattrs); + }; + # Flip the order of the arguments of a binary function. flip = f: a: b: f b a; @@ -113,4 +134,7 @@ rec { */ warn = msg: builtins.trace "WARNING: ${msg}"; info = msg: builtins.trace "INFO: ${msg}"; + + fetchMD5warn = name: context : data : info + "Deprecated use of MD5 hash in ${name} to fetch ${context}" data; } diff --git a/lib/types.nix b/lib/types.nix index 83f624e6b44..991fa0e5c29 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -261,7 +261,7 @@ rec { # declarations from the ‘options’ attribute of containing option # declaration. optionSet = mkOptionType { - name = /* builtins.trace "types.optionSet is deprecated; use types.submodule instead" */ "option set"; + name = builtins.trace "types.optionSet is deprecated; use types.submodule instead" "option set"; }; # Augment the given type with an additional type check function. diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index d7a9239027d..a2b8080e2a4 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/maintainers/scripts/fetch-kde-qt.sh @@ -1,6 +1,8 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils findutils gnused nix wget +set -efuo pipefail + SRCS= if [ -d "$1" ]; then SRCS="$(pwd)/$1/srcs.nix" diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh index 1f6fdaff6dd..27e7741799f 100755 --- a/maintainers/scripts/vanity.sh +++ b/maintainers/scripts/vanity.sh @@ -101,15 +101,15 @@ cleaner_script="$(echo "$name_list_canonical" | denormalize_name | # Add github usernames if [ -n "$NIXPKGS_GITHUB_NAME_CACHE" ]; then - github_adder_script="$(echo "$github_name_list" | + github_adder_script="$(mktemp)" + echo "$github_name_list" | grep -E "$(echo "$name_list_canonical" | cut -f 2 | tr '\n' '|' )" | sort | uniq | sed -re 's/(.*)\t(.*)/s| \1$| \1\t\2|g;/' | - denormalize_name - )" + denormalize_name > "$github_adder_script" else - github_adder_script='' + github_adder_script='/dev/null' fi echo "$name_list" | denormalize_name @@ -118,5 +118,5 @@ echo echo "$git_data" | cut -f 1 | sed -e "$cleaner_script" | - sort | uniq -c | sort -k1n | sed -re "$github_adder_script" | + sort | uniq -c | sort -k1n | sed -rf "$github_adder_script" | sed -re 's/^ *([0-9]+) /\1\t/' diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 13668dfd8eb..40d49f1541b 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -94,14 +94,11 @@ let "--stringparam chunk.toc ${toc}" ]; - olinkDB = stdenv.mkDerivation { - name = "manual-olinkdb"; - - inherit sources; - - buildInputs = [ libxml2 libxslt ]; - - buildCommand = '' + olinkDB = runCommand "manual-olinkdb" + { inherit sources; + buildInputs = [ libxml2 libxslt ]; + } + '' ${copySources} xsltproc \ @@ -133,15 +130,14 @@ let EOF ''; - }; in rec { # The NixOS options in JSON format. - optionsJSON = stdenv.mkDerivation { - name = "options-json"; - - buildCommand = '' + optionsJSON = runCommand "options-json" + { meta.description = "List of NixOS options in JSON format"; + } + '' # Export list of options in different format. dst=$out/share/doc/nixos mkdir -p $dst @@ -154,18 +150,14 @@ in rec { echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products ''; # */ - meta.description = "List of NixOS options in JSON format"; - }; - # Generate the NixOS manual. - manual = stdenv.mkDerivation { - name = "nixos-manual"; - - inherit sources; - - buildInputs = [ libxml2 libxslt ]; - - buildCommand = '' + manual = runCommand "nixos-manual" + { inherit sources; + buildInputs = [ libxml2 libxslt ]; + meta.description = "The NixOS manual in HTML format"; + allowedReferences = ["out"]; + } + '' ${copySources} # Check the validity of the manual sources. @@ -192,20 +184,12 @@ in rec { echo "doc manual $dst" >> $out/nix-support/hydra-build-products ''; # */ - meta.description = "The NixOS manual in HTML format"; - allowedReferences = ["out"]; - }; - - - manualEpub = stdenv.mkDerivation { - name = "nixos-manual-epub"; - - inherit sources; - - buildInputs = [ libxml2 libxslt zip ]; - - buildCommand = '' + manualEpub = runCommand "nixos-manual-epub" + { inherit sources; + buildInputs = [ libxml2 libxslt zip ]; + } + '' ${copySources} # Check the validity of the manual sources. @@ -234,17 +218,15 @@ in rec { mkdir -p $out/nix-support echo "doc-epub manual $manual" >> $out/nix-support/hydra-build-products ''; - }; + # Generate the NixOS manpages. - manpages = stdenv.mkDerivation { - name = "nixos-manpages"; - - inherit sources; - - buildInputs = [ libxml2 libxslt ]; - - buildCommand = '' + manpages = runCommand "nixos-manpages" + { inherit sources; + buildInputs = [ libxml2 libxslt ]; + allowedReferences = ["out"]; + } + '' ${copySources} # Check the validity of the man pages sources. @@ -264,7 +246,4 @@ in rec { ./man-pages.xml ''; - allowedReferences = ["out"]; - }; - } diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml index 2983c76c770..b0364b34657 100644 --- a/nixos/doc/manual/development/development.xml +++ b/nixos/doc/manual/development/development.xml @@ -14,8 +14,11 @@ NixOS. + + + diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml index b0689aa1d97..7be5e9d51d4 100644 --- a/nixos/doc/manual/development/option-declarations.xml +++ b/nixos/doc/manual/development/option-declarations.xml @@ -31,9 +31,9 @@ options = { type - The type of the option (see below). It may be omitted, - but that’s not advisable since it may lead to errors that are - hard to diagnose. + The type of the option (see ). + It may be omitted, but that’s not advisable since it may lead to errors + that are hard to diagnose. @@ -65,86 +65,4 @@ options = { -Here is a non-exhaustive list of option types: - - - - - types.bool - - A Boolean. - - - - - types.int - - An integer. - - - - - types.str - - A string. - - - - - types.lines - - A string. If there are multiple definitions, they are - concatenated, with newline characters in between. - - - - - types.path - - A path, defined as anything that, when coerced to a - string, starts with a slash. This includes derivations. - - - - - types.package - - A derivation (such as pkgs.hello) or a - store path (such as - /nix/store/1ifi1cfbfs5iajmvwgrbmrnrw3a147h9-hello-2.10). - - - - - types.listOf t - - A list of elements of type t - (e.g., types.listOf types.str is a list of - strings). Multiple definitions are concatenated together. - - - - - types.attrsOf t - - A set of elements of type t - (e.g., types.attrsOf types.int is a set of - name/value pairs, the values being integers). - - - - - types.nullOr t - - Either the value null or something of - type t. - - - - - -You can also create new types using the function -mkOptionType. See -lib/types.nix in Nixpkgs for details. -
diff --git a/nixos/doc/manual/development/option-types.xml b/nixos/doc/manual/development/option-types.xml new file mode 100644 index 00000000000..8871b02cebf --- /dev/null +++ b/nixos/doc/manual/development/option-types.xml @@ -0,0 +1,394 @@ +
+ +Options Types + + Option types are a way to put constraints on the values a module option + can take. + Types are also responsible of how values are merged in case of multiple + value definitions. +
Basic Types + + Basic types are the simplest available types in the module system. + Basic types include multiple string types that mainly differ in how + definition merging is handled. + + + + types.bool + A boolean, its values can be true or + false. + + + types.int + An integer. + + + types.path + A filesystem path, defined as anything that when coerced to + a string starts with a slash. Even if derivations can be considered as + path, the more specific types.package should be + preferred. + + + types.package + A derivation or a store path. + + + +String related types: + + + + types.str + A string. Multiple definitions cannot be + merged. + + + types.lines + A string. Multiple definitions are concatenated with a new + line "\n". + + + types.commas + A string. Multiple definitions are concatenated with a comma + ",". + + + types.envVar + A string. Multiple definitions are concatenated with a + collon ":". + + + types.separatedString + sep + A string with a custom separator + sep, e.g. types.separatedString + "|". + + + +
+ +
Composed Types + + Composed types allow to create complex types by taking another type(s) + or value(s) as parameter(s). + It is possible to compose types multiple times, e.g. with types; + nullOr (enum [ "left" "right" ]). + + + + types.listOf t + A list of t type, e.g. + types.listOf int. Multiple definitions are merged + with list concatenation. + + + types.attrsOf t + An attribute set of where all the values are of + t type. Multiple definitions result in the + joined attribute set. + + + types.loaOf t + An attribute set or a list of t + type. Multiple definitions are merged according to the + value. + + + types.loeOf t + A list or an element of t type. + Multiple definitions are merged according to the + values. + + + types.nullOr t + null or type + t. Multiple definitions are merged according + to type t. + + + types.uniq t + Ensures that type t cannot be + merged. It is used to ensure option definitions are declared only + once. + + + types.enum l + One element of the list l, e.g. + types.enum [ "left" "right" ]. Multiple definitions + cannot be merged + + + types.either t1 + t2 + Type t1 or type + t2, e.g. with types; either int + str. Multiple definitions cannot be + merged. + + + types.submodule o + A set of sub options o. + o can be an attribute set or a function + returning an attribute set. Submodules are used in composed types to + create modular options. Submodule are detailed in . + + + +
+ +
Submodule + + Submodule is a very powerful type that defines a set of sub-options that + are handled like a separate module. + It is especially interesting when used with composed types like + attrsOf or listOf. + + The submodule type take a parameter o, that + should be a set, or a function returning a set with an + options key defining the sub-options. + The option set can be defined directly () or as reference (). + + Submodule option definitions are type-checked accordingly to the options + declarations. It is possible to declare submodule options inside a submodule + sub-options for even higher modularity. + +Directly defined submodule + +options.mod = mkOption { + name = "mod"; + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; + +Submodule defined as a + reference + +let + modOptions = { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = int; + }; + }; + }; +in +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule modOptions); +}; + + +
Composed with <literal>listOf</literal> + + When composed with listOf, submodule allows multiple + definitions of the submodule option set. + +Declaration of a list + of submodules + +options.mod = mkOption { + description = "submodule example"; + type = with types; listOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; + +Definition of a list of + submodules + +config.mod = [ + { foo = 1; bar = "one"; } + { foo = 2; bar = "two"; } +]; + +
+ + +
Composed with <literal>attrsOf</literal> + + When composed with attrsOf, submodule allows multiple + named definitions of the submodule option set. + +Declaration of + attribute sets of submodules + +options.mod = mkOption { + description = "submodule example"; + type = with types; attrsOf (submodule { + options = { + foo = mkOption { + type = int; + }; + bar = mkOption { + type = str; + }; + }; + }); +}; + +Declaration of + attribute sets of submodules + +config.mod.one = { foo = 1; bar = "one"; }; +config.mod.two = { foo = 2; bar = "two"; }; + +
+
+ +
Extending types + + Types are mainly characterized by their check and + merge functions. + + + + check + The function to type check the value. Takes a value as + parameter and return a boolean. + It is possible to extend a type check with the + addCheck function (), or to fully override the + check function (). + +Adding a type check + +byte = mkOption { + description = "An integer between 0 and 255."; + type = addCheck (x: x >= 0 && x <= 255) types.int; +}; + +Overriding a type + check + +nixThings = mkOption { + description = "words that start with 'nix'"; + type = types.str // { + check = (x: lib.hasPrefix "nix" x) + }; +}; + + + + merge + Function to merge the options values when multiple values + are set. +The function takes two parameters, loc the option path as a +list of strings, and defs the list of defined values as a +list. +It is possible to override a type merge function for custom +needs. + + + +
+ +
Custom Types + +Custom types can be created with the mkOptionType + function. +As type creation includes some more complex topics such as submodule handling, +it is recommended to get familiar with types.nix +code before creating a new type. + +The only required parameter is name. + + + + name + A string representation of the type function name, name + usually changes accordingly parameters passed to + types. + + + check + A function to type check the definition value. Takes the + definition value as a parameter and returns a boolean indicating the + type check result, true for success and + false for failure. + + + merge + A function to merge multiple definitions values. Takes two + parameters: + + + loc + The option path as a list of strings, e.g. + ["boot" "loader "grub" + "enable"]. + + + defs + The list of sets of defined value + and file where the value was defined, e.g. + [ { file = "/foo.nix"; value = 1; } { file = "/bar.nix"; + value = 2 } ]. The merge function + should return the merged value or throw an error in case the + values are impossible or not meant to be merged. + + + + + + getSubOptions + For composed types that can take a submodule as type + parameter, this function generate sub-options documentation. It takes + the current option prefix as a list and return the set of sub-options. + Usually defined in a recursive manner by adding a term to the prefix, + e.g. prefix: elemType.getSubOptions (prefix ++ + ["prefix"]) where + "prefix" is the newly added + prefix. + + + getSubModules + For composed types that can take a submodule as type + parameter, this function should return the type parameters submodules. + If the type parameter is called elemType, the + function should just recursively look into submodules by returning + elemType.getSubModules;. + + + substSubModules + For composed types that can take a submodule as type + parameter, this function can be used to substitute the parameter of a + submodule type. It takes a module as parameter and return the type with + the submodule options substituted. It is usally defined as a type + function call with a recursive call to + substSubModules, e.g for a type + composedType that take an elemtype + type parameter, this function should be defined as m: + composedType (elemType.substSubModules m). + + + +
+
diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml new file mode 100755 index 00000000000..01c3dbc22f1 --- /dev/null +++ b/nixos/doc/manual/development/releases.xml @@ -0,0 +1,241 @@ + + +Releases + +
+ Release process + + + Going through an example of releasing NixOS 15.09: + + +
+ One month before the beta + + + + Send an email to nix-dev mailinglist as a warning about upcoming beta "feature freeze" in a month. + + + + + Discuss with Eelco Dolstra and the community (via IRC, ML) about what will reach the deadline. + Any issue or Pull Request targeting the release should have assigned milestone. + + + +
+
+ At beta release time + + + + Rename rl-unstable.xml -> + rl-1509.xml. + + + + + git tag -a -m "Release 15.09-beta" 15.09-beta && git push --tags + + + + + From the master branch run git checkout -B release-15.09. + + + + + + Make sure channel is created at http://nixos.org/channels/. + + + + + + + Lock the branch on github (so developers can’t force push) + + + + + + bump + system.defaultChannel attribute in + nixos/modules/misc/version.nix + + + + + update + versionSuffix in + nixos/release.nix, use + git log --format=%an|wc -l to get commit + count + + + + + echo -n "16.03" > .version in + master. + + + + + pick + a new name for unstable branch. + + + + + Create + an issue for tracking Zero Hydra Failures progress. ZHF is an effort + to get build failures down to zero. + + + + + Use https://lwn.net/Vulnerabilities/ and + triage vulnerabilities in an issue. + + + + + Create two Hydra jobsets: release-15.09 and release-15.09-small with stableBranch set to false + + + + + Edit changelog at + nixos/doc/manual/release-notes/rl-1509.xml + (double check desktop versions are noted) + + + + + Get all new NixOS modules + git diff release-14.12..release-15.09 nixos/modules/module-list.nix|grep ^+ + + + + + Note systemd, kernel, glibc and Nix upgrades. + + + + + +
+
+ Before the final release + + + + Release Nix (currently only Eelco Dolstra can do that). + + Make sure fallback is updated. + + + + + + + Update README.md with new stable NixOS version information. + + + + + + Change stableBranch to true and wait for channel to update. + + + +
+
+ At final release time + + + + git tag -s -a -m "Release 15.09" 15.09 + + + + + Update http://nixos.org/nixos/download.html and http://nixos.org/nixos/manual in https://github.com/NixOS/nixos-org-configurations + + + + + Get number of commits for the release: + git log release-14.04..release-14.12 --format=%an|wc -l + + + + + Commits by contributor: + git log release-14.04..release-14.12 --format=%an|sort|uniq -c|sort -rn + + + + + Send an email to nix-dev to announce the release with above information. Best to check how previous email was formulated + to see what needs to be included. + + + +
+
+ +
+ Release schedule + + + + + + + + + Date + + + Event + + + + + + + 2016-07-25 + + + Send email to nix-dev about upcoming branch-off + + + + + 2016-09-01 + + + release-16.09 branch and corresponding jobsets are created, + change freeze + + + + + 2016-09-30 + + + NixOS 16.09 released + + + + + +
+ + diff --git a/nixos/doc/manual/development/reviewing-contributions.xml b/nixos/doc/manual/development/reviewing-contributions.xml new file mode 100644 index 00000000000..f86928bcd5d --- /dev/null +++ b/nixos/doc/manual/development/reviewing-contributions.xml @@ -0,0 +1,393 @@ + + +Reviewing contributions + + + The following section is a draft and reviewing policy is still being + discussed. + + +The nixpkgs projects receives a fairly high number of contributions via + GitHub pull-requests. Reviewing and approving these is an important task and a + way to contribute to the project. + +The high change rate of nixpkgs make any pull request that is open for + long enough subject to conflicts that will require extra work from the + submitter or the merger. Reviewing pull requests in a timely manner and being + responsive to the comments is the key to avoid these. Github provides sort + filters that can be used to see the most + recently and the least + recently updated pull-requests. + +When reviewing a pull request, please always be nice and polite. + Controversial changes can lead to controversial opinions, but it is important + to respect every community members and their work. + +GitHub provides reactions, they are a simple and quick way to provide + feedback to pull-requests or any comments. The thumb-down reaction should be + used with care and if possible accompanied with some explanations so the + submitter has directions to improve his contribution. + +Pull-requests reviews should include a list of what has been reviewed in a + comment, so other reviewers and mergers can know the state of the + review. + +All the review template samples provided in this section are generic and + meant as examples. Their usage is optional and the reviewer is free to adapt + them to his liking. + +
Package updates + +A package update is the most trivial and common type of pull-request. + These pull-requests mainly consist in updating the version part of the package + name and the source hash. +It can happen that non trivial updates include patches or more complex + changes. + +Reviewing process: + + + Add labels to the pull-request. (Requires commit + rights) + + 8.has: package (update) and any topic + label that fit the updated package. + + + Ensure that the package versioning is fitting the + guidelines. + Ensure that the commit text is fitting the + guidelines. + Ensure that the package maintainers are notified. + + mention-bot usually notify GitHub users based on the + submitted changes, but it can happen that it misses some of the + package maintainers. + + + Ensure that the meta field contains correct + information. + + License can change with version updates, so it should be + checked to be fitting upstream license. + If the package has no maintainer, a maintainer must be + set. This can be the update submitter or a community member that + accepts to take maintainership of the package. + + + Ensure that the code contains no typos. + Building the package locally. + + Pull-requests are often targeted to the master or staging + branch so building the pull-request locally as it is submitted can + trigger a large amount of source builds. + It is possible to rebase the changes on nixos-unstable or + nixpkgs-unstable for easier review by running the following commands + from a nixpkgs clone. + +$ git remote add channels https://github.com/NixOS/nixpkgs-channels.git +$ git fetch channels nixos-unstable +$ git fetch origin pull/PRNUMBER/head +$ git rebase --onto nixos-unstable BASEBRANCH FETCH_HEAD + + + + This should be done only once to be able to fetch channel + branches from the nixpkgs-channels repository. + + + Fetching the nixos-unstable branch. + + + Fetching the pull-request changes, PRNUMBER + is the number at the end of the pull-request title and + BASEBRANCH the base branch of the + pull-request. + + + Rebasing the pull-request changes to the nixos-unstable + branch. + + + + + + The nox + tool can be used to review a pull-request content in a single command. + It doesn't rebase on a channel branch so it might trigger multiple + source builds. PRNUMBER should be replaced by the + number at the end of the pull-request title. + +$ nix-shell -p nox --run "nox-review -k pr PRNUMBER" + + + + + Running every binary. + + +Sample template for a package update review + +##### Reviewed points + +- [ ] package name fits guidelines +- [ ] package version fits guidelines +- [ ] package build on ARCHITECTURE +- [ ] executables tested on ARCHITECTURE +- [ ] all depending packages build + +##### Possible improvements + +##### Comments + + +
+ +
New packages + +New packages are a common type of pull-requests. These pull requests + consists in adding a new nix-expression for a package. + +Reviewing process: + + + Add labels to the pull-request. (Requires commit + rights) + + 8.has: package (new) and any topic + label that fit the new package. + + + Ensure that the package versioning is fitting the + guidelines. + Ensure that the commit name is fitting the + guidelines. + Ensure that the meta field contains correct + information. + + License must be checked to be fitting upstream + license. + Platforms should be set or the package will not get binary + substitutes. + A maintainer must be set, this can be the package + submitter or a community member that accepts to take maintainership of + the package. + + + Ensure that the code contains no typos. + Ensure the package source. + + Mirrors urls should be used when + available. + The most appropriate function should be used (e.g. + packages from GitHub should use + fetchFromGitHub). + + + Building the package locally. + Running every binary. + + +Sample template for a new package review + +##### Reviewed points + +- [ ] package path fits guidelines +- [ ] package name fits guidelines +- [ ] package version fits guidelines +- [ ] package build on ARCHITECTURE +- [ ] executables tested on ARCHITECTURE +- [ ] `meta.description` is set and fits guidelines +- [ ] `meta.license` fits upstream license +- [ ] `meta.platforms` is set +- [ ] `meta.maintainers` is set +- [ ] build time only dependencies are declared in `nativeBuildInputs` +- [ ] source is fetched using the appropriate function +- [ ] phases are respected +- [ ] patches that are remotely available are fetched with `fetchpatch` + +##### Possible improvements + +##### Comments + + +
+ +
Module updates + +Module updates are submissions changing modules in some ways. These often + contains changes to the options or introduce new options. + +Reviewing process + + + Add labels to the pull-request. (Requires commit + rights) + + 8.has: module (update) and any topic + label that fit the module. + + + Ensure that the module maintainers are notified. + + Mention-bot notify GitHub users based on the submitted + changes, but it can happen that it miss some of the package + maintainers. + + + Ensure that the module tests, if any, are + succeeding. + Ensure that the introduced options are correct. + + Type should be appropriate (string related types differs + in their merging capabilities, optionSet and + string types are deprecated). + Description, default and example should be + provided. + + + Ensure that option changes are backward compatible. + + mkRenamedOptionModule and + mkAliasOptionModule functions provide way to make + option changes backward compatible. + + + Ensure that removed options are declared with + mkRemovedOptionModule + Ensure that changes that are not backward compatible are + mentioned in release notes. + Ensure that documentations affected by the change is + updated. + + +Sample template for a module update review + +##### Reviewed points + +- [ ] changes are backward compatible +- [ ] removed options are declared with `mkRemovedOptionModule` +- [ ] changes that are not backward compatible are documented in release notes +- [ ] module tests succeed on ARCHITECTURE +- [ ] options types are appropriate +- [ ] options description is set +- [ ] options example is provided +- [ ] documentation affected by the changes is updated + +##### Possible improvements + +##### Comments + + +
+ +
New modules + +New modules submissions introduce a new module to NixOS. + + + Add labels to the pull-request. (Requires commit + rights) + + 8.has: module (new) and any topic label + that fit the module. + + + Ensure that the module tests, if any, are + succeeding. + Ensure that the introduced options are correct. + + Type should be appropriate (string related types differs + in their merging capabilities, optionSet and + string types are deprecated). + Description, default and example should be + provided. + + + Ensure that module meta field is + present + + Maintainers should be declared in + meta.maintainers. + Module documentation should be declared with + meta.doc. + + + Ensure that the module respect other modules + functionality. + + For example, enabling a module should not open firewall + ports by default. + + + + +Sample template for a new module review + +##### Reviewed points + +- [ ] module path fits the guidelines +- [ ] module tests succeed on ARCHITECTURE +- [ ] options have appropriate types +- [ ] options have default +- [ ] options have example +- [ ] options have descriptions +- [ ] No unneeded package is added to system.environmentPackages +- [ ] meta.maintainers is set +- [ ] module documentation is declared in meta.doc + +##### Possible improvements + +##### Comments + + +
+ +
Other submissions + +Other type of submissions requires different reviewing steps. + +If you consider having enough knowledge and experience in a topic and + would like to be a long-term reviewer for related submissions, please contact + the current reviewers for that topic. They will give you information about the + reviewing process. +The main reviewers for a topic can be hard to find as there is no list, but +checking past pull-requests to see who reviewed or git-blaming the code to see +who committed to that topic can give some hints. + +Container system, boot system and library changes are some examples of the + pull requests fitting this category. + +
+ +
Merging pull-requests + +It is possible for community members that have enough knowledge and + experience on a special topic to contribute by merging pull requests. + +TODO: add the procedure to request merging rights. + + + +In a case a contributor leaves definitively the Nix community, he should + create an issue or notify the mailing list with references of packages and + modules he maintains so the maintainership can be taken over by other + contributors. + +
+ diff --git a/nixos/doc/manual/development/writing-documentation.xml b/nixos/doc/manual/development/writing-documentation.xml new file mode 100644 index 00000000000..59a287717ac --- /dev/null +++ b/nixos/doc/manual/development/writing-documentation.xml @@ -0,0 +1,147 @@ + + +Writing NixOS Documentation + + + As NixOS grows, so too does the need for a catalogue and explanation + of its extensive functionality. Collecting pertinent information + from disparate sources and presenting it in an accessible style + would be a worthy contribution to the project. + + +
+Building the Manual + + The DocBook sources of the are in the + nixos/doc/manual + subdirectory of the Nixpkgs repository. If you make modifications to + the manual, it's important to build it before committing. You can do + that as follows: + + nix-build nixos/release.nix -A manual.x86_64-linux + + + + When this command successfully finishes, it will tell you where the + manual got generated. The HTML will be accessible through the + result symlink at + ./result/share/doc/nixos/index.html. + +
+ +
+Editing DocBook XML + + + For general information on how to write in DocBook, see + + DocBook 5: The Definitive Guide. + + + + Emacs nXML Mode is very helpful for editing DocBook XML because it + validates the document as you write, and precisely locates + errors. To use it, see . + + + + Pandoc can generate + DocBook XML from a multitude of formats, which makes a good starting + point. + + + Pandoc invocation to convert GitHub-Flavoured MarkDown to DocBook 5 XML + pandoc -f markdown_github -t docbook5 docs.md -o my-section.md + + + Pandoc can also quickly convert a single + section.xml to HTML, which is helpful when + drafting. + + + + Sometimes writing valid DocBook is simply too difficult. In this + case, submit your documentation updates in a GitHub + Issue and someone will handle the conversion to XML for you. + +
+ +
+Creating a Topic + + + You can use an existing topic as a basis for the new topic or create a topic from scratch. + + + +Keep the following guidelines in mind when you create and add a topic: + + + + The NixOS book + element is in nixos/doc/manual/manual.xml. + It includes several + parts + which are in subdirectories. + + + + Store the topic file in the same directory as the part + to which it belongs. If your topic is about configuring a NixOS + module, then the XML file can be stored alongside the module + definition nix file. + + + + If you include multiple words in the file name, separate the words + with a dash. For example: ipv6-config.xml. + + + + Make sure that the xml:id value is unique. You can use + abbreviations if the ID is too long. For example: + nixos-config. + + + + Determine whether your topic is a chapter or a section. If you are + unsure, open an existing topic file and check whether the main + element is chapter or section. + + + + + +
+ +
+Adding a Topic to the Book + + + Open the parent XML file and add an xi:include + element to the list of chapters with the file name of the topic that + you created. If you created a section, you add the file to + the chapter file. If you created a chapter, you + add the file to the part file. + + + + If the topic is about configuring a NixOS module, it can be + automatically included in the manual by using the + meta.doc attribute. See for an explanation. + + +
+ + + + + + + diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml index a68b122ce02..ef6920160e6 100644 --- a/nixos/doc/manual/development/writing-modules.xml +++ b/nixos/doc/manual/development/writing-modules.xml @@ -176,6 +176,7 @@ in { + diff --git a/nixos/doc/manual/release-notes/rl-1609.xml b/nixos/doc/manual/release-notes/rl-1609.xml index 70759ee25f8..18b9a333e23 100644 --- a/nixos/doc/manual/release-notes/rl-1609.xml +++ b/nixos/doc/manual/release-notes/rl-1609.xml @@ -4,7 +4,7 @@ version="5.0" xml:id="sec-release-16.09"> -Release 16.09 (“Flounder”, 2016/09/??) +Release 16.09 (“Flounder”, 2016/09/30) In addition to numerous new and upgraded packages, this release has the following highlights: @@ -12,22 +12,45 @@ has the following highlights: - PXE "netboot" media has landed in . - See for documentation. + Many NixOS configurations and Nix packages now use + significantly less disk space, thanks to the extensive + work on closure size reduction. For example, the closure + size of a minimal NixOS container went down from ~424 MiB in 16.03 + to ~212 MiB in 16.09, while the closure size of Firefox went from + ~651 MiB to ~259 MiB. - Xorg-server-1.18.*. If you choose "ati_unfree" driver, - 1.17.* is still used due to ABI incompatibility. + To improve security, packages are now built + using various hardening features. See the Nixpkgs manual + for more information. + + + Support for PXE netboot. See for documentation. + + + + X.org server 1.18. If you use the + ati_unfree driver, 1.17 is still used due to an + ABI incompatibility. + + + + This release is based on Glibc 2.24, GCC 5.4.0 and systemd + 231. The default Linux kernel remains 4.4. + + The following new services were added since the last release: - - (this will get automatically generated at release time) - - + + (this will get automatically generated at release time) + When upgrading from a previous release, please be aware of the following incompatible changes: @@ -36,7 +59,8 @@ following incompatible changes: A large number of packages have been converted to use the multiple outputs feature - of Nix to greatly reduce the amount of required disk space. This may require changes + of Nix to greatly reduce the amount of required disk space, as + mentioned above. This may require changes to any custom packages to make them build again; see the relevant chapter in the Nixpkgs manual for more information. (Additional caveat to packagers: some packaging conventions related to multiple-output packages @@ -45,6 +69,25 @@ following incompatible changes: + + Previous versions of Nixpkgs had support for all versions of the LTS + Haskell package set. That support has been dropped. The previously provided + haskell.packages.lts-x_y package sets still exist in + name to aviod breaking user code, but these package sets don't actually + contain the versions mandated by the corresponding LTS release. Instead, + our package set it loosely based on the latest available LTS release, i.e. + LTS 7.x at the time of this writing. New releases of NixOS and Nixpkgs will + drop those old names entirely. The + motivation for this change has been discussed at length on the + nix-dev mailing list and in Github issue + #14897. Development strategies for Haskell hackers who want to rely + on Nix and NixOS have been described in another + nix-dev article. + + Shell aliases for systemd sub-commands were dropped: @@ -58,16 +101,20 @@ following incompatible changes: - /var/setuid-wrappers/ - is now a symlink so - it can be atomically updated - and it's not mounted as tmpfs anymore since setuid binaries are located on /run/ as tmpfs. + + /var/empty is now immutable. Activation script runs chattr +i + to forbid any modifications inside the folder. See + the pull request for what bugs this caused. - Gitlab's maintainence script gitlab-runner was removed and split up into the more clearer - gitlab-run and gitlab-rake scripts because gitlab-runner is a component of Gitlab CI. + Gitlab's maintainance script + gitlab-runner was removed and split up into the + more clearer gitlab-run and + gitlab-rake scripts, because + gitlab-runner is a component of Gitlab + CI. @@ -80,14 +127,49 @@ following incompatible changes: fonts.fontconfig.ultimate.rendering was removed because our presets were obsolete for some time. New presets are hardcoded - into freetype; one selects a preset via fonts.fontconfig.ultimate.preset. + into FreeType; you can select a preset via fonts.fontconfig.ultimate.preset. You can customize those presets via ordinary environment variables, using environment.variables. The audit service is no longer enabled by default. - Use security.audit.enable = true; to explicitly enable it. + Use security.audit.enable = true to explicitly enable it. + + + + + pkgs.linuxPackages.virtualbox now contains only the + kernel modules instead of the VirtualBox user space binaries. + If you want to reference the user space binaries, you have to use the new + pkgs.virtualbox instead. + + + + + goPackages was replaced with separated Go + applications in appropriate nixpkgs + categories. Each Go package uses its own dependency set. There's + also a new go2nix tool introduced to generate a + Go package definition from its Go source automatically. + + + + services.mongodb.extraConfig configuration format + was changed to YAML. + + + + + PHP has been upgraded to 7.0 + + + + + PHP now scans for extra configuration .ini files in /etc/php.d + instead of /etc. This prevents accidentally loading non-PHP .ini files + that may be in /etc. + @@ -105,6 +187,60 @@ following incompatible changes: functionality. See for documentation + Special filesystems, like /proc, + /run and others, now have the same mount options + as recommended by systemd and are unified across different places in + NixOS. Mount options are updated during nixos-rebuild + switch if possible. One benefit from this is improved + security — most such filesystems are now mounted with + noexec, nodev and/or + nosuid options. + + The reverse path filter was interfering with DHCPv4 server + operation in the past. An exception for DHCPv4 and a new option to log + packets that were dropped due to the reverse path filter was added + (networking.firewall.logReversePathDrops) for easier + debugging. + + Containers configuration within + containers.<name>.config is now + properly typed and checked. In particular, partial + configurations are merged correctly. + + + The directory container setuid wrapper programs, + /var/setuid-wrappers, is now + updated atomically to prevent failures if the switch to a new + configuration is interrupted. + + + + services.xserver.startGnuPGAgent + has been removed due to GnuPG 2.1.x bump. See + how to achieve similar behavior. You might need to + pkill gpg-agent after the upgrade + to prevent a stale agent being in the way. + + + + + + Declarative users could share the uid due to the bug in + the script handling conflict resolution. + + + + + Gummi boot has been replaced using systemd-boot. + + + + Hydra package and NixOS module were added for convenience. + + diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml index c0fa4388a2a..21cea77f876 100644 --- a/nixos/doc/manual/release-notes/rl-1703.xml +++ b/nixos/doc/manual/release-notes/rl-1703.xml @@ -29,7 +29,37 @@ following incompatible changes: - + + gnome alias has been removed along with + gtk, gtkmm and several others. + Now you need to use versioned attributes, like gnome3. + + + + + + The attribute name of the Radicale daemon has been changed from + pythonPackages.radicale to + radicale. + + + + + + The Yama LSM is now enabled by default in the kernel, + which prevents ptracing non-child processes. + This means you will not be able to attach gdb to an existing process, + but will need to start that process from gdb (so it is a child). + + + + + + The stripHash bash function in stdenv + changed according to its documentation; it now outputs the stripped name to + stdout instead of putting it in the variable + strippedName. + diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index 109959cd512..7fad5cbc3cd 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -181,9 +181,11 @@ rec { eval $i2=/tmp/xchg/$_basename ${coreutils}/bin/ls -la $xchg done - unset i i2 _basename xchg - export > $xchg/saved-env + unset i i2 _basename + export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env + unset xchg + export tests='${testScript}' ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm ''; # */ diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix index 17cb862d291..671a59f52f6 100644 --- a/nixos/modules/config/debug-info.nix +++ b/nixos/modules/config/debug-info.nix @@ -20,7 +20,7 @@ with lib; nixpkgs.config.packageOverrides = pkgs: { - hello = overrideDerivation pkgs.hello (attrs: { + hello = pkgs.lib.overrideDerivation pkgs.hello (attrs: { outputs = attrs.outputs or ["out"] ++ ["debug"]; buildInputs = attrs.buildInputs ++ [<nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh>]; }); diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index aab5523c684..fdc782b0579 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -29,6 +29,19 @@ in ''; }; + networking.hostConf = lib.mkOption { + type = types.lines; + default = "multi on"; + example = '' + multi on + reorder on + trim lan + ''; + description = '' + The contents of /etc/host.conf. See also host.conf5. + ''; + }; + networking.dnsSingleRequest = lib.mkOption { type = types.bool; default = false; @@ -171,6 +184,9 @@ in ${cfg.extraHosts} ''; + # /etc/host.conf: resolver configuration file + "host.conf".text = cfg.hostConf; + # /etc/resolvconf.conf: Configuration for openresolv. "resolvconf.conf".text = '' @@ -232,7 +248,7 @@ in # and other configurations. If the file is destroyed by an environment # activation then it must be rebuilt so that applications which interface # with /etc/resolv.conf directly don't break. - system.activationScripts.resolvconf = stringAfter [ "etc" "tmpfs" "var" ] + system.activationScripts.resolvconf = stringAfter [ "etc" "specialfs" "var" ] '' # Systemd resolved controls its own resolv.conf rm -f /run/resolvconf/interfaces/systemd diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index b9844b4adad..39a45042c6c 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -37,14 +37,15 @@ in environment.sessionVariables.TZDIR = "/etc/zoneinfo"; + # This way services are restarted when tzdata changes. systemd.globalEnvironment.TZDIR = tzdir; environment.etc.localtime = - { source = "${tzdir}/${config.time.timeZone}"; + { source = "/etc/zoneinfo/${config.time.timeZone}"; mode = "direct-symlink"; }; - environment.etc.zoneinfo.source = "${pkgs.tzdata}/share/zoneinfo"; + environment.etc.zoneinfo.source = tzdir; }; diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index d92deb85d2a..57e4940378b 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -131,13 +131,12 @@ let }; subUidRanges = mkOption { - type = types.listOf types.optionSet; + type = with types; listOf (submodule subordinateUidRange); default = []; example = [ { startUid = 1000; count = 1; } { startUid = 100001; count = 65534; } ]; - options = [ subordinateUidRange ]; description = '' Subordinate user ids that user is allowed to use. They are set into /etc/subuid and are used @@ -146,13 +145,12 @@ let }; subGidRanges = mkOption { - type = types.listOf types.optionSet; + type = with types; listOf (submodule subordinateGidRange); default = []; example = [ { startGid = 100; count = 1; } { startGid = 1001; count = 999; } ]; - options = [ subordinateGidRange ]; description = '' Subordinate group ids that user is allowed to use. They are set into /etc/subgid and are used @@ -310,32 +308,36 @@ let }; subordinateUidRange = { - startUid = mkOption { - type = types.int; - description = '' - Start of the range of subordinate user ids that user is - allowed to use. - ''; - }; - count = mkOption { - type = types.int; - default = 1; - description = ''Count of subordinate user ids''; + options = { + startUid = mkOption { + type = types.int; + description = '' + Start of the range of subordinate user ids that user is + allowed to use. + ''; + }; + count = mkOption { + type = types.int; + default = 1; + description = ''Count of subordinate user ids''; + }; }; }; subordinateGidRange = { - startGid = mkOption { - type = types.int; - description = '' - Start of the range of subordinate group ids that user is - allowed to use. - ''; - }; - count = mkOption { - type = types.int; - default = 1; - description = ''Count of subordinate group ids''; + options = { + startGid = mkOption { + type = types.int; + description = '' + Start of the range of subordinate group ids that user is + allowed to use. + ''; + }; + count = mkOption { + type = types.int; + default = 1; + description = ''Count of subordinate group ids''; + }; }; }; @@ -428,7 +430,7 @@ in { users.users = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule userOpts); example = { alice = { uid = 1234; @@ -444,7 +446,6 @@ in { Additional user accounts to be created automatically by the system. This can also be used to set options for root. ''; - options = [ userOpts ]; }; users.groups = mkOption { @@ -453,11 +454,10 @@ in { { students.gid = 1001; hackers = { }; }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule groupOpts); description = '' Additional groups to be created automatically by the system. ''; - options = [ groupOpts ]; }; # FIXME: obsolete - will remove. diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 0bc574d4819..bef500e30c0 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -14,7 +14,7 @@ let name = "mesa-drivers+txc-${p.mesa_drivers.version}"; paths = [ p.mesa_drivers - p.mesa_noglu # mainly for libGL + p.mesa_drivers.out # mainly for libGL (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) ]; }; diff --git a/nixos/modules/hardware/video/amdgpu-pro.nix b/nixos/modules/hardware/video/amdgpu-pro.nix new file mode 100644 index 00000000000..3723d7690dc --- /dev/null +++ b/nixos/modules/hardware/video/amdgpu-pro.nix @@ -0,0 +1,56 @@ +# This module provides the proprietary AMDGPU-PRO drivers. + +{ config, lib, pkgs, pkgs_i686, ... }: + +with lib; + +let + + drivers = config.services.xserver.videoDrivers; + + enabled = elem "amdgpu-pro" drivers; + + package = config.boot.kernelPackages.amdgpu-pro; + package32 = pkgs_i686.linuxPackages.amdgpu-pro.override { libsOnly = true; kernel = null; }; + + opengl = config.hardware.opengl; + +in + +{ + + config = mkIf enabled { + + services.xserver.drivers = singleton + { name = "amdgpu"; modules = [ package ]; libPath = [ package ]; }; + + hardware.opengl.package = package; + hardware.opengl.package32 = package32; + + boot.extraModulePackages = [ package ]; + + boot.blacklistedKernelModules = [ "radeon" ]; + + hardware.firmware = [ package ]; + + system.activationScripts.setup-amdgpu-pro = '' + mkdir -p /run/lib + ln -sfn ${package}/lib ${package.libCompatDir} + '' + optionalString opengl.driSupport32Bit '' + ln -sfn ${package32}/lib ${package32.libCompatDir} + ''; + + environment.etc = { + "amd/amdrc".source = package + "/etc/amd/amdrc"; + "amd/amdapfxx.blb".source = package + "/etc/amd/amdapfxx.blb"; + "gbm/gbm.conf".source = package + "/etc/gbm/gbm.conf"; + "OpenCL/vendors/amdocl64.icd".source = package + "/etc/OpenCL/vendors/amdocl64.icd"; + "vulkan/icd.d/amd_icd64.json".source = package + "/etc/vulkan/icd.d/amd_icd64.json"; + } // optionalAttrs opengl.driSupport32Bit { + "OpenCL/vendors/amdocl32.icd".source = package32 + "/etc/OpenCL/vendors/amdocl32.icd"; + "vulkan/icd.d/amd_icd32.json".source = package32 + "/etc/vulkan/icd.d/amd_icd32.json"; + }; + + }; + +} diff --git a/nixos/modules/hardware/video/displaylink.nix b/nixos/modules/hardware/video/displaylink.nix new file mode 100644 index 00000000000..2a9382f3941 --- /dev/null +++ b/nixos/modules/hardware/video/displaylink.nix @@ -0,0 +1,61 @@ +{ config, lib, ... }: + +with lib; + +let + + enabled = elem "displaylink" config.services.xserver.videoDrivers; + + displaylink = config.boot.kernelPackages.displaylink; + +in + +{ + + config = mkIf enabled { + + boot.extraModulePackages = [ displaylink ]; + + boot.kernelModules = [ "evdi" ]; + + # Those are taken from displaylink-installer.sh and from Arch Linux AUR package. + + services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="17e9", ATTR{bNumInterfaces}=="*5", TAG+="uaccess" + ''; + + powerManagement.powerDownCommands = '' + #flush any bytes in pipe + while read -n 1 -t 1 SUSPEND_RESULT < /tmp/PmMessagesPort_out; do : ; done; + + #suspend DisplayLinkManager + echo "S" > /tmp/PmMessagesPort_in + + #wait until suspend of DisplayLinkManager finish + read -n 1 -t 10 SUSPEND_RESULT < /tmp/PmMessagesPort_out + ''; + + powerManagement.resumeCommands = '' + #resume DisplayLinkManager + echo "R" > /tmp/PmMessagesPort_in + ''; + + systemd.services.displaylink = { + description = "DisplayLink Manager Service"; + after = [ "display-manager.service" ]; + wantedBy = [ "graphical.target" ]; + + serviceConfig = { + ExecStart = "${displaylink}/bin/DisplayLinkManager"; + Restart = "always"; + RestartSec = 5; + }; + + preStart = '' + mkdir -p /var/log/displaylink + ''; + }; + + }; + +} diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index f3e568f1dde..7ed4a584d64 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -3,26 +3,27 @@ with lib; let cfg = config.i18n.inputMethod; - gtk2_cache = pkgs.stdenv.mkDerivation { - preferLocalBuild = true; - allowSubstitutes = false; - name = "gtk2-immodule.cache"; - buildInputs = [ pkgs.gtk cfg.package ]; - buildCommand = '' + + gtk2_cache = pkgs.runCommand "gtk2-immodule.cache" + { preferLocalBuild = true; + allowSubstitutes = false; + buildInputs = [ pkgs.gtk2 cfg.package ]; + } + '' mkdir -p $out/etc/gtk-2.0/ GTK_PATH=${cfg.package}/lib/gtk-2.0/ gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache ''; - }; - gtk3_cache = pkgs.stdenv.mkDerivation { - preferLocalBuild = true; - allowSubstitutes = false; - name = "gtk3-immodule.cache"; - buildInputs = [ pkgs.gtk3 cfg.package ]; - buildCommand = '' + + gtk3_cache = pkgs.runCommand "gtk3-immodule.cache" + { preferLocalBuild = true; + allowSubstitutes = false; + buildInputs = [ pkgs.gtk3 cfg.package ]; + } + '' mkdir -p $out/etc/gtk-3.0/ GTK_PATH=${cfg.package}/lib/gtk-3.0/ gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache ''; - }; + in { options.i18n = { diff --git a/nixos/modules/i18n/input-method/default.xml b/nixos/modules/i18n/input-method/default.xml index a32ed100df3..45d6daf068b 100644 --- a/nixos/modules/i18n/input-method/default.xml +++ b/nixos/modules/i18n/input-method/default.xml @@ -56,8 +56,18 @@ i18n.inputMethod = { Table (ibus-engines.table): An input method that load tables of input methods. table-others (ibus-engines.table-others): - Various table-based input methods. + Various table-based input methods. To use this, and any other table-based + input methods, it must appear in the list of engines along with + table. For example: + +ibus.engines = with pkgs.ibus-engines; [ table table-others ]; + + + +To use any input method, the package must be added in the configuration, + as shown above, and also (after running nixos-rebuild) the + input method must be added from IBus' preference dialog.
Fcitx diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index d64cf2f283b..e23e28aa25e 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -17,7 +17,7 @@ let [Desktop Entry] Name=IBus Type=Application - Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim --cache=refresh + Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim ''; }; in diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix index d14768bc107..b5ee57d9e22 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix @@ -96,15 +96,16 @@ with lib; ''; in - pkgs.stdenv.mkDerivation { - inherit (pkg) name meta; - - buildCommand = '' + pkgs.runCommand pkg.name + { inherit (pkg) meta; } + '' mkdir -p $out cp -prf ${pkg}/* $out/ chmod a+w $out/share/apps/plasma-desktop/init cp -f ${plasmaInit} $out/share/apps/plasma-desktop/init/00-defaultLayout.js ''; - }; + + # Disable large stuff that's not very useful on the installation CD. + services.xserver.desktopManager.kde4.enablePIM = false; } diff --git a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix index d984cb30717..ba84cd51098 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-fuloong2f.nix @@ -61,7 +61,7 @@ in pkgs.cryptsetup # needed for dm-crypt volumes # Some networking tools. - pkgs.sshfsFuse + pkgs.sshfs-fuse pkgs.socat pkgs.screen pkgs.wpa_supplicant # !!! should use the wpa module diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix index 9e733241993..7ec09acd591 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix @@ -55,7 +55,7 @@ in pkgs.cryptsetup # needed for dm-crypt volumes # Some networking tools. - pkgs.sshfsFuse + pkgs.sshfs-fuse pkgs.socat pkgs.screen pkgs.wpa_supplicant # !!! should use the wpa module diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 5e576367eb2..f1874f23977 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -527,8 +527,11 @@ EOF # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.version = 2; + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.efiInstallAsRemovable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; # Define on which hard drive you want to install Grub. - # boot.loader.grub.device = "/dev/sda"; + # boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only EOF } diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 0a452b86018..da28c027c56 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -259,7 +259,7 @@ chroot $mountPoint /nix/var/nix/profiles/system/activate # Ask the user to set a root password. -if [ -z "$noRootPasswd" ] && [ -x $mountPoint/var/setuid-wrappers/passwd ] && [ -t 0 ]; then +if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /var/setuid-wrappers/passwd ] && [ -t 0 ]; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index d406cbf9c01..2881d843760 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -74,7 +74,6 @@ rtkit = 45; dovecot2 = 46; dovenull2 = 47; - unbound = 48; prayer = 49; mpd = 50; clamav = 51; @@ -120,7 +119,6 @@ minidlna = 91; elasticsearch = 92; tcpcryptd = 93; # tcpcryptd uses a hard-coded uid. We patch it in Nixpkgs to match this choice. - #connman = 94; # unused firebird = 95; #keys = 96; # unused haproxy = 97; @@ -141,7 +139,7 @@ ngircd = 112; btsync = 113; minecraft = 114; - monetdb = 115; + #monetdb = 115; # unused (not packaged), removed 2016-09-19 rippled = 116; murmur = 117; foundationdb = 118; @@ -274,6 +272,10 @@ gocd-server = 252; terraria = 253; mattermost = 254; + prometheus = 255; + telegraf = 256; + gitlab-runner = 257; + postgrey = 258; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -330,7 +332,6 @@ #rtkit = 45; # unused dovecot2 = 46; #dovenull = 47; # unused - #unbound = 48; # unused prayer = 49; mpd = 50; clamav = 51; @@ -376,7 +377,6 @@ minidlna = 91; elasticsearch = 92; #tcpcryptd = 93; # unused - connman = 94; firebird = 95; keys = 96; haproxy = 97; @@ -395,7 +395,7 @@ #ngircd = 112; # unused btsync = 113; #minecraft = 114; # unused - monetdb = 115; + #monetdb = 115; # unused (not packaged), removed 2016-09-19 #ripped = 116; # unused #murmur = 117; # unused foundationdb = 118; @@ -518,6 +518,10 @@ gocd-server = 252; terraria = 253; mattermost = 254; + prometheus = 255; + #telegraf = 256; # unused + gitlab-runner = 257; + postgrey = 258; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index efbb63da400..403f326df3d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -38,8 +38,10 @@ ./hardware/opengl.nix ./hardware/pcmcia.nix ./hardware/video/amdgpu.nix + ./hardware/video/amdgpu-pro.nix ./hardware/video/ati.nix ./hardware/video/bumblebee.nix + ./hardware/video/displaylink.nix ./hardware/video/nvidia.nix ./hardware/video/webcam/facetimehd.nix ./i18n/input-method/default.nix @@ -69,6 +71,7 @@ ./programs/fish.nix ./programs/freetds.nix ./programs/info.nix + ./programs/java.nix ./programs/kbdlight.nix ./programs/light.nix ./programs/man.nix @@ -82,6 +85,7 @@ ./programs/ssmtp.nix ./programs/tmux.nix ./programs/venus.nix + ./programs/vim.nix ./programs/wvdial.nix ./programs/xfs_quota.nix ./programs/xonsh.nix @@ -132,6 +136,7 @@ ./services/computing/slurm/slurm.nix ./services/continuous-integration/buildkite-agent.nix ./services/continuous-integration/hydra/default.nix + ./services/continuous-integration/gitlab-runner.nix ./services/continuous-integration/gocd-agent/default.nix ./services/continuous-integration/gocd-server/default.nix ./services/continuous-integration/jenkins/default.nix @@ -144,7 +149,6 @@ ./services/databases/hbase.nix ./services/databases/influxdb.nix ./services/databases/memcached.nix - ./services/databases/monetdb.nix ./services/databases/mongodb.nix ./services/databases/mysql.nix ./services/databases/neo4j.nix @@ -210,10 +214,12 @@ ./services/mail/freepops.nix ./services/mail/mail.nix ./services/mail/mlmmj.nix + ./services/mail/offlineimap.nix ./services/mail/opendkim.nix ./services/mail/opensmtpd.nix ./services/mail/postfix.nix ./services/mail/postsrsd.nix + ./services/mail/postgrey.nix ./services/mail/spamassassin.nix ./services/mail/rspamd.nix ./services/mail/rmilter.nix @@ -230,7 +236,9 @@ ./services/misc/dictd.nix ./services/misc/dysnomia.nix ./services/misc/disnix.nix + ./services/misc/docker-registry.nix ./services/misc/emby.nix + ./services/misc/errbot.nix ./services/misc/etcd.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix @@ -250,6 +258,7 @@ ./services/misc/mwlib.nix ./services/misc/nix-daemon.nix ./services/misc/nix-gc.nix + ./services/misc/nix-optimise.nix ./services/misc/nixos-manual.nix ./services/misc/nix-ssh-serve.nix ./services/misc/nzbget.nix @@ -287,6 +296,9 @@ ./services/monitoring/monit.nix ./services/monitoring/munin.nix ./services/monitoring/nagios.nix + ./services/monitoring/prometheus/default.nix + ./services/monitoring/prometheus/node-exporter.nix + ./services/monitoring/prometheus/alertmanager.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix ./services/monitoring/riemann-tools.nix @@ -295,6 +307,7 @@ ./services/monitoring/statsd.nix ./services/monitoring/systemhealth.nix ./services/monitoring/teamviewer.nix + ./services/monitoring/telegraf.nix ./services/monitoring/ups.nix ./services/monitoring/uptime.nix ./services/monitoring/zabbix-agent.nix @@ -338,6 +351,7 @@ ./services/networking/ferm.nix ./services/networking/firefox/sync-server.nix ./services/networking/firewall.nix + ./services/networking/flannel.nix ./services/networking/flashpolicyd.nix ./services/networking/freenet.nix ./services/networking/gale.nix @@ -350,6 +364,7 @@ ./services/networking/haproxy.nix ./services/networking/heyefi.nix ./services/networking/hostapd.nix + ./services/networking/htpdate.nix ./services/networking/i2pd.nix ./services/networking/i2p.nix ./services/networking/iodine.nix @@ -376,7 +391,6 @@ ./services/networking/ntopng.nix ./services/networking/ntpd.nix ./services/networking/nylon.nix - ./services/networking/offlineimap.nix ./services/networking/oidentd.nix ./services/networking/openfire.nix ./services/networking/openntpd.nix @@ -384,6 +398,7 @@ ./services/networking/ostinato.nix ./services/networking/pdnsd.nix ./services/networking/polipo.nix + ./services/networking/powerdns.nix ./services/networking/pptpd.nix ./services/networking/prayer.nix ./services/networking/privoxy.nix @@ -426,6 +441,7 @@ ./services/networking/wakeonlan.nix ./services/networking/websockify.nix ./services/networking/wicd.nix + ./services/networking/wireguard.nix ./services/networking/wpa_supplicant.nix ./services/networking/xinetd.nix ./services/networking/xl2tpd.nix @@ -462,14 +478,20 @@ ./services/system/uptimed.nix ./services/torrent/deluge.nix ./services/torrent/flexget.nix + ./services/torrent/opentracker.nix ./services/torrent/peerflix.nix ./services/torrent/transmission.nix ./services/ttys/agetty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix + ./services/web-apps/atlassian/confluence.nix + ./services/web-apps/atlassian/crowd.nix + ./services/web-apps/atlassian/jira.nix ./services/web-apps/mattermost.nix + ./services/web-apps/nixbot.nix ./services/web-apps/pump.io.nix ./services/web-apps/tt-rss.nix + ./services/web-apps/selfoss.nix ./services/web-servers/apache-httpd/default.nix ./services/web-servers/caddy.nix ./services/web-servers/fcgiwrap.nix @@ -502,6 +524,7 @@ ./services/x11/hardware/synaptics.nix ./services/x11/hardware/wacom.nix ./services/x11/redshift.nix + ./services/x11/urxvtd.nix ./services/x11/window-managers/awesome.nix #./services/x11/window-managers/compiz.nix ./services/x11/window-managers/default.nix @@ -544,6 +567,7 @@ ./system/boot/stage-1.nix ./system/boot/stage-2.nix ./system/boot/systemd.nix + ./system/boot/systemd-nspawn.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix ./system/etc/etc.nix diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix index 20a1f7f1ed8..32bea97823c 100644 --- a/nixos/modules/profiles/base.nix +++ b/nixos/modules/profiles/base.nix @@ -20,7 +20,7 @@ # Some networking tools. pkgs.fuse - pkgs.sshfsFuse + pkgs.sshfs-fuse pkgs.socat pkgs.screen diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index c09bcfb70e2..e23849d350b 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -16,7 +16,7 @@ let # programmable completion. If we do, enable all modules installed in # the system (and user profile). if shopt -q progcomp &>/dev/null; then - . "${pkgs.bashCompletion}/etc/profile.d/bash_completion.sh" + . "${pkgs.bash-completion}/etc/profile.d/bash_completion.sh" nullglobStatus=$(shopt -p nullglob) shopt -s nullglob for p in $NIX_PROFILES; do diff --git a/nixos/modules/programs/java.nix b/nixos/modules/programs/java.nix new file mode 100644 index 00000000000..3292aa369d2 --- /dev/null +++ b/nixos/modules/programs/java.nix @@ -0,0 +1,57 @@ +# This module provides JAVA_HOME, with a different way to install java +# system-wide. + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.java; +in + +{ + + options = { + + programs.java = { + + enable = mkEnableOption "java" // { + description = '' + Install and setup the Java development kit. + + This adds JAVA_HOME to the global environment, by sourcing the + jdk's setup-hook on shell init. It is equivalent to starting a shell + through 'nix-shell -p jdk', or roughly the following system-wide + configuration: + + + environment.variables.JAVA_HOME = ''${pkgs.jdk.home}/lib/openjdk; + environment.systemPackages = [ pkgs.jdk ]; + + + ''; + }; + + package = mkOption { + default = pkgs.jdk; + description = '' + Java package to install. Typical values are pkgs.jdk or pkgs.jre. + ''; + type = types.package; + }; + + }; + + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ cfg.package ]; + + environment.shellInit = '' + test -e ${cfg.package}/nix-support/setup-hook && source ${cfg.package}/nix-support/setup-hook + ''; + + }; + +} diff --git a/nixos/modules/programs/vim.nix b/nixos/modules/programs/vim.nix new file mode 100644 index 00000000000..8476c1accd3 --- /dev/null +++ b/nixos/modules/programs/vim.nix @@ -0,0 +1,24 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.vim; +in { + options.programs.vim = { + defaultEditor = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + When enabled, installs vim and configures vim to be the default editor + using the EDITOR environment variable. + ''; + }; + }; + + config = mkIf cfg.defaultEditor { + environment.systemPackages = [ pkgs.vim ]; + environment.variables = { EDITOR = mkOverride 900 "vim"; }; + }; +} diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 91cd8441692..5b7d9415745 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -84,6 +84,14 @@ in type = types.bool; }; + enableSyntaxHighlighting = mkOption { + default = false; + description = '' + Enable zsh-syntax-highlighting + ''; + type = types.bool; + }; + }; }; @@ -102,9 +110,9 @@ in interactiveShellInit = '' # history defaults - export SAVEHIST=2000 - export HISTSIZE=2000 - export HISTFILE=$HOME/.zsh_history + SAVEHIST=2000 + HISTSIZE=2000 + HISTFILE=$HOME/.zsh_history setopt HIST_IGNORE_DUPS SHARE_HISTORY HIST_FCNTL_LOCK @@ -120,6 +128,10 @@ in ${if cfg.enableCompletion then "autoload -U compinit && compinit" else ""} + ${optionalString (cfg.enableSyntaxHighlighting) + "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + } + HELPDIR="${pkgs.zsh}/share/zsh/$ZSH_VERSION/help" ''; @@ -182,7 +194,8 @@ in environment.etc."zinputrc".source = ./zinputrc; environment.systemPackages = [ pkgs.zsh ] - ++ optional cfg.enableCompletion pkgs.nix-zsh-completions; + ++ optional cfg.enableCompletion pkgs.nix-zsh-completions + ++ optional cfg.enableSyntaxHighlighting pkgs.zsh-syntax-highlighting; environment.pathsToLink = optional cfg.enableCompletion "/share/zsh"; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 412cccc20d5..44e07f4618d 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -15,7 +15,6 @@ with lib; (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ]) (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ]) - (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ]) (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ]) (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ]) @@ -140,6 +139,9 @@ with lib; # fontconfig-ultimate (mkRenamedOptionModule [ "fonts" "fontconfig" "ultimate" "rendering" ] [ "fonts" "fontconfig" "ultimate" "preset" ]) + # murmur + (mkRenamedOptionModule [ "services" "murmur" "welcome" ] [ "services" "murmur" "welcometext" ]) + # Options that are obsolete and have no replacement. (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ] "") (mkRemovedOptionModule [ "programs" "bash" "enable" ] "") @@ -151,7 +153,7 @@ with lib; (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ] "") (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ] "") (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ] - "See the 16.03 release notes for more information.") + "See the 16.09 release notes for more information.") (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "") (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "") ]; diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 45e8f64046b..12736e57b4a 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -129,11 +129,10 @@ in certs = mkOption { default = { }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule certOpts); description = '' Attribute set of certificates to get signed and renewed. ''; - options = [ certOpts ]; example = { "example.com" = { webroot = "/var/www/challenges/"; @@ -283,6 +282,7 @@ in timerConfig = { OnCalendar = cfg.renewInterval; Unit = "acme-${cert}.service"; + Persistent = "yes"; }; }) ); diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix index 849530238e7..67469be18b4 100644 --- a/nixos/modules/security/ca.nix +++ b/nixos/modules/security/ca.nix @@ -4,10 +4,16 @@ with lib; let + cfg = config.security.pki; + + cacertPackage = pkgs.cacert.override { + blacklist = cfg.caCertificateBlacklist; + }; + caCertificates = pkgs.runCommand "ca-certificates.crt" { files = - config.security.pki.certificateFiles ++ - [ (builtins.toFile "extra.crt" (concatStringsSep "\n" config.security.pki.certificates)) ]; + cfg.certificateFiles ++ + [ (builtins.toFile "extra.crt" (concatStringsSep "\n" cfg.certificates)) ]; } '' cat $files > $out @@ -52,11 +58,27 @@ in ''; }; + security.pki.caCertificateBlacklist = mkOption { + type = types.listOf types.str; + default = []; + example = [ + "WoSign" "WoSign China" + "CA WoSign ECC Root" + "Certification Authority of WoSign G2" + ]; + description = '' + A list of blacklisted CA certificate names that won't be imported from + the Mozilla Trust Store into + /etc/ssl/certs/ca-certificates.crt. Use the + names from that file. + ''; + }; + }; config = { - security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ]; + security.pki.certificateFiles = [ "${cacertPackage}/etc/ssl/certs/ca-bundle.crt" ]; # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility. environment.etc."ssl/certs/ca-certificates.crt".source = caCertificates; diff --git a/nixos/modules/security/grsecurity.xml b/nixos/modules/security/grsecurity.xml index 28415e89bfa..37314bdba8a 100644 --- a/nixos/modules/security/grsecurity.xml +++ b/nixos/modules/security/grsecurity.xml @@ -149,6 +149,10 @@ Trusted path execution: a desirable feature, but requires some more work to operate smoothly on NixOS. + + Module hardening: would break user initiated module + loading. Might enable this at some point, depending on the potential + breakage. @@ -208,8 +212,6 @@ let kernel = pkgs.linux_grsec_nixos.override { extraConfig = '' - GRKERNSEC y - PAX y GRKERNSEC_CONFIG_AUTO y GRKERNSEC_CONFIG_SERVER y GRKERNSEC_CONFIG_SECURITY y diff --git a/nixos/modules/security/hidepid.nix b/nixos/modules/security/hidepid.nix index 8f2df380cfe..ee351eb8447 100644 --- a/nixos/modules/security/hidepid.nix +++ b/nixos/modules/security/hidepid.nix @@ -2,19 +2,19 @@ with lib; { - options = { - security.hideProcessInformation = mkEnableOption "" // { description = '' - Restrict access to process information to the owning user. Enabling - this option implies, among other things, that command-line arguments - remain private. This option is recommended for most systems, unless - there's a legitimate reason for allowing unprivileged users to inspect - the process information of other users. + meta = { + maintainers = [ maintainers.joachifm ]; + doc = ./hidepid.xml; + }; - Members of the group "proc" are exempt from process information hiding. - To allow a service to run without process information hiding, add "proc" - to its supplementary groups via - . - ''; }; + options = { + security.hideProcessInformation = mkOption { + type = types.bool; + default = false; + description = '' + Restrict process information to the owning user. + ''; + }; }; config = mkIf config.security.hideProcessInformation { diff --git a/nixos/modules/security/hidepid.xml b/nixos/modules/security/hidepid.xml new file mode 100644 index 00000000000..5715ee7ac16 --- /dev/null +++ b/nixos/modules/security/hidepid.xml @@ -0,0 +1,33 @@ + + + Hiding process information + + + Setting + + security.hideProcessInformation = true; + + ensures that access to process information is restricted to the + owning user. This implies, among other things, that command-line + arguments remain private. Unless your deployment relies on unprivileged + users being able to inspect the process information of other users, this + option should be safe to enable. + + + + Members of the proc group are exempt from process + information hiding. + + + + To allow a service foo to run without process information hiding, set + + systemd.services.foo.serviceConfig.SupplementaryGroups = [ "proc" ]; + + + + diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 814dd21b53d..f9aa4136c8d 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -386,8 +386,7 @@ in security.pam.services = mkOption { default = []; - type = types.loaOf types.optionSet; - options = [ pamOpts ]; + type = with types; loaOf (submodule pamOpts); description = '' This option defines the PAM services. A service typically diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index b14ea7a5f27..3a1ffc55e5f 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -18,7 +18,7 @@ with lib; config = mkIf config.security.rngd.enable { services.udev.extraRules = '' KERNEL=="random", TAG+="systemd" - SUBSYSTEM=="cpu", ENV{MODALIAS}=="x86cpu:*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" + SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''} ''; diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index bced2a6ed75..f5612e1b0c5 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -74,7 +74,7 @@ in Defaults env_keep+=SSH_AUTH_SOCK # "root" is allowed to do anything. - root ALL=(ALL) SETENV: ALL + root ALL=(ALL:ALL) SETENV: ALL # Users in the "wheel" group can do anything. %wheel ALL=(ALL:ALL) ${if cfg.wheelNeedsPassword then "" else "NOPASSWD: ALL, "}SETENV: ALL diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 029b14ab472..c0a0f037429 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -21,13 +21,7 @@ in { services.mopidy = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Whether to enable Mopidy, a music player daemon. - ''; - }; + enable = mkEnableOption "Mopidy, a music player daemon"; dataDir = mkOption { default = "/var/lib/mopidy"; diff --git a/nixos/modules/services/audio/ympd.nix b/nixos/modules/services/audio/ympd.nix index fb8b868ed40..d34c1c9d83c 100644 --- a/nixos/modules/services/audio/ympd.nix +++ b/nixos/modules/services/audio/ympd.nix @@ -12,11 +12,7 @@ in { services.ympd = { - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable ympd, the MPD Web GUI."; - }; + enable = mkEnableOption "ympd, the MPD Web GUI"; webPort = mkOption { type = types.string; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index 8a26aae75fe..ef8e5e55ede 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -198,8 +198,7 @@ in { description = '' This option defines director resources in Bacula File Daemon. ''; - type = types.attrsOf types.optionSet; - options = [ directorOptions ]; + type = with types; attrsOf (submodule directorOptions); }; extraClientConfig = mkOption { @@ -253,8 +252,7 @@ in { description = '' This option defines Director resources in Bacula Storage Daemon. ''; - type = types.attrsOf types.optionSet; - options = [ directorOptions ]; + type = with types; attrsOf (submodule directorOptions); }; device = mkOption { @@ -262,8 +260,7 @@ in { description = '' This option defines Device resources in Bacula Storage Daemon. ''; - type = types.attrsOf types.optionSet; - options = [ deviceOptions ]; + type = with types; attrsOf (submodule deviceOptions); }; extraStorageConfig = mkOption { diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix index ce628a72036..16815bcc860 100644 --- a/nixos/modules/services/backup/rsnapshot.nix +++ b/nixos/modules/services/backup/rsnapshot.nix @@ -7,11 +7,14 @@ let cfgfile = pkgs.writeText "rsnapshot.conf" '' config_version 1.2 cmd_cp ${pkgs.coreutils}/bin/cp + cmd_rm ${pkgs.coreutils}/bin/rm cmd_rsync ${pkgs.rsync}/bin/rsync cmd_ssh ${pkgs.openssh}/bin/ssh cmd_logger ${pkgs.inetutils}/bin/logger cmd_du ${pkgs.coreutils}/bin/du + cmd_rsnapshot_diff ${pkgs.rsnapshot}/bin/rsnapshot-diff lockfile /run/rsnapshot.pid + link_dest 1 ${cfg.extraConfig} ''; diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 42efde36678..4bdd7f95f77 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -421,7 +421,7 @@ in { description = "Kubernetes Api Server"; wantedBy = [ "multi-user.target" ]; requires = ["kubernetes-setup.service"]; - after = [ "network-interfaces.target" "etcd.service" ]; + after = [ "network.target" "etcd.service" "kubernetes-setup.service" ]; serviceConfig = { ExecStart = let authorizationPolicyFile = @@ -468,7 +468,7 @@ in { systemd.services.kube-scheduler = { description = "Kubernetes Scheduler Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; + after = [ "network.target" "kubernetes-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-scheduler \ --address=${cfg.scheduler.address} \ @@ -487,7 +487,7 @@ in { systemd.services.kube-controller-manager = { description = "Kubernetes Controller Manager Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "kubernetes-apiserver.service" ]; + after = [ "network.target" "kubernetes-apiserver.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-controller-manager \ --address=${cfg.controllerManager.address} \ @@ -511,7 +511,7 @@ in { description = "Kubernetes Kubelet Service"; wantedBy = [ "multi-user.target" ]; requires = ["kubernetes-setup.service"]; - after = [ "network-interfaces.target" "etcd.service" "docker.service" ]; + after = [ "network.target" "etcd.service" "docker.service" "kubernetes-setup.service" ]; path = [ pkgs.gitMinimal pkgs.openssh ]; script = '' export PATH="/bin:/sbin:/usr/bin:/usr/sbin:$PATH" @@ -542,7 +542,7 @@ in { systemd.services.kube-proxy = { description = "Kubernetes Proxy Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "etcd.service" ]; + after = [ "network.target" "etcd.service" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/kube-proxy \ --master=${cfg.proxy.master} \ diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix new file mode 100644 index 00000000000..1fe4d28f9f3 --- /dev/null +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -0,0 +1,51 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.gitlab-runner; + configFile = pkgs.writeText "config.toml" cfg.configText; +in +{ + options.services.gitlab-runner = { + enable = mkEnableOption "Gitlab Runner"; + + configText = mkOption { + description = "Verbatim config.toml to use"; + }; + + workDir = mkOption { + default = "/var/lib/gitlab-runner"; + type = types.path; + description = "The working directory used"; + }; + + }; + + config = mkIf cfg.enable { + systemd.services.gitlab-runner = { + description = "Gitlab Runner"; + after = [ "network.target" "docker.service" ]; + requires = [ "docker.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = ''${pkgs.gitlab-runner.bin}/bin/gitlab-runner run \ + --working-directory ${cfg.workDir} \ + --config ${configFile} \ + --service gitlab-runner \ + --user gitlab-runner \ + ''; + }; + }; + + users.extraUsers.gitlab-runner = { + group = "gitlab-runner"; + extraGroups = [ "docker" ]; + uid = config.ids.uids.gitlab-runner; + home = cfg.workDir; + createHome = true; + }; + + users.extraGroups.gitlab-runner.gid = config.ids.gids.gitlab-runner; + }; +} diff --git a/nixos/modules/services/continuous-integration/gocd-agent/default.nix b/nixos/modules/services/continuous-integration/gocd-agent/default.nix index 21f319f7fcf..d60b55e83d1 100644 --- a/nixos/modules/services/continuous-integration/gocd-agent/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-agent/default.nix @@ -98,7 +98,7 @@ in { ]; description = '' Specifies startup command line arguments to pass to Go.CD agent - java process. Example contains debug and gcLog arguments. + java process. ''; }; diff --git a/nixos/modules/services/continuous-integration/gocd-server/default.nix b/nixos/modules/services/continuous-integration/gocd-server/default.nix index 2d198630121..4bb792055d2 100644 --- a/nixos/modules/services/continuous-integration/gocd-server/default.nix +++ b/nixos/modules/services/continuous-integration/gocd-server/default.nix @@ -90,7 +90,7 @@ in { ''; }; - extraOptions = mkOption { + startupOptions = mkOption { default = [ "-Xms${cfg.initialJavaHeapSize}" "-Xmx${cfg.maxJavaHeapMemory}" @@ -103,6 +103,15 @@ in { "-Dcruise.server.port=${toString cfg.port}" "-Dcruise.server.ssl.port=${toString cfg.sslPort}" ]; + + description = '' + Specifies startup command line arguments to pass to Go.CD server + java process. + ''; + }; + + extraOptions = mkOption { + default = [ ]; example = [ "-X debug" "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005" @@ -169,7 +178,8 @@ in { script = '' ${pkgs.git}/bin/git config --global --add http.sslCAinfo /etc/ssl/certs/ca-certificates.crt - ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.extraOptions} \ + ${pkgs.jre}/bin/java -server ${concatStringsSep " " cfg.startupOptions} \ + ${concatStringsSep " " cfg.extraOptions} \ -jar ${pkgs.gocd-server}/go-server/go.jar ''; diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix index c98af617587..b43b448ed7e 100644 --- a/nixos/modules/services/databases/cassandra.nix +++ b/nixos/modules/services/databases/cassandra.nix @@ -377,7 +377,7 @@ in { systemd.services.cassandra = { description = "Cassandra Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment = cassandraEnvironment; restartTriggers = [ cassandraConfFile cassandraLogFile cassandraRackFile ]; serviceConfig = { diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix index e2268bd556e..dd88624f406 100644 --- a/nixos/modules/services/databases/influxdb.nix +++ b/nixos/modules/services/databases/influxdb.nix @@ -66,16 +66,16 @@ let enabled = false; }]; - collectd = { + collectd = [{ enabled = false; typesdb = "${pkgs.collectd}/share/collectd/types.db"; database = "collectd_db"; port = 25826; - }; + }]; - opentsdb = { + opentsdb = [{ enabled = false; - }; + }]; continuous_queries = { enabled = true; @@ -160,7 +160,7 @@ in systemd.services.influxdb = { description = "InfluxDB Server"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; serviceConfig = { ExecStart = ''${cfg.package}/bin/influxd -config "${configFile}"''; User = "${cfg.user}"; @@ -171,6 +171,11 @@ in mkdir -m 0770 -p ${cfg.dataDir} if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi ''; + postStart = mkBefore '' + until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://127.0.0.1${toString configOptions.http.bind-address}'/ping; do + sleep 1; + done + ''; }; users.extraUsers = optional (cfg.user == "influxdb") { diff --git a/nixos/modules/services/databases/monetdb.nix b/nixos/modules/services/databases/monetdb.nix deleted file mode 100644 index 9f09c71e005..00000000000 --- a/nixos/modules/services/databases/monetdb.nix +++ /dev/null @@ -1,88 +0,0 @@ -{ config, lib, pkgs, ... }: -let - cfg = config.services.monetdb; - monetdbUser = "monetdb"; -in -with lib; -{ - - ###### interface - - options = { - - services.monetdb = { - - enable = mkOption { - type = types.bool; - default = false; - description = "Whether to enable MonetDB database server."; - }; - - package = mkOption { - type = types.path; - description = "MonetDB package to use."; - }; - - dbfarmDir = mkOption { - type = types.path; - default = "/var/lib/monetdb"; - description = '' - Specifies location of Monetdb dbfarm (keeps database and auxiliary files). - ''; - }; - - port = mkOption { - default = "50000"; - example = "50000"; - description = "Port to listen on."; - }; - }; - - }; - - - ###### implementation - - config = mkIf cfg.enable { - - users.extraUsers.monetdb = - { name = monetdbUser; - uid = config.ids.uids.monetdb; - description = "monetdb user"; - home = cfg.dbfarmDir; - }; - - users.extraGroups.monetdb.gid = config.ids.gids.monetdb; - - environment.systemPackages = [ cfg.package ]; - - systemd.services.monetdb = - { description = "MonetDB Server"; - - wantedBy = [ "multi-user.target" ]; - - after = [ "network.target" ]; - - path = [ cfg.package ]; - - preStart = - '' - # Initialise the database. - if ! test -e ${cfg.dbfarmDir}/.merovingian_properties; then - mkdir -m 0700 -p ${cfg.dbfarmDir} - chown -R ${monetdbUser} ${cfg.dbfarmDir} - ${cfg.package}/bin/monetdbd create ${cfg.dbfarmDir} - ${cfg.package}/bin/monetdbd set port=${cfg.port} ${cfg.dbfarmDir} - fi - ''; - - serviceConfig.ExecStart = "${cfg.package}/bin/monetdbd start -n ${cfg.dbfarmDir}"; - - serviceConfig.ExecStop = "${cfg.package}/bin/monetdbd stop ${cfg.dbfarmDir}"; - - unitConfig.RequiresMountsFor = "${cfg.dbfarmDir}"; - }; - - }; - -} diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index ef9bc46e4a0..38e46a0c6ef 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -12,13 +12,11 @@ let mongoCnf = pkgs.writeText "mongodb.conf" '' - bind_ip = ${cfg.bind_ip} - ${optionalString cfg.quiet "quiet = true"} - dbpath = ${cfg.dbpath} - syslog = true - fork = true - pidfilepath = ${cfg.pidFile} - ${optionalString (cfg.replSetName != "") "replSet = ${cfg.replSetName}"} + net.bindIp: ${cfg.bind_ip} + ${optionalString cfg.quiet "systemLog.quiet: true"} + systemLog.destination: syslog + storage.dbPath: ${cfg.dbpath} + ${optionalString (cfg.replSetName != "") "replication.replSetName: ${cfg.replSetName}"} ${cfg.extraConfig} ''; @@ -84,9 +82,9 @@ in extraConfig = mkOption { default = ""; example = '' - nojournal = true + storage.journal.enabled: false ''; - description = "MongoDB extra configuration"; + description = "MongoDB extra configuration in YAML format"; }; }; @@ -112,7 +110,7 @@ in after = [ "network.target" ]; serviceConfig = { - ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf}"; + ExecStart = "${mongodb}/bin/mongod --quiet --config ${mongoCnf} --fork --pidfilepath ${cfg.pidFile}"; User = cfg.user; PIDFile = cfg.pidFile; Type = "forking"; diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 0b2f99f8fff..1180531248f 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -43,6 +43,7 @@ in services.mysql = { enable = mkOption { + type = types.bool; default = false; description = " Whether to enable the MySQL server. @@ -51,23 +52,28 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.mysql"; + default = pkgs.mysql; + defaultText = "pkgs.mysql"; + example = literalExample "pkgs.mysql55"; description = " Which MySQL derivation to use. "; }; port = mkOption { - default = "3306"; + type = types.int; + default = 3306; description = "Port of MySQL"; }; user = mkOption { + type = types.str; default = "mysql"; description = "User account under which MySQL runs"; }; dataDir = mkOption { + type = types.path; default = "/var/mysql"; # !!! should be /var/db/mysql description = "Location where MySQL stores its table files"; }; @@ -78,6 +84,7 @@ in }; extraOptions = mkOption { + type = types.lines; default = ""; example = '' key_buffer_size = 6G @@ -115,32 +122,39 @@ in replication = { role = mkOption { + type = types.enum [ "master" "slave" "none" ]; default = "none"; - description = "Role of the MySQL server instance. Can be either: master, slave or none"; + description = "Role of the MySQL server instance."; }; serverId = mkOption { + type = types.int; default = 1; description = "Id of the MySQL server instance. This number must be unique for each instance"; }; masterHost = mkOption { + type = types.str; description = "Hostname of the MySQL master server"; }; slaveHost = mkOption { + type = types.str; description = "Hostname of the MySQL slave server"; }; masterUser = mkOption { + type = types.str; description = "Username of the MySQL replication user"; }; masterPassword = mkOption { + type = types.str; description = "Password of the MySQL replication user"; }; masterPort = mkOption { + type = types.int; default = 3306; description = "Port number on which the MySQL master server runs"; }; @@ -167,6 +181,7 @@ in systemd.services.mysql = { description = "MySQL Server"; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; unitConfig.RequiresMountsFor = "${cfg.dataDir}"; diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix index 41b96068590..146a604adb2 100644 --- a/nixos/modules/services/databases/neo4j.nix +++ b/nixos/modules/services/databases/neo4j.nix @@ -123,7 +123,7 @@ in { systemd.services.neo4j = { description = "Neo4j Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment = { NEO4J_INSTANCE = cfg.dataDir; }; serviceConfig = { ExecStart = "${cfg.package}/bin/neo4j console"; diff --git a/nixos/modules/services/databases/riak.nix b/nixos/modules/services/databases/riak.nix index bee768fa42a..4477904f78c 100644 --- a/nixos/modules/services/databases/riak.nix +++ b/nixos/modules/services/databases/riak.nix @@ -20,7 +20,7 @@ in package = mkOption { type = types.package; - example = literalExample "pkgs.riak2"; + example = literalExample "pkgs.riak"; description = '' Riak package to use. ''; @@ -108,6 +108,7 @@ in pkgs.bash ]; + environment.HOME = "${cfg.dataDir}"; environment.RIAK_DATA_DIR = "${cfg.dataDir}"; environment.RIAK_LOG_DIR = "${cfg.logDir}"; environment.RIAK_ETC_DIR = "/etc/riak"; diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index ee8ef512bc7..bcaa8b8df3d 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -43,9 +43,10 @@ Installing <application>Emacs</application> - Emacs can installed in the normal way for Nix (see ). In addition, a NixOS - service can be enabled. + Emacs can be installed in the normal way for Nix (see + ). + In addition, a NixOS service + can be enabled.
@@ -59,20 +60,20 @@ emacs - emacs24 + emacs25 - The latest stable version of Emacs 24 using the GTK+ 2 widget toolkit. - emacs24-nox + emacs25-nox - Emacs 24 built without any dependency on X11 + Emacs 25 built without any dependency on X11 libraries. @@ -86,15 +87,6 @@ - - emacs25pre - - - A pretest version of what will become the first - version of Emacs 25. - - - @@ -573,6 +565,55 @@ services.emacs.install = true; <RET> nixos-rebuild <RET>.
+ +
+ Editing DocBook 5 XML Documents + + Emacs includes nXML, + a major-mode for validating and editing XML documents. + When editing DocBook 5.0 documents, such as + this one, + nXML needs to be configured with the relevant schema, which is + not included. + + + + To install the DocBook 5.0 schemas, either add + pkgs.docbook5 to + environment.systemPackages (NixOS), or run + nix-env -i pkgs.docbook5 + (Nix). + + + + Then customize the variable rng-schema-locating-files to include ~/.emacs.d/schemas.xml and put the following text into that file: + + nXML Schema Configuration (<filename>~/.emacs.d/schemas.xml</filename>) + + + + + + + +]]> + + + +
diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix index 3ec74458cd2..1923addeb3a 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan4.nix @@ -81,12 +81,11 @@ in { office1 = { model = "MFC-7860DW"; ip = "192.168.1.2"; }; office2 = { model = "MFC-7860DW"; nodename = "BRW0080927AFBCE"; }; }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule netDeviceOpts); description = '' The list of network devices that will be registered against the brscan4 sane backend. ''; - options = [ netDeviceOpts ]; }; }; @@ -113,4 +112,4 @@ in ]; }; -} \ No newline at end of file +} diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 7c4c93d0fcb..14d65978c32 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -32,13 +32,11 @@ let ''; # Perform substitutions in all udev rules files. - udevRules = stdenv.mkDerivation { - name = "udev-rules"; - - preferLocalBuild = true; - allowSubstitutes = false; - - buildCommand = '' + udevRules = pkgs.runCommand "udev-rules" + { preferLocalBuild = true; + allowSubstitutes = false; + } + '' mkdir -p $out shopt -s nullglob set +o pipefail @@ -130,15 +128,12 @@ let ln -s /dev/null $out/80-drivers.rules ''} ''; # */ - }; - hwdbBin = stdenv.mkDerivation { - name = "hwdb.bin"; - - preferLocalBuild = true; - allowSubstitutes = false; - - buildCommand = '' + hwdbBin = pkgs.runCommand "hwdb.bin" + { preferLocalBuild = true; + allowSubstitutes = false; + } + '' mkdir -p etc/udev/hwdb.d for i in ${toString ([udev] ++ cfg.packages)}; do echo "Adding hwdb files for package $i" @@ -151,7 +146,6 @@ let ${udev}/bin/udevadm hwdb --update --root=$(pwd) mv etc/udev/hwdb.bin $out ''; - }; # Udev has a 512-character limit for ENV{PATH}, so create a symlink # tree to work around this. diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 3a85fa60fe7..a8a214b2155 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -62,42 +62,46 @@ let }; ignoreOptions = { - level = levelOption; + options = { + level = levelOption; - regex = mkOption { - default = ""; - type = types.str; - description = '' - Regex specifying which log lines to ignore. - ''; + regex = mkOption { + default = ""; + type = types.str; + description = '' + Regex specifying which log lines to ignore. + ''; + }; }; }; ignoreCronOptions = { - user = mkOption { - default = "root"; - type = types.str; - description = '' - User that runs the cronjob. - ''; - }; + options = { + user = mkOption { + default = "root"; + type = types.str; + description = '' + User that runs the cronjob. + ''; + }; - cmdline = mkOption { - default = ""; - type = types.str; - description = '' - Command line for the cron job. Will be turned into a regex for the logcheck ignore rule. - ''; - }; + cmdline = mkOption { + default = ""; + type = types.str; + description = '' + Command line for the cron job. Will be turned into a regex for the logcheck ignore rule. + ''; + }; - timeArgs = mkOption { - default = null; - type = types.nullOr (types.str); - example = "02 06 * * *"; - description = '' - "min hr dom mon dow" crontab time args, to auto-create a cronjob too. - Leave at null to not do this and just add a logcheck ignore rule. - ''; + timeArgs = mkOption { + default = null; + type = types.nullOr (types.str); + example = "02 06 * * *"; + description = '' + "min hr dom mon dow" crontab time args, to auto-create a cronjob too. + Leave at null to not do this and just add a logcheck ignore rule. + ''; + }; }; }; @@ -180,8 +184,7 @@ in description = '' This option defines extra ignore rules. ''; - type = types.loaOf types.optionSet; - options = [ ignoreOptions ]; + type = with types; loaOf (submodule ignoreOptions); }; ignoreCron = mkOption { @@ -189,8 +192,7 @@ in description = '' This option defines extra ignore rules for cronjobs. ''; - type = types.loaOf types.optionSet; - options = [ ignoreOptions ignoreCronOptions ]; + type = with types; loaOf (submodule ignoreCronOptions); }; extraGroups = mkOption { diff --git a/nixos/modules/services/networking/offlineimap.nix b/nixos/modules/services/mail/offlineimap.nix similarity index 97% rename from nixos/modules/services/networking/offlineimap.nix rename to nixos/modules/services/mail/offlineimap.nix index daf6196d370..85ece020905 100644 --- a/nixos/modules/services/networking/offlineimap.nix +++ b/nixos/modules/services/mail/offlineimap.nix @@ -59,7 +59,7 @@ in { }; path = cfg.path; }; - environment.systemPackages = [ "${cfg.package}" ]; + environment.systemPackages = [ cfg.package ]; systemd.user.timers.offlineimap = { description = "offlineimap timer"; timerConfig = { diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix new file mode 100644 index 00000000000..0db631868cc --- /dev/null +++ b/nixos/modules/services/mail/postgrey.nix @@ -0,0 +1,79 @@ +{ config, lib, pkgs, ... }: + +with lib; let + + cfg = config.services.postgrey; + +in { + + options = { + services.postgrey = with types; { + enable = mkOption { + type = bool; + default = false; + description = "Whether to run the Postgrey daemon"; + }; + inetAddr = mkOption { + type = nullOr string; + default = null; + example = "127.0.0.1"; + description = "The inet address to bind to. If none given, bind to /var/run/postgrey.sock"; + }; + inetPort = mkOption { + type = int; + default = 10030; + description = "The tcp port to bind to"; + }; + greylistText = mkOption { + type = string; + default = "Greylisted for %%s seconds"; + description = "Response status text for greylisted messages"; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.postgrey ]; + + users = { + extraUsers = { + postgrey = { + description = "Postgrey Daemon"; + uid = config.ids.uids.postgrey; + group = "postgrey"; + }; + }; + extraGroups = { + postgrey = { + gid = config.ids.gids.postgrey; + }; + }; + }; + + systemd.services.postgrey = let + bind-flag = if isNull cfg.inetAddr then + "--unix=/var/run/postgrey.sock" + else + "--inet=${cfg.inetAddr}:${cfg.inetPort}"; + in { + description = "Postfix Greylisting Service"; + wantedBy = [ "multi-user.target" ]; + before = [ "postfix.service" ]; + preStart = '' + mkdir -p /var/postgrey + chown postgrey:postgrey /var/postgrey + chmod 0770 /var/postgrey + ''; + serviceConfig = { + Type = "simple"; + ExecStart = ''${pkgs.postgrey}/bin/postgrey ${bind-flag} --pidfile=/var/run/postgrey.pid --group=postgrey --user=postgrey --dbdir=/var/postgrey --greylist-text="${cfg.greylistText}"''; + Restart = "always"; + RestartSec = 5; + TimeoutSec = 10; + }; + }; + + }; + +} diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 88ce8b5a23f..c856d3294c0 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -139,7 +139,7 @@ in { systemd.services.apache-kafka = { description = "Apache Kafka Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; serviceConfig = { ExecStart = '' ${pkgs.jre}/bin/java \ diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 18f0c3eb83d..40b48f70f7e 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -22,7 +22,7 @@ in default = false; description = " Mount filesystems on demand. Unmount them automatically. - You may also be interested in afuese. + You may also be interested in afuse. "; }; diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix old mode 100644 new mode 100755 index 72ec68dee6b..fe13013286b --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix @@ -33,7 +33,7 @@ in { nodes = mkOption { description = "Confd list of nodes to connect to."; - default = [ "http://127.0.0.1:4001" ]; + default = [ "http://127.0.0.1:2379" ]; type = types.listOf types.str; }; diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix new file mode 100644 index 00000000000..96ac2a1cf2c --- /dev/null +++ b/nixos/modules/services/misc/docker-registry.nix @@ -0,0 +1,66 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.dockerRegistry; + +in { + options.services.dockerRegistry = { + enable = mkEnableOption "Docker Registry"; + + listenAddress = mkOption { + description = "Docker registry host or ip to bind to."; + default = "127.0.0.1"; + type = types.str; + }; + + port = mkOption { + description = "Docker registry port to bind to."; + default = 5000; + type = types.int; + }; + + storagePath = mkOption { + type = types.path; + default = "/var/lib/docker-registry"; + description = "Docker registry storage path."; + }; + + extraConfig = mkOption { + description = '' + Docker extra registry configuration via environment variables. + ''; + default = {}; + type = types.attrsOf types.str; + }; + }; + + config = mkIf cfg.enable { + systemd.services.docker-registry = { + description = "Docker Container Registry"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + environment = { + REGISTRY_HTTP_ADDR = "${cfg.listenAddress}:${toString cfg.port}"; + REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY = cfg.storagePath; + } // cfg.extraConfig; + + script = '' + ${pkgs.docker-distribution}/bin/registry serve \ + ${pkgs.docker-distribution.out}/share/go/src/github.com/docker/distribution/cmd/registry/config-example.yml + ''; + + serviceConfig = { + User = "docker-registry"; + WorkingDirectory = cfg.storagePath; + }; + }; + + users.extraUsers.docker-registry = { + createHome = true; + home = cfg.storagePath; + }; + }; +} diff --git a/nixos/modules/services/misc/emby.nix b/nixos/modules/services/misc/emby.nix index fe872349f45..9f290ed70c9 100644 --- a/nixos/modules/services/misc/emby.nix +++ b/nixos/modules/services/misc/emby.nix @@ -43,7 +43,7 @@ in User = cfg.user; Group = cfg.group; PermissionsStartOnly = "true"; - ExecStart = "${pkgs.mono}/bin/mono ${pkgs.emby}/bin/MediaBrowser.Server.Mono.exe"; + ExecStart = "${pkgs.emby}/bin/MediaBrowser.Server.Mono"; Restart = "on-failure"; }; }; diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix new file mode 100644 index 00000000000..f573be69925 --- /dev/null +++ b/nixos/modules/services/misc/errbot.nix @@ -0,0 +1,101 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.errbot; + pluginEnv = plugins: pkgs.buildEnv { + name = "errbot-plugins"; + paths = plugins; + }; + mkConfigFile = instanceCfg: dataDir: pkgs.writeText "errbot-config.py" '' + import logging + BACKEND = '${instanceCfg.backend}' + BOT_DATA_DIR = '${dataDir}' + BOT_EXTRA_PLUGIN_DIR = '${pluginEnv instanceCfg.plugins}' + + BOT_LOG_LEVEL = logging.${instanceCfg.logLevel} + BOT_LOG_FILE = False + + BOT_ADMINS = (${concatMapStringsSep "," (name: "'${name}'") instanceCfg.admins}) + + BOT_IDENTITY = ${builtins.toJSON instanceCfg.identity} + + ${instanceCfg.extraConfig} + ''; +in { + options = { + services.errbot.instances = mkOption { + default = {}; + description = "Errbot instance configs"; + type = types.attrsOf (types.submodule { + options = { + dataDir = mkOption { + type = types.nullOr types.path; + default = null; + description = "Data directory for errbot instance."; + }; + + plugins = mkOption { + type = types.listOf types.package; + default = []; + description = "List of errbot plugin derivations."; + }; + + logLevel = mkOption { + type = types.str; + default = "INFO"; + description = "Errbot log level"; + }; + + admins = mkOption { + type = types.listOf types.str; + default = []; + description = "List of identifiers of errbot admins."; + }; + + backend = mkOption { + type = types.str; + default = "XMPP"; + description = "Errbot backend name."; + }; + + identity = mkOption { + type = types.attrs; + description = "Errbot identity configuration"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "String to be appended to the config verbatim"; + }; + }; + }); + }; + }; + + config = mkIf (cfg.instances != {}) { + users.extraUsers.errbot.group = "errbot"; + users.extraGroups.errbot = {}; + + systemd.services = mapAttrs' (name: instanceCfg: nameValuePair "errbot-${name}" ( + let + dataDir = if !isNull instanceCfg.dataDir then instanceCfg.dataDir else + "/var/lib/errbot/${name}"; + in { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + mkdir -p ${dataDir} + chown -R errbot:errbot ${dataDir} + ''; + serviceConfig = { + User = "errbot"; + Restart = "on-failure"; + ExecStart = "${pkgs.errbot}/bin/errbot -c ${mkConfigFile instanceCfg dataDir}"; + PermissionsStartOnly = true; + }; + })) cfg.instances; + }; +} diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index d30cc5fd7e8..1de02d76ba0 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -143,9 +143,9 @@ in { config = mkIf cfg.enable { systemd.services.etcd = { - description = "Etcd Daemon"; + description = "etcd key-value store"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment = (filterAttrs (n: v: v != null) { ETCD_NAME = cfg.name; @@ -168,12 +168,18 @@ in { ETCD_INITIAL_CLUSTER_TOKEN = cfg.initialClusterToken; }) // (mapAttrs' (n: v: nameValuePair "ETCD_${n}" v) cfg.extraConf); + unitConfig = { + Documentation = "https://github.com/coreos/etcd"; + }; + serviceConfig = { Type = "notify"; ExecStart = "${pkgs.etcd.bin}/bin/etcd"; User = "etcd"; PermissionsStartOnly = true; + LimitNOFILE = 40000; }; + preStart = '' mkdir -m 0700 -p ${cfg.dataDir} if [ "$(id -u)" = 0 ]; then chown etcd ${cfg.dataDir}; fi diff --git a/nixos/modules/services/misc/folding-at-home.nix b/nixos/modules/services/misc/folding-at-home.nix index 4f09cbfdd79..053e7e95635 100644 --- a/nixos/modules/services/misc/folding-at-home.nix +++ b/nixos/modules/services/misc/folding-at-home.nix @@ -50,7 +50,7 @@ in { }; systemd.services.foldingathome = { - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' mkdir -m 0755 -p ${stateDir} diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index b3f09999adb..f8881233dce 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -449,13 +449,15 @@ in { Group = cfg.group; TimeoutSec = "300"; Restart = "on-failure"; + WorkingDirectory = gitlabEnv.HOME; ExecStart = "${cfg.packages.gitlab-workhorse}/bin/gitlab-workhorse " + "-listenUmask 0 " + "-listenNetwork unix " + "-listenAddr /run/gitlab/gitlab-workhorse.socket " + "-authSocket ${gitlabSocket} " - + "-documentRoot ${cfg.packages.gitlab}/share/gitlab/public"; + + "-documentRoot ${cfg.packages.gitlab}/share/gitlab/public " + + "-secretPath ${cfg.packages.gitlab}/share/gitlab/.gitlab_workhorse_secret"; }; }; @@ -525,17 +527,23 @@ in { psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true touch "${cfg.statePath}/db-created" - - # The gitlab:setup task is horribly broken somehow, these two tasks will do the same for setting up the initial database - ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production - ${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \ - GITLAB_ROOT_PASSWORD="${cfg.initialRootPassword}" GITLAB_ROOT_EMAIL="${cfg.initialRootEmail}"; fi fi + # enable required pg_trgm extension for gitlab + psql gitlab -c "CREATE EXTENSION IF NOT EXISTS pg_trgm" # Always do the db migrations just to be sure the database is up-to-date ${gitlab-rake}/bin/gitlab-rake db:migrate RAILS_ENV=production + # The gitlab:setup task is horribly broken somehow, the db:migrate + # task above and the db:seed_fu below will do the same for setting + # up the initial database + if ! test -e "${cfg.statePath}/db-seeded"; then + ${gitlab-rake}/bin/gitlab-rake db:seed_fu RAILS_ENV=production \ + GITLAB_ROOT_PASSWORD="${cfg.initialRootPassword}" GITLAB_ROOT_EMAIL="${cfg.initialRootEmail}" + touch "${cfg.statePath}/db-seeded" + fi + # Change permissions in the last step because some of the # intermediary scripts like to create directories as root. chown -R ${cfg.user}:${cfg.group} ${cfg.statePath} diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index bb8dc640f98..4145f8fa957 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -5,15 +5,16 @@ with lib; let cfg = config.services.matrix-synapse; logConfigFile = pkgs.writeText "log_config.yaml" cfg.logConfig; - mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${if r.compress then "true" else "false"}}''; - mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${if l.tls then "true" else "false"}, x_forwarded: ${if l.x_forwarded then "true" else "false"}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; + mkResource = r: ''{names: ${builtins.toJSON r.names}, compress: ${fromBool r.compress}}''; + mkListener = l: ''{port: ${toString l.port}, bind_address: "${l.bind_address}", type: ${l.type}, tls: ${fromBool l.tls}, x_forwarded: ${fromBool l.x_forwarded}, resources: [${concatStringsSep "," (map mkResource l.resources)}]}''; + fromBool = x: if x then "true" else "false"; configFile = pkgs.writeText "homeserver.yaml" '' tls_certificate_path: "${cfg.tls_certificate_path}" ${optionalString (cfg.tls_private_key_path != null) '' tls_private_key_path: "${cfg.tls_private_key_path}" ''} tls_dh_params_path: "${cfg.tls_dh_params_path}" -no_tls: ${if cfg.no_tls then "true" else "false"} +no_tls: ${fromBool cfg.no_tls} ${optionalString (cfg.bind_port != null) '' bind_port: ${toString cfg.bind_port} ''} @@ -25,7 +26,7 @@ bind_host: "${cfg.bind_host}" ''} server_name: "${cfg.server_name}" pid_file: "/var/run/matrix-synapse.pid" -web_client: ${if cfg.web_client then "true" else "false"} +web_client: ${fromBool cfg.web_client} ${optionalString (cfg.public_baseurl != null) '' public_baseurl: "${cfg.public_baseurl}" ''} @@ -53,14 +54,14 @@ media_store_path: "/var/lib/matrix-synapse/media" uploads_path: "/var/lib/matrix-synapse/uploads" max_upload_size: "${cfg.max_upload_size}" max_image_pixels: "${cfg.max_image_pixels}" -dynamic_thumbnails: ${if cfg.dynamic_thumbnails then "true" else "false"} +dynamic_thumbnails: ${fromBool cfg.dynamic_thumbnails} url_preview_enabled: False recaptcha_private_key: "${cfg.recaptcha_private_key}" recaptcha_public_key: "${cfg.recaptcha_public_key}" -enable_registration_captcha: ${if cfg.enable_registration_captcha then "true" else "false"} +enable_registration_captcha: ${fromBool cfg.enable_registration_captcha} turn_uris: ${builtins.toJSON cfg.turn_uris} turn_shared_secret: "${cfg.turn_shared_secret}" -enable_registration: ${if cfg.enable_registration then "true" else "false"} +enable_registration: ${fromBool cfg.enable_registration} ${optionalString (cfg.registration_shared_secret != null) '' registration_shared_secret: "${cfg.registration_shared_secret}" ''} @@ -68,9 +69,15 @@ recaptcha_siteverify_api: "https://www.google.com/recaptcha/api/siteverify" turn_user_lifetime: "${cfg.turn_user_lifetime}" user_creation_max_duration: ${cfg.user_creation_max_duration} bcrypt_rounds: ${cfg.bcrypt_rounds} -allow_guest_access: {if cfg.allow_guest_access then "true" else "false"} -enable_metrics: ${if cfg.enable_metrics then "true" else "false"} -report_stats: ${if cfg.report_stats then "true" else "false"} +allow_guest_access: ${fromBool cfg.allow_guest_access} +trusted_third_party_id_servers: ${builtins.toJSON cfg.trusted_third_party_id_servers} +room_invite_state_types: ${builtins.toJSON cfg.room_invite_state_types} +${optionalString (cfg.macaroon_secret_key != null) '' + macaroon_secret_key: "${cfg.macaroon_secret_key}" +''} +expire_access_token: ${fromBool cfg.expire_access_token} +enable_metrics: ${fromBool cfg.enable_metrics} +report_stats: ${fromBool cfg.report_stats} signing_key_path: "/var/lib/matrix-synapse/homeserver.signing.key" key_refresh_interval: "${cfg.key_refresh_interval}" perspectives: @@ -469,6 +476,34 @@ in { accessible to anonymous users. ''; }; + trusted_third_party_id_servers = mkOption { + type = types.listOf types.str; + default = ["matrix.org"]; + description = '' + The list of identity servers trusted to verify third party identifiers by this server. + ''; + }; + room_invite_state_types = mkOption { + type = types.listOf types.str; + default = ["m.room.join_rules" "m.room.canonical_alias" "m.room.avatar" "m.room.name"]; + description = '' + A list of event types that will be included in the room_invite_state + ''; + }; + macaroon_secret_key = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Secret key for authentication tokens + ''; + }; + expire_access_token = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable access token expiration. + ''; + }; key_refresh_interval = mkOption { type = types.str; default = "1d"; diff --git a/nixos/modules/services/misc/mesos-master.nix b/nixos/modules/services/misc/mesos-master.nix index 497646b2b41..99583ebeebd 100644 --- a/nixos/modules/services/misc/mesos-master.nix +++ b/nixos/modules/services/misc/mesos-master.nix @@ -80,7 +80,7 @@ in { systemd.services.mesos-master = { description = "Mesos Master"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; serviceConfig = { ExecStart = '' ${pkgs.mesos}/bin/mesos-master \ diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index 8c29734813a..9ddecb6fe30 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -105,7 +105,7 @@ in { systemd.services.mesos-slave = { description = "Mesos Slave"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment.MESOS_CONTAINERIZERS = concatStringsSep "," containerizers; serviceConfig = { ExecStart = '' diff --git a/nixos/modules/services/misc/nix-optimise.nix b/nixos/modules/services/misc/nix-optimise.nix new file mode 100644 index 00000000000..87ce05c5a11 --- /dev/null +++ b/nixos/modules/services/misc/nix-optimise.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.nix.optimise; +in + +{ + + ###### interface + + options = { + + nix.optimise = { + + automatic = mkOption { + default = false; + type = types.bool; + description = "Automatically run the nix store optimiser at a specific time."; + }; + + dates = mkOption { + default = ["03:45"]; + type = types.listOf types.str; + description = '' + Specification (in the format described by + systemd.time + 5) of the time at + which the optimiser will run. + ''; + }; + }; + }; + + + ###### implementation + + config = { + + systemd.services.nix-optimise = + { description = "Nix Store Optimiser"; + serviceConfig.ExecStart = "${config.nix.package}/bin/nix-store --optimise"; + startAt = optional cfg.automatic cfg.dates; + }; + + }; + +} diff --git a/nixos/modules/services/misc/rippled.nix b/nixos/modules/services/misc/rippled.nix index c6b67e8498c..8bcf35a8ad3 100644 --- a/nixos/modules/services/misc/rippled.nix +++ b/nixos/modules/services/misc/rippled.nix @@ -154,43 +154,45 @@ let }; dbOptions = { - type = mkOption { - description = "Rippled database type."; - type = types.enum ["rocksdb" "nudb"]; - default = "rocksdb"; - }; + options = { + type = mkOption { + description = "Rippled database type."; + type = types.enum ["rocksdb" "nudb"]; + default = "rocksdb"; + }; - path = mkOption { - description = "Location to store the database."; - type = types.path; - default = cfg.databasePath; - }; + path = mkOption { + description = "Location to store the database."; + type = types.path; + default = cfg.databasePath; + }; - compression = mkOption { - description = "Whether to enable snappy compression."; - type = types.nullOr types.bool; - default = null; - }; + compression = mkOption { + description = "Whether to enable snappy compression."; + type = types.nullOr types.bool; + default = null; + }; - onlineDelete = mkOption { - description = "Enable automatic purging of older ledger information."; - type = types.addCheck (types.nullOr types.int) (v: v > 256); - default = cfg.ledgerHistory; - }; + onlineDelete = mkOption { + description = "Enable automatic purging of older ledger information."; + type = types.addCheck (types.nullOr types.int) (v: v > 256); + default = cfg.ledgerHistory; + }; - advisoryDelete = mkOption { - description = '' - If set, then require administrative RPC call "can_delete" - to enable online deletion of ledger records. - ''; - type = types.nullOr types.bool; - default = null; - }; + advisoryDelete = mkOption { + description = '' + If set, then require administrative RPC call "can_delete" + to enable online deletion of ledger records. + ''; + type = types.nullOr types.bool; + default = null; + }; - extraOpts = mkOption { - description = "Extra database options."; - type = types.lines; - default = ""; + extraOpts = mkOption { + description = "Extra database options."; + type = types.lines; + default = ""; + }; }; }; @@ -213,8 +215,7 @@ in ports = mkOption { description = "Ports exposed by rippled"; - type = types.attrsOf types.optionSet; - options = [portOptions]; + type = with types; attrsOf (submodule portOptions); default = { rpc = { port = 5005; @@ -238,8 +239,7 @@ in nodeDb = mkOption { description = "Rippled main database options."; - type = types.nullOr types.optionSet; - options = dbOptions; + type = with types; nullOr (submodule dbOptions); default = { type = "rocksdb"; extraOpts = '' @@ -254,15 +254,13 @@ in tempDb = mkOption { description = "Rippled temporary database options."; - type = types.nullOr types.optionSet; - options = dbOptions; + type = with types; nullOr (submodule dbOptions); default = null; }; importDb = mkOption { description = "Settings for performing a one-time import."; - type = types.nullOr types.optionSet; - options = dbOptions; + type = with types; nullOr (submodule dbOptions); default = null; }; diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index c74befac749..04a6cd7bfa9 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -35,7 +35,7 @@ in config = mkIf cfg.enable { systemd.services.svnserve = { - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = "mkdir -p ${cfg.svnBaseDir}"; script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid"; diff --git a/nixos/modules/services/misc/taskserver/default.nix b/nixos/modules/services/misc/taskserver/default.nix index 6d458feec34..233c47684b7 100644 --- a/nixos/modules/services/misc/taskserver/default.nix +++ b/nixos/modules/services/misc/taskserver/default.nix @@ -154,7 +154,7 @@ let certtool = "${pkgs.gnutls.bin}/bin/certtool"; - nixos-taskserver = pkgs.buildPythonPackage { + nixos-taskserver = pkgs.pythonPackages.buildPythonPackage { name = "nixos-taskserver"; namePrefix = ""; diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix index 4ce692b6f6a..b7bca8b56b2 100644 --- a/nixos/modules/services/misc/zookeeper.nix +++ b/nixos/modules/services/misc/zookeeper.nix @@ -113,7 +113,7 @@ in { systemd.services.zookeeper = { description = "Zookeeper Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment = { ZOOCFGDIR = configDir; }; serviceConfig = { ExecStart = '' diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index a67df158be4..8ae8b12056c 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -90,6 +90,7 @@ in { ${optionalString cfg.storageDriverSecure "-storage_driver_secure"} ''} ''; + TimeoutStartSec=300; }; }; diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 08fc3f04dbf..1de3320dc42 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -387,7 +387,7 @@ in { systemd.services.carbonCache = let name = "carbon-cache"; in { description = "Graphite Data Storage Backend"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; @@ -410,7 +410,7 @@ in { enable = cfg.carbon.enableAggregator; description = "Carbon Data Aggregator"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; @@ -426,7 +426,7 @@ in { systemd.services.carbonRelay = let name = "carbon-relay"; in { description = "Carbon Data Relay"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment = carbonEnv; serviceConfig = { ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd ${carbonOpts name}"; @@ -448,7 +448,7 @@ in { systemd.services.graphiteWeb = { description = "Graphite Web Interface"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; path = [ pkgs.perl ]; environment = { PYTHONPATH = let @@ -501,7 +501,7 @@ in { systemd.services.graphiteApi = { description = "Graphite Api Interface"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment = { PYTHONPATH = let aenv = pkgs.python.buildEnv.override { @@ -538,7 +538,7 @@ in { systemd.services.seyren = { description = "Graphite Alerting Dashboard"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "mongodb.service" ]; + after = [ "network.target" "mongodb.service" ]; environment = seyrenConfig; serviceConfig = { ExecStart = "${pkgs.seyren}/bin/seyren -httpPort ${toString cfg.seyren.port}"; @@ -561,7 +561,7 @@ in { systemd.services.graphitePager = { description = "Graphite Pager Alerting Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "redis.service" ]; + after = [ "network.target" "redis.service" ]; environment = { REDIS_URL = cfg.pager.redisUrl; GRAPHITE_URL = cfg.pager.graphiteUrl; diff --git a/nixos/modules/services/monitoring/monit.nix b/nixos/modules/services/monitoring/monit.nix index 704693969a3..e07ffd2e8b5 100644 --- a/nixos/modules/services/monitoring/monit.nix +++ b/nixos/modules/services/monitoring/monit.nix @@ -36,11 +36,16 @@ in ]; systemd.services.monit = { - description = "Monit system watcher"; - after = [ "network-interfaces.target" ]; + description = "Pro-active monitoring utility for unix systems"; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf"; - serviceConfig.Restart = "always"; + serviceConfig = { + ExecStart = "${pkgs.monit}/bin/monit -I -c /etc/monit.conf"; + ExecStop = "${pkgs.monit}/bin/monit -c /etc/monit.conf quit"; + ExecReload = "${pkgs.monit}/bin/monit -c /etc/monit.conf reload"; + KillMode = "process"; + Restart = "always"; + }; }; }; } diff --git a/nixos/modules/services/monitoring/nagios.nix b/nixos/modules/services/monitoring/nagios.nix index f2f7710de9e..4914c5db97d 100644 --- a/nixos/modules/services/monitoring/nagios.nix +++ b/nixos/modules/services/monitoring/nagios.nix @@ -163,7 +163,7 @@ in description = "Nagios monitoring daemon"; path = [ pkgs.nagios ]; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; serviceConfig = { User = "nagios"; diff --git a/nixos/modules/services/monitoring/prometheus/alertmanager.nix b/nixos/modules/services/monitoring/prometheus/alertmanager.nix new file mode 100644 index 00000000000..a9c0ce4ed6c --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/alertmanager.nix @@ -0,0 +1,116 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.alertmanager; + mkConfigFile = pkgs.writeText "alertmanager.yml" (builtins.toJSON cfg.configuration); +in { + options = { + services.prometheus.alertmanager = { + enable = mkEnableOption "Prometheus Alertmanager"; + + user = mkOption { + type = types.str; + default = "nobody"; + description = '' + User name under which Alertmanager shall be run. + ''; + }; + + group = mkOption { + type = types.str; + default = "nogroup"; + description = '' + Group under which Alertmanager shall be run. + ''; + }; + + configuration = mkOption { + type = types.attrs; + default = {}; + description = '' + Alertmanager configuration as nix attribute set. + ''; + }; + + logFormat = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + If set use a syslog logger or JSON logging. + ''; + }; + + logLevel = mkOption { + type = types.enum ["debug" "info" "warn" "error" "fatal"]; + default = "warn"; + description = '' + Only log messages with the given severity or above. + ''; + }; + + webExternalUrl = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The URL under which Alertmanager is externally reachable (for example, if Alertmanager is served via a reverse proxy). + Used for generating relative and absolute links back to Alertmanager itself. + If the URL has a path portion, it will be used to prefix all HTTP endoints served by Alertmanager. + If omitted, relevant URL components will be derived automatically. + ''; + }; + + listenAddress = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Address to listen on for the web interface and API. + ''; + }; + + port = mkOption { + type = types.int; + default = 9093; + description = '' + Port to listen on for the web interface and API. + ''; + }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Open port in firewall for incoming connections. + ''; + }; + }; + }; + + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = optional cfg.openFirewall cfg.port; + + systemd.services.alertmanager = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + ${pkgs.prometheus-alertmanager.bin}/bin/alertmanager \ + -config.file ${mkConfigFile} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -log.level ${cfg.logLevel} \ + ${optionalString (cfg.webExternalUrl != null) ''-web.external-url ${cfg.webExternalUrl} \''} + ${optionalString (cfg.logFormat != null) "-log.format ${cfg.logFormat}"} + ''; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = "/tmp"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix new file mode 100644 index 00000000000..82b97bd92f8 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -0,0 +1,447 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus; + promUser = "prometheus"; + promGroup = "prometheus"; + + # Get a submodule without any embedded metadata: + _filter = x: filterAttrs (k: v: k != "_module") x; + + # Pretty-print JSON to a file + writePrettyJSON = name: x: + pkgs.runCommand name { } '' + echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out + ''; + + # This becomes the main config file + promConfig = { + global = cfg.globalConfig; + rule_files = cfg.ruleFiles ++ [ + (pkgs.writeText "prometheus.rules" (concatStringsSep "\n" cfg.rules)) + ]; + scrape_configs = cfg.scrapeConfigs; + }; + + cmdlineArgs = cfg.extraFlags ++ [ + "-storage.local.path=${cfg.dataDir}/metrics" + "-config.file=${writePrettyJSON "prometheus.yml" promConfig}" + "-web.listen-address=${cfg.listenAddress}" + "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}" + "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s" + (optionalString (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}") + ]; + + promTypes.globalConfig = types.submodule { + options = { + scrape_interval = mkOption { + type = types.str; + default = "1m"; + description = '' + How frequently to scrape targets by default. + ''; + }; + + scrape_timeout = mkOption { + type = types.str; + default = "10s"; + description = '' + How long until a scrape request times out. + ''; + }; + + evaluation_interval = mkOption { + type = types.str; + default = "1m"; + description = '' + How frequently to evaluate rules by default. + ''; + }; + + labels = mkOption { + type = types.attrsOf types.str; + default = {}; + description = '' + The labels to add to any timeseries that this Prometheus instance + scrapes. + ''; + }; + }; + }; + + promTypes.scrape_config = types.submodule { + options = { + job_name = mkOption { + type = types.str; + description = '' + The job name assigned to scraped metrics by default. + ''; + }; + scrape_interval = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + How frequently to scrape targets from this job. Defaults to the + globally configured default. + ''; + }; + scrape_timeout = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Per-target timeout when scraping this job. Defaults to the + globally configured default. + ''; + }; + metrics_path = mkOption { + type = types.str; + default = "/metrics"; + description = '' + The HTTP resource path on which to fetch metrics from targets. + ''; + }; + scheme = mkOption { + type = types.enum ["http" "https"]; + default = "http"; + description = '' + The URL scheme with which to fetch metrics from targets. + ''; + }; + basic_auth = mkOption { + type = types.nullOr (types.submodule { + options = { + username = mkOption { + type = types.str; + description = '' + HTTP username + ''; + }; + password = mkOption { + type = types.str; + description = '' + HTTP password + ''; + }; + }; + }); + default = null; + description = '' + Optional http login credentials for metrics scraping. + ''; + }; + dns_sd_configs = mkOption { + type = types.listOf promTypes.dns_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of DNS service discovery configurations. + ''; + }; + consul_sd_configs = mkOption { + type = types.listOf promTypes.consul_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of Consul service discovery configurations. + ''; + }; + file_sd_configs = mkOption { + type = types.listOf promTypes.file_sd_config; + default = []; + apply = x: map _filter x; + description = '' + List of file service discovery configurations. + ''; + }; + static_configs = mkOption { + type = types.listOf promTypes.static_config; + default = []; + apply = x: map _filter x; + description = '' + List of labeled target groups for this job. + ''; + }; + relabel_configs = mkOption { + type = types.listOf promTypes.relabel_config; + default = []; + apply = x: map _filter x; + description = '' + List of relabel configurations. + ''; + }; + }; + }; + + promTypes.static_config = types.submodule { + options = { + targets = mkOption { + type = types.listOf types.str; + description = '' + The targets specified by the target group. + ''; + }; + labels = mkOption { + type = types.attrsOf types.str; + description = '' + Labels assigned to all metrics scraped from the targets. + ''; + }; + }; + }; + + promTypes.dns_sd_config = types.submodule { + options = { + names = mkOption { + type = types.listOf types.str; + description = '' + A list of DNS SRV record names to be queried. + ''; + }; + refresh_interval = mkOption { + type = types.str; + default = "30s"; + description = '' + The time after which the provided names are refreshed. + ''; + }; + }; + }; + + promTypes.consul_sd_config = types.submodule { + options = { + server = mkOption { + type = types.str; + description = "Consul server to query."; + }; + token = mkOption { + type = types.nullOr types.str; + description = "Consul token"; + }; + datacenter = mkOption { + type = types.nullOr types.str; + description = "Consul datacenter"; + }; + scheme = mkOption { + type = types.nullOr types.str; + description = "Consul scheme"; + }; + username = mkOption { + type = types.nullOr types.str; + description = "Consul username"; + }; + password = mkOption { + type = types.nullOr types.str; + description = "Consul password"; + }; + + services = mkOption { + type = types.listOf types.str; + description = '' + A list of services for which targets are retrieved. + ''; + }; + tag_separator = mkOption { + type = types.str; + default = ","; + description = '' + The string by which Consul tags are joined into the tag label. + ''; + }; + }; + }; + + promTypes.file_sd_config = types.submodule { + options = { + files = mkOption { + type = types.listOf types.str; + description = '' + Patterns for files from which target groups are extracted. Refer + to the Prometheus documentation for permitted filename patterns + and formats. + + ''; + }; + refresh_interval = mkOption { + type = types.str; + default = "30s"; + description = '' + Refresh interval to re-read the files. + ''; + }; + }; + }; + + promTypes.relabel_config = types.submodule { + options = { + source_labels = mkOption { + type = types.listOf types.str; + description = '' + The source labels select values from existing labels. Their content + is concatenated using the configured separator and matched against + the configured regular expression. + ''; + }; + separator = mkOption { + type = types.str; + default = ";"; + description = '' + Separator placed between concatenated source label values. + ''; + }; + target_label = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Label to which the resulting value is written in a replace action. + It is mandatory for replace actions. + ''; + }; + regex = mkOption { + type = types.str; + default = "(.*)"; + description = '' + Regular expression against which the extracted value is matched. + ''; + }; + replacement = mkOption { + type = types.str; + default = "$1"; + description = '' + Replacement value against which a regex replace is performed if the + regular expression matches. + ''; + }; + action = mkOption { + type = types.enum ["replace" "keep" "drop"]; + default = "replace"; + description = '' + Action to perform based on regex matching. + ''; + }; + }; + }; + +in { + options = { + services.prometheus = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Prometheus monitoring daemon. + ''; + }; + + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0:9090"; + description = '' + Address to listen on for the web interface, API, and telemetry. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/prometheus"; + description = '' + Directory to store Prometheus metrics data. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching Prometheus. + ''; + }; + + globalConfig = mkOption { + type = promTypes.globalConfig; + default = {}; + apply = _filter; + description = '' + Parameters that are valid in all configuration contexts. They + also serve as defaults for other configuration sections + ''; + }; + + rules = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Alerting and/or Recording rules to evaluate at runtime. + ''; + }; + + ruleFiles = mkOption { + type = types.listOf types.path; + default = []; + description = '' + Any additional rules files to include in this configuration. + ''; + }; + + scrapeConfigs = mkOption { + type = types.listOf promTypes.scrape_config; + default = []; + apply = x: map _filter x; + description = '' + A list of scrape configurations. + ''; + }; + + alertmanagerURL = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of Alertmanager URLs to send notifications to. + ''; + }; + + alertmanagerNotificationQueueCapacity = mkOption { + type = types.int; + default = 10000; + description = '' + The capacity of the queue for pending alert manager notifications. + ''; + }; + + alertmanagerTimeout = mkOption { + type = types.int; + default = 10; + description = '' + Alert manager HTTP API timeout (in seconds). + ''; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraGroups.${promGroup}.gid = config.ids.gids.prometheus; + users.extraUsers.${promUser} = { + description = "Prometheus daemon user"; + uid = config.ids.uids.prometheus; + group = promGroup; + home = cfg.dataDir; + createHome = true; + }; + systemd.services.prometheus = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + script = '' + #!/bin/sh + exec ${pkgs.prometheus}/bin/prometheus \ + ${concatStringsSep " \\\n " cmdlineArgs} + ''; + serviceConfig = { + User = promUser; + Restart = "always"; + WorkingDirectory = cfg.dataDir; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/node-exporter.nix b/nixos/modules/services/monitoring/prometheus/node-exporter.nix new file mode 100644 index 00000000000..52dc14effc4 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/node-exporter.nix @@ -0,0 +1,71 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.prometheus.nodeExporter; + cmdlineArgs = cfg.extraFlags ++ [ + "-web.listen-address=${cfg.listenAddress}" + ]; +in { + options = { + services.prometheus.nodeExporter = { + enable = mkEnableOption "prometheus node exporter"; + + port = mkOption { + type = types.int; + default = 9100; + description = '' + Port to listen on. + ''; + }; + + listenAddress = mkOption { + type = types.string; + default = "0.0.0.0"; + description = '' + Address to listen on. + ''; + }; + + enabledCollectors = mkOption { + type = types.listOf types.string; + default = []; + example = ''[ "systemd" ]''; + description = '' + Collectors to enable, additionally to the defaults. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Extra commandline options when launching the node exporter. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.prometheus-node-exporter = { + description = "Prometheus exporter for machine metrics"; + unitConfig.Documentation = "https://github.com/prometheus/node_exporter"; + wantedBy = [ "multi-user.target" ]; + script = '' + exec ${pkgs.prometheus-node-exporter}/bin/node_exporter \ + ${optionalString (cfg.enabledCollectors != []) + ''-collectors.enabled ${concatStringsSep "," cfg.enabledCollectors}''} \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + serviceConfig = { + User = "nobody"; + Restart = "always"; + PrivateTmp = true; + WorkingDirectory = /tmp; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; +} diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 1017005226b..f2834f288f9 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -197,8 +197,7 @@ in devices = mkOption { default = []; example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ]; - type = types.listOf types.optionSet; - options = [ smartdOpts ]; + type = with types; listOf (submodule smartdOpts); description = "List of devices to monitor."; }; diff --git a/nixos/modules/services/monitoring/telegraf.nix b/nixos/modules/services/monitoring/telegraf.nix new file mode 100644 index 00000000000..49dc9d8143e --- /dev/null +++ b/nixos/modules/services/monitoring/telegraf.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.telegraf; + + configFile = pkgs.runCommand "config.toml" { + buildInputs = [ pkgs.remarshal ]; + } '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON cfg.extraConfig)} \ + > $out + ''; +in { + ###### interface + options = { + services.telegraf = { + enable = mkEnableOption "telegraf server"; + + package = mkOption { + default = pkgs.telegraf; + defaultText = "pkgs.telegraf"; + description = "Which telegraf derivation to use"; + type = types.package; + }; + + extraConfig = mkOption { + default = {}; + description = "Extra configuration options for telegraf"; + type = types.attrs; + example = { + outputs = { + influxdb = { + urls = ["http://localhost:8086"]; + database = "telegraf"; + }; + }; + inputs = { + statsd = { + service_address = ":8125"; + delete_timings = true; + }; + }; + }; + }; + }; + }; + + + ###### implementation + config = mkIf config.services.telegraf.enable { + systemd.services.telegraf = { + description = "Telegraf Agent"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + serviceConfig = { + ExecStart=''${cfg.package}/bin/telegraf -config "${configFile}"''; + ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + User = "telegraf"; + Restart = "on-failure"; + }; + }; + + users.extraUsers = [{ + name = "telegraf"; + uid = config.ids.uids.telegraf; + description = "telegraf daemon user"; + }]; + }; +} diff --git a/nixos/modules/services/monitoring/ups.nix b/nixos/modules/services/monitoring/ups.nix index febf0c95f5b..c4c4ed227b3 100644 --- a/nixos/modules/services/monitoring/ups.nix +++ b/nixos/modules/services/monitoring/ups.nix @@ -169,8 +169,7 @@ in monitoring directly. These are usually attached to serial ports, but USB devices are also supported. ''; - type = types.attrsOf types.optionSet; - options = [ upsOptions ]; + type = with types; attrsOf (submodule upsOptions); }; }; diff --git a/nixos/modules/services/network-filesystems/openafs-client/default.nix b/nixos/modules/services/network-filesystems/openafs-client/default.nix index 891f41c8dcd..6f51e287910 100644 --- a/nixos/modules/services/network-filesystems/openafs-client/default.nix +++ b/nixos/modules/services/network-filesystems/openafs-client/default.nix @@ -75,7 +75,7 @@ in systemd.services.afsd = { description = "AFS client"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; preStart = '' mkdir -p -m 0755 /afs diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index a186982ec9c..7de85b59e2a 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -56,6 +56,7 @@ let serviceConfig = { ExecStart = "${samba}/sbin/${appName} ${args}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + Type = "notify"; }; restartTriggers = [ configFile ]; @@ -167,12 +168,12 @@ in type = types.attrsOf (types.attrsOf types.unspecified); example = { public = - { path = "/srv/public"; - "read only" = true; - browseable = "yes"; - "guest ok" = "yes"; - comment = "Public samba share."; - }; + { path = "/srv/public"; + "read only" = true; + browseable = "yes"; + "guest ok" = "yes"; + comment = "Public samba share."; + }; }; }; diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index d4b6c05e943..f1846b96325 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -8,148 +8,150 @@ in options.services.tahoe = { introducers = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule { + options = { + nickname = mkOption { + type = types.str; + description = '' + The nickname of this Tahoe introducer. + ''; + }; + tub.port = mkOption { + default = 3458; + type = types.int; + description = '' + The port on which the introducer will listen. + ''; + }; + tub.location = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The external location that the introducer should listen on. + + If specified, the port should be included. + ''; + }; + package = mkOption { + default = pkgs.tahoelafs; + defaultText = "pkgs.tahoelafs"; + type = types.package; + example = literalExample "pkgs.tahoelafs"; + description = '' + The package to use for the Tahoe LAFS daemon. + ''; + }; + }; + }); description = '' The Tahoe introducers. ''; - options = { - nickname = mkOption { - type = types.str; - description = '' - The nickname of this Tahoe introducer. - ''; - }; - tub.port = mkOption { - default = 3458; - type = types.int; - description = '' - The port on which the introducer will listen. - ''; - }; - tub.location = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The external location that the introducer should listen on. - - If specified, the port should be included. - ''; - }; - package = mkOption { - default = pkgs.tahoelafs; - defaultText = "pkgs.tahoelafs"; - type = types.package; - example = literalExample "pkgs.tahoelafs"; - description = '' - The package to use for the Tahoe LAFS daemon. - ''; - }; - }; }; nodes = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule { + options = { + nickname = mkOption { + type = types.str; + description = '' + The nickname of this Tahoe node. + ''; + }; + tub.port = mkOption { + default = 3457; + type = types.int; + description = '' + The port on which the tub will listen. + + This is the correct setting to tweak if you want Tahoe's storage + system to listen on a different port. + ''; + }; + tub.location = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The external location that the node should listen on. + + This is the setting to tweak if there are multiple interfaces + and you want to alter which interface Tahoe is advertising. + + If specified, the port should be included. + ''; + }; + web.port = mkOption { + default = 3456; + type = types.int; + description = '' + The port on which the Web server will listen. + + This is the correct setting to tweak if you want Tahoe's WUI to + listen on a different port. + ''; + }; + client.introducer = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The furl for a Tahoe introducer node. + + Like all furls, keep this safe and don't share it. + ''; + }; + client.helper = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The furl for a Tahoe helper node. + + Like all furls, keep this safe and don't share it. + ''; + }; + client.shares.needed = mkOption { + default = 3; + type = types.int; + description = '' + The number of shares required to reconstitute a file. + ''; + }; + client.shares.happy = mkOption { + default = 7; + type = types.int; + description = '' + The number of distinct storage nodes required to store + a file. + ''; + }; + client.shares.total = mkOption { + default = 10; + type = types.int; + description = '' + The number of shares required to store a file. + ''; + }; + storage.enable = mkEnableOption "storage service"; + storage.reservedSpace = mkOption { + default = "1G"; + type = types.str; + description = '' + The amount of filesystem space to not use for storage. + ''; + }; + helper.enable = mkEnableOption "helper service"; + package = mkOption { + default = pkgs.tahoelafs; + defaultText = "pkgs.tahoelafs"; + type = types.package; + example = literalExample "pkgs.tahoelafs"; + description = '' + The package to use for the Tahoe LAFS daemon. + ''; + }; + }; + }); description = '' The Tahoe nodes. ''; - options = { - nickname = mkOption { - type = types.str; - description = '' - The nickname of this Tahoe node. - ''; - }; - tub.port = mkOption { - default = 3457; - type = types.int; - description = '' - The port on which the tub will listen. - - This is the correct setting to tweak if you want Tahoe's storage - system to listen on a different port. - ''; - }; - tub.location = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The external location that the node should listen on. - - This is the setting to tweak if there are multiple interfaces - and you want to alter which interface Tahoe is advertising. - - If specified, the port should be included. - ''; - }; - web.port = mkOption { - default = 3456; - type = types.int; - description = '' - The port on which the Web server will listen. - - This is the correct setting to tweak if you want Tahoe's WUI to - listen on a different port. - ''; - }; - client.introducer = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The furl for a Tahoe introducer node. - - Like all furls, keep this safe and don't share it. - ''; - }; - client.helper = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The furl for a Tahoe helper node. - - Like all furls, keep this safe and don't share it. - ''; - }; - client.shares.needed = mkOption { - default = 3; - type = types.int; - description = '' - The number of shares required to reconstitute a file. - ''; - }; - client.shares.happy = mkOption { - default = 7; - type = types.int; - description = '' - The number of distinct storage nodes required to store - a file. - ''; - }; - client.shares.total = mkOption { - default = 10; - type = types.int; - description = '' - The number of shares required to store a file. - ''; - }; - storage.enable = mkEnableOption "storage service"; - storage.reservedSpace = mkOption { - default = "1G"; - type = types.str; - description = '' - The amount of filesystem space to not use for storage. - ''; - }; - helper.enable = mkEnableOption "helper service"; - package = mkOption { - default = pkgs.tahoelafs; - defaultText = "pkgs.tahoelafs"; - type = types.package; - example = literalExample "pkgs.tahoelafs"; - description = '' - The package to use for the Tahoe LAFS daemon. - ''; - }; - }; }; }; config = mkMerge [ diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 2d3ce34a4e3..ecc091d1d03 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -7,10 +7,6 @@ let cfg = config.services.avahi; - # We must escape interfaces due to the systemd interpretation - subsystemDevice = interface: - "sys-subsystem-net-devices-${utils.escapeSystemdPath interface}.device"; - avahiDaemonConf = with cfg; pkgs.writeText "avahi-daemon.conf" '' [server] ${# Users can set `networking.hostName' to the empty string, when getting @@ -180,14 +176,8 @@ in environment.systemPackages = [ pkgs.avahi ]; systemd.services.avahi-daemon = - let - deps = optionals (cfg.interfaces!=null) (map subsystemDevice cfg.interfaces); - in { description = "Avahi daemon"; - wantedBy = [ "ip-up.target" ]; - bindsTo = deps; - after = deps; - before = [ "ip-up.target" ]; + wantedBy = [ "multi-user.target" ]; # Receive restart event after resume partOf = [ "post-resume.target" ]; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index 08afafceff2..41d7128ec31 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -145,8 +145,8 @@ in }; systemd.services.bind = { - description = "BIND name server job"; - after = [ "network-interfaces.target" ]; + description = "BIND Domain Name Server"; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' @@ -155,6 +155,7 @@ in ''; script = "${pkgs.bind.bin}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f"; + unitConfig.Documentation = "man:named(8)"; }; }; } diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 0495b32c6fa..cb00139c5f1 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -208,9 +208,9 @@ in # networking.firewall.allowedUDPPorts = ... systemd.services.cjdns = { - description = "encrypted networking for everybody"; - wantedBy = [ "network.target" ]; - after = [ "networkSetup.service" "network-interfaces.target" ]; + description = "cjdns: routing engine designed for security, scalability, speed and ease of use"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; preStart = if cfg.confFile != "" then "" else '' [ -e /etc/cjdns.keys ] && source /etc/cjdns.keys diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix index 3fecfbb13a0..d0683b87780 100644 --- a/nixos/modules/services/networking/connman.nix +++ b/nixos/modules/services/networking/connman.nix @@ -27,6 +27,14 @@ in { ''; }; + enableVPN = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable ConnMan VPN service. + ''; + }; + extraConfig = mkOption { type = types.lines; default = '' @@ -78,7 +86,7 @@ in { }; }; - systemd.services."connman-vpn" = { + systemd.services."connman-vpn" = mkIf cfg.enableVPN { description = "ConnMan VPN service"; wantedBy = [ "multi-user.target" ]; after = [ "syslog.target" ]; @@ -91,7 +99,7 @@ in { }; }; - systemd.services."net-connman-vpn" = { + systemd.services."net-connman-vpn" = mkIf cfg.enableVPN { description = "D-BUS Service"; serviceConfig = { Name = "net.connman.vpn"; diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix index 005c57dce7c..e74d68cad90 100644 --- a/nixos/modules/services/networking/ddclient.nix +++ b/nixos/modules/services/networking/ddclient.nix @@ -7,7 +7,7 @@ let stateDir = "/var/spool/ddclient"; ddclientUser = "ddclient"; - ddclientFlags = "-foreground -verbose -noquiet -file /etc/ddclient.conf"; + ddclientFlags = "-foreground -verbose -noquiet -file ${config.services.ddclient.configFile}"; ddclientPIDFile = "${stateDir}/ddclient.pid"; in @@ -52,6 +52,17 @@ in ''; }; + configFile = mkOption { + default = "/etc/ddclient.conf"; + type = path; + description = '' + Path to configuration file. + When set to the default '/etc/ddclient.conf' it will be populated with the various other options in this module. When it is changed (for example: '/root/nixos/secrets/ddclient.conf') the file read directly to configure ddclient. This is a source of impurity. + The purpose of this is to avoid placing secrets into the store. + ''; + example = "/root/nixos/secrets/ddclient.conf"; + }; + protocol = mkOption { default = "dyndns2"; type = str; @@ -88,7 +99,7 @@ in default = "web, web=checkip.dyndns.com/, web-skip='Current IP Address: '"; type = str; description = '' - Method to determine the IP address to send to the dymanic DNS provider. + Method to determine the IP address to send to the dynamic DNS provider. ''; }; }; @@ -109,9 +120,11 @@ in }; environment.etc."ddclient.conf" = { + enable = config.services.ddclient.configFile == /etc/ddclient.conf; uid = config.ids.uids.ddclient; mode = "0600"; text = '' + # This file can be used as a template for configFile or is automatically generated by Nix options. daemon=600 cache=${stateDir}/ddclient.cache pid=${ddclientPIDFile} diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 994b857e5e8..87c0aa50a1f 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -10,7 +10,8 @@ let interfaces = attrValues config.networking.interfaces; - enableDHCP = config.networking.useDHCP || any (i: i.useDHCP == true) interfaces; + enableDHCP = config.networking.dhcpcd.enable && + (config.networking.useDHCP || any (i: i.useDHCP == true) interfaces); # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. @@ -85,6 +86,15 @@ in options = { + networking.dhcpcd.enable = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable dhcpcd for device configuration. This is mainly to + explicitly disable dhcpcd (for example when using networkd). + ''; + }; + networking.dhcpcd.persistent = mkOption { type = types.bool; default = false; @@ -147,10 +157,9 @@ in systemd.services.dhcpcd = { description = "DHCP Client"; - wantedBy = [ "network.target" ]; - # Work-around to deal with problems where the kernel would remove & - # re-create Wifi interfaces early during boot. - after = [ "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + wants = [ "network.target" ]; # Stopping dhcpcd during a reconfiguration is undesirable # because it brings down the network interfaces configured by diff --git a/nixos/modules/services/networking/dhcpd.nix b/nixos/modules/services/networking/dhcpd.nix index 900df67b53a..36b4c5d5c1e 100644 --- a/nixos/modules/services/networking/dhcpd.nix +++ b/nixos/modules/services/networking/dhcpd.nix @@ -66,6 +66,14 @@ in "; }; + extraFlags = mkOption { + default = ""; + example = "-6"; + description = " + Additional command line flags to be passed to the dhcpd daemon. + "; + }; + configFile = mkOption { default = null; description = " @@ -138,6 +146,7 @@ in { ExecStart = "@${pkgs.dhcp}/sbin/dhcpd dhcpd" + " -pf /run/dhcpd/dhcpd.pid -cf ${configFile}" + " -lf ${stateDir}/dhcpd.leases -user dhcpd -group nogroup" + + " ${cfg.extraFlags}" + " ${toString cfg.interfaces}"; Restart = "always"; Type = "forking"; diff --git a/nixos/modules/services/networking/firewall.nix b/nixos/modules/services/networking/firewall.nix index 942fcc03f59..1c0ea5034df 100644 --- a/nixos/modules/services/networking/firewall.nix +++ b/nixos/modules/services/networking/firewall.nix @@ -100,13 +100,13 @@ let # Perform a reverse-path test to refuse spoofers # For now, we just drop, as the raw table doesn't have a log-refuse yet - ${optionalString (kernelHasRPFilter && cfg.checkReversePath) '' + ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' # Clean up rpfilter rules ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2> /dev/null || true ip46tables -t raw -F nixos-fw-rpfilter 2> /dev/null || true ip46tables -t raw -N nixos-fw-rpfilter 2> /dev/null || true - ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter -j RETURN + ip46tables -t raw -A nixos-fw-rpfilter -m rpfilter ${optionalString (cfg.checkReversePath == "loose") "--loose"} -j RETURN # Allows this host to act as a DHCPv4 server iptables -t raw -A nixos-fw-rpfilter -s 0.0.0.0 -d 255.255.255.255 -p udp --sport 68 --dport 67 -j RETURN @@ -200,7 +200,7 @@ let # Clean up after added ruleset ip46tables -D INPUT -j nixos-fw 2>/dev/null || true - ${optionalString (kernelHasRPFilter && cfg.checkReversePath) '' + ${optionalString (kernelHasRPFilter && (cfg.checkReversePath != false)) '' ip46tables -t raw -D PREROUTING -j nixos-fw-rpfilter 2>/dev/null || true ''} @@ -373,7 +373,7 @@ in networking.firewall.checkReversePath = mkOption { default = kernelHasRPFilter; - type = types.bool; + type = types.either types.bool (types.enum ["strict" "loose"]); description = '' Performs a reverse path filter test on a packet. @@ -381,7 +381,8 @@ in that the packet arrived on, it is refused. If using asymmetric routing or other complicated routing, - disable this setting and setup your own counter-measures. + set this option to loose mode or disable it and setup your + own counter-measures. (needs kernel 3.3+) ''; @@ -482,7 +483,7 @@ in options nf_conntrack nf_conntrack_helper=0 ''; - assertions = [ { assertion = ! cfg.checkReversePath || kernelHasRPFilter; + assertions = [ { assertion = (cfg.checkReversePath != false) || kernelHasRPFilter; message = "This kernel does not support rpfilter"; } { assertion = cfg.autoLoadConntrackHelpers || kernelCanDisableHelpers; message = "This kernel does not support disabling conntrack helpers"; } diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix new file mode 100644 index 00000000000..28b6c4f657d --- /dev/null +++ b/nixos/modules/services/networking/flannel.nix @@ -0,0 +1,153 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.flannel; + + networkConfig = filterAttrs (n: v: v != null) { + Network = cfg.network; + SubnetLen = cfg.subnetLen; + SubnetMin = cfg.subnetMin; + SubnetMax = cfg.subnetMax; + Backend = cfg.backend; + }; +in { + options.services.flannel = { + enable = mkEnableOption "flannel"; + + package = mkOption { + description = "Package to use for flannel"; + type = types.package; + default = pkgs.flannel.bin; + }; + + publicIp = mkOption { + description = '' + IP accessible by other nodes for inter-host communication. + Defaults to the IP of the interface being used for communication. + ''; + type = types.nullOr types.str; + default = null; + }; + + iface = mkOption { + description = '' + Interface to use (IP or name) for inter-host communication. + Defaults to the interface for the default route on the machine. + ''; + type = types.nullOr types.str; + default = null; + }; + + etcd = { + endpoints = mkOption { + description = "Etcd endpoints"; + type = types.listOf types.str; + default = ["http://127.0.0.1:2379"]; + }; + + prefix = mkOption { + description = "Etcd key prefix"; + type = types.str; + default = "/coreos.com/network"; + }; + + caFile = mkOption { + description = "Etcd certificate authority file"; + type = types.nullOr types.path; + default = null; + }; + + certFile = mkOption { + description = "Etcd cert file"; + type = types.nullOr types.path; + default = null; + }; + + keyFile = mkOption { + description = "Etcd key file"; + type = types.nullOr types.path; + default = null; + }; + }; + + network = mkOption { + description = " IPv4 network in CIDR format to use for the entire flannel network."; + type = types.str; + }; + + subnetLen = mkOption { + description = '' + The size of the subnet allocated to each host. Defaults to 24 (i.e. /24) + unless the Network was configured to be smaller than a /24 in which case + it is one less than the network. + ''; + type = types.int; + default = 24; + }; + + subnetMin = mkOption { + description = '' + The beginning of IP range which the subnet allocation should start with. + Defaults to the first subnet of Network. + ''; + type = types.nullOr types.str; + default = null; + }; + + subnetMax = mkOption { + description = '' + The end of IP range which the subnet allocation should start with. + Defaults to the last subnet of Network. + ''; + type = types.nullOr types.str; + default = null; + }; + + backend = mkOption { + description = "Type of backend to use and specific configurations for that backend."; + type = types.attrs; + default = { + Type = "vxlan"; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.flannel = { + description = "Flannel Service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + environment = { + FLANNELD_PUBLIC_IP = cfg.publicIp; + FLANNELD_ETCD_ENDPOINTS = concatStringsSep "," cfg.etcd.endpoints; + FLANNELD_ETCD_KEYFILE = cfg.etcd.keyFile; + FLANNELD_ETCD_CERTFILE = cfg.etcd.certFile; + FLANNELD_ETCD_CAFILE = cfg.etcd.caFile; + FLANNELD_IFACE = cfg.iface; + ETCDCTL_CERT_FILE = cfg.etcd.certFile; + ETCDCTL_KEY_FILE = cfg.etcd.keyFile; + ETCDCTL_CA_FILE = cfg.etcd.caFile; + ETCDCTL_PEERS = concatStringsSep "," cfg.etcd.endpoints; + }; + preStart = '' + echo "setting network configuration" + until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + do + echo "setting network configuration, retry" + sleep 1 + done + ''; + postStart = '' + while [ ! -f /run/flannel/subnet.env ] + do + sleep 1 + done + ''; + serviceConfig.ExecStart = "${cfg.package}/bin/flannel"; + }; + + services.etcd.enable = mkDefault cfg.etcd.endpoints == ["http://127.0.0.1:2379"]; + }; +} diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 27b64b5bb95..3ef3548e0a0 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -105,7 +105,7 @@ in config = mkIf cfg.enable { systemd.services.gvpe = { description = "GNU Virtual Private Ethernet node"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; preStart = '' diff --git a/nixos/modules/services/networking/htpdate.nix b/nixos/modules/services/networking/htpdate.nix new file mode 100644 index 00000000000..f5d512c7cd5 --- /dev/null +++ b/nixos/modules/services/networking/htpdate.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + inherit (pkgs) htpdate; + + cfg = config.services.htpdate; +in + +{ + + ###### interface + + options = { + + services.htpdate = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable htpdate daemon. + ''; + }; + + extraOptions = mkOption { + type = types.str; + default = ""; + description = '' + Additional command line arguments to pass to htpdate. + ''; + }; + + servers = mkOption { + type = types.listOf types.str; + default = [ "www.google.com" ]; + description = '' + HTTP servers to use for time synchronization. + ''; + }; + + proxy = mkOption { + type = types.str; + default = ""; + example = "127.0.0.1:8118"; + description = '' + HTTP proxy used for requests. + ''; + }; + + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.htpdate = { + description = "htpdate daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + PIDFile = "/var/run/htpdate.pid"; + ExecStart = concatStringsSep " " [ + "${htpdate}/bin/htpdate" + "-D -u nobody" + "-a -s" + "-l" + "${optionalString (cfg.proxy != "") "-P ${cfg.proxy}"}" + "${cfg.extraOptions}" + "${concatStringsSep " " cfg.servers}" + ]; + }; + }; + + }; + +} diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix index 0cbf57314c4..926857a0ff4 100644 --- a/nixos/modules/services/networking/i2pd.nix +++ b/nixos/modules/services/networking/i2pd.nix @@ -187,44 +187,43 @@ in outTunnels = mkOption { default = {}; - type = with types; loaOf optionSet; + type = with types; loaOf (submodule ( + { name, config, ... }: { + options = commonTunOpts name; + config = { + name = mkDefault name; + }; + } + )); description = '' Connect to someone as a client and establish a local accept endpoint ''; - options = [ ({ name, config, ... }: { - options = commonTunOpts name; - config = { - name = mkDefault name; - }; - }) ]; }; inTunnels = mkOption { default = {}; - type = with types; loaOf optionSet; + type = with types; loaOf (submodule ( + { name, config, ... }: { + options = { + inPort = mkOption { + type = types.int; + default = 0; + description = "Service port. Default to the tunnel's listen port."; + }; + accessList = mkOption { + type = with types; listOf str; + default = []; + description = "I2P nodes that are allowed to connect to this service."; + }; + } // commonTunOpts name; + config = { + name = mkDefault name; + }; + } + )); description = '' Serve something on I2P network at port and delegate requests to address inPort. ''; - options = [ ({ name, config, ... }: { - - options = { - inPort = mkOption { - type = types.int; - default = 0; - description = "Service port. Default to the tunnel's listen port."; - }; - accessList = mkOption { - type = with types; listOf str; - default = []; - description = "I2P nodes that are allowed to connect to this service."; - }; - } // commonTunOpts name; - - config = { - name = mkDefault name; - }; - - }) ]; }; }; }; diff --git a/nixos/modules/services/networking/ircd-hybrid/builder.sh b/nixos/modules/services/networking/ircd-hybrid/builder.sh index f2c92878a4d..38312210df2 100644 --- a/nixos/modules/services/networking/ircd-hybrid/builder.sh +++ b/nixos/modules/services/networking/ircd-hybrid/builder.sh @@ -12,7 +12,7 @@ for i in $scripts; do if test "$(echo $i | cut -c1-2)" = "=>"; then subDir=$(echo $i | cut -c3-) else - dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//') + dst=$out/$subDir/$(stripHash $i | sed 's/\.in//') doSub $i $dst chmod +x $dst # !!! fi @@ -23,7 +23,7 @@ for i in $substFiles; do if test "$(echo $i | cut -c1-2)" = "=>"; then subDir=$(echo $i | cut -c3-) else - dst=$out/$subDir/$((stripHash $i; echo $strippedName) | sed 's/\.in//') + dst=$out/$subDir/$(stripHash $i | sed 's/\.in//') doSub $i $dst fi done diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix index 5f3efcd133a..1e7f7437b8a 100644 --- a/nixos/modules/services/networking/kippo.nix +++ b/nixos/modules/services/networking/kippo.nix @@ -54,7 +54,7 @@ rec { }; config = mkIf cfg.enable { environment.systemPackages = with pkgs.pythonPackages; [ - python twisted_11 pycrypto pyasn1 ]; + python pkgs.kippo.twisted pycrypto pyasn1 ]; environment.etc."kippo.cfg".text = '' # Automatically generated by NixOS. @@ -84,7 +84,7 @@ rec { description = "Kippo Web Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted_11}/lib/python2.7/site-packages/:."; + environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.kippo.twisted}/lib/python2.7/site-packages/:."; preStart = '' if [ ! -d ${cfg.varPath}/ ] ; then mkdir -p ${cfg.logPath}/tty @@ -107,7 +107,7 @@ rec { fi ''; - serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted_11}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; + serviceConfig.ExecStart = "${pkgs.kippo.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n"; serviceConfig.PermissionsStartOnly = true; serviceConfig.User = "kippo"; serviceConfig.Group = "kippo"; diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 1cc19a2c9e0..134544cda68 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -15,7 +15,7 @@ let logfile=/var/log/murmur/murmurd.log pidfile=${cfg.pidfile} - welcome="${cfg.welcome}" + welcometext="${cfg.welcometext}" port=${toString cfg.port} ${if cfg.hostName == "" then "" else "host="+cfg.hostName} @@ -84,7 +84,7 @@ in description = "Path to PID file for Murmur daemon."; }; - welcome = mkOption { + welcometext = mkOption { type = types.str; default = ""; description = "Welcome message for connected clients."; diff --git a/nixos/modules/services/networking/nat.nix b/nixos/modules/services/networking/nat.nix index 9d163e60d5e..08ba2fdb164 100644 --- a/nixos/modules/services/networking/nat.nix +++ b/nixos/modules/services/networking/nat.nix @@ -122,23 +122,23 @@ in }; networking.nat.forwardPorts = mkOption { - type = types.listOf types.optionSet; + type = with types; listOf (submodule { + options = { + sourcePort = mkOption { + type = types.int; + example = 8080; + description = "Source port of the external interface"; + }; + + destination = mkOption { + type = types.str; + example = "10.0.0.1:80"; + description = "Forward tcp connection to destination ip:port"; + }; + }; + }); default = []; example = [ { sourcePort = 8080; destination = "10.0.0.1:80"; } ]; - options = { - sourcePort = mkOption { - type = types.int; - example = 8080; - description = "Source port of the external interface"; - }; - - destination = mkOption { - type = types.str; - example = "10.0.0.1:80"; - description = "Forward tcp connection to destination ip:port"; - }; - }; - description = '' List of forwarded ports from the external interface to @@ -171,7 +171,7 @@ in systemd.services = mkIf (!config.networking.firewall.enable) { nat = { description = "Network Address Translation"; wantedBy = [ "network.target" ]; - after = [ "network-interfaces.target" "systemd-modules-load.service" ]; + after = [ "network-pre.target" "systemd-modules-load.service" ]; path = [ pkgs.iptables ]; unitConfig.ConditionCapability = "CAP_NET_ADMIN"; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index aa190c553f8..65ffaece477 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -52,13 +52,6 @@ let }); ''; - ipUpScript = writeScript "01nixos-ip-up" '' - #!/bin/sh - if test "$2" = "up"; then - ${config.systemd.package}/bin/systemctl start network-online.target - fi - ''; - ns = xs: writeText "nameservers" ( concatStrings (map (s: "nameserver ${s}\n") xs) ); @@ -187,9 +180,6 @@ in { boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections. environment.etc = with cfg.basePackages; [ - { source = ipUpScript; - target = "NetworkManager/dispatcher.d/01nixos-ip-up"; - } { source = configFile; target = "NetworkManager/NetworkManager.conf"; } diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index 333a3378c4c..6af1dd73643 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -71,6 +71,7 @@ let # interfaces ${forEach " ip-address: " cfg.interfaces} + ip-freebind: ${yesOrNo cfg.ipFreebind} hide-version: ${yesOrNo cfg.hideVersion} identity: "${cfg.identity}" ip-transparent: ${yesOrNo cfg.ipTransparent} @@ -84,7 +85,7 @@ let reuseport: ${yesOrNo cfg.reuseport} round-robin: ${yesOrNo cfg.roundRobin} server-count: ${toString cfg.serverCount} - ${if cfg.statistics == null then "" else "statistics: ${toString cfg.statistics}"} + ${maybeToString "statistics: " cfg.statistics} tcp-count: ${toString cfg.tcpCount} tcp-query-count: ${toString cfg.tcpQueryCount} tcp-timeout: ${toString cfg.tcpTimeout} @@ -117,7 +118,8 @@ let ''; yesOrNo = b: if b then "yes" else "no"; - maybeString = pre: s: if s == null then "" else ''${pre} "${s}"''; + maybeString = prefix: x: if x == null then "" else ''${prefix} "${s}"''; + maybeToString = prefix: x: if x == null then "" else ''${prefix} ${toString s}''; forEach = pre: l: concatMapStrings (x: pre + x + "\n") l; @@ -146,6 +148,11 @@ let ${forEach " rrl-whitelist: " zone.rrlWhitelist} ${maybeString "zonestats: " zone.zoneStats} + ${maybeToString "max-refresh-time: " zone.maxRefreshSecs} + ${maybeToString "min-refresh-time: " zone.minRefreshSecs} + ${maybeToString "max-retry-time: " zone.maxRetrySecs} + ${maybeToString "min-retry-time: " zone.minRetrySecs} + allow-axfr-fallback: ${yesOrNo zone.allowAXFRFallback} ${forEach " allow-notify: " zone.allowNotify} ${forEach " request-xfr: " zone.requestXFR} @@ -241,6 +248,44 @@ let ''; }; + maxRefreshSecs = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Limit refresh time for secondary zones. This is the timer which + checks to see if the zone has to be refetched when it expires. + Normally the value from the SOA record is used, but this option + restricts that value. + ''; + }; + + minRefreshSecs = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Limit refresh time for secondary zones. + ''; + }; + + maxRetrySecs = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Limit retry time for secondary zones. This is the timeout after + a failed fetch attempt for the zone. Normally the value from + the SOA record is used, but this option restricts that value. + ''; + }; + + minRetrySecs = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Limit retry time for secondary zones. + ''; + }; + + notify = mkOption { type = types.listOf types.str; default = []; @@ -366,6 +411,15 @@ in ''; }; + ipFreebind = mkOption { + type = types.bool; + default = false; + description = '' + Whether to bind to nonlocal addresses and interfaces that are down. + Similar to ip-transparent. + ''; + }; + ipTransparent = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix index 651bb8e967c..ba7acd87954 100644 --- a/nixos/modules/services/networking/oidentd.nix +++ b/nixos/modules/services/networking/oidentd.nix @@ -25,7 +25,7 @@ with lib; config = mkIf config.services.oidentd.enable { systemd.services.oidentd = { - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.Type = "forking"; script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup" + diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix index 82173a841a3..3fbf5a9f022 100644 --- a/nixos/modules/services/networking/openvpn.nix +++ b/nixos/modules/services/networking/openvpn.nix @@ -56,7 +56,7 @@ let description = "OpenVPN instance ‘${name}’"; wantedBy = optional cfg.autoStart "multi-user.target"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; path = [ pkgs.iptables pkgs.iproute pkgs.nettools ]; @@ -116,52 +116,54 @@ in attribute name. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + config = mkOption { + type = types.lines; + description = '' + Configuration of this OpenVPN instance. See + openvpn8 + for details. + ''; + }; + + up = mkOption { + default = ""; + type = types.lines; + description = '' + Shell commands executed when the instance is starting. + ''; + }; + + down = mkOption { + default = ""; + type = types.lines; + description = '' + Shell commands executed when the instance is shutting down. + ''; + }; + + autoStart = mkOption { + default = true; + type = types.bool; + description = "Whether this OpenVPN instance should be started automatically."; + }; + + updateResolvConf = mkOption { + default = false; + type = types.bool; + description = '' + Use the script from the update-resolv-conf package to automatically + update resolv.conf with the DNS information provided by openvpn. The + script will be run after the "up" commands and before the "down" commands. + ''; + }; - config = mkOption { - type = types.lines; - description = '' - Configuration of this OpenVPN instance. See - openvpn8 - for details. - ''; }; - up = mkOption { - default = ""; - type = types.lines; - description = '' - Shell commands executed when the instance is starting. - ''; - }; - - down = mkOption { - default = ""; - type = types.lines; - description = '' - Shell commands executed when the instance is shutting down. - ''; - }; - - autoStart = mkOption { - default = true; - type = types.bool; - description = "Whether this OpenVPN instance should be started automatically."; - }; - - updateResolvConf = mkOption { - default = false; - type = types.bool; - description = '' - Use the script from the update-resolv-conf package to automatically - update resolv.conf with the DNS information provided by openvpn. The - script will be run after the "up" commands and before the "down" commands. - ''; - }; - - }; + }); }; diff --git a/nixos/modules/services/networking/powerdns.nix b/nixos/modules/services/networking/powerdns.nix new file mode 100644 index 00000000000..ba05e15389f --- /dev/null +++ b/nixos/modules/services/networking/powerdns.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.powerdns; + configDir = pkgs.writeTextDir "pdns.conf" "${cfg.extraConfig}"; +in { + options = { + services.powerdns = { + enable = mkEnableOption "Powerdns domain name server"; + + extraConfig = mkOption { + type = types.lines; + default = "launch=bind"; + description = '' + Extra lines to be added verbatim to pdns.conf. + Powerdns will chroot to /var/lib/powerdns. + So any file, powerdns is supposed to be read, + should be in /var/lib/powerdns and needs to specified + relative to the chroot. + ''; + }; + }; + }; + + config = mkIf config.services.powerdns.enable { + systemd.services.pdns = { + unitConfig.Documentation = "man:pdns_server(1) man:pdns_control(1)"; + description = "Powerdns name server"; + wantedBy = [ "multi-user.target" ]; + after = ["network.target" "mysql.service" "postgresql.service" "openldap.service"]; + + serviceConfig = { + Restart="on-failure"; + RestartSec="1"; + StartLimitInterval="0"; + PrivateDevices=true; + CapabilityBoundingSet="CAP_CHOWN CAP_NET_BIND_SERVICE CAP_SETGID CAP_SETUID CAP_SYS_CHROOT"; + NoNewPrivileges=true; + ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /var/lib/powerdns"; + ExecStart = "${pkgs.powerdns}/bin/pdns_server --setuid=nobody --setgid=nogroup --chroot=/var/lib/powerdns --socket-dir=/ --daemon=no --guardian=no --disable-syslog --write-pid=no --config-dir=${configDir}"; + ProtectSystem="full"; + ProtectHome=true; + RestrictAddressFamilies="AF_UNIX AF_INET AF_INET6"; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index f82f8bfddbb..247c4f1efb0 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -164,7 +164,7 @@ in description = "Define the virtual hosts"; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule vHostOpts); example = { myhost = { @@ -180,7 +180,6 @@ in }; }; - options = [ vHostOpts ]; }; ssl = mkOption { diff --git a/nixos/modules/services/networking/radicale.nix b/nixos/modules/services/networking/radicale.nix index d5e2e3041b4..f9300fdabc5 100644 --- a/nixos/modules/services/networking/radicale.nix +++ b/nixos/modules/services/networking/radicale.nix @@ -33,7 +33,7 @@ in }; config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.pythonPackages.radicale ]; + environment.systemPackages = [ pkgs.radicale ]; users.extraUsers = singleton { name = "radicale"; @@ -50,9 +50,9 @@ in systemd.services.radicale = { description = "A Simple Calendar and Contact Server"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - script = "${pkgs.pythonPackages.radicale}/bin/radicale -C ${confFile} -f"; + script = "${pkgs.radicale}/bin/radicale -C ${confFile} -f"; serviceConfig.User = "radicale"; serviceConfig.Group = "radicale"; }; diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix index f7a5926dc64..cc373ae892a 100644 --- a/nixos/modules/services/networking/smokeping.nix +++ b/nixos/modules/services/networking/smokeping.nix @@ -6,31 +6,39 @@ let cfg = config.services.smokeping; smokepingHome = "/var/lib/smokeping"; smokepingPidDir = "/run"; - configFile = '' - *** General *** - owner = ${cfg.owner} - contact = ${cfg.ownerEmail} - mailhost = ${cfg.mailHost} - #sendmail = /var/setuid-wrappers/sendmail - imgcache = ${smokepingHome}/cache - imgurl = http://${cfg.hostName}:${builtins.toString cfg.port}/cache - datadir = ${smokepingHome}/data - piddir = ${smokepingPidDir} - cgiurl = http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi - smokemail = ${cfg.smokeMailTemplate} - *** Presentation *** - template = ${cfg.presentationTemplate} - ${cfg.presentationConfig} - #*** Alerts *** - #${cfg.alertConfig} - *** Database *** - ${cfg.databaseConfig} - *** Probes *** - ${cfg.probeConfig} - *** Targets *** - ${cfg.targetConfig} - ${cfg.extraConfig} - ''; + configFile = + if cfg.config == null + then + '' + *** General *** + owner = ${cfg.owner} + contact = ${cfg.ownerEmail} + ${lib.optionalString (cfg.mailHost != "") "mailhost = ${cfg.mailHost}"} + ${lib.optionalString (cfg.sendmail != null) "sendmail = ${cfg.sendmail}"} + imgcache = ${smokepingHome}/cache + imgurl = http://${cfg.hostName}:${builtins.toString cfg.port}/cache + datadir = ${smokepingHome}/data + pagedir = ${smokepingHome}/cache + piddir = ${smokepingPidDir} + cgiurl = http://${cfg.hostName}:${builtins.toString cfg.port}/smokeping.cgi + linkstyle = ${cfg.linkStyle} + smokemail = ${cfg.smokeMailTemplate} + *** Presentation *** + template = ${cfg.presentationTemplate} + ${cfg.presentationConfig} + *** Alerts *** + ${cfg.alertConfig} + *** Database *** + ${cfg.databaseConfig} + *** Probes *** + ${cfg.probeConfig} + *** Targets *** + ${cfg.targetConfig} + ${cfg.extraConfig} + '' + else + cfg.config; + configPath = pkgs.writeText "smokeping.conf" configFile; cgiHome = pkgs.writeScript "smokeping.fcgi" '' #!${pkgs.bash}/bin/bash @@ -59,8 +67,15 @@ in }; mailHost = mkOption { type = types.string; - default = "127.0.0.1"; - description = "Use this SMTP server rather than localhost"; + default = ""; + example = "localhost"; + description = "Use this SMTP server to send alerts"; + }; + sendmail = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/setuid-wrappers/sendmail"; + description = "Use this sendmail compatible script to deliver alerts"; }; smokeMailTemplate = mkOption { type = types.string; @@ -71,6 +86,7 @@ in package = mkOption { type = types.package; default = pkgs.smokeping; + defaultText = "pkgs.smokeping"; description = "Specify a custom smokeping package"; }; owner = mkOption { @@ -85,6 +101,12 @@ in example = "somewhere.example.com"; description = "DNS name for the urls generated in the cgi."; }; + linkStyle = mkOption { + type = types.enum ["original" "absolute" "relative"]; + default = "relative"; + example = "absolute"; + description = "DNS name for the urls generated in the cgi."; + }; port = mkOption { type = types.int; default = 8081; @@ -132,7 +154,10 @@ in }; alertConfig = mkOption { type = types.string; - default = ""; + default = '' + to = root@localhost + from = smokeping@localhost + ''; example = literalExample '' to = alertee@address.somewhere from = smokealert@company.xy @@ -223,12 +248,26 @@ in default = ""; description = "Any additional customization not already included."; }; + config = mkOption { + type = types.nullOr types.string; + default = null; + description = "Full smokeping config supplied by the user. Overrides " + + "and replaces any other configuration supplied."; + }; }; }; config = mkIf cfg.enable { + assertions = [ + { + assertion = !(cfg.sendmail != null && cfg.mailHost != ""); + message = "services.smokeping: sendmail and Mailhost cannot both be enabled."; + } + ]; + security.setuidPrograms = [ "fping" ]; + environment.systemPackages = [ pkgs.fping ]; users.extraUsers = singleton { name = cfg.user; isNormalUser = false; @@ -243,9 +282,12 @@ in serviceConfig.PermissionsStartOnly = true; preStart = '' mkdir -m 0755 -p ${smokepingHome}/cache ${smokepingHome}/data + rm -f ${smokepingHome}/cropper + ln -s ${cfg.package}/htdocs/cropper ${smokepingHome}/cropper chown -R ${cfg.user} ${smokepingHome} cp ${cgiHome} ${smokepingHome}/smokeping.fcgi ${cfg.package}/bin/smokeping --check --config=${configPath} + ${cfg.package}/bin/smokeping --static --config=${configPath} ''; script = ''${cfg.package}/bin/smokeping --config=${configPath} --nodaemon''; }; @@ -253,8 +295,9 @@ in wantedBy = [ "multi-user.target"]; requires = [ "smokeping.service"]; partOf = [ "smokeping.service"]; - path = with pkgs; [ bash rrdtool smokeping ]; - script = ''${pkgs.thttpd}/bin/thttpd -u ${cfg.user} -c "**.fcgi" -d ${smokepingHome} -p ${builtins.toString cfg.port} -D''; + path = with pkgs; [ bash rrdtool smokeping thttpd ]; + script = ''thttpd -u ${cfg.user} -c "**.fcgi" -d ${smokepingHome} -p ${builtins.toString cfg.port} -D -nos''; + serviceConfig.Restart = "always"; }; }; } diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix index 5e49efc3aa3..16530078b97 100644 --- a/nixos/modules/services/networking/softether.nix +++ b/nixos/modules/services/networking/softether.nix @@ -63,7 +63,6 @@ in ]; systemd.services."softether-init" = { description = "SoftEther VPN services initial task"; - wantedBy = [ "network-interfaces.target" ]; serviceConfig = { Type = "oneshot"; RemainAfterExit = false; @@ -84,8 +83,9 @@ in (mkIf (cfg.vpnserver.enable) { systemd.services.vpnserver = { description = "SoftEther VPN Server"; - after = [ "softether-init.service" ]; - wantedBy = [ "network-interfaces.target" ]; + after = [ "softether-init.service" "network.target" ]; + wants = [ "softether-init.service" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; ExecStart = "${pkg}/bin/vpnserver start"; @@ -104,8 +104,9 @@ in (mkIf (cfg.vpnbridge.enable) { systemd.services.vpnbridge = { description = "SoftEther VPN Bridge"; - after = [ "softether-init.service" ]; - wantedBy = [ "network-interfaces.target" ]; + after = [ "softether-init.service" "network.target" ]; + wants = [ "softether-init.service" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; ExecStart = "${pkg}/bin/vpnbridge start"; @@ -124,8 +125,9 @@ in (mkIf (cfg.vpnclient.enable) { systemd.services.vpnclient = { description = "SoftEther VPN Client"; - after = [ "softether-init.service" ]; - wantedBy = [ "network-interfaces.target" ]; + after = [ "softether-init.service" "network.target" ]; + wants = [ "softether-init.service" ]; + wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "forking"; ExecStart = "${pkg}/bin/vpnclient start"; diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index 661a6a52463..eca599afb33 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -120,7 +120,7 @@ in systemd.services.lshd = { description = "GNU lshd SSH2 daemon"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 1d15a141972..3e9fae35847 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -102,8 +102,8 @@ in }; permitRootLogin = mkOption { - default = "without-password"; - type = types.enum ["yes" "without-password" "forced-commands-only" "no"]; + default = "prohibit-password"; + type = types.enum ["yes" "without-password" "prohibit-password" "forced-commands-only" "no"]; description = '' Whether the root user can login using ssh. ''; @@ -129,7 +129,24 @@ in }; listenAddresses = mkOption { - type = types.listOf types.optionSet; + type = with types; listOf (submodule { + options = { + addr = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Host, IPv4 or IPv6 address to listen to. + ''; + }; + port = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Port to listen to. + ''; + }; + }; + }); default = []; example = [ { addr = "192.168.3.1"; port = 22; } { addr = "0.0.0.0"; port = 64022; } ]; description = '' @@ -140,22 +157,6 @@ in NOTE: setting this option won't automatically enable given ports in firewall configuration. ''; - options = { - addr = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Host, IPv4 or IPv6 address to listen to. - ''; - }; - port = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - Port to listen to. - ''; - }; - }; }; passwordAuthentication = mkOption { diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index 16c4ee7e33b..e433ec7c5b9 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -34,7 +34,7 @@ let ''; in { description = "Supplicant ${iface}${optionalString (iface=="WLAN"||iface=="LAN") " %I"}"; - wantedBy = [ "network.target" ]; + wantedBy = [ "network.target" ] ++ deps; bindsTo = deps; after = deps; before = [ "network.target" ]; @@ -75,7 +75,107 @@ in options = { networking.supplicant = mkOption { - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { + options = { + + configFile = { + + path = mkOption { + type = types.path; + example = literalExample "/etc/wpa_supplicant.conf"; + description = '' + External wpa_supplicant.conf configuration file. + The configuration options defined declaratively within networking.supplicant have + precedence over options defined in configFile. + ''; + }; + + writable = mkOption { + type = types.bool; + default = false; + description = '' + Whether the configuration file at configFile.path should be written to by + wpa_supplicant. + ''; + }; + + }; + + extraConf = mkOption { + type = types.lines; + default = ""; + example = '' + ap_scan=1 + device_name=My-NixOS-Device + device_type=1-0050F204-1 + driver_param=use_p2p_group_interface=1 + disable_scan_offload=1 + p2p_listen_reg_class=81 + p2p_listen_channel=1 + p2p_oper_reg_class=81 + p2p_oper_channel=1 + manufacturer=NixOS + model_name=NixOS_Unstable + model_number=2015 + ''; + description = '' + Configuration options for wpa_supplicant.conf. + Options defined here have precedence over options in configFile. + NOTE: Do not write sensitive data into extraConf as it will + be world-readable in the nix-store. For sensitive information + use the configFile instead. + ''; + }; + + extraCmdArgs = mkOption { + type = types.str; + default = ""; + example = "-e/var/run/wpa_supplicant/entropy.bin"; + description = + "Command line arguments to add when executing wpa_supplicant."; + }; + + driver = mkOption { + type = types.nullOr types.str; + default = "nl80211,wext"; + description = "Force a specific wpa_supplicant driver."; + }; + + bridge = mkOption { + type = types.str; + default = ""; + description = "Name of the bridge interface that wpa_supplicant should listen at."; + }; + + userControlled = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli. + This is useful for laptop users that switch networks a lot and don't want + to depend on a large package such as NetworkManager just to pick nearby + access points. + ''; + }; + + socketDir = mkOption { + type = types.str; + default = "/var/run/wpa_supplicant"; + description = "Directory of sockets for controlling wpa_supplicant."; + }; + + group = mkOption { + type = types.str; + default = "wheel"; + example = "network"; + description = "Members of this group can control wpa_supplicant."; + }; + + }; + }; + }); default = { }; @@ -109,107 +209,6 @@ in service that can be accessed through D-Bus. ''; - options = { - - configFile = { - - path = mkOption { - type = types.path; - example = literalExample "/etc/wpa_supplicant.conf"; - description = '' - External wpa_supplicant.conf configuration file. - The configuration options defined declaratively within networking.supplicant have - precedence over options defined in configFile. - ''; - }; - - writable = mkOption { - type = types.bool; - default = false; - description = '' - Whether the configuration file at configFile.path should be written to by - wpa_supplicant. - ''; - }; - - }; - - extraConf = mkOption { - type = types.lines; - default = ""; - example = '' - ap_scan=1 - device_name=My-NixOS-Device - device_type=1-0050F204-1 - driver_param=use_p2p_group_interface=1 - disable_scan_offload=1 - p2p_listen_reg_class=81 - p2p_listen_channel=1 - p2p_oper_reg_class=81 - p2p_oper_channel=1 - manufacturer=NixOS - model_name=NixOS_Unstable - model_number=2015 - ''; - description = '' - Configuration options for wpa_supplicant.conf. - Options defined here have precedence over options in configFile. - NOTE: Do not write sensitive data into extraConf as it will - be world-readable in the nix-store. For sensitive information - use the configFile instead. - ''; - }; - - extraCmdArgs = mkOption { - type = types.str; - default = ""; - example = "-e/var/run/wpa_supplicant/entropy.bin"; - description = - "Command line arguments to add when executing wpa_supplicant."; - }; - - driver = mkOption { - type = types.nullOr types.str; - default = "nl80211,wext"; - description = "Force a specific wpa_supplicant driver."; - }; - - bridge = mkOption { - type = types.str; - default = ""; - description = "Name of the bridge interface that wpa_supplicant should listen at."; - }; - - userControlled = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Allow normal users to control wpa_supplicant through wpa_gui or wpa_cli. - This is useful for laptop users that switch networks a lot and don't want - to depend on a large package such as NetworkManager just to pick nearby - access points. - ''; - }; - - socketDir = mkOption { - type = types.str; - default = "/var/run/wpa_supplicant"; - description = "Directory of sockets for controlling wpa_supplicant."; - }; - - group = mkOption { - type = types.str; - default = "wheel"; - example = "network"; - description = "Members of this group can control wpa_supplicant."; - }; - - }; - - }; - }; }; diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index 267653abce0..2f304165eb4 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -39,7 +39,7 @@ in description = "tcpcrypt"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; path = [ pkgs.iptables pkgs.tcpcrypt pkgs.procps ]; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 8da0f817ae2..b26d30597b1 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -18,94 +18,96 @@ in networks = mkOption { default = { }; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule { + options = { + + extraConfig = mkOption { + default = ""; + type = types.lines; + description = '' + Extra lines to add to the tinc service configuration file. + ''; + }; + + name = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The name of the node which is used as an identifier when communicating + with the remote nodes in the mesh. If null then the hostname of the system + is used. + ''; + }; + + ed25519PrivateKeyFile = mkOption { + default = null; + type = types.nullOr types.path; + description = '' + Path of the private ed25519 keyfile. + ''; + }; + + debugLevel = mkOption { + default = 0; + type = types.addCheck types.int (l: l >= 0 && l <= 5); + description = '' + The amount of debugging information to add to the log. 0 means little + logging while 5 is the most logging. man tincd for + more details. + ''; + }; + + hosts = mkOption { + default = { }; + type = types.loaOf types.lines; + description = '' + The name of the host in the network as well as the configuration for that host. + This name should only contain alphanumerics and underscores. + ''; + }; + + interfaceType = mkOption { + default = "tun"; + type = types.addCheck types.str (n: n == "tun" || n == "tap"); + description = '' + The type of virtual interface used for the network connection + ''; + }; + + listenAddress = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + The ip adress to bind to. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.tinc_pre; + defaultText = "pkgs.tinc_pre"; + description = '' + The package to use for the tinc daemon's binary. + ''; + }; + + chroot = mkOption { + default = true; + type = types.bool; + description = '' + Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security. + The chroot is performed after all the initialization is done, after writing pid files and opening network sockets. + + Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment. + ''; + }; + }; + }); + description = '' Defines the tinc networks which will be started. Each network invokes a different daemon. ''; - options = { - - extraConfig = mkOption { - default = ""; - type = types.lines; - description = '' - Extra lines to add to the tinc service configuration file. - ''; - }; - - name = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The name of the node which is used as an identifier when communicating - with the remote nodes in the mesh. If null then the hostname of the system - is used. - ''; - }; - - ed25519PrivateKeyFile = mkOption { - default = null; - type = types.nullOr types.path; - description = '' - Path of the private ed25519 keyfile. - ''; - }; - - debugLevel = mkOption { - default = 0; - type = types.addCheck types.int (l: l >= 0 && l <= 5); - description = '' - The amount of debugging information to add to the log. 0 means little - logging while 5 is the most logging. man tincd for - more details. - ''; - }; - - hosts = mkOption { - default = { }; - type = types.loaOf types.lines; - description = '' - The name of the host in the network as well as the configuration for that host. - This name should only contain alphanumerics and underscores. - ''; - }; - - interfaceType = mkOption { - default = "tun"; - type = types.addCheck types.str (n: n == "tun" || n == "tap"); - description = '' - The type of virtual interface used for the network connection - ''; - }; - - listenAddress = mkOption { - default = null; - type = types.nullOr types.str; - description = '' - The ip adress to bind to. - ''; - }; - - package = mkOption { - type = types.package; - default = pkgs.tinc_pre; - defaultText = "pkgs.tinc_pre"; - description = '' - The package to use for the tinc daemon's binary. - ''; - }; - - chroot = mkOption { - default = true; - type = types.bool; - description = '' - Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security. - The chroot is performed after all the initialization is done, after writing pid files and opening network sockets. - - Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment. - ''; - }; - }; }; }; @@ -149,8 +151,8 @@ in ("tinc.${network}") ({ description = "Tinc Daemon - ${network}"; - wantedBy = [ "network.target" ]; - after = [ "network-interfaces.target" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; path = [ data.package ]; restartTriggers = [ config.environment.etc."tinc/${network}/tinc.conf".source ] ++ mapAttrsToList (host: _ : config.environment.etc."tinc/${network}/hosts/${host}".source) data.hosts; diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix index c38424c8e27..911836fdee4 100644 --- a/nixos/modules/services/networking/toxvpn.nix +++ b/nixos/modules/services/networking/toxvpn.nix @@ -25,8 +25,8 @@ with lib; systemd.services.toxvpn = { description = "toxvpn daemon"; - requires = [ "network-online.target" ]; # consider replacing by NetworkManager-wait-online.service wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; preStart = '' mkdir -p /run/toxvpn || true diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix index ed0744c44cc..6375ebee320 100644 --- a/nixos/modules/services/networking/unbound.nix +++ b/nixos/modules/services/networking/unbound.nix @@ -12,9 +12,17 @@ let interfaces = concatMapStrings (x: " interface: ${x}\n") cfg.interfaces; - forward = optionalString (length cfg.forwardAddresses != 0) - "forward-zone:\n name: .\n" + - concatMapStrings (x: " forward-addr: ${x}\n") cfg.forwardAddresses; + isLocalAddress = x: substring 0 3 x == "::1" || substring 0 9 x == "127.0.0.1"; + + forward = + optionalString (any isLocalAddress cfg.forwardAddresses) '' + do-not-query-localhost: no + '' + + optionalString (cfg.forwardAddresses != []) '' + forward-zone: + name: . + '' + + concatMapStringsSep "\n" (x: " forward-addr: ${x}") cfg.forwardAddresses; rootTrustAnchorFile = "${stateDir}/root.key"; @@ -72,7 +80,11 @@ in extraConfig = mkOption { default = ""; type = types.str; - description = "Extra lines of unbound config."; + description = '' + Extra unbound config. See + unbound.conf8 + . + ''; }; }; @@ -84,12 +96,9 @@ in environment.systemPackages = [ pkgs.unbound ]; - users.extraUsers = singleton { - name = "unbound"; - uid = config.ids.uids.unbound; + users.users.unbound = { description = "unbound daemon user"; - home = stateDir; - createHome = true; + isSystemUser = true; }; systemd.services.unbound = { @@ -107,12 +116,16 @@ in chown unbound ${stateDir} ${rootTrustAnchorFile} ''} touch ${stateDir}/dev/random - ${pkgs.utillinux}/bin/mount --bind -n /dev/random ${stateDir}/dev/random + ${pkgs.utillinux}/bin/mount --bind -n /dev/urandom ${stateDir}/dev/random ''; serviceConfig = { ExecStart = "${pkgs.unbound}/bin/unbound -d -c ${stateDir}/unbound.conf"; ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random"; + + ProtectSystem = true; + ProtectHome = true; + PrivateDevices = true; }; }; diff --git a/nixos/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix index 9e5a437b485..03c6bd28aab 100644 --- a/nixos/modules/services/networking/wicd.nix +++ b/nixos/modules/services/networking/wicd.nix @@ -26,7 +26,9 @@ with lib; environment.systemPackages = [pkgs.wicd]; systemd.services.wicd = { - after = [ "network-interfaces.target" ]; + after = [ "network-pre.target" ]; + before = [ "network.target" ]; + wants = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; script = "${pkgs.wicd}/sbin/wicd -f"; }; diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix new file mode 100644 index 00000000000..35918e42b40 --- /dev/null +++ b/nixos/modules/services/networking/wireguard.nix @@ -0,0 +1,225 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.networking.wireguard; + + kernel = config.boot.kernelPackages; + + # interface options + + interfaceOpts = { name, ... }: { + + options = { + + ips = mkOption { + example = [ "192.168.2.1/24" ]; + default = []; + type = with types; listOf str; + description = "The IP addresses of the interface."; + }; + + privateKey = mkOption { + example = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk="; + type = types.str; + description = "Base64 private key generated by wg genkey."; + }; + + presharedKey = mkOption { + default = null; + example = "rVXs/Ni9tu3oDBLS4hOyAUAa1qTWVA3loR8eL20os3I="; + type = with types; nullOr str; + description = ''base64 preshared key generated by wg genpsk. Optional, + and may be omitted. This option adds an additional layer of + symmetric-key cryptography to be mixed into the already existing + public-key cryptography, for post-quantum resistance.''; + }; + + listenPort = mkOption { + default = null; + type = with types; nullOr int; + example = 51820; + description = ''16-bit port for listening. Optional; if not specified, + automatically generated based on interface name.''; + }; + + preSetup = mkOption { + example = literalExample ['' + ${pkgs.iproute}/bin/ip netns add foo + '']; + default = []; + type = with types; listOf str; + description = ''A list of commands called at the start of the interface + setup.''; + }; + + postSetup = mkOption { + example = literalExample ['' + ${pkgs.bash} -c 'printf "nameserver 10.200.100.1" | ${pkgs.openresolv}/bin/resolvconf -a wg0 -m 0' + '']; + default = []; + type = with types; listOf str; + description = "A list of commands called at the end of the interface setup."; + }; + + postShutdown = mkOption { + example = literalExample ["${pkgs.openresolv}/bin/resolvconf -d wg0"]; + default = []; + type = with types; listOf str; + description = "A list of commands called after shutting down the interface."; + }; + + peers = mkOption { + default = []; + description = "Peers linked to the interface."; + type = with types; listOf (submodule peerOpts); + }; + + }; + + }; + + # peer options + + peerOpts = { + + options = { + + publicKey = mkOption { + example = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; + type = types.str; + description = "The base64 public key the peer."; + }; + + allowedIPs = mkOption { + example = [ "10.192.122.3/32" "10.192.124.1/24" ]; + type = with types; listOf str; + description = ''List of IP (v4 or v6) addresses with CIDR masks from + which this peer is allowed to send incoming traffic and to which + outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may + be specified for matching all IPv4 addresses, and ::/0 may be specified + for matching all IPv6 addresses.''; + }; + + endpoint = mkOption { + default = null; + example = "demo.wireguard.io:12913"; + type = with types; nullOr str; + description = ''Endpoint IP or hostname of the peer, followed by a colon, + and then a port number of the peer.''; + }; + + persistentKeepalive = mkOption { + default = null; + type = with types; nullOr int; + example = 25; + description = ''This is optional and is by default off, because most + users will not need it. It represents, in seconds, between 1 and 65535 + inclusive, how often to send an authenticated empty packet to the peer, + for the purpose of keeping a stateful firewall or NAT mapping valid + persistently. For example, if the interface very rarely sends traffic, + but it might at anytime receive traffic from a peer, and it is behind + NAT, the interface might benefit from having a persistent keepalive + interval of 25 seconds; however, most users will not need this.''; + }; + + }; + + }; + + generateConf = name: values: pkgs.writeText "wireguard-${name}.conf" '' + [Interface] + PrivateKey = ${values.privateKey} + ${optionalString (values.presharedKey != null) "PresharedKey = ${values.presharedKey}"} + ${optionalString (values.listenPort != null) "ListenPort = ${toString values.listenPort}"} + + ${concatStringsSep "\n\n" (map (peer: '' + [Peer] + PublicKey = ${peer.publicKey} + ${optionalString (peer.allowedIPs != []) "AllowedIPs = ${concatStringsSep ", " peer.allowedIPs}"} + ${optionalString (peer.endpoint != null) "Endpoint = ${peer.endpoint}"} + ${optionalString (peer.persistentKeepalive != null) "PersistentKeepalive = ${toString peer.persistentKeepalive}"} + '') values.peers)} + ''; + + ipCommand = "${pkgs.iproute}/bin/ip"; + wgCommand = "${pkgs.wireguard}/bin/wg"; + + generateUnit = name: values: + nameValuePair "wireguard-${name}" + { + description = "WireGuard Tunnel - ${name}"; + wantedBy = [ "ip-up.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + ExecStart = lib.flatten([ + values.preSetup + + "-${ipCommand} link del dev ${name}" + "${ipCommand} link add dev ${name} type wireguard" + "${wgCommand} setconf ${name} ${generateConf name values}" + + (map (ip: + ''${ipCommand} address add ${ip} dev ${name}'' + ) values.ips) + + "${ipCommand} link set up dev ${name}" + + (flatten (map (peer: (map (ip: + "${ipCommand} route add ${ip} dev ${name}" + ) peer.allowedIPs)) values.peers)) + + values.postSetup + ]); + + ExecStop = [ ''${ipCommand} link del dev "${name}"'' ] ++ values.postShutdown; + }; + }; + +in + +{ + + ###### interface + + options = { + + networking.wireguard = { + + interfaces = mkOption { + description = "Wireguard interfaces."; + default = {}; + example = { + wg0 = { + ips = [ "192.168.20.4/24" ]; + privateKey = "yAnz5TF+lXXJte14tji3zlMNq+hd2rYUIgJBgB3fBmk="; + peers = [ + { allowedIPs = [ "192.168.20.1/32" ]; + publicKey = "xTIBA5rboUvnH4htodjb6e697QjLERt1NAB4mZqp8Dg="; + endpoint = "demo.wireguard.io:12913"; } + ]; + }; + }; + type = with types; attrsOf (submodule interfaceOpts); + }; + + }; + + }; + + + ###### implementation + + config = mkIf (cfg.interfaces != {}) { + + boot.extraModulePackages = [ kernel.wireguard ]; + environment.systemPackages = [ pkgs.wireguard ]; + + systemd.services = mapAttrs' generateUnit cfg.interfaces; + + }; + +} diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index de99ce4f026..a344d785546 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -128,9 +128,9 @@ in { in { description = "WPA Supplicant"; - after = [ "network-interfaces.target" ] ++ lib.concatMap deviceUnit ifaces; + after = [ "network.target" ] ++ lib.concatMap deviceUnit ifaces; requires = lib.concatMap deviceUnit ifaces; - wantedBy = [ "network.target" ]; + wantedBy = [ "network-online.target" ]; path = [ pkgs.wpa_supplicant ]; diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 08680b51780..270122ee659 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -65,71 +65,73 @@ in A list of services provided by xinetd. ''; - type = types.listOf types.optionSet; + type = with types; listOf (submodule ({ - options = { + options = { + + name = mkOption { + type = types.string; + example = "login"; + description = "Name of the service."; + }; + + protocol = mkOption { + type = types.string; + default = "tcp"; + description = + "Protocol of the service. Usually tcp or udp."; + }; + + port = mkOption { + type = types.int; + default = 0; + example = 123; + description = "Port number of the service."; + }; + + user = mkOption { + type = types.string; + default = "nobody"; + description = "User account for the service"; + }; + + server = mkOption { + type = types.string; + example = "/foo/bin/ftpd"; + description = "Path of the program that implements the service."; + }; + + serverArgs = mkOption { + type = types.string; + default = ""; + description = "Command-line arguments for the server program."; + }; + + flags = mkOption { + type = types.string; + default = ""; + description = ""; + }; + + unlisted = mkOption { + type = types.bool; + default = false; + description = '' + Whether this server is listed in + /etc/services. If so, the port + number can be omitted. + ''; + }; + + extraConfig = mkOption { + type = types.string; + default = ""; + description = "Extra configuration-lines added to the section of the service."; + }; - name = mkOption { - type = types.string; - example = "login"; - description = "Name of the service."; }; - protocol = mkOption { - type = types.string; - default = "tcp"; - description = - "Protocol of the service. Usually tcp or udp."; - }; - - port = mkOption { - type = types.int; - default = 0; - example = 123; - description = "Port number of the service."; - }; - - user = mkOption { - type = types.string; - default = "nobody"; - description = "User account for the service"; - }; - - server = mkOption { - type = types.string; - example = "/foo/bin/ftpd"; - description = "Path of the program that implements the service."; - }; - - serverArgs = mkOption { - type = types.string; - default = ""; - description = "Command-line arguments for the server program."; - }; - - flags = mkOption { - type = types.string; - default = ""; - description = ""; - }; - - unlisted = mkOption { - type = types.bool; - default = false; - description = '' - Whether this server is listed in - /etc/services. If so, the port - number can be omitted. - ''; - }; - - extraConfig = mkOption { - type = types.string; - default = ""; - description = "Extra configuration-lines added to the section of the service."; - }; - - }; + })); }; @@ -141,7 +143,7 @@ in config = mkIf cfg.enable { systemd.services.xinetd = { description = "xinetd server"; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; path = [ pkgs.xinetd ]; script = "xinetd -syslog daemon -dontfork -stayalive -f ${configFile}"; diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix index 1c524602f8e..274bbca53fa 100644 --- a/nixos/modules/services/networking/zerobin.nix +++ b/nixos/modules/services/networking/zerobin.nix @@ -86,15 +86,15 @@ in systemd.services.zerobin = { enable = true; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; serviceConfig.ExecStart = "${pkgs.pythonPackages.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}"; serviceConfig.PrivateTmp="yes"; serviceConfig.User = cfg.user; serviceConfig.Group = cfg.group; preStart = '' - mkdir -p ${cfg.dataDir} - chown ${cfg.user} ${cfg.dataDir} + mkdir -p ${cfg.dataDir} + chown ${cfg.user} ${cfg.dataDir} ''; }; }; diff --git a/nixos/modules/services/scheduling/chronos.nix b/nixos/modules/services/scheduling/chronos.nix index db1f0f5f00c..6c39997fec8 100644 --- a/nixos/modules/services/scheduling/chronos.nix +++ b/nixos/modules/services/scheduling/chronos.nix @@ -41,7 +41,7 @@ in { systemd.services.chronos = { description = "Chronos Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "zookeeper.service" ]; + after = [ "network.target" "zookeeper.service" ]; serviceConfig = { ExecStart = "${pkgs.chronos}/bin/chronos --master ${cfg.master} --zk_hosts ${concatStringsSep "," cfg.zookeeperHosts} --http_port ${toString cfg.httpPort}"; diff --git a/nixos/modules/services/scheduling/marathon.nix b/nixos/modules/services/scheduling/marathon.nix index 4e837c62dc1..19c9a708f21 100644 --- a/nixos/modules/services/scheduling/marathon.nix +++ b/nixos/modules/services/scheduling/marathon.nix @@ -83,7 +83,7 @@ in { description = "Marathon Service"; environment = cfg.environment; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ]; + after = [ "network.target" "zookeeper.service" "mesos-master.service" "mesos-slave.service" ]; serviceConfig = { ExecStart = "${pkgs.marathon}/bin/marathon --master ${cfg.master} --zk zk://${concatStringsSep "," cfg.zookeeperHosts}/marathon --http_port ${toString cfg.httpPort} ${concatStringsSep " " cfg.extraCmdLineOptions}"; diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix index 9299aaac2f7..574f74d547a 100644 --- a/nixos/modules/services/search/elasticsearch.nix +++ b/nixos/modules/services/search/elasticsearch.nix @@ -129,7 +129,7 @@ in { systemd.services.elasticsearch = { description = "Elasticsearch Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; path = [ pkgs.inetutils ]; environment = { ES_HOME = cfg.dataDir; diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix index 033b8139d34..d377a6feeb8 100644 --- a/nixos/modules/services/search/kibana.nix +++ b/nixos/modules/services/search/kibana.nix @@ -138,7 +138,7 @@ in { systemd.services.kibana = { description = "Kibana Service"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" "elasticsearch.service" ]; + after = [ "network.target" "elasticsearch.service" ]; environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; }; serviceConfig = { ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}"; diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix index 2aa523bf70a..eca52918881 100644 --- a/nixos/modules/services/security/haveged.nix +++ b/nixos/modules/services/security/haveged.nix @@ -48,14 +48,18 @@ in { description = "Entropy Harvesting Daemon"; unitConfig.Documentation = "man:haveged(8)"; wantedBy = [ "multi-user.target" ]; - + path = [ pkgs.haveged ]; - - serviceConfig = - { Type = "forking"; - ExecStart = "${pkgs.haveged}/sbin/haveged -w ${toString cfg.refill_threshold} -v 1"; - PIDFile = "/run/haveged.pid"; - }; + + serviceConfig = { + ExecStart = "${pkgs.haveged}/bin/haveged -F -w ${toString cfg.refill_threshold} -v 1"; + SuccessExitStatus = 143; + PrivateTmp = true; + PrivateDevices = true; + PrivateNetwork = true; + ProtectSystem = "full"; + ProtectHome = true; + }; }; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 4c20392214f..caa7d9d5081 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -510,7 +510,7 @@ in description = "OAuth2 Proxy"; path = [ cfg.package ]; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; serviceConfig = { User = "oauth2_proxy"; diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 6c4833afbe8..a7cf74c15cc 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -8,7 +8,7 @@ let cfg = config.services.dbus; - homeDir = "/var/run/dbus"; + homeDir = "/run/dbus"; systemExtraxml = concatStrings (flip concatMap cfg.packages (d: [ "${d}/share/dbus-1/system-services" @@ -20,15 +20,23 @@ let "${d}/etc/dbus-1/session.d" ])); - configDir = pkgs.stdenv.mkDerivation { - name = "dbus-conf"; + daemonArgs = "--address=systemd: --nofork --nopidfile --systemd-activation"; - preferLocalBuild = true; - allowSubstitutes = false; - - buildCommand = '' + configDir = pkgs.runCommand "dbus-conf" + { preferLocalBuild = true; + allowSubstitutes = false; + } + '' mkdir -p $out + cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out + + # avoid circular includes + sed -ri 's@(/etc/dbus-1/(system|session)\.conf)@@g' $out/{system,session}.conf + + # include by full path + sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf + sed '${./dbus-system-local.conf.in}' \ -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \ -e 's,@extra@,${systemExtraxml},' \ @@ -38,7 +46,6 @@ let -e 's,@extra@,${sessionExtraxml},' \ > "$out/session-local.conf" ''; - }; in @@ -75,11 +82,16 @@ in ''; }; + socketActivated = mkOption { + type = types.bool; + default = false; + description = '' + Make the user instance socket activated. + ''; + }; }; - }; - ###### implementation config = mkIf cfg.enable { @@ -117,13 +129,29 @@ in config.system.path ]; - # Don't restart dbus-daemon. Bad things tend to happen if we do. - systemd.services.dbus.reloadIfChanged = true; + systemd.services.dbus = { + # Don't restart dbus-daemon. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ configDir ]; + serviceConfig.ExecStart = [ + "" + "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=${configDir}/system.conf ${daemonArgs}" + ]; + }; - systemd.services.dbus.restartTriggers = [ configDir ]; + systemd.user = { + services.dbus = { + # Don't restart dbus-daemon. Bad things tend to happen if we do. + reloadIfChanged = true; + restartTriggers = [ configDir ]; + serviceConfig.ExecStart = [ + "" + "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=${configDir}/session.conf ${daemonArgs}" + ]; + }; + sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ]; + }; environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; - }; - } diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index becd57055d4..a9c08b66eb8 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -5,26 +5,36 @@ with lib; let cfg = config.services.deluge; cfg_web = config.services.deluge.web; + openFilesLimit = 4096; + in { options = { - services.deluge = { - enable = mkOption { - default = false; - example = true; - description = '' - Start Deluge daemon. - ''; - }; - }; + services = { + deluge = { + enable = mkOption { + default = false; + example = true; + description = "Start the Deluge daemon"; + }; - services.deluge.web = { - enable = mkOption { - default = false; - example = true; - description = '' - Start Deluge Web daemon. - ''; - }; + openFilesLimit = mkOption { + default = openFilesLimit; + example = 8192; + description = '' + Number of files to allow deluged to open. + ''; + }; + }; + + deluge.web = { + enable = mkOption { + default = false; + example = true; + description = '' + Start Deluge Web daemon. + ''; + }; + }; }; }; @@ -35,11 +45,14 @@ in { description = "Deluge BitTorrent Daemon"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.pythonPackages.deluge ]; - serviceConfig.ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d"; - # To prevent "Quit & shutdown daemon" from working; we want systemd to manage it! - serviceConfig.Restart = "on-success"; - serviceConfig.User = "deluge"; - serviceConfig.Group = "deluge"; + serviceConfig = { + ExecStart = "${pkgs.pythonPackages.deluge}/bin/deluged -d"; + # To prevent "Quit & shutdown daemon" from working; we want systemd to manage it! + Restart = "on-success"; + User = "deluge"; + Group = "deluge"; + LimitNOFILE = cfg.openFilesLimit; + }; }; systemd.services.delugeweb = mkIf cfg_web.enable { diff --git a/nixos/modules/services/torrent/opentracker.nix b/nixos/modules/services/torrent/opentracker.nix new file mode 100644 index 00000000000..d86b9fea2d7 --- /dev/null +++ b/nixos/modules/services/torrent/opentracker.nix @@ -0,0 +1,44 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.opentracker; +in { + options.services.opentracker = { + enable = mkEnableOption "opentracker"; + + package = mkOption { + type = types.package; + description = '' + opentracker package to use + ''; + default = pkgs.opentracker; + }; + + extraOptions = mkOption { + type = types.separatedString " "; + description = '' + Configuration Arguments for opentracker + See https://erdgeist.org/arts/software/opentracker/ for all params + ''; + default = ""; + }; + }; + + config = lib.mkIf cfg.enable { + + systemd.services.opentracker = { + description = "opentracker server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + restartIfChanged = true; + serviceConfig = { + ExecStart = "${cfg.package}/bin/opentracker ${cfg.extraOptions}"; + PrivateTmp = true; + WorkingDirectory = "/var/empty"; + # By default opentracker drops all privileges and runs in chroot after starting up as root. + }; + }; + }; +} + diff --git a/nixos/modules/services/torrent/peerflix.nix b/nixos/modules/services/torrent/peerflix.nix index 38fbd3b226c..2e3dd9902d7 100644 --- a/nixos/modules/services/torrent/peerflix.nix +++ b/nixos/modules/services/torrent/peerflix.nix @@ -42,7 +42,7 @@ in { systemd.services.peerflix = { description = "Peerflix Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; environment.HOME = cfg.stateDir; preStart = '' diff --git a/nixos/modules/services/web-apps/atlassian/confluence.nix b/nixos/modules/services/web-apps/atlassian/confluence.nix new file mode 100644 index 00000000000..2d9287577de --- /dev/null +++ b/nixos/modules/services/web-apps/atlassian/confluence.nix @@ -0,0 +1,141 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.confluence; + + pkg = pkgs.atlassian-confluence; + +in + +{ + options = { + services.confluence = { + enable = mkEnableOption "Atlassian Confluence service"; + + user = mkOption { + type = types.str; + default = "confluence"; + description = "User which runs confluence."; + }; + + group = mkOption { + type = types.str; + default = "confluence"; + description = "Group which runs confluence."; + }; + + home = mkOption { + type = types.str; + default = "/var/lib/confluence"; + description = "Home directory of the confluence instance."; + }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Address to listen on."; + }; + + listenPort = mkOption { + type = types.int; + default = 8090; + description = "Port to listen on."; + }; + + catalinaOptions = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-Xms1024m" "-Xmx2048m" "-Dconfluence.disable.peopledirectory.all=true" ]; + description = "Java options to pass to catalina/tomcat."; + }; + + proxy = { + enable = mkEnableOption "proxy support"; + + name = mkOption { + type = types.str; + example = "confluence.example.com"; + description = "Virtual hostname at the proxy"; + }; + + port = mkOption { + type = types.int; + default = 443; + example = 80; + description = "Port used at the proxy"; + }; + + scheme = mkOption { + type = types.str; + default = "https"; + example = "http"; + description = "Protocol used at the proxy."; + }; + }; + + jrePackage = let + jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; + in mkOption { + type = types.package; + default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre; + defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre"; + example = literalExample "pkgs.openjdk8.jre"; + description = "Java Runtime to use for Confluence. Note that Atlassian recommends the Oracle JRE."; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers."${cfg.user}" = { + isSystemUser = true; + group = cfg.group; + }; + + users.extraGroups."${cfg.group}" = {}; + + systemd.services.confluence = { + description = "Atlassian Confluence"; + + wantedBy = [ "multi-user.target" ]; + requires = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + + path = [ cfg.jrePackage ]; + + environment = { + CONF_USER = cfg.user; + JAVA_HOME = "${cfg.jrePackage}"; + CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; + }; + + preStart = '' + mkdir -p ${cfg.home}/{logs,work,temp,deploy} + + mkdir -p /run/confluence + ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/confluence + ln -sf ${cfg.home} /run/confluence/home + + chown -R ${cfg.user} ${cfg.home} + + sed -e 's,port="8090",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ + '' + (lib.optionalString cfg.proxy.enable '' + -e 's,protocol="org.apache.coyote.http11.Http11NioProtocol",protocol="org.apache.coyote.http11.Http11NioProtocol" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}",' \ + '') + '' + ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml + ''; + + script = "${pkg}/bin/start-confluence.sh -fg"; + stopScript = "${pkg}/bin/stop-confluence.sh"; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + PrivateTmp = true; + PermissionsStartOnly = true; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/atlassian/crowd.nix b/nixos/modules/services/web-apps/atlassian/crowd.nix new file mode 100644 index 00000000000..5e79678023d --- /dev/null +++ b/nixos/modules/services/web-apps/atlassian/crowd.nix @@ -0,0 +1,147 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.crowd; + + pkg = pkgs.atlassian-crowd; + +in + +{ + options = { + services.crowd = { + enable = mkEnableOption "Atlassian Crowd service"; + + user = mkOption { + type = types.str; + default = "crowd"; + description = "User which runs Crowd."; + }; + + group = mkOption { + type = types.str; + default = "crowd"; + description = "Group which runs Crowd."; + }; + + home = mkOption { + type = types.str; + default = "/var/lib/crowd"; + description = "Home directory of the Crowd instance."; + }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Address to listen on."; + }; + + listenPort = mkOption { + type = types.int; + default = 8092; + description = "Port to listen on."; + }; + + catalinaOptions = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-Xms1024m" "-Xmx2048m" ]; + description = "Java options to pass to catalina/tomcat."; + }; + + proxy = { + enable = mkEnableOption "reverse proxy support"; + + name = mkOption { + type = types.str; + example = "crowd.example.com"; + description = "Virtual hostname at the proxy"; + }; + + port = mkOption { + type = types.int; + default = 443; + example = 80; + description = "Port used at the proxy"; + }; + + scheme = mkOption { + type = types.str; + default = "https"; + example = "http"; + description = "Protocol used at the proxy."; + }; + + secure = mkOption { + type = types.bool; + default = true; + example = false; + description = "Whether the connections to the proxy should be considered secure."; + }; + }; + + jrePackage = let + jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; + in mkOption { + type = types.package; + default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre; + defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre"; + example = literalExample "pkgs.openjdk8.jre"; + description = "Java Runtime to use for Crowd. Note that Atlassian recommends the Oracle JRE."; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers."${cfg.user}" = { + isSystemUser = true; + group = cfg.group; + }; + + users.extraGroups."${cfg.group}" = {}; + + systemd.services.atlassian-crowd = { + description = "Atlassian Crowd"; + + wantedBy = [ "multi-user.target" ]; + requires = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + + path = [ cfg.jrePackage ]; + + environment = { + JAVA_HOME = "${cfg.jrePackage}"; + CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; + CATALINA_TMPDIR = "/tmp"; + }; + + preStart = '' + mkdir -p ${cfg.home}/{logs,work} + + mkdir -p /run/atlassian-crowd + ln -sf ${cfg.home}/{work,server.xml} /run/atlassian-crowd + + chown -R ${cfg.user} ${cfg.home} + + sed -e 's,port="8095",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ + '' + (lib.optionalString cfg.proxy.enable '' + -e 's,compression="on",compression="off" protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ + '') + '' + ${pkg}/apache-tomcat/conf/server.xml.dist > ${cfg.home}/server.xml + ''; + + script = "${pkg}/start_crowd.sh"; + #stopScript = "${pkg}/bin/stop_crowd.sh"; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + PrivateTmp = true; + PermissionsStartOnly = true; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/atlassian/jira.nix b/nixos/modules/services/web-apps/atlassian/jira.nix new file mode 100644 index 00000000000..6e31d20d068 --- /dev/null +++ b/nixos/modules/services/web-apps/atlassian/jira.nix @@ -0,0 +1,149 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.jira; + + pkg = pkgs.atlassian-jira; + +in + +{ + options = { + services.jira = { + enable = mkEnableOption "Atlassian JIRA service"; + + user = mkOption { + type = types.str; + default = "jira"; + description = "User which runs JIRA."; + }; + + group = mkOption { + type = types.str; + default = "jira"; + description = "Group which runs JIRA."; + }; + + home = mkOption { + type = types.str; + default = "/var/lib/jira"; + description = "Home directory of the JIRA instance."; + }; + + listenAddress = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Address to listen on."; + }; + + listenPort = mkOption { + type = types.int; + default = 8091; + description = "Port to listen on."; + }; + + catalinaOptions = mkOption { + type = types.listOf types.str; + default = []; + example = [ "-Xms1024m" "-Xmx2048m" ]; + description = "Java options to pass to catalina/tomcat."; + }; + + proxy = { + enable = mkEnableOption "reverse proxy support"; + + name = mkOption { + type = types.str; + example = "jira.example.com"; + description = "Virtual hostname at the proxy"; + }; + + port = mkOption { + type = types.int; + default = 443; + example = 80; + description = "Port used at the proxy"; + }; + + scheme = mkOption { + type = types.str; + default = "https"; + example = "http"; + description = "Protocol used at the proxy."; + }; + + secure = mkOption { + type = types.bool; + default = true; + example = false; + description = "Whether the connections to the proxy should be considered secure."; + }; + }; + + jrePackage = let + jreSwitch = unfree: free: if config.nixpkgs.config.allowUnfree or false then unfree else free; + in mkOption { + type = types.package; + default = jreSwitch pkgs.oraclejre8 pkgs.openjdk8.jre; + defaultText = jreSwitch "pkgs.oraclejre8" "pkgs.openjdk8.jre"; + example = literalExample "pkgs.openjdk8.jre"; + description = "Java Runtime to use for JIRA. Note that Atlassian recommends the Oracle JRE."; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers."${cfg.user}" = { + isSystemUser = true; + group = cfg.group; + }; + + users.extraGroups."${cfg.group}" = {}; + + systemd.services.atlassian-jira = { + description = "Atlassian JIRA"; + + wantedBy = [ "multi-user.target" ]; + requires = [ "postgresql.service" ]; + after = [ "postgresql.service" ]; + + path = [ cfg.jrePackage ]; + + environment = { + JIRA_USER = cfg.user; + JIRA_HOME = cfg.home; + JAVA_HOME = "${cfg.jrePackage}"; + CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; + }; + + preStart = '' + mkdir -p ${cfg.home}/{logs,work,temp,deploy} + + mkdir -p /run/atlassian-jira + ln -sf ${cfg.home}/{logs,work,temp,server.xml} /run/atlassian-jira + ln -sf ${cfg.home} /run/atlassian-jira/home + + chown -R ${cfg.user} ${cfg.home} + + sed -e 's,port="8080",port="${toString cfg.listenPort}" address="${cfg.listenAddress}",' \ + '' + (lib.optionalString cfg.proxy.enable '' + -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ + '') + '' + ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml + ''; + + script = "${pkg}/bin/start-jira.sh -fg"; + stopScript = "${pkg}/bin/stop-jira.sh"; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + PrivateTmp = true; + PermissionsStartOnly = true; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/nixbot.nix b/nixos/modules/services/web-apps/nixbot.nix new file mode 100644 index 00000000000..0592d01bf36 --- /dev/null +++ b/nixos/modules/services/web-apps/nixbot.nix @@ -0,0 +1,149 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.nixbot; + pyramidIni = '' + ### + # app configuration + # http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/narr/environment.html + ### + + [app:main] + use = egg:nixbot + + nixbot.github_token = ${cfg.githubToken} + nixbot.bot_name = ${cfg.botName} + nixbot.repo = ${cfg.repo} + nixbot.pr_repo = ${cfg.prRepo} + nixbot.hydra_jobsets_repo = ${cfg.hydraJobsetsRepo} + nixbot.github_secret = justnotsorandom + nixbot.public_url = ${cfg.publicUrl} + nixbot.repo_dir = ${cfg.repoDir} + + pyramid.reload_templates = false + pyramid.debug_authorization = false + pyramid.debug_notfound = false + pyramid.debug_routematch = false + pyramid.default_locale_name = en + + # By default, the toolbar only appears for clients from IP addresses + # '127.0.0.1' and '::1'. + # debugtoolbar.hosts = 127.0.0.1 ::1 + + ### + # wsgi server configuration + ### + + [server:main] + use = egg:waitress#main + host = 0.0.0.0 + port = 6543 + + ### + # logging configuration + # http://docs.pylonsproject.org/projects/pyramid/en/1.7-branch/narr/logging.html + ### + + [loggers] + keys = root, nixbot + + [handlers] + keys = console + + [formatters] + keys = generic + + [logger_root] + level = INFO + handlers = console + + [logger_nixbot] + level = INFO + handlers = + qualname = nixbot + + [handler_console] + class = StreamHandler + args = (sys.stderr,) + level = NOTSET + formatter = generic + + [formatter_generic] + format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s + ''; +in { + options = { + services.nixbot = { + enable = mkEnableOption "nixbot"; + + botName = mkOption { + type = types.str; + description = "The bot's github user account name."; + default = "nixbot"; + }; + + githubToken = mkOption { + type = types.str; + description = "The bot's github user account token."; + example = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; + }; + + repo = mkOption { + type = types.str; + description = "The github repository to check for PRs."; + example = "nixos/nixpkgs"; + }; + + prRepo = mkOption { + type = types.str; + description = "The github repository to push the testing branches to."; + example = "nixos/nixpkgs-pr"; + }; + + hydraJobsetsRepo = mkOption { + type = types.str; + description = "The github repository to push the hydra jobset definitions to."; + example = "nixos/hydra-jobsets"; + }; + + publicUrl = mkOption { + type = types.str; + description = "The public URL the bot is reachable at (Github hook endpoint)."; + example = "https://nixbot.nixos.org"; + }; + + repoDir = mkOption { + type = types.path; + description = "The directory the repositories are stored in."; + default = "/var/lib/nixbot"; + }; + }; + }; + + config = mkIf cfg.enable { + users.extraUsers.nixbot = { + createHome = true; + home = cfg.repoDir; + }; + + systemd.services.nixbot = let + env = pkgs.python3.buildEnv.override { + extraLibs = [ pkgs.nixbot ]; + }; + in { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = '' + ${env}/bin/pserve ${pkgs.writeText "production.ini" pyramidIni} + ''; + + serviceConfig = { + User = "nixbot"; + Group = "nogroup"; + PermissionsStartOnly = true; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix new file mode 100644 index 00000000000..5571f77334c --- /dev/null +++ b/nixos/modules/services/web-apps/selfoss.nix @@ -0,0 +1,166 @@ +{ config, lib, pkgs, ... }: +with lib; +let + cfg = config.services.selfoss; + + poolName = "selfoss_pool"; + phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; + + dataDir = "/var/lib/selfoss"; + + selfoss-config = + let + db_type = cfg.database.type; + default_port = if (db_type == "mysql") then 3306 else 5342; + in + pkgs.writeText "selfoss-config.ini" '' + [globals] + ${lib.optionalString (db_type != "sqlite") '' + db_type=${db_type} + db_host=${cfg.database.host} + db_database=${cfg.database.name} + db_username=${cfg.database.user} + db_password=${cfg.database.password} + db_port=${if (cfg.database.port != null) then cfg.database.port + else default_port} + '' + } + ${cfg.extraConfig} + ''; +in + { + options = { + services.selfoss = { + enable = mkEnableOption "selfoss"; + + user = mkOption { + type = types.str; + default = "nginx"; + example = "nginx"; + description = '' + User account under which both the service and the web-application run. + ''; + }; + + pool = mkOption { + type = types.str; + default = "${poolName}"; + description = '' + Name of existing phpfpm pool that is used to run web-application. + If not specified a pool will be created automatically with + default values. + ''; + }; + + database = { + type = mkOption { + type = types.enum ["pgsql" "mysql" "sqlite"]; + default = "sqlite"; + description = '' + Database to store feeds. Supported are sqlite, pgsql and mysql. + ''; + }; + + host = mkOption { + type = types.str; + default = "localhost"; + description = '' + Host of the database (has no effect if type is "sqlite"). + ''; + }; + + name = mkOption { + type = types.str; + default = "tt_rss"; + description = '' + Name of the existing database (has no effect if type is "sqlite"). + ''; + }; + + user = mkOption { + type = types.str; + default = "tt_rss"; + description = '' + The database user. The user must exist and has access to + the specified database (has no effect if type is "sqlite"). + ''; + }; + + password = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + The database user's password (has no effect if type is "sqlite"). + ''; + }; + + port = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + The database's port. If not set, the default ports will be + provided (5432 and 3306 for pgsql and mysql respectively) + (has no effect if type is "sqlite"). + ''; + }; + }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration added to config.ini + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + services.phpfpm.poolConfigs = mkIf (cfg.pool == "${poolName}") { + "${poolName}" = '' + listen = "${phpfpmSocketName}"; + listen.owner = nginx + listen.group = nginx + listen.mode = 0600 + user = nginx + pm = dynamic + pm.max_children = 75 + pm.start_servers = 10 + pm.min_spare_servers = 5 + pm.max_spare_servers = 20 + pm.max_requests = 500 + catch_workers_output = 1 + ''; + }; + + systemd.services.selfoss-config = { + serviceConfig.Type = "oneshot"; + script = '' + mkdir -m 755 -p ${dataDir} + cd ${dataDir} + + # Delete all but the "data" folder + ls | grep -v data | while read line; do rm -rf $line; done || true + + # Create the files + cp -r "${pkgs.selfoss}/"* "${dataDir}" + ln -sf "${selfoss-config}" "${dataDir}/config.ini" + chown -R "${cfg.user}" "${dataDir}" + chmod -R 755 "${dataDir}" + ''; + wantedBy = [ "multi-user.target" ]; + }; + + systemd.services.selfoss-update = { + serviceConfig = { + ExecStart = "${pkgs.php}/bin/php ${dataDir}/cliupdate.php"; + User = "${cfg.user}"; + }; + startAt = "hourly"; + after = [ "selfoss-config.service" ]; + wantedBy = [ "multi-user.target" ]; + + }; + + }; +} diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index b08070f1e36..5193814da72 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -18,7 +18,6 @@ let poolName = "tt-rss"; phpfpmSocketName = "/var/run/phpfpm/${poolName}.sock"; - virtualHostName = "tt-rss"; tt-rss-config = pkgs.writeText "config.php" '' 0 from pg_tables where tableowner = user"} \ | tail -n+3 | head -n-2 | sed -e 's/[ \n\t]*//') @@ -540,8 +531,9 @@ let else echo 'The database contains some data. Leaving it as it is.' fi; - '') + (optionalString (cfg.database.type == "mysql") '' + '') + + (optionalString (cfg.database.type == "mysql") '' exists=$(${callSql "select count(*) > 0 from information_schema.tables where table_schema = schema()"} \ | tail -n+2 | sed -e 's/[ \n\t]*//') @@ -554,7 +546,7 @@ let serviceConfig = { User = "${cfg.user}"; - ExecStart = "${pkgs.php}/bin/php /var/lib/tt-rss/update.php --daemon"; + ExecStart = "${pkgs.php}/bin/php ${cfg.root}/update.php --daemon"; StandardOutput = "syslog"; StandardError = "syslog"; PermissionsStartOnly = true; diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index b4b5a6fdc07..4f9e9f52f9e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -83,11 +83,11 @@ let # Unpack Mediawiki and put the config file in its root directory. mediawikiRoot = pkgs.stdenv.mkDerivation rec { - name= "mediawiki-1.23.13"; + name= "mediawiki-1.27.1"; src = pkgs.fetchurl { - url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz"; - sha256 = "168wpf53n4ksj2g5q5r0hxapx6238dvsfng5ff9ixk6axsn0j5d0"; + url = "http://download.wikimedia.org/mediawiki/1.27/${name}.tar.gz"; + sha256 = "0sm3ymz93qragbwhzzbwq7f127mbj29inv0afg2z6p32jb1pd9h8"; }; skins = config.skins; diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix index 87b1fba5aa1..aa00e89967d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/moodle.nix +++ b/nixos/modules/services/web-servers/apache-httpd/moodle.nix @@ -63,6 +63,10 @@ let cp -r * $out cp ${moodleConfig} $out/config.php ''; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + meta.broken = true; + }; in diff --git a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix index 937b2698ce9..2315c4729ae 100644 --- a/nixos/modules/services/web-servers/apache-httpd/wordpress.nix +++ b/nixos/modules/services/web-servers/apache-httpd/wordpress.nix @@ -5,7 +5,8 @@ with lib; let - version = "4.3.1"; + # Upgrading? We have a test! nix-build ./nixos/tests/wordpress.nix + version = "4.6.1"; fullversion = "${version}"; # Our bare-bones wp-config.php file using the above settings @@ -74,7 +75,7 @@ let owner = "WordPress"; repo = "WordPress"; rev = "${fullversion}"; - sha256 = "1rk10vcv4z9p04hfzc0wkbilrgx7m9ssyr6c3w6vw3vl1bcgqxza"; + sha256 = "0n82xgjg1ry2p73hhgpslnkdzrma5n6hxxq76s7qskkzj0qjfvpn"; }; installPhase = '' mkdir -p $out @@ -98,7 +99,7 @@ let # symlink additional plugin(s) ${concatMapStrings (plugin: "ln -s ${plugin} $out/wp-content/plugins/${plugin.name}\n") (config.plugins) } - # symlink additional translation(s) + # symlink additional translation(s) mkdir -p $out/wp-content/languages ${concatMapStrings (language: "ln -s ${language}/*.mo ${language}/*.po $out/wp-content/languages/\n") (selectedLanguages) } ''; @@ -123,7 +124,7 @@ in options = { dbHost = mkOption { default = "localhost"; - description = "The location of the database server."; + description = "The location of the database server."; example = "localhost"; }; dbName = mkOption { @@ -244,7 +245,6 @@ in chown ${serverInfo.serverConfig.user} ${config.wordpressUploads} # we should use systemd dependencies here - #waitForUnit("network-interfaces.target"); if [ ! -d ${serverInfo.fullConfig.services.mysql.dataDir}/${config.dbName} ]; then echo "Need to create the database '${config.dbName}' and grant permissions to user named '${config.dbUser}'." # Wait until MySQL is up @@ -253,7 +253,7 @@ in 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}";' - else + 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 94c442e165b..7b822619a2f 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -18,9 +18,13 @@ let ${cfg.config} - ${optionalString (cfg.httpConfig == "" && cfg.config == "") '' - events {} + ${optionalString (cfg.eventsConfig != "" || cfg.config == "") '' + events { + ${cfg.eventsConfig} + } + ''} + ${optionalString (cfg.httpConfig == "" && cfg.config == "") '' http { include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/fastcgi.conf; @@ -98,7 +102,6 @@ let }''} ${optionalString (cfg.httpConfig != "") '' - events {} http { include ${cfg.package}/conf/mime.types; include ${cfg.package}/conf/fastcgi.conf; @@ -272,12 +275,20 @@ in "; }; + eventsConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Configuration lines to be set inside the events block. + ''; + }; + appendHttpConfig = mkOption { type = types.lines; default = ""; description = " Configuration lines to be appended to the generated http block. - This is mutually exclusive with using config and httpConfig for + This is mutually exclusive with using config and httpConfig for specifying the whole http block verbatim. "; }; @@ -383,6 +394,9 @@ in optionalAttrs vhostConfig.enableACME { webroot = vhostConfig.acmeRoot; extraDomains = genAttrs vhostConfig.serverAliases (alias: null); + postRun = '' + systemctl reload nginx + ''; } ) virtualHosts ); diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 29cfbb8e9a0..ed537e7122a 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -7,8 +7,6 @@ let stateDir = "/run/phpfpm"; - pidFile = "${stateDir}/phpfpm.pid"; - mkPool = n: p: '' [${n}] listen = ${p.listen} @@ -17,9 +15,8 @@ let cfgFile = pkgs.writeText "phpfpm.conf" '' [global] - pid = ${pidFile} error_log = syslog - daemonize = yes + daemonize = no ${cfg.extraConfig} ${concatStringsSep "\n" (mapAttrsToList mkPool cfg.pools)} @@ -42,8 +39,8 @@ in { default = ""; description = '' Extra configuration that should be put in the global section of - the PHP FPM configuration file. Do not specify the options - pid, error_log or + the PHP-FPM configuration file. Do not specify the options + error_log or daemonize here, since they are generated by NixOS. ''; @@ -54,7 +51,7 @@ in { default = pkgs.php; defaultText = "pkgs.php"; description = '' - The PHP package to use for running the FPM service. + The PHP package to use for running the PHP-FPM service. ''; }; @@ -86,7 +83,7 @@ in { } ''; description = '' - A mapping between PHP FPM pool names and their configurations. + A mapping between PHP-FPM pool names and their configurations. See the documentation on php-fpm.conf for details on configuration directives. If no pools are defined, the phpfpm service is disabled. @@ -98,8 +95,24 @@ in { inherit lib; })); default = {}; + example = literalExample '' + { + mypool = { + listen = "/path/to/unix/socket"; + extraConfig = ''' + user = nobody + pm = dynamic + pm.max_children = 75 + pm.start_servers = 10 + pm.min_spare_servers = 5 + pm.max_spare_servers = 20 + pm.max_requests = 500 + '''; + } + }''; description = '' - If no pools are defined, the phpfpm service is disabled. + PHP-FPM pools. If no pools or poolConfigs are defined, the PHP-FPM + service is disabled. ''; }; }; @@ -113,10 +126,10 @@ in { mkdir -p "${stateDir}" ''; serviceConfig = { + Type = "notify"; ExecStart = "${cfg.phpPackage}/bin/php-fpm -y ${cfgFile} -c ${phpIni}"; - PIDFile = pidFile; + ExecReload = "${pkgs.coreutils}/bin/kill -USR2 $MAINPID"; }; }; - }; } diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index fa6b4c0629d..943415e08c6 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -139,7 +139,7 @@ in systemd.services.tomcat = { description = "Apache Tomcat server"; wantedBy = [ "multi-user.target" ]; - after = [ "network-interfaces.target" ]; + after = [ "network.target" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix index 6dab467b35e..064ead5ce4b 100644 --- a/nixos/modules/services/web-servers/winstone.nix +++ b/nixos/modules/services/web-servers/winstone.nix @@ -113,8 +113,7 @@ in { options = { services.winstone = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ winstoneOpts ]; + type = with types; attrsOf (submodule winstoneOpts); description = '' Defines independent Winstone services, each serving one WAR-file. ''; diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index ef3cffd582e..8a453e01557 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -74,7 +74,7 @@ in services.zope2.instances = mkOption { default = {}; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule zope2Opts); example = literalExample '' { plone01 = { @@ -96,7 +96,6 @@ in } ''; description = "zope2 instances to be created automaticaly by the system."; - options = [ zope2Opts ]; }; }; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 1ea7b5ccf16..31412ae7014 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -19,7 +19,7 @@ in # E.g., if KDE is enabled, it supersedes xterm. imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde5.nix - ./enlightenment.nix ./gnome3.nix ./kodi.nix + ./lxqt.nix ./enlightenment.nix ./gnome3.nix ./kodi.nix ]; options = { diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 8a03dd65b33..7ea8b30d23d 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -32,10 +32,10 @@ in e.efl e.enlightenment e.terminology e.econnman pkgs.xorg.xauth # used by kdesu - pkgs.gtk # To get GTK+'s themes. + pkgs.gtk2 # To get GTK+'s themes. pkgs.tango-icon-theme pkgs.shared_mime_info - pkgs.gnome.gnomeicontheme + pkgs.gnome2.gnomeicontheme pkgs.xorg.xcursorthemes ]; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index b3da2544802..dc71531759b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -25,9 +25,8 @@ let ''; }; - nixos-gsettings-desktop-schemas = pkgs.stdenv.mkDerivation { - name = "nixos-gsettings-desktop-schemas"; - buildCommand = '' + nixos-gsettings-desktop-schemas = pkgs.runCommand "nixos-gsettings-desktop-schemas" {} + '' mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas @@ -46,7 +45,6 @@ let ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/ ''; - }; in { diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index 1927341e45d..3aa4821a052 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -14,7 +14,7 @@ let # files), segfault sometimes and consume significant resources. # They can be re-enabled in the KDE System Settings under "Desktop # Search". - nepomukConfig = pkgs.writeTextFile + disableNepomuk = pkgs.writeTextFile { name = "nepomuk-config"; destination = "/share/config/nepomukserverrc"; text = @@ -70,6 +70,18 @@ in type = types.package; description = "Custom kde-workspace, used for NixOS rebranding."; }; + + enablePIM = mkOption { + type = types.bool; + default = true; + description = "Whether to enable PIM support. Note that enabling this pulls in Akonadi and MariaDB as dependencies."; + }; + + enableNepomuk = mkOption { + type = types.bool; + default = false; + description = "Whether to enable Nepomuk (deprecated)."; + }; }; }; @@ -138,7 +150,6 @@ in pkgs.kde4.kde_wallpapers # contains kdm's default background pkgs.kde4.oxygen_icons - pkgs.virtuoso # to enable Nepomuk to find Virtuoso # Starts KDE's Polkit authentication agent. pkgs.kde4.polkit_kde_agent @@ -149,20 +160,26 @@ in xorg.xmessage # so that startkde can show error messages xorg.xset # used by startkde, non-essential xorg.xauth # used by kdesu - pkgs.shared_desktop_ontologies # used by nepomuk - pkgs.strigi # used by nepomuk + ] + ++ optionals cfg.enablePIM + [ pkgs.kde4.kdepim_runtime pkgs.kde4.akonadi pkgs.mysql # used by akonadi - pkgs.kde4.kdepim_runtime ] - ++ lib.optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled - ++ lib.optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil - ++ lib.optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm - ++ [ nepomukConfig ] ++ phononBackendPackages; + ++ (if cfg.enableNepomuk then + [ pkgs.shared_desktop_ontologies # used by nepomuk + pkgs.strigi # used by nepomuk + pkgs.virtuoso # to enable Nepomuk to find Virtuoso + ] else + [ disableNepomuk ]) + ++ optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled + ++ optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil + ++ optional config.networking.networkmanager.enable pkgs.kde4.plasma-nm + ++ phononBackendPackages; environment.pathsToLink = [ "/share" ]; - environment.profileRelativeEnvVars = mkIf (lib.elem "gstreamer" cfg.phononBackends) { + environment.profileRelativeEnvVars = mkIf (elem "gstreamer" cfg.phononBackends) { GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ]; }; diff --git a/nixos/modules/services/x11/desktop-managers/lxqt.nix b/nixos/modules/services/x11/desktop-managers/lxqt.nix new file mode 100644 index 00000000000..4241ec890dd --- /dev/null +++ b/nixos/modules/services/x11/desktop-managers/lxqt.nix @@ -0,0 +1,81 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + xcfg = config.services.xserver; + cfg = xcfg.desktopManager.lxqt; + +in + +{ + options = { + + services.xserver.desktopManager.lxqt.enable = mkOption { + type = types.bool; + default = false; + description = "Enable the LXQt desktop manager"; + }; + + }; + + + config = mkIf (xcfg.enable && cfg.enable) { + + services.xserver.desktopManager.session = singleton { + name = "lxqt"; + start = '' + exec ${pkgs.lxqt.lxqt-common}/bin/startlxqt + ''; + }; + + environment.systemPackages = [ + pkgs.kde5.kwindowsystem # provides some QT5 plugins needed by lxqt-panel + pkgs.kde5.libkscreen # provides plugins for screen management software + pkgs.kde5.oxygen-icons5 # default icon theme + pkgs.libfm + pkgs.libfm-extra + pkgs.lxmenu-data + pkgs.lxqt.compton-conf + pkgs.lxqt.libfm-qt + pkgs.lxqt.liblxqt + pkgs.lxqt.libqtxdg + pkgs.lxqt.libsysstat + pkgs.lxqt.lximage-qt + pkgs.lxqt.lxqt-about + pkgs.lxqt.lxqt-admin + pkgs.lxqt.lxqt-common + pkgs.lxqt.lxqt-config + pkgs.lxqt.lxqt-globalkeys + pkgs.lxqt.lxqt-l10n + pkgs.lxqt.lxqt-notificationd + pkgs.lxqt.lxqt-openssh-askpass + pkgs.lxqt.lxqt-panel + pkgs.lxqt.lxqt-policykit + pkgs.lxqt.lxqt-powermanagement + pkgs.lxqt.lxqt-qtplugin + pkgs.lxqt.lxqt-runner + pkgs.lxqt.lxqt-session + pkgs.lxqt.lxqt-sudo + pkgs.lxqt.obconf-qt + pkgs.lxqt.pavucontrol-qt + pkgs.lxqt.pcmanfm-qt + pkgs.lxqt.qps + pkgs.lxqt.qterminal + pkgs.lxqt.qtermwidget + pkgs.menu-cache + pkgs.openbox # default window manager + pkgs.qt5.qtsvg # provides QT5 plugins for svg icons + pkgs.xscreensaver + ]; + + # Link some extra directories in /run/current-system/software/share + environment.pathsToLink = [ + "/share/desktop-directories" + "/share/icons" + "/share/lxqt" + ]; + + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 634d2a39576..530468be5f9 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -69,7 +69,7 @@ in services.xserver.updateDbusEnvironment = true; environment.systemPackages = - [ pkgs.gtk # To get GTK+'s themes. + [ pkgs.gtk2.out # To get GTK+'s themes and gtk-update-icon-cache pkgs.hicolor_icon_theme pkgs.tango-icon-theme pkgs.shared_mime_info @@ -100,6 +100,7 @@ in pkgs.xfce.tumbler # found via dbus ] ++ optional config.powerManagement.enable pkgs.xfce.xfce4_power_manager + ++ optional config.networking.networkmanager.enable pkgs.networkmanagerapplet ++ optionals (!cfg.noDesktop) [ pkgs.xfce.xfce4panel pkgs.xfce.xfdesktop diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 75d80609f73..ce82af4ca68 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -134,13 +134,8 @@ let (*) echo "$0: Desktop manager '$desktopManager' not found.";; esac - # FIXME: gdbus should not be in glib.dev! - ${optionalString (cfg.startDbusSession && cfg.updateDbusEnvironment) '' - ${pkgs.glib.dev}/bin/gdbus call --session \ - --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus \ - --method org.freedesktop.DBus.UpdateActivationEnvironment \ - "{$(env | ${pkgs.gnused}/bin/sed "s/'/\\\\'/g; s/\([^=]*\)=\(.*\)/'\1':'\2'/" \ - | ${pkgs.coreutils}/bin/paste -sd,)}" + ${optionalString cfg.updateDbusEnvironment '' + ${lib.getBin pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all ''} test -n "$waitPID" && wait "$waitPID" diff --git a/nixos/modules/services/x11/display-managers/kdm.nix b/nixos/modules/services/x11/display-managers/kdm.nix index d9f7f8f0dfc..8b51c621e11 100644 --- a/nixos/modules/services/x11/display-managers/kdm.nix +++ b/nixos/modules/services/x11/display-managers/kdm.nix @@ -54,19 +54,17 @@ let ''} ''; - kdmrc = pkgs.stdenv.mkDerivation { - name = "kdmrc"; - config = defaultConfig + cfg.extraConfig; - preferLocalBuild = true; - buildCommand = - '' - echo "$config" > $out + kdmrc = pkgs.runCommand "kdmrc" + { config = defaultConfig + cfg.extraConfig; + preferLocalBuild = true; + } + '' + echo "$config" > $out - # The default kdmrc would add "-nolisten tcp", and we already - # have that managed by nixos. Hence the grep. - cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out - ''; - }; + # The default kdmrc would add "-nolisten tcp", and we already + # have that managed by nixos. Hence the grep. + cat ${kdebase_workspace}/share/config/kdm/kdmrc | grep -v nolisten >> $out + ''; in 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 543dd628ce6..dfda90978b1 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -16,11 +16,9 @@ let # The default greeter provided with this expression is the GTK greeter. # Again, we need a few things in the environment for the greeter to run with # fonts/icons. - wrappedGtkGreeter = stdenv.mkDerivation { - name = "lightdm-gtk-greeter"; - buildInputs = [ pkgs.makeWrapper ]; - - buildCommand = '' + wrappedGtkGreeter = pkgs.runCommand "lightdm-gtk-greeter" + { buildInputs = [ pkgs.makeWrapper ]; } + '' # This wrapper ensures that we actually get themes makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \ $out/greeter \ @@ -40,7 +38,6 @@ let Type=Application EOF ''; - }; gtkGreeterConf = writeText "lightdm-gtk-greeter.conf" '' diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 47786f0a432..33cd51f37c6 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -46,13 +46,15 @@ let [Seat:*] xserver-command = ${xserverWrapper} session-wrapper = ${dmcfg.session.script} + ${optionalString (elem defaultSessionName dmcfg.session.names) '' + user-session = ${defaultSessionName} + ''} ${optionalString cfg.greeter.enable '' greeter-session = ${cfg.greeter.name} ''} ${optionalString cfg.autoLogin.enable '' autologin-user = ${cfg.autoLogin.user} autologin-user-timeout = ${toString cfg.autoLogin.timeout} - autologin-session = ${defaultSessionName} ''} ${cfg.extraSeatDefaults} ''; diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index 16d1e89e8d9..c79893e77aa 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -14,7 +14,7 @@ let xserverWrapper = pkgs.writeScript "xserver-wrapper" '' #!/bin/sh ${concatMapStrings (n: "export ${n}=\"${getAttr n xEnv}\"\n") (attrNames xEnv)} - exec ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" + exec systemd-cat ${dmcfg.xserverBin} ${dmcfg.xserverArgs} "$@" ''; Xsetup = pkgs.writeScript "Xsetup" '' @@ -46,7 +46,7 @@ let HideUsers=${concatStringsSep "," dmcfg.hiddenUsers} HideShells=/run/current-system/sw/bin/nologin - [XDisplay] + [X11] MinimumVT=${toString xcfg.tty} ServerPath=${xserverWrapper} XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr @@ -100,7 +100,7 @@ in theme = mkOption { type = types.str; - default = "maui"; + default = ""; description = '' Greeter theme to use. ''; diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index ce44c9f54a3..ca2ae1a4772 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -26,15 +26,13 @@ let # Unpack the SLiM theme, or use the default. slimThemesDir = let - unpackedTheme = pkgs.stdenv.mkDerivation { - name = "slim-theme"; - buildCommand = '' + unpackedTheme = pkgs.runCommand "slim-theme" {} + '' mkdir -p $out cd $out unpackFile ${cfg.theme} ln -s * default ''; - }; in if cfg.theme == null then "${pkgs.slim}/share/slim/themes" else unpackedTheme; in diff --git a/nixos/modules/services/x11/urxvtd.nix b/nixos/modules/services/x11/urxvtd.nix new file mode 100644 index 00000000000..ab47f4547ae --- /dev/null +++ b/nixos/modules/services/x11/urxvtd.nix @@ -0,0 +1,49 @@ +{ config, lib, pkgs, ... }: + +# maintainer: siddharthist + +with lib; + +let + cfg = config.services.urxvtd; +in { + + options.services.urxvtd.enable = mkOption { + type = types.bool; + default = false; + example = true; + description = '' + Enable urxvtd, the urxvt terminal daemon. To use urxvtd, run + "urxvtc". + ''; + }; + + config = mkIf cfg.enable { + systemd.user = { + sockets.urxvtd = { + description = "socket for urxvtd, the urxvt terminal daemon"; + after = [ "graphical.target" ]; + wants = [ "graphical.target" ]; + wantedBy = [ "sockets.target" ]; + socketConfig = { + ListenStream = "%t/urxvtd-socket"; + }; + }; + + services.urxvtd = { + description = "urxvt terminal daemon"; + serviceConfig = { + ExecStart = "${pkgs.rxvt_unicode-with-plugins}/bin/urxvtd -o"; + Environment = "RXVT_SOCKET=%t/urxvtd-socket"; + Restart = "on-failure"; + RestartSec = "5s"; + }; + }; + + }; + + environment.systemPackages = [ pkgs.rxvt_unicode-with-plugins ]; + environment.variables.RXVT_SOCKET = "/run/user/$(id -u)/urxvtd-socket"; + }; + +} diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index 455b3568499..eb97449c6bd 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -6,7 +6,7 @@ let cfg = config.services.xserver.windowManager.awesome; awesome = cfg.package; - + inherit (pkgs.luaPackages) getLuaPath getLuaCPath; in { @@ -46,10 +46,8 @@ in { name = "awesome"; start = '' - ${concatMapStrings (pkg: '' - export LUA_CPATH=$LUA_CPATH''${LUA_CPATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.so - export LUA_PATH=$LUA_PATH''${LUA_PATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.lua - '') cfg.luaModules} + export LUA_CPATH="${lib.concatStringsSep ";" (map getLuaCPath cfg.luaModules)}" + export LUA_PATH="${lib.concatStringsSep ";" (map getLuaPath cfg.luaModules)}" ${awesome}/bin/awesome & waitPID=$! @@ -59,5 +57,4 @@ in environment.systemPackages = [ awesome ]; }; - } diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 6c6a1e79ed0..e34f0c21663 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -71,15 +71,11 @@ let monitors = reverseList (foldl mkMonitor [] xrandrHeads); in concatMapStrings (getAttr "value") monitors; - configFile = pkgs.stdenv.mkDerivation { - name = "xserver.conf"; - - xfs = optionalString (cfg.useXFS != false) - ''FontPath "${toString cfg.useXFS}"''; - - inherit (cfg) config; - - buildCommand = + configFile = pkgs.runCommand "xserver.conf" + { xfs = optionalString (cfg.useXFS != false) + ''FontPath "${toString cfg.useXFS}"''; + inherit (cfg) config; + } '' echo 'Section "Files"' >> $out echo $xfs >> $out @@ -102,7 +98,6 @@ let echo "$config" >> $out ''; # */ - }; in @@ -154,6 +149,22 @@ in ''; }; + autoRepeatDelay = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Sets the autorepeat delay (length of time in milliseconds that a key must be depressed before autorepeat starts). + ''; + }; + + autoRepeatInterval = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Sets the autorepeat interval (length of time in milliseconds that should elapse between autorepeat-generated keystrokes). + ''; + }; + inputClassSections = mkOption { type = types.listOf types.lines; default = []; @@ -509,7 +520,6 @@ in environment = { - XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension. XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime. LD_LIBRARY_PATH = concatStringsSep ":" ( [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" "/run/opengl-driver/lib" ] @@ -529,6 +539,10 @@ in Restart = "always"; RestartSec = "200ms"; SyslogIdentifier = "display-manager"; + # Stop restarting if the display manager stops (crashes) 2 times + # in one minute. Starting X typically takes 3-4s. + StartLimitInterval = "30s"; + StartLimitBurst = "3"; }; }; @@ -541,7 +555,9 @@ in ] ++ optional (cfg.display != null) ":${toString cfg.display}" ++ optional (cfg.tty != null) "vt${toString cfg.tty}" ++ optional (cfg.dpi != null) "-dpi ${toString cfg.dpi}" - ++ optional (!cfg.enableTCP) "-nolisten tcp"; + ++ optional (!cfg.enableTCP) "-nolisten tcp" + ++ optional (cfg.autoRepeatDelay != null) "-ardelay ${toString cfg.autoRepeatDelay}" + ++ optional (cfg.autoRepeatInterval != null) "-arinterval ${toString cfg.autoRepeatInterval}"; services.xserver.modules = concatLists (catAttrs "modules" cfg.drivers) ++ diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index 60298362d76..dcf105eb784 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -142,10 +142,11 @@ in # Empty, immutable home directory of many system accounts. mkdir -p /var/empty # Make sure it's really empty - ${pkgs.e2fsprogs}/bin/chattr -i /var/empty + ${pkgs.e2fsprogs}/bin/chattr -f -i /var/empty || true find /var/empty -mindepth 1 -delete chmod 0555 /var/empty - ${pkgs.e2fsprogs}/bin/chattr +i /var/empty + chown root:root /var/empty + ${pkgs.e2fsprogs}/bin/chattr -f +i /var/empty || true ''; system.activationScripts.usrbinenv = if config.environment.usrbinenv != null @@ -159,7 +160,7 @@ in rmdir --ignore-fail-on-non-empty /usr/bin /usr ''; - system.activationScripts.tmpfs = + system.activationScripts.specialfs = '' specialMount() { local device="$1" @@ -167,7 +168,12 @@ in local options="$3" local fsType="$4" - ${pkgs.utillinux}/bin/mount -t "$fsType" -o "remount,$options" "$device" "$mountPoint" + if ${pkgs.utillinux}/bin/mountpoint -q "$mountPoint"; then + local options="remount,$options" + else + mkdir -m 0755 -p "$mountPoint" + fi + ${pkgs.utillinux}/bin/mount -t "$fsType" -o "$options" "$device" "$mountPoint" } source ${config.system.build.earlyMountScript} ''; diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index bb97d0c53a6..8747c1e3d4a 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -213,33 +213,30 @@ while (my ($unit, $state) = each %{$activePrev}) { elsif (!boolIsTrue($unitInfo->{'X-RestartIfChanged'} // "yes") || boolIsTrue($unitInfo->{'RefuseManualStop'} // "no") ) { $unitsToSkip{$unit} = 1; } else { - # If this unit is socket-activated, then stop the - # socket unit(s) as well, and restart the - # socket(s) instead of the service. - my $socketActivated = 0; - if ($unit =~ /\.service$/) { - my @sockets = split / /, ($unitInfo->{Sockets} // ""); - if (scalar @sockets == 0) { - @sockets = ("$baseName.socket"); - } - foreach my $socket (@sockets) { - if (defined $activePrev->{$socket}) { - $unitsToStop{$unit} = 1; - $unitsToStart{$unit} = 1; - recordUnit($startListFile, $socket); - $socketActivated = 1; - } - } - } - if (!boolIsTrue($unitInfo->{'X-StopIfChanged'} // "yes")) { - # This unit should be restarted instead of # stopped and started. $unitsToRestart{$unit} = 1; recordUnit($restartListFile, $unit); - } else { + # If this unit is socket-activated, then stop the + # socket unit(s) as well, and restart the + # socket(s) instead of the service. + my $socketActivated = 0; + if ($unit =~ /\.service$/) { + my @sockets = split / /, ($unitInfo->{Sockets} // ""); + if (scalar @sockets == 0) { + @sockets = ("$baseName.socket"); + } + foreach my $socket (@sockets) { + if (defined $activePrev->{$socket}) { + $unitsToStop{$socket} = 1; + $unitsToStart{$socket} = 1; + recordUnit($startListFile, $socket); + $socketActivated = 1; + } + } + } # If the unit is not socket-activated, record # that this unit needs to be started below. @@ -251,7 +248,6 @@ while (my ($unit, $state) = each %{$activePrev}) { } $unitsToStop{$unit} = 1; - } } } diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index 2d1b0ffb54c..0c08375da64 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -98,7 +98,7 @@ let # `switch-to-configuration' that activates the configuration and # makes it bootable. baseSystem = showWarnings ( - if [] == failed then pkgs.stdenv.mkDerivation { + if [] == failed then pkgs.stdenvNoCC.mkDerivation { name = let hn = config.networking.hostName; nn = if (hn != "") then hn else "unnamed"; in "nixos-system-${nn}-${config.system.nixosLabel}"; diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index bc899984c57..a8c7d4b3ee5 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -85,10 +85,14 @@ in }; config = mkIf (config.boot.initrd.network.enable && cfg.enable) { - assertions = [ { - assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null; - message = "You should specify at least one host key for initrd SSH"; - } ]; + assertions = [ + { assertion = cfg.hostRSAKey != null || cfg.hostDSSKey != null || cfg.hostECDSAKey != null; + message = "You should specify at least one host key for initrd SSH"; + } + { assertion = cfg.authorizedKeys != []; + message = "You should specify at least one authorized key for initrd SSH"; + } + ]; boot.initrd.extraUtilsCommands = '' copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index ba15d0318b1..51b3b8a3dca 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -4,7 +4,9 @@ with lib; let - kernel = config.boot.kernelPackages.kernel; + inherit (config.boot) kernelPatches; + + inherit (config.boot.kernelPackages) kernel; kernelModulesConf = pkgs.writeText "nixos.conf" '' @@ -21,6 +23,11 @@ in boot.kernelPackages = mkOption { default = pkgs.linuxPackages; + apply = kernelPackages: kernelPackages.extend (self: super: { + kernel = super.kernel.override { + kernelPatches = super.kernel.kernelPatches ++ kernelPatches; + }; + }); # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. defaultText = "pkgs.linuxPackages"; @@ -39,6 +46,13 @@ in ''; }; + boot.kernelPatches = mkOption { + type = types.listOf types.attrs; + default = []; + example = literalExample "[ pkgs.kernelPatches.ubuntu_fan_4_4 ]"; + description = "A list of additional patches to apply to the kernel."; + }; + boot.kernelParams = mkOption { type = types.listOf types.str; default = [ ]; diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 61c34cc2f03..c3be7407d59 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -55,7 +55,7 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels - default fsIdentifier efiSupport gfxmodeEfi gfxmodeBios; + default fsIdentifier efiSupport efiInstallAsRemovable gfxmodeEfi gfxmodeBios; path = (makeBinPath ([ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else []) @@ -131,51 +131,51 @@ in to the respective devices corresponding to those partitions. ''; - type = types.listOf types.optionSet; + type = with types; listOf (submodule { + options = { - options = { + path = mkOption { + example = "/boot1"; + type = types.str; + description = '' + The path to the boot directory where GRUB will be written. Generally + this boot path should double as an EFI path. + ''; + }; + + efiSysMountPoint = mkOption { + default = null; + example = "/boot1/efi"; + type = types.nullOr types.str; + description = '' + The path to the efi system mount point. Usually this is the same + partition as the above path and can be left as null. + ''; + }; + + efiBootloaderId = mkOption { + default = null; + example = "NixOS-fsid"; + type = types.nullOr types.str; + description = '' + The id of the bootloader to store in efi nvram. + The default is to name it NixOS and append the path or efiSysMountPoint. + This is only used if boot.loader.efi.canTouchEfiVariables is true. + ''; + }; + + devices = mkOption { + default = [ ]; + example = [ "/dev/sda" "/dev/sdb" ]; + type = types.listOf types.str; + description = '' + The path to the devices which will have the GRUB MBR written. + Note these are typically device paths and not paths to partitions. + ''; + }; - path = mkOption { - example = "/boot1"; - type = types.str; - description = '' - The path to the boot directory where GRUB will be written. Generally - this boot path should double as an EFI path. - ''; }; - - efiSysMountPoint = mkOption { - default = null; - example = "/boot1/efi"; - type = types.nullOr types.str; - description = '' - The path to the efi system mount point. Usually this is the same - partition as the above path and can be left as null. - ''; - }; - - efiBootloaderId = mkOption { - default = null; - example = "NixOS-fsid"; - type = types.nullOr types.str; - description = '' - The id of the bootloader to store in efi nvram. - The default is to name it NixOS and append the path or efiSysMountPoint. - This is only used if boot.loader.efi.canTouchEfiVariables is true. - ''; - }; - - devices = mkOption { - default = [ ]; - example = [ "/dev/sda" "/dev/sdb" ]; - type = types.listOf types.str; - description = '' - The path to the devices which will have the GRUB MBR written. - Note these are typically device paths and not paths to partitions. - ''; - }; - - }; + }); }; configurationName = mkOption { @@ -357,6 +357,44 @@ in ''; }; + efiInstallAsRemovable = mkOption { + default = false; + example = true; + type = types.bool; + description = '' + Whether to invoke grub-install with + --removable. + + Unless you turn this on, GRUB will install itself somewhere in + boot.loader.efi.efiSysMountPoint (exactly where + depends on other config variables). If you've set + boot.loader.efi.canTouchEfiVariables *AND* you + are currently booted in UEFI mode, then GRUB will use + efibootmgr to modify the boot order in the + EFI variables of your firmware to include this location. If you are + *not* booted in UEFI mode at the time GRUB is being installed, the + NVRAM will not be modified, and your system will not find GRUB at + boot time. However, GRUB will still return success so you may miss + the warning that gets printed ("efibootmgr: EFI variables + are not supported on this system."). + + If you turn this feature on, GRUB will install itself in a + special location within efiSysMountPoint (namely + EFI/boot/boot$arch.efi) which the firmwares + are hardcoded to try first, regardless of NVRAM EFI variables. + + To summarize, turn this on if: + + You are installing NixOS and want it to boot in UEFI mode, + but you are currently booted in legacy mode + You want to make a drive that will boot regardless of + the NVRAM state of the computer (like a USB "removable" drive) + You simply dislike the idea of depending on NVRAM + state to make your drive bootable + + ''; + }; + enableCryptodisk = mkOption { default = false; type = types.bool; @@ -465,7 +503,7 @@ in + "'boot.loader.grub.mirroredBoots' to make the system bootable."; } { - assertion = all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters); + assertion = cfg.efiSupport || all (c: c < 2) (mapAttrsToList (_: c: c) bootDeviceCounters); message = "You cannot have duplicated devices in mirroredBoots"; } { @@ -484,6 +522,14 @@ in assertion = !cfg.trustedBoot.enable || cfg.trustedBoot.systemHasTPM == "YES_TPM_is_activated"; message = "Trusted GRUB can break the system! Confirm that the system has an activated TPM by setting 'systemHasTPM'."; } + { + assertion = cfg.efiInstallAsRemovable -> cfg.efiSupport; + message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn on boot.loader.grub.efiSupport"; + } + { + assertion = cfg.efiInstallAsRemovable -> !config.boot.loader.efi.canTouchEfiVariables; + message = "If you wish to to use boot.loader.grub.efiInstallAsRemovable, then turn off boot.loader.efi.canTouchEfiVariables"; + } ] ++ flip concatMap cfg.mirroredBoots (args: [ { assertion = args.devices != [ ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 06eece5025f..b93395300b7 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -60,6 +60,7 @@ my $grubTargetEfi = get("grubTargetEfi"); my $bootPath = get("bootPath"); my $storePath = get("storePath"); my $canTouchEfiVariables = get("canTouchEfiVariables"); +my $efiInstallAsRemovable = get("efiInstallAsRemovable"); my $efiSysMountPoint = get("efiSysMountPoint"); my $gfxmodeEfi = get("gfxmodeEfi"); my $gfxmodeBios = get("gfxmodeBios"); @@ -544,13 +545,15 @@ if (($requireNewInstall != 0) && ($efiTarget eq "no" || $efiTarget eq "both")) { # install EFI GRUB if (($requireNewInstall != 0) && ($efiTarget eq "only" || $efiTarget eq "both")) { print STDERR "installing the GRUB $grubVersion EFI boot loader into $efiSysMountPoint...\n"; + my @command = ("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint"); if ($canTouchEfiVariables eq "true") { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--bootloader-id=$bootloaderId") == 0 - or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; + push @command, "--bootloader-id=$bootloaderId"; } else { - system("$grubEfi/sbin/grub-install", "--recheck", "--target=$grubTargetEfi", "--boot-directory=$bootPath", "--efi-directory=$efiSysMountPoint", "--no-nvram") == 0 - or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; + push @command, "--no-nvram"; + push @command, "--removable" if $efiInstallAsRemovable eq "true"; } + + (system @command) == 0 or die "$0: installation of GRUB EFI into $efiSysMountPoint failed\n"; } 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 c703a3e083b..515136c904c 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 @@ -1,4 +1,4 @@ -#! @python@/bin/python +#! @python3@/bin/python3 import argparse import shutil import os @@ -13,29 +13,21 @@ def copy_if_not_exists(source, dest): if not os.path.exists(dest): shutil.copyfile(source, dest) -system_dir = lambda generation: "/nix/var/nix/profiles/system-%d-link" % (generation) +def system_dir(generation): + return "/nix/var/nix/profiles/system-%d-link" % (generation) -def write_entry(generation, kernel, initrd): - entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) - generation_dir = os.readlink(system_dir(generation)) - tmp_path = "%s.tmp" % (entry_file) - kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir) - with open("%s/kernel-params" % (generation_dir)) as params_file: - kernel_params = kernel_params + params_file.read() - with open(tmp_path, 'w') as f: - print >> f, "title NixOS" - print >> f, "version Generation %d" % (generation) - if machine_id is not None: print >> f, "machine-id %s" % (machine_id) - print >> f, "linux %s" % (kernel) - print >> f, "initrd %s" % (initrd) - print >> f, "options %s" % (kernel_params) - os.rename(tmp_path, entry_file) +BOOT_ENTRY = """title NixOS +version Generation {generation} +linux {kernel} +initrd {initrd} +options {kernel_params} +""" def write_loader_conf(generation): with open("@efiSysMountPoint@/loader/loader.conf.tmp", 'w') as f: if "@timeout@" != "": - print >> f, "timeout @timeout@" - print >> f, "default nixos-generation-%d" % (generation) + f.write("timeout @timeout@\n") + f.write("default nixos-generation-%d\n" % generation) os.rename("@efiSysMountPoint@/loader/loader.conf.tmp", "@efiSysMountPoint@/loader/loader.conf") def copy_from_profile(generation, name, dry_run=False): @@ -47,10 +39,23 @@ def copy_from_profile(generation, name, dry_run=False): copy_if_not_exists(store_file_path, "@efiSysMountPoint@%s" % (efi_file_path)) return efi_file_path -def add_entry(generation): - efi_kernel_path = copy_from_profile(generation, "kernel") - efi_initrd_path = copy_from_profile(generation, "initrd") - write_entry(generation, efi_kernel_path, efi_initrd_path) +def write_entry(generation, machine_id): + kernel = copy_from_profile(generation, "kernel") + initrd = copy_from_profile(generation, "initrd") + entry_file = "@efiSysMountPoint@/loader/entries/nixos-generation-%d.conf" % (generation) + generation_dir = os.readlink(system_dir(generation)) + tmp_path = "%s.tmp" % (entry_file) + kernel_params = "systemConfig=%s init=%s/init " % (generation_dir, generation_dir) + with open("%s/kernel-params" % (generation_dir)) as params_file: + kernel_params = kernel_params + params_file.read() + with open(tmp_path, 'w') as f: + f.write(BOOT_ENTRY.format(generation=generation, + kernel=kernel, + initrd=initrd, + kernel_params=kernel_params)) + if machine_id is not None: + f.write("machine-id %s\n" % machine_id) + os.rename(tmp_path, entry_file) def mkdir_p(path): try: @@ -65,8 +70,8 @@ def get_generations(profile): "--list-generations", "-p", "/nix/var/nix/profiles/%s" % (profile), - "--option", "build-users-group", "" - ]) + "--option", "build-users-group", ""], + universal_newlines=True) gen_lines = gen_list.split('\n') gen_lines.pop() return [ int(line.split()[0]) for line in gen_lines ] @@ -89,33 +94,37 @@ def remove_old_entries(gens): if not path in known_paths: os.unlink(path) -parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') -parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') -args = parser.parse_args() +def main(): + parser = argparse.ArgumentParser(description='Update NixOS-related systemd-boot files') + parser.add_argument('default_config', metavar='DEFAULT-CONFIG', help='The default NixOS config to boot') + args = parser.parse_args() -if os.getenv("NIXOS_INSTALL_GRUB") == "1": - warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) - os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1" + if os.getenv("NIXOS_INSTALL_GRUB") == "1": + warnings.warn("NIXOS_INSTALL_GRUB env var deprecated, use NIXOS_INSTALL_BOOTLOADER", DeprecationWarning) + os.environ["NIXOS_INSTALL_BOOTLOADER"] = "1" -if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1": - if "@canTouchEfiVariables@" == "1": - subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"]) - else: - subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "--no-variables", "install"]) + if os.getenv("NIXOS_INSTALL_BOOTLOADER") == "1": + if "@canTouchEfiVariables@" == "1": + subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "install"]) + else: + subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "--no-variables", "install"]) -mkdir_p("@efiSysMountPoint@/efi/nixos") -mkdir_p("@efiSysMountPoint@/loader/entries") -try: - with open("/etc/machine-id") as machine_file: - machine_id = machine_file.readlines()[0] -except IOError as e: - if e.errno != errno.ENOENT: - raise - machine_id = None + mkdir_p("@efiSysMountPoint@/efi/nixos") + mkdir_p("@efiSysMountPoint@/loader/entries") + try: + with open("/etc/machine-id") as machine_file: + machine_id = machine_file.readlines()[0] + except IOError as e: + if e.errno != errno.ENOENT: + raise + machine_id = None -gens = get_generations("system") -remove_old_entries(gens) -for gen in gens: - add_entry(gen) - if os.readlink(system_dir(gen)) == args.default_config: - write_loader_conf(gen) + gens = get_generations("system") + remove_old_entries(gens) + for gen in gens: + write_entry(gen, machine_id) + if os.readlink(system_dir(gen)) == args.default_config: + write_loader_conf(gen) + +if __name__ == '__main__': + main() 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 a778a4f539c..cc43fb8bab4 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -12,7 +12,7 @@ let isExecutable = true; - inherit (pkgs) python; + inherit (pkgs) python3; systemd = config.systemd.package; diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index f2755b49f88..1f412fe2d8f 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -236,165 +236,165 @@ in /dev/mapper/name. ''; - type = types.loaOf types.optionSet; + type = with types; loaOf (submodule ( + { name, ... }: { options = { - options = { name, ... }: { options = { - - name = mkOption { - visible = false; - default = name; - example = "luksroot"; - type = types.str; - description = "Name of the unencrypted device in /dev/mapper."; - }; - - device = mkOption { - example = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; - type = types.str; - description = "Path of the underlying encrypted block device."; - }; - - header = mkOption { - default = null; - example = "/root/header.img"; - type = types.nullOr types.str; - description = '' - The name of the file or block device that - should be used as header for the encrypted device. - ''; - }; - - keyFile = mkOption { - default = null; - example = "/dev/sdb1"; - type = types.nullOr types.str; - description = '' - The name of the file (can be a raw device or a partition) that - should be used as the decryption key for the encrypted device. If - not specified, you will be prompted for a passphrase instead. - ''; - }; - - keyFileSize = mkOption { - default = null; - example = 4096; - type = types.nullOr types.int; - description = '' - The size of the key file. Use this if only the beginning of the - key file should be used as a key (often the case if a raw device - or partition is used as key file). If not specified, the whole - keyFile will be used decryption, instead of just - the first keyFileSize bytes. - ''; - }; - - # FIXME: get rid of this option. - preLVM = mkOption { - default = true; - type = types.bool; - description = "Whether the luksOpen will be attempted before LVM scan or after it."; - }; - - allowDiscards = mkOption { - default = false; - type = types.bool; - description = '' - Whether to allow TRIM requests to the underlying device. This option - has security implications; please read the LUKS documentation before - activating it. - ''; - }; - - yubikey = mkOption { - default = null; - type = types.nullOr types.optionSet; - description = '' - The options to use for this LUKS device in Yubikey-PBA. - If null (the default), Yubikey-PBA will be disabled for this device. - ''; - - options = { - twoFactor = mkOption { - default = true; - type = types.bool; - description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)."; - }; - - slot = mkOption { - default = 2; - type = types.int; - description = "Which slot on the Yubikey to challenge."; - }; - - saltLength = mkOption { - default = 16; - type = types.int; - description = "Length of the new salt in byte (64 is the effective maximum)."; - }; - - keyLength = mkOption { - default = 64; - type = types.int; - description = "Length of the LUKS slot key derived with PBKDF2 in byte."; - }; - - iterationStep = mkOption { - default = 0; - type = types.int; - description = "How much the iteration count for PBKDF2 is increased at each successful authentication."; - }; - - gracePeriod = mkOption { - default = 2; - type = types.int; - description = "Time in seconds to wait before attempting to find the Yubikey."; - }; - - ramfsMountPoint = mkOption { - default = "/crypt-ramfs"; - type = types.str; - description = "Path where the ramfs used to update the LUKS key will be mounted during early boot."; - }; - - /* TODO: Add to the documentation of the current module: - - Options related to the storing the salt. - */ - storage = { - device = mkOption { - default = "/dev/sda1"; - type = types.path; - description = '' - An unencrypted device that will temporarily be mounted in stage-1. - Must contain the current salt to create the challenge for this LUKS device. - ''; - }; - - fsType = mkOption { - default = "vfat"; - type = types.str; - description = "The filesystem of the unencrypted device."; - }; - - mountPoint = mkOption { - default = "/crypt-storage"; - type = types.str; - description = "Path where the unencrypted device will be mounted during early boot."; - }; - - path = mkOption { - default = "/crypt-storage/default"; - type = types.str; - description = '' - Absolute path of the salt on the unencrypted device with - that device's root directory as "/". - ''; - }; - }; + name = mkOption { + visible = false; + default = name; + example = "luksroot"; + type = types.str; + description = "Name of the unencrypted device in /dev/mapper."; }; - }; - }; }; + device = mkOption { + example = "/dev/disk/by-uuid/430e9eff-d852-4f68-aa3b-2fa3599ebe08"; + type = types.str; + description = "Path of the underlying encrypted block device."; + }; + + header = mkOption { + default = null; + example = "/root/header.img"; + type = types.nullOr types.str; + description = '' + The name of the file or block device that + should be used as header for the encrypted device. + ''; + }; + + keyFile = mkOption { + default = null; + example = "/dev/sdb1"; + type = types.nullOr types.str; + description = '' + The name of the file (can be a raw device or a partition) that + should be used as the decryption key for the encrypted device. If + not specified, you will be prompted for a passphrase instead. + ''; + }; + + keyFileSize = mkOption { + default = null; + example = 4096; + type = types.nullOr types.int; + description = '' + The size of the key file. Use this if only the beginning of the + key file should be used as a key (often the case if a raw device + or partition is used as key file). If not specified, the whole + keyFile will be used decryption, instead of just + the first keyFileSize bytes. + ''; + }; + + # FIXME: get rid of this option. + preLVM = mkOption { + default = true; + type = types.bool; + description = "Whether the luksOpen will be attempted before LVM scan or after it."; + }; + + allowDiscards = mkOption { + default = false; + type = types.bool; + description = '' + Whether to allow TRIM requests to the underlying device. This option + has security implications; please read the LUKS documentation before + activating it. + ''; + }; + + yubikey = mkOption { + default = null; + description = '' + The options to use for this LUKS device in Yubikey-PBA. + If null (the default), Yubikey-PBA will be disabled for this device. + ''; + + type = with types; nullOr (submodule { + options = { + twoFactor = mkOption { + default = true; + type = types.bool; + description = "Whether to use a passphrase and a Yubikey (true), or only a Yubikey (false)."; + }; + + slot = mkOption { + default = 2; + type = types.int; + description = "Which slot on the Yubikey to challenge."; + }; + + saltLength = mkOption { + default = 16; + type = types.int; + description = "Length of the new salt in byte (64 is the effective maximum)."; + }; + + keyLength = mkOption { + default = 64; + type = types.int; + description = "Length of the LUKS slot key derived with PBKDF2 in byte."; + }; + + iterationStep = mkOption { + default = 0; + type = types.int; + description = "How much the iteration count for PBKDF2 is increased at each successful authentication."; + }; + + gracePeriod = mkOption { + default = 2; + type = types.int; + description = "Time in seconds to wait before attempting to find the Yubikey."; + }; + + ramfsMountPoint = mkOption { + default = "/crypt-ramfs"; + type = types.str; + description = "Path where the ramfs used to update the LUKS key will be mounted during early boot."; + }; + + /* TODO: Add to the documentation of the current module: + + Options related to the storing the salt. + */ + storage = { + device = mkOption { + default = "/dev/sda1"; + type = types.path; + description = '' + An unencrypted device that will temporarily be mounted in stage-1. + Must contain the current salt to create the challenge for this LUKS device. + ''; + }; + + fsType = mkOption { + default = "vfat"; + type = types.str; + description = "The filesystem of the unencrypted device."; + }; + + mountPoint = mkOption { + default = "/crypt-storage"; + type = types.str; + description = "Path where the unencrypted device will be mounted during early boot."; + }; + + path = mkOption { + default = "/crypt-storage/default"; + type = types.str; + description = '' + Absolute path of the salt on the unencrypted device with + that device's root directory as "/". + ''; + }; + }; + }; + }); + }; + + }; })); }; boot.initrd.luks.yubikeySupport = mkOption { diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 38b4b437369..8c139a94c0c 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -296,35 +296,35 @@ let }; addressOptions = { - - addressConfig = mkOption { - default = {}; - example = { Address = "192.168.0.100/24"; }; - type = types.addCheck (types.attrsOf unitOption) checkAddress; - description = '' - Each attribute in this set specifies an option in the - [Address] section of the unit. See - systemd.network - 5 for details. - ''; + options = { + addressConfig = mkOption { + default = {}; + example = { Address = "192.168.0.100/24"; }; + type = types.addCheck (types.attrsOf unitOption) checkAddress; + description = '' + Each attribute in this set specifies an option in the + [Address] section of the unit. See + systemd.network + 5 for details. + ''; + }; }; - }; routeOptions = { - - routeConfig = mkOption { - default = {}; - example = { Gateway = "192.168.0.1"; }; - type = types.addCheck (types.attrsOf unitOption) checkRoute; - description = '' - Each attribute in this set specifies an option in the - [Route] section of the unit. See - systemd.network - 5 for details. - ''; + options = { + routeConfig = mkOption { + default = {}; + example = { Gateway = "192.168.0.1"; }; + type = types.addCheck (types.attrsOf unitOption) checkRoute; + description = '' + Each attribute in this set specifies an option in the + [Route] section of the unit. See + systemd.network + 5 for details. + ''; + }; }; - }; networkOptions = commonNetworkOptions // { @@ -471,8 +471,7 @@ let addresses = mkOption { default = [ ]; - type = types.listOf types.optionSet; - options = [ addressOptions ]; + type = with types; listOf (submodule addressOptions); description = '' A list of address sections to be added to the unit. See systemd.network @@ -482,8 +481,7 @@ let routes = mkOption { default = [ ]; - type = types.listOf types.optionSet; - options = [ routeOptions ]; + type = with types; listOf (submodule routeOptions); description = '' A list of route sections to be added to the unit. See systemd.network @@ -624,35 +622,32 @@ in systemd.network.links = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ linkOptions ]; + type = with types; attrsOf (submodule [ { options = linkOptions; } ]); description = "Definition of systemd network links."; }; systemd.network.netdevs = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ netdevOptions ]; + type = with types; attrsOf (submodule [ { options = netdevOptions; } ]); description = "Definition of systemd network devices."; }; systemd.network.networks = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ networkOptions networkConfig ]; + type = with types; attrsOf (submodule [ { options = networkOptions; } networkConfig ]); description = "Definition of systemd networks."; }; systemd.network.units = mkOption { description = "Definition of networkd units."; default = {}; - type = types.attrsOf types.optionSet; - options = { name, config, ... }: + type = with types; attrsOf (submodule ( + { name, config, ... }: { options = concreteUnitOptions; config = { unit = mkDefault (makeUnit name config); }; - }; + })); }; }; @@ -672,7 +667,6 @@ in systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; - before = [ "network-interfaces.target" ]; restartTriggers = [ config.environment.etc."systemd/network".source ]; }; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 513c121347b..61def24efd8 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -34,7 +34,7 @@ let # copy what we need. Instead of using statically linked binaries, # we just copy what we need from Glibc and use patchelf to make it # work. - extraUtils = pkgs.runCommand "extra-utils" + extraUtils = pkgs.runCommandCC "extra-utils" { buildInputs = [pkgs.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } @@ -134,10 +134,9 @@ let ''; # */ - udevRules = pkgs.stdenv.mkDerivation { - name = "udev-rules"; - allowedReferences = [ extraUtils ]; - buildCommand = '' + udevRules = pkgs.runCommand "udev-rules" + { allowedReferences = [ extraUtils ]; } + '' mkdir -p $out echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules @@ -176,7 +175,6 @@ let substituteInPlace $out/60-persistent-storage.rules \ --replace ID_CDROM_MEDIA_TRACK_COUNT_DATA ID_CDROM_MEDIA ''; # */ - }; # The init script of boot stage 1 (loading kernel modules for @@ -198,9 +196,10 @@ let preLVMCommands preDeviceCommands postDeviceCommands postMountCommands preFailCommands kernelModules; resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}") - (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption - # Don't include zram devices - && !(hasPrefix "/dev/zram" sd.device)) config.swapDevices); + (filter (sd: hasPrefix "/dev/" sd.device && !sd.randomEncryption + # Don't include zram devices + && !(hasPrefix "/dev/zram" sd.device) + ) config.swapDevices); fsInfo = let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType (builtins.concatStringsSep "," fs.options) ]; @@ -229,16 +228,12 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } - { object = pkgs.stdenv.mkDerivation { - name = "initrd-kmod-blacklist-ubuntu"; - builder = pkgs.writeText "builder.sh" '' - source $stdenv/setup + { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" + { src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; } + '' target=$out - ${pkgs.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out ''; - src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; - }; symlink = "/etc/modprobe.d/ubuntu.conf"; } { object = pkgs.kmod-debian-aliases; diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index ae88222f278..f827e530f87 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -111,16 +111,6 @@ rm -f /etc/{group,passwd,shadow}.lock rm -rf /nix/var/nix/gcroots/tmp /nix/var/nix/temproots -# Create a ramfs on /run/keys to hold secrets that shouldn't be -# written to disk (generally used for NixOps, harmless elsewhere). -if ! mountpoint -q /run/keys; then - rm -rf /run/keys - mkdir /run/keys - mount -t ramfs ramfs /run/keys - chown 0:96 /run/keys - chmod 0750 /run/keys -fi - mkdir -m 0755 -p /run/lock diff --git a/nixos/modules/system/boot/systemd-lib.nix b/nixos/modules/system/boot/systemd-lib.nix index 2e93693cbfc..997770b8bec 100644 --- a/nixos/modules/system/boot/systemd-lib.nix +++ b/nixos/modules/system/boot/systemd-lib.nix @@ -182,7 +182,7 @@ rec { mkdir -p $out/getty.target.wants/ ln -s ../autovt@tty1.service $out/getty.target.wants/ - ln -s ../local-fs.target ../remote-fs.target ../network.target \ + ln -s ../local-fs.target ../remote-fs.target \ ../nss-lookup.target ../nss-user-lookup.target ../swap.target \ $out/multi-user.target.wants/ ''} diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix new file mode 100644 index 00000000000..2527ab35719 --- /dev/null +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -0,0 +1,121 @@ +{ config, lib , pkgs, ...}: + +with lib; +with import ./systemd-unit-options.nix { inherit config lib; }; +with import ./systemd-lib.nix { inherit config lib pkgs; }; + +let + cfg = config.systemd.nspawn; + assertions = [ + # boot = true -> processtwo != true + ]; + + checkExec = checkUnitConfig "Exec" [ + (assertOnlyFields [ + "Boot" "ProcessTwo" "Parameters" "Environment" "User" "WorkingDirectory" + "Capability" "DropCapability" "KillSignal" "Personality" "MachineId" + "PrivateUsers" + ]) + (assertValueOneOf "Boot" boolValues) + (assertValueOneOf "ProcessTwo" boolValues) + (assertValueOneOf "PrivateUsers" (boolValues ++ [ "pick" ])) + ]; + + checkFiles = checkUnitConfig "Files" [ + (assertOnlyFields [ + "ReadOnly" "Volatile" "Bind" "BindReadOnly" "TemporaryFileSystems" + "PrivateUsersChown" + ]) + (assertValueOneOf "ReadOnly" boolValues) + (assertValueOneOf "Volatile" (boolValues ++ [ "state" ])) + (assertValueOneOf "PrivateUsersChown" boolValues) + ]; + + checkNetwork = checkUnitConfig "Network" [ + (assertOnlyFields [ + "Private" "VirtualEthernet" "VirtualEthernetExtra" "Interface" "MACVLAN" + "IPVLAN" "Bridge" "Zone" "Port" + ]) + (assertValueOneOf "Private" boolValues) + (assertValueOneOf "VirtualEthernet" boolValues) + ]; + + instanceOptions = { + + execConfig = mkOption { + default = {}; + example = { Parameters = "/bin/sh"; }; + type = types.addCheck (types.attrsOf unitOption) checkExec; + description = '' + Each attribute in this set specifies an option in the + [Exec] section of this unit. See + systemd.nspawn + 5 for details. + ''; + }; + + filesConfig = mkOption { + default = {}; + example = { Bind = [ "/home/alice" ]; }; + type = types.addCheck (types.attrsOf unitOption) checkFiles; + description = '' + Each attribute in this set specifies an option in the + [Files] section of this unit. See + systemd.nspawn + 5 for details. + ''; + }; + + networkConfig = mkOption { + default = {}; + example = { Private = false; }; + type = types.addCheck (types.attrsOf unitOption) checkNetwork; + description = '' + Each attribute in this set specifies an option in the + [Network] section of this unit. See + systemd.nspawn + 5 for details. + ''; + }; + + }; + + instanceToUnit = name: def: + { text = '' + [Exec] + ${attrsToSection def.execConfig} + + [Files] + ${attrsToSection def.filesConfig} + + [Network] + ${attrsToSection def.networkConfig} + ''; + }; + +in { + + options = { + + systemd.nspawn = mkOption { + default = {}; + type = types.attrsOf types.optionSet; + options = [ instanceOptions ]; + description = "Definition of systemd-nspawn configurations."; + }; + + }; + + config = + let + units = mapAttrs' (n: v: nameValuePair "${n}.nspawn" (instanceToUnit n v)) cfg.instances; + in mkIf (cfg != {}) { + + environment.etc."systemd/nspawn".source = generateUnits "nspawn" units [] []; + + systemd.services."systemd-nspawn@" = { + wantedBy = [ "machine.target" ]; + }; + }; + +} diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix index f4892244de4..731b1701e00 100644 --- a/nixos/modules/system/boot/systemd-unit-options.nix +++ b/nixos/modules/system/boot/systemd-unit-options.nix @@ -77,6 +77,12 @@ in rec { description = "Description of this unit used in systemd messages and progress indicators."; }; + documentation = mkOption { + default = []; + type = types.listOf types.str; + description = "A list of URIs referencing documentation for this unit or its configuration."; + }; + requires = mkOption { default = []; type = types.listOf types.str; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 3fa257f9668..d44c2e234b0 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -185,6 +185,8 @@ let "timers.target" ]; + boolToString = value: if value then "yes" else "no"; + makeJobScript = name: text: let mkScriptName = s: (replaceChars [ "\\" ] [ "-" ] (shellEscape s) ); x = pkgs.writeTextFile { name = "unit-script"; executable = true; destination = "/bin/${mkScriptName name}"; inherit text; }; @@ -212,8 +214,10 @@ let // optionalAttrs (config.restartTriggers != []) { X-Restart-Triggers = toString config.restartTriggers; } // optionalAttrs (config.description != "") { - Description = config.description; - } // optionalAttrs (config.onFailure != []) { + Description = config.description; } + // optionalAttrs (config.documentation != []) { + Documentation = toString config.documentation; } + // optionalAttrs (config.onFailure != []) { OnFailure = toString config.onFailure; }; }; @@ -389,13 +393,13 @@ in systemd.units = mkOption { description = "Definition of systemd units."; default = {}; - type = types.attrsOf types.optionSet; - options = { name, config, ... }: + type = with types; attrsOf (submodule ( + { name, config, ... }: { options = concreteUnitOptions; config = { unit = mkDefault (makeUnit name config); }; - }; + })); }; systemd.packages = mkOption { @@ -406,43 +410,37 @@ in systemd.targets = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ targetOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = targetOptions; } unitConfig] ); description = "Definition of systemd target units."; }; systemd.services = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ serviceOptions unitConfig serviceConfig ]; + type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ]); description = "Definition of systemd service units."; }; systemd.sockets = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ socketOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = socketOptions; } unitConfig ]); description = "Definition of systemd socket units."; }; systemd.timers = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ timerOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ]); description = "Definition of systemd timer units."; }; systemd.paths = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ pathOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = pathOptions; } unitConfig ]); description = "Definition of systemd path units."; }; systemd.mounts = mkOption { default = []; - type = types.listOf types.optionSet; - options = [ mountOptions unitConfig mountConfig ]; + type = with types; listOf (submodule [ { options = mountOptions; } unitConfig mountConfig ]); description = '' Definition of systemd mount units. This is a list instead of an attrSet, because systemd mandates the names to be derived from @@ -452,8 +450,7 @@ in systemd.automounts = mkOption { default = []; - type = types.listOf types.optionSet; - options = [ automountOptions unitConfig automountConfig ]; + type = with types; listOf (submodule [ { options = automountOptions; } unitConfig automountConfig ]); description = '' Definition of systemd automount units. This is a list instead of an attrSet, because systemd mandates the names to be derived from @@ -571,6 +568,16 @@ in ''; }; + systemd.user.extraConfig = mkOption { + default = ""; + type = types.lines; + example = "DefaultCPUAccounting=yes"; + description = '' + Extra config options for systemd user instances. See man systemd-user.conf for + available options. + ''; + }; + systemd.tmpfiles.rules = mkOption { type = types.listOf types.str; default = []; @@ -590,36 +597,39 @@ in systemd.user.units = mkOption { description = "Definition of systemd per-user units."; default = {}; - type = types.attrsOf types.optionSet; - options = { name, config, ... }: + type = with types; attrsOf (submodule ( + { name, config, ... }: { options = concreteUnitOptions; config = { unit = mkDefault (makeUnit name config); }; - }; + })); }; systemd.user.services = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ serviceOptions unitConfig serviceConfig ]; + type = with types; attrsOf (submodule [ { options = serviceOptions; } unitConfig serviceConfig ] ); description = "Definition of systemd per-user service units."; }; systemd.user.timers = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ timerOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = timerOptions; } unitConfig ] ); description = "Definition of systemd per-user timer units."; }; systemd.user.sockets = mkOption { default = {}; - type = types.attrsOf types.optionSet; - options = [ socketOptions unitConfig ]; + type = with types; attrsOf (submodule [ { options = socketOptions; } unitConfig ] ); description = "Definition of systemd per-user socket units."; }; + systemd.user.targets = mkOption { + default = {}; + type = with types; attrsOf (submodule [ { options = targetOptions; } unitConfig] ); + description = "Definition of systemd per-user target units."; + }; + systemd.additionalUpstreamSystemUnits = mkOption { default = [ ]; type = types.listOf types.str; @@ -665,6 +675,11 @@ in ${config.systemd.extraConfig} ''; + "systemd/user.conf".text = '' + [Manager] + ${config.systemd.user.extraConfig} + ''; + "systemd/journald.conf".text = '' [Journal] RateLimitInterval=${config.services.journald.rateLimitInterval} @@ -727,8 +742,6 @@ in unitConfig.X-StopOnReconfiguration = true; }; - systemd.targets.network-online.after = [ "ip-up.target" ]; - systemd.units = mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.targets // mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.services @@ -745,6 +758,7 @@ in systemd.user.units = mapAttrs' (n: v: nameValuePair "${n}.service" (serviceToUnit n v)) cfg.user.services // mapAttrs' (n: v: nameValuePair "${n}.socket" (socketToUnit n v)) cfg.user.sockets + // mapAttrs' (n: v: nameValuePair "${n}.target" (targetToUnit n v)) cfg.user.targets // mapAttrs' (n: v: nameValuePair "${n}.timer" (timerToUnit n v)) cfg.user.timers; system.requiredKernelConfig = map config.lib.kernelConfig.isEnabled @@ -795,6 +809,8 @@ in systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions. systemd.services.systemd-logind.restartTriggers = [ config.environment.etc."systemd/logind.conf".source ]; systemd.services.systemd-logind.stopIfChanged = false; + systemd.services.systemd-journald.restartTriggers = [ config.environment.etc."systemd/journald.conf".source ]; + systemd.services.systemd-journald.stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ]; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 163f4f4106e..fd6e58cd5b4 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -8,7 +8,7 @@ let etc' = filter (f: f.enable) (attrValues config.environment.etc); - etc = pkgs.stdenv.mkDerivation { + etc = pkgs.stdenvNoCC.mkDerivation { name = "etc"; builder = ./make-etc.sh; @@ -33,7 +33,6 @@ in options = { environment.etc = mkOption { - type = types.loaOf types.optionSet; default = {}; example = literalExample '' { example-configuration-file = @@ -47,7 +46,8 @@ in Set of files that have to be linked in /etc. ''; - options = singleton ({ name, config, ... }: + type = with types; loaOf (submodule ( + { name, config, ... }: { options = { enable = mkOption { @@ -117,7 +117,7 @@ in in mkDefault (pkgs.writeText name' config.text)); }; - }); + })); }; diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 3c822c8716d..49ba66ad50a 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -18,7 +18,7 @@ let prioOption = prio: optionalString (prio != null) " pri=${toString prio}"; - specialFSTypes = [ "proc" "sysfs" "tmpfs" "devtmpfs" "devpts" ]; + specialFSTypes = [ "proc" "sysfs" "tmpfs" "ramfs" "devtmpfs" "devpts" ]; coreFileSystemOpts = { name, config, ... }: { @@ -258,7 +258,7 @@ in let mountPoint' = "${escapeSystemdPath fs.mountPoint}.mount"; device' = escapeSystemdPath fs.device; - device'' = "${device}.device"; + device'' = "${device'}.device"; in nameValuePair "mkfs-${device'}" { description = "Initialisation of Filesystem ${fs.device}"; wantedBy = [ mountPoint' ]; @@ -290,6 +290,9 @@ in "/dev" = { fsType = "devtmpfs"; options = [ "nosuid" "strictatime" "mode=755" "size=${config.boot.devSize}" ]; }; "/dev/shm" = { fsType = "tmpfs"; options = [ "nosuid" "nodev" "strictatime" "mode=1777" "size=${config.boot.devShmSize}" ]; }; "/dev/pts" = { fsType = "devpts"; options = [ "nosuid" "noexec" "mode=620" "gid=${toString config.ids.gids.tty}" ]; }; + + # To hold secrets that shouldn't be written to disk (generally used for NixOps, harmless elsewhere) + "/run/keys" = { fsType = "ramfs"; options = [ "nosuid" "nodev" "mode=750" "gid=${toString config.ids.gids.keys}" ]; }; } // optionalAttrs (!config.boot.isContainer) { # systemd-nspawn populates /sys by itself, and remounting it causes all # kinds of weird issues (most noticeably, waiting for host disk device diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 627762bd60d..c50ea5c7964 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -46,6 +46,23 @@ in systemd.services = let + deviceDependency = dev: + if (config.boot.isContainer == false) + then + # Trust udev when not in the container + optional (dev != null) (subsystemDevice dev) + else + # When in the container, check whether the interface is built from other definitions + if (hasAttr dev cfg.bridges) || + (hasAttr dev cfg.bonds) || + (hasAttr dev cfg.macvlans) || + (hasAttr dev cfg.sits) || + (hasAttr dev cfg.vlans) || + (hasAttr dev cfg.vswitches) || + (hasAttr dev cfg.wlanInterfaces) + then [ "${dev}-netdev.service" ] + else []; + networkLocalCommands = { after = [ "network-setup.service" ]; bindsTo = [ "network-setup.service" ]; @@ -54,16 +71,22 @@ in networkSetup = { description = "Networking Setup"; - after = [ "network-interfaces.target" "network-pre.target" ]; - before = [ "network.target" ]; - wantedBy = [ "network.target" ]; + after = [ "network-pre.target" "systemd-udevd.service" "systemd-sysctl.service" ]; + before = [ "network.target" "shutdown.target" ]; + wants = [ "network.target" ]; + conflicts = [ "shutdown.target" ]; + wantedBy = [ "multi-user.target" ]; unitConfig.ConditionCapability = "CAP_NET_ADMIN"; path = [ pkgs.iproute ]; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + + unitConfig.DefaultDependencies = false; script = '' @@ -108,10 +131,14 @@ in in nameValuePair "network-addresses-${i.name}" { description = "Address configuration of ${i.name}"; - wantedBy = [ "network-interfaces.target" ]; - before = [ "network-interfaces.target" ]; - bindsTo = [ (subsystemDevice i.name) ]; - after = [ (subsystemDevice i.name) "network-pre.target" ]; + wantedBy = [ "network-setup.service" ]; + # propagate stop and reload from network-setup + partOf = [ "network-setup.service" ]; + # order before network-setup because the routes that are configured + # there may need ip addresses configured + before = [ "network-setup.service" ]; + bindsTo = deviceDependency i.name; + after = [ "network-pre.target" ] ++ (deviceDependency i.name); serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -129,21 +156,11 @@ in echo "checking ip ${address}..." if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then echo "added ip ${address}..." - restart_network_setup=true elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then echo "failed to add ${address}" exit 1 fi - '') - + optionalString (ips != [ ]) - '' - if [ "$restart_network_setup" = "true" ]; then - # Ensure that the default gateway remains set. - # (Flushing this interface may have removed it.) - ${config.systemd.package}/bin/systemctl try-restart --no-block network-setup.service - fi - ${config.systemd.package}/bin/systemctl start network-online.target - ''; + ''); preStop = flip concatMapStrings (ips) (ip: let address = "${ip.address}/${toString ip.prefixLength}"; @@ -157,10 +174,11 @@ in createTunDevice = i: nameValuePair "${i.name}-netdev" { description = "Virtual Network Interface ${i.name}"; - requires = [ "dev-net-tun.device" ]; + bindsTo = [ "dev-net-tun.device" ]; after = [ "dev-net-tun.device" "network-pre.target" ]; - wantedBy = [ "network.target" (subsystemDevice i.name) ]; - before = [ "network-interfaces.target" (subsystemDevice i.name) ]; + wantedBy = [ "network-setup.service" (subsystemDevice i.name) ]; + partOf = [ "network-setup.service" ]; + before = [ "network-setup.service" (subsystemDevice i.name) ]; path = [ pkgs.iproute ]; serviceConfig = { Type = "oneshot"; @@ -178,15 +196,15 @@ in createBridgeDevice = n: v: nameValuePair "${n}-netdev" (let - deps = map subsystemDevice v.interfaces; + deps = concatLists (map deviceDependency v.interfaces); in { description = "Bridge Interface ${n}"; - wantedBy = [ "network.target" (subsystemDevice n) ]; + wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps ++ optional v.rstp "mstpd.service"; - partOf = optional v.rstp "mstpd.service"; + partOf = [ "network-setup.service" ] ++ optional v.rstp "mstpd.service"; after = [ "network-pre.target" "mstpd.service" ] ++ deps ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces; - before = [ "network-interfaces.target" (subsystemDevice n) ]; + before = [ "network-setup.service" (subsystemDevice n) ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -219,15 +237,15 @@ in createVswitchDevice = n: v: nameValuePair "${n}-netdev" (let - deps = map subsystemDevice v.interfaces; + deps = concatLists (map deviceDependency v.interfaces); ofRules = pkgs.writeText "vswitch-${n}-openFlowRules" v.openFlowRules; in { description = "Open vSwitch Interface ${n}"; - wantedBy = [ "network.target" "vswitchd.service" ] ++ deps; + wantedBy = [ "network-setup.service" "vswitchd.service" ] ++ deps; bindsTo = [ "vswitchd.service" (subsystemDevice n) ] ++ deps; - partOf = [ "vswitchd.service" ]; + partOf = [ "network-setup.service" "vswitchd.service" ]; after = [ "network-pre.target" "vswitchd.service" ] ++ deps; - before = [ "network-interfaces.target" ]; + before = [ "network-setup.service" ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute config.virtualisation.vswitch.package ]; @@ -252,14 +270,15 @@ in createBondDevice = n: v: nameValuePair "${n}-netdev" (let - deps = map subsystemDevice v.interfaces; + deps = concatLists (map deviceDependency v.interfaces); in { description = "Bond Interface ${n}"; - wantedBy = [ "network.target" (subsystemDevice n) ]; + wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps ++ concatMap (i: [ "network-addresses-${i}.service" "network-link-${i}.service" ]) v.interfaces; - before = [ "network-interfaces.target" (subsystemDevice n) ]; + before = [ "network-setup.service" (subsystemDevice n) ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute pkgs.gawk ]; @@ -289,13 +308,14 @@ in createMacvlanDevice = n: v: nameValuePair "${n}-netdev" (let - deps = [ (subsystemDevice v.interface) ]; + deps = deviceDependency v.interface; in { description = "Vlan Interface ${n}"; - wantedBy = [ "network.target" (subsystemDevice n) ]; + wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-interfaces.target" (subsystemDevice n) ]; + before = [ "network-setup.service" (subsystemDevice n) ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -313,13 +333,14 @@ in createSitDevice = n: v: nameValuePair "${n}-netdev" (let - deps = optional (v.dev != null) (subsystemDevice v.dev); + deps = deviceDependency v.dev; in { description = "6-to-4 Tunnel Interface ${n}"; - wantedBy = [ "network.target" (subsystemDevice n) ]; + wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-interfaces.target" (subsystemDevice n) ]; + before = [ "network-setup.service" (subsystemDevice n) ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; @@ -340,13 +361,14 @@ in createVlanDevice = n: v: nameValuePair "${n}-netdev" (let - deps = [ (subsystemDevice v.interface) ]; + deps = deviceDependency v.interface; in { description = "Vlan Interface ${n}"; - wantedBy = [ "network.target" (subsystemDevice n) ]; + wantedBy = [ "network-setup.service" (subsystemDevice n) ]; bindsTo = deps; + partOf = [ "network-setup.service" ]; after = [ "network-pre.target" ] ++ deps; - before = [ "network-interfaces.target" (subsystemDevice n) ]; + before = [ "network-setup.service" (subsystemDevice n) ]; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; path = [ pkgs.iproute ]; diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index 301ee43fd0e..974041d7e1a 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -43,7 +43,7 @@ in message = "networking.bridges.${n}.rstp is not supported by networkd."; }); - systemd.services.dhcpcd.enable = mkDefault false; + networking.dhcpcd.enable = mkDefault false; systemd.services.network-local-commands = { after = [ "systemd-networkd.service" ]; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index c52bd904cae..aae4dc5fdad 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -97,21 +97,22 @@ let addrOpts = v: assert v == 4 || v == 6; - { - address = mkOption { - type = types.str; - description = '' - IPv${toString v} address of the interface. Leave empty to configure the - interface using DHCP. - ''; - }; + { options = { + address = mkOption { + type = types.str; + description = '' + IPv${toString v} address of the interface. Leave empty to configure the + interface using DHCP. + ''; + }; - prefixLength = mkOption { - type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); - description = '' - Subnet mask of the interface, specified as the number of - bits in the prefix (${if v == 4 then "24" else "64"}). - ''; + prefixLength = mkOption { + type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + description = '' + Subnet mask of the interface, specified as the number of + bits in the prefix (${if v == 4 then "24" else "64"}). + ''; + }; }; }; @@ -141,8 +142,7 @@ let { address = "10.0.0.1"; prefixLength = 16; } { address = "192.168.1.1"; prefixLength = 24; } ]; - type = types.listOf types.optionSet; - options = addrOpts 4; + type = with types; listOf (submodule (addrOpts 4)); description = '' List of IPv4 addresses that will be statically assigned to the interface. ''; @@ -154,8 +154,7 @@ let { address = "fdfd:b3f0:482::1"; prefixLength = 48; } { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; } ]; - type = types.listOf types.optionSet; - options = addrOpts 6; + type = with types; listOf (submodule (addrOpts 6)); description = '' List of IPv6 addresses that will be statically assigned to the interface. ''; @@ -231,7 +230,7 @@ let type = types.bool; description = '' Whether this interface is virtual and should be created by tunctl. - This is mainly useful for creating bridges between a host a virtual + This is mainly useful for creating bridges between a host and a virtual network such as VPN or a virtual machine. ''; }; @@ -311,9 +310,9 @@ in generate a random 32-bit ID using the following commands: cksum /etc/machine-id | while read c rest; do printf "%x" $c; done - + (this derives it from the machine-id that systemd generates) or - + head -c4 /dev/urandom | od -A none -t x4 ''; }; @@ -391,7 +390,7 @@ in }; networking.localCommands = mkOption { - type = types.str; + type = types.lines; default = ""; example = "text=anything; echo You can put $text here."; description = '' @@ -415,8 +414,7 @@ in is true, then every interface not listed here will be configured using DHCP. ''; - type = types.loaOf types.optionSet; - options = [ interfaceOpts ]; + type = with types; loaOf (submodule interfaceOpts); }; networking.vswitches = mkOption { @@ -434,53 +432,55 @@ in interface. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + interfaces = mkOption { + example = [ "eth0" "eth1" ]; + type = types.listOf types.str; + description = + "The physical network interfaces connected by the vSwitch."; + }; + + controllers = mkOption { + type = types.listOf types.str; + default = []; + example = [ "ptcp:6653:[::1]" ]; + description = '' + Specify the controller targets. For the allowed options see man 8 ovs-vsctl. + ''; + }; + + openFlowRules = mkOption { + type = types.lines; + default = ""; + example = '' + actions=normal + ''; + description = '' + OpenFlow rules to insert into the Open vSwitch. All openFlowRules are + loaded with ovs-ofctl within one atomic operation. + ''; + }; + + extraOvsctlCmds = mkOption { + type = types.lines; + default = ""; + example = '' + set-fail-mode secure + set Bridge stp_enable=true + ''; + description = '' + Commands to manipulate the Open vSwitch database. Every line executed with ovs-vsctl. + All commands are bundled together with the operations for adding the interfaces + into one atomic operation. + ''; + }; - interfaces = mkOption { - example = [ "eth0" "eth1" ]; - type = types.listOf types.str; - description = - "The physical network interfaces connected by the vSwitch."; }; - controllers = mkOption { - type = types.listOf types.str; - default = []; - example = [ "ptcp:6653:[::1]" ]; - description = '' - Specify the controller targets. For the allowed options see man 8 ovs-vsctl. - ''; - }; - - openFlowRules = mkOption { - type = types.lines; - default = ""; - example = '' - actions=normal - ''; - description = '' - OpenFlow rules to insert into the Open vSwitch. All openFlowRules are - loaded with ovs-ofctl within one atomic operation. - ''; - }; - - extraOvsctlCmds = mkOption { - type = types.lines; - default = ""; - example = '' - set-fail-mode secure - set Bridge stp_enable=true - ''; - description = '' - Commands to manipulate the Open vSwitch database. Every line executed with ovs-vsctl. - All commands are bundled together with the operations for adding the interfaces - into one atomic operation. - ''; - }; - - }; + }); }; @@ -499,25 +499,27 @@ in bridge's network interface. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + interfaces = mkOption { + example = [ "eth0" "eth1" ]; + type = types.listOf types.str; + description = + "The physical network interfaces connected by the bridge."; + }; + + rstp = mkOption { + example = true; + default = false; + type = types.bool; + description = "Whether the bridge interface should enable rstp."; + }; - interfaces = mkOption { - example = [ "eth0" "eth1" ]; - type = types.listOf types.str; - description = - "The physical network interfaces connected by the bridge."; }; - rstp = mkOption { - example = true; - default = false; - type = types.bool; - description = "Whether the bridge interface should enable rstp."; - }; - - }; + }); }; @@ -538,65 +540,66 @@ in name specifying the name of the bond's network interface ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + interfaces = mkOption { + example = [ "enp4s0f0" "enp4s0f1" "wlan0" ]; + type = types.listOf types.str; + description = "The interfaces to bond together"; + }; + + lacp_rate = mkOption { + default = null; + example = "fast"; + type = types.nullOr types.str; + description = '' + Option specifying the rate in which we'll ask our link partner + to transmit LACPDU packets in 802.3ad mode. + ''; + }; + + miimon = mkOption { + default = null; + example = 100; + type = types.nullOr types.int; + description = '' + Miimon is the number of millisecond in between each round of polling + by the device driver for failed links. By default polling is not + enabled and the driver is trusted to properly detect and handle + failure scenarios. + ''; + }; + + mode = mkOption { + default = null; + example = "active-backup"; + type = types.nullOr types.str; + description = '' + The mode which the bond will be running. The default mode for + the bonding driver is balance-rr, optimizing for throughput. + More information about valid modes can be found at + https://www.kernel.org/doc/Documentation/networking/bonding.txt + ''; + }; + + xmit_hash_policy = mkOption { + default = null; + example = "layer2+3"; + type = types.nullOr types.str; + description = '' + Selects the transmit hash policy to use for slave selection in + balance-xor, 802.3ad, and tlb modes. + ''; + }; - interfaces = mkOption { - example = [ "enp4s0f0" "enp4s0f1" "wlan0" ]; - type = types.listOf types.str; - description = "The interfaces to bond together"; }; - lacp_rate = mkOption { - default = null; - example = "fast"; - type = types.nullOr types.str; - description = '' - Option specifying the rate in which we'll ask our link partner - to transmit LACPDU packets in 802.3ad mode. - ''; - }; - - miimon = mkOption { - default = null; - example = 100; - type = types.nullOr types.int; - description = '' - Miimon is the number of millisecond in between each round of polling - by the device driver for failed links. By default polling is not - enabled and the driver is trusted to properly detect and handle - failure scenarios. - ''; - }; - - mode = mkOption { - default = null; - example = "active-backup"; - type = types.nullOr types.str; - description = '' - The mode which the bond will be running. The default mode for - the bonding driver is balance-rr, optimizing for throughput. - More information about valid modes can be found at - https://www.kernel.org/doc/Documentation/networking/bonding.txt - ''; - }; - - xmit_hash_policy = mkOption { - default = null; - example = "layer2+3"; - type = types.nullOr types.str; - description = '' - Selects the transmit hash policy to use for slave selection in - balance-xor, 802.3ad, and tlb modes. - ''; - }; - - }; + }); }; networking.macvlans = mkOption { - type = types.attrsOf types.optionSet; default = { }; example = literalExample { wan = { @@ -608,26 +611,28 @@ in This option allows you to define macvlan interfaces which should be automatically created. ''; - options = { + type = with types; attrsOf (submodule { + options = { + + interface = mkOption { + example = "enp4s0"; + type = types.str; + description = "The interface the macvlan will transmit packets through."; + }; + + mode = mkOption { + default = null; + type = types.nullOr types.str; + example = "vepa"; + description = "The mode of the macvlan device."; + }; - interface = mkOption { - example = "enp4s0"; - type = types.str; - description = "The interface the macvlan will transmit packets through."; }; - mode = mkOption { - default = null; - type = types.nullOr types.str; - example = "vepa"; - description = "The mode of the macvlan device."; - }; - - }; + }); }; networking.sits = mkOption { - type = types.attrsOf types.optionSet; default = { }; example = literalExample { hurricane = { @@ -644,46 +649,49 @@ in description = '' This option allows you to define 6-to-4 interfaces which should be automatically created. ''; - options = { + type = with types; attrsOf (submodule { + options = { + + remote = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.0.0.1"; + description = '' + The address of the remote endpoint to forward traffic over. + ''; + }; + + local = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.0.0.22"; + description = '' + The address of the local endpoint which the remote + side should send packets to. + ''; + }; + + ttl = mkOption { + type = types.nullOr types.int; + default = null; + example = 255; + description = '' + The time-to-live of the connection to the remote tunnel endpoint. + ''; + }; + + dev = mkOption { + type = types.nullOr types.str; + default = null; + example = "enp4s0f0"; + description = '' + The underlying network device on which the tunnel resides. + ''; + }; - remote = mkOption { - type = types.nullOr types.str; - default = null; - example = "10.0.0.1"; - description = '' - The address of the remote endpoint to forward traffic over. - ''; }; - local = mkOption { - type = types.nullOr types.str; - default = null; - example = "10.0.0.22"; - description = '' - The address of the local endpoint which the remote - side should send packets to. - ''; - }; - - ttl = mkOption { - type = types.nullOr types.int; - default = null; - example = 255; - description = '' - The time-to-live of the connection to the remote tunnel endpoint. - ''; - }; - - dev = mkOption { - type = types.nullOr types.str; - default = null; - example = "enp4s0f0"; - description = '' - The underlying network device on which the tunnel resides. - ''; - }; - - }; + }); }; networking.vlans = mkOption { @@ -706,23 +714,26 @@ in specifying the name of the vlan interface. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + id = mkOption { + example = 1; + type = types.int; + description = "The vlan identifier"; + }; + + interface = mkOption { + example = "enp4s0"; + type = types.str; + description = "The interface the vlan will transmit packets through."; + }; - id = mkOption { - example = 1; - type = types.int; - description = "The vlan identifier"; }; - interface = mkOption { - example = "enp4s0"; - type = types.str; - description = "The interface the vlan will transmit packets through."; - }; + }); - }; }; networking.wlanInterfaces = mkOption { @@ -760,73 +771,76 @@ in would have to be created explicitly. ''; - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { - options = { + options = { + + device = mkOption { + type = types.string; + example = "wlp6s0"; + description = "The name of the underlying hardware WLAN device as assigned by udev."; + }; + + type = mkOption { + type = types.string; + default = "managed"; + example = "ibss"; + description = '' + The type of the WLAN interface. The type has to be either managed, + ibss, monitor, mesh or wds. + Also, the type has to be supported by the underlying hardware of the device. + ''; + }; + + meshID = mkOption { + type = types.nullOr types.string; + default = null; + description = "MeshID of interface with type mesh."; + }; + + flags = mkOption { + type = types.nullOr types.string; + default = null; + example = "control"; + description = '' + Flags for interface of type monitor. The valid flags are: + none: no special flags + fcsfail: show frames with FCS errors + control: show control frames + otherbss: show frames from other BSSes + cook: use cooked mode + active: use active mode (ACK incoming unicast packets) + ''; + }; + + fourAddr = mkOption { + type = types.nullOr types.bool; + default = null; + description = "Whether to enable 4-address mode with type managed."; + }; + + mac = mkOption { + type = types.nullOr types.str; + default = null; + example = "02:00:00:00:00:01"; + description = '' + MAC address to use for the device. If null, then the MAC of the + underlying hardware WLAN device is used. + + INFO: Locally administered MAC addresses are of the form: + + x2:xx:xx:xx:xx:xx + x6:xx:xx:xx:xx:xx + xA:xx:xx:xx:xx:xx + xE:xx:xx:xx:xx:xx + + ''; + }; - device = mkOption { - type = types.string; - example = "wlp6s0"; - description = "The name of the underlying hardware WLAN device as assigned by udev."; }; - type = mkOption { - type = types.string; - default = "managed"; - example = "ibss"; - description = '' - The type of the WLAN interface. The type has to be either managed, - ibss, monitor, mesh or wds. - Also, the type has to be supported by the underlying hardware of the device. - ''; - }; + }); - meshID = mkOption { - type = types.nullOr types.string; - default = null; - description = "MeshID of interface with type mesh."; - }; - - flags = mkOption { - type = types.nullOr types.string; - default = null; - example = "control"; - description = '' - Flags for interface of type monitor. The valid flags are: - none: no special flags - fcsfail: show frames with FCS errors - control: show control frames - otherbss: show frames from other BSSes - cook: use cooked mode - active: use active mode (ACK incoming unicast packets) - ''; - }; - - fourAddr = mkOption { - type = types.nullOr types.bool; - default = null; - description = "Whether to enable 4-address mode with type managed."; - }; - - mac = mkOption { - type = types.nullOr types.str; - default = null; - example = "02:00:00:00:00:01"; - description = '' - MAC address to use for the device. If null, then the MAC of the - underlying hardware WLAN device is used. - - INFO: Locally administered MAC addresses are of the form: - - x2:xx:xx:xx:xx:xx - x6:xx:xx:xx:xx:xx - xA:xx:xx:xx:xx:xx - xE:xx:xx:xx:xx:xx - - ''; - }; - - }; }; networking.useDHCP = mkOption { @@ -932,8 +946,10 @@ in ] ++ bridgeStp; + # The network-interfaces target is kept for backwards compatibility. + # New modules must NOT use it. systemd.targets."network-interfaces" = - { description = "All Network Interfaces"; + { description = "All Network Interfaces (deprecated)"; wantedBy = [ "network.target" ]; before = [ "network.target" ]; after = [ "network-pre.target" ]; @@ -956,12 +972,17 @@ in ''; }; } // (listToAttrs (flip map interfaces (i: + let + deviceDependency = if config.boot.isContainer + then [] + else [ (subsystemDevice i.name) ]; + in nameValuePair "network-link-${i.name}" { description = "Link configuration of ${i.name}"; wantedBy = [ "network-interfaces.target" ]; before = [ "network-interfaces.target" ]; - bindsTo = [ (subsystemDevice i.name) ]; - after = [ (subsystemDevice i.name) "network-pre.target" ]; + bindsTo = deviceDependency; + after = [ "network-pre.target" ] ++ deviceDependency; path = [ pkgs.iproute ]; serviceConfig = { Type = "oneshot"; diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index f9c3f2e53ad..17e69b311b4 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -138,7 +138,7 @@ let cfg = config.ec2; in # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; + services.openssh.permitRootLogin = "prohibit-password"; # Force getting the hostname from EC2. networking.hostName = mkDefault ""; diff --git a/nixos/modules/virtualisation/azure-bootstrap-blobs.nix b/nixos/modules/virtualisation/azure-bootstrap-blobs.nix new file mode 100644 index 00000000000..281be9a1231 --- /dev/null +++ b/nixos/modules/virtualisation/azure-bootstrap-blobs.nix @@ -0,0 +1,3 @@ +{ + "16.03" = "https://nixos.blob.core.windows.net/images/nixos-image-16.03.847.8688c17-x86_64-linux.vhd"; +} diff --git a/nixos/modules/virtualisation/azure-common.nix b/nixos/modules/virtualisation/azure-common.nix index 70a3d752f6d..5cd2304a295 100644 --- a/nixos/modules/virtualisation/azure-common.nix +++ b/nixos/modules/virtualisation/azure-common.nix @@ -24,7 +24,7 @@ with lib; # Allow root logins only using the SSH key that the user specified # at instance creation time, ping client connections to avoid timeouts services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; + services.openssh.permitRootLogin = "prohibit-password"; services.openssh.extraConfig = '' ClientAliveInterval 180 ''; diff --git a/nixos/modules/virtualisation/brightbox-image.nix b/nixos/modules/virtualisation/brightbox-image.nix index e2905913b6c..7f45f0f34f7 100644 --- a/nixos/modules/virtualisation/brightbox-image.nix +++ b/nixos/modules/virtualisation/brightbox-image.nix @@ -103,7 +103,7 @@ in # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; + services.openssh.permitRootLogin = "prohibit-password"; # Force getting the hostname from Google Compute. networking.hostName = mkDefault ""; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 413aa94339f..aa28a25be7a 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -12,21 +12,21 @@ let '' echo "Bringing ${name} up" ip link set dev ${name} up - ${optionalString (cfg . "localAddress" or null != null) '' + ${optionalString (cfg.localAddress != null) '' echo "Setting ip for ${name}" - ip addr add ${cfg . "localAddress"} dev ${name} + ip addr add ${cfg.localAddress} dev ${name} ''} - ${optionalString (cfg . "localAddress6" or null != null) '' + ${optionalString (cfg.localAddress6 != null) '' echo "Setting ip6 for ${name}" - ip -6 addr add ${cfg . "localAddress6"} dev ${name} + ip -6 addr add ${cfg.localAddress6} dev ${name} ''} - ${optionalString (cfg . "hostAddress" or null != null) '' + ${optionalString (cfg.hostAddress != null) '' echo "Setting route to host for ${name}" - ip route add ${cfg . "hostAddress"} dev ${name} + ip route add ${cfg.hostAddress} dev ${name} ''} - ${optionalString (cfg . "hostAddress6" or null != null) '' + ${optionalString (cfg.hostAddress6 != null) '' echo "Setting route6 to host for ${name}" - ip -6 route add ${cfg . "hostAddress6"} dev ${name} + ip -6 route add ${cfg.hostAddress6} dev ${name} ''} '' ); @@ -56,9 +56,7 @@ let ip -6 route add default via $HOST_ADDRESS6 fi - ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg . "extraVeths" or {})} - ip a - ip r + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} fi # Start the regular stage 1 script. @@ -67,7 +65,8 @@ let ); nspawnExtraVethArgs = (name: cfg: "--network-veth-extra=${name}"); - startScript = (cfg: + + startScript = cfg: '' mkdir -p -m 0755 "$root/etc" "$root/var/lib" mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers @@ -92,11 +91,7 @@ let fi fi - ${if cfg . "extraVeths" or null != null then - ''extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg . "extraVeths" or {})}"'' - else - ''# No extra veth pairs to create'' - } + extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}" for iface in $INTERFACES; do extraFlags+=" --network-interface=$iface" @@ -134,11 +129,13 @@ let --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ --setenv PATH="$PATH" \ + ${if cfg.additionalCapabilities != null then + ''--capability="${concatStringsSep " " cfg.additionalCapabilities}"'' else "" + } \ ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" - '' - ); + ''; - preStartScript = (cfg: + preStartScript = cfg: '' # Clean up existing machined registration and interfaces. machinectl terminate "$INSTANCE" 2> /dev/null || true @@ -151,45 +148,43 @@ let ${concatStringsSep "\n" ( mapAttrsToList (name: cfg: ''ip link del dev ${name} 2> /dev/null || true '' - ) cfg . "extraVeths" or {} + ) cfg.extraVeths )} - '' - ); + ''; + postStartScript = (cfg: let - ipcall = (cfg: ipcmd: variable: attribute: - if cfg . attribute or null == null then + ipcall = cfg: ipcmd: variable: attribute: + if cfg.${attribute} == null then '' if [ -n "${variable}" ]; then ${ipcmd} add ${variable} dev $ifaceHost fi '' else - ''${ipcmd} add ${cfg . attribute} dev $ifaceHost'' - ); - renderExtraVeth = (name: cfg: - if cfg . "hostBridge" or null != null then + ''${ipcmd} add ${cfg.${attribute}} dev $ifaceHost''; + renderExtraVeth = name: cfg: + if cfg.hostBridge != null then '' # Add ${name} to bridge ${cfg.hostBridge} ip link set dev ${name} master ${cfg.hostBridge} up '' else '' - # Set IPs and routes for ${name} - ${optionalString (cfg . "hostAddress" or null != null) '' - ip addr add ${cfg . "hostAddress"} dev ${name} - ''} - ${optionalString (cfg . "hostAddress6" or null != null) '' - ip -6 addr add ${cfg . "hostAddress6"} dev ${name} - ''} - ${optionalString (cfg . "localAddress" or null != null) '' - ip route add ${cfg . "localAddress"} dev ${name} - ''} - ${optionalString (cfg . "localAddress6" or null != null) '' - ip -6 route add ${cfg . "localAddress6"} dev ${name} - ''} - '' - ); + # Set IPs and routes for ${name} + ${optionalString (cfg.hostAddress != null) '' + ip addr add ${cfg.hostAddress} dev ${name} + ''} + ${optionalString (cfg.hostAddress6 != null) '' + ip -6 addr add ${cfg.hostAddress6} dev ${name} + ''} + ${optionalString (cfg.localAddress != null) '' + ip route add ${cfg.localAddress} dev ${name} + ''} + ${optionalString (cfg.localAddress6 != null) '' + ip -6 route add ${cfg.localAddress6} dev ${name} + ''} + ''; in '' if [ "$PRIVATE_NETWORK" = 1 ]; then @@ -202,7 +197,7 @@ let ${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"} ${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"} fi - ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg . "extraVeths" or {})} + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} fi # Get the leader PID so that we can signal it in @@ -213,6 +208,41 @@ let '' ); + serviceDirectives = cfg: { + ExecReload = pkgs.writeScript "reload-container" + '' + #! ${pkgs.stdenv.shell} -e + ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \ + bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" + ''; + + SyslogIdentifier = "container %i"; + + EnvironmentFile = "-/etc/containers/%i.conf"; + + Type = "notify"; + + # Note that on reboot, systemd-nspawn returns 133, so this + # unit will be restarted. On poweroff, it returns 0, so the + # unit won't be restarted. + RestartForceExitStatus = "133"; + SuccessExitStatus = "133"; + + Restart = "on-failure"; + + # Hack: we don't want to kill systemd-nspawn, since we call + # "machinectl poweroff" in preStop to shut down the + # container cleanly. But systemd requires sending a signal + # (at least if we want remaining processes to be killed + # after the timeout). So send an ignored signal. + KillMode = "mixed"; + KillSignal = "WINCH"; + + DevicePolicy = "closed"; + DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices; + }; + + system = config.nixpkgs.system; bindMountOpts = { name, config, ... }: { @@ -243,6 +273,27 @@ let }; + allowedDeviceOpts = { name, config, ... }: { + options = { + node = mkOption { + example = "/dev/net/tun"; + type = types.str; + description = "Path to device node"; + }; + modifier = mkOption { + example = "rw"; + type = types.str; + description = '' + Device node access modifier. Takes a combination + r (read), w (write), and + m (mknod). See the + systemd.resource-control(5) man page for more + information.''; + }; + }; + }; + + mkBindFlag = d: let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind="; mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}"; @@ -307,6 +358,17 @@ let }; + dummyConfig = + { + extraVeths = {}; + additionalCapabilities = []; + allowedDevices = []; + hostAddress = null; + hostAddress6 = null; + localAddress = null; + localAddress6 = null; + }; + in { @@ -367,6 +429,26 @@ in ''; }; + additionalCapabilities = mkOption { + type = types.listOf types.str; + default = []; + example = [ "CAP_NET_ADMIN" "CAP_MKNOD" ]; + description = '' + Grant additional capabilities to the container. See the + capabilities(7) and systemd-nspawn(1) man pages for more + information. + ''; + }; + enableTun = mkOption { + type = types.bool; + default = false; + description = '' + Allows the container to create and setup tunnel interfaces + by granting the NET_ADMIN capability and + enabling access to /dev/net/tun. + ''; + }; + privateNetwork = mkOption { type = types.bool; default = false; @@ -391,9 +473,8 @@ in }; extraVeths = mkOption { - type = types.attrsOf types.optionSet; + type = with types; attrsOf (submodule { options = networkOptions; }); default = {}; - options = networkOptions; description = '' Extra veth-pairs to be created for the container ''; @@ -408,8 +489,7 @@ in }; bindMounts = mkOption { - type = types.loaOf types.optionSet; - options = [ bindMountOpts ]; + type = with types; loaOf (submodule bindMountOpts); default = {}; example = { "/home" = { hostPath = "/home/alice"; isReadOnly = false; }; @@ -421,6 +501,15 @@ in ''; }; + allowedDevices = mkOption { + type = with types; listOf (submodule allowedDeviceOpts); + default = []; + example = [ { node = "/dev/net/tun"; modifier = "rw"; } ]; + description = '' + A list of device nodes to which the containers has access to. + ''; + }; + } // networkOptions; config = mkMerge @@ -451,7 +540,7 @@ in containers. Each container appears as a service container-name on the host system, allowing it to be started and stopped via - systemctl . + systemctl. ''; }; @@ -470,11 +559,11 @@ in environment.INSTANCE = "%i"; environment.root = "/var/lib/containers/%i"; - preStart = preStartScript {}; + preStart = preStartScript dummyConfig; - script = startScript {}; + script = startScript dummyConfig; - postStart = postStartScript {}; + postStart = postStartScript dummyConfig; preStop = '' @@ -487,59 +576,39 @@ in restartIfChanged = false; - serviceConfig = { - ExecReload = pkgs.writeScript "reload-container" - '' - #! ${pkgs.stdenv.shell} -e - ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \ - bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" - ''; - - SyslogIdentifier = "container %i"; - - EnvironmentFile = "-/etc/containers/%i.conf"; - - Type = "notify"; - - # Note that on reboot, systemd-nspawn returns 133, so this - # unit will be restarted. On poweroff, it returns 0, so the - # unit won't be restarted. - RestartForceExitStatus = "133"; - SuccessExitStatus = "133"; - - Restart = "on-failure"; - - # Hack: we don't want to kill systemd-nspawn, since we call - # "machinectl poweroff" in preStop to shut down the - # container cleanly. But systemd requires sending a signal - # (at least if we want remaining processes to be killed - # after the timeout). So send an ignored signal. - KillMode = "mixed"; - KillSignal = "WINCH"; - - DevicePolicy = "closed"; - }; + serviceConfig = serviceDirectives dummyConfig; }; in { systemd.services = listToAttrs (filter (x: x.value != null) ( # The generic container template used by imperative containers [{ name = "container@"; value = unit; }] # declarative containers - ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" ( - unit // { - preStart = preStartScript cfg; - script = startScript cfg; - postStart = postStartScript cfg; - } // ( - if cfg.autoStart then - { - wantedBy = [ "multi-user.target" ]; - wants = [ "network.target" ]; - after = [ "network.target" ]; - restartTriggers = [ cfg.path ]; - reloadIfChanged = true; - } - else {}) + ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let + config = cfg // ( + if cfg.enableTun then + { + allowedDevices = cfg.allowedDevices + ++ [ { node = "/dev/net/tun"; modifier = "rw"; } ]; + additionalCapabilities = cfg.additionalCapabilities + ++ [ "CAP_NET_ADMIN" ]; + } + else {}); + in + unit // { + preStart = preStartScript config; + script = startScript config; + postStart = postStartScript config; + serviceConfig = serviceDirectives config; + } // ( + if config.autoStart then + { + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; + restartTriggers = [ config.path ]; + reloadIfChanged = true; + } + else {}) )) config.containers) )); diff --git a/nixos/modules/virtualisation/docker.nix b/nixos/modules/virtualisation/docker.nix index ebc2be087a5..92fe98f3f9c 100644 --- a/nixos/modules/virtualisation/docker.nix +++ b/nixos/modules/virtualisation/docker.nix @@ -40,13 +40,25 @@ in }; storageDriver = mkOption { - type = types.enum ["aufs" "btrfs" "devicemapper" "overlay" "zfs"]; - default = "devicemapper"; + type = types.nullOr (types.enum ["aufs" "btrfs" "devicemapper" "overlay" "overlay2" "zfs"]); + default = null; description = '' - This option determines which Docker storage driver to use. + This option determines which Docker storage driver to use. By default + it let's docker automatically choose preferred storage driver. ''; }; + + logDriver = + mkOption { + type = types.enum ["none" "json-file" "syslog" "journald" "gelf" "fluentd" "awslogs" "splunk" "etwlogs" "gcplogs"]; + default = "journald"; + description = + '' + This option determines which Docker log driver to use. + ''; + }; + extraOptions = mkOption { type = types.separatedString " "; @@ -88,7 +100,12 @@ in after = [ "network.target" ] ++ (optional cfg.socketActivation "docker.socket") ; requires = optional cfg.socketActivation "docker.socket"; serviceConfig = { - ExecStart = "${pkgs.docker}/bin/docker daemon --group=docker --storage-driver=${cfg.storageDriver} ${optionalString cfg.socketActivation "--host=fd://"} ${cfg.extraOptions}"; + ExecStart = ''${pkgs.docker}/bin/dockerd \ + --group=docker --log-driver=${cfg.logDriver} \ + ${optionalString (cfg.storageDriver != null) "--storage-driver=${cfg.storageDriver}"} \ + ${optionalString cfg.socketActivation "--host=fd://"} \ + ${cfg.extraOptions} + ''; # I'm not sure if that limits aren't too high, but it's what # goes in config bundled with docker itself LimitNOFILE = 1048576; diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index bdf6ed4dcd2..ffd1cbec3ce 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -1,4 +1,4 @@ -{ +let self = { "14.04".ap-northeast-1.hvm-ebs = "ami-71c6f470"; "14.04".ap-northeast-1.pv-ebs = "ami-4dcbf84c"; "14.04".ap-northeast-1.pv-s3 = "ami-8fc4f68e"; @@ -134,4 +134,52 @@ "16.03".us-west-2.hvm-s3 = "ami-925c9ff2"; "16.03".us-west-2.pv-ebs = "ami-5e61a23e"; "16.03".us-west-2.pv-s3 = "ami-734c8f13"; -} + + # 16.09.666.3738950 + "16.09".ap-northeast-1.hvm-ebs = "ami-35578954"; + "16.09".ap-northeast-1.hvm-s3 = "ami-d6528cb7"; + "16.09".ap-northeast-1.pv-ebs = "ami-07548a66"; + "16.09".ap-northeast-1.pv-s3 = "ami-f1548a90"; + "16.09".ap-northeast-2.hvm-ebs = "ami-d48753ba"; + "16.09".ap-northeast-2.hvm-s3 = "ami-4c865222"; + "16.09".ap-northeast-2.pv-ebs = "ami-ca8551a4"; + "16.09".ap-northeast-2.pv-s3 = "ami-9c8551f2"; + "16.09".ap-south-1.hvm-ebs = "ami-922450fd"; + "16.09".ap-south-1.hvm-s3 = "ami-6d3a4e02"; + "16.09".ap-south-1.pv-ebs = "ami-4d394d22"; + "16.09".ap-south-1.pv-s3 = "ami-17384c78"; + "16.09".ap-southeast-1.hvm-ebs = "ami-f824809b"; + "16.09".ap-southeast-1.hvm-s3 = "ami-f924809a"; + "16.09".ap-southeast-1.pv-ebs = "ami-af2480cc"; + "16.09".ap-southeast-1.pv-s3 = "ami-5826823b"; + "16.09".ap-southeast-2.hvm-ebs = "ami-40fecd23"; + "16.09".ap-southeast-2.hvm-s3 = "ami-48fecd2b"; + "16.09".ap-southeast-2.pv-ebs = "ami-dffecdbc"; + "16.09".ap-southeast-2.pv-s3 = "ami-e0fccf83"; + "16.09".eu-central-1.hvm-ebs = "ami-1d8b7472"; + "16.09".eu-central-1.hvm-s3 = "ami-1c8b7473"; + "16.09".eu-central-1.pv-ebs = "ami-8c8d72e3"; + "16.09".eu-central-1.pv-s3 = "ami-3488775b"; + "16.09".eu-west-1.hvm-ebs = "ami-15662766"; + "16.09".eu-west-1.hvm-s3 = "ami-476b2a34"; + "16.09".eu-west-1.pv-ebs = "ami-876928f4"; + "16.09".eu-west-1.pv-s3 = "ami-70682903"; + "16.09".sa-east-1.hvm-ebs = "ami-27bc2e4b"; + "16.09".sa-east-1.hvm-s3 = "ami-e4b92b88"; + "16.09".sa-east-1.pv-ebs = "ami-4dbe2c21"; + "16.09".sa-east-1.pv-s3 = "ami-77fc6e1b"; + "16.09".us-east-1.hvm-ebs = "ami-93347684"; + "16.09".us-east-1.hvm-s3 = "ami-5e347649"; + "16.09".us-east-1.pv-ebs = "ami-b0387aa7"; + "16.09".us-east-1.pv-s3 = "ami-51357746"; + "16.09".us-west-1.hvm-ebs = "ami-06337a66"; + "16.09".us-west-1.hvm-s3 = "ami-76307916"; + "16.09".us-west-1.pv-ebs = "ami-fd327b9d"; + "16.09".us-west-1.pv-s3 = "ami-cc347dac"; + "16.09".us-west-2.hvm-ebs = "ami-49fe2729"; + "16.09".us-west-2.hvm-s3 = "ami-93fc25f3"; + "16.09".us-west-2.pv-ebs = "ami-14fe2774"; + "16.09".us-west-2.pv-s3 = "ami-74f12814"; + + latest = self."16.09"; +}; in self diff --git a/nixos/modules/virtualisation/google-compute-image.nix b/nixos/modules/virtualisation/google-compute-image.nix index 489b612f167..90dbd3b6d63 100644 --- a/nixos/modules/virtualisation/google-compute-image.nix +++ b/nixos/modules/virtualisation/google-compute-image.nix @@ -111,7 +111,7 @@ in # Allow root logins only using the SSH key that the user specified # at instance creation time. services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; + services.openssh.permitRootLogin = "prohibit-password"; services.openssh.passwordAuthentication = mkDefault false; # Force getting the hostname from Google Compute. diff --git a/nixos/modules/virtualisation/nova-image.nix b/nixos/modules/virtualisation/nova-image.nix index 7971212b47c..e253c77ebb4 100644 --- a/nixos/modules/virtualisation/nova-image.nix +++ b/nixos/modules/virtualisation/nova-image.nix @@ -31,7 +31,7 @@ with lib; # Allow root logins services.openssh.enable = true; - services.openssh.permitRootLogin = "without-password"; + services.openssh.permitRootLogin = "prohibit-password"; # Put /tmp and /var on /ephemeral0, which has a lot more space. # Unfortunately we can't do this with the `fileSystems' option diff --git a/nixos/modules/virtualisation/virtualbox-host.nix b/nixos/modules/virtualisation/virtualbox-host.nix index ce4abecd676..7214543871d 100644 --- a/nixos/modules/virtualisation/virtualbox-host.nix +++ b/nixos/modules/virtualisation/virtualbox-host.nix @@ -4,10 +4,15 @@ with lib; let cfg = config.virtualisation.virtualbox.host; - virtualbox = config.boot.kernelPackages.virtualbox.override { + + virtualbox = pkgs.virtualbox.override { inherit (cfg) enableHardening headless; }; + kernelModules = config.boot.kernelPackages.virtualbox.override { + inherit virtualbox; + }; + in { @@ -60,7 +65,7 @@ in config = mkIf cfg.enable (mkMerge [{ boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; - boot.extraModulePackages = [ virtualbox ]; + boot.extraModulePackages = [ kernelModules ]; environment.systemPackages = [ virtualbox ]; security.setuidOwners = let diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index b6a5b3e4788..d68b3bb7390 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -34,7 +34,7 @@ in { postVM = '' export HOME=$PWD - export PATH=${pkgs.linuxPackages.virtualbox}/bin:$PATH + export PATH=${pkgs.virtualbox}/bin:$PATH echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..." VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage diff --git a/nixos/release.nix b/nixos/release.nix index 87e10b49731..10c624afebc 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -227,6 +227,7 @@ in rec { tests.containers-bridge = callTest tests/containers-bridge.nix {}; 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.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.dnscrypt-proxy = callTest tests/dnscrypt-proxy.nix { system = "x86_64-linux"; }; tests.ecryptfs = callTest tests/ecryptfs.nix {}; @@ -260,6 +261,7 @@ in rec { #tests.logstash = callTest tests/logstash.nix {}; tests.mathics = callTest tests/mathics.nix {}; tests.misc = callTest tests/misc.nix {}; + tests.mongodb = callTest tests/mongodb.nix {}; tests.mumble = callTest tests/mumble.nix {}; tests.munin = callTest tests/munin.nix {}; tests.mysql = callTest tests/mysql.nix {}; @@ -274,7 +276,7 @@ in rec { tests.nfs4 = callTest tests/nfs.nix { version = 4; }; tests.nsd = callTest tests/nsd.nix {}; tests.openssh = callTest tests/openssh.nix {}; - tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); + #tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; }); tests.peerflix = callTest tests/peerflix.nix {}; tests.postgresql = callTest tests/postgresql.nix {}; tests.printing = callTest tests/printing.nix {}; @@ -283,6 +285,7 @@ in rec { 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.simple = callTest tests/simple.nix {}; tests.smokeping = callTest tests/smokeping.nix {}; diff --git a/nixos/tests/boot-stage1.nix b/nixos/tests/boot-stage1.nix index ccd8394a1f0..50186525cf3 100644 --- a/nixos/tests/boot-stage1.nix +++ b/nixos/tests/boot-stage1.nix @@ -3,7 +3,7 @@ import ./make-test.nix ({ pkgs, ... }: { machine = { config, pkgs, lib, ... }: { boot.extraModulePackages = let - compileKernelModule = name: source: pkgs.runCommand name rec { + compileKernelModule = name: source: pkgs.runCommandCC name rec { inherit source; kdev = config.boot.kernelPackages.kernel.dev; kver = config.boot.kernelPackages.kernel.modDirVersion; @@ -62,7 +62,7 @@ import ./make-test.nix ({ pkgs, ... }: { boot.initrd.kernelModules = [ "kcanary" ]; boot.initrd.extraUtilsCommands = let - compile = name: source: pkgs.runCommand name { inherit source; } '' + compile = name: source: pkgs.runCommandCC name { inherit source; } '' mkdir -p "$out/bin" echo "$source" | gcc -Wall -o "$out/bin/$name" -xc - ''; diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix index c55b08c0e92..f0083ab18e4 100644 --- a/nixos/tests/cadvisor.nix +++ b/nixos/tests/cadvisor.nix @@ -13,10 +13,6 @@ import ./make-test.nix ({ pkgs, ... } : { services.cadvisor.enable = true; services.cadvisor.storageDriver = "influxdb"; services.influxdb.enable = true; - systemd.services.influxdb.postStart = mkAfter '' - ${pkgs.curl.bin}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \ - -d '{"name": "root"}' - ''; }; }; @@ -27,6 +23,12 @@ import ./make-test.nix ({ pkgs, ... } : { $machine->succeed("curl http://localhost:8080/containers/"); $influxdb->waitForUnit("influxdb.service"); + + # create influxdb database + $influxdb->succeed(q~ + curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE root" + ~); + $influxdb->waitForUnit("cadvisor.service"); $influxdb->succeed("curl http://localhost:8080/containers/"); ''; diff --git a/nixos/tests/containers-physical_interfaces.nix b/nixos/tests/containers-physical_interfaces.nix new file mode 100644 index 00000000000..a3b0b29951b --- /dev/null +++ b/nixos/tests/containers-physical_interfaces.nix @@ -0,0 +1,133 @@ + +import ./make-test.nix ({ pkgs, ...} : { + name = "containers-physical_interfaces"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ kampfschlaefer ]; + }; + + nodes = { + server = { config, pkgs, ... }: + { + virtualisation.memorySize = 256; + virtualisation.vlans = [ 1 ]; + + containers.server = { + privateNetwork = true; + interfaces = [ "eth1" ]; + + config = { + networking.interfaces.eth1 = { + ip4 = [ { address = "10.10.0.1"; prefixLength = 24; } ]; + }; + networking.firewall.enable = false; + }; + }; + }; + bridged = { config, pkgs, ... }: { + virtualisation.memorySize = 128; + virtualisation.vlans = [ 1 ]; + + containers.bridged = { + privateNetwork = true; + interfaces = [ "eth1" ]; + + config = { + networking.bridges.br0.interfaces = [ "eth1" ]; + networking.interfaces.br0 = { + ip4 = [ { address = "10.10.0.2"; prefixLength = 24; } ]; + }; + networking.firewall.enable = false; + }; + }; + }; + + bonded = { config, pkgs, ... }: { + virtualisation.memorySize = 128; + virtualisation.vlans = [ 1 ]; + + containers.bonded = { + privateNetwork = true; + interfaces = [ "eth1" ]; + + config = { + networking.bonds.bond0 = { + interfaces = [ "eth1" ]; + mode = "active-backup"; + }; + networking.interfaces.bond0 = { + ip4 = [ { address = "10.10.0.3"; prefixLength = 24; } ]; + }; + networking.firewall.enable = false; + }; + }; + }; + + bridgedbond = { config, pkgs, ... }: { + virtualisation.memorySize = 128; + virtualisation.vlans = [ 1 ]; + + containers.bridgedbond = { + privateNetwork = true; + interfaces = [ "eth1" ]; + + config = { + networking.bonds.bond0 = { + interfaces = [ "eth1" ]; + mode = "active-backup"; + }; + networking.bridges.br0.interfaces = [ "bond0" ]; + networking.interfaces.br0 = { + ip4 = [ { address = "10.10.0.4"; prefixLength = 24; } ]; + }; + networking.firewall.enable = false; + }; + }; + }; + }; + + testScript = '' + startAll; + + subtest "prepare server", sub { + $server->waitForUnit("default.target"); + $server->succeed("ip link show dev eth1 >&2"); + }; + + subtest "simple physical interface", sub { + $server->succeed("nixos-container start server"); + $server->waitForUnit("container\@server"); + $server->succeed("systemctl -M server list-dependencies network-addresses-eth1.service >&2"); + + # The other tests will ping this container on its ip. Here we just check + # that the device is present in the container. + $server->succeed("nixos-container run server -- ip a show dev eth1 >&2"); + }; + + subtest "physical device in bridge in container", sub { + $bridged->waitForUnit("default.target"); + $bridged->succeed("nixos-container start bridged"); + $bridged->waitForUnit("container\@bridged"); + $bridged->succeed("systemctl -M bridged list-dependencies network-addresses-br0.service >&2"); + $bridged->succeed("systemctl -M bridged status -n 30 -l network-addresses-br0.service"); + $bridged->succeed("nixos-container run bridged -- ping -w 10 -c 1 -n 10.10.0.1"); + }; + + subtest "physical device in bond in container", sub { + $bonded->waitForUnit("default.target"); + $bonded->succeed("nixos-container start bonded"); + $bonded->waitForUnit("container\@bonded"); + $bonded->succeed("systemctl -M bonded list-dependencies network-addresses-bond0 >&2"); + $bonded->succeed("systemctl -M bonded status -n 30 -l network-addresses-bond0 >&2"); + $bonded->succeed("nixos-container run bonded -- ping -w 10 -c 1 -n 10.10.0.1"); + }; + + subtest "physical device in bond in bridge in container", sub { + $bridgedbond->waitForUnit("default.target"); + $bridgedbond->succeed("nixos-container start bridgedbond"); + $bridgedbond->waitForUnit("container\@bridgedbond"); + $bridgedbond->succeed("systemctl -M bridgedbond list-dependencies network-addresses-br0.service >&2"); + $bridgedbond->succeed("systemctl -M bridgedbond status -n 30 -l network-addresses-br0.service"); + $bridgedbond->succeed("nixos-container run bridgedbond -- ping -w 10 -c 1 -n 10.10.0.1"); + }; + ''; +}) diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix new file mode 100644 index 00000000000..df24686aba8 --- /dev/null +++ b/nixos/tests/docker-registry.nix @@ -0,0 +1,45 @@ +# This test runs docker-registry and check if it works + +import ./make-test.nix ({ pkgs, ...} : { + name = "docker-registry"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ globin ]; + }; + + nodes = { + registry = { config, pkgs, ... }: { + services.dockerRegistry.enable = true; + services.dockerRegistry.port = 8080; + services.dockerRegistry.listenAddress = "0.0.0.0"; + networking.firewall.allowedTCPPorts = [ 8080 ]; + }; + + client1 = { config, pkgs, ...}: { + virtualisation.docker.enable = true; + virtualisation.docker.socketActivation = false; + virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; + }; + + client2 = { config, pkgs, ...}: { + virtualisation.docker.enable = true; + virtualisation.docker.socketActivation = false; + virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; + }; + }; + + testScript = '' + $client1->start(); + $client1->waitForUnit("docker.service"); + $client1->succeed("tar cv --files-from /dev/null | docker import - scratch"); + $client1->succeed("docker tag scratch registry:8080/scratch"); + + $registry->start(); + $registry->waitForUnit("docker-registry.service"); + $client1->succeed("docker push registry:8080/scratch"); + + $client2->start(); + $client2->waitForUnit("docker.service"); + $client2->succeed("docker pull registry:8080/scratch"); + $client2->succeed("docker images | grep scratch"); + ''; +}) diff --git a/nixos/tests/docker.nix b/nixos/tests/docker.nix index 06e511d6e0b..1b57a94a05d 100644 --- a/nixos/tests/docker.nix +++ b/nixos/tests/docker.nix @@ -11,9 +11,6 @@ import ./make-test.nix ({ pkgs, ...} : { { config, pkgs, ... }: { virtualisation.docker.enable = true; - # FIXME: The default "devicemapper" storageDriver fails in NixOS VM - # tests. - virtualisation.docker.storageDriver = "overlay"; }; }; diff --git a/nixos/tests/flannel.nix b/nixos/tests/flannel.nix new file mode 100644 index 00000000000..7f27903a302 --- /dev/null +++ b/nixos/tests/flannel.nix @@ -0,0 +1,55 @@ +import ./make-test.nix ({ pkgs, ...} : rec { + name = "flannel"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ offline ]; + }; + + nodes = let + flannelConfig = { + services.flannel = { + enable = true; + network = "10.1.0.0/16"; + iface = "eth1"; + etcd.endpoints = ["http://etcd:2379"]; + }; + + networking.firewall.allowedUDPPorts = [ 8472 ]; + }; + in { + etcd = { config, pkgs, ... }: { + services = { + etcd = { + enable = true; + listenClientUrls = ["http://etcd:2379"]; + listenPeerUrls = ["http://etcd:2380"]; + initialAdvertisePeerUrls = ["http://etcd:2379"]; + initialCluster = ["etcd=http://etcd:2379"]; + }; + }; + + networking.firewall.allowedTCPPorts = [ 2379 ]; + }; + + node1 = { config, ... }: { + require = [flannelConfig]; + }; + + node2 = { config, ... }: { + require = [flannelConfig]; + }; + }; + + testScript = '' + startAll; + + $node1->waitForUnit("flannel.service"); + $node2->waitForUnit("flannel.service"); + + my $ip1 = $node1->succeed("ip -4 addr show flannel.1 | grep -oP '(?<=inet).*(?=/)'"); + my $ip2 = $node2->succeed("ip -4 addr show flannel.1 | grep -oP '(?<=inet).*(?=/)'"); + + $node1->waitUntilSucceeds("ping -c 1 $ip2"); + $node2->waitUntilSucceeds("ping -c 1 $ip1"); + ''; +}) diff --git a/nixos/tests/influxdb.nix b/nixos/tests/influxdb.nix index aca2189716a..ee126091667 100644 --- a/nixos/tests/influxdb.nix +++ b/nixos/tests/influxdb.nix @@ -17,9 +17,6 @@ import ./make-test.nix ({ pkgs, ...} : { $one->waitForUnit("influxdb.service"); - # Check if admin interface is avalible - $one->waitUntilSucceeds("curl -f 127.0.0.1:8083"); - # create database $one->succeed(q~ curl -XPOST http://localhost:8086/query --data-urlencode "q=CREATE DATABASE test" diff --git a/nixos/tests/kde5.nix b/nixos/tests/kde5.nix index 787dd2f8cbd..30a0d09d18b 100644 --- a/nixos/tests/kde5.nix +++ b/nixos/tests/kde5.nix @@ -1,7 +1,7 @@ import ./make-test.nix ({ pkgs, ...} : { - name = "sddm"; + name = "kde5"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ttuegel ]; }; diff --git a/nixos/tests/logstash.nix b/nixos/tests/logstash.nix index edece352caf..01f6a0358b2 100644 --- a/nixos/tests/logstash.nix +++ b/nixos/tests/logstash.nix @@ -25,7 +25,6 @@ import ./make-test.nix ({ pkgs, ...} : { ''; outputConfig = '' stdout { codec => rubydebug } - elasticsearch { embedded => true } ''; }; }; @@ -38,6 +37,5 @@ import ./make-test.nix ({ pkgs, ...} : { $one->waitForUnit("logstash.service"); $one->waitUntilSucceeds("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep flowers"); $one->fail("journalctl -n 20 _SYSTEMD_UNIT=logstash.service | grep dragons"); - $one->waitUntilSucceeds("curl -s http://127.0.0.1:9200/_status?pretty=true | grep logstash"); ''; }) diff --git a/nixos/tests/mongodb.nix b/nixos/tests/mongodb.nix new file mode 100644 index 00000000000..18535f51af9 --- /dev/null +++ b/nixos/tests/mongodb.nix @@ -0,0 +1,34 @@ +# This test start mongodb, runs a query using mongo shell + +import ./make-test.nix ({ pkgs, ...} : let + testQuery = pkgs.writeScript "nixtest.js" '' + db.greetings.insert({ "greeting": "hello" }); + print(db.greetings.findOne().greeting); + ''; +in { + name = "mongodb"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bluescreen303 offline wkennington cstrahan rvl ]; + }; + + nodes = { + one = + { config, pkgs, ... }: + { + services = { + mongodb.enable = true; + mongodb.extraConfig = '' + # Allow starting engine with only a small virtual disk + storage.journal.enabled: false + storage.mmapv1.smallFiles: true + ''; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("mongodb.service"); + $one->succeed("mongo nixtest ${testQuery}") =~ /hello/ or die; + ''; +}) diff --git a/nixos/tests/mumble.nix b/nixos/tests/mumble.nix index 35f44002699..7959b85a0cf 100644 --- a/nixos/tests/mumble.nix +++ b/nixos/tests/mumble.nix @@ -36,18 +36,29 @@ in # cancel client audio configuration $client1->waitForWindow(qr/Audio Tuning Wizard/); $client2->waitForWindow(qr/Audio Tuning Wizard/); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendKeys("esc"); $client2->sendKeys("esc"); # cancel client cert configuration $client1->waitForWindow(qr/Certificate Management/); $client2->waitForWindow(qr/Certificate Management/); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendKeys("esc"); $client2->sendKeys("esc"); # accept server certificate $client1->waitForWindow(qr/^Mumble$/); $client2->waitForWindow(qr/^Mumble$/); + $server->sleep(5); # wait because mumble is slow to register event handlers + $client1->sendChars("y"); + $client2->sendChars("y"); + $server->sleep(5); # wait because mumble is slow to register event handlers + + # sometimes the wrong of the 2 windows is focused, we switch focus and try pressing "y" again + $client1->sendKeys("alt-tab"); + $client2->sendKeys("alt-tab"); + $server->sleep(5); # wait because mumble is slow to register event handlers $client1->sendChars("y"); $client2->sendChars("y"); diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index d5a0a9b798f..17d4a878d3a 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -41,7 +41,6 @@ let machine.networking.useNetworkd = networkd; testScript = '' startAll; - $machine->waitForUnit("network-interfaces.target"); $machine->waitForUnit("network.target"); $machine->succeed("ip addr show lo | grep -q 'inet 127.0.0.1/8 '"); $machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '"); @@ -71,9 +70,7 @@ let '' startAll; - $client->waitForUnit("network-interfaces.target"); $client->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Make sure dhcpcd is not started @@ -119,9 +116,7 @@ let '' startAll; - $client->waitForUnit("network-interfaces.target"); $client->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Wait until we have an ip address on each interface @@ -164,9 +159,7 @@ let startAll; # Wait for networking to come up - $client->waitForUnit("network-interfaces.target"); $client->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Wait until we have an ip address on each interface @@ -213,9 +206,7 @@ let startAll; # Wait for networking to come up - $client1->waitForUnit("network-interfaces.target"); $client1->waitForUnit("network.target"); - $client2->waitForUnit("network-interfaces.target"); $client2->waitForUnit("network.target"); # Test bonding @@ -259,11 +250,8 @@ let startAll; # Wait for networking to come up - $client1->waitForUnit("network-interfaces.target"); $client1->waitForUnit("network.target"); - $client2->waitForUnit("network-interfaces.target"); $client2->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Test bridging @@ -298,9 +286,7 @@ let startAll; # Wait for networking to come up - $client->waitForUnit("network-interfaces.target"); $client->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Wait until we have an ip address on each interface @@ -348,9 +334,7 @@ let startAll; # Wait for networking to be configured - $client1->waitForUnit("network-interfaces.target"); $client1->waitForUnit("network.target"); - $client2->waitForUnit("network-interfaces.target"); $client2->waitForUnit("network.target"); # Print diagnostic information @@ -391,9 +375,7 @@ let startAll; # Wait for networking to be configured - $client1->waitForUnit("network-interfaces.target"); $client1->waitForUnit("network.target"); - $client2->waitForUnit("network-interfaces.target"); $client2->waitForUnit("network.target"); # Test vlan is setup diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix new file mode 100644 index 00000000000..7605227100d --- /dev/null +++ b/nixos/tests/prometheus.nix @@ -0,0 +1,29 @@ +import ./make-test.nix { + name = "prometheus"; + + nodes = { + one = { config, pkgs, ... }: { + services.prometheus = { + enable = true; + globalConfig = { + labels = { foo = "bar"; }; + }; + scrapeConfigs = [{ + job_name = "prometheus"; + target_groups = [{ + targets = [ "127.0.0.1:9090" ]; + labels = { instance = "localhost"; }; + }]; + }]; + rules = [ ''testrule = count(up{job="prometheus"})'' ]; + }; + }; + }; + + testScript = '' + startAll; + $one->waitForUnit("prometheus.service"); + $one->waitForOpenPort(9090); + $one->succeed("curl -s http://127.0.0.1:9090/metrics"); + ''; +} diff --git a/nixos/tests/pump.io.nix b/nixos/tests/pump.io.nix index 3864f676497..18da52b5134 100644 --- a/nixos/tests/pump.io.nix +++ b/nixos/tests/pump.io.nix @@ -77,7 +77,7 @@ in { }; }; mongodb.enable = true; mongodb.extraConfig = '' - nojournal = true + storage.journal.enabled: false ''; }; systemd.services.mongodb.unitConfig.Before = "pump.io.service"; diff --git a/nixos/tests/samba.nix b/nixos/tests/samba.nix new file mode 100644 index 00000000000..d6658ef0400 --- /dev/null +++ b/nixos/tests/samba.nix @@ -0,0 +1,48 @@ +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "samba"; + + meta.maintainers = [ pkgs.lib.maintainers.eelco ]; + + nodes = + { client = + { config, pkgs, ... }: + { fileSystems = pkgs.lib.mkVMOverride + { "/public" = { + fsType = "cifs"; + device = "//server/public"; + options = [ "guest" ]; + }; + }; + }; + + server = + { config, pkgs, ... }: + { services.samba.enable = true; + services.samba.shares.public = + { path = "/public"; + "read only" = true; + browseable = "yes"; + "guest ok" = "yes"; + comment = "Public samba share."; + }; + networking.firewall.allowedTCPPorts = [ 139 445 ]; + networking.firewall.allowedUDPPorts = [ 137 138 ]; + }; + }; + + # client# [ 4.542997] mount[777]: sh: systemd-ask-password: command not found + + testScript = + '' + $server->start; + $server->waitForUnit("samba-smbd"); + $server->waitForUnit("samba-nmbd"); + $server->succeed("mkdir -p /public; echo bar > /public/foo"); + + $client->start; + $client->waitForUnit("network.target"); + $client->succeed("[[ \$(cat /public/foo) = bar ]]"); + ''; +}) diff --git a/nixos/tests/smokeping.nix b/nixos/tests/smokeping.nix index 324f83147e0..9de3030417f 100644 --- a/nixos/tests/smokeping.nix +++ b/nixos/tests/smokeping.nix @@ -11,9 +11,10 @@ import ./make-test.nix ({ pkgs, ...} : { services.smokeping = { enable = true; port = 8081; + mailHost = "127.0.0.2"; probeConfig = '' + FPing - binary = ${pkgs.fping}/bin/fping + binary = /var/setuid-wrappers/fping offset = 0% ''; }; @@ -27,5 +28,6 @@ import ./make-test.nix ({ pkgs, ...} : { $sm->waitForFile("/var/lib/smokeping/data/Local/LocalMachine.rrd"); $sm->succeed("curl -s -f localhost:8081/smokeping.fcgi?target=Local"); $sm->succeed("ls /var/lib/smokeping/cache/Local/LocalMachine_mini.png"); + $sm->succeed("ls /var/lib/smokeping/cache/index.html"); ''; }) diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix index 92680d82ba8..475c947e72d 100644 --- a/nixos/tests/tomcat.nix +++ b/nixos/tests/tomcat.nix @@ -23,9 +23,8 @@ import ./make-test.nix ({ pkgs, ...} : { startAll; $server->waitForUnit("tomcat"); - $server->sleep(30); # Dirty, but it takes a while before Tomcat handles to requests properly $client->waitForUnit("network.target"); - $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); - $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); + $client->waitUntilSucceeds("curl --fail http://server/examples/servlets/servlet/HelloWorldExample"); + $client->waitUntilSucceeds("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp"); ''; }) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index ab4d46ab7e1..66f16ed8bcc 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -144,6 +144,7 @@ let "--uart1 0x3F8 4" "--uartmode1 client /run/virtualbox-log-${name}.sock" "--memory 768" + "--audio none" ] ++ (attrs.vmFlags or [])); controllerFlags = mkFlags [ @@ -273,9 +274,12 @@ let sub shutdownVM_${name} { $machine->succeed(ru "touch ${sharePath}/shutdown"); - $machine->waitUntilSucceeds( - "test ! -e ${sharePath}/shutdown ". - " -a ! -e ${sharePath}/boot-done" + $machine->execute( + 'set -e; i=0; '. + 'while test -e ${sharePath}/shutdown '. + ' -o -e ${sharePath}/boot-done; do '. + 'sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; '. + 'done' ); waitForShutdown_${name}; } @@ -386,6 +390,7 @@ in mapAttrs mkVBoxTest { $machine->sendKeys("ctrl-q"); $machine->sleep(5); $machine->screenshot("gui_manager_stopped"); + destroyVM_simple; ''; simple-cli = '' @@ -403,6 +408,7 @@ in mapAttrs mkVBoxTest { }); shutdownVM_simple; + destroyVM_simple; ''; headless = '' @@ -411,6 +417,7 @@ in mapAttrs mkVBoxTest { waitForStartup_headless; waitForVMBoot_headless; shutdownVM_headless; + destroyVM_headless; ''; host-usb-permissions = '' diff --git a/nixos/tests/wordpress.nix b/nixos/tests/wordpress.nix new file mode 100644 index 00000000000..afee1f7f6dd --- /dev/null +++ b/nixos/tests/wordpress.nix @@ -0,0 +1,60 @@ +import ./make-test.nix ({ pkgs, ... }: + +{ + name = "wordpress"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ grahamc ]; # under duress! + }; + + nodes = + { web = + { config, pkgs, ... }: + { + services.mysql.enable = true; + services.mysql.package = pkgs.mysql; + services.mysql.initialScript = pkgs.writeText "start.sql" '' + CREATE DATABASE wordpress; + CREATE USER 'wordpress'@'localhost' IDENTIFIED BY 'wordpress'; + GRANT ALL on wordpress.* TO 'wordpress'@'localhost'; + ''; + + services.httpd = { + enable = true; + logPerVirtualHost = true; + adminAddr="js@lastlog.de"; + extraModules = [ + { name = "php7"; path = "${pkgs.php}/modules/libphp7.so"; } + ]; + + virtualHosts = [ + { + hostName = "wordpress"; + extraSubservices = + [ + { + serviceType = "wordpress"; + dbPassword = "wordpress"; + wordpressUploads = "/data/uploads"; + languages = [ "de_DE" "en_GB" ]; + } + ]; + } + ]; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + startAll; + + $web->waitForUnit("mysql"); + $web->waitForUnit("httpd"); + + $web->succeed("curl -L 127.0.0.1:80 | grep 'Welcome to the famous'"); + + + ''; + +}) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 7b4e7d54f32..40d82914bf7 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -6,14 +6,14 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - core_version = "0.12.0"; + core_version = "0.13.0"; version = core_version; src = fetchurl { urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz" "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz" ]; - sha256 = "0f1cda66c841a548a07cc37e80b0727354b1236d9f374c7d44362acdb85eb3e1"; + sha256 = "0c7d7049689bb17f4256f1e5ec20777f42acef61814d434b38e6c17091161cda"; }; buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib diff --git a/pkgs/applications/audio/ams-lv2/default.nix b/pkgs/applications/audio/ams-lv2/default.nix index 0001f0a9292..9d62696a3f8 100644 --- a/pkgs/applications/audio/ams-lv2/default.nix +++ b/pkgs/applications/audio/ams-lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cairo, fftw, gtk, gtkmm, lv2, lvtk, pkgconfig, python }: +{ stdenv, fetchurl, cairo, fftw, gtkmm2, lv2, lvtk, pkgconfig, python }: stdenv.mkDerivation rec { name = "ams-lv2-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1kqbl7rc3zrs27c5ga0frw3mlpx15sbxzhf04sfbrd9l60535fd5"; }; - buildInputs = [ cairo fftw gtk gtkmm lv2 lvtk pkgconfig python ]; + buildInputs = [ cairo fftw gtkmm2 lv2 lvtk pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix index d9614d10d32..ff2d4bbce4e 100644 --- a/pkgs/applications/audio/ardour/ardour3.nix +++ b/pkgs/applications/audio/ardour/ardour3.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2 +, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile , libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo + glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK diff --git a/pkgs/applications/audio/ardour/ardour4.nix b/pkgs/applications/audio/ardour/ardour4.nix new file mode 100644 index 00000000000..f9d64ff6f63 --- /dev/null +++ b/pkgs/applications/audio/ardour/ardour4.nix @@ -0,0 +1,86 @@ +{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw +, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 +, libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf +, librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile +, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango +, perl, pkgconfig, python, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: + +let + + # Ardour git repo uses a mix of annotated and lightweight tags. Annotated + # tags are used for MAJOR.MINOR versioning, and lightweight tags are used + # in-between; MAJOR.MINOR.REV where REV is the number of commits since the + # last annotated tag. A slightly different version string format is needed + # for the 'revision' info that is built into the binary; it is the format of + # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. + + # Version to build. + tag = "4.7"; + +in + +stdenv.mkDerivation rec { + name = "ardour-${tag}"; + + src = fetchFromGitHub { + owner = "Ardour"; + repo = "ardour"; + rev = "d84a8222f2b6dab5028b2586f798535a8766670e"; + sha256 = "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l"; + }; + + buildInputs = + [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc + glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo + libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate + libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 + makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK + ]; + + # ardour's wscript has a "tarball" target but that required the git revision + # be available. Since this is an unzipped tarball fetched from github we + # have to do that ourself. + patchPhase = '' + printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc + sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript + patchShebangs ./tools/ + ''; + + configurePhase = "python waf configure --optimize --docs --with-backends=jack,alsa --prefix=$out"; + + buildPhase = "python waf"; + + installPhase = '' + python waf install + # Install desktop file + mkdir -p "$out/share/applications" + cat > "$out/share/applications/ardour.desktop" << EOF + [Desktop Entry] + Name=Ardour 4 + GenericName=Digital Audio Workstation + Comment=Multitrack harddisk recorder + Exec=$out/bin/ardour4 + Icon=$out/share/ardour4/icons/ardour_icon_256px.png + Terminal=false + Type=Application + X-MultipleArgs=false + Categories=GTK;Audio;AudioVideoEditing;AudioVideo;Video; + EOF + ''; + + meta = with stdenv.lib; { + description = "Multi-track hard disk recording software"; + longDescription = '' + Ardour is a digital audio workstation (DAW), You can use it to + record, edit and mix multi-track audio and midi. Produce your + own CDs. Mix video soundtracks. Experiment with new ideas about + music and sound. + Please consider supporting the ardour project financially: + https://community.ardour.org/node/8288 + ''; + homepage = http://ardour.org/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.goibhniu maintainers.fps ]; + }; +} diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 9f047a600cb..6adb3a0ed47 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, alsaLib, aubio, boost, cairomm, curl, doxygen, dbus, fftw -, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtk, gtkmm, libjack2 +{ stdenv, fetchgit, alsaLib, aubio, boost, cairomm, curl, doxygen +, fftwSinglePrec, flac, glibc, glibmm, graphviz, gtkmm2, libjack2 , libgnomecanvas, libgnomecanvasmm, liblo, libmad, libogg, librdf , librdf_raptor, librdf_rasqal, libsamplerate, libsigcxx, libsndfile -, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper, pango -, perl, pkgconfig, python, rubberband, serd, sord-svn, sratom, suil, taglib, vampSDK }: +, libusb, libuuid, libxml2, libxslt, lilv-svn, lv2, makeWrapper +, perl, pkgconfig, python, rubberband, serd, sord-svn, sratom +, taglib, vampSDK, dbus, fftw, pango, suil, libarchive }: let @@ -15,26 +16,26 @@ let # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH. # Version to build. - tag = "4.7"; + tag = "5.4"; in stdenv.mkDerivation rec { name = "ardour-${tag}"; - src = fetchFromGitHub { - owner = "Ardour"; - repo = "ardour"; - rev = "d84a8222f2b6dab5028b2586f798535a8766670e"; - sha256 = "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l"; + src = fetchgit { + url = "git://git.ardour.org/ardour/ardour.git"; + rev = "bb3312c3bb9c6ed9b75ac6739a6ee720ddf86c86"; + sha256 = "1yrg0d86k9fqw7lmzjglilbadb4cjqxqkf6ii4bjs6rihj6b0qrf"; }; buildInputs = [ alsaLib aubio boost cairomm curl doxygen dbus fftw fftwSinglePrec flac glibc - glibmm graphviz gtk gtkmm libjack2 libgnomecanvas libgnomecanvasmm liblo + glibmm graphviz gtkmm2 libjack2 libgnomecanvas libgnomecanvasmm liblo libmad libogg librdf librdf_raptor librdf_rasqal libsamplerate libsigcxx libsndfile libusb libuuid libxml2 libxslt lilv-svn lv2 - makeWrapper pango perl pkgconfig python rubberband serd sord-svn sratom suil taglib vampSDK + makeWrapper pango perl pkgconfig python rubberband serd sord-svn + sratom suil taglib vampSDK libarchive ]; # ardour's wscript has a "tarball" target but that required the git revision @@ -57,11 +58,11 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/applications" cat > "$out/share/applications/ardour.desktop" << EOF [Desktop Entry] - Name=Ardour 4 + Name=Ardour 5 GenericName=Digital Audio Workstation Comment=Multitrack harddisk recorder - Exec=$out/bin/ardour4 - Icon=$out/share/ardour4/icons/ardour_icon_256px.png + Exec=$out/bin/ardour5 + Icon=$out/share/ardour5/icons/ardour_icon_256px.png Terminal=false Type=Application X-MultipleArgs=false diff --git a/pkgs/applications/audio/asunder/default.nix b/pkgs/applications/audio/asunder/default.nix new file mode 100644 index 00000000000..b5897c71cd9 --- /dev/null +++ b/pkgs/applications/audio/asunder/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl, makeWrapper, gtk2, libcddb, intltool, pkgconfig, cdparanoia +, mp3Support ? false, lame +, oggSupport ? true, vorbis-tools +, flacSupport ? true, flac +, opusSupport ? false, opusTools +, wavpackSupport ? false, wavpack +#, musepackSupport ? false, TODO: mpcenc +, monkeysAudioSupport ? false, monkeysAudio +#, aacSupport ? false, TODO: neroAacEnc +}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "2.8"; + name = "asunder-${version}"; + src = fetchurl { + url = "http://littlesvr.ca/asunder/releases/${name}.tar.bz2"; + sha256 = "1nq9kd4rd4k2kibf57gdbm0zw2gxa234vvvdhxkm8g5bhx5h3iyq"; + }; + + buildInputs = [ gtk2 libcddb intltool pkgconfig makeWrapper ]; + + runtimeDeps = + optional mp3Support lame ++ + optional oggSupport vorbis-tools ++ + optional flacSupport flac ++ + optional opusSupport opusTools ++ + optional wavpackSupport wavpack ++ + optional monkeysAudioSupport monkeysAudio ++ + [ cdparanoia ]; + + postInstall = '' + wrapProgram "$out/bin/asunder" \ + --prefix PATH : "${makeBinPath runtimeDeps}" + ''; + + meta = { + description = "A graphical Audio CD ripper and encoder for Linux"; + homepage = http://littlesvr.ca/asunder/index.php; + license = licenses.gpl2; + maintainers = with maintainers; [ mudri ]; + platforms = platforms.linux; + + longDescription = '' + Asunder is a graphical Audio CD ripper and encoder for Linux. You can use + it to save tracks from an Audio CD as any of WAV, MP3, OGG, FLAC, Opus, + WavPack, Musepack, AAC, and Monkey's Audio files. + ''; + }; +} diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index e6322dd1d0a..e9d7b5da79a 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -8,16 +8,16 @@ stdenv.mkDerivation rec { name = "audacious-${version}"; - version = "3.7.2"; + version = "3.8"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2"; - sha256 = "1pvyxi8niy70nv13kc16g2vaywwahmg2650fa7v4rlbmykifk75z"; + sha256 = "0rpdzf9pb52lcswxypwh4nq3qkjzliw42v39nm5rlwwxdq6bm99q"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2"; - sha256 = "0gxka0lp9a35k2xgq8bx69wyv83dvrqnpwcsqliy3h3yz6v1fv2v"; + sha256 = "0j9svdqdjvj5spx1vfp0m63xh8xwk8naqsikdxfxbb68xk33rxb9"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index a93a445db31..b31cecffbd1 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk, glib, zlib, perl, intltool, +{ stdenv, fetchurl, wxGTK30, pkgconfig, gettext, gtk2, glib, zlib, perl, intltool, libogg, libvorbis, libmad, alsaLib, libsndfile, soxr, flac, lame, fetchpatch, expat, libid3tag, ffmpeg, soundtouch /*, portaudio - given up fighting their portaudio.patch */ }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gettext wxGTK30 expat alsaLib - libsndfile soxr libid3tag gtk + libsndfile soxr libid3tag gtk2 ffmpeg libmad lame libvorbis flac soundtouch ]; #ToDo: detach sbsms diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix index f5f0711ecac..db5f081c4ed 100644 --- a/pkgs/applications/audio/aumix/default.nix +++ b/pkgs/applications/audio/aumix/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl, gettext, ncurses , gtkGUI ? false , pkgconfig ? null -, gtk ? null}: +, gtk2 ? null}: -assert gtkGUI -> pkgconfig != null && gtk != null; +assert gtkGUI -> pkgconfig != null && gtk2 != null; stdenv.mkDerivation rec { name = "aumix-2.9.1"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gettext ncurses ] - ++ (if gtkGUI then [pkgconfig gtk] else []); + ++ (if gtkGUI then [pkgconfig gtk2] else []); meta = { description = "Audio mixer for X and the console"; diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 7113a169e80..900d6759e4a 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, guile, libart_lgpl, pkgconfig, intltool -, gtk, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: +, gtk2, glib, libogg, libvorbis, libgnomecanvas, gettext, perl }: stdenv.mkDerivation rec { name = "beast-0.7.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ zlib guile libart_lgpl pkgconfig intltool gtk glib + [ zlib guile libart_lgpl pkgconfig intltool gtk2 glib libogg libvorbis libgnomecanvas gettext ]; diff --git a/pkgs/applications/audio/bitwig-studio/default.nix b/pkgs/applications/audio/bitwig-studio/default.nix index efb36abe240..47c80af9fe0 100644 --- a/pkgs/applications/audio/bitwig-studio/default.nix +++ b/pkgs/applications/audio/bitwig-studio/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf -, glib, gtk, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp +, glib, gtk2, harfbuzz, jdk, lib, libX11, libXau, libXcursor, libXdmcp , libXext, libXfixes, libXrender, libbsd, libjack2, libpng, libxcb , libxkbcommon, libxkbfile, makeWrapper, pixman, xcbutil, xcbutilwm , xdg_utils, zenity, zlib }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { dontStrip = true; libPath = lib.makeLibraryPath [ - alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk harfbuzz + alsaLib bzip2.out cairo freetype gdk_pixbuf glib gtk2 harfbuzz libX11 libXau libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb libxkbfile pixman xcbutil xcbutilwm zlib diff --git a/pkgs/applications/audio/calf/default.nix b/pkgs/applications/audio/calf/default.nix index 4ba086d8848..e133df564d7 100644 --- a/pkgs/applications/audio/calf/default.nix +++ b/pkgs/applications/audio/calf/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, expat, fftwSinglePrec, fluidsynth, glib -, gtk, libjack2, ladspaH , libglade, lv2, pkgconfig }: +, gtk2, libjack2, ladspaH , libglade, lv2, pkgconfig }: stdenv.mkDerivation rec { name = "calf-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cairo expat fftwSinglePrec fluidsynth glib gtk libjack2 ladspaH + cairo expat fftwSinglePrec fluidsynth glib gtk2 libjack2 ladspaH libglade lv2 pkgconfig ]; diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix index 39ad787c4a1..57107924b61 100644 --- a/pkgs/applications/audio/cava/default.nix +++ b/pkgs/applications/audio/cava/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "cava-${version}"; - version = "0.4.1"; + version = "0.4.2"; buildInputs = [ alsaLib @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "karlstav"; repo = "cava"; rev = version; - sha256 = "157hw4cn3qjic7ymn5vy67paxmzssc33h1zswx72ss7j6nc8707f"; + sha256 = "1c5gl8ghmd89f6097rjd2dzrgh1z4i4v9m4vn5wkpnnm68b96yyc"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/applications/audio/cd-discid/default.nix b/pkgs/applications/audio/cd-discid/default.nix index 2cf9849e351..382d4a1b667 100644 --- a/pkgs/applications/audio/cd-discid/default.nix +++ b/pkgs/applications/audio/cd-discid/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { installFlags = "PREFIX=$(out) INSTALL=install"; buildInputs = [] - ++ stdenv.lib.optional stdenv.isDarwin [ IOKit ]; + ++ stdenv.lib.optional stdenv.isDarwin IOKit; meta = with stdenv.lib; { homepage = http://linukz.org/cd-discid.shtml; diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 28183a2c669..ceff147d618 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = stdenv.lib.optional stdenv.isDarwin [ + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Carbon IOKit ]; diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix index 0ff83a9023e..3ef69606c77 100644 --- a/pkgs/applications/audio/eq10q/default.nix +++ b/pkgs/applications/audio/eq10q/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, gtkmm, libxcb, lv2, pkgconfig, xorg }: +{ stdenv, fetchurl, cmake, fftw, gtkmm2, libxcb, lv2, pkgconfig, xorg }: stdenv.mkDerivation rec { name = "eq10q-${version}"; version = "2.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "08vlfly0qqrfqiwpn5g5php680icpk97pwnwjadmj5syhgvi0i3h"; }; - buildInputs = [ cmake fftw gtkmm libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; + buildInputs = [ cmake fftw gtkmm2 libxcb lv2 pkgconfig xorg.libpthreadstubs xorg.libXdmcp xorg.libxshmfence ]; installFlags = '' DESTDIR=$(out) diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/applications/audio/faust/faust2alsa.nix index 2fe03d73a23..17cec46f6c6 100644 --- a/pkgs/applications/audio/faust/faust2alsa.nix +++ b/pkgs/applications/audio/faust/faust2alsa.nix @@ -6,7 +6,7 @@ , freetype , gdk_pixbuf , glib -, gtk +, gtk2 , pango }: @@ -22,7 +22,7 @@ faust.wrapWithBuildEnv { freetype gdk_pixbuf glib - gtk + gtk2 pango ]; diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 9dfb7f875c5..3867114562d 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -1,5 +1,5 @@ { faust -, gtk +, gtk2 , jack2Full , opencv }: @@ -15,7 +15,7 @@ faust.wrapWithBuildEnv { ]; propagatedBuildInputs = [ - gtk + gtk2 jack2Full opencv ]; diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 6971a718de9..ecb9d0f85d0 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -3,17 +3,19 @@ , libSM, libsndfile, libogg }: -stdenv.mkDerivation { - name = "freewheeling-100"; +stdenv.mkDerivation rec { + name = "freewheeling-${version}"; + version = "100"; src = fetchsvn { url = svn://svn.code.sf.net/p/freewheeling/code; - rev = 100; + rev = version; sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv"; }; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ - pkgconfig autoreconfHook gnutls33 freetype SDL SDL_gfx SDL_ttf + gnutls33 freetype SDL SDL_gfx SDL_ttf liblo libxml2 libjack2 alsaLib libvorbis libsndfile libogg libSM ]; @@ -35,7 +37,6 @@ stdenv.mkDerivation { software, released under the GNU GPL license. '' ; - version = "r100"; homepage = "http://freewheeling.sourceforge.net"; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.sepi ]; diff --git a/pkgs/applications/audio/gigedit/default.nix b/pkgs/applications/audio/gigedit/default.nix index 269b48aebb8..e53b498fb6e 100644 --- a/pkgs/applications/audio/gigedit/default.nix +++ b/pkgs/applications/audio/gigedit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, autoconf, automake, docbook_xml_dtd_45 -, docbook_xsl, gtkmm, intltool, libgig, libsndfile, libtool, libxslt +, docbook_xsl, gtkmm2, intltool, libgig, libsndfile, libtool, libxslt , pkgconfig }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preConfigure = "make -f Makefile.cvs"; buildInputs = [ - autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm intltool + autoconf automake docbook_xml_dtd_45 docbook_xsl gtkmm2 intltool libgig libsndfile libtool libxslt pkgconfig ]; diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix index 7486ec3e081..2d63245fef6 100644 --- a/pkgs/applications/audio/gjay/default.nix +++ b/pkgs/applications/audio/gjay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk, gsl +{ stdenv, fetchurl, pkgconfig, mpd_clientlib, dbus_glib, audacious, gtk2, gsl , libaudclient }: stdenv.mkDerivation { @@ -11,7 +11,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib dbus_glib audacious gtk gsl libaudclient ]; + buildInputs = [ mpd_clientlib dbus_glib audacious gtk2 gsl libaudclient ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index 0c7b5c2c9ca..ab6dd0eee72 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, libtool, intltool, pkgconfig, glib -, gtk, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique +, gtk2, curl, mpd_clientlib, libsoup, gob2, vala_0_23, libunique , libSM, libICE, sqlite, hicolor_icon_theme, wrapGAppsHook }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libtool intltool pkgconfig glib gtk curl mpd_clientlib libsoup + libtool intltool pkgconfig glib gtk2 curl mpd_clientlib libsoup libunique libmpd gob2 vala_0_23 libSM libICE sqlite hicolor_icon_theme wrapGAppsHook ]; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index af213f1a835..4fd68742ba2 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, gettext, intltool, pkgconfig, python , avahi, bluez, boost, eigen, fftw, glib, glib_networking -, glibmm, gsettings_desktop_schemas, gtk, gtkmm, libjack2 +, glibmm, gsettings_desktop_schemas, gtkmm2, libjack2 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom , webkitgtk2, wrapGAppsHook, zita-convolver, zita-resampler , optimizationSupport ? false # Enable support for native CPU extensions @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ avahi bluez boost eigen fftw glib glibmm glib_networking.out - gsettings_desktop_schemas gtk gtkmm libjack2 ladspaH librdf + gsettings_desktop_schemas gtkmm2 libjack2 ladspaH librdf libsndfile lilv lv2 serd sord sratom webkitgtk2 zita-convolver zita-resampler ]; diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index ab8f7af1bd5..9a336576d3a 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, libjack2, lilv-svn +{ stdenv, fetchsvn, boost, ganv, glibmm, gtkmm2, libjack2, lilv-svn , lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord-svn, sratom , suil }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - boost ganv glibmm gtk gtkmm libjack2 lilv-svn lv2 makeWrapper pkgconfig + boost ganv glibmm gtkmm2 libjack2 lilv-svn lv2 makeWrapper pkgconfig python raul serd sord-svn sratom suil ]; diff --git a/pkgs/applications/audio/jack-rack/default.nix b/pkgs/applications/audio/jack-rack/default.nix index e4a48230e23..1d1925779f0 100644 --- a/pkgs/applications/audio/jack-rack/default.nix +++ b/pkgs/applications/audio/jack-rack/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk, alsaLib, libxml2, librdf }: +{ stdenv, fetchurl, pkgconfig, libjack2, ladspaH, gtk2, alsaLib, libxml2, librdf }: stdenv.mkDerivation rec { name = "jack-rack-1.4.7"; src = fetchurl { url = "mirror://sourceforge/jack-rack/${name}.tar.bz2"; sha256 = "1lmibx9gicagcpcisacj6qhq6i08lkl5x8szysjqvbgpxl9qg045"; }; - buildInputs = [ pkgconfig libjack2 ladspaH gtk alsaLib libxml2 librdf ]; + buildInputs = [ pkgconfig libjack2 ladspaH gtk2 alsaLib libxml2 librdf ]; meta = { description = ''An effects "rack" for the JACK low latency audio API''; diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 5e99e60c818..bcec085887a 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, libjack2, lilv, lv2, pkgconfig, python +{ stdenv, fetchurl, gtk2, libjack2, lilv, lv2, pkgconfig, python , serd, sord , sratom, suil }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gtk libjack2 lilv lv2 pkgconfig python serd sord sratom suil + gtk2 libjack2 lilv lv2 pkgconfig python serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix index d00dcafd7b8..c5593a8d600 100644 --- a/pkgs/applications/audio/kid3/default.nix +++ b/pkgs/applications/audio/kid3/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { phonon automoc4 chromaprint id3lib taglib mp4v2 flac libogg libvorbis qt zlib readline makeWrapper ]; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DWITH_APPS=Qt;CLI" ]; + cmakeFlags = [ "-DWITH_APPS=Qt;CLI" ]; NIX_LDFLAGS = "-lm -lpthread"; preConfigure = '' diff --git a/pkgs/applications/audio/lash/default.nix b/pkgs/applications/audio/lash/default.nix index cfe29949e4f..da61eee3b64 100644 --- a/pkgs/applications/audio/lash/default.nix +++ b/pkgs/applications/audio/lash/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, libjack2, libuuid, libxml2 +{ stdenv, fetchurl, alsaLib, gtk2, libjack2, libuuid, libxml2 , makeWrapper, pkgconfig, readline }: assert libuuid != null; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # http://permalink.gmane.org/gmane.linux.redhat.fedora.extras.cvs/822346 patches = [ ./socket.patch ./gcc-47.patch ]; - buildInputs = [ alsaLib gtk libjack2 libxml2 makeWrapper + buildInputs = [ alsaLib gtk2 libjack2 libxml2 makeWrapper pkgconfig readline ]; propagatedBuildInputs = [ libuuid ]; diff --git a/pkgs/applications/audio/lingot/default.nix b/pkgs/applications/audio/lingot/default.nix index 22ab37dc98a..47b65ff2b5a 100644 --- a/pkgs/applications/audio/lingot/default.nix +++ b/pkgs/applications/audio/lingot/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk, alsaLib, libglade }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk2, alsaLib, libglade }: stdenv.mkDerivation { name = "lingot-0.9.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ pkgconfig intltool gtk alsaLib libglade ]; + buildInputs = [ pkgconfig intltool gtk2 alsaLib libglade ]; configureFlags = "--disable-jack"; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index a3aa133960f..5c127a289c0 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, python, pyGtkGlade, pygtksourceview }: +{ stdenv, fetchurl, makeWrapper, pkgconfig, MMA, libjack2, libsmf, pythonPackages }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) pyGtkGlade pygtksourceview python; +in stdenv.mkDerivation rec { version = "12.02.1"; name = "linuxband-${version}"; diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix index 26400ed61da..2c6df650d5d 100644 --- a/pkgs/applications/audio/mhwaveedit/default.nix +++ b/pkgs/applications/audio/mhwaveedit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk, libjack2, ladspaH +{ stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk2, libjack2, ladspaH , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame , vorbis-tools }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "010rk4mr631s440q9cfgdxx2avgzysr9aq52diwdlbq9cddifli3"; }; - buildInputs = [ SDL alsaLib gtk libjack2 ladspaH libsamplerate libsndfile + buildInputs = [ SDL alsaLib gtk2 libjack2 ladspaH libsamplerate libsndfile pkgconfig libpulseaudio makeWrapper ]; configureFlags = "--with-default-ladspa-path=${ladspaPlugins}/lib/ladspa"; diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index b9a38ab9d03..0ab0d24c272 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { }; pythonPath = with pythonPackages; [ - pygobject gst_python musicbrainzngs + pygobject2 gst_python musicbrainzngs pycdio pyxdg setuptools CDDB ]; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index d28cd7c9e06..5f1d2bfa93d 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ncurses, pkgconfig, gtk }: +{ fetchurl, stdenv, ncurses, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "mp3info-0.8.5a"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "042f1czcs9n2sbqvg4rsvfwlqib2gk976mfa2kxlfjghx5laqf04"; }; - buildInputs = [ ncurses pkgconfig gtk ]; + buildInputs = [ ncurses pkgconfig gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix new file mode 100644 index 00000000000..d5e0ed1c476 --- /dev/null +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, SDL2, pkgconfig }: + +let + version = "0.2.7025-beta20.1"; +in stdenv.mkDerivation rec { + name = "openmpt123-${version}"; + src = fetchurl { + url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}.tar.gz"; + sha256 = "0qp2nnz6pnl1d7yv9hcjyim7q6yax5881k1jxm8jfgjqagmz5k6p"; + }; + buildInputs = [ SDL2 pkgconfig ]; + makeFlags = [ "NO_LTDL=1 TEST=0 EXAMPLES=0" ] + ++ stdenv.lib.optional (stdenv.isDarwin) "SHARED_SONAME=0"; + installFlags = "PREFIX=\${out}"; + + meta = with stdenv.lib; { + description = "A cross-platform command-line based module file player"; + homepage = https://lib.openmpt.org/libopenmpt/; + license = licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/audio/opusfile/default.nix b/pkgs/applications/audio/opusfile/default.nix index b55ea30bae0..f840ba278cf 100644 --- a/pkgs/applications/audio/opusfile/default.nix +++ b/pkgs/applications/audio/opusfile/default.nix @@ -1,14 +1,17 @@ { stdenv, fetchurl, pkgconfig, openssl, libogg, libopus }: stdenv.mkDerivation rec { - name = "opusfile-0.6"; + name = "opusfile-0.8"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz"; - sha256 = "19iys2kld75k0210b807i4illrdmj3cmmnrgxlc9y4vf6mxp2a14"; + sha256 = "192mp2jgn5s9815h31ybzsfipmbppmdhwx1dymrk26xarz9iw8rc"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libogg libopus ]; + buildInputs = [ openssl libogg ]; + propagatedBuildInputs = [ libopus ]; + patches = [ ./include-multistream.patch ]; + configureFlags = [ "--disable-examples" ]; meta = { description = "High-level API for decoding and seeking in .opus files"; diff --git a/pkgs/applications/audio/opusfile/include-multistream.patch b/pkgs/applications/audio/opusfile/include-multistream.patch new file mode 100644 index 00000000000..7c6dd847596 --- /dev/null +++ b/pkgs/applications/audio/opusfile/include-multistream.patch @@ -0,0 +1,12 @@ +diff -Naur a/include/opusfile.h b/include/opusfile.h +--- a/include/opusfile.h 2014-04-29 19:07:09.000000000 +0200 ++++ b/include/opusfile.h 2016-09-05 17:50:15.147553798 +0200 +@@ -107,7 +107,7 @@ + # include + # include + # include +-# include ++# include + + /**@cond PRIVATE*/ + diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix index 0f8c7a95010..7cce08e733d 100644 --- a/pkgs/applications/audio/paprefs/default.nix +++ b/pkgs/applications/audio/paprefs/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm +{ fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm2, libglademm , dbus_glib, GConf, gconfmm, intltool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1c5b3sb881szavly220q31g7rvpn94wr7ywlk00hqb9zaikml716"; }; - buildInputs = [ libpulseaudio gtkmm libglademm dbus_glib gconfmm ]; + buildInputs = [ libpulseaudio gtkmm2 libglademm dbus_glib gconfmm ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix index 1deb11d9925..91a270a698e 100644 --- a/pkgs/applications/audio/patchage/default.nix +++ b/pkgs/applications/audio/patchage/default.nix @@ -1,5 +1,5 @@ -{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm, gtk2 -, gtkmm, libjack2, pkgconfig, python2 +{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm +, gtkmm2, libjack2, pkgconfig, python2 }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost dbus_glib ganv glibmm gtk2 gtkmm libjack2 + alsaLib boost dbus_glib ganv glibmm gtkmm2 libjack2 pkgconfig python2 ]; diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index c9d9ad57487..d86e5aae2cd 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas +{ stdenv, fetchurl, alsaLib, cmake, gtk2, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkgconfig, openssl }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib cmake gtk libjack2 libgnomecanvas libpthreadstubs + [ alsaLib cmake gtk2 libjack2 libgnomecanvas libpthreadstubs libsamplerate libsndfile libtool libxml2 pkgconfig openssl ]; diff --git a/pkgs/applications/audio/ponymix/default.nix b/pkgs/applications/audio/ponymix/default.nix index cbc516fb288..ced5262f5d2 100644 --- a/pkgs/applications/audio/ponymix/default.nix +++ b/pkgs/applications/audio/ponymix/default.nix @@ -1,11 +1,14 @@ -{ stdenv, fetchurl, libpulseaudio, libnotify, pkgconfig }: +{ stdenv, fetchFromGitHub, libpulseaudio, libnotify, pkgconfig }: stdenv.mkDerivation rec { name = "ponymix-${version}"; version = "5"; - src = fetchurl { - url = "http://code.falconindy.com/archive/ponymix/${name}.tar.xz"; - sha256 = "0qn2kms9h9b7da2xzkdgzrykhhdywr4psxnz03j8rg7wa9nwfw0x"; + + src = fetchFromGitHub { + owner = "falconindy"; + repo = "ponymix"; + rev = version; + sha256 = "08yp7fprmzm6px5yx2rvzri0l60bra5h59l26pn0k071a37ks1rb"; }; buildInputs = [ libpulseaudio libnotify ]; @@ -13,9 +16,11 @@ stdenv.mkDerivation rec { postPatch = ''substituteInPlace Makefile --replace "\$(DESTDIR)/usr" "$out"''; - meta = { + meta = with stdenv.lib; { description = "CLI PulseAudio Volume Control"; homepage = "http://github.com/falconindy/ponymix"; - license = "mit"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ ericsagnes ]; }; } diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 883d49682ce..52f2a0ff924 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtk, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtk2, pkgconfig }: stdenv.mkDerivation rec { name = "praat-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { cp praat $out/bin ''; - buildInputs = [ alsaLib gtk pkgconfig ]; + buildInputs = [ alsaLib gtk2 pkgconfig ]; meta = { description = "Doing phonetics by computer"; diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 418efa23b20..9e0abac5ce4 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -1,4 +1,4 @@ -{ alsaLib, autoconf, automake, dssi, fetchurl, gtk, libjack2 +{ alsaLib, autoconf, automake, dssi, fetchurl, gtk2, libjack2 , ladspaH, ladspaPlugins, liblo, libmad, libsamplerate, libsndfile , libtool, libvorbis, lilv, lv2, pkgconfig, qt4, rubberband, serd , sord, sratom, stdenv, suil }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ alsaLib autoconf automake dssi gtk libjack2 ladspaH + [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH ladspaPlugins liblo libmad libsamplerate libsndfile libtool libvorbis lilv lv2 pkgconfig qt4 rubberband serd sord sratom suil diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix index a046fe80e13..00856721f95 100644 --- a/pkgs/applications/audio/quodlibet/default.nix +++ b/pkgs/applications/audio/quodlibet/default.nix @@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null let version = "2.6.3"; - inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject dbus-python; + inherit (pythonPackages) buildPythonApplication python mutagen pygtk pygobject2 dbus-python; in buildPythonApplication { # call the package quodlibet and just quodlibet name = "quodlibet${stdenv.lib.optionalString withGstPlugins "-with-gst-plugins"}-${version}"; @@ -48,7 +48,7 @@ in buildPythonApplication { ]; propagatedBuildInputs = [ - mutagen pygtk pygobject dbus-python gst_python intltool + mutagen pygtk pygobject2 dbus-python gst_python intltool ]; postInstall = stdenv.lib.optionalString withGstPlugins '' diff --git a/pkgs/applications/audio/seq24/default.nix b/pkgs/applications/audio/seq24/default.nix index 73fa58a46c4..eafa0980b4b 100644 --- a/pkgs/applications/audio/seq24/default.nix +++ b/pkgs/applications/audio/seq24/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, gtkmm, libjack2, pkgconfig }: +{ stdenv, fetchurl, alsaLib, gtkmm2, libjack2, pkgconfig }: stdenv.mkDerivation rec { name = "seq24-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = [ ./mutex_no_nameclash.patch ]; - buildInputs = [ alsaLib gtkmm libjack2 ]; + buildInputs = [ alsaLib gtkmm2 libjack2 ]; nativeBuildInputs = [ pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index e0d89d809a7..0cc0740eddb 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype -, glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf -, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }: +, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, GConf +, libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome2 }: assert stdenv.system == "x86_64-linux"; let # Please update the stable branch! - version = "1.0.37.152.gc83ea995-42"; + version = "1.0.38.171.g5e1cd7b2-22"; deps = [ alsaLib @@ -22,7 +22,7 @@ let GConf gdk_pixbuf glib - gtk + gtk2 libgcrypt libpng nss @@ -51,20 +51,27 @@ stdenv.mkDerivation { src = fetchurl { url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "00hd5q3cn9dzgphkpswd5y06k9phiqhhmb3frwdkcnb1d4pnp9cx"; + sha256 = "0mhrbcw92g11czwcclnbwz1pk1jgap4xlya7dqsrcyb50azmv450"; }; buildInputs = [ dpkg makeWrapper ]; - unpackPhase = "true"; + unpackPhase = '' + runHook preUnpack + dpkg-deb -x $src . + runHook postUnpack + ''; + + configurePhase = "runHook preConfigure; runHook postConfigure"; + buildPhase = "runHook preBuild; runHook postBuild"; installPhase = '' + runHook preInstall + libdir=$out/lib/spotify mkdir -p $libdir - dpkg-deb -x $src $out - mv $out/usr/* $out/ - rm -rf $out/usr + mv ./usr/* $out/ # Work around Spotify referring to a specific minor version of # OpenSSL. @@ -83,7 +90,7 @@ stdenv.mkDerivation { librarypath="${stdenv.lib.makeLibraryPath deps}:$libdir" wrapProgram $out/share/spotify/spotify \ --prefix LD_LIBRARY_PATH : "$librarypath" \ - --prefix PATH : "${gnome.zenity}/bin" + --prefix PATH : "${gnome2.zenity}/bin" # Desktop file mkdir -p "$out/share/applications/" @@ -96,6 +103,8 @@ stdenv.mkDerivation { ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \ "$out/share/icons/hicolor/$ixi/apps/spotify-client.png" done + + runHook postInstall ''; dontStrip = true; diff --git a/pkgs/applications/audio/squishyball/default.nix b/pkgs/applications/audio/squishyball/default.nix new file mode 100644 index 00000000000..2022183f4a0 --- /dev/null +++ b/pkgs/applications/audio/squishyball/default.nix @@ -0,0 +1,48 @@ +{ stdenv, autoreconfHook, fetchsvn, flac, libao, libvorbis, ncurses +, opusfile, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "squishyball-${rev}"; + rev = "19580"; + + src = fetchsvn { + url = "https://svn.xiph.org/trunk/squishyball"; + rev = rev; + sha256 = "013vq52q9z6kpg9iyc2jnb3m2gihcjblvwpg4yj4wy1q2c05pzqp"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ flac libao libvorbis ncurses opusfile ]; + + patches = [ ./gnu-screen.patch ]; + + postInstall = '' + # Why doesn’t this happen automagically? + mkdir -p $out/share/man/man1 + cp squishyball.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "A tool to perform sample comparison testing on the command line"; + longDescription = '' + squishyball is a simple command-line utility for performing + double-blind A/B, A/B/X or X/X/Y testing on the command line. + The user specifies two input files to be compared and uses the + keyboard during playback to flip between the randomized samples + to perform on-the-fly compar‐ isons. After a predetermined + number of trials, squishyball prints the trial results to + stdout and exits. Results (stdout) may be redirected to a file + without affecting interactive use of the terminal. + + squishyball can also be used to perform casual, non-randomized + comparisons of groups of up to ten samples; this is the default + mode of operation. + ''; + homepage = https://svn.xiph.org/trunk/squishyball; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ michalrus ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/squishyball/gnu-screen.patch b/pkgs/applications/audio/squishyball/gnu-screen.patch new file mode 100644 index 00000000000..addc30d604c --- /dev/null +++ b/pkgs/applications/audio/squishyball/gnu-screen.patch @@ -0,0 +1,20 @@ +diff -Naur a/main.c b/main.c +--- a/main.c 2016-09-06 13:37:32.259895631 +0200 ++++ b/main.c 2016-09-07 01:41:51.014309863 +0200 +@@ -693,6 +693,11 @@ + } + + /* set up terminal */ ++ if (!strncmp(getenv("TERM"), "screen", 6)) { ++ char term[256]; ++ snprintf(term, sizeof(term), "xterm%s", getenv("TERM") + 6); ++ setenv("TERM", term, 1); ++ } + atexit(min_panel_remove); + panel_init(pcm, test_files, test_mode, start, end>0 ? end : len, len, + beep_mode, restart_mode, tests, running_score); +@@ -1170,4 +1175,3 @@ + fprintf(stderr,"Done.\n"); + return 0; + } +- diff --git a/pkgs/applications/audio/uade123/default.nix b/pkgs/applications/audio/uade123/default.nix new file mode 100644 index 00000000000..0a07e97270c --- /dev/null +++ b/pkgs/applications/audio/uade123/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, which, libao, pkgconfig }: + +let + version = "2.13"; +in stdenv.mkDerivation rec { + name = "uade123-${version}"; + src = fetchurl { + url = "http://zakalwe.fi/uade/uade2/uade-${version}.tar.bz2"; + sha256 = "04nn5li7xy4g5ysyjjngmv5d3ibxppkbb86m10vrvadzxdd4w69v"; + }; + buildInputs = [ which libao pkgconfig ]; + + meta = with stdenv.lib; { + description = "Plays old Amiga tunes through UAE emulation and cloned m68k-assembler Eagleplayer API"; + homepage = http://zakalwe.fi/uade/; + license = licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 9ca78ee1a3f..2c3d4b91f25 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, fetchgit, ftgl, freefont_ttf, libjack2, mesa_glu, pkgconfig -, libltc, libsndfile, libsamplerate, xz -, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: +{ stdenv, fetchurl, pkgconfig, fetchgit +, libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 +, mesa_glu, lv2, mesa, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { version = "20160619"; @@ -11,15 +11,22 @@ stdenv.mkDerivation rec { sha256 = "1ald0c5xbfkdq6g5xwyy8wmbi636m3k3gqrq16kbh46g0kld1as9"; }; - buildInputs = [ xz mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver]; + buildInputs = [ + mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate + lv2 mesa gtk2 cairo pango fftwFloat pkgconfig zita-convolver + ]; - makeFlags = [ "PREFIX=$(out)" "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" ]; + makeFlags = [ + "PREFIX=$(out)" + "FONTFILE=${freefont_ttf}/share/fonts/truetype/FreeSansBold.ttf" + "LIBZITACONVOLVER=${zita-convolver}/include/zita-convolver.h" + ]; - meta = with stdenv.lib; - { description = "Collection of LV2 plugins by Robin Gareus"; - homepage = https://github.com/x42/x42-plugins; - maintainers = with maintainers; [ magnetophon ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "Collection of LV2 plugins by Robin Gareus"; + homepage = https://github.com/x42/x42-plugins; + maintainers = with maintainers; [ magnetophon ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/audio/xsynth-dssi/default.nix b/pkgs/applications/audio/xsynth-dssi/default.nix index 96da8ad8c55..a55b47a6c16 100644 --- a/pkgs/applications/audio/xsynth-dssi/default.nix +++ b/pkgs/applications/audio/xsynth-dssi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk, libjack2, +{ stdenv, fetchurl, alsaLib, autoconf, automake, dssi, gtk2, libjack2, ladspaH, ladspaPlugins, liblo, pkgconfig }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00nwv2pqjbmxqdc6xdm0cljq6z05lv4y6bibmhz1kih9lm0lklnk"; }; - buildInputs = [ alsaLib autoconf automake dssi gtk libjack2 ladspaH + buildInputs = [ alsaLib autoconf automake dssi gtk2 libjack2 ladspaH ladspaPlugins liblo pkgconfig ]; installPhase = '' diff --git a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix index ea80957afb0..235d4d16a40 100644 --- a/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix +++ b/pkgs/applications/display-managers/lightdm-gtk-greeter/default.nix @@ -18,6 +18,14 @@ stdenv.mkDerivation rec { sha256 = "031iv7zrpv27zsvahvfyrm75zdrh7591db56q89k8cjiiy600r1j"; }; + patches = [ + (fetchurl { + name = "lightdm-gtk-greeter-2.0.1-lightdm-1.19.patch"; + url = "https://588764.bugs.gentoo.org/attachment.cgi?id=442616"; + sha256 = "0r383kjkvq9yanjc1lk878xc5g8993pjgxylqhhjb5rkpi1mbfsv"; + }) + ]; + buildInputs = [ pkgconfig lightdm intltool makeWrapper ] ++ (if useGTK2 then [ gtk2 ] else [ gtk3 ]); diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix index c33d06e7822..e788585a0a9 100644 --- a/pkgs/applications/display-managers/lightdm/default.nix +++ b/pkgs/applications/display-managers/lightdm/default.nix @@ -5,15 +5,15 @@ }: let - ver_branch = "1.18"; - version = "1.18.1"; + ver_branch = "1.19"; + version = "1.19.4"; in stdenv.mkDerivation rec { name = "lightdm-${version}"; src = fetchurl { url = "${meta.homepage}/${ver_branch}/${version}/+download/${name}.tar.xz"; - sha256 = "1yl9zhn9l83bj5mbifkxfw15nqgsjzzhqcrgb81fr290wijqaj45"; + sha256 = "1l105y07wkl9dj0cjhbs8qh6flpkyfj97wkw0rdd3n624lknvbqf"; }; patches = [ ./fix-paths.patch ]; diff --git a/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch b/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch deleted file mode 100644 index ad5dcbc472d..00000000000 --- a/pkgs/applications/display-managers/sddm/0002-fix-ConfigReader-QStringList-corruption.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 7a18f4cb77c567dec9ad924fcc76c50092de6ee7 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 23 Nov 2015 06:57:51 -0600 -Subject: [PATCH 2/2] fix ConfigReader QStringList corruption - ---- - src/common/ConfigReader.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp -index 5bf5a6a..34182e6 100644 ---- a/src/common/ConfigReader.cpp -+++ b/src/common/ConfigReader.cpp -@@ -30,7 +30,8 @@ - - QTextStream &operator>>(QTextStream &str, QStringList &list) { - list.clear(); -- foreach(const QStringRef &s, str.readLine().splitRef(QLatin1Char(','))) -+ QString line = str.readLine(); -+ foreach(const QStringRef &s, line.splitRef(QLatin1Char(','))) - { - QStringRef trimmed = s.trimmed(); - if (!trimmed.isEmpty()) --- -2.6.3 - diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 923b185ae39..3f8d5aec4aa 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,11 +1,11 @@ { stdenv, makeQtWrapper, fetchFromGitHub, fetchpatch -, cmake, pkgconfig, libxcb, libpthreadstubs, lndir +, cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd , themes }: let - version = "0.13.0"; + version = "0.14.0"; unwrapped = stdenv.mkDerivation rec { name = "sddm-unwrapped-${version}"; @@ -14,19 +14,18 @@ let owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "0c3q8lpb123m9k5x3i71mm8lmyzhknw77zxh89yfl8qmn6zd61i1"; + sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj"; }; patches = [ ./0001-ignore-config-mtime.patch - ./0002-fix-ConfigReader-QStringList-corruption.patch - (fetchpatch { - url = https://github.com/benjarobin/sddm/commit/7d05362e3c7c5945ad85b0176771bc1c5a370598.patch; - sha256 = "17f174lsb8vm7k1vx00yiqcipyyr6hgg4rm1rclps7saapfah5sj"; + (fetchpatch { /* Fix display of user avatars. */ + url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch; + sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms"; }) ]; - nativeBuildInputs = [ cmake pkgconfig qttools ]; + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ]; buildInputs = [ libxcb libpthreadstubs libXdmcp libXau qtbase pam systemd diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 85b9e7c4368..4e16ceedbbb 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -3,25 +3,32 @@ , coreutils , fetchurl , findutils +, file , git +, glxinfo , gnugrep , gnutar , gzip , jdk +, libpulseaudio +, libX11 , libXrandr , makeWrapper +, pciutils , pkgsi686Linux +, setxkbmap , stdenv , unzip , which , writeTextFile +, xkeyboard_config , zlib }: let - version = "2.1.2.0"; - build = "143.2915827"; + version = "2.1.3.0"; + build = "143.3101438"; androidStudio = stdenv.mkDerivation { name = "android-studio"; @@ -40,6 +47,12 @@ let jdk which + # For Android emulator + file + glxinfo + pciutils + setxkbmap + # Used during setup wizard gnutar gzip @@ -47,21 +60,26 @@ let # Runtime stuff git - ]}" --set LD_LIBRARY_PATH "${stdenv.lib.makeLibraryPath [ + ]}" --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ # Gradle wants libstdc++.so.6 stdenv.cc.cc.lib # mksdcard wants 32 bit libstdc++.so.6 pkgsi686Linux.stdenv.cc.cc.lib + # aapt wants libz.so.1 zlib pkgsi686Linux.zlib # Support multiple monitors libXrandr - ]}" + + # For Android emulator + libpulseaudio + libX11 + ]}" --set QT_XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" ''; src = fetchurl { url = "https://dl.google.com/dl/android/studio/ide-zips/${version}/android-studio-ide-${build}-linux.zip"; - sha256 = "0q61m8yln77valg7y6lyxlml53z387zh6fyfgc22sm3br5ahbams"; + sha256 = "1xlz3ibqrm4ckw4lgbkzbxvpgg0y8hips9b54p4d15f34i0r8bvj"; }; }; diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix index dbfc2ebb6b3..1285e46fb48 100644 --- a/pkgs/applications/editors/atom/env.nix +++ b/pkgs/applications/editors/atom/env.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk, atk, pango, freetype, fontconfig +{ stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig , libgnome_keyring3, gdk_pixbuf, gvfs, cairo, cups, expat, libgpgerror, nspr , gconf, nss, xorg, libcap, systemd, libnotify }: let packages = [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index a839f5b24e5..4237ce73f21 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf +{ stdenv, fetchurl, buildEnv, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, makeWrapper, dbus }: let bracketsEnv = buildEnv { name = "env-brackets"; paths = [ - gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5 + gtk2 glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd.lib ]; }; diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 76df6d4d2b9..9cab87e9ed2 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, file, zip, wxGTK, gtk2 , contribPlugins ? false, hunspell, gamin, boost }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "044njhps4cm1ijfdyr5f9wjyd0vblhrz9b4603ma52wcdq25093p"; }; - buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk ] + buildInputs = [ automake autoconf libtool pkgconfig file zip wxGTK gtk2 ] ++ optionals contribPlugins [ hunspell gamin boost ]; enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix new file mode 100644 index 00000000000..03b920ffab0 --- /dev/null +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, freetype, libX11, libXt, libXft +}: + +stdenv.mkDerivation rec { + name = "deadpixi-sam-unstable"; + version = "2016-09-15"; + src = fetchFromGitHub { + owner = "deadpixi"; + repo = "sam"; + rev = "a6a8872246e8634d884b0ce52bc3be9770ab1b0f"; + sha256 = "1zr8dl0vp1xic3dq69h4bp2fcxsjhrzasfl6ayvkibjd6z5dn07p"; + }; + + postPatch = '' + substituteInPlace config.mk.def \ + --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" + ''; + + makeFlags = [ "DESTDIR=$(out)" ]; + buildInputs = [ libX11 libXt libXft ]; + + postInstall = '' + mkdir -p $out/share/applications + mv deadpixi-sam.desktop $out/share/applications + ''; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Updated version of the sam text editor"; + license = with licenses; lpl-102; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index 609c5e3c651..74707c65b6c 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,4 +1,4 @@ -{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }: +{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk2, libXtst, webkitgtk2, makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk2 libXtst ] ++ stdenv.lib.optional (webkitgtk2 != null) webkitgtk2)} \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" # Create desktop item. diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index 3d59777e5f0..c688065e6ea 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXext, libXrender, zlib -, glib, gtk, libXtst, jdk +, glib, libXtst, jdk , webkitgtk2 ? null # for internal web browser , buildEnv, writeText, runCommand , callPackage -} @ args: +}: assert stdenv ? glibc; rec { - buildEclipse = import ./build-eclipse.nix args; + buildEclipse = callPackage ./build-eclipse.nix { }; eclipse-sdk-35 = buildEclipse { name = "eclipse-sdk-3.5.2"; diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix index b3008f8cb24..bc3f7b064d4 100644 --- a/pkgs/applications/editors/eclipse/plugins.nix +++ b/pkgs/applications/editors/eclipse/plugins.nix @@ -403,16 +403,16 @@ rec { testng = buildEclipsePlugin rec { name = "testng-${version}"; - version = "6.9.11.201604020423"; + version = "6.9.12.201607091356"; srcFeature = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/features/org.testng.eclipse_${version}.jar"; - sha256 = "1cp7f6f0525wqwjj4pyrp0q0ii7zcd5gwd5acaq9jjb13xgw8vav"; + sha256 = "06c6885d3ggg1i085zhfwayj06jn4v1jip9zz40921vpq0iand54"; }; srcPlugin = fetchurl { url = "http://beust.com/eclipse-old/eclipse_${version}/plugins/org.testng.eclipse_${version}.jar"; - sha256 = "04m07cdfw0isp27ykx6dbrlcdw33rxww7vnavanygxxnlpyvyas3"; + sha256 = "0bpyb9bnh8kglajmdzb7pr21i1sly73kwdjbygg75ad7z37l58br"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/editors/emacs-24/builder.sh b/pkgs/applications/editors/emacs-24/builder.sh deleted file mode 100644 index 984a61df6f3..00000000000 --- a/pkgs/applications/editors/emacs-24/builder.sh +++ /dev/null @@ -1,38 +0,0 @@ -source $stdenv/setup - -# This hook is supposed to be run on Linux. It patches the proper locations of -# the crt{1,i,n}.o files into the build to ensure that Emacs is linked with -# *our* versions, not the ones found in the system, as it would do by default. -# On other platforms, this appears to be unnecessary. -preConfigure() { - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done - - case "${system}" in - x86_64-linux) glibclibdir=lib64 ;; - i686-linux) glibclibdir=lib ;; - *) return; - esac - - libc=$(cat ${NIX_CC}/nix-support/orig-libc) - echo "libc: $libc" - - for i in src/s/*.h src/m/*.h; do - substituteInPlace $i \ - --replace /usr/${glibclibdir}/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/${glibclibdir}/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/${glibclibdir}/crtn.o $libc/${glibclibdir}/crtn.o \ - --replace /usr/lib/crt1.o $libc/${glibclibdir}/crt1.o \ - --replace /usr/lib/crti.o $libc/${glibclibdir}/crti.o \ - --replace /usr/lib/crtn.o $libc/${glibclibdir}/crtn.o - done -} - -preInstall () { - for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do - substituteInPlace $i --replace /bin/pwd pwd - done -} - -genericBuild diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix deleted file mode 100644 index df53cf2c9a4..00000000000 --- a/pkgs/applications/editors/emacs-24/default.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d -, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls -, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO -, withX ? !stdenv.isDarwin -, withGTK3 ? false, gtk3 ? null -, withGTK2 ? true, gtk2 -, enableTTYTrueColor ? false -}: - -assert (libXft != null) -> libpng != null; # probably a bug -assert stdenv.isDarwin -> libXaw != null; # fails to link otherwise -assert withGTK2 -> withX || stdenv.isDarwin; -assert withGTK3 -> withX || stdenv.isDarwin; -assert withGTK2 -> !withGTK3 && gtk2 != null; -assert withGTK3 -> !withGTK2 && gtk3 != null; - -let - toolkit = - if withGTK3 then "gtk3" - else if withGTK2 then "gtk2" - else "lucid"; -in - -stdenv.mkDerivation rec { - name = "emacs-24.5"; - - builder = ./builder.sh; - - src = fetchurl { - url = "mirror://gnu/emacs/${name}.tar.xz"; - sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx"; - }; - - patches = lib.optionals stdenv.isDarwin [ - ./at-fdcwd.patch - ] ++ lib.optionals enableTTYTrueColor [ - # Modified TTY True Color patch from: https://gist.github.com/choppsv1/36aacdd696d505566088 - # To use, pass --color=true-color, which will default to using ';' - # as the separator. - # Alternatively, set $EMACS_TRUE_COLOR_SEPARATOR to ';' or ':'. - ./tty-true-color.patch - ]; - - postPatch = '' - sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el - # emacs runs then dumps itself. In the process, it keeps a copy of the - # PATH env var, holding all the build inputs in it's closure. - # Prevent that by running the self-dumping emacs with an empty PATH. - sed -i 's|^RUN_TEMACS = |&PATH= |' src/Makefile.in - ''; - - buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext ] - ++ stdenv.lib.optional stdenv.isLinux dbus - ++ stdenv.lib.optionals withX - [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft - imagemagick gconf ] - ++ stdenv.lib.optional (withX && withGTK2) gtk2 - ++ stdenv.lib.optional (withX && withGTK3) gtk3 - ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo; - - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; - - configureFlags = - if stdenv.isDarwin - then [ "--with-ns" "--disable-ns-self-contained" ] - else if withX - then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] - else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" - "--with-gif=no" "--with-tiff=no" ]; - - NIX_CFLAGS_COMPILE = - [ "-ffreestanding" ] # needed due to glibc 2.24 upgrade (see https://sourceware.org/glibc/wiki/Release/2.24#Known_Issues) - ++ stdenv.lib.optional (stdenv.isDarwin && withX) "-I${cairo.dev}/include/cairo"; - - postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ - cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - '' + stdenv.lib.optionalString stdenv.isDarwin '' - mkdir -p $out/Applications - mv nextstep/Emacs.app $out/Applications - ''; - - 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; [ chaoflow lovek323 peti the-kenny jwiegley ]; - platforms = platforms.all; - - 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. - ''; - }; -} diff --git a/pkgs/applications/editors/emacs-24/site-start.el b/pkgs/applications/editors/emacs-24/site-start.el deleted file mode 100644 index 023d6412ed8..00000000000 --- a/pkgs/applications/editors/emacs-24/site-start.el +++ /dev/null @@ -1,17 +0,0 @@ -;; NixOS specific load-path -(setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (or (getenv "NIX_PROFILES") "")))) - load-path)) - -;;; Make `woman' find the man pages -(eval-after-load 'woman - '(setq woman-manpath - (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) - (split-string (or (getenv "NIX_PROFILES") "")))) - woman-manpath))) - -;; Make tramp work for remote NixOS machines -;;; NOTE: You might want to add -(eval-after-load 'tramp - '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) diff --git a/pkgs/applications/editors/emacs-24/tty-true-color.patch b/pkgs/applications/editors/emacs-24/tty-true-color.patch deleted file mode 100644 index 09ceeb658ab..00000000000 --- a/pkgs/applications/editors/emacs-24/tty-true-color.patch +++ /dev/null @@ -1,428 +0,0 @@ -diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el -index 98108ce..21814a9 100644 ---- a/lisp/term/tty-colors.el -+++ b/lisp/term/tty-colors.el -@@ -764,7 +764,8 @@ - (auto . 0) - (ansi8 . 8) - (always . 8) -- (yes . 8)) -+ (yes . 8) -+ (true-color . 16777216)) - "An alist of supported standard tty color modes and their aliases.") - - (defun tty-color-alist (&optional _frame) -diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el -index c673749..244cf7f 100644 ---- a/lisp/term/xterm.el -+++ b/lisp/term/xterm.el -@@ -674,6 +674,15 @@ versions of xterm." - ;; are more colors to support, compute them now. - (when (> ncolors 0) - (cond -+ ((= (display-color-cells (selected-frame)) 16777216) ; 24-bit xterm -+ (let ((idx (length xterm-standard-colors))) -+ ;; Insert standard X colors after the standard xterm ones -+ (mapc (lambda (color) -+ (if (not (assoc (car color) xterm-standard-colors)) -+ (progn -+ (tty-color-define (car color) idx (cdr color)) -+ (setq idx (1+ idx))))) -+ color-name-rgb-alist))) - ((= ncolors 240) ; 256-color xterm - ;; 216 non-gray colors first - (let ((r 0) (g 0) (b 0)) -diff --git a/src/dispextern.h b/src/dispextern.h -index 239c442..5760b84 100644 ---- a/src/dispextern.h -+++ b/src/dispextern.h -@@ -1739,9 +1739,15 @@ struct face - INLINE bool - face_tty_specified_color (unsigned long color) - { -- return color < FACE_TTY_DEFAULT_BG_COLOR; -+ return (color < FACE_TTY_DEFAULT_BG_COLOR); - } - -+INLINE bool -+face_tty_specified_24_bit_color (unsigned long color) -+{ -+ /* 24 bit colors have 24th but not 25th bit set */ -+ return ((color & (0x03 << 24)) == (0x01 << 24)); -+} - /* Non-zero if FACE was realized for unibyte use. */ - - #define FACE_UNIBYTE_P(FACE) ((FACE)->charset < 0) -diff --git a/src/term.c b/src/term.c -index 8312491..b14aded 100644 ---- a/src/term.c -+++ b/src/term.c -@@ -1915,18 +1915,40 @@ turn_on_face (struct frame *f, int face_id) - const char *ts; - char *p; - -- ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground; -+ if (face_tty_specified_24_bit_color(fg)) -+ ts = tty->standout_mode ? tty->TS_set_rgb_background : tty->TS_set_rgb_foreground; -+ else -+ ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground; - if (face_tty_specified_color (fg) && ts) - { -- p = tparam (ts, NULL, 0, fg, 0, 0, 0); -+ if (!face_tty_specified_24_bit_color(fg)) -+ p = tparam (ts, NULL, 0, fg, 0, 0, 0); -+ else -+ { -+ const unsigned char r = (fg >> 16) & 0xFF, -+ g = (fg >> 8) & 0xFF, -+ b = fg & 0xFF; -+ p = tparam (ts, NULL, 0, (int)r, (int)g, (int)b, 0); -+ } - OUTPUT (tty, p); - xfree (p); - } - -- ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background; -+ if (face_tty_specified_24_bit_color(bg)) -+ ts = tty->standout_mode ? tty->TS_set_rgb_foreground : tty->TS_set_rgb_background; -+ else -+ ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background; - if (face_tty_specified_color (bg) && ts) - { -- p = tparam (ts, NULL, 0, bg, 0, 0, 0); -+ if (!face_tty_specified_24_bit_color(bg)) -+ p = tparam (ts, NULL, 0, bg, 0, 0, 0); -+ else -+ { -+ const unsigned char r = (bg >> 16) & 0xFF, -+ g = (bg >> 8) & 0xFF, -+ b = bg & 0xFF; -+ p = tparam (ts, NULL, 0, (int)r, (int)g, (int)b, 0); -+ } - OUTPUT (tty, p); - xfree (p); - } -@@ -2028,6 +2050,8 @@ TERMINAL does not refer to a text terminal. */) - struct terminal *t = get_tty_terminal (terminal, 0); - if (!t) - return make_number (0); -+ else if (t->display_info.tty->TS_set_rgb_foreground) -+ return make_number (16777216); /* 24 bit True Color */ - else - return make_number (t->display_info.tty->TN_max_colors); - } -@@ -2043,6 +2067,8 @@ static int default_no_color_video; - static char *default_orig_pair; - static char *default_set_foreground; - static char *default_set_background; -+static char *default_set_rgb_foreground; -+static char *default_set_rgb_background; - - /* Save or restore the default color-related capabilities of this - terminal. */ -@@ -2055,6 +2081,8 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save) - dupstring (&default_orig_pair, tty->TS_orig_pair); - dupstring (&default_set_foreground, tty->TS_set_foreground); - dupstring (&default_set_background, tty->TS_set_background); -+ dupstring (&default_set_rgb_foreground, tty->TS_set_rgb_foreground); -+ dupstring (&default_set_rgb_background, tty->TS_set_rgb_background); - default_max_colors = tty->TN_max_colors; - default_max_pairs = tty->TN_max_pairs; - default_no_color_video = tty->TN_no_color_video; -@@ -2064,6 +2092,8 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save) - tty->TS_orig_pair = default_orig_pair; - tty->TS_set_foreground = default_set_foreground; - tty->TS_set_background = default_set_background; -+ tty->TS_set_rgb_foreground = default_set_rgb_foreground; -+ tty->TS_set_rgb_background = default_set_rgb_background; - tty->TN_max_colors = default_max_colors; - tty->TN_max_pairs = default_max_pairs; - tty->TN_no_color_video = default_no_color_video; -@@ -2088,6 +2118,7 @@ tty_setup_colors (struct tty_display_info *tty, int mode) - tty->TN_max_pairs = 0; - tty->TN_no_color_video = 0; - tty->TS_set_foreground = tty->TS_set_background = tty->TS_orig_pair = NULL; -+ tty->TS_set_rgb_foreground = tty->TS_set_rgb_background = NULL; - break; - case 0: /* default colors, if any */ - default: -@@ -2102,10 +2133,45 @@ tty_setup_colors (struct tty_display_info *tty, int mode) - tty->TS_set_foreground = "\033[3%dm"; - tty->TS_set_background = "\033[4%dm"; - #endif -+ tty->TS_set_rgb_foreground = NULL; -+ tty->TS_set_rgb_background = NULL; - tty->TN_max_colors = 8; - tty->TN_max_pairs = 64; - tty->TN_no_color_video = 0; - break; -+ case 16777216: /* RGB colors */ -+ tty->TS_orig_pair = "\033[0m"; -+ -+ /* if the user hasn't explicitly chosen the ":" separator, use ";". */ -+ char * true_color_separator = getenv ("EMACS_TRUE_COLOR_SEPARATOR"); -+ if (true_color_separator && strcmp (true_color_separator, ":") == 0) -+ { -+ /* XXX chopps use ITU T.421 ':' separator */ -+ /* TODO This should be extracted from terminfo/termcap. */ -+#ifdef TERMINFO -+ tty->TS_set_rgb_foreground = "\033[38:2:%p1%d:%p2%d:%p3%dm"; -+ tty->TS_set_rgb_background = "\033[48:2:%p1%d:%p2%d:%p3%dm"; -+#else -+ tty->TS_set_rgb_foreground = "\033[38:2:%d:%d:%dm"; -+ tty->TS_set_rgb_background = "\033[48:2:%d:%d:%dm"; -+#endif -+ } -+ else -+ { -+ /* TODO This should be extracted from terminfo/termcap. */ -+#ifdef TERMINFO -+ tty->TS_set_rgb_foreground = "\033[38;2;%p1%d;%p2%d;%p3%dm"; -+ tty->TS_set_rgb_background = "\033[48;2;%p1%d;%p2%d;%p3%dm"; -+#else -+ tty->TS_set_rgb_foreground = "\033[38;2;%d;%d;%dm"; -+ tty->TS_set_rgb_background = "\033[48;2;%d;%d;%dm"; -+#endif -+ } -+ -+ tty->TN_max_colors = 16777216; -+ /*tty->TN_max_pairs = 64; TODO */ -+ tty->TN_no_color_video = 0; -+ break; - } - } - -@@ -4201,6 +4267,38 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\ - tty->TN_no_color_video = tgetnum ("NC"); - if (tty->TN_no_color_video == -1) - tty->TN_no_color_video = 0; -+ -+ -+ /* Allow the user to opt-in to True Color support. */ -+ char * true_color_separator = getenv ("EMACS_TRUE_COLOR_SEPARATOR"); -+ if (true_color_separator && strcmp (true_color_separator, ";") == 0) -+ { -+ /* TODO This should be extracted from terminfo/termcap. */ -+#ifdef TERMINFO -+ tty->TS_set_rgb_foreground = "\033[38;2;%p1%d;%p2%d;%p3%dm"; -+ tty->TS_set_rgb_background = "\033[48;2;%p1%d;%p2%d;%p3%dm"; -+#else -+ tty->TS_set_rgb_foreground = "\033[38;2;%d;%d;%dm"; -+ tty->TS_set_rgb_background = "\033[48;2;%d;%d;%dm"; -+#endif -+ } -+ else if (true_color_separator && strcmp (true_color_separator, ":") == 0) -+ { -+ /* XXX chopps use ITU T.421 ':' separator */ -+ /* TODO This should be extracted from terminfo/termcap. */ -+#ifdef TERMINFO -+ tty->TS_set_rgb_foreground = "\033[38:2:%p1%d:%p2%d:%p3%dm"; -+ tty->TS_set_rgb_background = "\033[48:2:%p1%d:%p2%d:%p3%dm"; -+#else -+ tty->TS_set_rgb_foreground = "\033[38:2:%d:%d:%dm"; -+ tty->TS_set_rgb_background = "\033[48:2:%d:%d:%dm"; -+#endif -+ } -+ else -+ { -+ tty->TS_set_rgb_foreground = NULL; -+ tty->TS_set_rgb_background = NULL; -+ } - } - - tty_default_color_capabilities (tty, 1); -diff --git a/src/termchar.h b/src/termchar.h -index d8066d7..e48d583 100644 ---- a/src/termchar.h -+++ b/src/termchar.h -@@ -157,6 +157,10 @@ struct tty_display_info - const char *TS_set_foreground; - const char *TS_set_background; - -+ /* Support for 24bit RGB color terminals. */ -+ const char *TS_set_rgb_foreground; -+ const char *TS_set_rgb_background; -+ - int TF_hazeltine; /* termcap hz flag. */ - int TF_insmode_motion; /* termcap mi flag: can move while in insert mode. */ - int TF_standout_motion; /* termcap mi flag: can move while in standout mode. */ -diff --git a/src/xfaces.c b/src/xfaces.c -index 29c91f7..347ebf8 100644 ---- a/src/xfaces.c -+++ b/src/xfaces.c -@@ -382,7 +382,7 @@ static ptrdiff_t lface_id_to_name_size; - - /* TTY color-related functions (defined in tty-colors.el). */ - --static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values; -+static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values, Qtty_color_canonicalize; - - /* The name of the function used to compute colors on TTYs. */ - -@@ -943,54 +943,80 @@ tty_lookup_color (struct frame *f, Lisp_Object color, XColor *tty_color, - if (!STRINGP (color) || NILP (Ffboundp (Qtty_color_desc))) - return 0; - -- XSETFRAME (frame, f); -- -- color_desc = call2 (Qtty_color_desc, color, frame); -- if (CONSP (color_desc) && CONSP (XCDR (color_desc))) -+ if (f->output_method == output_termcap -+ && f->output_data.tty->display_info->TS_set_rgb_foreground -+ && !NILP (Ffboundp (Qtty_color_standard_values))) - { -- Lisp_Object rgb; -- -- if (! INTEGERP (XCAR (XCDR (color_desc)))) -- return 0; -+ /* Terminal supports 3 byte RGB colors. */ -+ if (!NILP (Ffboundp (Qtty_color_canonicalize))) -+ color = call1(Qtty_color_canonicalize, color); - -- tty_color->pixel = XINT (XCAR (XCDR (color_desc))); -+ color_desc = call1 (Qtty_color_standard_values, color); -+ if (! parse_rgb_list (color_desc, tty_color)) -+ return 0; - -- rgb = XCDR (XCDR (color_desc)); -- if (! parse_rgb_list (rgb, tty_color)) -- return 0; -+ /* Map XColor to 3 byte values. */ -+ tty_color->pixel = 1 << 24 /* Set bit 24 to mark RGB values. */ -+ | (tty_color->red / 256) << 16 -+ | (tty_color->green / 256) << 8 -+ | (tty_color->blue / 256); - -- /* Should we fill in STD_COLOR too? */ - if (std_color) -- { -- /* Default STD_COLOR to the same as TTY_COLOR. */ -- *std_color = *tty_color; -- -- /* Do a quick check to see if the returned descriptor is -- actually _exactly_ equal to COLOR, otherwise we have to -- lookup STD_COLOR separately. If it's impossible to lookup -- a standard color, we just give up and use TTY_COLOR. */ -- if ((!STRINGP (XCAR (color_desc)) -- || NILP (Fstring_equal (color, XCAR (color_desc)))) -- && !NILP (Ffboundp (Qtty_color_standard_values))) -- { -- /* Look up STD_COLOR separately. */ -- rgb = call1 (Qtty_color_standard_values, color); -- if (! parse_rgb_list (rgb, std_color)) -- return 0; -- } -- } -+ *std_color = *tty_color; - - return 1; - } -- else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist")))) -- /* We were called early during startup, and the colors are not -- yet set up in tty-defined-color-alist. Don't return a failure -- indication, since this produces the annoying "Unable to -- load color" messages in the *Messages* buffer. */ -- return 1; - else -- /* tty-color-desc seems to have returned a bad value. */ -- return 0; -+ { -+ XSETFRAME (frame, f); -+ -+ color_desc = call2 (Qtty_color_desc, color, frame); -+ if (CONSP (color_desc) && CONSP (XCDR (color_desc))) -+ { -+ Lisp_Object rgb; -+ -+ if (! INTEGERP (XCAR (XCDR (color_desc)))) -+ return 0; -+ -+ tty_color->pixel = XINT (XCAR (XCDR (color_desc))); -+ -+ rgb = XCDR (XCDR (color_desc)); -+ if (! parse_rgb_list (rgb, tty_color)) -+ return 0; -+ -+ /* Should we fill in STD_COLOR too? */ -+ if (std_color) -+ { -+ /* Default STD_COLOR to the same as TTY_COLOR. */ -+ *std_color = *tty_color; -+ -+ /* Do a quick check to see if the returned descriptor is -+ actually _exactly_ equal to COLOR, otherwise we have to -+ lookup STD_COLOR separately. If it's impossible to lookup -+ a standard color, we just give up and use TTY_COLOR. */ -+ if ((!STRINGP (XCAR (color_desc)) -+ || NILP (Fstring_equal (color, XCAR (color_desc)))) -+ && !NILP (Ffboundp (Qtty_color_standard_values))) -+ { -+ /* Look up STD_COLOR separately. */ -+ rgb = call1 (Qtty_color_standard_values, color); -+ if (! parse_rgb_list (rgb, std_color)) -+ return 0; -+ } -+ } -+ -+ return 1; -+ } -+ else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist")))) -+ /* We were called early during startup, and the colors are not -+ yet set up in tty-defined-color-alist. Don't return a failure -+ indication, since this produces the annoying "Unable to -+ load color" messages in the *Messages* buffer. */ -+ return 1; -+ else -+ /* tty-color-desc seems to have returned a bad value. */ -+ return 0; -+ } - } - - /* A version of defined_color for non-X frames. */ -@@ -1008,7 +1034,9 @@ tty_defined_color (struct frame *f, const char *color_name, - color_def->green = 0; - - if (*color_name) -- status = tty_lookup_color (f, build_string (color_name), color_def, NULL); -+ { -+ status = tty_lookup_color (f, build_string (color_name), color_def, NULL); -+ } - - if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name) - { -@@ -5780,6 +5808,7 @@ map_tty_color (struct frame *f, struct face *face, - unsigned long default_pixel = - foreground_p ? FACE_TTY_DEFAULT_FG_COLOR : FACE_TTY_DEFAULT_BG_COLOR; - unsigned long pixel = default_pixel; -+ XColor true_color; - #ifdef MSDOS - unsigned long default_other_pixel = - foreground_p ? FACE_TTY_DEFAULT_BG_COLOR : FACE_TTY_DEFAULT_FG_COLOR; -@@ -5798,7 +5827,18 @@ map_tty_color (struct frame *f, struct face *face, - { - /* Associations in tty-defined-color-alist are of the form - (NAME INDEX R G B). We need the INDEX part. */ -- pixel = XINT (XCAR (XCDR (def))); -+ if (f->output_method == output_termcap -+ && f->output_data.tty->display_info->TS_set_rgb_foreground -+ && parse_rgb_list (XCDR (XCDR(def)), &true_color)) -+ { -+ /* Map XColor to 3 byte values. */ -+ pixel = 1 << 24 /* Set bit 24 to mark RGB values. */ -+ | (true_color.red / 256) << 16 -+ | (true_color.green / 256) << 8 -+ | (true_color.blue / 256); -+ } -+ else -+ pixel = XINT (XCAR (XCDR (def))); - } - - if (pixel == default_pixel && STRINGP (color)) -@@ -6460,6 +6500,7 @@ syms_of_xfaces (void) - DEFSYM (Qwindow_divider, "window-divider"); - DEFSYM (Qwindow_divider_first_pixel, "window-divider-first-pixel"); - DEFSYM (Qwindow_divider_last_pixel, "window-divider-last-pixel"); -+ DEFSYM (Qtty_color_canonicalize, "tty-color-canonicalize"); - DEFSYM (Qtty_color_desc, "tty-color-desc"); - DEFSYM (Qtty_color_standard_values, "tty-color-standard-values"); - DEFSYM (Qtty_color_by_index, "tty-color-by-index"); diff --git a/pkgs/applications/editors/emacs-25/at-fdcwd.patch b/pkgs/applications/editors/emacs-25/at-fdcwd.patch deleted file mode 100644 index 2d8099b7373..00000000000 --- a/pkgs/applications/editors/emacs-25/at-fdcwd.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lib/careadlinkat.h b/lib/careadlinkat.h -index 84ede3e..8e8f42e 100644 ---- a/lib/careadlinkat.h -+++ b/lib/careadlinkat.h -@@ -23,6 +23,10 @@ - #include - #include - -+#ifndef AT_FDCWD -+#define AT_FDCWD -2 -+#endif -+ - struct allocator; - - /* Assuming the current directory is FD, get the symbolic link value diff --git a/pkgs/applications/editors/emacs-25/site-start.el b/pkgs/applications/editors/emacs-25/site-start.el deleted file mode 100644 index 023d6412ed8..00000000000 --- a/pkgs/applications/editors/emacs-25/site-start.el +++ /dev/null @@ -1,17 +0,0 @@ -;; NixOS specific load-path -(setq load-path - (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) - (split-string (or (getenv "NIX_PROFILES") "")))) - load-path)) - -;;; Make `woman' find the man pages -(eval-after-load 'woman - '(setq woman-manpath - (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) - (split-string (or (getenv "NIX_PROFILES") "")))) - woman-manpath))) - -;; Make tramp work for remote NixOS machines -;;; NOTE: You might want to add -(eval-after-load 'tramp - '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) diff --git a/pkgs/applications/editors/emacs-modes/cua/default.nix b/pkgs/applications/editors/emacs-modes/cua/default.nix index a03c6447622..0305be28ad6 100644 --- a/pkgs/applications/editors/emacs-modes/cua/default.nix +++ b/pkgs/applications/editors/emacs-modes/cua/default.nix @@ -3,6 +3,6 @@ builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/cua-mode-2.10.el; - md5 = "5bf5e43f5f38c8383868c7c6c5baca09"; + sha256 = "01877xjbq0v9wrpcbnhvppdn9wxliwkkjg3dr6k795mjgslwhr1b"; }; } diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index cc9e033cd41..d54b686244e 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -471,10 +471,10 @@ debbugs = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, soap-client }: elpaBuild { pname = "debbugs"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/debbugs-0.10.tar"; - sha256 = "0vrsa70h6ipsq01qr9qzlaw1704xqviby321ri6w69wkwlcjkpin"; + url = "https://elpa.gnu.org/packages/debbugs-0.11.tar"; + sha256 = "10v9s7ayvfzd6j6hqfc9zihxgmsc2j0xhxrgy3ah30qkqn6z8w6n"; }; packageRequires = [ cl-lib soap-client ]; meta = { @@ -711,10 +711,10 @@ }) {}; exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild { pname = "exwm"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.10.tar"; - sha256 = "1c8558dxy7a2m61a0bc0p5vrdw3nw03zq9s8wxgmdvlklyzbqa22"; + url = "https://elpa.gnu.org/packages/exwm-0.11.tar"; + sha256 = "108n09b6512y05rskq754hzwc5nzqmkq1lfrarl34my41wsc1qnf"; }; packageRequires = [ xelb ]; meta = { @@ -767,10 +767,10 @@ ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "ggtags"; - version = "0.8.11"; + version = "0.8.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ggtags-0.8.11.el"; - sha256 = "1q2bp2b7lylf7n6c1psfn5swyjg0y78ykm0ak2kd84pbyhqak2mq"; + url = "https://elpa.gnu.org/packages/ggtags-0.8.12.el"; + sha256 = "0ny3llk021g6r0s75xdm4hzpbxv393ddm2r6f2xdk8kqnq4gnirp"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -1336,10 +1336,10 @@ }) {}; org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20160905"; + version = "20161003"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-20160905.tar"; - sha256 = "118xq8bsiwa6nfxm14ww5dmyf5r0cv69lf748cj39bcvg1qm94vn"; + url = "https://elpa.gnu.org/packages/org-20161003.tar"; + sha256 = "077v69l3w5q0rfbj1mm92cs2pz5yh3p89qnxxj0zn3g5m0dg9yjm"; }; packageRequires = []; meta = { @@ -1529,10 +1529,10 @@ rudel = callPackage ({ cl-generic, cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "rudel"; - version = "0.3"; + version = "0.3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rudel-0.3.tar"; - sha256 = "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1"; + url = "https://elpa.gnu.org/packages/rudel-0.3.1.tar"; + sha256 = "0glqa68g509p0s2vcc0i8kzlddnc9brd9jqhnm5rzxz4i050cvnz"; }; packageRequires = [ cl-generic cl-lib emacs ]; meta = { @@ -1687,10 +1687,10 @@ }) {}; stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "stream"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/stream-2.2.1.el"; - sha256 = "1d91ddak5whb7kln216vhcsl707h5kirc6aqbkw82skhpg4c3ap1"; + url = "https://elpa.gnu.org/packages/stream-2.2.3.el"; + sha256 = "1y9nh5473p0dd149g675nybsdnzp8c4mq3wdql066nir7scz6rhy"; }; packageRequires = [ emacs ]; meta = { @@ -2061,10 +2061,10 @@ ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "ztree"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ztree-1.0.3.tar"; - sha256 = "1mwzk48sah4w5jmlmzqxnwhnlnc2mf25ayhgymv24sv8c6hdllsw"; + url = "https://elpa.gnu.org/packages/ztree-1.0.4.tar"; + sha256 = "0xiiaa660s8z7901siwvmqkqz30agfzsy3zcyry2r017m3ghqjph"; }; packageRequires = [ cl-lib ]; meta = { diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix index e1382d6d50b..92ef4d0393c 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix @@ -2,12 +2,12 @@ _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "_0blayout"; - version = "20160826.1522"; + version = "20160919.823"; src = fetchFromGitHub { owner = "etu"; repo = "0blayout-mode"; - rev = "3032dadf28ab63c132cd20abdd3a0008f6b72f9f"; - sha256 = "1xq91wx2f0psj395jlrjb2viwdz4ai1xm34m5xvanip2vm085xgy"; + rev = "b8bb44b5336965b5519b9a826a0f46f8ee31c471"; + sha256 = "1apv5zd3zzni2llj9is7h2bzq1xxbx67kr7c07dfjd26n7l0zvfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout"; @@ -20,6 +20,27 @@ license = lib.licenses.free; }; }) {}; + _0xc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "_0xc"; + version = "20161001.1852"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "0xc"; + rev = "9a05fcafe6727df0844feba7fbeb75e39ffe15a4"; + sha256 = "0yy83di1jc5nnnvfxd2l0pnzikp07m0d5szz2pkl88yrpacpnndn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3fbb2c86a50a8df9a3967787fc10f33beab2c933/recipes/0xc"; + sha256 = "0lxcz1x1dymsh9idhkn7jn8vphr724d6sb88a4g55x2m1rlmzg3w"; + name = "_0xc"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/0xc"; + license = lib.licenses.free; + }; + }) {}; _2048-game = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "_2048-game"; @@ -359,8 +380,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4b873d36a3a9a90999a59c074c0a9e86fdbb9c51"; - sha256 = "0mnaahi5pjkz67vykpaqzi9w005zsy18k4s3scksvpd6as4jbdid"; + rev = "6e52e1b8501288e57dd0523270ed6406795b0b9e"; + sha256 = "0jx04r7jz1ijq8y7kzcj1j8msxjnh3vbzi378dazr3762ixj51m5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/ac-emacs-eclim"; @@ -418,12 +439,12 @@ ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ac-etags"; - version = "20151031.1921"; + version = "20161001.807"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-ac-etags"; - rev = "e53cb3a8dd44e41fba3d2b737f90a8cfc529e2a6"; - sha256 = "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4"; + rev = "7983e631c226fe0fa53af3b2d56bf4eca3d785ce"; + sha256 = "1vvgcy5hybrip4jn4pj9r3fahr6rc70k28w5aw951h0x7g7laipr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fda9c7def8bc54af4ab17dc049dd94324c8f10fa/recipes/ac-etags"; @@ -443,8 +464,8 @@ src = fetchFromGitHub { owner = "xiaohanyu"; repo = "ac-geiser"; - rev = "0e2e36532336f27e3dc3b01fff55ad1a4329817d"; - sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn"; + rev = "cecfcf1a5c4be580b9337d9f4f9337c6ae1e0d91"; + sha256 = "0zaia963kpnqmlxafp0m0jibzz6fvvjj7f1v4lcwb9cvs2b7vq1m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/586ef409e3ae758b459b625d4bf0108f0525a085/recipes/ac-geiser"; @@ -590,8 +611,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ac-inf-ruby"; - rev = "3a1e741b40b8dba0e9c235dad4b9907411d9dcd3"; - sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0"; + rev = "ee53fc9c61950da9a96df3ff5ef186f9a9faf151"; + sha256 = "13xgv1c4gr075gffq95njra7bw1fkb5yp3xdlh3qndzw4bpary1l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1a72abe0fe1253149afb45b0d9e81b6846a926c0/recipes/ac-inf-ruby"; @@ -712,12 +733,12 @@ ac-php = callPackage ({ ac-php-core, auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "ac-php"; - version = "20160628.422"; + version = "20160910.1747"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; - sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; + rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a"; + sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php"; @@ -737,8 +758,8 @@ src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; - sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; + rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a"; + sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/ac-php-core"; @@ -800,8 +821,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ac-slime"; - rev = "df6c4e88b5ba2d15d47a651ecf7edc0986624112"; - sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88"; + rev = "fafc6f75c90b2dbf124edd3e2887860ce052081e"; + sha256 = "0dix8giqbc9la5mycrjgq287j03s44nhrg9b1drsca2sc58cnach"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/ac-slime"; @@ -859,12 +880,12 @@ ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }: melpaBuild { pname = "ace-isearch"; - version = "20160804.1608"; + version = "20160927.330"; src = fetchFromGitHub { owner = "tam17aki"; repo = "ace-isearch"; - rev = "1355f15b49490eeff0336716f4b27b02784ef55a"; - sha256 = "15rsb0i53k9vi7w2p08k89wdqcy51av0jg8zb5a0vssc7awpk4sk"; + rev = "b8c59511d7ff13ed050a80be372121d9cba9e160"; + sha256 = "1flfskn0bsz0mxfys0ipn20355v20d48l8mgf41wb49kvnnd1bmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/344f0cf784a027cde196b7d766024fb415fa1968/recipes/ace-isearch"; @@ -901,12 +922,12 @@ ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "ace-jump-helm-line"; - version = "20160329.1218"; + version = "20160918.1136"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "ace-jump-helm-line"; - rev = "8779050e4794279946892b6a156d0086554a9c9e"; - sha256 = "1d4bxxcnjbdr6cjr3jmz2zrnzjv5pwrypbp4xqgqyv9rz02n7ac1"; + rev = "1483055255df3f8ae349f7520f05b1e43ea3ed37"; + sha256 = "191a2g1if1jliikbxkpwmvlp4v1sp541j71xrlymili8ygm0idq5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8925f3daa92ff39776b55642aa9ec0e49245c0c7/recipes/ace-jump-helm-line"; @@ -964,12 +985,12 @@ ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-link"; - version = "20160811.112"; + version = "20160925.1210"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-link"; - rev = "36770f464a0d15f8c666a55f8aedde26c238f4f4"; - sha256 = "1rcpylzpqf06jss7kibm3jr1lpakhf236nqg39725bxqai63j6ci"; + rev = "822628e39345b77f9444fdfc17bd660b7831e536"; + sha256 = "002wi64awig3kdyihqdisxsfaiailyjw90ah9j1i6qqasgvm9acn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68032f40c0ce4170a22db535be4bfa7099f61f85/recipes/ace-link"; @@ -1048,12 +1069,12 @@ ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ace-window"; - version = "20160225.819"; + version = "20160923.1117"; src = fetchFromGitHub { owner = "abo-abo"; repo = "ace-window"; - rev = "77cc05f7284577ed396f292de0e7bb8ec561ea81"; - sha256 = "1afc0f8ax334gv644zdrrp55754gxa353iijvmfzxmlr67v23j96"; + rev = "92bd29c4fd8132944385083600b29a3f9a50a37c"; + sha256 = "078wsnslyh1wr8j8flwj7n06cf6vl152d92l9cjsj91hgy70bb73"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42fe131d3c2ea498e4df30ba539a6b91c00f5b07/recipes/ace-window"; @@ -1131,12 +1152,12 @@ addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "addressbook-bookmark"; - version = "20160316.2303"; + version = "20160925.22"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "addressbook-bookmark"; - rev = "f58b944d11f8522ab85bbaf52a9591518e296545"; - sha256 = "0dk7hyp7cs0ws4w7i32g7di5aqkkxlxkvmrllg43bi5ivlji7pvn"; + rev = "53732af6e225976f8d51c971041eed4320987c36"; + sha256 = "0qnh9bk5xgggh80wylzq06alxkj22y9p8lixncjanwhygh80vv3s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a497aec6e27efa627068542cae5a16c01c3c6d3c/recipes/addressbook-bookmark"; @@ -1339,12 +1360,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "20160815.1724"; + version = "20161003.811"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "ce0804bfc4fcd6db07d1ffc96722e1e9e87f0871"; - sha256 = "0cbb8389wd80hbfb084q3b3qlkzxmz5i682rd2sl0rgvk9aafik4"; + rev = "563638c5b4102805e5b3282abfb2278921c07898"; + sha256 = "10c3cgjz9q5di3cpnvx970l36akf1i0w7sxas0ppk7gpy22cg2wl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -1381,12 +1402,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "20160602.2341"; + version = "20161002.2144"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "b70a9458d7cb0cf191a660e7f27c73dc49d0278c"; - sha256 = "1pfmpwma9k6l386v4m884gb5p2apl4k5m2vaxhmb7hnf9p27yrwl"; + rev = "5693e5a7b1d75faee0dd424cd89fd20b3b9d77f6"; + sha256 = "1cim833y3xh2s0vz3zawxbybb1yri8qmfhhk3iqbiw2w9gg2y4qs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1504,15 +1525,36 @@ license = lib.licenses.free; }; }) {}; + all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "all-the-icons"; + version = "20160921.935"; + src = fetchFromGitHub { + owner = "domtronn"; + repo = "all-the-icons.el"; + rev = "21b2e084a8779a6eb2e800add37671e21e5fc5d8"; + sha256 = "1zw6mkayf9dqxkk6pfb6niarkxk1jcwdln45jp7q7n8vq3cqg6rp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; + sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; + name = "all-the-icons"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/all-the-icons"; + license = lib.licenses.free; + }; + }) {}; amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "20160801.1445"; + version = "20160923.134"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "f785c5bf39f04194dbeb5c55138c03de1524bb22"; - sha256 = "1f6q4p31v0j0n088blz87fp8n4awr39w7fpid9yfkccpi7grmjkn"; + rev = "c610c1a85728d161d28854d7373fc13b3dec311b"; + sha256 = "1ghs3gh410c9w2v17zb93wk184lwl5izpkzrm0qn37qz8i87jqcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1558,12 +1600,12 @@ ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ample-theme"; - version = "20160906.643"; + version = "20161002.1640"; src = fetchFromGitHub { owner = "jordonbiondo"; repo = "ample-theme"; - rev = "ad6b85dcc9bdc698d1a6ce657addd133c180eeea"; - sha256 = "0c6jr8izks2x316xzcd962aiy7q4zmwfn8w4i85ans01a88249xf"; + rev = "7546ab41c4c106be7b781a8c351abfb59fe95078"; + sha256 = "124kxhp7q4ddlj4nhjn8y2w3s08ln8am49cwjvwsvrfliz87n9kq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d448c03202137a461ed814ce87acfac23faf676e/recipes/ample-theme"; @@ -1850,12 +1892,12 @@ ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-doc"; - version = "20150524.1005"; + version = "20160924.124"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "ansible-doc.el"; - rev = "d0ce210674b5bee9836e6773c4e823747a6f1946"; - sha256 = "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62"; + rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad"; + sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc"; @@ -1868,6 +1910,27 @@ license = lib.licenses.free; }; }) {}; + ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ansible-vault"; + version = "20161001.1001"; + src = fetchFromGitHub { + owner = "zellio"; + repo = "ansible-vault-mode"; + rev = "8b4cdebb817c979b13eab625e3bbeebb08ddf026"; + sha256 = "1gqga59qinmkjalk1jkbh8w70sqvb3p033sbx69qljc2mivs8rh8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; + sha256 = "0pmsvpc866rgcajb2ihhb62g3rwhda7vvq2kxkvr566y609vv021"; + name = "ansible-vault"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ansible-vault"; + license = lib.licenses.free; + }; + }) {}; ant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ant"; @@ -2673,12 +2736,12 @@ atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "atom-one-dark-theme"; - version = "20160816.713"; + version = "20160914.1337"; src = fetchFromGitHub { owner = "jonathanchu"; repo = "atom-one-dark-theme"; - rev = "0e20e451605a052ef4faecafbd4d9937a6daaf0c"; - sha256 = "1q9c0ckrax5qvf3l3v8pxf1ygx380k803rdwrl9c8yb9wmxyn0ck"; + rev = "7e2c683d2d45f0c4901c4c492004b78345425d41"; + sha256 = "1p2vv7cwaa00qnjxhd4d7nv6lms3v0fsnwdpxck1p4a96zcgm0dz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3ba1c4625c9603372746a6c2edb69d65f0ef79f5/recipes/atom-one-dark-theme"; @@ -2694,12 +2757,12 @@ auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; - version = "20160706.503"; + version = "20160923.7"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "c4d5a1ecea2506fc9854f3740550616a92c76686"; - sha256 = "0bfr0fc6mjll6jg15g8k46vp5xaqkjhda1caynwzpb26mr3jcf3q"; + rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096"; + sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -2820,12 +2883,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "20160228.623"; + version = "20160909.50"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "451952126251b4eaf0418ffb50257b63510451a1"; - sha256 = "03h5p4wbgj3gz3d94fwmc6s3gkxg7l77fscl3znkcb8f934rf6xn"; + rev = "73bf5a83697f10fb9291ae30d58ae0f1f4f9f2c0"; + sha256 = "0dqgxfw0c6zdnhfdsys8and60qxpd3vk459kx4xgbvmv0vljl83h"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -2841,12 +2904,12 @@ auto-async-byte-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-async-byte-compile"; - version = "20120322.1441"; + version = "20160915.2154"; src = fetchFromGitHub { owner = "rubikitch"; repo = "auto-async-byte-compile"; - rev = "73248feca5595d81cd8a3bd4a4810e3586076e0d"; - sha256 = "17nv8rqjh3ynbk1r0njwjb5hd7sgii0vncsa1q19jyp3h30rj4in"; + rev = "8681e74ddb8481789c5dbb3cafabb327db4c4484"; + sha256 = "1g98gla9qdqmifsxakhkbxlljy2ln1s3wfahk9zycrwgzfjlsdf4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/auto-async-byte-compile"; @@ -3052,8 +3115,8 @@ src = fetchFromGitHub { owner = "sebastiw"; repo = "distel-completion"; - rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6"; - sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2"; + rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f"; + sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/auto-complete-distel"; @@ -3273,6 +3336,27 @@ license = lib.licenses.free; }; }) {}; + auto-org-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: + melpaBuild { + pname = "auto-org-md"; + version = "20160923.708"; + src = fetchFromGitHub { + owner = "jamcha-aa"; + repo = "auto-org-md"; + rev = "7604c06c1b2f1d01c2e88f114bb0d2d00f21dabb"; + sha256 = "18js1pa60095fs8qjzhjhkx9sjwa2h2iribb27gqv59796qxkfsg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/39f934f86b5dc04078c204bcbd268af60857e268/recipes/auto-org-md"; + sha256 = "1yh9g8407kym6r0b8kr18qshxlrkw47ac17a9lvql0ksshfmnqvk"; + name = "auto-org-md"; + }; + packageRequires = [ emacs org ]; + meta = { + homepage = "https://melpa.org/#/auto-org-md"; + license = lib.licenses.free; + }; + }) {}; auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auto-package-update"; @@ -3381,12 +3465,12 @@ auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "auto-yasnippet"; - version = "20160809.46"; + version = "20160925.225"; src = fetchFromGitHub { owner = "abo-abo"; repo = "auto-yasnippet"; - rev = "4496ad507041e48d36522ed1616e430df3f87efe"; - sha256 = "17g463clsyi69fl2mzy84yg6v3sh7nq3ij06spx5j0fpxvmbf6z8"; + rev = "d1ccfea87312c6dd8cf8501ab5b71b1d3d44d95b"; + sha256 = "1i8k2qiyzd5rq0zplk4xb5nfa5mp0ibxbzwqj6c7877waq7244xk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d33c0aee6a5d27217bbae28fc8f448c3badc8a4b/recipes/auto-yasnippet"; @@ -3402,12 +3486,12 @@ autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "autobookmarks"; - version = "20160430.1221"; + version = "20160930.1113"; src = fetchFromGitHub { owner = "Fuco1"; repo = "autobookmarks"; - rev = "05ea2283e73125dba1bb320929b879633e69a600"; - sha256 = "1kb6h37qlhzxk3v45bn0m38bp244c3fpxr3lzr7f6rsy8bpc8w67"; + rev = "067c29cd6088c019578df8530356c126eef9ea2c"; + sha256 = "0iqcl1y1lnfma95lhdyy1zkkn8xlp2hin2wb0gbmkcrlfy0cw364"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e40e6ebeb30b3f23ad37a695e011431a48c5a62e/recipes/autobookmarks"; @@ -3586,19 +3670,17 @@ license = lib.licenses.free; }; }) {}; - avandu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { + avandu = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avandu"; version = "20140412.1426"; - src = fetchFromGitHub { - owner = "dk87"; - repo = "avandu"; - rev = "98155b6da0e81e9480de94791df75f1f7b9653f6"; - sha256 = "06fwpqj21z1xrfl0i9jjrn14vk83a0h32scja34hk7pj9vc2854m"; + src = fetchgit { + url = "git://ryuslash.org/avandu.git"; + rev = "891a847b0fff0ec1abfa717ede28250a16d5c429"; + sha256 = "01mcp4q8qsbcz2nfsfd5wndpnka7qfiqfn2f35y0pm56di7a49v5"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/824aa2dbc230142e893ace4470d386290db8785e/recipes/avandu"; - sha256 = "00fhc3mw7ihfil8fbnibgs8bch9712fya2d1k7k3ll2aln25jjxw"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7a67d2cd2d62c5deb4b9bbbe8efcd014c151f58e/recipes/avandu"; + sha256 = "1pyjpdyk8s4zandz8n1wgyvn0mpvrqn7g34ljnpjr8xciv6qsfpq"; name = "avandu"; }; packageRequires = []; @@ -3607,6 +3689,27 @@ license = lib.licenses.free; }; }) {}; + avk-emacs-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "avk-emacs-themes"; + version = "20160909.1323"; + src = fetchFromGitHub { + owner = "avkoval"; + repo = "avk-emacs-themes"; + rev = "29b58481e0e7fcd46e4d93b6aa250d0b7061d260"; + sha256 = "12vw1r5pvk9wvwqyfg46w3pdmj8asvsk92vfwxa059z4383kq7rz"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b986c7c981ccc5c7169930908543f2a515edaefa/recipes/avk-emacs-themes"; + sha256 = "0yimnfm50qsq505fc67b3qnxx2aiyz5a7bw87zkjrdnar12vv144"; + name = "avk-emacs-themes"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/avk-emacs-themes"; + license = lib.licenses.free; + }; + }) {}; avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy"; @@ -3673,12 +3776,12 @@ avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }: melpaBuild { pname = "avy-migemo"; - version = "20160818.725"; + version = "20161001.845"; src = fetchFromGitHub { owner = "momomo5717"; repo = "avy-migemo"; - rev = "6e394af511274e906db027ea025ac95b4739b613"; - sha256 = "00air40hslsiwm4h0kf3ynklx13hn5dziqw3xwcgf3cvjpchw7vy"; + rev = "74d57be48c29a05e79a920f890a083ab0da75769"; + sha256 = "0s9lhg6kjm51h4wzv2rz6rbl2wr7k54i4bhvsifq6c66cmwz5phl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6a02db29eb3e4b76b4a9cdbc966df5a1bd35dec0/recipes/avy-migemo"; @@ -3694,12 +3797,12 @@ avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "avy-zap"; - version = "20160330.1130"; + version = "20160921.1444"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "avy-zap"; - rev = "173dbb6339e683ff8ed0114cdd5a6490ab6b28f0"; - sha256 = "0nv6y9jwy2z4rlnd6qklhqww367kaqjc5id7yr4hsmxmxw2jj43p"; + rev = "6081738668ab726099ce1c711c580d9745dfaede"; + sha256 = "0byanv32kxsd1lzvyq82xmyfx4drx5j5i10whyyq8a5hhvrpg1qy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/10a2a57c78ac1d8ab621031caa21e8574daeb9a0/recipes/avy-zap"; @@ -3730,22 +3833,22 @@ license = lib.licenses.free; }; }) {}; - aws-ec2 = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }: + aws-ec2 = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, tablist }: melpaBuild { pname = "aws-ec2"; - version = "20160710.2110"; + version = "20161002.628"; src = fetchFromGitHub { owner = "Yuki-Inoue"; repo = "aws.el"; - rev = "408c4e7973d5cf148c5379237d18326e99fdfca2"; - sha256 = "0k97xwyi1img990ynkq5lqh9g651azmb49p9400fs9m5z64q9hn8"; + rev = "2bac460bd54cefe4d1781255ea4800a9037fc520"; + sha256 = "0d8n7ii5z81cc4i5fhbs31b0wfh492qmi8n207cy0ndvpm774l8v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90ac00160cbf692baa1f3953122ac828356944e0/recipes/aws-ec2"; sha256 = "040c69g8rhpcmrdjjg4avdmqarxx3dfzylmz62yxhfpn02qh48xd"; name = "aws-ec2"; }; - packageRequires = [ dash dash-functional emacs magit-popup tablist ]; + packageRequires = [ cl-lib dash emacs magit-popup tablist ]; meta = { homepage = "https://melpa.org/#/aws-ec2"; license = lib.licenses.free; @@ -3904,12 +4007,12 @@ badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "badwolf-theme"; - version = "20160823.152"; + version = "20160920.839"; src = fetchFromGitHub { owner = "bkruczyk"; repo = "badwolf-emacs"; - rev = "dc3bf0ed7031e8d755e3c8ac733e69003715665a"; - sha256 = "00r9gwmyrf8dd4l83mqw4m4qzj8ppy3082k94njhmyq1cx9bvx85"; + rev = "436f48df120530f4eab7c9f02e0b55805122b970"; + sha256 = "0hnb3a4yyz4q94cgbmv1ygpir7azgmzd70l7zafibbxvsp4zir43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/01f3deade0759830ed2e70e00e596915be5f5c11/recipes/badwolf-theme"; @@ -3943,15 +4046,36 @@ license = lib.licenses.free; }; }) {}; + bar-cursor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "bar-cursor"; + version = "20160923.920"; + src = fetchFromGitHub { + owner = "ajsquared"; + repo = "bar-cursor"; + rev = "afa1d4bc1937610cc30575d71aab85ea20ebf2ea"; + sha256 = "1cj28v48xajy1nsqk92vinaz2rh1crm5g58ma5gnibkdnkpq828s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/932e7b128f092ec724ebf18c9c5ca84e16edc82c/recipes/bar-cursor"; + sha256 = "0f7z3mlnh3p28pmn1bnqbszcy1j68dwm8xra1wz8jgykvrdlyf2s"; + name = "bar-cursor"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/bar-cursor"; + license = lib.licenses.free; + }; + }) {}; base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "20160906.2114"; + version = "20160930.2031"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "d97474f6188700556ac4e121b7ea8887e24a8c0b"; - sha256 = "02pj78ccxzkbw7kgnqjpicyy672c1irlya0kq7q38yfmvnsjrxgc"; + rev = "4a50d7fce61c96865d603829f5fe1003848e8fbb"; + sha256 = "1v0ayygk51m292b4vb677v1mafma6a68zxfkhv9a0825ax8w42ix"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -4089,11 +4213,11 @@ }) {}; bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bbdb"; - version = "20160720.2318"; + version = "20161001.2212"; src = fetchgit { url = "git://git.savannah.nongnu.org/bbdb.git"; - rev = "2ea2846d5f34a843dcaf666ad0fc8f603d949b16"; - sha256 = "1xhxnw2svxnb0g3wj86ffcjcsx9jf29s0cpxj2nqgab9r5pyqh1k"; + rev = "2ee0d69610808f84b958f868c3268b75a24aced0"; + sha256 = "0azkjnspn97y0fx4k37spvmxxy7p3g106prcbkmsaqm8jkkxc0qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6b6801fe29cb6fb6183f0babf528375d14f966b3/recipes/bbdb"; @@ -4656,8 +4780,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "3f6ba1bb8ad3fd81278b6787c664639a6a0df6f5"; - sha256 = "161bdn6b76rf0sm7881pyr6xs8mvyvpxhzicf0g2dqncisg4y0gn"; + rev = "ca736c378404d66e9ff0df27969bad2b921c8d08"; + sha256 = "1133n9rgclqyyqba91cc8n1hfhcqxkzh67c6nq5szwy30zjqpzy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d39d33af6b6c9af9fe49bda319ea05c711a1b16e/recipes/bind-key"; @@ -4943,12 +5067,12 @@ bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "bm"; - version = "20151222.1603"; + version = "20160924.1310"; src = fetchFromGitHub { owner = "joodland"; repo = "bm"; - rev = "b91f87c8f78d2430edc376830d5ba15f45d28637"; - sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x"; + rev = "acdd5fef7c72969c1e973113ce4989a9651e2d32"; + sha256 = "19gh8mzq6hvpssp5fdm17gchqmwpdhdrfhg3mvd6qinh0wn2hrgz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/bm"; @@ -5068,7 +5192,7 @@ }) {}; bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "bookmark-plus"; - version = "20160906.1010"; + version = "20160921.1035"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/bookmark+.el"; sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad"; @@ -5087,12 +5211,12 @@ boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "20160906.1203"; + version = "20160929.1310"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "bef6f50554209ccdfba9261fac9a1c40f08e47ef"; - sha256 = "0z176l6bfpyr1z51k3zyfsgnz46mpabncf1pjyip9ddw08qr2ird"; + rev = "dde68b2e64ea7192d313d57536960237ce2db1fd"; + sha256 = "1mbma82ikhywfk71x3y0y49ys101aidxikgsmxyiy26ngfvkm9ml"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; @@ -6148,12 +6272,12 @@ cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }: melpaBuild { pname = "cargo"; - version = "20160906.1346"; + version = "20160910.827"; src = fetchFromGitHub { owner = "kwrooijen"; repo = "cargo.el"; - rev = "9ab9937f6c2abb94b24383603838d762909bb62c"; - sha256 = "05a2nsr2pd679k5z9lj3q4pivvnd9xnnv49an90m6z9bvdcdp1kk"; + rev = "45ec3ac3bce4aac6b832e158efc8cb784caaf5f2"; + sha256 = "0jmdh4bllmr3jgv2v35d014pjcl4brffz9p9l17dvdi01pwkhan0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e997b356b009b3d2ab467fe49b79d728a8cfe24b/recipes/cargo"; @@ -6211,12 +6335,12 @@ cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }: melpaBuild { pname = "cask"; - version = "20160907.306"; + version = "20161003.1152"; src = fetchFromGitHub { owner = "cask"; repo = "cask"; - rev = "f5b828ef4ff6c367f87181a5b998aa78e42c2f24"; - sha256 = "0kmm1dlyf4f8b7dy2v2n7nf6620v6cq70ndlv5607dibhmaa8ksr"; + rev = "8712ea35172e8c63320f963a982c1b50fc7578d1"; + sha256 = "0709zak2y1ifwl9p6qqnzz9vpblan4n7zyrlx81jrkxd3x697dkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/cask"; @@ -6295,12 +6419,12 @@ cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cbm"; - version = "20160905.303"; + version = "20160926.1150"; src = fetchFromGitHub { owner = "akermu"; repo = "cbm.el"; - rev = "bd74f5f83ea1778d2e871cbcbedf458ccde40128"; - sha256 = "1smj2l0g0643qp2c5jgj7z9yk6y8yia5a33pfbdpa4qwgq1ap3m4"; + rev = "bf8cbbcef82e4643c5f0399f0198f606275af08c"; + sha256 = "1p88fx90xwjk7dmd5gmbqyajyxf859kjsjzqmzljwai91skbb3pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm"; @@ -6320,8 +6444,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "fa713612fbf12a599b20f31e0aa6f35931bc92a0"; - sha256 = "0adl3njl8p4jgzwbjfw30yf1z0qis4nilbdkssgag8n9jld53ayz"; + rev = "c06ead712c4c0f44c809552014ba6f12f36102fb"; + sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7375cab750a67ede1a021b6a4371b678a7b991b0/recipes/ccc"; @@ -6362,8 +6486,8 @@ src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "fa713612fbf12a599b20f31e0aa6f35931bc92a0"; - sha256 = "0adl3njl8p4jgzwbjfw30yf1z0qis4nilbdkssgag8n9jld53ayz"; + rev = "c06ead712c4c0f44c809552014ba6f12f36102fb"; + sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b48fe069ecd95ea0f9768ecad969e0838344e45d/recipes/cdb"; @@ -6549,8 +6673,8 @@ src = fetchFromGitHub { owner = "cfengine"; repo = "core"; - rev = "52debcc0a272e8c6c0bda85a46b1880d8a7e5d60"; - sha256 = "1nb5wmn04in8a4d2maqxmynbkhigi8r8pl6j72s4in694y0mnn61"; + rev = "2029d3e544c83a43ef785ab59a3969bb6992186a"; + sha256 = "0vfaxdf87ry4ykvmnyk5b5skmrmz207slpf9nm94zi9lq40nscdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c737839aeda583e61257ad40157e24df7f918b0f/recipes/cfengine-code-style"; @@ -6589,7 +6713,7 @@ version = "20160801.615"; src = fetchsvn { url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs"; - rev = "11717"; + rev = "11758"; sha256 = "1wbk9aslvcmwj3n28appdhl3p2m6jgrpb5cijij8fk0szzxi1hrl"; }; recipeFile = fetchurl { @@ -6898,12 +7022,12 @@ chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "chinese-fonts-setup"; - version = "20160906.2229"; + version = "20160915.1934"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-fonts-setup"; - rev = "c17d7f3a16a2551d7c8e908186dcc361fad9ba40"; - sha256 = "0vg1rxn3lwvmapw63i9i9iccs86xmjr83kx96w8gligacvnbgnzz"; + rev = "dc7a7bfb2ed5f26d99bfe416f2586aba50082c64"; + sha256 = "0rghbg1a8bqll5zn6r2gff94l8jn22q52aac7hpcw5n53ypqk4c1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c536882e613e83a4a2baf86479bfb3efb86d916a/recipes/chinese-fonts-setup"; @@ -6919,12 +7043,12 @@ chinese-pyim = callPackage ({ async, chinese-pyim-basedict, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }: melpaBuild { pname = "chinese-pyim"; - version = "20160831.2112"; + version = "20160923.2342"; src = fetchFromGitHub { owner = "tumashu"; repo = "chinese-pyim"; - rev = "d173f6da0fa304bf69504aa99b64ffa8a2a1beee"; - sha256 = "12wy66binrbakbj2ak6a54j9z7nx1fgpsngyhl5vrb8vhbg60f9c"; + rev = "3d0ccf663fd6b3753a886239dd64fbef44bc02fd"; + sha256 = "0ggz80wlq86scdvfpg4fg9hvwgis9qwsfs52dyk2gpwfpqyn7pmc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/157a264533124ba05c161aa93a32c7209f002fba/recipes/chinese-pyim"; @@ -7126,12 +7250,12 @@ cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }: melpaBuild { pname = "cider"; - version = "20160830.23"; + version = "20160927.2135"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "cider"; - rev = "bdbb2d25b9f3fccf2c586414c5dfce104c811713"; - sha256 = "1k5s97inlm7igy5wp8rapy3l8k8mln0c3fqwn5w7pr09xb7bcqk9"; + rev = "cb2ec12357ab84c04b91b9dd17a007ae78a04afd"; + sha256 = "0jf7d5mjwkykvn9zfbwq2knmk9axfmyz8m20h3m9ih7f5bvsxci0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/55a937aed818dbe41530037da315f705205f189b/recipes/cider"; @@ -7378,11 +7502,11 @@ clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clang-format"; - version = "20151116.438"; + version = "20160912.302"; src = fetchsvn { url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format"; - rev = "280808"; - sha256 = "0jli8vapg8frk12djhrgz4wfhl7pxka73wx0x41a4k45y9yijyfg"; + rev = "283173"; + sha256 = "0fp1q99rrc5c8y9n3bvxqjmfpapkl5qbm47cijipb25bv189gqym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69e56114948419a27f06204f6fe5326cc250ae28/recipes/clang-format"; @@ -7503,12 +7627,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "20160502.1912"; + version = "20160916.513"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "7a1a8a6dcc046c7ede4480315c539c06e1bbadc9"; - sha256 = "0h856l6rslawf3vg37xhsaw5w56r9qlwzbqapg751qg0v7wf0860"; + rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; + sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -7524,12 +7648,12 @@ clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clipmon"; - version = "20160128.1004"; + version = "20160926.329"; src = fetchFromGitHub { owner = "bburns"; repo = "clipmon"; - rev = "90e24ba9dd53cb7c6f147d2d716816410117cd8b"; - sha256 = "07a55q97j2vsqpha0akri2kq90v1l97mc1mgr97pq39gc1bbc5d3"; + rev = "3f985aa2a55fbfd8566425c90e1968998f57b8ee"; + sha256 = "0jkim6zdmqq8swq70yic7cypj89d1rks5lla1kq9qvrmll36x31w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4dc92d73705ebb61ff8218f3483dd2da51ce8d32/recipes/clipmon"; @@ -7587,12 +7711,12 @@ clj-refactor = callPackage ({ cider, clojure-mode, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }: melpaBuild { pname = "clj-refactor"; - version = "20160621.902"; + version = "20160922.329"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clj-refactor.el"; - rev = "51b8b0b0d02ee279dfa0b6a7bf083406fffe1d3d"; - sha256 = "09z78z78m2ncw8n1wvqiwrwdpha358xi1kphiy3q8mp7p10zfnsh"; + rev = "85feb15737823e1bdc07c39088cc3a4f7b18168e"; + sha256 = "16r7ymh4i3n890zi5z4a7s4ryybgml8jhjfnacv47yfgx7x5flds"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3a2db268e55d10f7d1d5a5f02d35b2c27b12b78e/recipes/clj-refactor"; @@ -7617,22 +7741,22 @@ license = lib.licenses.free; }; }) {}; - cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "cljr-helm"; - version = "20150425.1307"; + version = "20160913.128"; src = fetchFromGitHub { owner = "philjackson"; repo = "cljr-helm"; - rev = "99c6dcc5228ecd2fe9e6e28a9512cbc3df0770ef"; - sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln"; + rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4"; + sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm"; sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc"; name = "cljr-helm"; }; - packageRequires = [ clj-refactor helm ]; + packageRequires = [ cl-lib clj-refactor helm-core ]; meta = { homepage = "https://melpa.org/#/cljr-helm"; license = lib.licenses.free; @@ -7851,12 +7975,12 @@ clomacs = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "clomacs"; - version = "20160828.1236"; + version = "20160920.42"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "clomacs"; - rev = "de0d374886c79deb4068e188d00ea3ef76835a8c"; - sha256 = "11z1rdxsg6w44ab9cfgvl7kdrdzvq5fj9fxsqig6j6gvd7m3znhq"; + rev = "b4e2379b1360d777514fbacf20002aeb7c34adf6"; + sha256 = "0829phiki2fh95q9s2hqz12hhn1wprbl2vnczr02j3vqhdv992vz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/345f9797e87e3f5f957c167a5e3d33d1e31b50a3/recipes/clomacs"; @@ -7956,12 +8080,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "20160824.615"; + version = "20160914.148"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "81863c2e16e2ddc6e1616d5585836e46ceee6401"; - sha256 = "0rj4ww67v0r5wjf8siz6yy3hwxbwsnm9l5f8962sxrjillgf3kpg"; + rev = "12b7460691dc502d27329d6ac11c51cc83cd098e"; + sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -7998,12 +8122,12 @@ cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }: melpaBuild { pname = "cmake-ide"; - version = "20160802.619"; + version = "20160929.2359"; src = fetchFromGitHub { owner = "atilaneves"; repo = "cmake-ide"; - rev = "372c05ecd4a7eae91c8b3b1e31c9226b514b6d90"; - sha256 = "0caqi5s17mmgfz6q1439a1w6yr9kmd2g7xqg54ij1km5vq2wbxxk"; + rev = "3e20bd79267b6896154b4d1ca213491e685c3244"; + sha256 = "1jxwrwja9z54jij69wjgin1kbkp6570xz6qxivjz86dk29rqxflv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17e8a8a5205d222950dc8e9245549a48894b864a/recipes/cmake-ide"; @@ -8019,12 +8143,12 @@ cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cmake-mode"; - version = "20160801.1215"; + version = "20160928.505"; src = fetchFromGitHub { owner = "Kitware"; repo = "CMake"; - rev = "f76bcee9a6a95b566e36b533a5fa45b496eb456b"; - sha256 = "00k49iwbkc82wk3ik05al0xyj34vagdall2bqb6c4lv9plica189"; + rev = "484dc1e5d85f4f468e27816eab0fccc9c7d6ec11"; + sha256 = "0f66d728xb5dwpac4pz1x9ghhndd4axflbgy369snz38sw57hyn3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/598723893ae4bc2e60f527a072efe6ed9d4e2488/recipes/cmake-mode"; @@ -8479,8 +8603,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-solarized"; - rev = "6d1cf921881a0db6286ad6904aff2d17b2a335b3"; - sha256 = "0cw1al8dan7vglkm33wkznvmyma903ckd95l1ns6qmf1d55lnpig"; + rev = "99fb4753f071542690e7a17b3dd76b5f2a05e9fc"; + sha256 = "1vhncjyw0qbglgsd04cgyqc3473kz97ks15586ljrpa14f8fnjk2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-solarized"; @@ -8496,12 +8620,12 @@ color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "color-theme-sanityinc-tomorrow"; - version = "20160829.2324"; + version = "20160916.1758"; src = fetchFromGitHub { owner = "purcell"; repo = "color-theme-sanityinc-tomorrow"; - rev = "6943ca134babe228fef975506826d7ac471c9ca2"; - sha256 = "1cnd1fd4mi6jjy7fkldsk9vzgl6q67d5rajr9a5fzzanp4v08zr1"; + rev = "81d8990085960824f700520d08027e6aca58feaa"; + sha256 = "1x3aq6hadp158vh8mf9hmj5rikq0qz7a1frv7vbl39xr3wcnjj23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/color-theme-sanityinc-tomorrow"; @@ -8535,6 +8659,27 @@ license = lib.licenses.free; }; }) {}; + color-theme-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "color-theme-x"; + version = "20160924.854"; + src = fetchFromGitHub { + owner = "ajsquared"; + repo = "color-theme-x"; + rev = "7cba227f8bd4c82269405848550a4f4475057c65"; + sha256 = "053dq567iy9hkidsx76wjzgnq91z4gncx4870cj5lyp6j4g4mc8h"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/321900baf4149f8b58b075b9fb27716cf708f2a2/recipes/color-theme-x"; + sha256 = "0nb2hqmmj1rhqjcbv5m8r9g2bf993lp45ka9rrxqp0pkmyd9fvs2"; + name = "color-theme-x"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/color-theme-x"; + license = lib.licenses.free; + }; + }) {}; colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "colorsarenice-theme"; @@ -8787,12 +8932,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "20160905.1243"; + version = "20160920.1241"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "09065115bead0a14c134d4419944eed7e999284c"; - sha256 = "1vygalvg3hky0hacvj8pgjiaym91yh0npq69q4qi3slz87rpl24c"; + rev = "9f22c09009734bd281fcbb89d8903a04b8a72b74"; + sha256 = "0z6ix3sihzzkk4jgi1qg5ma9wczzdl55kc0y93jnfn69yk3l0ikn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -8970,12 +9115,12 @@ company-distel = callPackage ({ distel-completion-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-distel"; - version = "20160815.2300"; + version = "20161002.2339"; src = fetchFromGitHub { owner = "sebastiw"; repo = "distel-completion"; - rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6"; - sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2"; + rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f"; + sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/company-distel"; @@ -9016,8 +9161,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4b873d36a3a9a90999a59c074c0a9e86fdbb9c51"; - sha256 = "0mnaahi5pjkz67vykpaqzi9w005zsy18k4s3scksvpd6as4jbdid"; + rev = "6e52e1b8501288e57dd0523270ed6406795b0b9e"; + sha256 = "0jx04r7jz1ijq8y7kzcj1j8msxjnh3vbzi378dazr3762ixj51m5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/company-emacs-eclim"; @@ -9054,12 +9199,12 @@ company-flow = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-flow"; - version = "20160831.1929"; + version = "20160915.2229"; src = fetchFromGitHub { owner = "aaronjensen"; repo = "company-flow"; - rev = "5439c4060ef0b8120ed6e9bb6c549d412eb809de"; - sha256 = "1mdx07891gll4rkgm7y0vdp980g72rv07wpnmjdp4v26qy9jnakg"; + rev = "a5bb9014de6ef1393cb12ff808dd4469da7ea648"; + sha256 = "15yyg0qapmkc9m53fpxzpiq2rh6cxwanh1k79v0d0qqk97dxdr3y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/63d346c14af1c5c138d14591a4d6dbc44d9bc429/recipes/company-flow"; @@ -9142,8 +9287,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "46e8fd2234a86934e3e8496c7405984ff7b18df5"; - sha256 = "1r8fh3mi5dywxx6qz2r9cnhnsxdcb52p168bfnadw17g9ps550ms"; + rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a"; + sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/company-go"; @@ -9331,8 +9476,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3"; - sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w"; + rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; + sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/company-nixos-options"; @@ -9348,12 +9493,12 @@ company-php = callPackage ({ ac-php-core, cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-php"; - version = "20160804.2131"; + version = "20160910.1747"; src = fetchFromGitHub { owner = "xcwen"; repo = "ac-php"; - rev = "5b463aba738648d0ac8e1d1000e849a858353ce8"; - sha256 = "0y0yzi9dy852yxww5zzj97fpr9sdgg6n5bk9s0hbwi0v4sj4hvwa"; + rev = "7f82b4f1dbe0992a1b939e9ce359f12f1eb6482a"; + sha256 = "0gfhg7rji735j31xibvimx7v7w337zvrlxzj18qxzymnimhx1843"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac283f1b65c3ba6278e9d3236e5a19734e42b123/recipes/company-php"; @@ -9480,12 +9625,12 @@ company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-shell"; - version = "20160528.507"; + version = "20161002.505"; src = fetchFromGitHub { owner = "Alexander-Miller"; repo = "company-shell"; - rev = "538371368a7590cfddb23d6a5e70fe204b7fa641"; - sha256 = "0dfqc506zyljsl5xasvdq7ym5pfhd3r17kvz84mzgg34r1fd4b8d"; + rev = "63d3cbdf8b2f88cfb2607bc064ef8059b93a75a1"; + sha256 = "11d49spfvx9y1skksjhgirhjxp7i17xcd5xp3a0k59jzb0zhyyqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bbaa05d158f3806b9f79a2c826763166dbee56ca/recipes/company-shell"; @@ -9603,22 +9748,22 @@ license = lib.licenses.free; }; }) {}; - company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: + company-ycmd = callPackage ({ company, dash, deferred, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s, ycmd }: melpaBuild { pname = "company-ycmd"; - version = "20160821.1554"; + version = "20160918.1527"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; - sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; + rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098"; + sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1138c8cc239183a2435ce8c1a6df5163e5fed2ea/recipes/company-ycmd"; sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk"; name = "company-ycmd"; }; - packageRequires = [ company dash deferred let-alist s ycmd ]; + packageRequires = [ company dash deferred f let-alist s ycmd ]; meta = { homepage = "https://melpa.org/#/company-ycmd"; license = lib.licenses.free; @@ -9687,6 +9832,27 @@ license = lib.licenses.free; }; }) {}; + conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: + melpaBuild { + pname = "conda"; + version = "20160922.1700"; + src = fetchFromGitHub { + owner = "necaris"; + repo = "conda.el"; + rev = "41169a10cc41c0a3e0b9a61fd8cae7f964347ed7"; + sha256 = "1n56g7n4nsqrgyhn9lwwqjivmpllibmpgnvy34gbwifkmnq4wz0b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; + sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y"; + name = "conda"; + }; + packageRequires = [ dash emacs f pythonic s ]; + meta = { + homepage = "https://melpa.org/#/conda"; + license = lib.licenses.free; + }; + }) {}; config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "config-parser"; @@ -9920,12 +10086,12 @@ counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }: melpaBuild { pname = "counsel"; - version = "20160906.750"; + version = "20161001.543"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; - sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; + rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5"; + sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c50f32b8d603db0d70e77907e36862cd66b811/recipes/counsel"; @@ -9983,12 +10149,12 @@ counsel-projectile = callPackage ({ counsel, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "counsel-projectile"; - version = "20160507.1022"; + version = "20160926.547"; src = fetchFromGitHub { owner = "ericdanan"; repo = "counsel-projectile"; - rev = "e17c0845633e3d1fb6f8b84d97efa17227361a85"; - sha256 = "1jzqhbw6mid7p5s88lwk1vjb12fmmxc3zfkhdkvxiglmanqghq6f"; + rev = "e5f2f20a167941d212b98b95a52c776c42704baf"; + sha256 = "0fh4w52q42mafbc1lv41x6v6qv8zq04yy15nqf808q7n0xakmssa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/389f16f886a385b02f466540f042a16eea8ba792/recipes/counsel-projectile"; @@ -10064,15 +10230,36 @@ license = lib.licenses.free; }; }) {}; + cpanfile-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "cpanfile-mode"; + version = "20161001.10"; + src = fetchFromGitHub { + owner = "zakame"; + repo = "cpanfile-mode"; + rev = "6f0b6121baa2c1469f168c0cbbed7b74bbdd7d08"; + sha256 = "014ak97li7xsxrdqpsdmaclnsrm4d3gy2cw3msby4j6saj9rcn4r"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/673e828a076ad806cdb69102a9d55f80ace45670/recipes/cpanfile-mode"; + sha256 = "1sflykfrhx9sn5dqlaa4s7w34nczh4xqwcig5rmlpwj9yl2mk2dm"; + name = "cpanfile-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/cpanfile-mode"; + license = lib.licenses.free; + }; + }) {}; cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cpputils-cmake"; - version = "20160515.103"; + version = "20160928.549"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cpputils-cmake"; - rev = "55e5c69554379632692a0fa20bfadeef9194fbdd"; - sha256 = "1rk0bwdvfrp24z69flh7jg3c8vgvwk6vciixmmmldnrlwhpnbh6i"; + rev = "6ea0b6abb1274f61e47c2a0cc09451d6824f7a60"; + sha256 = "1691dk3iqswljhjap6g5n3lfskkwz3k0dg3yk6ga84ys586mm804"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9b84a159e97f7161d0705da5dd5e8c34ae5cb848/recipes/cpputils-cmake"; @@ -10317,12 +10504,12 @@ cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cryptol-mode"; - version = "20140426.1004"; + version = "20160819.1444"; src = fetchFromGitHub { owner = "thoughtpolice"; repo = "cryptol-mode"; - rev = "a54d000d24757fad2a91ae2853b16a97ebe52771"; - sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w"; + rev = "9bf28f865d30d23b8b4fdef16a79ab66abbcc41f"; + sha256 = "0ihhx4zp725g1qaxq6n2ah8rsg099ccyavqxgkk53rpwr8iia0i2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/de12333bb429d84b2c214ac7ebb0219f67838f4f/recipes/cryptol-mode"; @@ -10342,8 +10529,8 @@ src = fetchFromGitHub { owner = "Sodaware"; repo = "cryptsy-public-api.el"; - rev = "59bdf2425dccc27cc1598868a1a810885508cff5"; - sha256 = "0ry0087g1br3397js7a9iy6k2x6p0dgqlggxx9gaqhms7pmpq14b"; + rev = "795c204452f880c0087663e7c35faf26ea34af4d"; + sha256 = "19lfgxay02ngi815cw5mcdksymgfm2mnjs974idr7788kmwqmfij"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/cryptsy-public-api"; @@ -10359,12 +10546,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "20160901.319"; + version = "20160909.1316"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "2275ddab415bcd790f603ccfb6f613142c6144f1"; - sha256 = "16dabgcll453rwc7afigsbvk42dl9yb8ihgvvq01pv57y95jn5wf"; + rev = "b87332e7f9fd543e4b3d32ed97b96daf7426c31f"; + sha256 = "138kkwq5dflypz52b2md53jmp3j1z8nyivwf4bs22j5skp4p9411"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -10585,12 +10772,12 @@ cubicaltt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cubicaltt"; - version = "20160810.38"; + version = "20160914.1356"; src = fetchFromGitHub { owner = "mortberg"; repo = "cubicaltt"; - rev = "cdf88159a26e2e4b73f9fea0c88a6e1d16497218"; - sha256 = "1x9qpil0fmhqld03aj5zxqcb7k4q35ca8w4plgblf5h30l9xzfzg"; + rev = "20ee756ff1159c19c2aa57ddfe241f3d746f4984"; + sha256 = "0k000693g68dx9nlxa8ysfm0x2jr8vh4flxp5n021fxh94zpqi5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1be42b49c206fc4f0df6fb50fed80b3d9b76710b/recipes/cubicaltt"; @@ -10726,12 +10913,12 @@ cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cyberpunk-theme"; - version = "20160121.1712"; + version = "20160930.815"; src = fetchFromGitHub { owner = "n3mo"; repo = "cyberpunk-theme.el"; - rev = "35e73ef8ad01965bf9b58e2188c5f94544911dfd"; - sha256 = "1jffhqkp5ci20gsmlihayihvvg3vyngbjzlna9lmy83gy7jqqj1f"; + rev = "db5e86634d25cf0740f3d070cf2d521378fdf910"; + sha256 = "17y28k5p0in2silrxi9yc1873k9g5lw58rnwab8dyfgda3lw7i7y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4c632d1e501d48dab54432ab111ce589aa229125/recipes/cyberpunk-theme"; @@ -10874,8 +11061,8 @@ src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "f0091a9d6580785b868e4660b3a53027a2447a3e"; - sha256 = "0wlvgpmj6rypgngkmf5wjy6hh45pws40b299r4j1rqk480px1d82"; + rev = "b1d7b0de9e4cdc1eb866661e34f3da8892993fba"; + sha256 = "0m00lbxaa8gd79v8a11mhp89d0hn9sz7fxgksr41hkwpby6wfd1f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -11143,12 +11330,12 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "20160820.48"; + version = "20160929.1724"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "839c94048e0a3e9ac6e286212c7626f3fb7ac2c9"; - sha256 = "1nagwhd8n69iysa4m5i7xxi06w6z4hsrvjsgmdg5msyi14ci5lip"; + rev = "825a61d8d65dbbe9fca44f865dc0a57dbd6bf3db"; + sha256 = "1b2i5fvg3q4fwg5inp08ivznv97cvz2x073i21pv82rk1p8f39q7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -11189,8 +11376,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "f1c60c4f114e6f7256100364e04bbd32552b0eaf"; - sha256 = "15iy8dhs2hx4kfn7ym4yp2kb6j17g5i8q66ji39sf5adbjsfsf1l"; + rev = "2996a0dc3a3ef17afbd67cb60c15c87b93e81620"; + sha256 = "0v11n1vq3cblxnb97wy6p5wb31sc87lmw67vwgpzkcrvdkaxf1w4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash"; @@ -11231,8 +11418,8 @@ src = fetchFromGitHub { owner = "magnars"; repo = "dash.el"; - rev = "f1c60c4f114e6f7256100364e04bbd32552b0eaf"; - sha256 = "15iy8dhs2hx4kfn7ym4yp2kb6j17g5i8q66ji39sf5adbjsfsf1l"; + rev = "2996a0dc3a3ef17afbd67cb60c15c87b93e81620"; + sha256 = "0v11n1vq3cblxnb97wy6p5wb31sc87lmw67vwgpzkcrvdkaxf1w4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57eed8767c3e98614259c408dc0b5c54d3473883/recipes/dash-functional"; @@ -11416,12 +11603,12 @@ ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ddskk"; - version = "20160820.1428"; + version = "20161003.1408"; src = fetchFromGitHub { owner = "skk-dev"; repo = "ddskk"; - rev = "fa713612fbf12a599b20f31e0aa6f35931bc92a0"; - sha256 = "0adl3njl8p4jgzwbjfw30yf1z0qis4nilbdkssgag8n9jld53ayz"; + rev = "c06ead712c4c0f44c809552014ba6f12f36102fb"; + sha256 = "1ixg1871v9k755yflh4c92bp00ylip5aax5zgsqhbxj7mpi535pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6eccccb79881eaa04af3ed6395cd2ab981d9c894/recipes/ddskk"; @@ -11691,8 +11878,8 @@ src = fetchFromGitHub { owner = "liblit"; repo = "demangle-mode"; - rev = "b40d7174d5d31ea8bf3442fb054f3c15bf6e979c"; - sha256 = "00aqhzamp1492kn0x1j2h15wywbkwx9m0alm5z82z60wrq7gy9z7"; + rev = "24a4a9a0f023c7b3fe5441783794185ba3954ffe"; + sha256 = "04q7fv3qvh8a4p64hd9pqfvhnbclfbr1b9s0vi9m8jz9y5p86x8d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ced9f4ffb051a8474d3f72695156416cf2dd8be/recipes/demangle-mode"; @@ -11813,12 +12000,12 @@ dfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dfmt"; - version = "20160827.211"; + version = "20160911.228"; src = fetchFromGitHub { owner = "qsimpleq"; repo = "elisp-dfmt"; - rev = "618274b841b0b6dbfebd79baa9fe05eab2bbd5c9"; - sha256 = "1pvplsjcxl3m8fxix63ndwcwp54ga12kh0yv2y1bzbd51z08210a"; + rev = "f07512fc8555ecd592d8a44722baf922f9f77aaf"; + sha256 = "1ph8z4hazz71k8zsv4gfhpsbysj4d3rinb68fmhp842n00ds6fk4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a343a752d25185b30b10805c4012f3b21a03651e/recipes/dfmt"; @@ -12130,8 +12317,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "d53877ccfd6955c2037d0c214638b6945c8e4511"; + sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-avfs"; @@ -12293,8 +12480,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "d53877ccfd6955c2037d0c214638b6945c8e4511"; + sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-filter"; @@ -12314,8 +12501,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "d53877ccfd6955c2037d0c214638b6945c8e4511"; + sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-hacks-utils"; @@ -12352,12 +12539,12 @@ dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "20160817.823"; + version = "20160918.2130"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "4c9eb0fab636983a03dbe4357f9b3ee6b3ca8d74"; - sha256 = "17g0ajhbhk7l5s75h0ybz1w1dnf5aikvbcgcdd4d0qkj9l91k8x6"; + rev = "57f263b42ea83c6a1cf391fcccffd0f36d213f35"; + sha256 = "1w2grc91m71k9mr4n423vbnakkqg6vc10bham869xs3yr8fs7nay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; @@ -12373,12 +12560,12 @@ dired-launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-launch"; - version = "20160904.1533"; + version = "20160914.756"; src = fetchFromGitHub { owner = "thomp"; repo = "dired-launch"; - rev = "1c24b5ea9d0b091fac58047cb1a1ca60a16a6594"; - sha256 = "0cnj9ffphsq7rzq4hnlxaxi4ziij2d86zqll5pg0ggdsfjhq2dv6"; + rev = "8766ab5ed59b7b5105ca5818fa85004447ced1cb"; + sha256 = "13q1xd2ycs1c6ybizykzhb42x3j3mx2g9dxy8h1nr7bb7393hs64"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31c9a4945d65aa6afc371c447a572284d38d4d71/recipes/dired-launch"; @@ -12394,12 +12581,12 @@ dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-narrow"; - version = "20160130.845"; + version = "20160918.740"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "d53877ccfd6955c2037d0c214638b6945c8e4511"; + sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8994330f90a925df17ae425ccdc87865df8e19cd/recipes/dired-narrow"; @@ -12419,8 +12606,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "d53877ccfd6955c2037d0c214638b6945c8e4511"; + sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-open"; @@ -12435,10 +12622,10 @@ }) {}; dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-plus"; - version = "20160826.2346"; + version = "20160920.1522"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/dired+.el"; - sha256 = "0v5qi7gvqq52qb8wv2dqw3xq348ckfb1ps1l1sk52qp5iswl6995"; + sha256 = "1f6gigw8lzw30qjgl3z13kivwhbgp81fkg3n1b5a8jdg04lkgldp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/dired+"; @@ -12479,8 +12666,8 @@ src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "d53877ccfd6955c2037d0c214638b6945c8e4511"; + sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/568e524b7bdf91b31655bdbb30fe9481d7a0ffbf/recipes/dired-rainbow"; @@ -12496,12 +12683,12 @@ dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-ranger"; - version = "20160528.1031"; + version = "20160924.335"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "d53877ccfd6955c2037d0c214638b6945c8e4511"; + sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c03f6f8c779c8784f52adb20b266404cb537113a/recipes/dired-ranger"; @@ -12593,12 +12780,12 @@ dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-subtree"; - version = "20150908.1033"; + version = "20160920.130"; src = fetchFromGitHub { owner = "Fuco1"; repo = "dired-hacks"; - rev = "230f81191824fa920016d9828a8672df402b4e12"; - sha256 = "1hrfm139c1g1pkpclx491qj9rjlms7g873wds7n4dqiq2mlm1rp7"; + rev = "d53877ccfd6955c2037d0c214638b6945c8e4511"; + sha256 = "09vypvsmva71z4pi7y6npwj6r6rj98d32zyqzmq5kygz7calxkhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6a947ac9476f10b95a3c153ec784d2a8330dd4c/recipes/dired-subtree"; @@ -12674,6 +12861,27 @@ license = lib.licenses.free; }; }) {}; + direnv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "direnv"; + version = "20161002.715"; + src = fetchFromGitHub { + owner = "jml"; + repo = "direnv-el"; + rev = "fc80f40a77553b3c8841abedc15a64771634cb35"; + sha256 = "15lkpnklvgppj63q9qwjd6jbq8czyvjic81mkhf3bwcd7gdqar84"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0f526b9cc7bc1495e5f5e9fb2e49af926aba8a7d/recipes/direnv"; + sha256 = "12yl7hmb7kc8ycr8nr39xb35jhagv8mqn6xs0k8j0mcykpzf2h1g"; + name = "direnv"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/direnv"; + license = lib.licenses.free; + }; + }) {}; direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "direx"; @@ -12801,12 +13009,12 @@ discourse = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "discourse"; - version = "20160811.2150"; + version = "20160911.119"; src = fetchFromGitHub { owner = "lujun9972"; repo = "discourse-api"; - rev = "a1c16af8f77986fb94fbc34c1e6ea36fcd97e00b"; - sha256 = "0i2p97cgrqz65l0bc6zgixvb5bdya4ynq18ygrs3v66xp02rxqc1"; + rev = "a86c7e608851e186fe12e892a573994f08c8e65e"; + sha256 = "1p4crd7v94hmqzqh8bc7jx1pfhallmj4kn36f8l22z4r2mkyycxc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f5e64fc3fa3fc7d0ac14e7e5d324ee1ca77ea4c3/recipes/discourse"; @@ -12970,8 +13178,8 @@ src = fetchFromGitHub { owner = "sebastiw"; repo = "distel-completion"; - rev = "994c61dda2e3256b41fa2e53821c484b5ffd13e6"; - sha256 = "00nifdhwy89zmi50hln5p5albdx7ypm4mbdfjzhk4870crx4zjr2"; + rev = "2ba4eea51cecfa75cf62f58180460ee9ff43131f"; + sha256 = "1761lgplngmpn1vd8syc1h4g6q1dhngamz1j3n48z07c1ylzpkdd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/90fff35dd9709b06802edef89d1fe6a96b7115a6/recipes/distel-completion-lib"; @@ -13028,12 +13236,12 @@ dix = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dix"; - version = "20160801.142"; + version = "20160919.638"; src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "64289f0f658fb67ec9470626aea3365b8fd84f58"; - sha256 = "1r8nz1v0b0qnjvdszh9pvj8c9y5b07k2sdvdmimdhpp0fx9vd246"; + rev = "8b0a4f62b040a0b6b0b81bd052d8b2ea1e8822fa"; + sha256 = "1pb6y8rrbfg0hnnlhn1akgx79hgyazk0rqjd748iyi5dggc2dhq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/149eeba213b82aa0bcda1073aaf1aa02c2593f91/recipes/dix"; @@ -13053,8 +13261,8 @@ src = fetchFromGitHub { owner = "unhammer"; repo = "dix"; - rev = "64289f0f658fb67ec9470626aea3365b8fd84f58"; - sha256 = "1r8nz1v0b0qnjvdszh9pvj8c9y5b07k2sdvdmimdhpp0fx9vd246"; + rev = "8b0a4f62b040a0b6b0b81bd052d8b2ea1e8822fa"; + sha256 = "1pb6y8rrbfg0hnnlhn1akgx79hgyazk0rqjd748iyi5dggc2dhq6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d9dcceb57231bf2082154cab394064a59d84d3a5/recipes/dix-evil"; @@ -13095,8 +13303,8 @@ src = fetchFromGitHub { owner = "gopar"; repo = "django-manage"; - rev = "e72b1cf2fdbb5c624d19169176e60467b4918fe2"; - sha256 = "0lyi64dfd2njlnf9dzb8i88rrw930jiq99xfn8zmh87y6qy1j79i"; + rev = "876fb2cb627d465adfdc905841279784bcdd7ee8"; + sha256 = "0yi38aif1n0s9yp87wimdbnq7vr7k5gbshfprj9ansibrjxnb6xk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66f88d30a1ab9b7f9281a2b5939c7ab2711b966a/recipes/django-manage"; @@ -13109,22 +13317,22 @@ license = lib.licenses.free; }; }) {}; - django-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + django-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }: melpaBuild { pname = "django-mode"; - version = "20150207.517"; + version = "20160926.1151"; src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; - rev = "3d82a62a7faeb2c124ac4c109e075f581c175508"; - sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va"; + rev = "a3fdf9156a65a03e6f50c41d32b0f5a6960bba54"; + sha256 = "0z7yskxz34wncmg516qkaisbr7w3fcp9jrx80w2h68lyy8slcbmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-mode"; sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara"; name = "django-mode"; }; - packageRequires = []; + packageRequires = [ projectile s ]; meta = { homepage = "https://melpa.org/#/django-mode"; license = lib.licenses.free; @@ -13137,8 +13345,8 @@ src = fetchFromGitHub { owner = "myfreeweb"; repo = "django-mode"; - rev = "3d82a62a7faeb2c124ac4c109e075f581c175508"; - sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va"; + rev = "a3fdf9156a65a03e6f50c41d32b0f5a6960bba54"; + sha256 = "0z7yskxz34wncmg516qkaisbr7w3fcp9jrx80w2h68lyy8slcbmv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bdc46811612ff96cb1e09552b9f095d68528dcb3/recipes/django-snippets"; @@ -13193,6 +13401,27 @@ license = lib.licenses.free; }; }) {}; + dkl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "dkl"; + version = "20161001.1825"; + src = fetchFromGitHub { + owner = "flexibeast"; + repo = "dkl"; + rev = "0a6b1ef7dbbf3fcf43ea386d1aab8bd7ae039d8c"; + sha256 = "1vjs9zjcyyk728x80b53v16cvlwswxgvhn2dwncajkcfva0pjjwj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8bd9cf21473f676aa54e142b6f0bf0427f40d29/recipes/dkl"; + sha256 = "0bcv4ld8bfj2sk3sh4j1m9qqybw3l0a6b3d12qwy8lc3b8197lr0"; + name = "dkl"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/dkl"; + license = lib.licenses.free; + }; + }) {}; dklrt = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, ledger-mode, lib, melpaBuild }: melpaBuild { pname = "dklrt"; @@ -13319,22 +13548,30 @@ license = lib.licenses.free; }; }) {}; - docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s, tablist }: + docker = callPackage ({ dash, docker-tramp, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s, tablist }: melpaBuild { pname = "docker"; - version = "20160816.105"; + version = "20160911.1215"; src = fetchFromGitHub { owner = "Silex"; repo = "docker.el"; - rev = "d5d6f8ecdc5fdae19ff03ad3b242fd50fd618c4a"; - sha256 = "0sczy87n9ymckw64fh3lxbpjawfc26xsja4qylzaj5pjsixrnpjh"; + rev = "7d9b72ed0e7afa992a6f15066bfd974d5f2e1696"; + sha256 = "05pll1a7j9clgjn00llhra59svkwqhynyyjvsih0p3rhp3vg7297"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c74bf8a41c17bc733636f9e7c05f3858d17936b/recipes/docker"; sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk"; name = "docker"; }; - packageRequires = [ dash docker-tramp emacs magit-popup s tablist ]; + packageRequires = [ + dash + docker-tramp + emacs + json-mode + magit-popup + s + tablist + ]; meta = { homepage = "https://melpa.org/#/docker"; license = lib.licenses.free; @@ -13466,6 +13703,27 @@ license = lib.licenses.free; }; }) {}; + doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "doom-themes"; + version = "20160926.844"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-doom-theme"; + rev = "1b257a7dcb21193b4af0722262c79bc53a4ab866"; + sha256 = "1ccm4lpgmkzg0fhqak4xl25vp2is1dcid0hahd8f1ly7fzn7xwmq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; + sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; + name = "doom-themes"; + }; + packageRequires = [ all-the-icons dash emacs ]; + meta = { + homepage = "https://melpa.org/#/doom-themes"; + license = lib.licenses.free; + }; + }) {}; doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "doremi"; version = "20151231.1255"; @@ -13807,12 +14065,12 @@ drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }: melpaBuild { pname = "drupal-mode"; - version = "20160821.1324"; + version = "20160915.245"; src = fetchFromGitHub { owner = "arnested"; repo = "drupal-mode"; - rev = "f425ba445ae201a16e3fc3b4f5fb8bea93579d39"; - sha256 = "1c3krir3l04rwlyadnhra6kmbnmvdm95aj7iwspa6dssnry4vflj"; + rev = "eec2e557d769f3379e6c208334650f3041d28d54"; + sha256 = "0c3s5l5msc1npjxdix6lr0467vgxil29ha39q3cwq60kbvrcdbgq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e16af340868048eb1f51f9865dfc707e57abe8/recipes/drupal-mode"; @@ -13851,7 +14109,7 @@ version = "20130120.1257"; src = fetchsvn { url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/"; - rev = "1759610"; + rev = "1763224"; sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq"; }; recipeFile = fetchurl { @@ -13952,12 +14210,12 @@ dumb-jump = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }: melpaBuild { pname = "dumb-jump"; - version = "20160904.1855"; + version = "20160928.1442"; src = fetchFromGitHub { owner = "jacktasia"; repo = "dumb-jump"; - rev = "e32a4916a1cf0a7f455abce41015f297d9c5bc60"; - sha256 = "0lh32i3y3z5i5wvyxniw1biip59kzklz7nvxmxaqw2bbdbrqkwn8"; + rev = "77e27004289981d0ae3d9425dfefc725ef1829f9"; + sha256 = "1ngvffh4lfd1nasnpqw8vvd4pyl286m4fn82xx4fhfz50m797pcy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2a60e7c166c2d68e4f719d293014a22139593dde/recipes/dumb-jump"; @@ -14036,11 +14294,11 @@ dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dyalog-mode"; - version = "20160723.524"; + version = "20160926.1456"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "4b5bc1f49cad"; - sha256 = "1c0jswjxazf330bh0xg889s6pfk50x5qi5lc8kpfqwa0p6b15306"; + rev = "2664661b55eb"; + sha256 = "1yawkav0hdsn41lx9q33lxsfpjy7fiwk0f5xlly5vswsn2va9zlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -14476,12 +14734,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "20160905.1750"; + version = "20160923.210"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "0b97d84c342820f873e3bfe506365f9d51aad7a7"; - sha256 = "0p8pf902prs26fafzkavna3capfrq7abfmg06p1mi6mz32rqph5r"; + rev = "212b6a594d13ffcc5683f9bcfd274682abff2b05"; + sha256 = "1d19qw9980iq4idmcdr8ri42pdmyig6c1nwpxijqvdnd0zxfbnph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -14561,8 +14819,8 @@ src = fetchFromGitHub { owner = "emacs-eclim"; repo = "emacs-eclim"; - rev = "4b873d36a3a9a90999a59c074c0a9e86fdbb9c51"; - sha256 = "0mnaahi5pjkz67vykpaqzi9w005zsy18k4s3scksvpd6as4jbdid"; + rev = "6e52e1b8501288e57dd0523270ed6406795b0b9e"; + sha256 = "0jx04r7jz1ijq8y7kzcj1j8msxjnh3vbzi378dazr3762ixj51m5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e9d3075587fbd9ca188535fd945a7dc451c6d7e/recipes/eclim"; @@ -14599,12 +14857,12 @@ ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ecukes"; - version = "20150717.648"; + version = "20160913.5"; src = fetchFromGitHub { owner = "ecukes"; repo = "ecukes"; - rev = "7dad2da09da33d8540f25bf7bb7dd62900669b80"; - sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2"; + rev = "1dcfebf13506e6ecc7e76e668665cff9cf79acda"; + sha256 = "0grk10s0fzcdpcimdk1dblq5f8k999h7mlqhhjvvdwjbypmy9891"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14cf66e6929db2a0f377612e786aaed9eb12b799/recipes/ecukes"; @@ -14743,6 +15001,27 @@ license = lib.licenses.free; }; }) {}; + ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ede-php-autoload"; + version = "20160924.152"; + src = fetchFromGitHub { + owner = "stevenremot"; + repo = "ede-php-autoload"; + rev = "73bdbfa4dc9dda7ff735db8a8b25c18b66c9f256"; + sha256 = "1dqxi3w6pp3mkd8jgy5ylx7bqmzf58g4qgkvrpvg0j3c2j9arfpq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; + sha256 = "0b7qbighncipgfaksvggpyldc5h0wxbjbiyaghglvycc4p1sfjd0"; + name = "ede-php-autoload"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ede-php-autoload"; + license = lib.licenses.free; + }; + }) {}; edebug-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edebug-x"; @@ -15053,8 +15332,8 @@ src = fetchFromGitHub { owner = "egisatoshi"; repo = "egison3"; - rev = "f08462616a29d58774e4e89fe01b75f4503394a8"; - sha256 = "13xyr7g1if29yv6vykwx1inmphig20z320hzva1lbni4cl1dwfc7"; + rev = "d4f408a78a1b60f78053fbdeaab99b8b350c13af"; + sha256 = "1l2631q3n2wla2pqlfg8r1ppqzl0np62270v6mwg8zlr17yi59fi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f543dd136e2af6c36b12073ea75b3c4d4bc79769/recipes/egison-mode"; @@ -15070,12 +15349,12 @@ ego = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }: melpaBuild { pname = "ego"; - version = "20160822.849"; + version = "20160909.937"; src = fetchFromGitHub { owner = "emacs-china"; repo = "EGO"; - rev = "33b8df4e13257a0e893a4f49a1d6aa623e2bca72"; - sha256 = "059vhx15rvp52s3bdvhz62jvkxi6ab9ly7pmab9cpdcpagqq9gaq"; + rev = "ec36eacb1455b551a2084f8b7cc79981723dbd38"; + sha256 = "0pv0a8d0czk3kyliynbwmcqmr3adaw0pis2wgbdy9qz07m2k64s3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0090a628a5d566a887cac0d24b080ee6bafe4612/recipes/ego"; @@ -15090,11 +15369,11 @@ }) {}; eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eide"; - version = "20160210.1238"; + version = "20160926.1332"; src = fetchgit { url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git"; - rev = "9d7fb8c50568ece04bb0382caca42d3ab68fbb01"; - sha256 = "1qiafvx6bhliqaysyc4qv2ps44qsmls75ysjbgmzw5rndc8hf0r0"; + rev = "72c07fdbe6c8507147e997a22abcc2b42e45fce8"; + sha256 = "1v64b6ii4xl3cyr6cvyq25i2xzyk6czr4m1z82pknb3qmxx3m26w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d384f185f76039b06a1b5b12c792b346c6d47a22/recipes/eide"; @@ -15131,12 +15410,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "20160831.817"; + version = "20160923.837"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e"; - sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m"; + rev = "71d8994ebb7636fc13b305d009c537d8f0b357ef"; + sha256 = "1cayckl1r8mhfz8sz6w4b6vrydd677mxjxm9lpnfk2yr6iwxvnbi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein"; @@ -15194,12 +15473,12 @@ ejc-sql = callPackage ({ auto-complete, clomacs, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ejc-sql"; - version = "20160603.742"; + version = "20160916.33"; src = fetchFromGitHub { owner = "kostafey"; repo = "ejc-sql"; - rev = "a7509abcdf76408acc03f1f198450b9064bcd5c4"; - sha256 = "0v7amrmzrmj3myikd0a3g30cmkjri84paxxi4qzldwshj1pwypn4"; + rev = "52c5845d25416405c19362125598ac2447f2333f"; + sha256 = "0j1vyjx060bsmkkczvhvpzhamx6nr5qgqk8ld86aaxyd8kb3x4q4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f2cd74717269ef7f10362077a91546723a72104/recipes/ejc-sql"; @@ -15236,12 +15515,12 @@ el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-get"; - version = "20160827.1305"; + version = "20160929.613"; src = fetchFromGitHub { owner = "dimitri"; repo = "el-get"; - rev = "0ee06a6f8890d3a1eca913e42c7f22e9d1d507e2"; - sha256 = "0dv4ags1hfv2fyypqn75cmnjgskwjkx6kjz5r1k93siz3grny8kf"; + rev = "0c3c33e604830e9e4dabc35a1b4bd0bc5ae0f3a6"; + sha256 = "1dpbw9pj44lda7fnm17ap8cgw28h0cydx2sxhf49az0s7h2czdip"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1c61197a2b616d6d3c6b652248cb166196846b44/recipes/el-get"; @@ -15299,12 +15578,12 @@ el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "el-mock"; - version = "20150906.321"; + version = "20160923.1157"; src = fetchFromGitHub { owner = "rejeep"; repo = "el-mock.el"; - rev = "5cb160b9bd2c9b909a2b64adcc9ec947da643c39"; - sha256 = "1jiq2hpym3wpk80zsl4lffpv4kgkykc2zp08sb01wa7pl8d1knmm"; + rev = "e3cff9f127ab62dc177b043ce319c7866f6fe2f0"; + sha256 = "1qclqb5g50m208hwyalc6gc0y04lbai8fplxs0nadas3478x5344"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1989beb927657c0ff7e79fe448f62ac58c11be7/recipes/el-mock"; @@ -15570,8 +15849,8 @@ src = fetchFromGitHub { owner = "davidshepherd7"; repo = "electric-operator"; - rev = "4f8ced25619b34ca6b36f8446071c2cb75e23906"; - sha256 = "1lvlhjdprlw3dqz49h8gncw5q33mlpqwx9pgi7jj79hrsfq8fqml"; + rev = "a23a5b92e0efba55314bc621502a373e28784d1a"; + sha256 = "04dnkrrxim82ysdzwcqhvhqabxm3f97z8nqgn8g8idj0m1as4wm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/906cdf8647524bb76f644373cf8b65397d9053a5/recipes/electric-operator"; @@ -15650,12 +15929,12 @@ elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elfeed"; - version = "20160826.1719"; + version = "20160911.1353"; src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "85b59b9e580ab58a71852026698c6d61daa977e6"; - sha256 = "0ak7qar0wagb35cxzb09nfjmnb5wz5hiq2bardsvz9ifddi7nnps"; + rev = "f45deed1694340df010e5c60776bfef3784a2c7f"; + sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/407ae027fcec444622c2a822074b95996df9e6af/recipes/elfeed"; @@ -15671,12 +15950,12 @@ elfeed-goodies = callPackage ({ ace-jump-mode, cl-lib ? null, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, popwin, powerline }: melpaBuild { pname = "elfeed-goodies"; - version = "20160317.424"; + version = "20160926.209"; src = fetchFromGitHub { owner = "algernon"; repo = "elfeed-goodies"; - rev = "4e0f45a4fa459e1acd1282a063190311ca2aaa81"; - sha256 = "10dbf292l1pd6a4jchdlvpp4yf2kxmf2j6zqigh4wlg125px1drk"; + rev = "f3f2595c845a8001d1bb28a185cc05cf984998ef"; + sha256 = "1qfny4qmhy2cb0yxjpzn039kmzhy3n29mik0am0csx9a71gii109"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e6ebb8d23961fd9bfe101f7917caa3b405493f31/recipes/elfeed-goodies"; @@ -15724,8 +16003,8 @@ src = fetchFromGitHub { owner = "skeeto"; repo = "elfeed"; - rev = "85b59b9e580ab58a71852026698c6d61daa977e6"; - sha256 = "0ak7qar0wagb35cxzb09nfjmnb5wz5hiq2bardsvz9ifddi7nnps"; + rev = "f45deed1694340df010e5c60776bfef3784a2c7f"; + sha256 = "01my4vsjxrgnvybayshikagmw801g5dispi7mlrc7w20lab26lk5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62459d16ee44d5fcf170c0ebc981ca2c7d4672f2/recipes/elfeed-web"; @@ -15822,6 +16101,27 @@ license = lib.licenses.free; }; }) {}; + elisp-refs = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: + melpaBuild { + pname = "elisp-refs"; + version = "20161001.1123"; + src = fetchFromGitHub { + owner = "Wilfred"; + repo = "refs.el"; + rev = "0f6746fd0ee911244f116061574ece4496be776e"; + sha256 = "0fncp8hhyrzlp53w20la0i2jcf25s4xhgz4ql0r2krshf2dvdyz4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/60891099e241ebd32d39bdcfe4953529a5a3263e/recipes/elisp-refs"; + sha256 = "16h7dccmzvmap3knnwhjq79wm82xm3whria70vq5msl2y252f6cx"; + name = "elisp-refs"; + }; + packageRequires = [ dash f list-utils loop s ]; + meta = { + homepage = "https://melpa.org/#/elisp-refs"; + license = lib.licenses.free; + }; + }) {}; elisp-sandbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elisp-sandbox"; @@ -15850,8 +16150,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "elisp-slime-nav"; - rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432"; - sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih"; + rev = "8a1c2717a6fb50b654b8d1ffa12a40420ee32990"; + sha256 = "1nn97aqfawygvwybr5d51y82az4pj774d6qmwsqfpx7yppd45hsd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/elisp-slime-nav"; @@ -15867,12 +16167,12 @@ elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "elixir-mode"; - version = "20160718.2245"; + version = "20160922.857"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "emacs-elixir"; - rev = "1d0404494c1543b0d1e4d410b77c7d5e3ecc8dac"; - sha256 = "0yhrmr4am949vsjq7jxc60vl0986p2wyklmhcjd4had4z1vzgz3i"; + rev = "765828706971050b4bd78d22203ebe22ed2d2dab"; + sha256 = "1r1wzw1sk3320qv72yk8d6l2r1knlnbvfaa0cnn4vlk5ww7bh1yh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6374ced0de38d83bf99147f702f30706615480ed/recipes/elixir-mode"; @@ -15909,12 +16209,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "20160906.36"; + version = "20161002.103"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "7e0da96f483703930919f04943f60f6eca3cb842"; - sha256 = "1y0prk4dbw6h26kj2l5vl3bakvc58aawjpkpb2r8wgb2b3fg9vl3"; + rev = "2f7f0c3e42d137aaefd12bc28383807d35a2a290"; + sha256 = "137189r1rba5l9m82qj3zba8x0gkm0c3xc9df1vri4wsbz4df7nm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -15951,12 +16251,12 @@ elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmacro"; - version = "20160224.931"; + version = "20161003.1228"; src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; - rev = "d4a54dc41bd15e2acb6edb12f9b4f8bdad784478"; - sha256 = "085ab50q3jdy3vh22lz2p5ivcjlhfki3zzfsp1n0939myw6vqcsm"; + rev = "1014e515c9714613921622cdb3f36ed4ef27233e"; + sha256 = "14rjlxskxhjlidj4v50g0xsm0xhqm6gxl0bi9lwm699dlw9h5z4r"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; @@ -16081,8 +16381,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "elpa-audit"; - rev = "1ca4e6073f8c4cbb41688b69d3b3feaa1a392efc"; - sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy"; + rev = "727da50e626977351aff2675b6540a36818bbbe6"; + sha256 = "0wlhdzsrlj266jfvp925zrgzg2mxfba93klgky0hc8zialmmb50b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c351c97e5b2c0595c82d65a7075176f9ebe44638/recipes/elpa-audit"; @@ -16119,12 +16419,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "20160511.2204"; + version = "20160917.10"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "d735bfaa848d93abde5848673f6bf8e50aaf8530"; - sha256 = "1l1wnnmz62crr2gzpf0gzqp2pwmd50xp9knpswwz7l482gvfbzl7"; + rev = "dcadffd331ac70c59e1960d34b7f998302c616d6"; + sha256 = "08dz6zy9fqj7qd1g1igvr28q2znrd5pwxxqjlrkzs994ypfj1vzq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -16144,8 +16444,8 @@ src = fetchFromGitHub { owner = "jorgenschaefer"; repo = "elpy"; - rev = "c3fb8a8a4aaa7aafec6a38d22ffe1731e7a8cf20"; - sha256 = "16c5pzrnnjg4dy1k07wn64nmvb8h86530krdyp5h5v4vlpwd3m67"; + rev = "4137f5aa88fc219f84effc6a6f79def8249bff6e"; + sha256 = "1jfn3pb0hh5sybgcfmgba7xairpwpcx56xg9gbrn0sviwbcmyjwp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a36daf2b034653cd73ee2db2bc30df2a5be6f3d1/recipes/elpy"; @@ -16206,6 +16506,27 @@ license = lib.licenses.free; }; }) {}; + elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "elscreen-fr"; + version = "20160920.253"; + src = fetchFromGitHub { + owner = "rocher"; + repo = "elscreen-fr"; + rev = "b9c11f80d277086d5d5bf88623e15fc7adbbbe3c"; + sha256 = "1dz8jqd2agh06hya59vbybrmgyhyz2rk6c9panrm49w37v0bwksb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/18730986df5eb9816eec7ad479abe1e338d3c66f/recipes/elscreen-fr"; + sha256 = "1kmga1zz9mb3hxd2sxja2vz45pix5a52yl0g9z4vmak32x9rgqrm"; + name = "elscreen-fr"; + }; + packageRequires = [ elscreen seq ]; + meta = { + homepage = "https://melpa.org/#/elscreen-fr"; + license = lib.licenses.free; + }; + }) {}; elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-mew"; @@ -16563,6 +16884,27 @@ license = lib.licenses.free; }; }) {}; + emaps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "emaps"; + version = "20160910.521"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "emaps"; + rev = "728eb6eeae46194f32a01bafa349ece520bc7a10"; + sha256 = "1asl6wkibfcxmf1kwnppbh8qpa454ssyxrqfh2d5dna3gxaa2cqm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4faeda02aabc0b6c5003cdf5d1fdfca0fd71b0d7/recipes/emaps"; + sha256 = "151rh6lyqi0ps2w022shzjj67nkg6y4m1nfj90qyc7jgl64qb9qw"; + name = "emaps"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/emaps"; + license = lib.licenses.free; + }; + }) {}; ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ember-mode"; @@ -16753,12 +17095,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 = "20160717.638"; + version = "20161002.855"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-mpv-jp-radios"; - rev = "61657c2dd79136f8787b45a0416a64459dae1b7e"; - sha256 = "04plvyy2ahjdd9q22fr8jhwfz0g55ccn67flnwfms3p05xc5vvzg"; + rev = "2fcc970436142b8f4ce4911f2a04680fc77699b8"; + sha256 = "0ncax0vlgdah8mlqi3kr63ymf45bngr38vk6m6q3i2wdx6fbrxm9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/09ba6da5057061f055d4a3212d167f9666618d4f/recipes/emms-player-mpv-jp-radios"; @@ -16774,12 +17116,12 @@ emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-simple-mpv"; - version = "20151020.601"; + version = "20160924.825"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-simple-mpv"; - rev = "92be36ef158df3db3a2f9e2d0186a609fc2d3702"; - sha256 = "0ajxyv7yx4ni8dizs7acpsxnmy3c9s0dx28vw9y1ym0bxkgfyzrf"; + rev = "bcc056364df5f405716006a8b7bb90102a57f62f"; + sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4eaa866ba6b0ad2b590fb15c30f81b9fdbef6dd/recipes/emms-player-simple-mpv"; @@ -16921,12 +17263,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "20160904.2344"; + version = "20160928.550"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "f791ad4c741218668dad4ba8db65161da9a5b010"; - sha256 = "172p422889wikj9hvq973whqz9jnkaxay8lsa5zdk26i0b6a2kk7"; + rev = "4eccfc7ce43d4dfd3cf65ea86b2975abb4b4e9ad"; + sha256 = "1n5pmcd6d71pcgjwkqnmh6midcyp7ahc5yry3r38my3shrwirqc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -17143,12 +17485,12 @@ ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode, yasnippet }: melpaBuild { pname = "ensime"; - version = "20160905.704"; + version = "20160921.1725"; src = fetchFromGitHub { owner = "ensime"; repo = "ensime-emacs"; - rev = "adca2a4dc74edca2a017374543bdcb45a3ffcabc"; - sha256 = "1wlm4c5pasvnh3mrkwvzhs5phyh3h1a6hyksm4lr7ynvgyn7nslz"; + rev = "3dcff1facb075149158175c76326900eb01c99da"; + sha256 = "08m7g0h9iap2sma7mhni6pg6rbgibf9gkhicx7i2z7r3sbgaal43"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/502faab70af713f50dd8952be4f7a5131075e78e/recipes/ensime"; @@ -17424,11 +17766,11 @@ erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }: melpaBuild { pname = "erc-hipchatify"; - version = "20160504.1145"; + version = "20160909.1503"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "b237cf8118fd"; - sha256 = "11a64rvhd88val6vg9l1d5j3zdjd0bbbwcqilj0wp6rbn57xy0w8"; + rev = "dbb74dd91c5a"; + sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -17675,12 +18017,12 @@ ereader = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, xml-plus }: melpaBuild { pname = "ereader"; - version = "20160904.854"; + version = "20160924.1342"; src = fetchFromGitHub { owner = "bddean"; repo = "emacs-ereader"; - rev = "d85ff3601f5f6c4771a3e215640f6bc026e02822"; - sha256 = "1i7599pddh5klad0a0lmkcb978ckc898nknlrbcbrh7r7gm70242"; + rev = "d673666315075e449b5c555a06ba50ae8cd8cad2"; + sha256 = "1pkjm4dh4ly4angbcnn3cyyyxpc3h38b4jlyx4050nabim13vh2k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a3feaacdfcddb862cd3101b33777d9c19dfd125/recipes/ereader"; @@ -17738,12 +18080,12 @@ ergoemacs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ergoemacs-mode"; - version = "20160720.1613"; + version = "20160926.919"; src = fetchFromGitHub { owner = "ergoemacs"; repo = "ergoemacs-mode"; - rev = "6bb3eb24c8a7e881024d6d0becb01c84c37c95f0"; - sha256 = "0pnv4q30aab18c65vqrd16dbvl9mfkni13zfcm4sgabpmhgh7r8h"; + rev = "7e08fda94454bfe6be92f35bc2be3aceb32e90ad"; + sha256 = "0ic29n4x0m3cii03bcgbs2mn5b0ng5knzal4b10q10n33zazwcvi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/02920517987c7fc698de9952cbb09dfd41517c40/recipes/ergoemacs-mode"; @@ -17784,8 +18126,8 @@ src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "b834a527c2f420a80806fbf36d4585c1e530061c"; - sha256 = "0n1mrsgbk5r663i2zkxqn4q0dimpr2n156822yb6f38ay6b41c7m"; + rev = "a0abdb8631d7bd7a154023950ccdcbf09c85b92d"; + sha256 = "19yy1sci2fdqp5iwzfm1rpw4b97vpbplfc7hwhv036afzkg9kj7m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -17923,12 +18265,12 @@ es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, spark }: melpaBuild { pname = "es-mode"; - version = "20160822.927"; + version = "20160927.1351"; src = fetchFromGitHub { owner = "dakrone"; repo = "es-mode"; - rev = "58782fb516a4fcf94d7347c4bf9a166679e62e49"; - sha256 = "0jllwx3fc5dlv83s3sn8s1afj26ijgym5qzqbagwh2rgajxmh7w8"; + rev = "b2e4403197834c06bf47a9b72b57a65a28589fbf"; + sha256 = "19wzyc8qxdgm69k3nrv6x1yi3lajyxp1xhm6w54x14yqw2l8d67g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/85445b59329bfd81a3fd913d7d6fe7784c31744c/recipes/es-mode"; @@ -18133,12 +18475,12 @@ eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "eshell-prompt-extras"; - version = "20160801.2006"; + version = "20160926.1723"; src = fetchFromGitHub { owner = "hiddenlotus"; repo = "eshell-prompt-extras"; - rev = "7a5af38b1b891d831b8317f0f24f179544628730"; - sha256 = "1gcvsxxvad0kj3m638jmfc2mjza5v69yq89ffl7llpqkicrnxrxq"; + rev = "9825db1b9326e106f821364ae01ec9c7dbdf6d18"; + sha256 = "1zijgwqm9j25ayiy4p5gl3xsrgv10l85j2p317i8bx9hn3v9rk5a"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/eshell-prompt-extras"; @@ -18280,12 +18622,12 @@ ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }: melpaBuild { pname = "ess"; - version = "20160905.1519"; + version = "20161003.124"; src = fetchFromGitHub { owner = "emacs-ess"; repo = "ESS"; - rev = "14e80d605a9f0d3912526f1eb4bfbeac9290d450"; - sha256 = "0qlpl2an7qzq9q1ib29z2haqd2q2hqciblxvh982f3yghscn7wgr"; + rev = "c37aaa8b672c25686cd4dd92f4b230116a1897b8"; + sha256 = "19xghzyabl0i5kg4b73jdik3npkq4bs5xsnn1kx3zrvr2szf89js"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/12997b9e2407d782b3d2fcd2843f7c8b22442c0a/recipes/ess"; @@ -18774,6 +19116,27 @@ license = lib.licenses.free; }; }) {}; + evil-colemak-minimal = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-colemak-minimal"; + version = "20160922.226"; + src = fetchFromGitHub { + owner = "bmallred"; + repo = "evil-colemak-minimal"; + rev = "334a1809ac4d3af3aeb8a18ca05c96c0c6ea6ad1"; + sha256 = "0608vcj2birsfm12w89gnpmcsalcpva61qkhh7m4kxqafglq7bzf"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/828c744062069027f19fe5f2f233179f9149dc16/recipes/evil-colemak-minimal"; + sha256 = "0qi5k17b9k227zz9binbrd22cwmlqxkay98by9yxcbyhl4hjhdyy"; + name = "evil-colemak-minimal"; + }; + packageRequires = [ emacs evil ]; + meta = { + homepage = "https://melpa.org/#/evil-colemak-minimal"; + license = lib.licenses.free; + }; + }) {}; evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-commentary"; @@ -19176,12 +19539,12 @@ evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-mc"; - version = "20160804.637"; + version = "20160923.1622"; src = fetchFromGitHub { owner = "gabesoft"; repo = "evil-mc"; - rev = "4a202ae581978e467c726b6bab2344a48d225bf4"; - sha256 = "18p90q9xxsnnakk4zc1lylwri0qpqhavabjbrn8yb740brwi59dj"; + rev = "540846d2769b7466f4d98accafdc4e0d1dc76ece"; + sha256 = "0j970h7xapg3y29rsyhirmda81d59ck5acjz0yrmjxjy0f61kq3w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/96770d778a03ab012fb82a3a0122983db6f9b0c4/recipes/evil-mc"; @@ -19407,12 +19770,12 @@ evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }: melpaBuild { pname = "evil-search-highlight-persist"; - version = "20151215.238"; + version = "20160912.807"; src = fetchFromGitHub { owner = "juanjux"; repo = "evil-search-highlight-persist"; - rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85"; - sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk"; + rev = "2f9ea9086373292610f50e5f468b55c3fe072bfc"; + sha256 = "04mf3zd424kfnswifrg3qlyi39f58ydnm7ahcd0zi168bv1d9r6j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/91361f95852910968b395423e16377c70189fc55/recipes/evil-search-highlight-persist"; @@ -19449,12 +19812,12 @@ evil-snipe = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-snipe"; - version = "20160815.608"; + version = "20160928.508"; src = fetchFromGitHub { owner = "hlissner"; repo = "evil-snipe"; - rev = "f48a215eabefcd1e1d76814e166d59bd0cdecc79"; - sha256 = "1hgdx1rvmfgcy9i2ihpibd1iahpvn2g8g7zyzj9dz4rm8cg1w6ry"; + rev = "eaf97a09b38024d6bc7d44db5734bad16716c66a"; + sha256 = "1inw88n96wki9mja9xvdfc0qpwffh0l0kjnxpka5636sl7pl4i74"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6748f3febbe2f098761e967b4dc67791186d0aa7/recipes/evil-snipe"; @@ -19491,12 +19854,12 @@ evil-surround = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-surround"; - version = "20160501.1704"; + version = "20160911.1224"; src = fetchFromGitHub { owner = "timcharper"; repo = "evil-surround"; - rev = "eda6b0d6ca856d66f32b2718887ff02ea5c94d16"; - sha256 = "0nqa5lqr2rplsinxh5nh1qkyl2b7lg64q6pxi2mn3rgvhdq7hrm9"; + rev = "3812140e11a1b30878701cc028a4305ec3280a35"; + sha256 = "076rxzi947jg54l6giss83a22mg87798hl5iygzgb8wway6b7mfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/da8b46729f3bd9aa74c4f0ee2a9dc60804aa661c/recipes/evil-surround"; @@ -19512,12 +19875,12 @@ evil-swap-keys = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-swap-keys"; - version = "20160825.1024"; + version = "20160909.1407"; src = fetchFromGitHub { owner = "wbolster"; repo = "evil-swap-keys"; - rev = "064c7388995803ccf9959e09fe8aaa95c53e001b"; - sha256 = "0nqj70yw0jalw8svkbh46240kr0bhs60yallrribxakiz5iqyb33"; + rev = "54aed57b464905d18bfcf52e3d0e7e5f939aa133"; + sha256 = "03ii6hj226aq6qbhias41miyv59aij24byw8637dbhb68gpff8v1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2abff8e3d54ac13c4fe90692a56437844accca25/recipes/evil-swap-keys"; @@ -19656,6 +20019,27 @@ license = lib.licenses.free; }; }) {}; + evil-tutor-ja = callPackage ({ evil, evil-tutor, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "evil-tutor-ja"; + version = "20160916.1832"; + src = fetchFromGitHub { + owner = "kenjimyzk"; + repo = "evil-tutor-ja"; + rev = "99af7d82e02ce3bcdfaff47c5c80b57327a7ea8d"; + sha256 = "1cms98cy4p5dxwfc1zhgdaln8vr2nxzcj0d31imyabb4mwliabfw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2c98605fd21b38aaa200c6a0ec4c18f8575b0d7a/recipes/evil-tutor-ja"; + sha256 = "1yd8aij9q1jdmb387f1zjiq5mf68jvbgbyp5b49hmag4hw5h7vm2"; + name = "evil-tutor-ja"; + }; + packageRequires = [ evil evil-tutor ]; + meta = { + homepage = "https://melpa.org/#/evil-tutor-ja"; + license = lib.licenses.free; + }; + }) {}; evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }: melpaBuild { pname = "evil-vimish-fold"; @@ -19701,12 +20085,12 @@ evil-visual-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "evil-visual-replace"; - version = "20160731.508"; + version = "20160923.2243"; src = fetchFromGitHub { owner = "troyp"; repo = "evil-visual-replace"; - rev = "867d1175f84cb49f31e6b74b005ce1acb4e597ee"; - sha256 = "01j9dz6b187h154aj2p2201qa6mgv2960wa2fx8i349sna1akr04"; + rev = "65293924a42c94bd6ea788caf5a33330eb78d7a5"; + sha256 = "1rhsrfd6mb3bm80yqzaangq8i2snlv2m8ia7mawnn7d4hvjk8z8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/165aea6697a6041bb83303f3ec8068a537accd4a/recipes/evil-visual-replace"; @@ -19810,8 +20194,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "exec-path-from-shell"; - rev = "9700a076a932d4c8bc92d9e12f21978232056373"; - sha256 = "11w0wn2q7c80h8czkbipp5j5vgj47jx0azfqk6xpw66dh4205zp3"; + rev = "5836fb1656493be4152e8f20b5b0ec3d49ca2787"; + sha256 = "1laii7pvw18pp71r0fssw67lgw7wb5wqbjrpdrg5xr7smx8fxccc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3d8545191031bece15cf1706d81ad1d064f2a4bd/recipes/exec-path-from-shell"; @@ -20014,12 +20398,12 @@ ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ez-query-replace"; - version = "20140810.517"; + version = "20160908.1329"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ez-query-replace.el"; - rev = "1c0cab96d65105b780e32fdd29d2c6933be72ef6"; - sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi"; + rev = "4b3c6212dc8141a1f75d258e70657b62e4c96ab3"; + sha256 = "0a1cgcbh969lchkqqxlxzg8rgdf1yiwaf1d15fk2z489lklqn5sx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c40808c7687ace84e4c59bf8c25332c94b6fdd76/recipes/ez-query-replace"; @@ -20035,12 +20419,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "20160909.829"; + version = "20161002.800"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "e055e3dd404c8a7cc7849a0e6fd8aade714c5355"; - sha256 = "1n9v2ackd86xbl0msnrvrfxp1qacydz9n0zjxm328jxlvj4h35rx"; + rev = "cc9adc134c1eedab88147b65723800d76aa1efa2"; + sha256 = "0c772p7jjx86z7i3qfqyfbwba7zjiw3q1kaa4k1y5p8jpdhrv5bn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f"; @@ -20194,12 +20578,12 @@ faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faff-theme"; - version = "20160424.852"; + version = "20160928.741"; src = fetchFromGitHub { owner = "WJCFerguson"; repo = "emacs-faff-theme"; - rev = "66d67b355c8be03483fbf4519daff698870cb165"; - sha256 = "1iv9xnpylw2mw18993yy5s9bkxs1rjrn4q92b1wvrx1n51kcw2ny"; + rev = "cdac27efa1ed24c536b26df70476405e78c1de5e"; + sha256 = "1hwypmqn3q14kw9ayd89nfnk92m5k4anzi4d2sxi54sjxdl02lwn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b35c169fe56a5612ff5a4242140f617fdcae14f/recipes/faff-theme"; @@ -20383,12 +20767,12 @@ faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "faust-mode"; - version = "20160119.920"; + version = "20160930.222"; src = fetchFromGitHub { owner = "magnetophon"; repo = "emacs-faust-mode"; - rev = "de3015c23aa26e8242e69293f0e2966b329b7dcf"; - sha256 = "0m9nzl0z3gc6fjpfqklwrsxlcgbbyydls004a39wfppyz0wr94fy"; + rev = "41379dd52a8be01cdfac06996ea1593877fdaf58"; + sha256 = "0q624nm9wfyg95wybi542bx8pdpqk9vibyb6b9fin4mw102nah9j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31f4177ce35313e0f40e9ef0e5a1043ecd181573/recipes/faust-mode"; @@ -20687,12 +21071,12 @@ find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "find-file-in-project"; - version = "20160809.526"; + version = "20160909.1355"; src = fetchFromGitHub { owner = "technomancy"; repo = "find-file-in-project"; - rev = "a32ab79cfef0e1c5c8d9055fb99d9cad005815de"; - sha256 = "0gdsribyrvapinjkpm773rdn6sbrr9gsydpss5jw4p9a16nkl8a5"; + rev = "e2de1f221635910f5f4d9211bd709cb72281ac2d"; + sha256 = "1r5a6h440zg4lwjd68jp4g7gskgzwvgdm4nqc2476l71yv1ifg1p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/find-file-in-project"; @@ -20954,12 +21338,12 @@ fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fish-mode"; - version = "20160429.2057"; + version = "20160924.1207"; src = fetchFromGitHub { owner = "wwwjfy"; repo = "emacs-fish"; - rev = "0bab96b8e2f5bd5012f874b10582f12c1d18b753"; - sha256 = "0z0ji88mdp3xm5lg3drkd56gpl4qy61mxh11i09rqiwmiw0lp1vm"; + rev = "d8b3493623ad834cb18f7de957dfbd17e2fba3ba"; + sha256 = "16x8fv8yl9wxmrxh4p7npixrh36vdwdc2n6paly0swlmj9a2j399"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/efac97c0f54a3300251020c4626056526c18b441/recipes/fish-mode"; @@ -20974,10 +21358,10 @@ }) {}; fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "fit-frame"; - version = "20151231.1314"; + version = "20161002.912"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/fit-frame.el"; - sha256 = "082c6yyb1269va6k602hxpdf7ylfxz8gq8swqzwf07qaas0b5qxd"; + sha256 = "1v4c3l2lcglrvcqk27amrpg29rnn6009w968sf6kdab8k2yz5f4b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e13c77f822db3c9eaeb3fd5fa95cc2dbe5133f2c/recipes/fit-frame"; @@ -21018,8 +21402,8 @@ src = fetchFromGitHub { owner = "jonnay"; repo = "fix-muscle-memory"; - rev = "df687aea23c6eac4b751f993893c2fd56e5a8a3b"; - sha256 = "02nl4vz6fnbjc7w1lk1y9z0qw5bsxr407ww0b2wqw6h8spmcpcrc"; + rev = "a123e04f8a1d2982cbf930efb909cad9522ac884"; + sha256 = "0mm6dl7017x5l43jf89w4nn5hcyi4fm160d2rcqx5w6dwb6f0v27"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c6b0501714a6d82657b88d11e3f79d75eea17d8e/recipes/fix-muscle-memory"; @@ -21210,11 +21594,11 @@ flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flex-isearch"; - version = "20130508.1503"; + version = "20160926.1630"; src = fetchhg { url = "https://bitbucket.com/jpkotta/flex-isearch"; - rev = "bb9c3502057d"; - sha256 = "02z1w8z9fqdshyyf03c26zjwhmmclb02caw3b6nhhk4w1rkbh6is"; + rev = "6a54f37be01f"; + sha256 = "19wcfpgd5qrh3sbybrxvd1hx34j85y34dy19yb80nlh2nha2n5sk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/flex-isearch"; @@ -21374,12 +21758,12 @@ flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }: melpaBuild { pname = "flycheck"; - version = "20160904.1622"; + version = "20160930.944"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck"; - rev = "f0f31ecb7a08111961961a0455f02d094c115619"; - sha256 = "1ibrdzhbpwlfgaq5rf15177c7ahramgxmjbagwp54m5n3r6rmiz7"; + rev = "c6fc7237f55cc61cced7a400f331491333b1f2a9"; + sha256 = "1b38rr6ad2qg17v0vdmxfp1859m1aavns7zw9d7jgbb5cv63rx14"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/649f9c3576e81409ae396606798035173cc6669f/recipes/flycheck"; @@ -21458,12 +21842,12 @@ flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-cask"; - version = "20160815.1200"; + version = "20160928.226"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-cask"; - rev = "13eaae7e8ac14412433ab9eafc651a63bbd1c427"; - sha256 = "1d486bgkn4mmffy4h61q9cphqfjrvcdsm54gmp28h1bvbnk3krjw"; + rev = "c3a51147eddeb7347de81f6a498fc96538bac499"; + sha256 = "1jw8n6df2hpnjrsqzdd70j0ya3yjzkcy5gm6zx9acqfx88zlgb9m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/43224eef52bb316102fea524ba87b0e9e43dc6e6/recipes/flycheck-cask"; @@ -21584,12 +21968,12 @@ flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-css-colorguard"; - version = "20151122.147"; + version = "20161002.242"; src = fetchFromGitHub { owner = "Simplify"; repo = "flycheck-css-colorguard"; - rev = "8c2061c11d5465eec77ad471bef413eb14d122da"; - sha256 = "073vkjgcyqp8frsi05s6x8ml3ar6hwjmn2c7ryfab5b35kp9gmdi"; + rev = "d42f5e17d9991604da2200afd4af2e1cc48533f0"; + sha256 = "09p3dclx9pq0b4i005gjyg5qqlcls65f3qkkym1sny2jmd9nrg61"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f413cc5c2080091491a986f69402b305abe4a7f/recipes/flycheck-css-colorguard"; @@ -21819,8 +22203,8 @@ src = fetchFromGitHub { owner = "favadi"; repo = "flycheck-gometalinter"; - rev = "2e863429cc953cf4c14783e249df56d1ae669868"; - sha256 = "07r2csy2psflvg0pl6n9scfwhnp9mv7hs02hz861v5kbkfx0ajzw"; + rev = "33cc9c2d7101e0448e5e49e23487c50df163f7db"; + sha256 = "0fjm1ll2958rjs2kzn8zgdl9ifjah6rrcsgfb1razbhf57qwbc0i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bfe9f2d030c04fb292297eb9226072bfea2ac64/recipes/flycheck-gometalinter"; @@ -21878,12 +22262,12 @@ flycheck-hdevtools = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-hdevtools"; - version = "20160109.1814"; + version = "20160926.2"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-hdevtools"; - rev = "ee311ac8d8be5803f13c649b8260839c0024e729"; - sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb"; + rev = "53829f0c57800615718cfce27ffa16d8ba286cee"; + sha256 = "1isx9v5xx35pglmhyhpmpg7axw0krmnl0n2qiikf499z7dd35wyn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9e210eb2405cc85dd1d03e9119d2249178950398/recipes/flycheck-hdevtools"; @@ -21924,8 +22308,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-ledger"; - rev = "78392ba2c0c177c47bb795a1a191c29846837f57"; - sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv"; + rev = "cba408d61e26cf7c31c4a6f82a28a3a32e145c05"; + sha256 = "0ysc2hwz0xmmlwfwd70nfqvd81dvf4gfrynkrfgg9w6hp7y4z522"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc715e6849aa5d6017e2478514c4a0d84c7ddbe5/recipes/flycheck-ledger"; @@ -22067,12 +22451,12 @@ flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-package"; - version = "20160502.135"; + version = "20160921.1826"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "aeae7de23483a44126740f452e79266fc6fd0d9b"; - sha256 = "1x5lk6fdai5jvq4hlcgb88ljjncwkq1lkqs8d3wkqwyc3kh3rwjg"; + rev = "f6efe48411b695bf1db62d00b3697818dbd60b65"; + sha256 = "1qq2vbks6c42114s1saq9g185b1r9z1k4gih4acxsdjw2vid4pj6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -22155,8 +22539,8 @@ src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-pos-tip"; - rev = "2ad60d92610596672b830328b5837b58350ca7cf"; - sha256 = "0wca22jp0alknmllfl22j89aasiwms6ipqyv1pnvbrgmrbzcmlp7"; + rev = "2a92f6e2f8cf6a1019358c69c14c7ca835d02955"; + sha256 = "017869kcd4cjyv0hx4pkpfln96cxp6ra4ps7rx6xwrxa24f0bhrz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/698843f75e17b9e6160487c0153f9d6b4af288f6/recipes/flycheck-pos-tip"; @@ -22232,22 +22616,22 @@ license = lib.licenses.free; }; }) {}; - flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }: + flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }: melpaBuild { pname = "flycheck-rust"; - version = "20160816.236"; + version = "20161002.543"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-rust"; - rev = "2a0fb6bb82785fc717b0acc7427e801b08a13017"; - sha256 = "0dyjamgmgdj0sw9l7ay9s4akba95n0apnza4l5qcbkmz28qw6gz5"; + rev = "737ca5faa159d1a7788f4bf52cb33ee79b1e4225"; + sha256 = "0235dj863cdh1pysrgj10dkc4fhvpgbpxj6gj97lfb0fchbavypc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68d8cdf3d225b13ebbbe5ce81a01366f33266aed/recipes/flycheck-rust"; sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w"; name = "flycheck-rust"; }; - packageRequires = [ dash emacs flycheck let-alist seq ]; + packageRequires = [ dash emacs flycheck seq ]; meta = { homepage = "https://melpa.org/#/flycheck-rust"; license = lib.licenses.free; @@ -22295,15 +22679,36 @@ license = lib.licenses.free; }; }) {}; + flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-swift"; + version = "20160921.1921"; + src = fetchFromGitHub { + owner = "swift-emacs"; + repo = "flycheck-swift"; + rev = "822d1415eabfd464adc52063f9c44da1c87f0ff9"; + sha256 = "0gf7cxrsrf62kamm4xy1fi4v264szm6qk607ifg4bi5dmdc10b0k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift"; + sha256 = "1s6rn4wyz9la6bw228jfxx8dxjyk5hf8r3vbmq0k808p772zki0z"; + name = "flycheck-swift"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-swift"; + license = lib.licenses.free; + }; + }) {}; flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; - version = "20160622.1906"; + version = "20160908.1953"; src = fetchFromGitHub { owner = "yuutayamada"; repo = "flycheck-tip"; - rev = "2e8ec9818f25c57516c48612f8b0963df177123d"; - sha256 = "0dblxsny6immyg9l1mraahqipbbybg3drny87gl5vsvqpd94g4px"; + rev = "53e812ae6d517e8d35907eed8ddcee95c2922e91"; + sha256 = "180c9q273k8167kfkfkvgsadprr34irnmb4qx8ksr3dmg77ghpc8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/024f1e588e94014734fa252ee7bdb00b4991ede9/recipes/flycheck-tip"; @@ -22319,12 +22724,12 @@ flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, ycmd }: melpaBuild { pname = "flycheck-ycmd"; - version = "20160808.754"; + version = "20160913.130"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; - sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; + rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098"; + sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/332e5585963c04112a55894fe7151c380930b17c/recipes/flycheck-ycmd"; @@ -22995,8 +23400,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "e9a80346ff306e8512930596069257a59393ecee"; - sha256 = "0gryvd3c6k1kjk1aqrhdkz1va4515sf4ljc82m8c72clln3378zz"; + rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; + sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -23016,8 +23421,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "e9a80346ff306e8512930596069257a59393ecee"; - sha256 = "0gryvd3c6k1kjk1aqrhdkz1va4515sf4ljc82m8c72clln3378zz"; + rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; + sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -23037,8 +23442,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "e9a80346ff306e8512930596069257a59393ecee"; - sha256 = "0gryvd3c6k1kjk1aqrhdkz1va4515sf4ljc82m8c72clln3378zz"; + rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; + sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -23058,8 +23463,8 @@ src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "e9a80346ff306e8512930596069257a59393ecee"; - sha256 = "0gryvd3c6k1kjk1aqrhdkz1va4515sf4ljc82m8c72clln3378zz"; + rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; + sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -23510,6 +23915,27 @@ license = lib.licenses.free; }; }) {}; + forth-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "forth-mode"; + version = "20161003.541"; + src = fetchFromGitHub { + owner = "larsbrinkhoff"; + repo = "forth-mode"; + rev = "039bf122ee7412a29b1283bb23d8687aa07c22cd"; + sha256 = "1f1c37d5vlpj3ach1qpc43ay399vvcv52dn1nm2mz8l0q1916sz2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d1c8b5b9fe8f17905de801f5d7dea28ca73daa4e/recipes/forth-mode"; + sha256 = "09arqyzsfiqblpxb6kv1nwcdr1ify96814jvxrqwkd20rxx1d79j"; + name = "forth-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/forth-mode"; + license = lib.licenses.free; + }; + }) {}; fortpy = callPackage ({ auto-complete, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, python-environment }: melpaBuild { pname = "fortpy"; @@ -23555,12 +23981,12 @@ fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fountain-mode"; - version = "20160901.2339"; + version = "20160930.642"; src = fetchFromGitHub { owner = "rnkn"; repo = "fountain-mode"; - rev = "a31c19e88f403a8ebb2e6a5d27eef39fca595ba4"; - sha256 = "1sxr79gcj2xkh8qfp0h4r6iqmhm27qkibsk8l78gi2n3790sbnxk"; + rev = "57567cfa879acef36e396138795a48c4405023ed"; + sha256 = "0g0br07v1lxw8sdsprsgn2hc9gmskqgjb74pin4riwja1wvgdpc7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/913386ac8d5049d37154da3ab32bde408a226511/recipes/fountain-mode"; @@ -23775,6 +24201,27 @@ license = lib.licenses.free; }; }) {}; + fsbot-data-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fsbot-data-browser"; + version = "20160921.833"; + src = fetchFromGitHub { + owner = "benaiah"; + repo = "fsbot-data-browser"; + rev = "6bca4f7de63e31839d2542f6c678b79931dec344"; + sha256 = "0lvpgfp89sz6f6rn576g1g88s0q3ibj5ghydjwfcg9w6h7vx5b5s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser"; + sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5"; + name = "fsbot-data-browser"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fsbot-data-browser"; + license = lib.licenses.free; + }; + }) {}; fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; @@ -23831,8 +24278,8 @@ version = "20160825.254"; src = fetchgit { url = "git://factorcode.org/git/factor.git"; - rev = "98be09e8eab968cfd6c4c8d9ed0d894297aea82e"; - sha256 = "0gyfi59rd61sxpgw0dz6xk5n2ickrxisgwh443zx9jainjrqk5f9"; + rev = "78d9065db0ad87041b519b888f729f820ea49f9f"; + sha256 = "05c6z9bwmyn110940wbglf74rcgs7v1vgf3ixfhm0xk2nvzrplf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0c3633c23baa472560a489fc663a0302f082bcef/recipes/fuel"; @@ -24073,12 +24520,12 @@ fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fzf"; - version = "20160714.557"; + version = "20160908.806"; src = fetchFromGitHub { owner = "bling"; repo = "fzf.el"; - rev = "022798e6ed0d03fcb896635d7322f0b79f6463ff"; - sha256 = "1vc0lh6cr3d7fyg7w400750glk3jfas0y58qxh2wdsnfj8qvarc3"; + rev = "383a050920e9b99d37c21d041deb7f38b202485c"; + sha256 = "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1671e17c99ef1932c6a2e83fc4fa2e4eb6674bc8/recipes/fzf"; @@ -24180,8 +24627,8 @@ src = fetchFromGitHub { owner = "ahungry"; repo = "geben"; - rev = "7a125456d3aa97c9217520da6893421804559884"; - sha256 = "1k4lrj261p2kafqbkvw7ghnqvm9xkfkvff5cx9m244ay14g6n7ny"; + rev = "7ed838f1c91f10a590a2236dddcd09aea2f5747f"; + sha256 = "0cpmywngrb0fp5bpfy54xfh3f96hgkv79w7chc6riadapm2yvxz7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f8648609e160f7dcefe4a963e8b00475f2fff78/recipes/geben"; @@ -24239,12 +24686,12 @@ geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "geiser"; - version = "20160906.450"; + version = "20161001.1854"; src = fetchFromGitHub { owner = "jaor"; repo = "geiser"; - rev = "219abf6230d1379eb302725f28461fda8405b5e3"; - sha256 = "1a9fba0v5w9wph4w8l1nvwvbqllbd242qhwwmzdknlcmdrxddkm6"; + rev = "e6535d461bc33ee0d7353b722f2fd5f8ee2bb2e5"; + sha256 = "17p3qwj5qyx5sql09slf9pwghiljlfx3ndkh1izbbqhc5m410r2f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b0fe32d24cedd5307b4cccfb08a7095d81d639a0/recipes/geiser"; @@ -24260,12 +24707,12 @@ general = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general"; - version = "20160621.1258"; + version = "20160923.1826"; src = fetchFromGitHub { owner = "noctuid"; repo = "general.el"; - rev = "6dd637debd7ef37925ec5e4bd2da4626b8c075b0"; - sha256 = "1h6f46hlmim17zn2y2c5lqpn4nxzbprqiz5jl5dh3rr37l6qm4iz"; + rev = "86a0c0e3c41036c7f525f89ad65590c7a97aaa61"; + sha256 = "0gdw02za93w93jmcx9xpgcv30yrfd0bkyvgg8jdam83fb380p6v6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d86383b443622d78f6d8ff7b8ac74c8d72879d26/recipes/general"; @@ -24281,12 +24728,12 @@ general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "general-close"; - version = "20160907.532"; + version = "20160921.520"; src = fetchFromGitHub { owner = "emacs-berlin"; repo = "general-close"; - rev = "e8913a9f57cde590cd932704ba6efd7429572435"; - sha256 = "0djf7rz918z2xchf05ir8q0jc1zmrdvvmpmhl8a8qfav9146ffi3"; + rev = "4544040b3498d7f734ecce251708cd70089cd63b"; + sha256 = "07gh8awa37g7kyj3z44ffir98l5rk5zpk19a59b9s9jmkz1zixhg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/641a48f5148df2a19476c9b3302934a604f5c283/recipes/general-close"; @@ -24386,12 +24833,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "20160617.1840"; + version = "20161001.1836"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "b4ee572a6b2e70d3db6ce11f73e6f87b73a13273"; - sha256 = "07gbnymgc6lfv1vd37kqfm5bwg5zn5603fs2amrcc6jz3jyqfn0p"; + rev = "7a7ee76a8055531482927e6abf7e0ef676165dd2"; + sha256 = "1kyg26wdimy5k5icglgqg9gdfvzkgk4xis12nx1xkh01j2imzl97"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -24453,8 +24900,8 @@ src = fetchFromGitHub { owner = "DanielG"; repo = "ghc-mod"; - rev = "8be4cdfe5f051f29a2488baae8a106a914d83ba8"; - sha256 = "10f5492r6pb203669zgpy49csz2jfmjxp53pnyk2rwyzfy0ci3v6"; + rev = "b7cda9e9b9515ac2cbf8a0cf0ffe7cd4ba52844b"; + sha256 = "183ssyryfqzz4dacirkfn6ycigsm6mfvr6mx4hivav9jzyrd9n7x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/ghc"; @@ -24743,12 +25190,12 @@ git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }: melpaBuild { pname = "git-commit"; - version = "20160821.1338"; + version = "20160929.801"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; - sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; + rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83"; + sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/git-commit"; @@ -24827,12 +25274,12 @@ git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }: melpaBuild { pname = "git-gutter-fringe"; - version = "20160520.1656"; + version = "20160929.854"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-git-gutter-fringe"; - rev = "dfc93d1064df154a809aab350942830408051da3"; - sha256 = "18jpa5i99x0gqizs2qbqr8c1jlza8x9vpb6wg9zqd4np1p6q4lan"; + rev = "dbcaaba83a5fc3e23a735e871e8f31068b92228a"; + sha256 = "1wklzf8vdsjpzs26xg8d97zq6fddw9hbrkd5npi3qwjmjl1xccws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/git-gutter-fringe"; @@ -24911,12 +25358,12 @@ git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "git-link"; - version = "20160813.1502"; + version = "20160911.1640"; src = fetchFromGitHub { owner = "sshaw"; repo = "git-link"; - rev = "b9e197419b1d71c7190c2e7cb14b89d9e6759ab2"; - sha256 = "0f10qqmjaxy29qw86a85kjshyj8wc5dldymm8i89l3hb9s9iv260"; + rev = "f5b62320b45cfdfaf8db5b4e91f536bf0043ff0f"; + sha256 = "1s18x9cnmx4jjgyi7jnsg4qsvjlxq9aablg5c3z458w2fh25h3rg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1385443585e628e3d4efb3badb7611e9d653e0c9/recipes/git-link"; @@ -25118,6 +25565,27 @@ license = lib.licenses.free; }; }) {}; + github-elpa = callPackage ({ commander, fetchFromGitHub, fetchurl, git, lib, melpaBuild, package-build }: + melpaBuild { + pname = "github-elpa"; + version = "20160922.907"; + src = fetchFromGitHub { + owner = "10sr"; + repo = "github-elpa"; + rev = "2c813e0092acbe2fdeccece6f57d2a95ff85e0cd"; + sha256 = "0dlndpybh166dkjqcbqw2qwqqa9dc8g974nijyas74gi17zw93q9"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa"; + sha256 = "1981dnz49l5r4qsn49i4dhy6x4ln0haff6gl2zx0p5p0zfkzbi7x"; + name = "github-elpa"; + }; + packageRequires = [ commander git package-build ]; + meta = { + homepage = "https://melpa.org/#/github-elpa"; + license = lib.licenses.free; + }; + }) {}; github-issues = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "github-issues"; @@ -25167,8 +25635,8 @@ src = fetchFromGitHub { owner = "IvanMalison"; repo = "github-search"; - rev = "1a5c1f8291f4d41e57367a8522699cb08eea8fc4"; - sha256 = "1382hda3hgpx3c3d1kjzz8hs4l5hi3s7c485hsgihhr6xdd5wrgm"; + rev = "24435772bf8c2c55b4f228917a1344d785851e2a"; + sha256 = "1863g5gphlz1xr465r9nplf5n3ajz1b6girswf3fv1gk8xl1swjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/733a808400858513137e0e3d7d38b5b25e8ddc5a/recipes/github-search"; @@ -25205,12 +25673,12 @@ gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "gitlab"; - version = "20160519.303"; + version = "20160909.56"; src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "2ed2e36dd023c12545f00b41d01bca326048656e"; + sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/gitlab"; @@ -25244,6 +25712,27 @@ license = lib.licenses.free; }; }) {}; + gitter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }: + melpaBuild { + pname = "gitter"; + version = "20160916.1128"; + src = fetchFromGitHub { + owner = "xuchunyang"; + repo = "gitter.el"; + rev = "18dcb779350367af49d34b4a1c6c3f576657c327"; + sha256 = "1rwxq13i0cpcf55lfmycdy1igyqg58w9g7cjrksfadp06w74k84p"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b8076c3b4d60e4c505bb6f4e426ecc4f69d74684/recipes/gitter"; + sha256 = "1ad5abqgfh6x2fcqbbdvgbg8xin69j0h93z7bav1hs3jla7mgwnv"; + name = "gitter"; + }; + packageRequires = [ emacs let-alist ]; + meta = { + homepage = "https://melpa.org/#/gitter"; + license = lib.licenses.free; + }; + }) {}; gitty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gitty"; @@ -25436,12 +25925,12 @@ gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gnu-apl-mode"; - version = "20160805.36"; + version = "20161003.332"; src = fetchFromGitHub { owner = "lokedhs"; repo = "gnu-apl-mode"; - rev = "ba0d4d4815361e0af67d956d00880cad10553239"; - sha256 = "19jkryr60acls0bbhw3223xdjj37bi1ky8glw7zwhapbln52bgqr"; + rev = "783dd54a2e44dd143a2b2e427b17fa431806af4e"; + sha256 = "08fh3h4ly7zjzcnsgmpbcd5kvpmsz1ihmhiil9c38cr8acysgpzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/369a55301bba0c4f7ce27f6e141944a523beaa0f/recipes/gnu-apl-mode"; @@ -25619,6 +26108,27 @@ license = lib.licenses.free; }; }) {}; + go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "go-add-tags"; + version = "20161003.1549"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-go-add-tags"; + rev = "14865351e15a4a6d3bfbcae7a17c84435d308b00"; + sha256 = "18phz9ysyspcpb3h4lc079wy5sarxzfkg4ycz1wg0yx21r107vjh"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags"; + sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim"; + name = "go-add-tags"; + }; + packageRequires = [ cl-lib emacs s ]; + meta = { + homepage = "https://melpa.org/#/go-add-tags"; + license = lib.licenses.free; + }; + }) {}; go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-autocomplete"; @@ -25626,8 +26136,8 @@ src = fetchFromGitHub { owner = "nsf"; repo = "gocode"; - rev = "46e8fd2234a86934e3e8496c7405984ff7b18df5"; - sha256 = "1r8fh3mi5dywxx6qz2r9cnhnsxdcb52p168bfnadw17g9ps550ms"; + rev = "7a0b9e99156df54d06a720e3a2a9f55618e5a25a"; + sha256 = "0hlbga620b2mr03vnrgmz8yd0n3sviyz03idz2jwbrrlk50qsbkl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/go-autocomplete"; @@ -25772,8 +26282,8 @@ version = "20160715.854"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "9deed8c6c1c89e0b6d68d727f215de8e851d1064"; - sha256 = "10pj8yilyk8mgflmql09qfqbp7lyfqdpf9y9v099bz70vyw7is24"; + rev = "fc2b74b64ef08c618146ebc92062f6499db5314c"; + sha256 = "0f5nx76iqr86x0bi4v06yr7x7p74n3azhhp68441w0c7cq7wsdra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/816a2511c54e451313c7ac9433d0860f95e68da6/recipes/go-guru"; @@ -25810,12 +26320,12 @@ go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-mode"; - version = "20160715.205"; + version = "20160913.944"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-mode.el"; - rev = "737611ee2f8ffd6ae573e37cc04c4ad4abe7697d"; - sha256 = "0wljlakm6gjgjrvinpi7vgs1n08xj87cvqq149gzzjwa9dq2gk15"; + rev = "004575eb128ab01a11b4a4d278c544f91cf752fd"; + sha256 = "0il6hbk1lvmqb6c45zima372g7my14bm13c9mlcsxghpp0hs1fj4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a9d94efc1a0cedaaa0a1acd1227b2530efefca2/recipes/go-mode"; @@ -25897,8 +26407,8 @@ version = "20160307.744"; src = fetchgit { url = "https://go.googlesource.com/tools"; - rev = "9deed8c6c1c89e0b6d68d727f215de8e851d1064"; - sha256 = "10pj8yilyk8mgflmql09qfqbp7lyfqdpf9y9v099bz70vyw7is24"; + rev = "fc2b74b64ef08c618146ebc92062f6499db5314c"; + sha256 = "0f5nx76iqr86x0bi4v06yr7x7p74n3azhhp68441w0c7cq7wsdra"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/421911dd75eec0f857295b76d310b8282053b57f/recipes/go-rename"; @@ -25974,6 +26484,27 @@ license = lib.licenses.free; }; }) {}; + gobgen = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gobgen"; + version = "20160928.2013"; + src = fetchFromGitHub { + owner = "gergelypolonkai"; + repo = "gobgen.el"; + rev = "20ac2dff2eab2184c487393f334d5c8a660c4151"; + sha256 = "003in5qpc0qq8vy20psnfc9cdahrbkfc4xkl3ivb8mhbpkwh3398"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8c9fed22bb8dbfb359e4fdb0d802ed4b5781f50d/recipes/gobgen"; + sha256 = "0fb0q9x7wj8gs1iyr87q1vpxmfa2d43zy6cgxpzmv2wc26x96vi7"; + name = "gobgen"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/gobgen"; + license = lib.licenses.free; + }; + }) {}; god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "god-mode"; @@ -26065,8 +26596,8 @@ src = fetchFromGitHub { owner = "golang"; repo = "lint"; - rev = "c7bacac2b21ca01afa1dee0acf64df3ce047c28f"; - sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; + rev = "64229b89515c2a585c623c79a7ccdea71e8589ff"; + sha256 = "05wjfps01hc5y8pc26lf4iq887jjvdqdkr1w2h6q8783dl0608n5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/34f22d829257456abbc020c006b92da9c7a7860e/recipes/golint"; @@ -26128,8 +26659,8 @@ src = fetchFromGitHub { owner = "google"; repo = "styleguide"; - rev = "6d3a7d8a229e189f7a5bb7c3923363356625ece5"; - sha256 = "1yzx5zk91cyl3j0xf6a8nq6m9yx76x9icyzy8x226sch1y8k9jy9"; + rev = "71ec7f1e524969c19ce33cfc72e8e023f2b98ee2"; + sha256 = "0y7pgd05wbaxlc946gmly5l4jyhvh6w6aznz5cxip4vpka8s8ab7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/google-c-style"; @@ -26208,12 +26739,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "20160824.1707"; + version = "20160909.1358"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "7e156e840d597f413ef3debd7629adf8de63da5d"; - sha256 = "1yf7z7mwn4qq9q1phiap565nvs8yrw7p1y8i7wwi2xbi91mjc232"; + rev = "a1e95d9f01550b5170db052887be3d45482dddc1"; + sha256 = "1w81wxv3yyhrzbj2f7s8nfcw3w5j5ijjfzqsm5z0bjvkvcp4nbm4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -26373,12 +26904,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "20160808.1810"; + version = "20160909.1241"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "582151d8d15324ce497ee6d7c0297b2fd27701d5"; - sha256 = "15g4p7hjimnapcdrl8r1cixjyj3glqw2fribk8mws3f4sbihw952"; + rev = "b932baf416e9101c762b7075f12af5a6fb364627"; + sha256 = "18xmhdlm94p1b1jnj2mvj2dhjcgdm9cklksgp3qifwwph9xlyrh8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -26541,12 +27072,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "20160906.810"; + version = "20160922.640"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d"; - sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7"; + rev = "14ec10937720bc91bb2f5e1c1e2c124d8a43a9d6"; + sha256 = "03990wbrc56sm4qzc2nsjj3q96vx1ipjivdhqfy8s6sy9r1msa86"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -26740,10 +27271,10 @@ }) {}; grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "grep-plus"; - version = "20160212.625"; + version = "20160923.1514"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/grep+.el"; - sha256 = "08jl4xhh25znyc6cm7288x4b55pykrpcsyym78fdlrw3xxr77cxs"; + sha256 = "17ly744dcnir98mk48prgmia7v7dpvp73l9kkni9vdz4lw5mapxj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/grep+"; @@ -26817,6 +27348,27 @@ license = lib.licenses.free; }; }) {}; + groovy-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: + melpaBuild { + pname = "groovy-imports"; + version = "20161003.151"; + src = fetchFromGitHub { + owner = "mbezjak"; + repo = "emacs-groovy-imports"; + rev = "e56d7dda617555ec6205644d32ffddf2e1fa43d9"; + sha256 = "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b18a6842805856062e9452dc32bf0fd458f7d51a/recipes/groovy-imports"; + sha256 = "09yjkwsm192lgala1pvxw47id4j7362sl3j1hn9ald2m8m3ddyfs"; + name = "groovy-imports"; + }; + packageRequires = [ emacs pcache s ]; + meta = { + homepage = "https://melpa.org/#/groovy-imports"; + license = lib.licenses.free; + }; + }) {}; groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "groovy-mode"; @@ -26883,12 +27435,12 @@ gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gruvbox-theme"; - version = "20160907.315"; + version = "20160917.2225"; src = fetchFromGitHub { owner = "Greduan"; repo = "emacs-theme-gruvbox"; - rev = "b0e67e42a44374be7176e199414a40309cd8d6fb"; - sha256 = "1h2whbp1qqlfgs3z7nxk31jgq7dqhsac8pxamr6wvxpy23wvj9x2"; + rev = "9b0526be614190cfc78d06024b2254802fbc706d"; + sha256 = "0xfansmy336g16smr47bf5pm8allzb6imzbyny4jry2mvk7q74p3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2bd48c87919f64ced9f3add4860751bb34cb5ecb/recipes/gruvbox-theme"; @@ -26925,12 +27477,12 @@ gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "gscholar-bibtex"; - version = "20160701.1627"; + version = "20160929.1218"; src = fetchFromGitHub { owner = "cute-jumper"; repo = "gscholar-bibtex"; - rev = "ed0053be2cedb54c4aeb7a48b51ef775be0689a3"; - sha256 = "10d2qmwva41x9ykfy9csl5isi03q2a5c9nv3239mqyn8cxw9dxrb"; + rev = "0b083af54385d292c1f6b12876f509be15269020"; + sha256 = "12s6zhp3fy37vj53d347rhp3k1kw7hdb37p7wbnr6d1wh7vi0kpx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9fa546d3dce59b07a623ee83e3befe139dc10481/recipes/gscholar-bibtex"; @@ -26985,6 +27537,27 @@ license = lib.licenses.free; }; }) {}; + gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gulp-task-runner"; + version = "20160911.430"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "gulp-task-runner"; + rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2"; + sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; + sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7"; + name = "gulp-task-runner"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gulp-task-runner"; + license = lib.licenses.free; + }; + }) {}; guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; @@ -27030,12 +27603,12 @@ habitica = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "habitica"; - version = "20160828.912"; + version = "20161001.1122"; src = fetchFromGitHub { owner = "abrochard"; repo = "emacs-habitica"; - rev = "eddd0ad1664b305e2b8c05daba3fd37971ee8d24"; - sha256 = "1xwzdlbn19aq66v2b1i5kl6jk9zs6dk07ryy14yws26d1ajvm8rg"; + rev = "868893474ebe8bd58d799dd1d065230cf1ac1e8c"; + sha256 = "0msp9h8xzgpbdydihsgsbijxcw8gliqrlpnkvb3bd3ra9xp57wrm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cf9543db3564f4806440ed8c5c30fecbbc625fa1/recipes/habitica"; @@ -27387,12 +27960,12 @@ haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "20160827.1033"; + version = "20160925.103"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "80225e09bf06ab3962b24812f014f948218e0c80"; - sha256 = "1vb6wp35l1vhzlyfs7h5hcnmm2mk47sxxx5waiclmafc7y8j35al"; + rev = "f755c369d1ce22225b7dd7896fcc2620e2235ea4"; + sha256 = "1zjmkq8sxg3vfb9hy85x39anarl8yf1z6p0hl0gg6y10xmvjv7s6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; @@ -27405,22 +27978,22 @@ license = lib.licenses.free; }; }) {}; - haskell-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: + haskell-snippets = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "haskell-snippets"; - version = "20160121.1458"; + version = "20160918.1722"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-snippets"; - rev = "c72e467d77c8c91439522599a741a8b2950fe1e9"; - sha256 = "1wha5f2zx5hr6y0wvpmkg7jnxcgbzx99gd70h96c3dqqqhqz6d2a"; + rev = "07b0f460b946fd1be26c29652cb0468b47782f3a"; + sha256 = "0a7y3awi9hcyahggf0ghsdwvsmrhr9yq634wy9lkqjzrm2hqj0ci"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b5534e58ea66fd90ba4a69262f0b303c7fb85af4/recipes/haskell-snippets"; sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2"; name = "haskell-snippets"; }; - packageRequires = [ yasnippet ]; + packageRequires = [ cl-lib yasnippet ]; meta = { homepage = "https://melpa.org/#/haskell-snippets"; license = lib.licenses.free; @@ -27655,12 +28228,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "20160906.1118"; + version = "20160929.1313"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "97f4d65e4cfb2253ec27a4331570f09e68cb6404"; - sha256 = "1zsmj6j23hy6csh471l0qaj6rg5f7py6dlywla7bkbp152hdimj9"; + rev = "2b91583c4f183b505d4870b4e6d3441d57637eae"; + sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -27739,12 +28312,12 @@ helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-ag"; - version = "20160809.337"; + version = "20160923.2128"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-ag"; - rev = "88e422ad5a76a7a0d8a5cd766d29c22206d8135e"; - sha256 = "0fmhys3ikjcqnsld8fc04d9l0kbb8gs1n3yy06kxf5jzc8cnyi84"; + rev = "7839e04d072e2c86c339f5bb4da61b391e7ad93b"; + sha256 = "0ssallh4rva31sw03088fvv0vm5n0ykrrm1a44jqpi4fx25az11i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-ag"; @@ -27844,12 +28417,12 @@ helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: melpaBuild { pname = "helm-bibtex"; - version = "20160823.900"; + version = "20160928.2345"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "13e04b275d3b9a523d6a9f7fa753fc449f3f5960"; - sha256 = "1l66sn7ancyd9q3jbbhay55rs8zbbd7nh2vv9jdgmpw2lys3xs89"; + rev = "5d8f8488537f3c8ced5803d73dc38bcd30a31ebc"; + sha256 = "1lnmwvhfsmv8yx5v7i5dfcfhiy1grphbmphv9ii2pzzmdj4psk8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; @@ -28033,12 +28606,12 @@ helm-cider = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, seq }: melpaBuild { pname = "helm-cider"; - version = "20160902.2037"; + version = "20160912.1935"; src = fetchFromGitHub { owner = "clojure-emacs"; repo = "helm-cider"; - rev = "375b5666e333398a60e9ddb9a38cad677e2f60a0"; - sha256 = "0vh3whp4qr56ijjkx24g4yis3qvkjgzhzx535hl7kqnrpf4apjry"; + rev = "eab25fb6bc151b467a1d6a16b8d7a9e39f6ccdac"; + sha256 = "1hrvlj38rifyh1fsjcl4l77xlvnjavgff9wx5i6da20zkz2kqzf1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/31d3cd618f2ac88860d0b11335ff81b6e2973982/recipes/helm-cider"; @@ -28201,12 +28774,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "20160906.1004"; + version = "20160929.1313"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "97f4d65e4cfb2253ec27a4331570f09e68cb6404"; - sha256 = "1zsmj6j23hy6csh471l0qaj6rg5f7py6dlywla7bkbp152hdimj9"; + rev = "2b91583c4f183b505d4870b4e6d3441d57637eae"; + sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -28306,12 +28879,12 @@ helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-descbinds"; - version = "20160806.913"; + version = "20160916.713"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-descbinds"; - rev = "7771aa53d4f2828022504132114fa99e178be892"; - sha256 = "0dp540vah2lnza4g1p65ping09jk944fvpq7yp965dj62gsjbjgn"; + rev = "6d5ddc11e6cef86548bd6b3e0d840112d602659c"; + sha256 = "03b79wdcp4im0fwadzhyc8jxl2wqvg8gmpflnznrwz3l71bi4sqq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/447610a05422cd2f35399e43d98bf46410ff0408/recipes/helm-descbinds"; @@ -28331,8 +28904,8 @@ src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm-describe-modes"; - rev = "d2253c7c2bf4f28b9ff8a2d281bd7527c0106527"; - sha256 = "0li9bi1lm5ldwfpvzahxp7hyfd94jr1kl43rprx0myxb016yk2p5"; + rev = "2ce64bf7ad31f13830cabe5f03c3fa8e35c130b7"; + sha256 = "0n5xx7yl7hppdc5nlrj0pchczzrmzvbiiws3n8x7g5dgdwx79hfr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/23f0b2025073850c477ba4646c3821b3c7de6c42/recipes/helm-describe-modes"; @@ -28369,12 +28942,12 @@ helm-dired-history = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-dired-history"; - version = "20160731.645"; + version = "20161003.58"; src = fetchFromGitHub { owner = "jixiuf"; repo = "helm-dired-history"; - rev = "77e60f201aee071dad920e6120aa118d346ee265"; - sha256 = "139kbf2kn64fs6a971kk7gyvbs49007544dxxjx3p1qawrnyc0jy"; + rev = "dd324f383a66a5306ccd0fc3cf7a2c4815f45e8f"; + sha256 = "1xjnblqmk2247c0brbi6byiq3k7d9lz9bb94w9n6j1qyls0flinm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/56036d496c2a5fb1a6b32cdfcd1814944618e652/recipes/helm-dired-history"; @@ -28576,22 +29149,22 @@ license = lib.licenses.free; }; }) {}; - helm-flyspell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + helm-flyspell = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-flyspell"; - version = "20160612.1640"; + version = "20160927.1648"; src = fetchFromGitHub { owner = "pronobis"; repo = "helm-flyspell"; - rev = "2b0d8b4abda322507a5379e2befdf031bca851e0"; - sha256 = "1z5f911w1b173bpnab8ni89s1zba8yfr2qhnrrdxlhgvynwn5jgg"; + rev = "5aeace7004cbb689276fb5056a9935d27593ce8c"; + sha256 = "1jnphdmh6j252bgyxw5jl01wkfwnjrv2j7isnq40xnqs4azjwz80"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8c5b91762d47a4d3024f1ed7f19666c6f2d5ce5/recipes/helm-flyspell"; sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f"; name = "helm-flyspell"; }; - packageRequires = []; + packageRequires = [ helm ]; meta = { homepage = "https://melpa.org/#/helm-flyspell"; license = lib.licenses.free; @@ -28793,8 +29366,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "2ed2e36dd023c12545f00b41d01bca326048656e"; + sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1d012991188956f6e06c37d504b0d06ab31487b9/recipes/helm-gitlab"; @@ -28852,12 +29425,12 @@ helm-grepint = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-grepint"; - version = "20160903.321"; + version = "20161001.713"; src = fetchFromGitHub { owner = "kopoli"; repo = "helm-grepint"; - rev = "ce5bcb435d090bab35344c5abc682dc92aaf4862"; - sha256 = "1ffwn21c1z201q9wcac0d4xj6w4p1lmcg9pgnbs576vabb2mdmxq"; + rev = "a62ca27515ff6a366b89b420500eb16d380cc653"; + sha256 = "1v87v6a34zv998z1dwwcqx49476pvy9g5zml7w5vzfkms0l8l28w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/26446d6a2215bfa622d86837b30f2754dd25eb4c/recipes/helm-grepint"; @@ -28875,14 +29448,14 @@ pname = "helm-growthforecast"; version = "20140119.1944"; src = fetchFromGitHub { - owner = "daic-h"; + owner = "daichirata"; repo = "helm-growthforecast"; rev = "0f94ac090d6c354058ad89a86e5c18385c136d9b"; sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/935d4c6bff4adab531536ab6a695cb690c72e0ae/recipes/helm-growthforecast"; - sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/helm-growthforecast"; + sha256 = "1qlyp263rl0892hr53kgc16jlx3jylw2pplbzlx05a60k5348jjv"; name = "helm-growthforecast"; }; packageRequires = [ helm ]; @@ -28894,12 +29467,12 @@ helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-gtags"; - version = "20160726.844"; + version = "20160917.2238"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-gtags"; - rev = "fb0079054518b966a1b8a42f5d970e5fbc522d37"; - sha256 = "1nw0drvyqdjwdq4q5ypj1pqjvkgmgz64i70r7dnwnyjpgvk3d1dc"; + rev = "1dd22dcc97a593f920f10acd7afd167f0e060f7b"; + sha256 = "0sixfcs6114x9af9m8frjj0cz1krzrm5z704crlfjlbw8a8a16l1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-gtags"; @@ -28978,12 +29551,12 @@ helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-hoogle"; - version = "20150919.32"; + version = "20160913.1022"; src = fetchFromGitHub { owner = "jwiegley"; repo = "helm-hoogle"; - rev = "f4a02784dd7c3f6e8ecda31dea23b2faae260636"; - sha256 = "1l85kip4zd08d38sk7cdafmx0v68dh419cs86g7x0mgi0wn00kfc"; + rev = "882b729b9f0f23d35e808e0dcd51047954486135"; + sha256 = "016s8g87qnhgcs547wf6ynabh6qnc3p38f4h9vrlhwr5lfwb3w5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8ccc21c2acc76a6794aee94902b1bc4c14119901/recipes/helm-hoogle"; @@ -29233,7 +29806,7 @@ version = "20150717.39"; src = fetchsvn { url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el"; - rev = "152395"; + rev = "153526"; sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz"; }; recipeFile = fetchurl { @@ -29313,12 +29886,12 @@ helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: melpaBuild { pname = "helm-mt"; - version = "20160803.713"; + version = "20160917.2152"; src = fetchFromGitHub { owner = "dfdeshom"; repo = "helm-mt"; - rev = "10790691f083c3806c9e85758b7ea73b5e24c5ed"; - sha256 = "1k1jzzxygpmxnj07br7ah2582sdj67vqmipykz7yzrprd8r9c8fw"; + rev = "d2bff4100118483bc398c56d0ff095294209265b"; + sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt"; @@ -29359,8 +29932,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3"; - sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w"; + rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; + sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/helm-nixos-options"; @@ -29418,12 +29991,12 @@ helm-org-rifle = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-org-rifle"; - version = "20160420.818"; + version = "20160926.1239"; src = fetchFromGitHub { owner = "alphapapa"; repo = "helm-org-rifle"; - rev = "598e88f0c0dcb37a0af8ee890be71d8522bd2748"; - sha256 = "0ab083b5n2jxqxbcvrriyw896j3gsb86k3ngwmjvvfk4bdyzgabp"; + rev = "604e473dc2b3e107cc6fb35d10b3326c4591a0dd"; + sha256 = "1rqm28xgp8drwk92n3vfxbm3q2rhl3ziy95l2pps1n240qj7is82"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615/recipes/helm-org-rifle"; @@ -29457,22 +30030,22 @@ license = lib.licenses.free; }; }) {}; - helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + helm-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-package"; - version = "20151210.48"; + version = "20160917.2232"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-package"; - rev = "117f5f26c96c0854aadaf9c52aaec961195d5798"; - sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw"; + rev = "dec1600da71301d14a7c17052286ac4a25378b7c"; + sha256 = "0qg7q01i48x8igfv3sh3gx77af76hj3yrwwc7f878r56k3w9d2ca"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e31f4e01891b6a863a38da45eeea57ec656b5813/recipes/helm-package"; sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y"; name = "helm-package"; }; - packageRequires = [ cl-lib helm ]; + packageRequires = [ emacs helm ]; meta = { homepage = "https://melpa.org/#/helm-package"; license = lib.licenses.free; @@ -29481,12 +30054,12 @@ helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-pages"; - version = "20160321.1913"; + version = "20160929.2141"; src = fetchFromGitHub { owner = "david-christiansen"; repo = "helm-pages"; - rev = "0366be2f89b92edc0d4a8c5f0f0e8674e0124d0c"; - sha256 = "1dyi3rs72jl7739knnikv8pawam54k0sxz5a4a33i6s2bg3ghxcd"; + rev = "002ee736e082f792aa3f66b040902c19b81d2b5e"; + sha256 = "1lbhdwpqzj5z8yi3qma9r7p7ar2diz2qyi56mvm5qmjmnq7nqpwr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7a33cb19b6e71240896bbe5da07ab25f2ee11f0b/recipes/helm-pages"; @@ -29520,22 +30093,22 @@ license = lib.licenses.free; }; }) {}; - helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-perldoc = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-perldoc"; - version = "20160712.2137"; + version = "20160917.2256"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-perldoc"; - rev = "90a0ce4d2f4c77c486869ed3ecdbcb3f2014005e"; - sha256 = "0xkxl07y9z6zdh41m3dg9q35df2lsgbp298svlfygdm6rl5i2z0v"; + rev = "1979f9f67814c11ec9498502237c89a5e1153100"; + sha256 = "0fvjw8sqnwnjx978y7fghvgp5dznx31hx0pjp4iih01xa1hcwbnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-perldoc"; sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb"; name = "helm-perldoc"; }; - packageRequires = [ cl-lib deferred helm-core ]; + packageRequires = [ deferred emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-perldoc"; license = lib.licenses.free; @@ -29565,12 +30138,12 @@ helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: melpaBuild { pname = "helm-proc"; - version = "20160514.718"; + version = "20160917.138"; src = fetchFromGitHub { owner = "markus1189"; repo = "helm-proc"; - rev = "0a75a86e4f381143134e0cdcd8c84c5b5b0fb2d6"; - sha256 = "0bgpd50ningqyzwhfinfrn6gqacard5ynwllhg9clq0f683sbck2"; + rev = "a096066d352174cdc71f3107b089913d6b0b588d"; + sha256 = "02rzbjzfvpszgh6gdnklsgmcxyzl1w4j88fkh7jkk3jdrrapysdm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d7905061141721ce9f2f8ccea8fc4cf53519481/recipes/helm-proc"; @@ -29607,12 +30180,12 @@ helm-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }: melpaBuild { pname = "helm-projectile"; - version = "20160902.2236"; + version = "20160922.4"; src = fetchFromGitHub { owner = "bbatsov"; repo = "helm-projectile"; - rev = "1e8354e61a086609ad43ba49c9a2b36f75ca4435"; - sha256 = "0xi4h8q44b5kf1r1ff8vg4gic4ayi44ay3hwkk6pbkhn1d8cdp5m"; + rev = "29836e0a062d715fe6072f1a2af9229ac9a55d38"; + sha256 = "0hddp85zh1ddzycvfijy9kdr55g38f36ingcpacbx9b4qb84ipik"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8bc4e3a5af7ba86d277c73a1966a91c87d3d855a/recipes/helm-projectile"; @@ -29688,22 +30261,22 @@ license = lib.licenses.free; }; }) {}; - helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-pydoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-pydoc"; - version = "20151008.724"; + version = "20160917.2242"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-pydoc"; - rev = "8eebf6535b4669b5d9e50bbe4f319cd54a2878c7"; - sha256 = "0admgfy0p13nilb4fi3dq8pm48w1fib8h8avi7h9ybi9k5h6x4ii"; + rev = "85480a29b56dacde425655bc8f5a597c785afdf5"; + sha256 = "1wrs2d84xzjnsmw255bmnd1wcpwd36m0vyni48aa7661d4dh10x3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-pydoc"; sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7"; name = "helm-pydoc"; }; - packageRequires = [ cl-lib helm-core ]; + packageRequires = [ emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-pydoc"; license = lib.licenses.free; @@ -29982,22 +30555,22 @@ license = lib.licenses.free; }; }) {}; - helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, spaces }: + helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }: melpaBuild { pname = "helm-spaces"; - version = "20160319.754"; + version = "20161001.709"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-spaces"; - rev = "8b20a229d7a932a54ac6a4239638789215e18597"; - sha256 = "0j3b5ypxq8k7mg6zlx3r15jpk3x2f0gx9p9bjr0h78h0sc0f46l7"; + rev = "877e2b5178926308d6a7c2a37477bb12c33a96d4"; + sha256 = "1cz8aw6zprzfalagma7jmbycwll2chk2l4n5hkgqyhakdfm2ryzm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ffb50643223b68a62fab348cd5aba24ce92e6/recipes/helm-spaces"; sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791"; name = "helm-spaces"; }; - packageRequires = [ helm spaces ]; + packageRequires = [ helm-core spaces ]; meta = { homepage = "https://melpa.org/#/helm-spaces"; license = lib.licenses.free; @@ -30066,22 +30639,22 @@ license = lib.licenses.free; }; }) {}; - helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: + helm-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "helm-themes"; - version = "20151008.2321"; + version = "20160917.2245"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-helm-themes"; - rev = "a6449a40c5a219b43a92c975917a07337f864b4f"; - sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w"; + rev = "1160af42590b0d845a55e65e1e782d9e4027fd6e"; + sha256 = "0856h8rnbgrxp3v3jpfmwq7kcdm1ymd4gcfvh0h27mk05113vz53"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/helm-themes"; sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j"; name = "helm-themes"; }; - packageRequires = [ helm-core ]; + packageRequires = [ emacs helm-core ]; meta = { homepage = "https://melpa.org/#/helm-themes"; license = lib.licenses.free; @@ -30236,10 +30809,10 @@ }) {}; help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "help-fns-plus"; - version = "20151215.637"; + version = "20160917.1126"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/help-fns+.el"; - sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w"; + sha256 = "12hjki054sm7gaky7q3b3sp8y4lxpnaq1vphjg85pfvad72rz71p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/help-fns+"; @@ -30979,8 +31552,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "hindent"; - rev = "4ef059b127d54cb9dcb3b6ecfbc7f8bc1681a0af"; - sha256 = "0vcyxzd9wr15mqqfcnshm3xlc4pqv7r3slzfrbrac0a9n6xns0g5"; + rev = "bdee6d4138aca96bfd8f39f4e5d5e3fd3d17523d"; + sha256 = "0h8rbvcci2virps05s958781jxkp0wk2dm8glmb7ghd5bp09p4rw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dbae71a47446095f768be35e689025aed57f462f/recipes/hindent"; @@ -31021,8 +31594,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "hippie-expand-slime"; - rev = "432de36799fffc920e5bff7a4691f3c67236e59c"; - sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp"; + rev = "66665b65f9053ada47c0283caea0a7db3eaf2f5f"; + sha256 = "0xdbqillrxap29zg35mpxgilz66kjvhx7yvv7hblwj6j30p7bbkq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/hippie-expand-slime"; @@ -31532,11 +32105,11 @@ howm = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "howm"; - version = "20160405.518"; + version = "20160928.439"; src = fetchgit { url = "git://git.osdn.jp/gitroot/howm/howm.git"; - rev = "6d6b4ca60e5c164a3e284ba82156b8ae33e83b7a"; - sha256 = "1ib97y2vm8whd2rqb8kgh0fk54mk3qjmij05bzmz4njz0k9crwgd"; + rev = "364c5be487539b16f4e879b95e27964580c59d36"; + sha256 = "05x7q4gchjj3pyq309w4lh7m27436qk53kh5glk9404ysnk3kqya"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4f66d7b6835d06b8e7451aec9e32bb9288a6020/recipes/howm"; @@ -31552,12 +32125,12 @@ ht = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ht"; - version = "20160806.1753"; + version = "20160911.1900"; src = fetchFromGitHub { owner = "Wilfred"; repo = "ht.el"; - rev = "62d77713ecb99871f2b05c111474445c15781164"; - sha256 = "07n1xh6q2v25jarjlkgjzn40niz958jw0r69d5c2mf66fr7n0b8g"; + rev = "addf09885e019a7c279ecd3693c35eda1c642e25"; + sha256 = "1kjlppsrddgvljd3qqfa198h1dlpkvqh97b7g0z2cqfjlsn6sxk9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c7589bca1c1dfcc0fe76779f6847fda946ab981/recipes/ht"; @@ -31864,12 +32437,12 @@ hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "hydra"; - version = "20160828.154"; + version = "20160913.216"; src = fetchFromGitHub { owner = "abo-abo"; repo = "hydra"; - rev = "3527b321ce02b796e22a4adb2b4c3f17899ca935"; - sha256 = "04r8bpznqfv5xlg9y9f1b690943117hhpxxfif398j8yyx0d8jpi"; + rev = "dd5f703d5257e5fbedf3e2a400a68f2e7663077c"; + sha256 = "1h4lyr0mflvmv53x1w9i2dln090q2a4nfdj5p7vzpvran8hxrrwd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a4375d8ae519290fd5018626b075c226016f951d/recipes/hydra"; @@ -32656,12 +33229,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "20160728.1951"; + version = "20160927.1726"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "3211c2ee6cdc6c7fca280244f426b3aa8fbff3f5"; - sha256 = "0nsd0s3fj571bdqv6zm0l9q14w5l2nf823fxa407riynxllxqp5w"; + rev = "39919478f9472ce7a808ca601f4c19261ecc2f99"; + sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit"; @@ -33109,12 +33682,12 @@ indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "indent-guide"; - version = "20160606.2318"; + version = "20160913.1754"; src = fetchFromGitHub { owner = "zk-phi"; repo = "indent-guide"; - rev = "feb207cb5610f351c7cdcf266e0c99117b2f786c"; - sha256 = "0ykddzily3b6c6k7fvq274pqdjf3934n8p3nrmnsw6c93i1ndd4f"; + rev = "69e1cd78f7379ff3f2c3d2a9f31610ace645bad7"; + sha256 = "0cmjfil9jkjjx1n6lx9d5g99bq8dlx7sqnmkvimw581m96ca040g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d7110054801e3af5e5ef710a29f73116a2bc746/recipes/indent-guide"; @@ -33345,8 +33918,8 @@ sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/50751b5f9843fde00505edd281e404ec1d875713/recipes/inherit-local"; - sha256 = "0j785xb72nk04x6jb9x5pdwp3dkalqmy208mvj4ss4fm559qfp3i"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; name = "inherit-local"; }; packageRequires = [ emacs ]; @@ -33400,12 +33973,12 @@ initsplit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "initsplit"; - version = "20160113.653"; + version = "20160919.1118"; src = fetchFromGitHub { owner = "dabrahams"; repo = "initsplit"; - rev = "5d51986eafb2b5c64f825fba0d1221bd42364c1c"; - sha256 = "1qvkxpxdv0n9qlzigvi25iw485824pgbpb10lwhh8bs2074dvrgq"; + rev = "c941d436eb2b10b01c76a582c5a2b23fb30751aa"; + sha256 = "0vz0pfm2m3v0zk65b4ikk6yfpk282nzbm99fbzj8w76yfg240dfn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a908c8fad08cd4d7dbb586570d0f0b384bf9071/recipes/initsplit"; @@ -33564,6 +34137,27 @@ license = lib.licenses.free; }; }) {}; + intellij-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "intellij-theme"; + version = "20160915.1707"; + src = fetchFromGitLab { + owner = "fommil"; + repo = "emacs-intellij-theme"; + rev = "8e86c414aebb37543656f672e6afab0d54aa40ba"; + sha256 = "1iqzcjyawj02ayzff3h19abc7fxwi074yjd17yj4rzfqcy67kbd1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/cfe86071b2e84929476a771da99341f4a73cfd06/recipes/intellij-theme"; + sha256 = "1g8cninmq840sl8fmhq2hcsmz7nccbjmprzcl8w1zdavfp86b97g"; + name = "intellij-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/intellij-theme"; + license = lib.licenses.free; + }; + }) {}; interaction-log = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "interaction-log"; @@ -33609,12 +34203,12 @@ intero = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }: melpaBuild { pname = "intero"; - version = "20160905.137"; + version = "20160927.127"; src = fetchFromGitHub { owner = "commercialhaskell"; repo = "intero"; - rev = "a82fdea78717047cec33c3b3c2b5fc5739e21022"; - sha256 = "18p7dmiymmw63dcn2v1wfy3i0prg6ldvbjdk98irvjg4mrfif1nb"; + rev = "293acc9de8b47e0ef3faabfef810115f7dcc3ab2"; + sha256 = "1g13lw5dj83673j5a67cngv3s7ffnzqck636dkw2llrz7a3cpsq4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1b56ca344ad944e03b669a9974e9b734b5b445bb/recipes/intero"; @@ -33753,6 +34347,27 @@ license = lib.licenses.free; }; }) {}; + ipcalc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ipcalc"; + version = "20160927.220"; + src = fetchFromGitHub { + owner = "dotemacs"; + repo = "ipcalc.el"; + rev = "e92afd8b96592b6e2d65ba073bf87c9dd2408e91"; + sha256 = "1s17wpdbrbkbmkndbwm0byy11cmymhs6yn7w0v5lvw5l2cgicxjg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/3f80bcdf411de128139a6bf1f507d7ec87076c25/recipes/ipcalc"; + sha256 = "0rd9p4yvzabw437qf7lgiyzxnvv6cjai8b22ywsdryxar9fd8pb2"; + name = "ipcalc"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/ipcalc"; + license = lib.licenses.free; + }; + }) {}; iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iplayer"; @@ -33858,12 +34473,12 @@ irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }: melpaBuild { pname = "irony"; - version = "20160825.1209"; + version = "20160925.1030"; src = fetchFromGitHub { owner = "Sarcasm"; repo = "irony-mode"; - rev = "03cf7216c93dcd907ce9e13e52b6de545a5593bc"; - sha256 = "17a6mpyk2pj479jjzxc68v2c62d07609ys959kb33c719w9djpb9"; + rev = "4b63b809c9643b90d396cbcc1ed0a53659888f4d"; + sha256 = "1mi838x36wi2jw4i64hcdlfi2ji76sqr5v832h0z8x2in40zrckf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d2b6a8d57b192325dcd30fddc9ff8dd1516ad680/recipes/irony"; @@ -33920,10 +34535,10 @@ }) {}; isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "isearch-plus"; - version = "20160704.805"; + version = "20160930.1057"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/isearch+.el"; - sha256 = "047fqfqn4i2vbamp0zj7f2v4wq7vah6cczi4mkvlxcnd0f8llr6l"; + sha256 = "0iwqmw42h6r1jh88kpvhs8196wspfd4mzindj8fjlisrigif497s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a847ee5f4c4206b48cb164c49e9e82a266a0730/recipes/isearch+"; @@ -34146,12 +34761,12 @@ ivy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ivy"; - version = "20160905.940"; + version = "20160926.221"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; - sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; + rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5"; + sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy"; @@ -34167,12 +34782,12 @@ ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: melpaBuild { pname = "ivy-bibtex"; - version = "20160823.900"; + version = "20160928.2352"; src = fetchFromGitHub { owner = "tmalsburg"; repo = "helm-bibtex"; - rev = "13e04b275d3b9a523d6a9f7fa753fc449f3f5960"; - sha256 = "1l66sn7ancyd9q3jbbhay55rs8zbbd7nh2vv9jdgmpw2lys3xs89"; + rev = "5d8f8488537f3c8ced5803d73dc38bcd30a31ebc"; + sha256 = "1lnmwvhfsmv8yx5v7i5dfcfhiy1grphbmphv9ii2pzzmdj4psk8z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; @@ -34188,12 +34803,12 @@ ivy-erlang-complete = callPackage ({ async, counsel, dash, emacs, erlang, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-erlang-complete"; - version = "20160905.353"; + version = "20160927.108"; src = fetchFromGitHub { owner = "s-kostyaev"; repo = "ivy-erlang-complete"; - rev = "568e639a31828e4e7155c96d3b9e0f10fba4c2cd"; - sha256 = "0y1w84v4pfj4fazz0k43l6v6as5jpd1ccpnb4z2dih0460rgbddz"; + rev = "aaca516a0e3d817dcbfdadfccaed548a60083651"; + sha256 = "1lhrg7kkld9kr557fc9plsm1hmn5rlys4zmd5k036wbda3cl58n2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac1b9e350d3f066e4e56202ebb443134d5fc3669/recipes/ivy-erlang-complete"; @@ -34213,8 +34828,8 @@ src = fetchFromGitHub { owner = "nlamirault"; repo = "emacs-gitlab"; - rev = "a1c1441ff5ffb290e695eb9ac05431e9385578f4"; - sha256 = "0ywjrgafpl4cnrykx9yysazr7hkd2pxk67h065f8z3mid6cgh1wa"; + rev = "2ed2e36dd023c12545f00b41d01bca326048656e"; + sha256 = "16rygpggqq48xhjyc8vnzppwq9kc9h4b1gabfnnfgk7m9g1ly8kz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/35d4d4f22e4c567954287b2a1cabcb595497095a/recipes/ivy-gitlab"; @@ -34234,8 +34849,8 @@ src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; - sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; + rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5"; + sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06c24112a5e17c423a4d92607356b25eb90a9a7b/recipes/ivy-hydra"; @@ -34290,6 +34905,27 @@ license = lib.licenses.free; }; }) {}; + ivy-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: + melpaBuild { + pname = "ivy-xcdoc"; + version = "20160917.355"; + src = fetchFromGitHub { + owner = "hex2010"; + repo = "emacs-ivy-xcdoc"; + rev = "5ea22af36c4c2737fb0bec53432c233482d8b314"; + sha256 = "1m5ljx395yw70fx643pnf7pk709s9v5b77zvvv3j21d0cjnppqz5"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d2fd855c098ca65293d84c3b526b0c39f7b07ade/recipes/ivy-xcdoc"; + sha256 = "1my45325ys2m2l5y8pmi5jnbplqm16b1n7zll37163vv16zwnd53"; + name = "ivy-xcdoc"; + }; + packageRequires = [ emacs ivy ]; + meta = { + homepage = "https://melpa.org/#/ivy-xcdoc"; + license = lib.licenses.free; + }; + }) {}; ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }: melpaBuild { pname = "ix"; @@ -34414,22 +35050,22 @@ license = lib.licenses.free; }; }) {}; - jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }: + jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "20160808.129"; + version = "20160916.1606"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "e5204d18a9a9563af2ba5d5f985d6161a906d7d9"; - sha256 = "0l0q4c98jil0scr4spc3z3rgy4xy4w85zrsas1z8w142arvpiw70"; + rev = "8b654ed00d4854c82c97a3c331709bb34f83c97e"; + sha256 = "1fdr0hnq4fjmc74flsypf0jwmcwb0i6mk9v06qv11p4jma1aaqdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; name = "jade"; }; - packageRequires = [ company emacs js2-mode map seq websocket ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/jade"; license = lib.licenses.free; @@ -34480,12 +35116,12 @@ japanese-holidays = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "japanese-holidays"; - version = "20150208.1737"; + version = "20160927.2318"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "japanese-holidays"; - rev = "3c82e33a942e495bbfdf3f40d965dafc87b51336"; - sha256 = "1mwm9wpnxqq3nw7fl0jf40a92ha51yd95vvr58zllhbxdpy3q9pv"; + rev = "0bccfac342d6ebda1c1a35c3babca0c800ff0c9b"; + sha256 = "1id40wxjb9j20lxhsq16j6qmdr6c7sh65iq7iyjqhrz5c4706x66"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/80088028a1322e99e5fc50bebe08fcb6d1a2a44d/recipes/japanese-holidays"; @@ -35104,22 +35740,22 @@ license = lib.licenses.free; }; }) {}; - js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }: + js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js-comint"; - version = "20160622.2316"; + version = "20160907.1705"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "js-comint"; - rev = "83978912073d554f3dc1185a8a46222317a90539"; - sha256 = "0h0dfq2rrnlvdbm39l2wqmhzrps6z6ha65j26bnblwa03jr608l9"; + rev = "2f293bde7ad99fa1f3c8eccf2c4d4782b90c515e"; + sha256 = "1maxypb349k5aw8q72k46zr4j3wmw2c81lghpb5j2jq70ndnpj4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc9d20b95e369e5a73c85a4a9385d3a8f9edd4ca/recipes/js-comint"; sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1"; name = "js-comint"; }; - packageRequires = [ nvm ]; + packageRequires = []; meta = { homepage = "https://melpa.org/#/js-comint"; license = lib.licenses.free; @@ -35191,12 +35827,12 @@ js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "js2-mode"; - version = "20160904.1234"; + version = "20160926.1243"; src = fetchFromGitHub { owner = "mooz"; repo = "js2-mode"; - rev = "c0801b25d6ada38cc93e7a6d33d5de0d1ad5bc1a"; - sha256 = "0g3y0sni3mb3480zlj0cv5d59b275bpswvsim4ym96fq4vs82qk7"; + rev = "64ec0a26673215e36f89e31d7935f99b731fd03d"; + sha256 = "1mcrnibbpnwykhp928f2fjpyapjnv87zrr067vg29h5fmkgn5xli"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/js2-mode"; @@ -35212,12 +35848,12 @@ js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }: melpaBuild { pname = "js2-refactor"; - version = "20160525.113"; + version = "20161003.1225"; src = fetchFromGitHub { owner = "magnars"; repo = "js2-refactor.el"; - rev = "987ed3be5f78d412fb73906cc0d077ddfc15f02d"; - sha256 = "0yzlcnana3ildshzmv60vfgfjkmxki42r7waxsmphjz2hcknbmfg"; + rev = "71fc914e08fe0b8d51112f482ddd4cb044259719"; + sha256 = "0zs05a7y8xyc2a4l5k5rr1yviyskvmfwhyjfmb1gv796hrx0mkwf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8935264dfea9bacc89fef312215624d1ad9fc437/recipes/js2-refactor"; @@ -35718,8 +36354,8 @@ src = fetchFromGitHub { owner = "listx"; repo = "kakapo-mode"; - rev = "5d0390009cddbd8e5e1cf6b565d38ddc8ddf9e9f"; - sha256 = "0cfpm8cy05nlqb0xv6pydvb6vwgkn3z10chfi894vhiwh04jxj4v"; + rev = "bb6de027fb578df31652e58daa92522884ecc274"; + sha256 = "1y6ihk52jza07krz24l9axkwhi46fwi4h6bcjdck9q1qvdrcxw40"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a43f0f1f6a0773240a51d379ec786c20a9389e7b/recipes/kakapo-mode"; @@ -36238,8 +36874,8 @@ src = fetchFromGitHub { owner = "kivy"; repo = "kivy"; - rev = "20eeefed81847f52b8d003fdfaa20cc6a927b311"; - sha256 = "0b6dgpl592fgz54j5hnhv6hylqjj0773j9zn7mk275m5c10is3cp"; + rev = "97eaba281b9a52ca2d4749005d4c5341383ac410"; + sha256 = "11qdcr5cl52gflvd9spyvl7x0rz5gvx584a7izgwiqmmkkav6vj5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/688e2a114073958c413e56e1d117d48db9d16fb8/recipes/kivy-mode"; @@ -36360,12 +36996,12 @@ kooten-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "kooten-theme"; - version = "20160214.451"; + version = "20161002.1540"; src = fetchFromGitHub { owner = "kootenpv"; repo = "emacs-kooten-theme"; - rev = "f703b3a9227b505008e2f07d5dd2e087fad563ba"; - sha256 = "1bh2zpprh2zwhfgdw131lm0j7zm0hmnb0zqcahps104xna9s5x60"; + rev = "0ccd84962e02030dcc96436bb298a5d18f3b3bf3"; + sha256 = "0kfbwahpacbwyxd6rrs2q59dl579zwlj13gfmkpfk7cw3rjg485d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/692d268189740e8b540ba14ed92b07bb8b7fb399/recipes/kooten-theme"; @@ -36902,12 +37538,12 @@ ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ledger-mode"; - version = "20160716.1044"; + version = "20161003.916"; src = fetchFromGitHub { owner = "ledger"; repo = "ledger-mode"; - rev = "96c4e81eed52e0ef514dc15a6ea6d877b3409a2a"; - sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989"; + rev = "c46efbc497b51223c2276d1e23a9fcf1ea440634"; + sha256 = "1z9776k6swm3nvy81i3mnrsn472d8wd9p26gwy6zgidi7k9sj3k3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; @@ -37049,12 +37685,12 @@ less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "less-css-mode"; - version = "20160819.9"; + version = "20160930.2153"; src = fetchFromGitHub { owner = "purcell"; repo = "less-css-mode"; - rev = "61f1d7219ec68e7471dd74d6e29cd35de49a2591"; - sha256 = "0bcf8j9lrcl3aaxzap4dsyz935xz1mp2pi3sfb009yr74cbnbgkc"; + rev = "59bf174c4e9f053ec2a7ef8c8a8198490390f6fb"; + sha256 = "1rkjamdy2a80w439vb2hhr7vqjj47wi2azlr7yq2xdz9851xsx9f"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cae2ac3513e371a256be0f1a7468e38e686c2487/recipes/less-css-mode"; @@ -37091,12 +37727,12 @@ leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "leuven-theme"; - version = "20160827.205"; + version = "20160925.1403"; src = fetchFromGitHub { owner = "fniessen"; repo = "emacs-leuven-theme"; - rev = "a41db665be150c8d4435dad6b4d15824034f296b"; - sha256 = "05avd08kvi74ivi0dwdygwi984ga1vxb1xc3cqpx4ircknilbc9a"; + rev = "689d9309a0551daf053bfa49e6aed6455489079c"; + sha256 = "0x8ig2c9ikz4pj5s17m20pv0fgy8k91dyip4vbpdm5ia626qypjy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b09451f4eb2be820e94d3fecbf4ec7cecd2cabdc/recipes/leuven-theme"; @@ -37155,8 +37791,8 @@ src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "c097741baa2a6757c94d01857139e8401b018294"; - sha256 = "1kamlps1bzsvz4kc7c0fzv1930zg92w2zgj20ghwmlsk9bl14zpx"; + rev = "bad3c20bdf6f707e0eff1173beee1ff632f62501"; + sha256 = "0v2w5n961fgvv3gq21pq1nw867jpbancg7q82zv6bni9bjrl5azq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -37429,12 +38065,12 @@ lisp-extra-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lisp-extra-font-lock"; - version = "20160507.1502"; + version = "20160930.1227"; src = fetchFromGitHub { owner = "Lindydancer"; repo = "lisp-extra-font-lock"; - rev = "77d153a54c20f90064076f3f4ff4ef0e44d1c2bf"; - sha256 = "0ah4nnjgjw7z7j9wz76zyq88rdmina9aw5adhn9b9pwr9s5frfkz"; + rev = "092f5a6e75ddfc8051b252f10e182723a17980e4"; + sha256 = "0cdjgnh2hzwpim4vl2siykfsfni1z5h45vn5dcm52yx8p10s7mzd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/13e01d4faf9ecb4dde8b6eb4acdb0e48e3e5b6ea/recipes/lisp-extra-font-lock"; @@ -37468,12 +38104,12 @@ lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "lispy"; - version = "20160906.743"; + version = "20161003.838"; src = fetchFromGitHub { owner = "abo-abo"; repo = "lispy"; - rev = "2360ae987f8c7a10bfbd716592982777bf6745b3"; - sha256 = "0skzfh26qwjbaxmspdmzma5bgqbibxqj8i24b8kmljdmij8z0gzn"; + rev = "c4b91d70befbc40ec08e55ed6d0b4df611b5a70b"; + sha256 = "0zf77l1cq09x5q3m62mjgxdw2g46d1adqv10d5x80azamq62dbdb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e23c062ff32d7aeae486c01e29c56a74727dcf1d/recipes/lispy"; @@ -37676,12 +38312,12 @@ litable = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "litable"; - version = "20150908.709"; + version = "20160922.859"; src = fetchFromGitHub { owner = "Fuco1"; repo = "litable"; - rev = "9065bade1ba42ad04d9839d58082b73da589dca6"; - sha256 = "1nbz119ldwjvkm3xd9m0dx820lc177frz5mn585fsd7kqdbkam99"; + rev = "4a57d7aeddca76448e4df2a46b42d49253e5e625"; + sha256 = "1zryrc0d2avb27w6a6yzqcc73rsr2rp795vi10qhb04ixda4a8w4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74f2190b653907985e49a96ded986ab11b4946d7/recipes/litable"; @@ -37868,8 +38504,8 @@ version = "20150910.644"; src = fetchgit { url = "http://llvm.org/git/llvm"; - rev = "9313182d938463d6fa1ba7ee75d002af37a0bd01"; - sha256 = "1m8ah6r8c1wscnrv3vbk9f02bls509zz5fmwrkgjrsylp3963vx9"; + rev = "dc1ddc021dd688b1efda20e804f2d6f5133ba4ab"; + sha256 = "1f64871k5vsdzs6fg3iyc97n0gfls9g27jm7z9j0v6vjrd376wc3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/05b7a689463c1dd4d3d00b992b9863d10e93112d/recipes/llvm-mode"; @@ -38322,12 +38958,12 @@ lyrics = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: melpaBuild { pname = "lyrics"; - version = "20160803.1106"; + version = "20160920.1945"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "lyrics.el"; - rev = "a8a613f2af78529a6285eb817fc5c6be07067e3b"; - sha256 = "1v6rgh78l3b15dr050ywlmn4zyksvmc9n2w9w69y0l97x438zncq"; + rev = "1378d534614793a51ebbed661c59eb8818299182"; + sha256 = "10mp9vavmbkhgb133n490kjfbk63j2b0plvaf57w432nalxcwf5n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b04c8f3dfa9fc07cc0ff3df5c4069f864b6db92e/recipes/lyrics"; @@ -38403,12 +39039,12 @@ macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "macrostep"; - version = "20151213.145"; + version = "20160925.505"; src = fetchFromGitHub { owner = "joddie"; repo = "macrostep"; - rev = "1e2593279f3722e31d8a8f07e297a5c546586cba"; - sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6"; + rev = "e5376126947837958983364b8615c7dea6953eda"; + sha256 = "0hdn0gwfwp5ixqqcjsiz4sjq13xzkynnbz2rclg4ajl53mgknfbv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/362b5cb71e81172bc654594c08a5d0b91262851a/recipes/macrostep"; @@ -38487,12 +39123,12 @@ magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }: melpaBuild { pname = "magit"; - version = "20160902.1451"; + version = "20161001.1454"; src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; - sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; + rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83"; + sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bb049b7c4424345f5c1aea82e950a5e47e9e47/recipes/magit"; @@ -38666,8 +39302,8 @@ src = fetchFromGitHub { owner = "magit"; repo = "magit"; - rev = "be39a9ba44da7255d2696dd2a66481bb96b26d75"; - sha256 = "01vfls3l55jf6wd20avc0b0fgaykv26lq8k4ciypnj3ryak94300"; + rev = "a49dfe13916ea0062f3970b787b1b6fa80eb4d83"; + sha256 = "0flxkv0qiic8bhr319cy1sc81sx396ighqygg13x7g9zaf97qvz2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cec5af50ae7634cc566adfbfdf0f95c3e2951c0c/recipes/magit-popup"; @@ -38764,6 +39400,27 @@ license = lib.licenses.free; }; }) {}; + magithub = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit, melpaBuild, s, with-editor }: + melpaBuild { + pname = "magithub"; + version = "20160930.1523"; + src = fetchFromGitHub { + owner = "vermiculus"; + repo = "magithub"; + rev = "7be8c823c51149f339a9ea2b2f2224b6c9402e8f"; + sha256 = "0dxz3vcypfhac43iczi96y7nz2pnlj8kda962pyxij804xa8agzw"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; + sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw"; + name = "magithub"; + }; + packageRequires = [ cl-lib emacs git-commit magit s with-editor ]; + meta = { + homepage = "https://melpa.org/#/magithub"; + license = lib.licenses.free; + }; + }) {}; magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "magma-mode"; @@ -38935,12 +39592,12 @@ malabar-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, groovy-mode, lib, melpaBuild }: melpaBuild { pname = "malabar-mode"; - version = "20150720.1055"; + version = "20161002.1455"; src = fetchFromGitHub { owner = "m0smith"; repo = "malabar-mode"; - rev = "830f38efae813db4388da6b4abd386eb0a4e861c"; - sha256 = "0hlxs9gi2vml2id9q0r1r0xdm0zshjzc1w3phjf2ab0aa3hl5k6l"; + rev = "cf5385cb13296ed64f9ddea59a6219e9c0f29202"; + sha256 = "0nbqnw95812zii8xbb9060csapahscp76ampw8w64pi5ra7b7naa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/29bbefd1e3cc5726584c89244fb5d8ecd18200c3/recipes/malabar-mode"; @@ -39187,12 +39844,12 @@ markdown-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "markdown-mode"; - version = "20160830.820"; + version = "20160928.932"; src = fetchFromGitHub { owner = "jrblevin"; repo = "markdown-mode"; - rev = "3f11a4a7609ba2a507ee10f491bdadab28e9b985"; - sha256 = "0yp6468fl15d8r6sbp3bhzp7nlrl98wjxmlyhd3vv336hwjqq7ad"; + rev = "c81e26ff477d46f68bcf0c6397d5f5346d9b0129"; + sha256 = "000g0l3al6qsl6h47jiz7kgny6svd9i8ppza53wj3p1i4yxrzmdx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/74610ec93d4478e835f8b3b446279efc0c71d644/recipes/markdown-mode"; @@ -39439,12 +40096,12 @@ material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; - version = "20160516.844"; + version = "20160908.1538"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "f9e2c7f86f94cb9a23be6bb618cb31304a491841"; - sha256 = "0nh016z84hx86rd09xvwajm44259viwgl1dx33d6z9dcjpp7f1mm"; + rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40"; + sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; @@ -39522,11 +40179,11 @@ matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }: melpaBuild { pname = "matrix-client"; - version = "20160806.2045"; + version = "20160929.756"; src = fetchgit { url = "http://fort.kickass.systems/git/rrix/matrix-client.git"; - rev = "987f6e9cf71843d638d8ad16f02da2f8a7f103e2"; - sha256 = "1h8zwwc7kwalqiliv07zjnw9rrb1gdhs6x3j67r6innnq1rw3z49"; + rev = "ab62f99be9d90fb261194d5b48a27379c9ebc920"; + sha256 = "1g8aa2i7kb5hb9i7aq2l2kfzdw3a346i78a2vagkn00hm613gj4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/152969c540b57c0a9532e698c24eac0de5e0269c/recipes/matrix-client"; @@ -39767,6 +40424,48 @@ license = lib.licenses.free; }; }) {}; + meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "meghanada"; + version = "20160929.127"; + src = fetchFromGitHub { + owner = "mopemope"; + repo = "meghanada-emacs"; + rev = "f80811e4f1efa712eabfa42fd995990d02fc1e5a"; + sha256 = "0w2ij8zh30qs19vwnqifg3p5cvk94akig03cv2f6mx14clvrwckn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; + sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; + name = "meghanada"; + }; + packageRequires = [ cl-lib company emacs flycheck yasnippet ]; + meta = { + homepage = "https://melpa.org/#/meghanada"; + license = lib.licenses.free; + }; + }) {}; + melancholy-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "melancholy-theme"; + version = "20160929.43"; + src = fetchFromGitHub { + owner = "techquila"; + repo = "melancholy-theme"; + rev = "3477a88cdf4586203430e24a1a72bc95e5fab3f5"; + sha256 = "0kkx7iwj4bp9yknk6k6mw80bsh6d00kqjdsscr1p0srv9vqnrwba"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8b8f708d1300d401697c099709718fcb70d5db1f/recipes/melancholy-theme"; + sha256 = "1wihbv44234lwsgp5w4hmmi3pgxbcfjvs1nclv0yg600z9s8sn8w"; + name = "melancholy-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/melancholy-theme"; + license = lib.licenses.free; + }; + }) {}; mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mellow-theme"; @@ -39895,10 +40594,10 @@ }) {}; menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "menu-bar-plus"; - version = "20160831.748"; + version = "20160918.1025"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/menu-bar+.el"; - sha256 = "0wqd2dv7rbw2cygjj79kfm3g9jjxria2zlcij8fxpnw7is4j951q"; + sha256 = "1kzmdanaf167qvmybf6hfbgia628xpqycnnl4a9qms6vfjzmqznk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/menu-bar+"; @@ -39953,12 +40652,12 @@ meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "meta-presenter"; - version = "20150501.410"; + version = "20160924.2206"; src = fetchFromGitHub { owner = "myTerminal"; repo = "meta-presenter"; - rev = "1a92f65114d3b6f83d822494c224a406fdaf6e33"; - sha256 = "03lpl8zkcys0p8x95s8d2izq7phgkl5g713sbxhblsl4yl8sbsjy"; + rev = "0b7f3d47e34fdd0c150da55e58ec2bfc274930a8"; + sha256 = "06s93i46rm91i23in51mf7ynl37c90f2gl52ykv48p41dyv1kg6v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b73e9424515b3ddea220b786e91c57ee22bed87f/recipes/meta-presenter"; @@ -40184,12 +40883,12 @@ migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "migemo"; - version = "20150412.741"; + version = "20160924.741"; src = fetchFromGitHub { owner = "emacs-jp"; repo = "migemo"; - rev = "c2240afa9afc0f003bb1d846710505e8e8e38169"; - sha256 = "1az4mnmanhz9ga0g46jf33w8axcw8lnrb9lmszajwv7y5j9nk7yr"; + rev = "e4744efae1b2fdea2bbd2ceaff0f6ea0bb739f5a"; + sha256 = "12p50kg2h78qi8892jj4g3wa4fjm7gjiqf6qw52zyx3kvgwxgxwa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2424b0328a0198a03359455abdb3024a8067c857/recipes/migemo"; @@ -40246,12 +40945,12 @@ mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }: melpaBuild { pname = "mingus"; - version = "20160321.917"; + version = "20161001.150"; src = fetchFromGitHub { owner = "pft"; repo = "mingus"; - rev = "940ac6e96c713eaa9dde636b6755ee34f03654ff"; - sha256 = "14dqa37z96nhmrhiczri0cyrzmjc3larw8sszvdal9prj47363sh"; + rev = "519c42b3dd138211c8a025e00826ba196c29facf"; + sha256 = "01p7j729gzn0sh0361qyz2gkfdz33mvb6xs5d5vj67pc2l7clxdh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6699927f1ded5c97f2ce1861f8e54a5453264cca/recipes/mingus"; @@ -40492,6 +41191,27 @@ license = lib.licenses.free; }; }) {}; + mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mips-mode"; + version = "20160923.209"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-mips-mode"; + rev = "e63064c926312d5b90d9da869db3b86de8fecee8"; + sha256 = "1cxpqbbdl431kxgn54008zi55hxzf6kjb1xamv73cv2gxh9aczy4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; + sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7"; + name = "mips-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mips-mode"; + license = lib.licenses.free; + }; + }) {}; misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "misc-cmds"; version = "20160719.1606"; @@ -40549,27 +41269,6 @@ license = lib.licenses.free; }; }) {}; - mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }: - melpaBuild { - pname = "mmm-jinja2"; - version = "20150904.1134"; - src = fetchFromGitHub { - owner = "beardedprojamz"; - repo = "mmm-jinja2"; - rev = "0ecd7fd239fc096495d903b5f1bafac83515acef"; - sha256 = "1lcc2p9qz70kpykgx82isv0qiqlsajp4vvcj6bvag92d7h9yk9bv"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/6148891549a38f1804d26613dfa0e2179556cb00/recipes/mmm-jinja2"; - sha256 = "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z"; - name = "mmm-jinja2"; - }; - packageRequires = [ mmm-mode ]; - meta = { - homepage = "https://melpa.org/#/mmm-jinja2"; - license = lib.licenses.free; - }; - }) {}; mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-mako"; @@ -40719,12 +41418,12 @@ mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }: melpaBuild { pname = "mocha-snippets"; - version = "20160211.832"; + version = "20160912.514"; src = fetchFromGitHub { owner = "cowboyd"; repo = "mocha-snippets.el"; - rev = "ac1f196bc0214cf7ec99bf34aafcbe13d53dffc4"; - sha256 = "1f8h5c9vvwynq92b1ii5hdpqmf52l5j443ir5hdbiigq30wkwlhx"; + rev = "6f09ba894a3f5fbaecd5c91597c6f0d1918e9d71"; + sha256 = "1jd5ji48myirqqhwrkm254zdrxgrdkfny9bvxc29vwgm8gjcpspw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/93c472e3d7f318373342907ca7253253ef12dab8/recipes/mocha-snippets"; @@ -40902,12 +41601,12 @@ moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "moe-theme"; - version = "20160814.2212"; + version = "20160907.727"; src = fetchFromGitHub { owner = "kuanyui"; repo = "moe-theme.el"; - rev = "c27112439d1567421922bd582ea525f4597ccc5c"; - sha256 = "16f4dphpnwpq5kw8k5pchq3l909b4qcgzqnycqfjgdr7ssjp5n4i"; + rev = "01274c8538f6e95ce8b82e0db672746cbeab6b23"; + sha256 = "0h7nlrhcg6sclrmw075n1rsv3rjsi8z0sgr1al998pv4a3w4m6bj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4efefd7edacf90620436ad4ef9ceb470618a8018/recipes/moe-theme"; @@ -40962,6 +41661,27 @@ license = lib.licenses.free; }; }) {}; + monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "monitor"; + version = "20160925.605"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "monitor"; + rev = "4b781279fd6bce744b7f553482fe6096b58b1ebb"; + sha256 = "0kqxjysbkv8dmjzb43h9lrcdvzfxwi8q1gq8bi32wmbwakaccy5b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor"; + sha256 = "11n4nv6vkjw434yrwqjw20229m2sxqxxdp7sg99gzrd5gjyab643"; + name = "monitor"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/monitor"; + license = lib.licenses.free; + }; + }) {}; monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monky"; @@ -41211,12 +41931,12 @@ move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "move-text"; - version = "20160430.1730"; + version = "20161002.2035"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "move-text"; - rev = "e8098573d4f422ad3797ed7b73edaa78474c6b36"; - sha256 = "1i8nbxmxi9yblik7ma3wm19sajk1pgpw83mj990vhj1yl1k7m136"; + rev = "3d9fe18c4015d82cdb85f7af3bb22e54ee907555"; + sha256 = "14mykiz7q93xjz0lhr17vk1hna64apsplkk424q7hv28fpahzfbp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; @@ -41299,8 +42019,8 @@ src = fetchFromGitHub { owner = "google"; repo = "mozc"; - rev = "73a8154b79b0b8db6cf8e11d6f1e750709c17518"; - sha256 = "1vn4i0cj60izng4zvpjgbdrlv3v6wilpkzxvb9mz5a8adf3myv5h"; + rev = "d87954bf3791fb871c6e16621077fb0b97cc10a5"; + sha256 = "01rx4ll6qdlf3qf0f3srmid24zsifqbvm43nqy7k6glnidv8fcnn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c/recipes/mozc"; @@ -41460,6 +42180,27 @@ license = lib.licenses.free; }; }) {}; + mtg-deck-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mtg-deck-mode"; + version = "20161001.1557"; + src = fetchFromGitHub { + owner = "mattiasb"; + repo = "mtg-deck-mode"; + rev = "72c80dc970271f3f4f5bc3295b4f3e6227440d8c"; + sha256 = "0qlvj2g9hg18jy9axdx28iwcygyfa82nljip5py3n5vh3zd4b87m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/425fa66cffe7bfda71de4ff2b49e951456bdeae1/recipes/mtg-deck-mode"; + sha256 = "07hszf33nawhp218f90qr4s713yyjdd7zzkq0s8q0fb6aai5iiih"; + name = "mtg-deck-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/mtg-deck-mode"; + license = lib.licenses.free; + }; + }) {}; mu-cite = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }: melpaBuild { pname = "mu-cite"; @@ -41484,12 +42225,12 @@ mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "20160814.145"; + version = "20160909.918"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "12d3c458e8a45440776f6560c5f22a090ff24769"; - sha256 = "0iy3lslr3w4npfqasgn3bv5akdc7h7csx7amcybb21dzwi38bi23"; + rev = "839cb7a9b9db150460d1e1b40fc7abcd61679011"; + sha256 = "1kl0f9m3zs9nkkmzpbf4kddjmbvvg7psmv1hanlw5h3z3yy1m9x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; @@ -41505,12 +42246,12 @@ mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mu4e-maildirs-extension"; - version = "20160604.243"; + version = "20160911.41"; src = fetchFromGitHub { owner = "agpchil"; repo = "mu4e-maildirs-extension"; - rev = "04872b79273ec81670e0ea19ed2c90ba74467c57"; - sha256 = "00ylq8ay7j21winii1g3c3hcaihcnq209mngs7g1cgykh1fpbblg"; + rev = "b695dcf4688e288488a6dd1583de3782df0a4549"; + sha256 = "1bwgrhsbf6frxvn8l66yi3qm1l7dc54dkjzdsad0mdas1vmibh0l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b20c61c62309f27895f7427f681266e393ef867/recipes/mu4e-maildirs-extension"; @@ -41586,12 +42327,12 @@ multi-line = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }: melpaBuild { pname = "multi-line"; - version = "20160831.1826"; + version = "20160908.1139"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "multi-line"; - rev = "e698e94ff34ab432bed9a11626c3a0277bd45fe7"; - sha256 = "1rq4bpa9bfyc9r3hwa6ik3yk74aizz2k1crwmafqy2wqlr6zx04q"; + rev = "7c03bfb2fc1c682ad78689325eac9cf302970ea0"; + sha256 = "1lb3kal8747z61l55dfpfzcn8m5114vrwgm8ar126rqp7hxa97xa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f8eee6798a0ba71d437a1cbf82e360a5b60eafb/recipes/multi-line"; @@ -41894,12 +42635,12 @@ mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mwim"; - version = "20160720.1210"; + version = "20161002.57"; src = fetchFromGitHub { owner = "alezost"; repo = "mwim.el"; - rev = "d7885c32ad54f5b5698b48abea392a8eae2567a8"; - sha256 = "1kssmryl44m4cq05ff98blwdvqafb9x7v3bvb1z70rrvdvw3l024"; + rev = "a8c6f679d39c62cf16889aed23978ba8b08bf93b"; + sha256 = "0lpfsz6g8zvf44kg36lnviap6g3z914ldpadnwkvd810k185kinf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7e1aa2fa1294b27ed7b6c5bdd5844fa5c37df72/recipes/mwim"; @@ -42020,12 +42761,12 @@ myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "myterminal-controls"; - version = "20160119.2030"; + version = "20160924.2206"; src = fetchFromGitHub { owner = "myTerminal"; repo = "myterminal-controls"; - rev = "9f4ad8007064b40302bc43bf826e17ef5c1bc70a"; - sha256 = "1517lhialks2404s2826vkvshqwjdsxyvqgysp6awmblg676k9yv"; + rev = "b76ef43a64f25cbea67b966ebf88eb12518a52b4"; + sha256 = "1x8sfhdb5cw1xih9gpr07pz3f0y9wzxv38pxg4pllkayc2sqhsr4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a82a45d9fcafea0795f832bce1bdd7bc83667e2/recipes/myterminal-controls"; @@ -42122,12 +42863,12 @@ nameframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nameframe"; - version = "20151017.2119"; + version = "20160927.2103"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e"; - sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5"; + rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; + sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd314150b3f8ce529a2ae39a71e03bebedfdc6b9/recipes/nameframe"; @@ -42143,12 +42884,12 @@ nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }: melpaBuild { pname = "nameframe-perspective"; - version = "20151018.207"; + version = "20160927.2103"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e"; - sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5"; + rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; + sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2543af5579d37a3eb52e6fea41da315f5590331e/recipes/nameframe-perspective"; @@ -42164,12 +42905,12 @@ nameframe-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, projectile }: melpaBuild { pname = "nameframe-projectile"; - version = "20151018.207"; + version = "20160927.2103"; src = fetchFromGitHub { owner = "john2x"; repo = "nameframe"; - rev = "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e"; - sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5"; + rev = "696223c61ca8e8f5cc557d2c198801a2f3c32ad3"; + sha256 = "14zrxv0x7p7rfrwdk02kzgvg8n594ij47yrr0c8q7b6vckhrz4gw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bc17af8ff1694120d12a0cdbfccec78834810acd/recipes/nameframe-projectile"; @@ -42185,12 +42926,12 @@ nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nameless"; - version = "20160403.1113"; + version = "20160916.728"; src = fetchFromGitHub { owner = "Malabarba"; repo = "Nameless"; - rev = "49225f379efedf228636985a92ca6fb84cfdea5a"; - sha256 = "1g8852c68ca4b4wf781aiyhbgk2a3g39jw1mijzpp0lmmnsbmmwc"; + rev = "e5e2f0a23c56cba750f93e74442104222f7f30c5"; + sha256 = "06xvh0r4589kxb6pr8a4xxr4msxl4jfp3dh3f9xxvp1icwlf4j9b"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8e4ee4dae5f32a8d445dc0cc2455c1f7075c9b3d/recipes/nameless"; @@ -42538,12 +43279,12 @@ ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ncl-mode"; - version = "20150525.929"; + version = "20160925.2200"; src = fetchFromGitHub { owner = "yyr"; repo = "ncl-mode"; - rev = "01559734504d2712606ac30916252d788ea73124"; - sha256 = "0gbv5fv401z58ycbqlivqamf5kp3x6krhi36q7q0m4gvy448xz0n"; + rev = "8841c2234a6425c4aaccddbf7567828681627dd0"; + sha256 = "1nngh564ggyb2qg8lgblls22ygfpj9dn7l6v50s7df3hy7zhkqhz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00cc4705650157621bb0135cc512d57178496100/recipes/ncl-mode"; @@ -42622,12 +43363,12 @@ neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "neotree"; - version = "20160906.739"; + version = "20160921.1817"; src = fetchFromGitHub { owner = "jaypei"; repo = "emacs-neotree"; - rev = "f2cec77d0c6ea843e37c584470b2c65561a457a7"; - sha256 = "09ll5l0vd4iybmgp43jdf55crgn0rcdcqs42v6yfknf9n6wf8w4f"; + rev = "ed8de7fbb60b3e1d580c20a4e16cb5005a195cab"; + sha256 = "1s1snaa76f9zgrlbkkhpnsk5arch5mi4gpc644hrrn0slc61hx8k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9caf2e12762d334563496d2c75fae6c74cfe5c1c/recipes/neotree"; @@ -42664,12 +43405,12 @@ netrunner = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }: melpaBuild { pname = "netrunner"; - version = "20160622.642"; + version = "20160910.1632"; src = fetchFromGitHub { owner = "Kungsgeten"; repo = "netrunner"; - rev = "202ddb1005ca54da3884f38627c6d1e5ba85d56d"; - sha256 = "0xj52211ca7fgr6zkwaf3rgn6zl8c3w2j3lfc4fkm2wlkhb9xcks"; + rev = "c64672992175c8c1073c0f56c2e471839db71a0f"; + sha256 = "1jj8qsq4xa93h3srskhw1l6igzf9jhwl8hfa73zvqr8dhqhp149k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a8b1d8c31383b6ec3788ad6c9adf0117190484c9/recipes/netrunner"; @@ -42745,6 +43486,27 @@ license = lib.licenses.free; }; }) {}; + ng2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, typescript-mode }: + melpaBuild { + pname = "ng2-mode"; + version = "20160910.820"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "ng2-mode"; + rev = "d06d8af34c1e74a7c7a8601233f5e42c38420035"; + sha256 = "0nz1lrx0iiapmhy78d17m8v91nly11hlykg00xvj91y1iw0713ql"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/a856ecd8aca2d9232bb20fa7019de9e1dbbb19f4/recipes/ng2-mode"; + sha256 = "0sr4yh5nkgqb1qciq9mzzhr64350bi2wjm6z9d616nkjw72saz1r"; + name = "ng2-mode"; + }; + packageRequires = [ typescript-mode ]; + meta = { + homepage = "https://melpa.org/#/ng2-mode"; + license = lib.licenses.free; + }; + }) {}; nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nginx-mode"; @@ -42829,22 +43591,22 @@ license = lib.licenses.free; }; }) {}; - nim-mode = callPackage ({ commenter, company, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: + nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }: melpaBuild { pname = "nim-mode"; - version = "20160827.1217"; + version = "20161001.2336"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nim-mode"; - rev = "208f42612b66b2d2cfc25381035f94b75c6364f2"; - sha256 = "0rcvfkknvy6pwvgl9h66lky5kw4kcjanpj7lisva9s5a4iq8z0jb"; + rev = "2ddac4faa12fc405fcb2148f7d045be83cae5f3d"; + sha256 = "1iaf03791x3jw1vgp2pc4aa01xw5kfr7mk87x7bg1py88pljkh7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc2ccb5f24b9d55c77eaa7952a9e6a2e0ed7be24/recipes/nim-mode"; sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6"; name = "nim-mode"; }; - packageRequires = [ commenter company emacs epc flycheck let-alist ]; + packageRequires = [ commenter emacs epc flycheck let-alist ]; meta = { homepage = "https://melpa.org/#/nim-mode"; license = lib.licenses.free; @@ -42857,8 +43619,8 @@ src = fetchFromGitHub { owner = "martine"; repo = "ninja"; - rev = "94fc14314501a78b1742e910f7c920188b2753da"; - sha256 = "05r6335i9fivinb2cny96wvvkcn1fwaqq7ax1nkzqsag27nc7qp5"; + rev = "6a2b876d3ab210c0c4e61c6f60d34304e024b54d"; + sha256 = "1ypi182ffr65vixg5va2bcgga29r9jxa8w0pv2cpilbys8w53hpd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aed2f32a02cb38c49163d90b1b503362e2e4a480/recipes/ninja-mode"; @@ -42882,8 +43644,8 @@ sha256 = "1y5x49mqippngp7ya6y7p8z81anrc644n84wpd7y62yqv8qhz0fp"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/4de2a8cbf1180ec7ca1648f497538b8dbf7a3945/recipes/nix-buffer"; - sha256 = "1svx1wg05fajxzjz95dfg072i6nfydr0ir4q1zhdxg1igkffqsml"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; name = "nix-buffer"; }; packageRequires = [ emacs f ]; @@ -42899,8 +43661,8 @@ src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "312bab008d835dd9c8939b803d2bc7af4f82a811"; - sha256 = "1vj7dwrv0x4zjaxpn5baiy1dhzdhabdcj28yp2dykdvymmp3zx8x"; + rev = "4bd51d74af34cc0014cd1b2dd0dd105e379e9770"; + sha256 = "0gmyrmqd75bcmh2xa2i1ykyryb38k42vspcbkr2nmrp2r87qfkrs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2b542189cfde5b9b1ebee4625684949b6704ded/recipes/nix-mode"; @@ -42916,12 +43678,12 @@ nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "nix-sandbox"; - version = "20160223.553"; + version = "20160914.1324"; src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3"; - sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w"; + rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; + sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/66be755a6566e8c0cfb5aafa50de29b434023c7a/recipes/nix-sandbox"; @@ -42941,8 +43703,8 @@ src = fetchFromGitHub { owner = "travisbhartwell"; repo = "nix-emacs"; - rev = "9e84e7f93307b72a1c0decfc2eff9d4943631de3"; - sha256 = "1r2qbd19kkqf70gq04jfpsrap75qcy359k3ian9rhapi8cj0n23w"; + rev = "89b9356d32b16e0dc0794c323a4661a01c3b83de"; + sha256 = "11pcp09z0vy6k81wghqq4rxlkfsc5bpgyacpl7bmxanj3qaa7ga5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6846c7d86e70a9dd8300b89b61435aa7e146be96/recipes/nixos-options"; @@ -43165,11 +43927,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "20160904.423"; + version = "20160930.313"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "fce8146a8b738f2317034fee6236cdbd3597849b"; - sha256 = "04iscnc83c1yhzwid83m71bgawnqkzwvikffgqd6kiwj140ahx2r"; + rev = "c2e74662bbbbf9be1fde0ae416dc2664ba3da3cd"; + sha256 = "1f68jin42nybygla41h84dp50hg4sdmn5y22a4iiapm6h6nnzmd0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -43438,8 +44200,8 @@ src = fetchFromGitHub { owner = "TeMPOraL"; repo = "nyan-mode"; - rev = "b5db3a612bba35c8f54f44c300ebc879db6b3288"; - sha256 = "199ii1658k4sp5krha77n9l5jblyvnvvvr28g2nbc74lfybckjwq"; + rev = "5ad24b20a59754f0673adfd33a323bde9e3a1ae4"; + sha256 = "1fdxwlih732ci2xpvk90ri35n4g3rjh91hs001j3y1c5ilpcp5cg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4d8c3000df5f2ee2493a54dee6f9b65008add753/recipes/nyan-mode"; @@ -43515,6 +44277,27 @@ license = lib.licenses.free; }; }) {}; + ob-applescript = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ob-applescript"; + version = "20160914.1327"; + src = fetchFromGitHub { + owner = "stig"; + repo = "ob-applescript.el"; + rev = "bc708af6cf45707d4e8d8f00ea59a7e413bfaca7"; + sha256 = "08q0kglajvgpjvzij89z9xiz65r15ddxz16bjk2b59p0vzzy51ij"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/23b075774be913539c3f057dcb7f24fbc05c37a4/recipes/ob-applescript"; + sha256 = "1gk8cgscj9wbl5k8ahh1a61p271xpk5vk2w64a8y3njnwrwxm9jc"; + name = "ob-applescript"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ob-applescript"; + license = lib.licenses.free; + }; + }) {}; ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ob-axiom"; @@ -43706,12 +44489,12 @@ ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-ipython"; - version = "20160703.639"; + version = "20160918.1001"; src = fetchFromGitHub { owner = "gregsexton"; repo = "ob-ipython"; - rev = "12e764aa231d029368056796452f644a3adba856"; - sha256 = "0k1jmacvfl2kxbc9xan93nivvnc3j3k17qp7xjmhrlrx1gdx63lr"; + rev = "cfdd9c00e6286d31d647defdb813b7aabfadcbff"; + sha256 = "0i441jwc32fnkd8rba512z373jaind8sdb20hf2yma7ny2iawcyk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/557c36e86844c211f2d2ee097ce51ee9db92ea8b/recipes/ob-ipython"; @@ -43916,12 +44699,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "20160903.25"; + version = "20160922.1638"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "56bb9a20ffa257db484616eeb62380deadaa5856"; - sha256 = "0mnkinwnjmzz9245ja0zf51cxxq3agk7j25aqvsdxj6p9bxpavfc"; + rev = "450d510a5eb1fd644d0037e9f02271ca33639fb0"; + sha256 = "00i7jszlfh67xzvqnp137aaia68rkk4ri5v0fs32ym10pcj8l4dp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -44252,12 +45035,12 @@ octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "octopress"; - version = "20160731.1150"; + version = "20160925.1656"; src = fetchFromGitHub { owner = "aaronbieber"; repo = "octopress.el"; - rev = "4624d8d58f1d571372827af20bddf55d2c97a36f"; - sha256 = "1d32ba8vpi6ladqzfnglizwj4w0jay57cwx4hkz3hizrsc7f4992"; + rev = "a38e9fe336f558fbda2a142318349f5617511728"; + sha256 = "1x1yrpn6z0vzlp9rfq0iczsbda389bcsg003nn6lcplnpchq69n8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7205d3d43797755077f19f57f531b4b39e77bae3/recipes/octopress"; @@ -44315,12 +45098,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "20160905.220"; + version = "20160912.1758"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "696c19550f50e1960327e007750c4b80bd3f14bf"; - sha256 = "12d6icnhmvpvpnfyai1ni5d5g3dqg1d7775rm5vd12hf9nafidj1"; + rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; + sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -44483,12 +45266,12 @@ omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }: melpaBuild { pname = "omnisharp"; - version = "20151210.1114"; + version = "20160920.2343"; src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "725796278fa8a391e244f2e50676dd6d6b67585d"; - sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm"; + rev = "f956929891e77ba4ce2fb1361129d5d3ebc7bb55"; + sha256 = "1xds6fqs1l6q9vak3v4xlzl1w084mhz86xrnycibcwm8q3q9hmb3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; @@ -44513,12 +45296,12 @@ omtose-phellack-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "omtose-phellack-theme"; - version = "20160820.812"; + version = "20160919.2240"; src = fetchFromGitHub { owner = "franksn"; repo = "omtose-phellack-theme"; - rev = "2c2da8950d7429e710dc785c92d38fe9ba254a4b"; - sha256 = "0zzj1kjzqdjjvgm5yq44fyh4gb8gqkx9wjzxd0yzz3ihklgz3d09"; + rev = "ae389d81e84646e1bbb283f56849ef34b449e4b8"; + sha256 = "0wn0xzvc8c5dlh53fl2naa44512w04j6xjxrw17gjs0ysvbqg4ns"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/478b1e07ed9010408c12598640ec8d154f9eb18d/recipes/omtose-phellack-theme"; @@ -44633,15 +45416,36 @@ license = lib.licenses.free; }; }) {}; + open-in-msvs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "open-in-msvs"; + version = "20160928.1103"; + src = fetchFromGitHub { + owner = "evgeny-panasyuk"; + repo = "open-in-msvs.el"; + rev = "caa335b0cf83b0f529fdaa54fe039308d4de91ef"; + sha256 = "130469gqjidz7zvzncfm9dg83vmja49vsav03j6qvdxww5z7a74w"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/09a462fac31a7ceda4ee84a8550ff1db6d11140f/recipes/open-in-msvs"; + sha256 = "0cng0brxjdriyhwsbn85pfrgqg56chzk24lvkx91rzgz15fbpnv5"; + name = "open-in-msvs"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/open-in-msvs"; + license = lib.licenses.free; + }; + }) {}; open-junk-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "open-junk-file"; - version = "20160514.1525"; + version = "20160912.1859"; src = fetchFromGitHub { owner = "rubikitch"; repo = "open-junk-file"; - rev = "249e0b39208224f540c982fc13d35dc7f4628891"; - sha256 = "0r5rsghqgy99jwjf3dqkw1q10smsvs242aafmz142l4ipsqr3gi3"; + rev = "31b6a88001d66cda95eabb444df188a61bde6346"; + sha256 = "0xqpwf1sc36r465wi1d3vk18grpcb32fyyxy62xdxfvlw5nlnphp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8e4328cae9b4759a75da0b26ea8b68821bc71af/recipes/open-junk-file"; @@ -44678,16 +45482,16 @@ opensource = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }: melpaBuild { pname = "opensource"; - version = "20160802.303"; + version = "20160926.916"; src = fetchFromGitHub { - owner = "nlamirault"; - repo = "opensource.el"; - rev = "27d06be45c852e84e47c33cbd0f4c344fd9a0370"; - sha256 = "1rjf78vki4xp8y856v95877093p3zgfc9mx92npscsi1g93dxn80"; + owner = "OpenSourceOrg"; + repo = "el-opensourceorg"; + rev = "42742d5f1b9590acff7f05ee0094e3a80f4f7171"; + sha256 = "0z92l9d3q12qlf18v7w8qjiw0ciha9l1nvxr0zmik5ck87qk4vmn"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b9925f059f0caf0550a747d1f07e043e9d854f77/recipes/opensource"; - sha256 = "0ha5xva27xf6af9yhxpmnkyp26jzia7fkbkqx5qv0cwmicapccfk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource"; + sha256 = "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my"; name = "opensource"; }; packageRequires = [ dash pkg-info request s ]; @@ -44823,12 +45627,12 @@ org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-attach-screenshot"; - version = "20160529.737"; + version = "20160928.258"; src = fetchFromGitHub { owner = "dfeich"; repo = "org-screenshot"; - rev = "e1b1eaadf3cdcac04d41156bbfb82b6622ce76e0"; - sha256 = "19axpybfdsnaj04h0mxpahzqa5r5yl5mmczd3mx5r6mnr6dgrwn9"; + rev = "1aabac1a2885d31a3d862cbeb31a635c3d68b9ab"; + sha256 = "04fylcv782sl00g5y30hjcg9z8q00lkzf89wq9g9za6dx013z33q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f545cd8d1da39e7fbd61020e178de30053ba774b/recipes/org-attach-screenshot"; @@ -44883,6 +45687,27 @@ license = lib.licenses.free; }; }) {}; + org-board = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-board"; + version = "20161003.510"; + src = fetchFromGitHub { + owner = "scallywag"; + repo = "org-board"; + rev = "3cc35b17d69bc41eff396a1b4a97f8e34c21397e"; + sha256 = "1rcl8zk563d64a1vsbpl49bsk4awajdffc4sb277rd50jmv6a045"; + }; + 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"; @@ -44890,8 +45715,8 @@ src = fetchFromGitHub { owner = "alphapapa"; repo = "org-bookmark-heading"; - rev = "6283c3459ab2f1afe54548d83e3200c53546c73e"; - sha256 = "00nz9wmz1xhh6qg51mxr1d05j2ndnqc4f5w8hjc4148iiwkk4ymg"; + rev = "6c8aad7bf98387875836873040e7815d8720ba84"; + sha256 = "0hhw9w5aj8rbfrifpr4djppif5hwgzdb3x1az4gdwvc2dsgd8psf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaadbd149399c6e3c48ac5cbeedeb29a3f5791f1/recipes/org-bookmark-heading"; @@ -45117,12 +45942,12 @@ org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-dashboard"; - version = "20150812.302"; + version = "20160929.941"; src = fetchFromGitHub { owner = "bard"; repo = "org-dashboard"; - rev = "b523aefb5822c1f09a70bc429579c2959929782b"; - sha256 = "1nqfi139cag3ll8wxk8rh59hay97vi8i0mlgnams4jla285zydj5"; + rev = "f9cd3b979166a3713aea48b1a1e6aaea2e7c7a05"; + sha256 = "1n78775h5mvqki2idkbwais37g2alblz1fzrsrgr3vvcd83g3i98"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/11ce0ba772672d9cbae5713ebaf3798eec5fdb3c/recipes/org-dashboard"; @@ -45180,12 +46005,12 @@ org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-download"; - version = "20160814.237"; + version = "20160907.1021"; src = fetchFromGitHub { owner = "abo-abo"; repo = "org-download"; - rev = "ec2dc69b7a49054bc0d34c6533cdcadba708db67"; - sha256 = "1fdzn8qfhalk15g5cfyywi99wmmgx6ck6b24zsgsr38jphcih0k1"; + rev = "115433394221da8071dedf7e3f056e37f097a272"; + sha256 = "1y2654ihc0py9nhl8178bmqvaqwx2wydyfqydd6vsis31hahxmnd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/edab283bc9ca736499207518b4c9f5e71e822bd9/recipes/org-download"; @@ -45261,6 +46086,27 @@ license = lib.licenses.free; }; }) {}; + org-easy-img-insert = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "org-easy-img-insert"; + version = "20160915.1308"; + src = fetchFromGitHub { + owner = "tashrifsanil"; + repo = "org-easy-img-insert"; + rev = "9f8aaa7f68ff1f0d8d7b1e9b618abb15002f971e"; + sha256 = "1p0hzfzlcdmd8d01a4xqg27n7qcnv7a03n8wiicv0dnicx179952"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/512db70609fc451972405acb4b186a9b3c6944fa/recipes/org-easy-img-insert"; + sha256 = "0gpb9f66gn8dbhwrlw7z2a5rpphbh1fv845wz8yy4v7nv2j3sf54"; + name = "org-easy-img-insert"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/org-easy-img-insert"; + license = lib.licenses.free; + }; + }) {}; org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }: melpaBuild { pname = "org-ehtml"; @@ -45303,6 +46149,27 @@ license = lib.licenses.free; }; }) {}; + org-evil = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, monitor, org }: + melpaBuild { + pname = "org-evil"; + version = "20160925.620"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "org-evil"; + rev = "aa94ee5f41cf170ec4a9c07bf3d25147d36e20db"; + sha256 = "0lbi9r551vs3rcagpiranrgxanwcsr69ibsss4qfghc4da638fsm"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/17a4772d409aa5dbda5fb84d86c237fd2653c70b/recipes/org-evil"; + sha256 = "0wvd201k9b9ghg39rwbah6rw8b7hyyd27vvqjynjwbk3v8rp5zyn"; + name = "org-evil"; + }; + packageRequires = [ dash evil monitor org ]; + meta = { + homepage = "https://melpa.org/#/org-evil"; + license = lib.licenses.free; + }; + }) {}; org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-fstree"; @@ -45539,8 +46406,8 @@ version = "20140107.519"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "d1c1b7f8faad0c8e1253695c95bf2df06969830b"; - sha256 = "1ph9gxxmbpy5094jzn7gg5xcck30a0b7a2hqrxj9irgsh16bdhrx"; + rev = "17e73cf9496b9972e21c4024cd9719740c2b3e62"; + sha256 = "1hb7c7ab1jg445kdm0dp0w9f2ny9wa5f361jca7qck8jncq5gcjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ee69e5e7b1617a29919d5fcece92414212fdf963/recipes/org-mac-iCal"; @@ -45559,8 +46426,8 @@ version = "20160808.220"; src = fetchgit { url = "git://orgmode.org/org-mode.git"; - rev = "d1c1b7f8faad0c8e1253695c95bf2df06969830b"; - sha256 = "1ph9gxxmbpy5094jzn7gg5xcck30a0b7a2hqrxj9irgsh16bdhrx"; + rev = "17e73cf9496b9972e21c4024cd9719740c2b3e62"; + sha256 = "1hb7c7ab1jg445kdm0dp0w9f2ny9wa5f361jca7qck8jncq5gcjm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b86c666ee9b0620390a250dddd42b17cbec2409f/recipes/org-mac-link"; @@ -45794,12 +46661,12 @@ org-preview-html = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "org-preview-html"; - version = "20160906.2327"; + version = "20160913.526"; src = fetchFromGitHub { owner = "lujun9972"; repo = "org-preview-html"; - rev = "0a6bf43046b2bff794f9d414b7171132dd23cecc"; - sha256 = "0xwwkgj4i28dr2wxq5fw7badpn9vk40hnfa83f3ay7c8z2rcz8ci"; + rev = "2b6afbaf1fcf781bcd53074ee62895f15f5282e5"; + sha256 = "1cr68gn093q7vvkald2gwcxns2ypqxhc5vavjj1j81ijrh1y1h2w"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9d433daa1a3b95646f3957ba58c49db2a6da2768/recipes/org-preview-html"; @@ -45926,12 +46793,12 @@ org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, ivy, key-chord, lib, melpaBuild, s }: melpaBuild { pname = "org-ref"; - version = "20160907.551"; + version = "20161001.719"; src = fetchFromGitHub { owner = "jkitchin"; repo = "org-ref"; - rev = "873337642b9b312803ae743d0d636947e74470b1"; - sha256 = "07s5n35qinihzg4lq2aazdidx48zmzi36vrd3iri50r149ks1gfm"; + rev = "341108cdc4830e604ba0145688bc99149efc051b"; + sha256 = "19jwj6m5nzjkv9p992amnwhvhwx0dz0cfhaa1radsiq17hj9mn5d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/550e4dcef2f74fbd96474561c1cb6c4fd80091fe/recipes/org-ref"; @@ -45982,8 +46849,8 @@ src = fetchFromGitHub { owner = "brabalan"; repo = "org-review"; - rev = "44773bbd9868bb3ddca27cd35d2fc54139a70ab5"; - sha256 = "1iqcxdni680pgl9azi7khx2ns3mh8sgpbq1mcc4ivxkbwrb93crb"; + rev = "058e75b7f28d2ad2390290fe17a63d98ef5ab763"; + sha256 = "1j917zblg5ncls9lbvpzhqal55mx27d3kpvhzvjw2h7x47ji6iym"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b474cf4f237c28771c48fb770dc88b57193976f0/recipes/org-review"; @@ -46237,12 +47104,12 @@ org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "org-vcard"; - version = "20151213.2222"; + version = "20161001.2202"; src = fetchFromGitHub { owner = "flexibeast"; repo = "org-vcard"; - rev = "928827c1de3c90045df3ea4fb07db4af9d3b0a22"; - sha256 = "1m2xdp6wfg11wi7s4i675c3m5qancm8bpizcf380r6vmkcdfkrdy"; + rev = "58f83784c580da893c214bd729aae3ab5d285f33"; + sha256 = "122qxg0ji9c7zj52vqlf9d6276w7rdlxg4ippy6dayqs8bhkimbg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/df860814a09c376c9a6a2c5e7f528bbae29810b2/recipes/org-vcard"; @@ -46405,12 +47272,12 @@ organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "organic-green-theme"; - version = "20160811.1539"; + version = "20160919.229"; src = fetchFromGitHub { owner = "kostafey"; repo = "organic-green-theme"; - rev = "e36bea4f8d424a856225639d9195afdc40dadb5d"; - sha256 = "16vc6f0c2ba14fgvplxdxzrdfqagfxgp9apiz5bvbbfs2gb7gphk"; + rev = "3b4601264c41ddbe62ba25a78c00365379cd2c9f"; + sha256 = "0sb17krqla5l2bk14p55dbxxkghsvs6ynsmcjg7qlhspv53zdcn4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9383ef5f0372724b34f4bb9173ef8ccbb773e19e/recipes/organic-green-theme"; @@ -46594,12 +47461,12 @@ origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "origami"; - version = "20160710.958"; + version = "20160924.218"; src = fetchFromGitHub { owner = "gregsexton"; repo = "origami.el"; - rev = "b571187d68dbfbbc797ac0869c0b3650ad421d00"; - sha256 = "1mranmf55rifh16vb89dfmvknfpilbqr7dvg1w6j373lh22jl2j7"; + rev = "a77d7f16345296bbbccc4f3d0fe45587c3907493"; + sha256 = "13w5mcdxvjzbixbg5kszlqrzrd5l51ddx1z65ir8zjp4xnbf9ysn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b816be227dfc7330292a50346c4bb37394d3e998/recipes/origami"; @@ -46678,12 +47545,12 @@ osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "osx-lib"; - version = "20160830.1149"; + version = "20160919.1700"; src = fetchFromGitHub { owner = "raghavgautam"; repo = "osx-lib"; - rev = "448dd983427a6130ff5606d3eff4198efedd54da"; - sha256 = "0g7iybibja08babmvdkdhdya97lxxyhywwy5ngis2zh7jkazsy3h"; + rev = "fdbbb41e07ba64d6a09b54bd142a7c7b83bfd09f"; + sha256 = "0n03yca62znrri1pg0cl4xzm4lkmdqyf1p9sm1vfjwlwxk552z5x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b42ae666e3511752f5138927e7bf7965bd9f7ee5/recipes/osx-lib"; @@ -46703,8 +47570,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "osx-location"; - rev = "110aee945b53ea550e4debe69bf3c077d940ec8c"; - sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x"; + rev = "84e9269f6c66e52e8bbe8a0cd55932e7b3e7977e"; + sha256 = "0yixzqx2b5pnc4qs2qas0jm7sxls511x9ahasqizsawcnqd43apg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8673dafb02a8d70c278bfd2c063f40992defe3a3/recipes/osx-location"; @@ -47018,8 +47885,8 @@ src = fetchFromGitHub { owner = "jkitchin"; repo = "scimax"; - rev = "652b43a77aab502498656117aa278f8f09a517db"; - sha256 = "11xgz0fl8biimkffmbfccinb0gr3zb5a57lrb7br1j22ncdacmyh"; + rev = "db84d90c9bedc7581129323fb3448b1e771de815"; + sha256 = "0b12n6wr6yn33f1ybbzf2pivhzdx5947ja91xclba5rl8n9d9r6y"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/222ccf4480395bda8c582ad5faf8c7902a69370e/recipes/ox-clip"; @@ -47137,22 +48004,22 @@ license = lib.licenses.free; }; }) {}; - ox-latex-chinese = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + ox-latex-chinese = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-latex-chinese"; - version = "20160513.1728"; + version = "20160928.2153"; src = fetchFromGitHub { owner = "tumashu"; repo = "ox-latex-chinese"; - rev = "7b5d4830858f5d283a5b13479dd7452f1bcc301b"; - sha256 = "1g42aq4iaq40aivncxw663hnsb2768lzc08dmsmk4lq5q9kzcjhg"; + rev = "338b168bac4c44f8f4d212f67a2190a70eacd240"; + sha256 = "1wh0ds7cznnvvh9rg3wsapdhxi8pplimszhzliglgj8sqfyb7kcx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a679ebaedcb496f915b9338f9d5c003e1389594d/recipes/ox-latex-chinese"; sha256 = "138yprik36jxhm6dnj42gaynqd84w7ya3s0kbnxhbizrfl4n4ck7"; name = "ox-latex-chinese"; }; - packageRequires = [ emacs ]; + packageRequires = [ cl-lib emacs ]; meta = { homepage = "https://melpa.org/#/ox-latex-chinese"; license = lib.licenses.free; @@ -47371,12 +48238,12 @@ ox-tufte = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "ox-tufte"; - version = "20160906.1801"; + version = "20160926.907"; src = fetchFromGitHub { owner = "dakrone"; repo = "ox-tufte"; - rev = "fe7e7cec0559acdaeb89d6dc99e50ad698723207"; - sha256 = "0fm0qmqcq6alk2sw3vlybqjlkwxp14zaqgi5r2lnmq4z0lsxa5sv"; + rev = "49d7ea78fde063b407ce6fa57739f90c83500682"; + sha256 = "1hb5s8m8r5nbz2kii1g975m3p4lnfkwraxhd71zhfvagf13wfkxd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e1592b788ef7218cfb4b3da8599b6cd23eef357/recipes/ox-tufte"; @@ -47392,12 +48259,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "20160820.604"; + version = "20160915.207"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "ca98e2c312c6be1165b956f655a4becc89776634"; - sha256 = "0ranapdq6ly5xrqcksisgazwjp5xvydn98qfi8i1b491163704m3"; + rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; + sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -47648,8 +48515,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "page-break-lines"; - rev = "67b5928a7f14568baf2716b5741e13659a86b9ea"; - sha256 = "1wp974716ih2cz9kdmdz7xwjy1qnnfzdzlfr9kchknagw8d9nn12"; + rev = "9229260e88fe84b53d384677fe5eda4a6652f015"; + sha256 = "11gg3bc41cn1fa04b6gf6r6bf5di1ffwbagmh2bb0n0i42idlcw8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22b6035987994c11d5e2564862efb1e56848c3b6/recipes/page-break-lines"; @@ -47851,12 +48718,12 @@ paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }: melpaBuild { pname = "paradox"; - version = "20160525.736"; + version = "20161002.1154"; src = fetchFromGitHub { owner = "Malabarba"; repo = "paradox"; - rev = "9086bd2241f86488e816682af0ef9897569ab31b"; - sha256 = "1vq3xjllgvzwp18mv2y1qydbbl6j1nk58vw7sm99zsf3wdpls465"; + rev = "c899a6d573294b34fc5950080d51caa0899a70d1"; + sha256 = "1kjakgwb0ypg48w90wi5ky2i51g5jys8d5ljbmmra3m7af03pfpg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1e6aed365c42987d64d0cd9a8a6178339b1b39e8/recipes/paradox"; @@ -47895,8 +48762,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "paredit-everywhere"; - rev = "79ecbfc15d2cb338f277f3da50d8e757f07151e9"; - sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv"; + rev = "94c92095c2096713fb3e2f7662ddd994f4b694c6"; + sha256 = "120m6vs6bb9cav88wpv97kd7s8vvmg6pry6pmf7jk6i7l1wj0iaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/593890222d074c6a308eb1b809077c6861e1af30/recipes/paredit-everywhere"; @@ -47993,6 +48860,27 @@ license = lib.licenses.free; }; }) {}; + parinfer = callPackage ({ aggressive-indent, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "parinfer"; + version = "20161003.1729"; + src = fetchFromGitHub { + owner = "DogLooksGood"; + repo = "parinfer-mode"; + rev = "4d7fc1cdcf0d0e1674996e72a9f4feccec0d6c7f"; + sha256 = "120qvffimvw01d1dchgrs85h5lw8x8wp78vpfz6g1iny1nspsajg"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; + sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i"; + name = "parinfer"; + }; + packageRequires = [ aggressive-indent cl-lib dash ]; + meta = { + homepage = "https://melpa.org/#/parinfer"; + license = lib.licenses.free; + }; + }) {}; parse-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parse-csv"; @@ -48372,12 +49260,12 @@ pcap-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pcap-mode"; - version = "20160830.1322"; + version = "20160923.819"; src = fetchFromGitHub { owner = "orgcandman"; repo = "pcap-mode"; - rev = "33356c815377e9d966768cefb15227ee5990ed1f"; - sha256 = "0h60m349xyfpvj2ik9akp37xx5wrfsbyi0n9zhhnjvx7lny0vafn"; + rev = "38169363f8e1da3837b049762e537a9c9bb516ca"; + sha256 = "13cf00pj238hmcmspvhwp6wrp2a2s0s5h2fzafpk1dn251yfybhc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44f4cb526556a4b58b7e67314002e73413a59a76/recipes/pcap-mode"; @@ -48812,12 +49700,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "20160830.228"; + version = "20161001.533"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "2c559083fa316b97b76e25c491a45aec5f2fe501"; - sha256 = "091k1pnkw4a62di6lj7gkczzpgf2jsxpj3brpfjs8gkcgx07vxsh"; + rev = "8d66aa2f9f16d64ab6808e80c25dd9baf7c9e754"; + sha256 = "0ax2yap12jicgdfvgzvn0vzrdn3k1xn06g3qj4rparkw4wl890zn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -49232,12 +50120,12 @@ php-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "php-mode"; - version = "20160831.819"; + version = "20160910.1801"; src = fetchFromGitHub { owner = "ejmr"; repo = "php-mode"; - rev = "182c0b583216ec02e259dc5bdb16c72fb92814b8"; - sha256 = "1zni6yb83bj09pw9p9p6i4jwq2l0k62bnc114jd8cbsmr55axla3"; + rev = "7337424d83aa77fbb5d12ba2a54293744ab30d36"; + sha256 = "1zn9c9ja36yf22mbfsfa32zrd5mwx2kqsnf740l4qnn9gwpvi5mg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7cdbc35fee67b87b87ec72aa00e6dca77aef17c4/recipes/php-mode"; @@ -49547,12 +50435,12 @@ pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pip-requirements"; - version = "20160131.926"; + version = "20160930.2032"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pip-requirements.el"; - rev = "a3656a8949c78f3d64b9a13ae3ed868005d82119"; - sha256 = "0j4h6q1s2s9dw1pp22xsajchwg8nh3x4x5qxbzf19i1xbpcghw7h"; + rev = "babe44af1132fb05748c7ee098a4226b9e31eb76"; + sha256 = "0x9kqqi36pvh04x6ng20wz9c47s7pndfawyw0j7yp9i0sgqbc1bh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements"; @@ -49635,8 +50523,8 @@ src = fetchFromGitHub { owner = "lunaryorn"; repo = "pkg-info.el"; - rev = "4dbe328c9eced79e0004e3fdcd7bfb997a928be5"; - sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2"; + rev = "76ba7415480687d05a4353b27fea2ae02b8d9d61"; + sha256 = "150xhsv695cchs5jc2hwk9gjgs0k8wkm966crvxxs6xvj5fg69xq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/73fc80e94c98ff304a521466c6577c96a10e79a8/recipes/pkg-info"; @@ -49736,12 +50624,12 @@ plantuml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "plantuml-mode"; - version = "20150531.2331"; + version = "20160928.900"; src = fetchFromGitHub { owner = "zwz"; repo = "plantuml-mode"; - rev = "574f5e79605a028912bb90c03487c80b1db612e7"; - sha256 = "03nw4af1lgfppsbfq945c9pcz6ynhvpzlfdx3az83zi24b10az8n"; + rev = "fa3e2e96e1a96516ad9b8ae7a55548556e4ed603"; + sha256 = "0rkfdbw5mhlb41y879nnkqf3j5063nha56klgn8bcidjfg4qq8hs"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/cad28f1bb83685ca355e230b46f1e0eebe2f7bb1/recipes/plantuml-mode"; @@ -49943,8 +50831,8 @@ version = "20160827.857"; src = fetchgit { url = "git://git.savannah.gnu.org/gettext.git"; - rev = "9c38baf93e46a2223b524f91ff744cff2a0e1157"; - sha256 = "1gghn58k2i887sib2m1agj3d94dm3ac3gr2gxxqyx08cqdm1sxpy"; + rev = "dce3a16e5e9368245735e29bf498dcd5e3e474a4"; + sha256 = "0pnb3fwxvmk1rgc0y6cap6yswv6kp7nycl2sbc19rq7pjwamzvaz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9317ccb52cdbaa2b273f8b2e8a598c9895b1cde1/recipes/po-mode"; @@ -49978,6 +50866,27 @@ license = lib.licenses.free; }; }) {}; + podcaster = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "podcaster"; + version = "20160930.433"; + src = fetchFromGitHub { + owner = "lujun9972"; + repo = "podcaster"; + rev = "d216120ee920715ae783245dc54e823f6a2cf7f4"; + sha256 = "0wflg2r7l1701vm7hn5iarbf1aw7d9h643l9ln24b42g8fwfpml1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2649dc294f40d00f3bf1b1cf09879c2ef0d3e43b/recipes/podcaster"; + sha256 = "1kzac0mhg8dk2vfk29ns36jl8vwg6ghbdb3n6kqfzci5ygn96yib"; + name = "podcaster"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://melpa.org/#/podcaster"; + license = lib.licenses.free; + }; + }) {}; point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "point-stack"; @@ -50788,12 +51697,12 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "20160815.1255"; + version = "20160929.2302"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "2bb744f3ff96805a854c7b34258f7d5ce51127b3"; - sha256 = "0ywxcad282nspafs3vnpfvzzjzcsxclf4j4nkw85q3wvpsb1671q"; + rev = "a2d1af72b97c7cad0b601b80ef36d242b34483d1"; + sha256 = "1dj2dx7vvvwg2839gy4qfr8kmlvzjs7n8xwj21vmxr6fqaa7cy3p"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy"; @@ -50974,12 +51883,12 @@ projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "projectile"; - version = "20160830.138"; + version = "20160926.1133"; src = fetchFromGitHub { owner = "bbatsov"; repo = "projectile"; - rev = "3e56c2f3c6ca4e28997320480a4115e4edf1a63c"; - sha256 = "0hxv2p8bwxz86mzq7dw8jdxai71ny5g0ig7171p51bvxx34xm7f8"; + rev = "5ad4275672beff1404ebead240836e0697cea4b2"; + sha256 = "0v8pbnrs9bi5nv4mg51968s8lsm161rk164x84dv9lwh4hsk1sms"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca7bf43ef8893bf04e9658390e306ef69e80a156/recipes/projectile"; @@ -51058,12 +51967,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "20160830.858"; + version = "20160923.708"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "70ec237ce49172ccc4daa536505749e3d4701469"; - sha256 = "0jvj0lxy7mhkv8ql472zz6wyrmh72cw1z9n1200z5g8p4n7jfjsj"; + rev = "c3a54723005d015d5d4364e4c74617dfd10ee294"; + sha256 = "1gywkxm9qk7y5za6fzjizxlc1lvwwa4mhadcyf1pxpq2119yhqy0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -51104,8 +52013,8 @@ src = fetchFromGitHub { owner = "anshulverma"; repo = "projectile-speedbar"; - rev = "95309e3e6041db3903129568c655a402b8153cc1"; - sha256 = "12nhmmdd9xnpf47hv76ljwhkkallqxpq7d9yc5p5ygl65xcindd4"; + rev = "2b9758fbf0b9c314a939630438822fbe2b538524"; + sha256 = "0383rg1zh03r8jbrm898lf0fxs74rgsivlvclr3lidf9h7har2yg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eda8cb5a175258404c347ffa30fca002504467a0/recipes/projectile-speedbar"; @@ -51118,15 +52027,36 @@ license = lib.licenses.free; }; }) {}; + projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + melpaBuild { + pname = "projectile-variable"; + version = "20160910.1005"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "projectile-variable"; + rev = "810394eabf330325a86ec6f60c69e160eb837ac3"; + sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; + sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji"; + name = "projectile-variable"; + }; + packageRequires = [ cl-lib emacs projectile ]; + meta = { + homepage = "https://melpa.org/#/projectile-variable"; + license = lib.licenses.free; + }; + }) {}; projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: melpaBuild { pname = "projector"; - version = "20160822.948"; + version = "20160929.2052"; src = fetchFromGitHub { owner = "waymondo"; repo = "projector.el"; - rev = "62ecd304df6fe643f1943ecbf1b85976c5689226"; - sha256 = "0ya5dykp2w1lpykj59k015xgmn36n87mbdynsrmdyzm9vbrjr5r1"; + rev = "e86b89e836ce2d0544b96235ef158d1252fd790f"; + sha256 = "1484gb3lxj8inh7q1z05mqiv5ddq2yymdlmhjxrl1l7c3lqbapn9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/420ffea4549f59677a16c1ee89c77b866487e302/recipes/projector"; @@ -51202,6 +52132,27 @@ license = lib.licenses.free; }; }) {}; + prompts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "prompts"; + version = "20160916.341"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "prompts.el"; + rev = "1cd5e732ff2a86b47836eb7252e5b59cd4b6ab26"; + sha256 = "10y8x54p64zs1jlq4nf1kixpb42078n2gdf9s62b1siyb1vhl581"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2395402e72d9b0f7ce2ca5fcb4497919f90a8fe2/recipes/prompts"; + sha256 = "1fz5sbc45jiq64y89lm8nj6lsanq3lzyjzahxzrgqvr7655pphzm"; + name = "prompts"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/prompts"; + license = lib.licenses.free; + }; + }) {}; prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "prop-menu"; @@ -51272,8 +52223,8 @@ src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "74638a253ea76baa0aed78491b92d157326295a6"; - sha256 = "18xz1ic5cz2vlypxwxz81z3m2cf36wl8dqw7fbbgq20z6c3zl76h"; + rev = "4d8752780715582aec3011e40a45778959acbe24"; + sha256 = "1bcnim7lj1r57a04h3j1pwzkx16nbrd89cvdl75n07iz47pkzpiz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -51289,12 +52240,12 @@ psc-ide = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "psc-ide"; - version = "20160720.1502"; + version = "20160926.619"; src = fetchFromGitHub { owner = "epost"; repo = "psc-ide-emacs"; - rev = "78df84316807f0efc0f39450172cc2e2f17c9acd"; - sha256 = "0z725mmwkb9b9py65vfs3pkn8pqd39ayc84v56y49gsqd0krdqhf"; + rev = "49d021de7fcba3717904f15d164524c754297726"; + sha256 = "1v4jj5qgiz74skg40q9wwsgqfawzf06q2pplaa2gbnl0ghsx9473"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8189f4e7d6742d72fb22acf61a9d7eb0bffb2d93/recipes/psc-ide"; @@ -51415,12 +52366,12 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "20160723.2236"; + version = "20160915.252"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "4a25f6b0ba51b87d882d4062de1601c49b2a822d"; - sha256 = "13rkmi7ckchd42zjl6lm7wdf6402xwjxvi1839lkzlmlb49xf47b"; + rev = "bff32a818ccc9e400210b942bd5e67fa21551148"; + sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -51667,12 +52618,12 @@ py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-autopep8"; - version = "20151231.614"; + version = "20160925.352"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-autopep8.el"; - rev = "575ca51c928e6aaf01650901bce3df1122a11a4c"; - sha256 = "1iw94m1bvsmadlj16f8ymwx0q6f9lqysy7by76hkpiwqqhd2i8rv"; + rev = "68e12d8788c91c7ec53a68acf1d23adb2ffa4788"; + sha256 = "16fmym6hvi2lx0mmbrrhld1vzki5iqfqx2m0xa9021gjjzb33lw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c400e0f3cfe70821e621fe85d239b4f6596d5171/recipes/py-autopep8"; @@ -51730,12 +52681,12 @@ py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-isort"; - version = "20150422.839"; + version = "20160925.318"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-isort.el"; - rev = "cfbb576784fe4501909c15299607ce2a2d0bf164"; - sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr"; + rev = "e67306f459c47c53a65604e4eea88a3914596560"; + sha256 = "08i55gv392wc12x8v3dca0dmz8a8p9ljsqhyajsb6qv1k120wqhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44377d11da07b49c8dc6887c948cc5ddfc065bd2/recipes/py-isort"; @@ -51793,12 +52744,12 @@ py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-yapf"; - version = "20160101.412"; + version = "20160925.422"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-yapf.el"; - rev = "56807d28bf288afec2e2999982074bdd5e9bf932"; - sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg"; + rev = "a878304202ad827a1f3de3dce1badd9ca8731146"; + sha256 = "1mmzqdigxx46my0h9497l25cjydy3vykg6slxkch4dzvhhlbap48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3306c6906d4b21868b9407de27fbebdaed3d00d5/recipes/py-yapf"; @@ -51964,8 +52915,8 @@ src = fetchFromGitHub { owner = "Wilfred"; repo = "pyimport"; - rev = "8b4c6ef8a79da35c847ad5581367012f6c4493ca"; - sha256 = "01gdzs2x2kdi7nwdcnp2iw8cbvzzqrsi9wqwc9wb4ny8ly4q75w6"; + rev = "f5e56b683eed07bfbcc2fe7256b59a8e8c09a492"; + sha256 = "08b0bmky35wfzy2ax7llvw19clkh5gb5if5k46s1js5a193l2qd1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/71bc39b06cee37814960ef31c6a2056261b802fb/recipes/pyimport"; @@ -52006,8 +52957,8 @@ src = fetchFromGitHub { owner = "PyCQA"; repo = "pylint"; - rev = "537885ec90ba7d949a929ac560760d0f4199a936"; - sha256 = "0cpalx34w2jhrmyc04a3108in8xv0qfsia388ksid373l7zaqd5z"; + rev = "05cc9a7dc82afeb32a315f5cbe2a132a2dac513e"; + sha256 = "1lhfsy29fxr1r9c5qygiwmj9a48l5vnrmm5cl3pdd1hdcmsdphnz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a073c91d6f4d31b82f6bfee785044c4e3ae96d3f/recipes/pylint"; @@ -52149,12 +53100,12 @@ python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-mode"; - version = "20160901.1048"; + version = "20160911.1032"; src = fetchFromGitLab { owner = "python-mode-devs"; repo = "python-mode"; - rev = "ef8df01d62097e38ec76940822440c9cc1e895b4"; - sha256 = "1yfcv70yv73cqmnwlvgqpda18xxkd7cdqn3jjp8bicillnpl04xz"; + rev = "a9cf4f5183228a6c6a31f676e3f5a47d7322a213"; + sha256 = "1yisakjmzd75mbdq2wrwdq06dkvyfzxkqg02llwv9wg8s2pbbn30"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82861e1ab114451af5e1106d53195afd3605448a/recipes/python-mode"; @@ -52170,12 +53121,12 @@ python-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "python-test"; - version = "20160801.1224"; + version = "20160924.1013"; src = fetchFromGitHub { owner = "emacs-pe"; repo = "python-test.el"; - rev = "a1a72be0d48c0270c7475ee216b061b07edaa97a"; - sha256 = "0bdg0zkh7hrx2v50d3nqyqz0bza68yirh46lqb9grw5ck3fkfnir"; + rev = "38fd3d63b810d3f82624224354ea3f0d5a3327f1"; + sha256 = "1w8xl3h34b34q8ar1rrp5jmssqzj5dnz11dzg0cj9iwszw1kgpcy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0ea68b3aa9c057e81a3e90a359a38ac16cb26c2f/recipes/python-test"; @@ -52191,12 +53142,12 @@ python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }: melpaBuild { pname = "python-x"; - version = "20160313.636"; + version = "20160923.548"; src = fetchFromGitHub { owner = "wavexx"; repo = "python-x.el"; - rev = "852ca78c70c22fc76f0cb15d57046d510e295ba6"; - sha256 = "1shz8qha2cqv89hz27aazwd6qbf4qnz17h6hh8in5qxgfsndi7pp"; + rev = "d9827cbf410717cd2d6f5f64a70ee64e9ae5b8b3"; + sha256 = "0ggbzjgqgwm0858gp2iyv0zh5337jv2kaswy8af2yqa6vm0fr7gl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/87ed5ea4868945df1bf92d1eae5d3ebb83ece117/recipes/python-x"; @@ -52317,12 +53268,12 @@ quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "quasi-monochrome-theme"; - version = "20150801.1325"; + version = "20160913.638"; src = fetchFromGitHub { owner = "lbolla"; repo = "emacs-quasi-monochrome"; - rev = "cc363fc72b6824122aadf6b7d27dfeac38f61901"; - sha256 = "0y7mdizx6km3000cqjrirlgwzkq56asnzl8n1bl56pk5d9grfx9h"; + rev = "75c515a30a77aa4661e41d67e5bba13f422bdf60"; + sha256 = "1932vjindz0mkfizbs1d19af9p78kl9cd05isjbd5sjwzs420bd9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9c8498e4bcca19c4c24b2fd0db035c3da477e2a/recipes/quasi-monochrome-theme"; @@ -52447,8 +53398,8 @@ src = fetchFromGitHub { owner = "syohex"; repo = "emacs-quickrun"; - rev = "cd9052132dbde7c8526309a0c21fc5a60c709a46"; - sha256 = "17l9kdfc2zc4d4alg4pfi7s6wlk51yxll6bdlcr4rbn67nj5lacj"; + rev = "487a74c7db513ceba86e849c8f42f834234c1f7b"; + sha256 = "04n6y5ymn29saaikzfg8ak57kqysh8915bvvzkiijmzbqr6ndsgj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/81f0f525680fea98e804f39dbde1dada887e8821/recipes/quickrun"; @@ -52506,12 +53457,12 @@ racer = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }: melpaBuild { pname = "racer"; - version = "20160829.2022"; + version = "20161003.1655"; src = fetchFromGitHub { owner = "racer-rust"; repo = "emacs-racer"; - rev = "8b35f743157e3c8b34bfec193a8f055f402bae8c"; - sha256 = "055jfkac0yiv9jdp50bzczyvvwnhhsy1rici8qwiv5pk3i89nj4v"; + rev = "47a29c4420f9b80b2b0dda87c34b4300df50a59e"; + sha256 = "0gc3ji639h93yawbbyj0w7cb9rnapyhgif33gpl3dqpgwv12bk28"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/97b97037c19655a3ddffee9a86359961f26c155c/recipes/racer"; @@ -52527,12 +53478,12 @@ racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "racket-mode"; - version = "20160829.846"; + version = "20160923.851"; src = fetchFromGitHub { owner = "greghendershott"; repo = "racket-mode"; - rev = "b6a7db7a3831268ebd5e9a68036486486abfacdd"; - sha256 = "0z7gxcldmqhzvi33a7g1rjwmyc5aim4ga0f4hb0ajbl0kwxl6m4d"; + rev = "2dbceb055495e95a2a2a9d2abdc7f2a5eed47187"; + sha256 = "1mbbmcaqpli83za1d5imy9mw50wv5p0wsinhvmi1i4q9gk3fkg1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7ad88d92cf02e718c9318d197dd458a2ecfc0f46/recipes/racket-mode"; @@ -52779,12 +53730,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "20160823.1611"; + version = "20161002.2336"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "58d3f847400294e0c096fc0cff45e71173721aba"; - sha256 = "1aygddzfhrmalivsy99bapvzvi7fq7h25nxbpb8zfcwb3wizmr36"; + rev = "584e4ae8cce1c54a44b40dd4c77fbb2f06d73ecb"; + sha256 = "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -52884,12 +53835,12 @@ rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rc-mode"; - version = "20160906.1227"; + version = "20160913.1218"; src = fetchFromGitHub { owner = "mrhmouse"; repo = "rc-mode.el"; - rev = "70b1e93f40d2f24dfb5619605fedbb1dc05cbe60"; - sha256 = "0jpsp8zbcdf7yrfakv9dycw606yqcb497k9w5aj16a8r37xg089l"; + rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f"; + sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode"; @@ -53094,12 +54045,12 @@ read-aloud = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "read-aloud"; - version = "20160815.928"; + version = "20160922.2200"; src = fetchFromGitHub { owner = "gromnitsky"; repo = "read-aloud.el"; - rev = "ebdc1180648cc5db6d6ab9ce8bdcf37858cc08ae"; - sha256 = "11l2nq80xsqlvpwhg2gvcam46x0b3gsa2jrdcs64sjyfbi2s8igk"; + rev = "d5f80ab72054a957aed25224639c1779cae5f4d1"; + sha256 = "1hbb6diz96jabajxrnancjfpyd9div8vzbwys1f5bddi9z8l2jyy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/20452bf3112276a7e1c880bfab259150fc70b47a/recipes/read-aloud"; @@ -53391,12 +54342,12 @@ rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rectangle-utils"; - version = "20160427.1024"; + version = "20160914.2108"; src = fetchFromGitHub { owner = "thierryvolpiatto"; repo = "rectangle-utils"; - rev = "5ee8a0955967181629393e1fd6589a6e2590a56e"; - sha256 = "0i336qakdkvxgyhjfq6b957xqlll156i1a8g1f5xap46v35d6gh3"; + rev = "6fe38fdd48ef5305a908b94a043a966ac3f2053a"; + sha256 = "08n3ah40gfgkbriwj2z3y0751vpvgz86qjdn6dxs4mghjrwr2545"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1852b75c82822e97c39b7c7caeb2a32246171be4/recipes/rectangle-utils"; @@ -53493,12 +54444,12 @@ redprl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "redprl"; - version = "20160905.1415"; + version = "20160912.1847"; src = fetchFromGitHub { owner = "RedPRL"; repo = "sml-redprl"; - rev = "80cce07e97ef1816c86c851b525461c6dd505849"; - sha256 = "1vk6hqjsc6dr9n1hf4wjhihimb9pyi0qyqfwrj8y5b1cv2rzvc01"; + rev = "80e9ce1f30594b342a04e06abad0065604a5e5fc"; + sha256 = "0ja7cs0byziwzqdrpwcx02jpzrqjqk6xik46yjwa47zfcpwsaxcw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/06e7371d703ffdc5b6ea555f2ed289e57e71e377/recipes/redprl"; @@ -53576,12 +54527,12 @@ refine = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, loop, melpaBuild, s }: melpaBuild { pname = "refine"; - version = "20160726.2025"; + version = "20160924.1555"; src = fetchFromGitHub { owner = "Wilfred"; repo = "refine"; - rev = "6546f1cbe9255b4b6009ae5c26ab6b1594f47990"; - sha256 = "09xg830hxivhxpi34ajvmj0zs6ygph1s907r1wizi27hgpbgg6zv"; + rev = "d1f5ced303957ce602385d6491e25cf1b0068d4f"; + sha256 = "1liflg4nnwy4ara41s1c91g1ahlz9p7r500rbkx201lknspavpkz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b111879ea0685cda88c758b270304d9e913c1391/recipes/refine"; @@ -53618,12 +54569,12 @@ regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "regex-tool"; - version = "20131104.1434"; + version = "20160907.2129"; src = fetchFromGitHub { owner = "jwiegley"; repo = "regex-tool"; - rev = "62b292d93f29e4c4767b0800d53c656b9f626892"; - sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l"; + rev = "0de0716dc26b1182f7f986d8442345aad135019e"; + sha256 = "1xjm3pqj1cf7cizbc6arqmk608w6cg49j284zrij0bvmyc5pbrj9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a9585fc1f0576e82a6a199828fa9773a0694da63/recipes/regex-tool"; @@ -53702,11 +54653,11 @@ related = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "related"; - version = "20160601.2254"; + version = "20161002.2310"; src = fetchgit { url = "https://bitbucket.org/lyude/related"; - rev = "dbdcbc1f3c8b02debeaec4073ea71e598e3373d9"; - sha256 = "0dl7lnf5318b0a842qgs5mg2s1c0i4vsl9ji6801z6w53mc46cgv"; + rev = "0065a2e16eeaa9bface49f7f0815b9cf9719f441"; + sha256 = "0gaj1mqv77dahw6zfqlf8q624b2ba589chgaa22vy4vg3lz6qzks"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a39b2fd835f6911e3dd2b42987f65d5bbea36091/recipes/related"; @@ -54080,8 +55031,8 @@ src = fetchFromGitHub { owner = "iqbalansari"; repo = "restart-emacs"; - rev = "be789b13ff6358e13a2b7d57224072fb1b108f09"; - sha256 = "1a2myx5isiwr29yhplmv07bisc8rvrabzz9dn239jf4gvr8x89ry"; + rev = "0dc6d689cd7fa080fe7c19431863bf7186f910e9"; + sha256 = "082izk2wmsdspyizfbvqw34rigvbfwq2963zf4iqlniqv05p88pd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9faeb6d910d686cbcafe7d12e0bcf62a85689bd/recipes/restart-emacs"; @@ -54424,15 +55375,57 @@ license = lib.licenses.free; }; }) {}; + ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ripgrep"; + version = "20160928.9"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "ripgrep.el"; + rev = "77e8aa61b5b893c037d87117943a164514c6145f"; + sha256 = "1xs8h2g02jdb05c07bk9qfvxvfchgzhccj5yhkxbnpxqmxpcskdc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; + sha256 = "1j9c3mhcyhs4xf44z6fnlvmb81pps25bp43gdqvp0954i068mgah"; + name = "ripgrep"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ripgrep"; + license = lib.licenses.free; + }; + }) {}; + riscv-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "riscv-mode"; + version = "20161001.1838"; + src = fetchFromGitHub { + owner = "AdamNiederer"; + repo = "riscv-mode"; + rev = "bfd7b91d25748158923c2194242e344df2f708a8"; + sha256 = "1kcl64klksvxjk0zrgn6w4647r7xwa3xinl5jlvi46wync54hivj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0853b4b678be7d1906a2f7946bfa1072590faf72/recipes/riscv-mode"; + sha256 = "0496b7xwshmk3gv6s5hggbm9qd60a05racj3xcsxwqzak359lk2b"; + name = "riscv-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/riscv-mode"; + license = lib.licenses.free; + }; + }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; - version = "20160518.259"; + version = "20160926.656"; src = fetchFromGitHub { owner = "dgutov"; repo = "robe"; - rev = "1d03485c37632f8fde0988b24de4f4b26bab07c0"; - sha256 = "0fwxn6pplyh5frwwqk46zq38nj5m2sl1idk1va2jqwnj5r407g78"; + rev = "0c6d8b52293dea80e62b73204871d177c8896c0c"; + sha256 = "0brhw5fl5xhmmwx27aj1yqjslqvk0qdj4akpgq1ikpx8y4gac95d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/673f920d02fe761bc080b73db7d37dbf5b6d86d8/recipes/robe"; @@ -54490,12 +55483,12 @@ rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rope-read-mode"; - version = "20160603.9"; + version = "20161003.610"; src = fetchFromGitHub { owner = "marcowahl"; repo = "rope-read-mode"; - rev = "7bb3b8b2d250bfd63b988f4469ff62979ebcee8c"; - sha256 = "0f90m47d1qyl16bq7gqz0xxx38jfgjay7s404q8ikwkvjhg3p85y"; + rev = "442886655166e9c9472d6aebad27aaf2fed3f3e0"; + sha256 = "1f4wp85j691sgc1yx3l73bdm5lvqgvgms2ic9yg3g0v5n8drgn1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/14a674559aa485e92357a8b941304ae8167b9c3e/recipes/rope-read-mode"; @@ -54511,16 +55504,16 @@ rotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rotate"; - version = "20160214.2318"; + version = "20160909.136"; src = fetchFromGitHub { - owner = "daic-h"; + owner = "daichirata"; repo = "emacs-rotate"; - rev = "868122fa807db32762a68defcf69654a28a5a39f"; - sha256 = "13xrjd5p2zq0r8ifbqbrgjfm0jj09nyxcbhk262jr6f171rf0y2m"; + rev = "091b5ac4fc310773253efb317e3dbe8e46959ba6"; + sha256 = "0msjn7ays71mcw6qmdk0mpjp1rvd7fwz917vmvlcd7cpmvkyfbds"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/771195f360543eab5c49da546bab0c7235f92ab5/recipes/rotate"; - sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/7d92e66cad586d4dc6b1de12d1b41b818b5232c2/recipes/rotate"; + sha256 = "11a0svvfq29cb4630jq0hz19xk9jfhfjnssm7vg0dnlzpxqi3vif"; name = "rotate"; }; packageRequires = []; @@ -54637,12 +55630,12 @@ rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rtags"; - version = "20160904.1233"; + version = "20160926.1010"; src = fetchFromGitHub { owner = "Andersbakken"; repo = "rtags"; - rev = "046372ccbf5b6a4367a873d23a784810f2bbda1b"; - sha256 = "1b5sfbvgyr2pa74fm24wmmiwmrrqfwawrfva9y8cj0fcnvvb198r"; + rev = "7b7a39429eca2a48c5c6e08aeed5623ce0198ba1"; + sha256 = "03qzg5mymr73x1aaxsm6xiqmn7l9s05bph2ahlrn77x8llrlcvfj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ac3b84fe84a7f57d09f1a303d8947ef19aaf02fb/recipes/rtags"; @@ -54700,11 +55693,11 @@ ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }: melpaBuild { pname = "ruby-additional"; - version = "20160607.157"; + version = "20160911.333"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56093"; - sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; + rev = "56336"; + sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/17cc8e84dd68f280c23f77510f58f21e7e7cbaae/recipes/ruby-additional"; @@ -54783,8 +55776,8 @@ version = "20150424.752"; src = fetchsvn { url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/"; - rev = "56093"; - sha256 = "0lcd5p5rkga6yfaaa5smy2pl1y1xv69ap33kyjmq58ajd78gql2m"; + rev = "56336"; + sha256 = "12w256fbx4xmwn96s0f66mvlczkmqdbi6w622l1b2sr3zbfh6wg8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d67431327845171f0e50d28e9276cbabecf6cb0/recipes/ruby-electric"; @@ -54867,8 +55860,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "ruby-hash-syntax"; - rev = "d73a498143a3a8d6d3a7720104f2f14e70b2e2ae"; - sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv"; + rev = "13288a29478a9e45ab4fd2188aea8d4894e08848"; + sha256 = "1zx70bdyqabx03g813h76ks9agy66yf08z9x83yw1rsf713d1pg2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c7d21a43a4bf267507bdc746ec9d0fd82049c0af/recipes/ruby-hash-syntax"; @@ -54926,12 +55919,12 @@ ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el, ruby-mode ? null }: melpaBuild { pname = "ruby-test-mode"; - version = "20160711.335"; + version = "20160930.9"; src = fetchFromGitHub { owner = "r0man"; repo = "ruby-test-mode"; - rev = "24c7b59a834413d60a97c5f59917dc13c247c883"; - sha256 = "0lcp5sil9fhlgq4mi1xc2zhrd5g4v84jviba8cs2rrhjx5ibwp1s"; + rev = "0924e9d17e0a9b7c5c1a4e878367be47f58a396c"; + sha256 = "0hlzkwll6di13hja3hm3nzmcjkwgciq9bziz837cr49agagz3b55"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/746e0e49a24f16baa5f1cc7f11220766ecf9f1fe/recipes/ruby-test-mode"; @@ -55010,12 +56003,12 @@ rust-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rust-mode"; - version = "20160820.255"; + version = "20160909.935"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-mode"; - rev = "5cfb9197af67e00ebd5bbcb05c28545c9014ea32"; - sha256 = "1pvb6imh89pnmxzdlivyidqqd7f1va29dvjhy5znw2qhw1myf4hn"; + rev = "1587839ba493b5ab98fb8415338172a9a22f224b"; + sha256 = "19di6dnk5fn91gqkjx0icr0scn1s3pkgrngp9ls2w96nl6i561l3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8f6e5d990d699d571dccbdeb13327b33389bb113/recipes/rust-mode"; @@ -55073,12 +56066,12 @@ s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "s"; - version = "20160711.525"; + version = "20160928.636"; src = fetchFromGitHub { owner = "magnars"; repo = "s.el"; - rev = "a767c1c04c3accef0bdd5e7e785f6dbee6dd85b8"; - sha256 = "1qwxynzsv7f9hn3np5jnqalp5xm88hcilpzp39fs3b2irpa0s3i4"; + rev = "fc395c8d5e6c14d5e0920ab80d4d5df007eed14a"; + sha256 = "07db8jfi1m19x760grkznaiwbap5dp00cicd88cbam16a0qfhbjj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d6e5137dac9f8f95579994601cb1e24614f965f2/recipes/s"; @@ -55136,16 +56129,16 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "20160907.418"; + version = "20161002.122"; src = fetchFromGitHub { - owner = "stakemori"; + owner = "sagemath"; repo = "sage-shell-mode"; - rev = "5dd85a064304af51c676b4a95b1f298e297756d5"; - sha256 = "114ja5gyhpv9xi1gxsxylxbbmnmjrqlwd4daww4a5xc2avi6flxq"; + rev = "7f7bafe83ddeac11e30c9c10524f176b6d70200b"; + sha256 = "10zr6fq9skqyw8mj9862b94s4k9yc40iq8dzk15sa43nsblmripi"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ff7cefd5497aec9ed271fd783625fed445c4ac12/recipes/sage-shell-mode"; - sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; + sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv"; name = "sage-shell-mode"; }; packageRequires = [ cl-lib deferred emacs ]; @@ -55175,27 +56168,6 @@ license = lib.licenses.free; }; }) {}; - salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }: - melpaBuild { - pname = "salt-mode"; - version = "20150904.1113"; - src = fetchFromGitHub { - owner = "beardedprojamz"; - repo = "salt-mode"; - rev = "c9147cb78680cc34e6fcff3968c336460a9090a4"; - sha256 = "1hl227bmjch0vq7n47mwydkyxnd6wkbz9klk3c4398qmc2qxm5kn"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/f75b1d3a8011bee1e8818473ee8d3a14e89553f9/recipes/salt-mode"; - sha256 = "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp"; - name = "salt-mode"; - }; - packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ]; - meta = { - homepage = "https://melpa.org/#/salt-mode"; - license = lib.licenses.free; - }; - }) {}; sane-term = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sane-term"; @@ -55346,12 +56318,12 @@ sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sbt-mode"; - version = "20160816.1353"; + version = "20160914.818"; src = fetchFromGitHub { owner = "ensime"; repo = "emacs-sbt-mode"; - rev = "cb9940f0e8b1346f4297ff6c2c90b406c92abab0"; - sha256 = "10bq04xm3b8awjnfq0mg52zm3rds1kr7q0jfrvhjkbd9rwd1y9bz"; + rev = "420044bc305bd4fe38d2f3af1f76b29172b06ff9"; + sha256 = "02h71mh0w8g9gz1pslgqmk40b5fb5q3g6jl5150cq608m4apyk75"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/364abdc3829fc12e19f00b534565227dbc30baad/recipes/sbt-mode"; @@ -55371,8 +56343,8 @@ src = fetchFromGitHub { owner = "openscad"; repo = "openscad"; - rev = "31211c6b7f4767f5e7611c6ed7844dbbb3600ee1"; - sha256 = "0yafxig7wvlps8fsl26n46hyfiqhyzjhi1k2lgwmacf3v7lhjqhv"; + rev = "7e0935d02c285a588152d373aed89b49d029c70d"; + sha256 = "0hj4brm8lfhlyp7p2qcncschbckr9inc59v3znazchz7clhpl2by"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2d27782b9ac8474fbd4f51535351207c9c84984c/recipes/scad-mode"; @@ -55577,16 +56549,16 @@ scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "scratch"; - version = "20120830.1028"; + version = "20120830.1105"; src = fetchFromGitHub { - owner = "ieure"; + owner = "cbbrowne"; repo = "scratch-el"; - rev = "54e31e81cd239e1fd1b3c6a20ff426029bf9aaf5"; - sha256 = "0ykhr24vpx3byn2n346nqqvmwcg34hk22s3lpdx7lpnkrn5z41aq"; + rev = "b377e5642aa0d0ddc9dbb2003d2055bc013e6426"; + sha256 = "1nr6yqmxz6jqjkfj249yz88480shlsnmri0d322pkz88d4nkr0hq"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b3faa25e63d4e1650d785b384a353e1b0ac20e33/recipes/scratch"; - sha256 = "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/e794c1fa9bd93e25a65c2b71a5ccf5662fe179bf/recipes/scratch"; + sha256 = "1hhwyvg05cnzfnn4bgygvjfqyayxl65f5zn7h05h9axvcab6s7kj"; name = "scratch"; }; packageRequires = []; @@ -55867,10 +56839,10 @@ }) {}; second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "second-sel"; - version = "20151231.1553"; + version = "20160918.1024"; src = fetchurl { url = "https://www.emacswiki.org/emacs/download/second-sel.el"; - sha256 = "143vg6z3aa0znmsx88r675vv5g2c13giz25dcbzazsp4wcr46wvq"; + sha256 = "0kc3fmg92blqbx85ykxrd4n0rcjfjhxxig4xjw3ah3cpp39zcsxx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/second-sel"; @@ -56215,27 +57187,6 @@ license = lib.licenses.free; }; }) {}; - session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "session"; - version = "20120510.1700"; - src = fetchFromGitHub { - owner = "emacsorphanage"; - repo = "session"; - rev = "19ea0806873daac3539a4b956e15655e99e3dd6c"; - sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/5f2a50f62475639af011c99c6cc38928b74b3b0a/recipes/session"; - sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx"; - name = "session"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/session"; - license = lib.licenses.free; - }; - }) {}; seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "seti-theme"; @@ -56278,6 +57229,27 @@ license = lib.licenses.free; }; }) {}; + sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sexy-monochrome-theme"; + version = "20160915.353"; + src = fetchFromGitHub { + owner = "nuncostans"; + repo = "sexy-monochrome-theme"; + rev = "87bea99be5fe4f2395bec1c6ee7f81794c3f6695"; + sha256 = "0gyh9kfj76wxajrbdi3q0cii9giyn2gbfdsgnrgvh1cv96cqbm6i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; + sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg"; + name = "sexy-monochrome-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sexy-monochrome-theme"; + license = lib.licenses.free; + }; + }) {}; shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; @@ -56344,12 +57316,12 @@ shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shakespeare-mode"; - version = "20160609.1028"; + version = "20160908.1511"; src = fetchFromGitHub { owner = "CodyReichert"; repo = "shakespeare-mode"; - rev = "ad5f4de2e0b51723deea2c68a2b5aa862bf38022"; - sha256 = "1daqh496m72l71x24czvzwf92rk310lzxp16l50qxlxif7rgpr78"; + rev = "0406a5ac4c98fcd171f0539c5cd88050aa351ea8"; + sha256 = "04p6132121cv9z20mpp3dw5b4s4k8wcknscq97a7z072cabph3ji"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b1c547d37422998c01a610f88d62784fbca33523/recipes/shakespeare-mode"; @@ -56650,25 +57622,6 @@ license = lib.licenses.free; }; }) {}; - shimbun = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "shimbun"; - version = "20160825.919"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "f48cdf069e61d81908e303d9984a05e1de9ccfc9fca8545435a95dd9de54eab9"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/shimbun"; - sha256 = "05dxdyh8xvbpjmc19q733jmjd6kgv8rdahjd3bw5wwsb3smqig4x"; - name = "shimbun"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/shimbun"; - license = lib.licenses.free; - }; - }) {}; shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shm"; @@ -56676,8 +57629,8 @@ src = fetchFromGitHub { owner = "chrisdone"; repo = "structured-haskell-mode"; - rev = "1ffb4db1e7049d4089fea430d4f20bce2eff263d"; - sha256 = "1vrycvqp4n2pp6sq7z2v0zkqz6662nvacm7cla5hrrzl157cg0j5"; + rev = "dde5104ee28e1c63ca9fbc37c969f8e319b4b903"; + sha256 = "0g5qpnxzr9qmgzvsld5mg94rb28xb8kd1a02q045r6zlmv1zx7lp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68a2fddb7e000487f022b3827a7de9808ae73e2a/recipes/shm"; @@ -57065,12 +58018,12 @@ simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "simple-mpc"; - version = "20160716.343"; + version = "20160930.805"; src = fetchFromGitHub { owner = "jorenvo"; repo = "simple-mpc"; - rev = "0802c385ff17b4226314e0ac396ea7e425e35092"; - sha256 = "1xwna7s32baz0aix5d1q52f5lvh045904fvydhchxv9y1fs46jzl"; + rev = "c920da63cc2c5cbc56fb8eb87f260dfffba163f9"; + sha256 = "1kaihrr2i2pcdyjh7qhz0x3clggf85ay5c4m5ld3r7dm3vv1yvmf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/62d762308c1ec0c1d8f7b4755b7deb285cbac018/recipes/simple-mpc"; @@ -57189,12 +58142,12 @@ simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }: melpaBuild { pname = "simplenote2"; - version = "20160318.603"; + version = "20160922.801"; src = fetchFromGitHub { owner = "alpha22jp"; repo = "simplenote2.el"; - rev = "a0941475c5fd71a31280f3219424af4586288719"; - sha256 = "0k16sjbrhxbv3fj5rzjzvs03230nwlzmvw18dhdhzzblk08f28dp"; + rev = "ea82d5e3e1226605e7b04054a77cca7431fe4709"; + sha256 = "0p6zlm46pq9id74bqpgscqczpkk991mzh8d6264g5qxj0az22iia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1ac16abd2ce075a8bed4b7b52aed71cb12b38518/recipes/simplenote2"; @@ -57357,12 +58310,12 @@ slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }: melpaBuild { pname = "slack"; - version = "20160805.614"; + version = "20160928.2036"; src = fetchFromGitHub { owner = "yuya373"; repo = "emacs-slack"; - rev = "e7219b50499a46b578bc9caf96d64b06ceea47ad"; - sha256 = "0dv1c33qk65bjz66jjzydi5b0c7vdwahsrq3zwhvrf97xd7vr4s3"; + rev = "c38db1a8c85e6c5940fa14aefd6a767b5e668c9d"; + sha256 = "03a4vk3dbxnyar7rswnnwxazp4pxkxgwqc3akn7ilhdfmx817rrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f0258cc41de809b67811a5dde3d475c429df0695/recipes/slack"; @@ -57630,12 +58583,12 @@ sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sly"; - version = "20160829.847"; + version = "20161003.631"; src = fetchFromGitHub { owner = "capitaomorte"; repo = "sly"; - rev = "fbcb96264ab073c516efa06c8e8d4b0cc4ff566e"; - sha256 = "19nlwqp7zia3fnvl323v8v9j10b32bpw0m5pv14ilqy4kbnpxw2q"; + rev = "2c772f5a98f8be4a8a10d537690abc64f4d44513"; + sha256 = "0v4hqgf12hgwyk6zw6mpwp324qrpfkzmav2kl4j9g09px73k2kjg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/79e7213183df892c5058a766b5805a1854bfbaec/recipes/sly"; @@ -58109,12 +59062,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "20160828.1136"; + version = "20161001.704"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "6b4832412a896213f3e3d45ef75acaf2aeeab97a"; - sha256 = "06l9ngm37lzqf22ywg20na0bnfq2bcwab9rkfc5w8m51j5z6gn6x"; + rev = "9ae8d4f5ce471d4cf53231e085c52d46ece4aa14"; + sha256 = "0pnyyrc0fdnjrf87qcb8k1hy8ac5j3xcj5wq3isr1zwyxxhsfw4l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -58360,12 +59313,12 @@ smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smooth-scrolling"; - version = "20160612.141"; + version = "20161002.1249"; src = fetchFromGitHub { owner = "aspiers"; repo = "smooth-scrolling"; - rev = "dcaaabf834d20e990af0cf471e04d0948cf1ff58"; - sha256 = "0lcp437135hxpw84vj096i3vw83ckfppdviyyf468mm02ajb4068"; + rev = "2462c13640aa4c75ab3ddad443fedc29acf68f84"; + sha256 = "1h15gjq781i6fsz32qlh51knawdr8hcqvshsz6cszp752cibdcdg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e156f146649a51f6ee636aef95214944a8079a27/recipes/smooth-scrolling"; @@ -58444,12 +59397,12 @@ snakemake-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild }: melpaBuild { pname = "snakemake-mode"; - version = "20160902.1855"; + version = "20160913.2031"; src = fetchFromGitHub { owner = "kyleam"; repo = "snakemake-mode"; - rev = "a28ff63f4c3a6492dea38c028e47bb6431ab4c84"; - sha256 = "1vb9b4wclmhqj4p9xqz3zhrh7id1s03k2041nx6pcwr7918dfpjs"; + rev = "2bceb7f266f71cd85f9b328de02797eb457da17c"; + sha256 = "0cda7r6l3kbvpvqgxk0n102mk48j26i4ns25y0ykglx8k154nhys"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c3a5b51fee1c9e6ce7e21555faa355d118d34b8d/recipes/snakemake-mode"; @@ -58591,12 +59544,12 @@ solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "solidity-mode"; - version = "20160505.203"; + version = "20160926.409"; src = fetchFromGitHub { owner = "ethereum"; repo = "emacs-solidity"; - rev = "6268b2a7fdd22ba37e3f7be907db9f5e9070f242"; - sha256 = "1mlhidfnvs2sph6qavzqz5qng78q2v4n5qc021958s29kx35i603"; + rev = "f62b7ff83420b0459c4f26b2e4c050ac94421f50"; + sha256 = "1cmxj6hd454lz82z17kxh1sabh6v7xh3bwy1zav9pg13sdxwr9qz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bb9df5ec0692352b6494d435d11166f4ea26c99e/recipes/solidity-mode"; @@ -58651,6 +59604,27 @@ license = lib.licenses.free; }; }) {}; + sort-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sort-words"; + version = "20160929.635"; + src = fetchFromGitHub { + owner = "dotemacs"; + repo = "sort-words.el"; + rev = "7b6e108f80237363faf7ec28b2c58dec270b8601"; + sha256 = "18cwii9h2planb9bgrih4hkz2cqinbl8wq5sal4b8kwnaq07bbw7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0a4bd566392d7cebe8a891d787439512e8d34cf9/recipes/sort-words"; + sha256 = "1hvbq09byjdbqzbyashw3y1h65wins44jnqcdic7vqzd1p1mzwka"; + name = "sort-words"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sort-words"; + license = lib.licenses.free; + }; + }) {}; sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }: melpaBuild { pname = "sos"; @@ -58871,12 +59845,12 @@ spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }: melpaBuild { pname = "spaceline"; - version = "20160801.211"; + version = "20160914.711"; src = fetchFromGitHub { owner = "TheBB"; repo = "spaceline"; - rev = "34ee477b3dbc0d81dc44c82cc092f006899cba70"; - sha256 = "10kwjlngp0xsgzj7gpglmzyx0l2vmfl3f6q7gwwad4kymsbh4s8p"; + rev = "679bdaa22b4155d515c9cc1bc42f793cf53adcc8"; + sha256 = "0xdkk1ig70ys4hs68fg5wa4pqjr2nf07jc0ckdlfvs3r1fafs7a3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/46e4c876aeeb0bb0d0e81dcbb8363a5db9c3ff61/recipes/spaceline"; @@ -58892,12 +59866,12 @@ spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spacemacs-theme"; - version = "20160820.1041"; + version = "20160909.445"; src = fetchFromGitHub { owner = "nashamri"; repo = "spacemacs-theme"; - rev = "6d96877d228af73a2c4c656c9bc33734feacc887"; - sha256 = "0aj0aazky2l8c59kn11qhj8xch40mqxjp6a9gfbyfbfcqnmrvlqg"; + rev = "e339866186a6687e9ae63db927ba3cc4bc75e88e"; + sha256 = "0hkygs57xybwx1shhjm2650aw36plskfvf8h24zah91xjnnsadn6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6c8ac39214856c1598beca0bd609e011b562346f/recipes/spacemacs-theme"; @@ -59116,15 +60090,36 @@ license = lib.licenses.free; }; }) {}; + sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sphinx-mode"; + version = "20160911.558"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "sphinx-mode"; + rev = "7db516b8b985cf209b6430b032cd0457af83b72b"; + sha256 = "0a3vgkp65hpc1a5h79yl0pc02lr6w299wd2fs9cgn8nvbdrip5ij"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode"; + sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b"; + name = "sphinx-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sphinx-mode"; + license = lib.licenses.free; + }; + }) {}; spice-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "spice-mode"; - version = "20160818.1749"; + version = "20160919.330"; src = fetchFromGitHub { owner = "stardiviner"; repo = "spice-mode"; - rev = "78bbaa6c39fe5a89de7fc3775b161f4a9c022e69"; - sha256 = "0cf0km62izcj62m78q9vgafrckq49mjmf672vnkbckf974m93h2l"; + rev = "1dcaa4b4cd1527cf15bfc6dfc278c574359a5062"; + sha256 = "0ngfyxpvwgyqh99vjr2msqan0hma1qlljkx971qjxcpn0y80dj23"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6142975cf9c0b9faaf128be34d30e12a88b500f8/recipes/spice-mode"; @@ -59473,12 +60468,12 @@ sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sqlup-mode"; - version = "20160904.838"; + version = "20160911.1911"; src = fetchFromGitHub { owner = "Trevoke"; repo = "sqlup-mode.el"; - rev = "4bf563b0b95f5a1e627e55d52d1c2fd0dd3af95f"; - sha256 = "0hxkkpylnf5phavcd2y3bxzikcnr7cdk3rbqgp3nw74sxz0223w2"; + rev = "da9273d9da8f84827b840776f398d24ea4c46b76"; + sha256 = "17pw9275disv1cgcila3r9fshh0ca7mcszri709v0gk0p7f8z70z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7fabdb05de9b8ec18a3a566f99688b50443b6b44/recipes/sqlup-mode"; @@ -59596,12 +60591,12 @@ ssh-deploy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ssh-deploy"; - version = "20160831.2219"; + version = "20160917.447"; src = fetchFromGitHub { owner = "cjohansson"; repo = "emacs-ssh-deploy"; - rev = "2257f951fef62080a97d5e3083889afd53b5648d"; - sha256 = "0c6pmvq7ck3hqcilb7cbb7gc7gi9wzjcb93qkgxy5mlv4m5w328m"; + rev = "78d064134e807742fa2ceb7b1c4672ffb284a20d"; + sha256 = "0vm3pcs2ijd3s8w8rj7wdkqi077xd5qq157987hygy92lw9svfqh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8b4547f86e9a022468524b0d3818b24e1457797e/recipes/ssh-deploy"; @@ -60318,12 +61313,12 @@ sudo-edit = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sudo-edit"; - version = "20160905.2153"; + version = "20160908.2310"; src = fetchFromGitHub { owner = "nflath"; repo = "sudo-edit"; - rev = "d7fce267b58614e2b56d2fd260151b7b4d0c7f1b"; - sha256 = "0j0pyvm6pfkk0mq4vm8ajxwclllmsyj6d8wd3sf2yfxy45qacl2n"; + rev = "beb584ca418dcd061641026662d9796f66a5a5a2"; + sha256 = "1gprc192igny4vsk4d72xqf76ig79wq73fn757ghb8yrg8zzw1zc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3b08d4bbdb23b988db5ed7cb5a2a925b7c2e242e/recipes/sudo-edit"; @@ -60360,12 +61355,12 @@ suggest = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, loop, melpaBuild, s }: melpaBuild { pname = "suggest"; - version = "20160903.806"; + version = "20160928.1741"; src = fetchFromGitHub { owner = "Wilfred"; repo = "suggest.el"; - rev = "b0d7826ba295fc20f3346d6beb52c169d892a06f"; - sha256 = "0lkny47kjw4q0khndb9swmgiy5j22473djk32yjwy7b6qnfgwcwf"; + rev = "c0c43412f21db464a542f5cab6de7e9ca66547aa"; + sha256 = "1bnf6s6bam6j6inhscy1zlq7rnvlwh8wcbpiliwzl3gxg3mnn1c6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b9fd27e812549587dc2ec26bb58974177ff263ff/recipes/suggest"; @@ -60378,6 +61373,27 @@ license = lib.licenses.free; }; }) {}; + suggestion-box = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: + melpaBuild { + pname = "suggestion-box"; + version = "20160927.1530"; + src = fetchFromGitHub { + owner = "yuutayamada"; + repo = "suggestion-box-el"; + rev = "90452d71e4afe9f42ee975f2f7897835cf3dee87"; + sha256 = "1bcmhbx4l4x01n2vpcyw8wyp3cklzp65v5d4sx284qj5gd64i1p4"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5b59be8dc0a1850d3e245957fd170e1d01f4e284/recipes/suggestion-box"; + sha256 = "17yai0fh7rfjbp3wz5x5r4src8lxn6qrhf7brp2gjr6cgdv40iac"; + name = "suggestion-box"; + }; + packageRequires = [ emacs popup ]; + meta = { + homepage = "https://melpa.org/#/suggestion-box"; + license = lib.licenses.free; + }; + }) {}; summarye = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild { pname = "summarye"; version = "20130328.327"; @@ -60669,12 +61685,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "20160124.236"; + version = "20161002.506"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "1563e8b248bc74613f381e7bd82a43df90064a68"; - sha256 = "08397a8y8hgyzwny4z9f6kgwy8d37h0iypcjps3l6lhnk35mshv0"; + rev = "ea77cf9157ed2a2bbf6874b6fbd15c2ca776f775"; + sha256 = "0x0v57a6f3lxbafb3slcl782vga7vrq2rci66hhabzrgs2k3lh7j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -60687,15 +61703,36 @@ license = lib.licenses.free; }; }) {}; + swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "swift3-mode"; + version = "20160918.550"; + src = fetchFromGitHub { + owner = "taku0"; + repo = "swift3-mode"; + rev = "4e51265c6905e17d8910e35b0b37cf51e20ecdfe"; + sha256 = "0wqwjzr3z9gzsjiyyr0ds4c5zvgifb9hbjadb7vkbbpzdy6qd9s1"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode"; + sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520"; + name = "swift3-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/swift3-mode"; + license = lib.licenses.free; + }; + }) {}; swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; - version = "20160905.940"; + version = "20160921.138"; src = fetchFromGitHub { owner = "abo-abo"; repo = "swiper"; - rev = "b73264eb678b96f1bb06f0fd2df9154d75549eca"; - sha256 = "1bsijipxahzw61z83mrp8fsz9dczd36pbks4df5glrzkd556xf3x"; + rev = "9b2892724be0cadb6afaf7bf8ae72f0feabe37b5"; + sha256 = "1xrc3z2w133g13xm017zcrnib43iw8ymkkwlxmga9sibscrrgsa4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e64cad81615ef3ec34fab1f438b0c55134833c97/recipes/swiper"; @@ -60981,12 +62018,12 @@ synquid = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "synquid"; - version = "20160617.2156"; + version = "20160930.850"; src = fetchFromGitHub { owner = "cpitclaudel"; repo = "synquid-emacs"; - rev = "328e50261a6d95ed046e2f07e933746ed0e606a1"; - sha256 = "1r0ch4w8m1p9j43rciq3wdzwn1zggj959irvrp3n7hr1z6fkq4z0"; + rev = "28701ce1a15437202f53ab93a14bcba1de83fd2c"; + sha256 = "0c0pi5w8xvir9gnbjp80g1c4i3rhid65zwh4i4vkyivkh2s29f6i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6ccd9f265d90a5f6a95942938532f556b223e4da/recipes/synquid"; @@ -61106,12 +62143,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "20160731.1630"; + version = "20160928.1956"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "a1633c271da2854f78e25015a846954df2e50968"; - sha256 = "05629nph69711yn7jvv5zlqdydivz9vgj8m57bjv7m9khdxf8j5l"; + rev = "7769000ba6b395dfaa2c6b0fce48ae5d5cd9a035"; + sha256 = "1vqcqrq8qk9n512rbwi2lcvjiy0wqmybwa2lmrkv49yshqjhm5ld"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -61399,12 +62436,12 @@ tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "tao-theme"; - version = "20160608.215"; + version = "20160915.2124"; src = fetchFromGitHub { owner = "11111000000"; repo = "tao-theme-emacs"; - rev = "3aad9b4f41985d8da90432885380d94c24dd772a"; - sha256 = "04baqjk3vg09x3p5v1mnn9yn4wzb4qa2ag9jc8baabrp19xbcl2v"; + rev = "85ee42a8e19b913865387d6662d41177fb0803ce"; + sha256 = "1d98rjbgw99ai0dg67xyf1dycqb7pbdj9pwv0d45fflyjnrlrcgq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/94b70f11655944080507744fd06464607727ecef/recipes/tao-theme"; @@ -61651,12 +62688,12 @@ term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-manager"; - version = "20160824.1049"; + version = "20160922.1302"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "0768cef5efe7579a36304a5832d46b0e044993cc"; - sha256 = "0cifgzsgzyd659h38gsvh2dr8z48n9qn0aq8z8bz18wz66q8lbij"; + rev = "c6d2810a3c9fc3e6d7f018127a12846607e6ed6e"; + sha256 = "17aw0jnihncf3scjynii7idpbczrf24cf0pq8r0bfqs4hw0k0qn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; @@ -61732,22 +62769,22 @@ license = lib.licenses.free; }; }) {}; - term-projectile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: + term-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: melpaBuild { pname = "term-projectile"; - version = "20160824.1049"; + version = "20161003.1428"; src = fetchFromGitHub { owner = "IvanMalison"; repo = "term-manager"; - rev = "0768cef5efe7579a36304a5832d46b0e044993cc"; - sha256 = "0cifgzsgzyd659h38gsvh2dr8z48n9qn0aq8z8bz18wz66q8lbij"; + rev = "c6d2810a3c9fc3e6d7f018127a12846607e6ed6e"; + sha256 = "17aw0jnihncf3scjynii7idpbczrf24cf0pq8r0bfqs4hw0k0qn8"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag"; name = "term-projectile"; }; - packageRequires = [ emacs projectile term-manager ]; + packageRequires = [ projectile term-manager ]; meta = { homepage = "https://melpa.org/#/term-projectile"; license = lib.licenses.free; @@ -61802,8 +62839,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "dcd808f985e7b0f562467e2145dcd1e901347999"; - sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg"; + rev = "a36a20c36265430c36235371957f07c8c89fee44"; + sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern"; @@ -61823,8 +62860,8 @@ src = fetchFromGitHub { owner = "ternjs"; repo = "tern"; - rev = "dcd808f985e7b0f562467e2145dcd1e901347999"; - sha256 = "1wwf9h6inv3gvp8g7n98dqvjmn01i8sx3n3h3ilqq3cbsy58yjvg"; + rev = "a36a20c36265430c36235371957f07c8c89fee44"; + sha256 = "1q25ln12b25al2vfwbsxrv5bg4a9qpyj8p1as9hkcmaszj2z7d41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/eaecd67af24050c72c5df73c3a12e717f95d5059/recipes/tern-auto-complete"; @@ -62068,12 +63105,12 @@ theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "theme-looper"; - version = "20150723.1104"; + version = "20160924.2205"; src = fetchFromGitHub { owner = "myTerminal"; repo = "theme-looper"; - rev = "6df57e7f6b6e40168b3b2c6a2f80a15d0522ce6f"; - sha256 = "05b3p4i7bljhlx490dqkp32a1n15kz697vdjlzld30hwspfynhcv"; + rev = "66788db264b3d94f25a077f9a6cecfa1c8ad2c96"; + sha256 = "1wckby9q7c6xdq0kv0x0fdjr9gplj4an5s3kx78dqrxcjj12a35d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/861c3b96189233956b15f222702ff034ed2d8cd1/recipes/theme-looper"; @@ -62232,8 +63269,8 @@ src = fetchFromGitHub { owner = "apache"; repo = "thrift"; - rev = "ddc53c32486cc23dfa63ed4e5abb19923b8d13e6"; - sha256 = "0gq2zwy1isrb4r1xv1j34ni6byyyy7x4mpvcfw6g2z9h36x7bcsb"; + rev = "b0dadbde6aad1f5a09d47e3d1f2c713c76cd915f"; + sha256 = "0yv0nssydryipa43w5vfpdaqg4h2z5n8hxln6fhp4gdcbk9p65v0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/857ab7e3a5c290265d88ebacb9685b3faee586e5/recipes/thrift"; @@ -62286,22 +63323,22 @@ license = lib.licenses.free; }; }) {}; - tide = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: + tide = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }: melpaBuild { pname = "tide"; - version = "20160830.2120"; + version = "20160929.357"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "tide"; - rev = "170bce9067a6467f190418284377559a9f43c667"; - sha256 = "0b23d9bi1i00v9ffrdi5ag0q2i149ai1p88klpgl2j9kvdif0zmg"; + rev = "de8937514494cb6b849be24a7b935e9c6bd08bfb"; + sha256 = "1lw5q3crhiyf6p5fm9ssxs4c4vm1ma8ibkpwhbb67jw8z8lnir0m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a21e063011ebbb03ac70bdcf0a379f9e383bdfab/recipes/tide"; sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1"; name = "tide"; }; - packageRequires = [ cl-lib dash emacs flycheck typescript-mode ]; + packageRequires = [ cl-lib dash flycheck typescript-mode ]; meta = { homepage = "https://melpa.org/#/tide"; license = lib.licenses.free; @@ -62619,12 +63656,12 @@ todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "todotxt"; - version = "20150513.1929"; + version = "20160919.2238"; src = fetchFromGitHub { owner = "rpdillon"; repo = "todotxt.el"; - rev = "fc83f954aea75065aa9788ee07027c94e76a9364"; - sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal"; + rev = "c0d0e8320ba9284710d46941eaf6847f909b589e"; + sha256 = "08fd5lk1gq9clxhz5i81qm5f0a20yrx49iy13bx1p59gj20f1z41"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f934da448463e672de3c87b2ee514a370f67107d/recipes/todotxt"; @@ -62808,12 +63845,12 @@ toml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "toml-mode"; - version = "20160718.2217"; + version = "20160910.1810"; src = fetchFromGitHub { owner = "dryman"; repo = "toml-mode.el"; - rev = "609d7101cc50b2ce350dad0d6adbd476d20fc811"; - sha256 = "068jcxadwpxk4rk4kix2y5g5dm7g3pd3d1v6dj5jimjkp9zvy1h9"; + rev = "0bbf0618fde844cd2e12765c8ca566df09066445"; + sha256 = "129yws71h5wy2y4z2ayl9kys22xa4hhxkybb7hhp2b3y8wq0717z"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f8157d7d11f1e1848f0ba384249b4b8c6354830b/recipes/toml-mode"; @@ -63597,12 +64634,12 @@ twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "twittering-mode"; - version = "20160710.1017"; + version = "20160921.1038"; src = fetchFromGitHub { owner = "hayamiz"; repo = "twittering-mode"; - rev = "97ed4410dd994c09081a7a12570adb34f356d87c"; - sha256 = "16wk15hn1lgxphvb6kmihahbxi4vkks2knr6r5k3iay6gq7bvpbh"; + rev = "08a810167d47852367e7e8d56916c794f7b0fd04"; + sha256 = "15wghd8iiyrikahd7ayga9m0s993ghriwk44ylcycy3a6axaizmi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/twittering-mode"; @@ -63639,12 +64676,12 @@ typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "typescript-mode"; - version = "20160719.2353"; + version = "20160923.9"; src = fetchFromGitHub { owner = "ananthakumaran"; repo = "typescript.el"; - rev = "aae70b59e64e1d7b3cfaee41e9134bfa19ac7363"; - sha256 = "10i2wkqq3bdrxxwx9nw8zbfx7jmvpwp5mpw9765zlppg46zkqkac"; + rev = "588d5f3d63b77f40951630d01fd3ecb0f3672c5b"; + sha256 = "1gq4vza69ffqhjls905agsshk0mj2gfg6cmhia0d75lf6r8h6nzf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; @@ -63966,11 +65003,11 @@ undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "undo-tree"; - version = "20140509.522"; + version = "20160922.853"; src = fetchgit { url = "http://www.dr-qubit.org/git/undo-tree.git"; - rev = "a3e81b682053a81e082139300ef0a913a7a610a2"; - sha256 = "014x3gnv4l0p7jbz34dmdrcksw4dfww9lkp9d7nx5q3fsbvsx35z"; + rev = "8afead161b5bfd167eab39f06f16a86c2dd36e29"; + sha256 = "1hnh2mnmw179gr094r561w6cw1haid0lpvpqvkc24wpj82vphzpa"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4327b4dd464ebb00c2acdd496274dedf912cdf92/recipes/undo-tree"; @@ -64011,8 +65048,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "unfill"; - rev = "a88ba489b47429653c98d72ae8e0b2bcbed02faa"; - sha256 = "1gmwdja53x3mzpfxjjqs41vy7prfyz7a1iy3cf5fx3k1yw9vcfkb"; + rev = "88186dce0de69e8f4aeaf2bfdc77d62210f19cd8"; + sha256 = "0wyradin5igp25nsd3n22i2ppxhmy49ac1iq1w2715v8pfmiydnc"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2ade389a20419b3e29a613409ac73a16b7c5bddb/recipes/unfill"; @@ -64397,8 +65434,8 @@ src = fetchFromGitHub { owner = "jwiegley"; repo = "use-package"; - rev = "3f6ba1bb8ad3fd81278b6787c664639a6a0df6f5"; - sha256 = "161bdn6b76rf0sm7881pyr6xs8mvyvpxhzicf0g2dqncisg4y0gn"; + rev = "ca736c378404d66e9ff0df27969bad2b921c8d08"; + sha256 = "1133n9rgclqyyqba91cc8n1hfhcqxkzh67c6nq5szwy30zjqpzy1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f9b52790e2a0bd579c24004873df5384e2ba549/recipes/use-package"; @@ -64918,12 +65955,12 @@ vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, helm, lib, melpaBuild, outshine }: melpaBuild { pname = "vhdl-tools"; - version = "20160810.525"; + version = "20160916.1421"; src = fetchFromGitHub { owner = "csantosb"; repo = "vhdl-tools"; - rev = "f6dfac6851c6bc78f9d72849befd54b09ac64ce7"; - sha256 = "03qqvv9l83b5cpdcjdcq0wv3ghhx13y3b16rn1d1l0vfndzmnz42"; + rev = "c93d080df2e47702a7952420101cf2d1d3b38bfd"; + sha256 = "12rbhgx350x46lj7777rgjv8akfjs59x86bfm95dwsq4mva7q2cl"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf/recipes/vhdl-tools"; @@ -65128,12 +66165,12 @@ virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "virtualenvwrapper"; - version = "20151127.621"; + version = "20161002.1515"; src = fetchFromGitHub { owner = "porterjamesj"; repo = "virtualenvwrapper.el"; - rev = "62df8c1af39c5a8fec5b4e3fd1a063db06d38d21"; - sha256 = "05rzjlb04h7xyq7l7z87hqqcsf907p2nsxqnh7r6wm24kddfb0ab"; + rev = "5649028ea0c049cb7dfa2105285dee9c00d189fb"; + sha256 = "1xcjjs394vlaz94xh52kqaq94gkbmmjqmxlg7wly8vfn9vh34mws"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/acc9b816796b9f142c53f90593952b43c962d2d8/recipes/virtualenvwrapper"; @@ -65453,25 +66490,6 @@ license = lib.licenses.free; }; }) {}; - w3m = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "w3m"; - version = "20160825.919"; - src = fetchcvs { - cvsRoot = ":pserver:anonymous@cvs.namazu.org:/storage/cvsroot"; - module = "emacs-w3m"; - sha256 = "f48cdf069e61d81908e303d9984a05e1de9ccfc9fca8545435a95dd9de54eab9"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/8bbb18b0db057b9cca78ae7280674fd1beb56443/recipes/w3m"; - sha256 = "17mzs126fvlnsvxgfpbil9wmka0i87psblq49phky7dywcwz27lc"; - name = "w3m"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/w3m"; - license = lib.licenses.free; - }; - }) {}; wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wacspace"; @@ -65517,12 +66535,12 @@ wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wakatime-mode"; - version = "20160417.109"; + version = "20161003.729"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-mode"; - rev = "a0d279ac7d17c927ca3c52b9e072751b987b8333"; - sha256 = "06d6ywc0hq6jn5ahq96qa8v8fnps464f2gjmdhsgvj8b0d0c5jl1"; + rev = "75fff3baaa405d0a19998bdfd76c2d8e06eb5169"; + sha256 = "0q1lfs9lm773lfq11zdv21z7kkrnfzp2wq5508wnh9q3swgwp1vq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/a46036a0e53afbebacafd3bc9545c99af79ccfcc/recipes/wakatime-mode"; @@ -65580,12 +66598,12 @@ wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }: melpaBuild { pname = "wanderlust"; - version = "20160906.1507"; + version = "20160912.242"; src = fetchFromGitHub { owner = "wanderlust"; repo = "wanderlust"; - rev = "2b717828f1878a05759701c249fffff6642fe1e1"; - sha256 = "084g3cn0s7n78s3zg0ln0sh445281pmn8fbr101y8akvp33b9aaz"; + rev = "f7bb1a662893b5aacd3f358f927c05ee47d08a5e"; + sha256 = "1kpz8501w8axr0p0r5p2yl06n5kwjc7712g90fkdcxxcw39lsjm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/426172b72026d1adeb1bf3fcc6b0407875047333/recipes/wanderlust"; @@ -65811,12 +66829,12 @@ web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "web-mode"; - version = "20160904.1151"; + version = "20161003.1327"; src = fetchFromGitHub { owner = "fxbois"; repo = "web-mode"; - rev = "c73ea9da7cbdefbe8edde0f021be93b8f4ad852d"; - sha256 = "1wriywjbqyibfd8m29blrccbs2g1kfjm4vlpz1a06f2kj0zcywq3"; + rev = "f7ecb126c1ecd43815fdaef7878678562360fa13"; + sha256 = "0wnspvmq8shfscf2a0ddp7sby9pq3q1r65yq137vz9n2rbaqmh5j"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6f0565555eaa356141422c5175d6cca4e9eb5c00/recipes/web-mode"; @@ -65915,12 +66933,12 @@ weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }: melpaBuild { pname = "weechat"; - version = "20160229.1248"; + version = "20161003.1201"; src = fetchFromGitHub { owner = "the-kenny"; repo = "weechat.el"; - rev = "41f06299b2a691473b6b26c15dc46367542c79f0"; - sha256 = "0vg3w18xj6i320jsivsml3mi1fdxr8dgxmn7qy2780ajy5ndxnw1"; + rev = "9efd3468bca81d74adfe5f63a17c64b9a7df2f0f"; + sha256 = "15r2gv0d0nyyrww9nvvh1mvsy1gdn0cm92bgrg6izmvs32fm8q85"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e38255a31a4ca31541c97a506a55f82e2670abe6/recipes/weechat"; @@ -65982,8 +67000,8 @@ src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; + sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep"; @@ -66003,8 +67021,8 @@ src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; + sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-ack"; @@ -66017,22 +67035,22 @@ license = lib.licenses.free; }; }) {}; - wgrep-ag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: + wgrep-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }: melpaBuild { pname = "wgrep-ag"; - version = "20141012.311"; + version = "20160923.403"; src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; + sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/2c50b704343c4cac5e2a62a67e284ba6d8e15f8a/recipes/wgrep-ag"; sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a"; name = "wgrep-ag"; }; - packageRequires = [ wgrep ]; + packageRequires = [ cl-lib wgrep ]; meta = { homepage = "https://melpa.org/#/wgrep-ag"; license = lib.licenses.free; @@ -66045,8 +67063,8 @@ src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; + sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/9648e3df896fcd97b3757a727108bc78261973cc/recipes/wgrep-helm"; @@ -66066,8 +67084,8 @@ src = fetchFromGitHub { owner = "mhayashi1120"; repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; + rev = "4e9f3d9822acab2d353c858d33ddaebb629fbfe8"; + sha256 = "14xja70gh9v3565fkl4b46swfrkmh6j6zg9pxwj5h1gicqrgaiwz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c39faef3b9c2e1867cd48341d9878b714dbed4eb/recipes/wgrep-pt"; @@ -66104,12 +67122,12 @@ which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "which-key"; - version = "20160831.1655"; + version = "20160911.1302"; src = fetchFromGitHub { owner = "justbur"; repo = "emacs-which-key"; - rev = "ad9b0e43bc07b44094686ed521a4e107aa8efd2e"; - sha256 = "097q45vn3f1bmr67qwy71sn4acxwhb20bs6lif7zxahbd7iaxcv3"; + rev = "c493e0b4bb53c524d99c6ad071ba0a22259f8f38"; + sha256 = "0gngmryqhkhsd6wjvg24fcxdmag3sp6mvp3r6swz1hg2j905lrf7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/315865a3df97c0694f648633d44b8b34df1ac76d/recipes/which-key"; @@ -66164,6 +67182,27 @@ license = lib.licenses.free; }; }) {}; + white-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "white-theme"; + version = "20160917.1043"; + src = fetchFromGitHub { + owner = "anler"; + repo = "white-theme.el"; + rev = "e9e6d5b9d43da6eb15e86f5fbc8b1ba83abe8c78"; + sha256 = "1yqfq1gzkrw79myvj16nfi30ynfyz8yrpbzjcj8nhsc5rfrrmym2"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/621e32e54be9e1ac7936bf6f4b9d74e2dd27df6e/recipes/white-theme"; + sha256 = "0nmxn35x6pngns1xqnsq8nm69f549c1gmvisd01in3qfvnpr0mic"; + name = "white-theme"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/white-theme"; + license = lib.licenses.free; + }; + }) {}; whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "whitespace-cleanup-mode"; @@ -66171,8 +67210,8 @@ src = fetchFromGitHub { owner = "purcell"; repo = "whitespace-cleanup-mode"; - rev = "14eaf40e0e67539106d3636af440a167105be296"; - sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r"; + rev = "cdc6ee4e33b9e637afabf2075198c5616a44f91f"; + sha256 = "1j6gh435r52p8kjnzqwbnkynmdq541clwxlnzpsjw8n5mspp7g25"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b461cfe450d7ce6bd0c14be3460cacffc1a32e6f/recipes/whitespace-cleanup-mode"; @@ -66273,8 +67312,8 @@ src = fetchFromGitHub { owner = "foretagsplatsen"; repo = "emacs-js"; - rev = "cbff3b029c7dc850676c288b5cd0d570a1906519"; - sha256 = "0vj02m8b29vwqv8k54h75s801sh6xz8vxsazqjmhx6a7cgm2l0k8"; + rev = "3cc7e8c4f4781db4f838531a7ba225865f74977f"; + sha256 = "0i97z8czrfva60i4iikcnkr45fc3bgmsk5i8x2bb63pbla9q4l6i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/78d7a15152f45a193384741fa00d0649c4bba91e/recipes/widgetjs"; @@ -66533,12 +67572,12 @@ window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }: melpaBuild { pname = "window-purpose"; - version = "20160727.655"; + version = "20160927.744"; src = fetchFromGitHub { owner = "bmag"; repo = "emacs-purpose"; - rev = "00c253778d8e845bdc17a350c22ea157c5871b41"; - sha256 = "11hv2rrcirswzgx0l52kwav5dilr3yksky9a3vg1pghgqhmm59hv"; + rev = "38d8dd513d5de18572d4c2b58a5e6feceb6bcb4b"; + sha256 = "1iar8f0qgjha4kr8gnjf7p3cbxbb6avlm8wk8nkx0x1vm5wzab87"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5813120ab674f6db7d0a486433d8faa6cfec1727/recipes/window-purpose"; @@ -66658,12 +67697,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "20160828.1025"; + version = "20160930.1603"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "6f41998405796336575b1fce49b84667feaa9b9f"; - sha256 = "12bw86l8756rwfgnik0kywqafw8idv8ncdxlbaybix70r2iaa61y"; + rev = "19201be2c59a7762da97835f7efc11f86191b676"; + sha256 = "0xqvk56dpafqqnglkyy9y95g3gik6jwyq6cqynmyg0wbqz48biza"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -66802,22 +67841,22 @@ license = lib.licenses.free; }; }) {}; - worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }: + worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper, zoutline }: melpaBuild { pname = "worf"; - version = "20160902.734"; + version = "20160929.43"; src = fetchFromGitHub { owner = "abo-abo"; repo = "worf"; - rev = "6b540776f849704c331dbbf9b4db4a1ca033ada6"; - sha256 = "0gf1pnk111q2m7706sq7jv198a8ah1560wha0m226b1q3swlx11a"; + rev = "b4b3888a1a2c39e659e60f3a106d0ff8b6f1e2a0"; + sha256 = "014f4a9xrn07c587p7npgdl9wcahqlba2hv2kcz891nz0zpxnwkb"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f00f8765e35c21dd1a4b5c01c239ed4d15170ab7/recipes/worf"; sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi"; name = "worf"; }; - packageRequires = [ ace-link hydra swiper ]; + packageRequires = [ ace-link hydra swiper zoutline ]; meta = { homepage = "https://melpa.org/#/worf"; license = lib.licenses.free; @@ -66952,12 +67991,12 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "20150126.759"; + version = "20160913.1902"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "7e2f32dcfcd7986fcee07f1413c6d8eae7ceb8f4"; - sha256 = "1ld5s45f9xh20z9z9k1fhlllzl6jgflcqkzys4x09vvax3mmynr8"; + rev = "b59e36b2451193bf96176f5a006bf506770a40f3"; + sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; @@ -66973,12 +68012,12 @@ wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "wsd-mode"; - version = "20160510.2251"; + version = "20160930.236"; src = fetchFromGitHub { owner = "josteink"; repo = "wsd-mode"; - rev = "1c7ff9c7a167d6bef5b551673be323687a619acd"; - sha256 = "14f87rgvh8rmdd7gp53iaibi1liiag10si2znbhiy1hf93ssd2pq"; + rev = "d1ee33397f9914834b9dd7208198b69ba46d3a11"; + sha256 = "0maxswk4pih27znq276q0aw0z5b9cj51m95ml5ap3qy7fsq9czdv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/wsd-mode"; @@ -67078,12 +68117,12 @@ x-path-walker = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "x-path-walker"; - version = "20160822.1015"; + version = "20160922.1135"; src = fetchFromGitHub { owner = "lompik"; repo = "x-path-walker"; - rev = "2c728b5fe21b83fa670b7f8ae026bb93bfffd551"; - sha256 = "0ldcfpdid1cjls66lb40wizak9cbrjfd0my20s89a6k9sxccyrah"; + rev = "3b01dbd7a039c6c84fdf8c8ee53ba72090ee950a"; + sha256 = "1gb3lnl3gvckbakc4fy22fcvif3xdfkdaw334xmp33phjb8gjqvj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c51f2aba59cb93f4bb104a7dde214963cbf002a6/recipes/x-path-walker"; @@ -67120,12 +68159,12 @@ xah-css-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-css-mode"; - version = "20160816.837"; + version = "20161002.932"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-css-mode"; - rev = "44f3f98549ef9eba5389dde11a74bd0b34b9a012"; - sha256 = "0bx1bk4m55qdf557s7dich0fs544vbfa6sgh8nlqhz6z0bvs2s5m"; + rev = "b597757761418a974c3d5e61e0f8e21a2d4ba818"; + sha256 = "0d7a4mgwpi0mxcpiilv7flld5d24gvwmqxv0dzypr5y9kw3r2aki"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/57c2e2112c4eb50ee6ebddef9c3d219cc5ced804/recipes/xah-css-mode"; @@ -67141,12 +68180,12 @@ xah-elisp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-elisp-mode"; - version = "20160903.1614"; + version = "20160924.753"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-elisp-mode"; - rev = "0955a1a83170d324f90188426932ab8ea4616832"; - sha256 = "0i4sgx5p1mp09hxgh1qvr97kc7mr41dvib6kv9djm8vm19rvfd3b"; + rev = "9e3c379e6fddaee086b0bba62066839aca9f02b9"; + sha256 = "07r5y1fpkpxg7pwcqbj23lps6nid2589hr1gja7r49mp2qrna006"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f2e996dd5b0061371662490e0b21d3c5bb506550/recipes/xah-elisp-mode"; @@ -67183,12 +68222,12 @@ xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-fly-keys"; - version = "20160906.1341"; + version = "20161003.1702"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-fly-keys"; - rev = "59a4980eabb96361626d275c813fff336b17ae65"; - sha256 = "0yriyizfyp9bd83d4069rdbps4f6hyi3hf6w47xxxsjmvn9s9c2i"; + rev = "db0821ee98f98b169b5c9e26f5db715a6bba0d20"; + sha256 = "1v3a53w8wpynm406j0nf247b2ncly5zpb7rq2ci8x9w3l8vqg664"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fc1683be70d1388efa3ce00adc40510e595aef2b/recipes/xah-fly-keys"; @@ -67225,12 +68264,12 @@ xah-lookup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-lookup"; - version = "20160711.1019"; + version = "20160928.1232"; src = fetchFromGitHub { owner = "xahlee"; repo = "lookup-word-on-internet"; - rev = "976e54f76dd9579c29b88c7ef7171df7683920c8"; - sha256 = "156vg0gz6y1rzfv52w45wbf060jzykp4khqs8nn9h3qyz0yk33j4"; + rev = "e391dc7b6667e60802606500d475fb4ea529408d"; + sha256 = "1wrf9fmqjig7iamrl4h40xff19qgkja2kqj1zz2mnlmcr4hml3vh"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38e6609a846a3c7781e0f03730b79bbf8d0355a9/recipes/xah-lookup"; @@ -67267,12 +68306,12 @@ xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "xah-replace-pairs"; - version = "20160713.1858"; + version = "20160913.1512"; src = fetchFromGitHub { owner = "xahlee"; repo = "xah-replace-pairs"; - rev = "b427b84923d349174464d7a15b0f86639f046248"; - sha256 = "1l43crr7balay139xvm3mxz22z516mcz84433vfdb8yczdya2sjq"; + rev = "d26e73bdefd6e0a53559c433b576aa663008308c"; + sha256 = "1gvdx1nvmxxvbbkr4hz4ar7k52cyyc77vcbm1yqw4r167i468knf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0e7de2fe0e55b1a546f105aa1aac44fde46c8f44/recipes/xah-replace-pairs"; @@ -67940,8 +68979,8 @@ src = fetchFromGitHub { owner = "JorisE"; repo = "yapfify"; - rev = "756ebae981208f4b9a8038c415107e1191be9b9d"; - sha256 = "0mfp3wpdk0hsrh93lg3gdym85g5g1f7wj08m7j5919dgx745n094"; + rev = "0931e0f4ee3ed060be87f529cac4950af534ffac"; + sha256 = "1dzhxldakjqnnihvggwbmi48l0dim49l463bahb3kr8493rd8c9x"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/060c32d8e9fdc56fe702d265a935d74d76082f86/recipes/yapfify"; @@ -68045,8 +69084,8 @@ src = fetchFromGitHub { owner = "capitaomorte"; repo = "yasnippet"; - rev = "309fe157f60e537e94f95e1ce3505a3fcdbd4994"; - sha256 = "1784kf4jqaq7x2f1z92n5spz2cc8xnmk4lamchkbziviwlk83jap"; + rev = "9cf92085e53f579af997f43540a26b4377f07678"; + sha256 = "0v7xzjhp87v1ahgzlvpf44b5qk5xfby80nbryla4d5afhahn8s0n"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/489687c6c41399a3bca8148a62d25581726a847d/recipes/yasnippet"; @@ -68080,25 +69119,6 @@ license = lib.licenses.free; }; }) {}; - yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "yatex"; - version = "20160813.100"; - src = fetchhg { - url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "2521a95043af"; - sha256 = "0l7nxjc67mg2ddi7cf9vm744yps26zz64hqq7g0cfycjsgzg517v"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; - sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; - name = "yatex"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/yatex"; - license = lib.licenses.free; - }; - }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -68144,12 +69164,12 @@ ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, request, request-deferred, s }: melpaBuild { pname = "ycmd"; - version = "20160905.1720"; + version = "20160922.525"; src = fetchFromGitHub { owner = "abingham"; repo = "emacs-ycmd"; - rev = "faf93fc2dfa7a7fba375b7afeda4e8e81b5fd193"; - sha256 = "1sp8fyskr3ncr5748fm3v4wplfkwy3avn73s84ncc22j26hrxbzd"; + rev = "a8ca68b508c448f6ac5ed6fa35ee3fe0a4771098"; + sha256 = "0v8by6y25sl7528vvrb1xsmm184xbqivqvllykx3kmaxpdh5hvih"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4b25378540c64d0214797348579671bf2b8cc696/recipes/ycmd"; @@ -68320,12 +69340,12 @@ zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zenburn-theme"; - version = "20160724.2141"; + version = "20160914.135"; src = fetchFromGitHub { owner = "bbatsov"; repo = "zenburn-emacs"; - rev = "d80c7cb91cce840c533d2261de44222c82c002b8"; - sha256 = "1hm0xlbi98czj7s5hb1f9n0c0kqglz95s45jwrljxxx5nxpnl238"; + rev = "e20756e1b78de58d3f82ba4a9d7c0772cb37482d"; + sha256 = "0mm4qx9c6v9r708p6yq6spzznbjy43qpn5k2479plnxixp8dh664"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/zenburn-theme"; @@ -68379,22 +69399,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: melpaBuild { pname = "zerodark-theme"; - version = "20160830.659"; + version = "20161003.855"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "1dbe8f3b202a1d958c9568a15d72059844277490"; - sha256 = "09kz6yx3ysmdsgrjabq5n30n48r13pi6mp3b5arl9y760k62kds5"; + rev = "cfd030d61347681566a06c119ac294d26cd17f91"; + sha256 = "08q64b7brdqi53vkb56dbz0agpjnyp0815qfkzd5m2qk6p4bsx7l"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = []; + packageRequires = [ all-the-icons flycheck magit powerline s ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; @@ -68487,12 +69507,12 @@ zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zone-nyan"; - version = "20160102.1456"; + version = "20160928.2303"; src = fetchFromGitHub { owner = "wasamasa"; repo = "zone-nyan"; - rev = "a9299ec7cc412d10cf7bddd392608fc3efba0899"; - sha256 = "0b8m0mdxbskkqsx86i6942235i8x0pk67a7s8lhsp2anahksazla"; + rev = "52f7e0a374fb7b4c1a69ad8b215fa8126063ba06"; + sha256 = "05yyin9y376zhha084zvfxj565s1qhy22yycc3wg3gs41xm0hrk1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/38262704e1045c21ee73ca9dc87656936382004a/recipes/zone-nyan"; @@ -68629,12 +69649,12 @@ zoom-window = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoom-window"; - version = "20160527.738"; + version = "20160918.2110"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-zoom-window"; - rev = "f0eb12e389d8d2d13b5911907ef872e18230e00e"; - sha256 = "13393bd5lqpbv7m3p6ihg0ghx1w4w6mrnybx4m8hcfvcn17dr3hw"; + rev = "95cd0c74bd63c9163148914fe1faecce7716be3c"; + sha256 = "1gddjvvl5pnh3q9x8q3q92d9l0rg9kksxqq84gi2hcyhvix5ghmz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8a55cc66cc0deb1c24023f638b8e920c9d975859/recipes/zoom-window"; @@ -68734,12 +69754,12 @@ zoutline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "zoutline"; - version = "20160906.743"; + version = "20160915.503"; src = fetchFromGitHub { owner = "abo-abo"; repo = "zoutline"; - rev = "47231c6a82f0b718b0bec09f34e40ce68ca050de"; - sha256 = "0jd7izvpc4z3ivp5mdzbmz5vrlwnjxp2r16f3zs0cfbym998i25c"; + rev = "714c10a25112b3da62696585bea289c3f8e74158"; + sha256 = "1z45p9i89lhqak993kq7rdji84rxrdcsnz1yz9xa2l758mnq5gp1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4a26341f491145938aee9b531cd861200bfa2f6d/recipes/zoutline"; @@ -68755,12 +69775,12 @@ ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ztree"; - version = "20160127.1542"; + version = "20160925.719"; src = fetchFromGitHub { owner = "fourier"; repo = "ztree"; - rev = "a7c54891c5ed00a192c72f99ba5ba7d4df7a2a0b"; - sha256 = "1sxjpbgi7ydmrlv34l16n40qpg969wfcb6kknndrh3fgjjc3p41b"; + rev = "e5eb534859acc0cc0a13403fd166457db9fb7eb5"; + sha256 = "158lzqsjpm1zlkq4c2hvg3s8z5yp30g0qj5wk2r1j3svfz4q9nl9"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f151e057c05407748991f23c021e94c178b87248/recipes/ztree"; diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index eaddf4ed61e..6081c96006a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -98,9 +98,6 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; - # upstream issue: missing dependency - jade = null; - # upstream issue: missing file header jsfmt = markBroken super.jsfmt; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix index e310064cb49..67198297485 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix @@ -2,12 +2,12 @@ _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "_0blayout"; - version = "1.0.0"; + version = "1.0.2"; src = fetchFromGitHub { owner = "etu"; repo = "0blayout-mode"; - rev = "1540cf8a8086bb73685927ae4eb3da099d65a1b4"; - sha256 = "13qgj7dckmilqd34b19klrk1yy1z68r8fv0plr7cg9rcms54aqqh"; + rev = "b8bb44b5336965b5519b9a826a0f46f8ee31c471"; + sha256 = "1apv5zd3zzni2llj9is7h2bzq1xxbx67kr7c07dfjd26n7l0zvfi"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6521ec44ae8b0ba2e0523517f0f3d5b94ddbe1be/recipes/0blayout"; @@ -947,12 +947,12 @@ airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }: melpaBuild { pname = "airline-themes"; - version = "1.4"; + version = "1.7"; src = fetchFromGitHub { owner = "AnthonyDiGirolamo"; repo = "airline-themes"; - rev = "3c5f127daf1cf8a74e3c9956e11e56eedf5f3e76"; - sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb"; + rev = "bd9624a94618f4144762032a93549f53ffc1e7b3"; + sha256 = "1rlszg7z5k8c6fmjk4sjgrc9xgcjc1jah6c7kdl9kypha7y8s4bq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/addeb923176132a52807308fa5e71d41c9511802/recipes/airline-themes"; @@ -968,12 +968,12 @@ alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }: melpaBuild { pname = "alchemist"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "tonini"; repo = "alchemist.el"; - rev = "d6e65ee1b041ea59b20f7b01e3ee9b3242780794"; - sha256 = "1y5nmcrlsmniv37x7w6yhihmb335n82d96yz7xclhwg59n652pjx"; + rev = "aa54643c6d64d82c2c8d502bb710e7de87699df1"; + sha256 = "0fbhrri816brh3283q3gisnxnginwzarsydsz881zk24kk2raq1k"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/6616dc61d17c5bd89bc4d226baab24a1f8e49b3e/recipes/alchemist"; @@ -1028,15 +1028,36 @@ license = lib.licenses.free; }; }) {}; + all-the-icons = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "all-the-icons"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "domtronn"; + repo = "all-the-icons.el"; + rev = "21b2e084a8779a6eb2e800add37671e21e5fc5d8"; + sha256 = "1zw6mkayf9dqxkk6pfb6niarkxk1jcwdln45jp7q7n8vq3cqg6rp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/604c01aa15927bd122260529ff0f4bb6a8168b7e/recipes/all-the-icons"; + sha256 = "00ba4gkfvg38l4s0gsb4asvv1hfw9yjl2786imybzy7bkg9f9x3q"; + name = "all-the-icons"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/all-the-icons"; + license = lib.licenses.free; + }; + }) {}; amd-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s, seq }: melpaBuild { pname = "amd-mode"; - version = "2.2"; + version = "2.5"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "amd-mode.el"; - rev = "27975cae561541bf5e3c4ec8f33730208ea240b5"; - sha256 = "1a9l3gz1r7b3nbzg08x9a30pdn6aa03a3crcsy5nmr5msydnfbsc"; + rev = "c610c1a85728d161d28854d7373fc13b3dec311b"; + sha256 = "1ghs3gh410c9w2v17zb93wk184lwl5izpkzrm0qn37qz8i87jqcr"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e4d6e9935e4935c9de769c7bf1c1b6dd256e10da/recipes/amd-mode"; @@ -1250,12 +1271,12 @@ ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ansible-doc"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "lunaryorn"; repo = "ansible-doc.el"; - rev = "6ab94392c860e23439ea3213b74ca56834d1ab14"; - sha256 = "05z379k6a7xq9d2zapf687x3f37jpmh6kfghpgxdd18v0hzca8ds"; + rev = "bc8128a85a79b14f4a121105d87a5eddc33975ad"; + sha256 = "0z3y69sfzka764wjbx31dywdq4d6bfsafv2gmmbpmxqmwfmy8sz4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/1daaaa7462f0b83c15ed9d9e7e6d0ee94434b8e9/recipes/ansible-doc"; @@ -1268,6 +1289,27 @@ license = lib.licenses.free; }; }) {}; + ansible-vault = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ansible-vault"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "zellio"; + repo = "ansible-vault-mode"; + rev = "8b4cdebb817c979b13eab625e3bbeebb08ddf026"; + sha256 = "1gqga59qinmkjalk1jkbh8w70sqvb3p033sbx69qljc2mivs8rh8"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/2bff0da29a9b883e53a3d211c5577a3e0bc263a0/recipes/ansible-vault"; + sha256 = "0pmsvpc866rgcajb2ihhb62g3rwhda7vvq2kxkvr566y609vv021"; + name = "ansible-vault"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/ansible-vault"; + license = lib.licenses.free; + }; + }) {}; anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "anti-zenburn-theme"; @@ -1585,12 +1627,12 @@ auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "auctex-latexmk"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "tom-tan"; repo = "auctex-latexmk"; - rev = "bda696babcf4f4df435415e2d6a9c54fa99b230c"; - sha256 = "0zq4am4jgb1rnr2gvi9156y7zi6vfkrasjfj5ar1pw4k0cba7pf6"; + rev = "b7053f71f578ffb0d247f8a9e8d5152efd86e096"; + sha256 = "0slihygr74vyijnyzssckapscxmdd7zlgrs0wvmpw9hnjzwwzzql"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3f48af615c56f093dff417a5d3b705f9993c518f/recipes/auctex-latexmk"; @@ -1648,12 +1690,12 @@ auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }: melpaBuild { pname = "auth-password-store"; - version = "1.0.4"; + version = "1.1.0"; src = fetchFromGitHub { owner = "DamienCassou"; repo = "auth-password-store"; - rev = "209663c772105ae87d244cce9247695823914a00"; - sha256 = "1b6g7qvrxv6gkl4izq1y7k0x0l7izyfnpki10di5vdv3jp6xg9b2"; + rev = "7b399fd7eb4a19f32d93ec6dc0eb3a344d2687aa"; + sha256 = "021iqwn4lwpsx02m3ns8l3bn5dvssii5sk9vg32mh56fjpbi2dkj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0f4d2a28373ba93da5b280ebf40c5a3fa758ea11/recipes/auth-password-store"; @@ -2137,12 +2179,12 @@ base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "base16-theme"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "belak"; repo = "base16-emacs"; - rev = "bd7c0d6f54f961752104e1e05f0c525cf62048f7"; - sha256 = "1150alc6f848daf47gchcsy6dhqsq5m35bj4rvdcy50i8n0wa5pc"; + rev = "97359d48a00b30776c5416ea90735d8302687677"; + sha256 = "0f0gg5kfzgii0rf75gh48wnwimkc88xzwbifkwdf745jhzkyqn6s"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/30862f6be74882cfb57fb031f7318d3fd15551e3/recipes/base16-theme"; @@ -2533,22 +2575,22 @@ license = lib.licenses.free; }; }) {}; - boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: + boon = callPackage ({ dash, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }: melpaBuild { pname = "boon"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "jyp"; repo = "boon"; - rev = "82458a944e9cf3e4c959e63ebad09312aafe6d2c"; - sha256 = "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq"; + rev = "c72d26ca2f9c0672192b5f40302ad0ebfc2d6db6"; + sha256 = "1grsaajfbhgq1wlraq8v21sfqdnk9ja3gj7y982hh44671haqjvw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/091dcc3775ec2137cb61d66df4e72aca4900897a/recipes/boon"; sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb"; name = "boon"; }; - packageRequires = [ emacs expand-region multiple-cursors ]; + packageRequires = [ dash emacs expand-region multiple-cursors ]; meta = { homepage = "https://melpa.org/#/boon"; license = lib.licenses.free; @@ -3103,12 +3145,12 @@ cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cbm"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "akermu"; repo = "cbm.el"; - rev = "bd74f5f83ea1778d2e871cbcbedf458ccde40128"; - sha256 = "1smj2l0g0643qp2c5jgj7z9yk6y8yia5a33pfbdpa4qwgq1ap3m4"; + rev = "bf8cbbcef82e4643c5f0399f0198f606275af08c"; + sha256 = "1p88fx90xwjk7dmd5gmbqyajyxf859kjsjzqmzljwai91skbb3pm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f28dbc97dc23cdb0b4c74f8805775c787635871e/recipes/cbm"; @@ -3565,12 +3607,12 @@ cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }: melpaBuild { pname = "cliphist"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "cliphist"; - rev = "7a1a8a6dcc046c7ede4480315c539c06e1bbadc9"; - sha256 = "0h856l6rslawf3vg37xhsaw5w56r9qlwzbqapg751qg0v7wf0860"; + rev = "5cddd9c0b3aacc9941214a749edd19ceb2cde7f4"; + sha256 = "0hifxb3r54yinlal6bwhycwaspbz1kwkybvrcppkpdfg9jd88nfd"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/82d86dae4ad8efc8ef342883c164c56e43079171/recipes/cliphist"; @@ -3636,22 +3678,22 @@ license = lib.licenses.free; }; }) {}; - cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }: + cljr-helm = callPackage ({ cl-lib ? null, clj-refactor, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }: melpaBuild { pname = "cljr-helm"; - version = "0.7"; + version = "0.11"; src = fetchFromGitHub { owner = "philjackson"; repo = "cljr-helm"; - rev = "916d070503d0f484f36626c7a42f156b737e3fab"; - sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha"; + rev = "f2fc7b698a56e4a44d5dfbc6a55d77a93c0fa9a4"; + sha256 = "0jy6hkz8sr1bplymwxnjg4q408cw2dgfrv70chlw3y5ddc4cingj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d99b67e295ef59916211bf22b57b4d093e3d53ab/recipes/cljr-helm"; sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc"; name = "cljr-helm"; }; - packageRequires = [ clj-refactor helm ]; + packageRequires = [ cl-lib clj-refactor helm-core ]; meta = { homepage = "https://melpa.org/#/cljr-helm"; license = lib.licenses.free; @@ -3807,12 +3849,12 @@ cm-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cm-mode"; - version = "1.2"; + version = "1.5"; src = fetchFromGitHub { owner = "joostkremers"; repo = "criticmarkup-emacs"; - rev = "1ac0d64842eb303323f2ebea61b4b6ba9f72969c"; - sha256 = "1rwln3ms71fys3rdv3sx8w706aqn874im3kqcfrkxz86wiazm2d5"; + rev = "12b7460691dc502d27329d6ac11c51cc83cd098e"; + sha256 = "018limfwcb396yr2kn6jixxdmpmiif3l7gp0p1pmwbg07fldllha"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/42dda804ec0c7338c39c57eec6ba479609a38555/recipes/cm-mode"; @@ -4164,12 +4206,12 @@ company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "company-ansible"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "krzysztof-magosa"; repo = "company-ansible"; - rev = "09065115bead0a14c134d4419944eed7e999284c"; - sha256 = "1vygalvg3hky0hacvj8pgjiaym91yh0npq69q4qi3slz87rpl24c"; + rev = "9f22c09009734bd281fcbb89d8903a04b8a72b74"; + sha256 = "0z6ix3sihzzkk4jgi1qg5ma9wczzdl55kc0y93jnfn69yk3l0ikn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7b44cd4bd9f9a7c942ca3f3bd88b2ce61ffff130/recipes/company-ansible"; @@ -4692,6 +4734,27 @@ license = lib.licenses.free; }; }) {}; + conda = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }: + melpaBuild { + pname = "conda"; + version = "0.0.5"; + src = fetchFromGitHub { + owner = "necaris"; + repo = "conda.el"; + rev = "41169a10cc41c0a3e0b9a61fd8cae7f964347ed7"; + sha256 = "1n56g7n4nsqrgyhn9lwwqjivmpllibmpgnvy34gbwifkmnq4wz0b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fcf762e34837975f5440a1d81a7f09699778123e/recipes/conda"; + sha256 = "1hi292h6ccl7vkvyxcwwcdxw8q2brv3hy0mnlikzj2qy5pbnfg4y"; + name = "conda"; + }; + packageRequires = [ dash emacs f pythonic s ]; + meta = { + homepage = "https://melpa.org/#/conda"; + license = lib.licenses.free; + }; + }) {}; conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "conkeror-minor-mode"; @@ -5031,12 +5094,12 @@ csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "csharp-mode"; - version = "0.8.12"; + version = "0.9.0"; src = fetchFromGitHub { owner = "josteink"; repo = "csharp-mode"; - rev = "b4fb58af022a60c1c8161475e9c3fa023a0f9816"; - sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx"; + rev = "6c0a0d6cf602666d63a06c3652ce522b3a5a7661"; + sha256 = "1pw96s0675rf35hwaxdzids9s8ynkb0g66yximiiz6ryh4ama0wn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/736716bbcfd9c9fb1d10ce290cb4f66fe1c68f44/recipes/csharp-mode"; @@ -5197,12 +5260,12 @@ cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "cython-mode"; - version = "0.24.1.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "cython"; repo = "cython"; - rev = "3de7bd5559631321c287c8fdd8958b6c494dba5c"; - sha256 = "11ddx5c535a76pnxqdfahchi839v59iwvpiyswigskyfhzxn5ic1"; + rev = "27d7795ce424cd710431c47ab4cb29111f1a3e9c"; + sha256 = "0kddvsnc4a2ass4zfzrqp26jlbnqsgbv0dy9rmj3p2n61wqkw4wk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/be9bfabe3f79153cb859efc7c3051db244a63879/recipes/cython-mode"; @@ -5260,12 +5323,12 @@ darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "darktooth-theme"; - version = "0.1.44"; + version = "0.1.49"; src = fetchFromGitHub { owner = "emacsfodder"; repo = "emacs-theme-darktooth"; - rev = "839c94048e0a3e9ac6e286212c7626f3fb7ac2c9"; - sha256 = "1nagwhd8n69iysa4m5i7xxi06w6z4hsrvjsgmdg5msyi14ci5lip"; + rev = "825a61d8d65dbbe9fca44f865dc0a57dbd6bf3db"; + sha256 = "1b2i5fvg3q4fwg5inp08ivznv97cvz2x073i21pv82rk1p8f39q7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b7f62ac1566ced7332e83253f79078dc30cb7889/recipes/darktooth-theme"; @@ -5867,12 +5930,12 @@ dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "dired-k"; - version = "0.17"; + version = "0.18"; src = fetchFromGitHub { owner = "syohex"; repo = "emacs-dired-k"; - rev = "4c9eb0fab636983a03dbe4357f9b3ee6b3ca8d74"; - sha256 = "17g0ajhbhk7l5s75h0ybz1w1dnf5aikvbcgcdd4d0qkj9l91k8x6"; + rev = "57f263b42ea83c6a1cf391fcccffd0f36d213f35"; + sha256 = "1w2grc91m71k9mr4n423vbnakkqg6vc10bham869xs3yr8fs7nay"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f8a828b2fbfa11c4b74192d9d0cfa0ad34b3da7/recipes/dired-k"; @@ -6220,6 +6283,27 @@ license = lib.licenses.free; }; }) {}; + doom-themes = callPackage ({ all-the-icons, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "doom-themes"; + version = "1.1.0"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-doom-theme"; + rev = "cf58400f74e88ed2ec519428a16b5668aaa60842"; + sha256 = "01dmy7723wss3cvxi127ki75v7ssxb4cs09d34akcmynrgh4x92s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/73fd9f3c2352ea1af49166c2fe586d0410614081/recipes/doom-themes"; + sha256 = "1ckr8rv1i101kynnx666lm7qa73jf9i5lppgwmhlc76lisg07cik"; + name = "doom-themes"; + }; + packageRequires = [ all-the-icons dash emacs ]; + meta = { + homepage = "https://melpa.org/#/doom-themes"; + license = lib.licenses.free; + }; + }) {}; downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "downplay-mode"; @@ -6415,8 +6499,8 @@ version = "0.3"; src = fetchhg { url = "https://bitbucket.com/harsman/dyalog-mode"; - rev = "4b5bc1f49cad"; - sha256 = "1c0jswjxazf330bh0xg889s6pfk50x5qi5lc8kpfqwa0p6b15306"; + rev = "2664661b55eb"; + sha256 = "1yawkav0hdsn41lx9q33lxsfpjy7fiwk0f5xlly5vswsn2va9zlv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b7972602399f9df9139cff177e38653bb0f43ed/recipes/dyalog-mode"; @@ -6705,12 +6789,12 @@ ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }: melpaBuild { pname = "ebib"; - version = "2.6.3"; + version = "2.7.2"; src = fetchFromGitHub { owner = "joostkremers"; repo = "ebib"; - rev = "018d6ae692eaff67aa77ebaccd29d49912669cd8"; - sha256 = "1awwlrmypbrycbrz8nh1z97gq9rh7k7mav9zk47rhq6vwbl9l066"; + rev = "212b6a594d13ffcc5683f9bcfd274682abff2b05"; + sha256 = "1d19qw9980iq4idmcdr8ri42pdmyig6c1nwpxijqvdnd0zxfbnph"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4e39cd8e8b4f61c04fa967def6a653bb22f45f5b/recipes/ebib"; @@ -6828,6 +6912,27 @@ license = lib.licenses.free; }; }) {}; + ede-php-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ede-php-autoload"; + version = "0.4.1"; + src = fetchFromGitHub { + owner = "stevenremot"; + repo = "ede-php-autoload"; + rev = "682cf38c3ba7c0da21171826a655003c0f1d8349"; + sha256 = "0gi8095rib20bggrjz8a52y0v3wh6jidjjab1yfr21gyl6i885w7"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/8ee9f7fd9cbc3397cd9af34b08b75c3d9d8bc551/recipes/ede-php-autoload"; + sha256 = "0b7qbighncipgfaksvggpyldc5h0wxbjbiyaghglvycc4p1sfjd0"; + name = "ede-php-autoload"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ede-php-autoload"; + license = lib.licenses.free; + }; + }) {}; edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "edit-indirect"; @@ -7039,12 +7144,12 @@ ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }: melpaBuild { pname = "ein"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "millejoh"; repo = "emacs-ipython-notebook"; - rev = "9fc8dd3be4a556d7abf6977c889887a38232929f"; - sha256 = "0w2j0bbqnba1wr12f0zk87zwnxf6xhchx224fwgwqd3kg0x5z0r3"; + rev = "0c47d8078d075c87bcc0bb2f072bef14fa57cd7e"; + sha256 = "1dljb6pd35l5mv51fm0bjfw4g6d19fj5sc1yag7jir6nmx0k992m"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3201516c0158c47d0226ef9c5d324d29ac7b088b/recipes/ein"; @@ -7396,12 +7501,12 @@ elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }: melpaBuild { pname = "elm-mode"; - version = "0.19.3"; + version = "0.19.5"; src = fetchFromGitHub { owner = "jcollard"; repo = "elm-mode"; - rev = "7e0da96f483703930919f04943f60f6eca3cb842"; - sha256 = "1y0prk4dbw6h26kj2l5vl3bakvc58aawjpkpb2r8wgb2b3fg9vl3"; + rev = "2f7f0c3e42d137aaefd12bc28383807d35a2a290"; + sha256 = "137189r1rba5l9m82qj3zba8x0gkm0c3xc9df1vri4wsbz4df7nm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5d1a4d786b137f61ed3a1dd4ec236d0db120e571/recipes/elm-mode"; @@ -7414,22 +7519,22 @@ license = lib.licenses.free; }; }) {}; - elmacro = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "elmacro"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Silex"; repo = "elmacro"; - rev = "20a0d1e220984ec6079dda9419b3bb44a88edae3"; - sha256 = "0l2iincskpks9yvj3y9zh1b48xli1q39wybr5n96rys5gv0drc9h"; + rev = "10eb7d70188ed1d49763920ecbc584b71864e8ba"; + sha256 = "0f0k9ais7bmjidv2mqr1whrv6rhq4jkig5h2y4h9npxyyb2nrz3q"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/566cc5bc0f71c5a4191ad93b917dc268f6e1a2da/recipes/elmacro"; sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz"; name = "elmacro"; }; - packageRequires = [ cl-lib dash s ]; + packageRequires = [ dash s ]; meta = { homepage = "https://melpa.org/#/elmacro"; license = lib.licenses.free; @@ -7501,12 +7606,12 @@ elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elpa-mirror"; - version = "1.2.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "redguardtoo"; repo = "elpa-mirror"; - rev = "940c17f757ddaf9c076503af2bb15d04f299692c"; - sha256 = "0h2xhys3cc9z61ax0ymg5fbsjg6192hwdvfhgmyq7vwibi402r1f"; + rev = "9cf096448b69c795b20aab89557e9add6029b13c"; + sha256 = "05la1v1p7wyrjflh8lv3pwr7ywm2rvvzhh8phr24w31jfs2kp4gf"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d64ce7042c45f29fb394be25ce415912182bac8b/recipes/elpa-mirror"; @@ -7546,6 +7651,27 @@ license = lib.licenses.free; }; }) {}; + elscreen-fr = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }: + melpaBuild { + pname = "elscreen-fr"; + version = "0.0.3"; + src = fetchFromGitHub { + owner = "rocher"; + repo = "elscreen-fr"; + rev = "b9c11f80d277086d5d5bf88623e15fc7adbbbe3c"; + sha256 = "1dz8jqd2agh06hya59vbybrmgyhyz2rk6c9panrm49w37v0bwksb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/18730986df5eb9816eec7ad479abe1e338d3c66f/recipes/elscreen-fr"; + sha256 = "1kmga1zz9mb3hxd2sxja2vz45pix5a52yl0g9z4vmak32x9rgqrm"; + name = "elscreen-fr"; + }; + packageRequires = [ elscreen seq ]; + meta = { + homepage = "https://melpa.org/#/elscreen-fr"; + license = lib.licenses.free; + }; + }) {}; elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "elscreen-mew"; @@ -7925,12 +8051,12 @@ emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "emms-player-simple-mpv"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "momomo5717"; repo = "emms-player-simple-mpv"; - rev = "ae4c0032d4d2d0b069ee147b19f962e6a8a73c79"; - sha256 = "15bb8fp2lwr5brfrsjwa47yvja5g2wyaac5a4sh5rn734s64x2sq"; + rev = "bcc056364df5f405716006a8b7bb90102a57f62f"; + sha256 = "0kz31qsn3nrpi8r31nlxlkkkah0qcdkq9a9i9ypv4ky7pvnzx6m5"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f4eaa866ba6b0ad2b590fb15c30f81b9fdbef6dd/recipes/emms-player-simple-mpv"; @@ -8009,12 +8135,12 @@ emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }: melpaBuild { pname = "emojify"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "emacs-emojify"; - rev = "fec788f09ab1c131b89f296ebd3e73df97e96cfe"; - sha256 = "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp"; + rev = "4eccfc7ce43d4dfd3cf65ea86b2975abb4b4e9ad"; + sha256 = "1n5pmcd6d71pcgjwkqnmh6midcyp7ahc5yry3r38my3shrwirqc2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/488d2751b5fd3bf00f5a6f0545530f44563b86d7/recipes/emojify"; @@ -8303,8 +8429,8 @@ version = "0.1"; src = fetchhg { url = "https://bitbucket.com/seanfarley/erc-hipchatify"; - rev = "b237cf8118fd"; - sha256 = "11a64rvhd88val6vg9l1d5j3zdjd0bbbwcqilj0wp6rbn57xy0w8"; + rev = "dbb74dd91c5a"; + sha256 = "0m72jwgp9zqm1aphg7xm3pzj2xvavqfpdx66lny8pvfv8lph93lj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b60e01e7064ce486fdac3d1b39fd4a1296b0dac5/recipes/erc-hipchatify"; @@ -8446,12 +8572,12 @@ erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "erlang"; - version = "19.0.5"; + version = "19.1.1"; src = fetchFromGitHub { owner = "erlang"; repo = "otp"; - rev = "71894a879d6254693791585246ce340dd7414b82"; - sha256 = "0s0s94jsqqpny5z2qdbb62h45cz8lh2if65q26jlcgbyz2729j77"; + rev = "310b00b7fc18b5883f5f2cb1b992deb1dd6c9a65"; + sha256 = "0vgnv517ljhkgmrljvxinm3x72c2mf4y83vpyhlb0cwl2q0gmc4d"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/erlang"; @@ -9641,12 +9767,12 @@ f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "f"; - version = "0.18.2"; + version = "0.19.0"; src = fetchFromGitHub { owner = "rejeep"; repo = "f.el"; - rev = "6f80f25ef87fb9df58cbc86faa2a2f037dcc2e7e"; - sha256 = "095ka87144jms5gi9spjcmkq346a56kzzy3in6naaha0djd4d607"; + rev = "541cb518afa5010029492847292c248f88b3ea42"; + sha256 = "1j6gc2pp5w3iwyjm4h3d0ahzs0ac3pah8lzfhpg4nkibl0nc1bcg"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/22ddcf536af597b688d8edb70b3636ed6c265bf5/recipes/f"; @@ -9830,12 +9956,12 @@ fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "fill-column-indicator"; - version = "1.81"; + version = "1.87"; src = fetchFromGitHub { owner = "alpaker"; repo = "Fill-Column-Indicator"; - rev = "5cbc077083775d4719a294455a8a8a53bb3151f8"; - sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9"; + rev = "0e755319451dd9c6c99c2a2ef82c890ba93343b6"; + sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/4ea0c00a7784621fcca0391a9c8ea85e9dd43852/recipes/fill-column-indicator"; @@ -10236,12 +10362,12 @@ flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-cask"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "flycheck"; repo = "flycheck-cask"; - rev = "bad0b7bc25fdfc200ec383db852120aa0fcdba4b"; - sha256 = "1c3igqfd42dm42kfjm2q2xgr673vws10n9jn2jjlsk4g33brc7h4"; + rev = "b4667500dcf52f96ec7e0fa10dd07edf191cbf5b"; + sha256 = "1wm5saf29gw0gp0qq5glf9qq3iras99npc2rip7bsnn0czr2mscy"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/43224eef52bb316102fea524ba87b0e9e43dc6e6/recipes/flycheck-cask"; @@ -10488,12 +10614,12 @@ flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: melpaBuild { pname = "flycheck-package"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "purcell"; repo = "flycheck-package"; - rev = "ff93e8986a1021daf542c441c1fd50436ee83cba"; - sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd"; + rev = "d2366c27a342e2040903b9c7a016c7309b299611"; + sha256 = "1gblp39k20qkwybpwlb1xl72281hjz4ymcynqc7dg2nv1gh89dv3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d17ec69c9f192625e74dfadf03b11d0d7dc575e7/recipes/flycheck-package"; @@ -10569,6 +10695,27 @@ license = lib.licenses.free; }; }) {}; + flycheck-swift = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }: + melpaBuild { + pname = "flycheck-swift"; + version = "2.0"; + src = fetchFromGitHub { + owner = "swift-emacs"; + repo = "flycheck-swift"; + rev = "822d1415eabfd464adc52063f9c44da1c87f0ff9"; + sha256 = "0gf7cxrsrf62kamm4xy1fi4v264szm6qk607ifg4bi5dmdc10b0k"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/fd99bea06079c4231363c37e3361bd9e5b1ba490/recipes/flycheck-swift"; + sha256 = "1s6rn4wyz9la6bw228jfxx8dxjyk5hf8r3vbmq0k808p772zki0z"; + name = "flycheck-swift"; + }; + packageRequires = [ emacs flycheck ]; + meta = { + homepage = "https://melpa.org/#/flycheck-swift"; + license = lib.licenses.free; + }; + }) {}; flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }: melpaBuild { pname = "flycheck-tip"; @@ -10971,12 +11118,12 @@ flyspell-correct = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "07aa9a9c67c56837b99f8545a4b37485a1732265"; - sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; + rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; + sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/fa06fbe3bc40ae5e3f6d10dee93a9d49e9288ba5/recipes/flyspell-correct"; @@ -10992,12 +11139,12 @@ flyspell-correct-helm = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, helm, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-helm"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "07aa9a9c67c56837b99f8545a4b37485a1732265"; - sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; + rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; + sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-helm"; @@ -11013,12 +11160,12 @@ flyspell-correct-ivy = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, ivy, lib, melpaBuild }: melpaBuild { pname = "flyspell-correct-ivy"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "07aa9a9c67c56837b99f8545a4b37485a1732265"; - sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; + rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; + sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-ivy"; @@ -11034,12 +11181,12 @@ flyspell-correct-popup = callPackage ({ fetchFromGitHub, fetchurl, flyspell-correct, lib, melpaBuild, popup }: melpaBuild { pname = "flyspell-correct-popup"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "d12frosted"; repo = "flyspell-correct"; - rev = "07aa9a9c67c56837b99f8545a4b37485a1732265"; - sha256 = "0zfyry6ysz77ala8ppy4k9h7ssnzw2brnglalphbqw2lgx3q3f98"; + rev = "d50f3661ad545b30acac4c8819eda2238ff375fc"; + sha256 = "1j39vsmcz2qwab4yld7asvf4wm3249728fdyf7myiqg5bnivd8ig"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7b9302d8f804c77eb81fee7ed27f13cb1176f6/recipes/flyspell-correct-popup"; @@ -11388,6 +11535,27 @@ license = lib.licenses.free; }; }) {}; + fsbot-data-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "fsbot-data-browser"; + version = "0.3"; + src = fetchFromGitHub { + owner = "benaiah"; + repo = "fsbot-data-browser"; + rev = "6bca4f7de63e31839d2542f6c678b79931dec344"; + sha256 = "0lvpgfp89sz6f6rn576g1g88s0q3ibj5ghydjwfcg9w6h7vx5b5s"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/37a0901b98e1c66be6906234e6d6520a6e940e97/recipes/fsbot-data-browser"; + sha256 = "0jijvl07jk200fs01ln4dmw5nx9jg3f9b7gjaknyd18vyvbwr3s5"; + name = "fsbot-data-browser"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/fsbot-data-browser"; + license = lib.licenses.free; + }; + }) {}; fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }: melpaBuild { pname = "fsharp-mode"; @@ -11767,12 +11935,12 @@ ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ggtags"; - version = "0.8.11"; + version = "0.8.12"; src = fetchFromGitHub { owner = "leoliu"; repo = "ggtags"; - rev = "d4fb6d40b71cad3fd5a2141b8456f27e2b2dc731"; - sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n"; + rev = "7a7ee76a8055531482927e6abf7e0ef676165dd2"; + sha256 = "1kyg26wdimy5k5icglgqg9gdfvzkgk4xis12nx1xkh01j2imzl97"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b158bb1bc2fbe3de61a6b21174eac7b1457edda2/recipes/ggtags"; @@ -12310,6 +12478,27 @@ license = lib.licenses.free; }; }) {}; + github-elpa = callPackage ({ commander, fetchFromGitHub, fetchurl, git, lib, melpaBuild, package-build }: + melpaBuild { + pname = "github-elpa"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "10sr"; + repo = "github-elpa"; + rev = "c5960375ed5d67465412be7eb0ac558082feebc7"; + sha256 = "02710iy9zz4ymmb2ydrca5kbdc5i06fjg7212iyvpd58yfzxjj2m"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/81ec06e370f51b750ba3313b661d7386710cffb0/recipes/github-elpa"; + sha256 = "1981dnz49l5r4qsn49i4dhy6x4ln0haff6gl2zx0p5p0zfkzbi7x"; + name = "github-elpa"; + }; + packageRequires = [ commander git package-build ]; + meta = { + homepage = "https://melpa.org/#/github-elpa"; + license = lib.licenses.free; + }; + }) {}; github-search = callPackage ({ fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }: melpaBuild { pname = "github-search"; @@ -12562,6 +12751,27 @@ license = lib.licenses.free; }; }) {}; + go-add-tags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + melpaBuild { + pname = "go-add-tags"; + version = "0.2"; + src = fetchFromGitHub { + owner = "syohex"; + repo = "emacs-go-add-tags"; + rev = "a6a879889729d579297935598d26b985f900ef29"; + sha256 = "1s4jwpwxlqxi9h5qqjcvxz3i8rgfrs874rpadp6lhizdhpjjp82y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/55d3b893bd68d3d2d86ecdbb4ed442edd256516a/recipes/go-add-tags"; + sha256 = "0nvas44rsvqzk2ay5bhzkbrnzql13vnxq9pk4lp4mvp86dda9qim"; + name = "go-add-tags"; + }; + packageRequires = [ cl-lib emacs s ]; + meta = { + homepage = "https://melpa.org/#/go-add-tags"; + license = lib.licenses.free; + }; + }) {}; go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "go-autocomplete"; @@ -12775,12 +12985,12 @@ google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "google-translate"; - version = "0.11.10"; + version = "0.11.13"; src = fetchFromGitHub { owner = "atykhonov"; repo = "google-translate"; - rev = "84d75daa644c0e73289fc428ff35acdc0943cbbb"; - sha256 = "0dzr1nb1s1sh8rv5wr9xfjd5xna54vp03y3h4q59vmnynsn64m9b"; + rev = "c859592c3fda01594b270e388414a79373b5587b"; + sha256 = "1arwq4nld3capjj2b3ask1pwy89fz25f550fb7cnhiv5rhqr51iw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e3c275e59cbfe6e40f9cd4c470fc66544c9a6d21/recipes/google-translate"; @@ -12880,12 +13090,12 @@ govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }: melpaBuild { pname = "govc"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; - rev = "c0c7ce63df7edd78e713257b924c89d9a2dac119"; - sha256 = "1yj4iimwfv3d4m24ifmncc2z09dlmxjr1dhryh4afkpgj48x4lcv"; + rev = "f9184c1d704efa615d419dd8d1dae1ade94701d1"; + sha256 = "1q86wklz73qmyif04fv5y42imly3yab5bjc8ymka8xkc5lh71mwm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/92d6391318021c63b06fe39b0ca38f667bb45ae9/recipes/govc"; @@ -13006,12 +13216,12 @@ grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "grandshell-theme"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "steckerhalter"; repo = "grandshell-theme"; - rev = "6bf34fb1a3117244629a7fb23daf610f50854bed"; - sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs"; + rev = "f9dbaa341fce72f9deaf69bfaa09282168ebaf9d"; + sha256 = "03lr4gim7yynwx0n06dd1vy6hbizxwc8hcwzz1gbvla2509njga7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5b04b0024f5a0367e2998d35ca88c2613a8e3470/recipes/grandshell-theme"; @@ -13180,6 +13390,27 @@ license = lib.licenses.free; }; }) {}; + groovy-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }: + melpaBuild { + pname = "groovy-imports"; + version = "1.0"; + src = fetchFromGitHub { + owner = "mbezjak"; + repo = "emacs-groovy-imports"; + rev = "e56d7dda617555ec6205644d32ffddf2e1fa43d9"; + sha256 = "060zxl2y4p50g5fwgplgx07h5akfplp49rkv5cx09rqlcyzqhqwa"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b18a6842805856062e9452dc32bf0fd458f7d51a/recipes/groovy-imports"; + sha256 = "09yjkwsm192lgala1pvxw47id4j7362sl3j1hn9ald2m8m3ddyfs"; + name = "groovy-imports"; + }; + packageRequires = [ emacs pcache s ]; + meta = { + homepage = "https://melpa.org/#/groovy-imports"; + license = lib.licenses.free; + }; + }) {}; groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "groovy-mode"; @@ -13306,6 +13537,27 @@ license = lib.licenses.free; }; }) {}; + gulp-task-runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "gulp-task-runner"; + version = "1.0"; + src = fetchFromGitHub { + owner = "NicolasPetton"; + repo = "gulp-task-runner"; + rev = "8f5c52a7180634a99e16822bbc9f6d5e014c87d2"; + sha256 = "0n4i3vdl3ayykxab9jql1ivcv7806pin91nmw9ang3fazan06diq"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/34a2bede5ea70cf9df623c32e789d78205f9ebb0/recipes/gulp-task-runner"; + sha256 = "0211mws99bc9ipg7r3qqm1n7gszvwil31psinf0250wliyppjij7"; + name = "gulp-task-runner"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/gulp-task-runner"; + license = lib.licenses.free; + }; + }) {}; guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "guru-mode"; @@ -13537,22 +13789,22 @@ license = lib.licenses.free; }; }) {}; - haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + haskell-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "haskell-mode"; - version = "13.20.1"; + version = "16.1"; src = fetchFromGitHub { owner = "haskell"; repo = "haskell-mode"; - rev = "9eef80d1a16ac3b41b62b8d79ecbafa62e00c6c9"; - sha256 = "1xckvi2s62hwrrrd6g446gszyqdk6bmd2hcrc6m0qfnyjkvg6jf0"; + rev = "d2ea5239bf02f3917a78a5c2dcbc5b6f6dd1b359"; + sha256 = "1qk36y0v9fzass6785il65c6wb5cfj4ihhwkvgnzmbafpa8p4dvq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7f18b4dcbad4192b0153a316cff6533272898f1a/recipes/haskell-mode"; sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp"; name = "haskell-mode"; }; - packageRequires = [ cl-lib emacs ]; + packageRequires = [ emacs ]; meta = { homepage = "https://melpa.org/#/haskell-mode"; license = lib.licenses.free; @@ -13665,12 +13917,12 @@ helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }: melpaBuild { pname = "helm"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "7a7c9d990e924b9ac0e845afa4e539122f034e31"; - sha256 = "0rpjz3z5ainpxkdmdwpmb1an23qwvfyfjsfscw5kw7k915wak0kq"; + rev = "2b91583c4f183b505d4870b4e6d3441d57637eae"; + sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/7e8bccffdf69479892d76b9336a4bec3f35e919d/recipes/helm"; @@ -13767,6 +14019,27 @@ license = lib.licenses.free; }; }) {}; + helm-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }: + melpaBuild { + pname = "helm-bibtex"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "tmalsburg"; + repo = "helm-bibtex"; + rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; + sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/f4118a7721435240cf8489daa4dd39369208855b/recipes/helm-bibtex"; + sha256 = "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z"; + name = "helm-bibtex"; + }; + packageRequires = [ biblio cl-lib dash f helm parsebib s ]; + meta = { + homepage = "https://melpa.org/#/helm-bibtex"; + license = lib.licenses.free; + }; + }) {}; helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }: melpaBuild { pname = "helm-bm"; @@ -13875,12 +14148,12 @@ helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "helm-core"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "emacs-helm"; repo = "helm"; - rev = "7a7c9d990e924b9ac0e845afa4e539122f034e31"; - sha256 = "0rpjz3z5ainpxkdmdwpmb1an23qwvfyfjsfscw5kw7k915wak0kq"; + rev = "2b91583c4f183b505d4870b4e6d3441d57637eae"; + sha256 = "0fbhfzy3karvdbfk49wp4pil5c2xncs8lpw5n9l4nv5yyvc4i2md"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ef7a700c5665e6d72cb4cecf7fb5a2dd43ef9bf7/recipes/helm-core"; @@ -14337,12 +14610,12 @@ helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }: melpaBuild { pname = "helm-mt"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "dfdeshom"; repo = "helm-mt"; - rev = "10790691f083c3806c9e85758b7ea73b5e24c5ed"; - sha256 = "1k1jzzxygpmxnj07br7ah2582sdj67vqmipykz7yzrprd8r9c8fw"; + rev = "d2bff4100118483bc398c56d0ff095294209265b"; + sha256 = "1wci63y0vjvrvrylkhhrz8p9q0ml6la5cpj4rx5cwin9rkmislm6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/e726bf0b9b3f371b21f1f0d75175e0dda62f6fb0/recipes/helm-mt"; @@ -14733,22 +15006,22 @@ license = lib.licenses.free; }; }) {}; - helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, spaces }: + helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, spaces }: melpaBuild { pname = "helm-spaces"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "yasuyk"; repo = "helm-spaces"; - rev = "141266a958feaf7a2e474ff4a5d4cd686919e942"; - sha256 = "13j3rgg5zfpxds6vsyq0aqws1f3p5y5dsq8558nqsymqvycpn047"; + rev = "877e2b5178926308d6a7c2a37477bb12c33a96d4"; + sha256 = "1cz8aw6zprzfalagma7jmbycwll2chk2l4n5hkgqyhakdfm2ryzm"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c2ffb50643223b68a62fab348cd5aba24ce92e6/recipes/helm-spaces"; sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791"; name = "helm-spaces"; }; - packageRequires = [ helm spaces ]; + packageRequires = [ helm-core spaces ]; meta = { homepage = "https://melpa.org/#/helm-spaces"; license = lib.licenses.free; @@ -15828,12 +16101,12 @@ iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "iedit"; - version = "0.9.9"; + version = "0.9.9.9"; src = fetchFromGitHub { owner = "victorhge"; repo = "iedit"; - rev = "b95c35107a429d63b99f888b52eb0f74105d0da0"; - sha256 = "06qv95bgcb6n3zcjs2i1q80v9040z7m9pb9xbhxmqzcx68vpbpdm"; + rev = "39919478f9472ce7a808ca601f4c19261ecc2f99"; + sha256 = "1pwkrm98vlpzsy5iwwfksdaz3zzyi7bvdf5fglhsn4ssf47p787g"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/aa2b2745bd1f1778070954c834158c19d4cfb788/recipes/iedit"; @@ -16203,6 +16476,27 @@ license = lib.licenses.free; }; }) {}; + inherit-local = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "inherit-local"; + version = "1.1"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "inherit-local"; + rev = "e687c702adb27ce5f69fb28a47fe21a86cf84063"; + sha256 = "11z3b1xwg6r769w3scd29lqg62fx8mp81g8dbx4klmj3clvyn69i"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/inherit-local"; + sha256 = "1v3q3s6qq64k1f4ck6rfgsy1arnf9cxg2kw6d1ahfrwr4ixsqm87"; + name = "inherit-local"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/inherit-local"; + license = lib.licenses.free; + }; + }) {}; init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "init-loader"; @@ -16496,6 +16790,27 @@ license = lib.licenses.free; }; }) {}; + ivy-bibtex = callPackage ({ biblio, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib, s, swiper }: + melpaBuild { + pname = "ivy-bibtex"; + version = "2.0.0"; + src = fetchFromGitHub { + owner = "tmalsburg"; + repo = "helm-bibtex"; + rev = "d6a98ac6f28d2a6a05e203115211c98333d40aca"; + sha256 = "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/c23c09225c57a9b9abe0a0a770a9184ae2e58f7c/recipes/ivy-bibtex"; + sha256 = "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2"; + name = "ivy-bibtex"; + }; + packageRequires = [ biblio cl-lib dash f parsebib s swiper ]; + meta = { + homepage = "https://melpa.org/#/ivy-bibtex"; + license = lib.licenses.free; + }; + }) {}; ivy-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, ivy, lib, melpaBuild, s }: melpaBuild { pname = "ivy-gitlab"; @@ -16662,22 +16977,22 @@ license = lib.licenses.free; }; }) {}; - jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, map, melpaBuild, seq, websocket }: + jade = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, seq, websocket }: melpaBuild { pname = "jade"; - version = "0.17"; + version = "0.20"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "jade"; - rev = "11769bf8419202819a25047f57dd9aa0c98f5ebb"; - sha256 = "09zfvcirz7hcp255yhsf7d04vrc078kk69qhwy1j31ar0rb4fy1b"; + rev = "856846322ea8077ffe6215b54f2f3676db5ccf61"; + sha256 = "03ckvamv61hpk1lcw6z66wsyg471qy979vm3wf8brq9zwapfknia"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b989c1bd83f20225314b6e903c5e1df972551c19/recipes/jade"; sha256 = "04w7pgn0dkppi6l15rkz8b1bcpw1dsgvvijy81a6i4nkigxxlv4y"; name = "jade"; }; - packageRequires = [ company emacs js2-mode map seq websocket ]; + packageRequires = [ company emacs js2-mode seq websocket ]; meta = { homepage = "https://melpa.org/#/jade"; license = lib.licenses.free; @@ -17760,13 +18075,13 @@ version = "3.1.1"; src = fetchFromGitHub { owner = "ledger"; - repo = "ledger"; - rev = "67d21ed4b083424831e51a649060fbde7c2f735b"; - sha256 = "0jkalp1sggdj0nsms7jlyll9fzq3xxjf110jqwk9ydid0farbyzi"; + repo = "ledger-mode"; + rev = "96c4e81eed52e0ef514dc15a6ea6d877b3409a2a"; + sha256 = "12q6wblwnb6y5c1882jz14742fqbm6p5jpzlvz7p90ylqfl7h989"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/93c54a327f226bf7e6a0ab4a3368a0e1ca169e62/recipes/ledger-mode"; - sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/851eca11911b337f809d030785dc2608c8a47424/recipes/ledger-mode"; + sha256 = "19vljgprgfpb9bkbdvkqnwc5pjn1rl0rniwav08a2c6kd2g59xaf"; name = "ledger-mode"; }; packageRequires = []; @@ -17841,12 +18156,12 @@ lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "lfe-mode"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "rvirding"; repo = "lfe"; - rev = "697e9b4996fa843f4c6a9edea25005d30a9b8a14"; - sha256 = "0w1vpjqj8ni43gi84i0mcml4gfaqhmmd9s46di37cngpdw86i3bz"; + rev = "e035006a486278c5ad8b8b04d14d5ef3dede64f7"; + sha256 = "16wpjry4yg3ap87kzzy387j1hxm0y7mcnh2v4a25snxcsz2cz7qv"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c44bdb00707c9ef90160e0a44f7148b480635132/recipes/lfe-mode"; @@ -18692,6 +19007,27 @@ license = lib.licenses.free; }; }) {}; + magithub = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }: + melpaBuild { + pname = "magithub"; + version = "0.1"; + src = fetchFromGitHub { + owner = "vermiculus"; + repo = "magithub"; + rev = "c94ff69749dd14200956e0b59a3757618c594730"; + sha256 = "12z9gl5lrvdfvhvk213phhgddvvr3y3hpigpzzcq0jla65db367b"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4605012c9d43403e968609710375e34f1b010235/recipes/magithub"; + sha256 = "1c3rbav13rw16ngjhjwnz80v653k8df63fkw0kayd80xrkxhrkxw"; + name = "magithub"; + }; + packageRequires = [ emacs magit ]; + meta = { + homepage = "https://melpa.org/#/magithub"; + license = lib.licenses.free; + }; + }) {}; make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "make-color"; @@ -19031,12 +19367,12 @@ material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "material-theme"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "cpaulik"; repo = "emacs-material-theme"; - rev = "b465a4f2112240df9e65f8326160d0c3e09a5a89"; - sha256 = "05cjgjmawndmgw2dl71sx5msj8csn0jr72rfxnw7jx24p4c33nkk"; + rev = "0890ff69a0fa1f908e79d0f68b1bb3cf0d55af40"; + sha256 = "0fd868ph4kdzp889j18wl4j5lypd5ggf1s69hz5sg0sn761b06x0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d31ababaa50061e767605c979a3f327a654e564b/recipes/material-theme"; @@ -19196,6 +19532,27 @@ license = lib.licenses.free; }; }) {}; + meghanada = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }: + melpaBuild { + pname = "meghanada"; + version = "0.2.2"; + src = fetchFromGitHub { + owner = "mopemope"; + repo = "meghanada-emacs"; + rev = "f80811e4f1efa712eabfa42fd995990d02fc1e5a"; + sha256 = "0w2ij8zh30qs19vwnqifg3p5cvk94akig03cv2f6mx14clvrwckn"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/4c75c69b2f00be9a93144f632738272c1e375785/recipes/meghanada"; + sha256 = "10f1fxma3lqcyv78i0p9mjpi79jfjd5lq5q60ylpxqp18nrql1s4"; + name = "meghanada"; + }; + packageRequires = [ cl-lib company emacs flycheck yasnippet ]; + meta = { + homepage = "https://melpa.org/#/meghanada"; + license = lib.licenses.free; + }; + }) {}; melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "melpa-upstream-visit"; @@ -19511,6 +19868,27 @@ license = lib.licenses.free; }; }) {}; + mips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "mips-mode"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "hlissner"; + repo = "emacs-mips-mode"; + rev = "dcde079176c1419ec24df08b62dd77a897892437"; + sha256 = "0jvbcld3abm45qzsbcaf6f1zd71hgdg5y47v6c0ri4xgwgcwqrvc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/024a76b83efce47271bcb0ce3bde01b88349f391/recipes/mips-mode"; + sha256 = "0gg18v80lbndi2yyr5nl37mz0zpamwv9ha4clajkf0bc0vplxkj7"; + name = "mips-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/mips-mode"; + license = lib.licenses.free; + }; + }) {}; mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }: melpaBuild { pname = "mmm-mako"; @@ -19699,6 +20077,27 @@ license = lib.licenses.free; }; }) {}; + monitor = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "monitor"; + version = "0.3.0"; + src = fetchFromGitHub { + owner = "GuiltyDolphin"; + repo = "monitor"; + rev = "8c67c06f60a89b2583bae90afc91a7e7d73260fd"; + sha256 = "1r2sns49f5fw4f122s165sa41nkrkq2qs20n98g2pfd1whflqfnb"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/b9df614e8e7b9dfdbd7eec552a2b13e0f5acfc22/recipes/monitor"; + sha256 = "11n4nv6vkjw434yrwqjw20229m2sxqxxdp7sg99gzrd5gjyab643"; + name = "monitor"; + }; + packageRequires = [ dash ]; + meta = { + homepage = "https://melpa.org/#/monitor"; + license = lib.licenses.free; + }; + }) {}; monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "monokai-theme"; @@ -19783,6 +20182,27 @@ license = lib.licenses.free; }; }) {}; + move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "move-text"; + version = "2.0.5"; + src = fetchFromGitHub { + owner = "emacsfodder"; + repo = "move-text"; + rev = "58f66f9b62af776a6c3ebe1151b038b59b2c12d4"; + sha256 = "03rkqv8l98ximfw33972y2lsqzjvbdv9kvz38i9p8iva56cmkbki"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/82bfd0f41e42eed1d4c2361ec1d1685edebbac1b/recipes/move-text"; + sha256 = "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy"; + name = "move-text"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/move-text"; + license = lib.licenses.free; + }; + }) {}; mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "mowedline"; @@ -19909,22 +20329,22 @@ license = lib.licenses.free; }; }) {}; - mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: + mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }: melpaBuild { pname = "mu4e-alert"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "iqbalansari"; repo = "mu4e-alert"; - rev = "83e6232b43902c7124fea16145de0da881bfe865"; - sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a"; + rev = "75ee79ed663bde0bd52f09c5b444cbd9e13a738a"; + sha256 = "09sywhf1g8yqadzp19djar2gm3fmilqi3pbdm0hvm9b7xpq1gg44"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5a48e8cb571e91b582ff0dea18e8dc75601edc35/recipes/mu4e-alert"; sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm"; name = "mu4e-alert"; }; - packageRequires = [ alert emacs s ]; + packageRequires = [ alert emacs ht s ]; meta = { homepage = "https://melpa.org/#/mu4e-alert"; license = lib.licenses.free; @@ -20269,12 +20689,12 @@ ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ncl-mode"; - version = "0.99.1"; + version = "0.99.2"; src = fetchFromGitHub { owner = "yyr"; repo = "ncl-mode"; - rev = "4a1a3f133c8c74a01b5c527496b56052bacac2ab"; - sha256 = "16i1k1zr6ng1dlxb1b73mxjf25f4kvf3x5vfffsi3qnfm960bg3q"; + rev = "164e504e25cec1812fbae5c3dae164d9f6018ece"; + sha256 = "1m3llm87qgd7sr6ci22nd835vdg0qprs5m9lqcx74k689jl89cni"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/00cc4705650157621bb0135cc512d57178496100/recipes/ncl-mode"; @@ -20413,6 +20833,27 @@ license = lib.licenses.free; }; }) {}; + nix-buffer = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "nix-buffer"; + version = "1.2.2"; + src = fetchFromGitHub { + owner = "shlevy"; + repo = "nix-buffer"; + rev = "eb28bf99c3562cfda07f312ca49e0b594f0ff81b"; + sha256 = "148iyy8ma1n5a3biyal5rafxpp0zzn81nyy06jlzrkzjy44iyzwi"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/08b978724ff26b3ea7a134d307d888c80e2a92a9/recipes/nix-buffer"; + sha256 = "1fjkf88345v9l2v2mk8a057mw0p0rckf6rjf00y5464dyhh58vcd"; + name = "nix-buffer"; + }; + packageRequires = [ emacs f ]; + meta = { + homepage = "https://melpa.org/#/nix-buffer"; + license = lib.licenses.free; + }; + }) {}; nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "nix-mode"; @@ -20539,11 +20980,11 @@ }) {}; notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild { pname = "notmuch"; - version = "0.22.1"; + version = "0.23"; src = fetchgit { url = "git://git.notmuchmail.org/git/notmuch"; - rev = "b824ecc48f1e838ab19e346b0eec17ff02432493"; - sha256 = "08jwa7fg2wnk5nhzd56lyvsgi6icgmzmb30mpvpvm4v2afwlhbvj"; + rev = "6cd6561aabcd24d033b592aa4503aaa3c06d241c"; + sha256 = "0hiw1da6zdcr47znmxm9mm7r1318va026bq6jqvby61rbhzj2ny7"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b19f21ed7485036e799ccd88edbf7896a379d759/recipes/notmuch"; @@ -20769,12 +21210,12 @@ ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "ob-http"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "zweifisch"; repo = "ob-http"; - rev = "e10b35accd4c758d781ab9f6e00b7b792dccf380"; - sha256 = "0bqr6yl1hpykpykjpfb247xnpnz510zrg9yv7nkxlrig4pjgdcx1"; + rev = "47a7b367314f6051715882e46a0e40477bda20a2"; + sha256 = "1y5izm9yxa556536mnpc8dp0nzm8wzr778qycpk4l9xfyp4xybaw"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/950b02f76a04f453992b8720032e8c4cec9a039a/recipes/ob-http"; @@ -20790,12 +21231,12 @@ ob-sagemath = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, sage-shell-mode }: melpaBuild { pname = "ob-sagemath"; - version = "0.2.4"; + version = "0.4"; src = fetchFromGitHub { owner = "stakemori"; repo = "ob-sagemath"; - rev = "98560075eb0a9dc5ad1e3102ac1154543692d74d"; - sha256 = "08p64ss3ia1gq6dsna5v3ajjwm5g9ma7yvd5y0jx91xssjqq5dja"; + rev = "450d510a5eb1fd644d0037e9f02271ca33639fb0"; + sha256 = "00i7jszlfh67xzvqnp137aaia68rkk4ri5v0fs32ym10pcj8l4dp"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/dc074af316a09906a26ad957a56e3dc272cd813b/recipes/ob-sagemath"; @@ -20958,12 +21399,12 @@ olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "olivetti"; - version = "1.5.3"; + version = "1.5.6"; src = fetchFromGitHub { owner = "rnkn"; repo = "olivetti"; - rev = "1553934954ea47e4d2de676c42324ed4790cfd14"; - sha256 = "1n978yv19bsy5876lnp16xs1qg1frdbicf9c9h2rvil5myrljhyj"; + rev = "de2716cfb1f4dc82a08093cdd00200e9bb1f07ef"; + sha256 = "0gfjrfhmjvq2zkyp0bgxymdv6r7p4x40aicvv1r61z29nz4dbyn2"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/697334ca3cdb9630572ae267811bd5c2a67d2a95/recipes/olivetti"; @@ -21067,8 +21508,8 @@ src = fetchFromGitHub { owner = "OmniSharp"; repo = "omnisharp-emacs"; - rev = "725796278fa8a391e244f2e50676dd6d6b67585d"; - sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm"; + rev = "f956929891e77ba4ce2fb1361129d5d3ebc7bb55"; + sha256 = "1xds6fqs1l6q9vak3v4xlzl1w084mhz86xrnycibcwm8q3q9hmb3"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/68bdb7e0100e120b95e9416398127d83530a221d/recipes/omnisharp"; @@ -21137,14 +21578,14 @@ pname = "opensource"; version = "0.2.0"; src = fetchFromGitHub { - owner = "nlamirault"; - repo = "opensource.el"; + owner = "OpenSourceOrg"; + repo = "el-opensourceorg"; rev = "27d06be45c852e84e47c33cbd0f4c344fd9a0370"; sha256 = "1rjf78vki4xp8y856v95877093p3zgfc9mx92npscsi1g93dxn80"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/b9925f059f0caf0550a747d1f07e043e9d854f77/recipes/opensource"; - sha256 = "0ha5xva27xf6af9yhxpmnkyp26jzia7fkbkqx5qv0cwmicapccfk"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/ec4255a403e912a14a7013ea96f554d3588dfc30/recipes/opensource"; + sha256 = "17gi20s2vi7m75qqaff907x1g8ja5ny90klldpqmj258m2j6a6my"; name = "opensource"; }; packageRequires = [ dash pkg-info request s ]; @@ -22411,12 +22852,12 @@ ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ox-twbs"; - version = "1.0.9"; + version = "1.1.0"; src = fetchFromGitHub { owner = "marsmining"; repo = "ox-twbs"; - rev = "ca98e2c312c6be1165b956f655a4becc89776634"; - sha256 = "0ranapdq6ly5xrqcksisgazwjp5xvydn98qfi8i1b491163704m3"; + rev = "d9847c7e7c1df384088726217e65a6c0067a67c7"; + sha256 = "1qf2ka61yykd234lwwfl2x206rlgkhnqfd5494iqqk4nsdz06bai"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3263133ba6dde790a364bad7c96144912971ba2d/recipes/ox-twbs"; @@ -22784,6 +23225,27 @@ license = lib.licenses.free; }; }) {}; + parinfer = callPackage ({ aggressive-indent, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "parinfer"; + version = "0.3.1"; + src = fetchFromGitHub { + owner = "DogLooksGood"; + repo = "parinfer-mode"; + rev = "710f203c3103016815c8d21369fe77e34103b0f9"; + sha256 = "1b92ksjpi3pzn97jgwx78vz10p3a6459j2mgcwb249zgzvb0lprx"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/470ab2b5cceef23692523b4668b15a0775a0a5ba/recipes/parinfer"; + sha256 = "05w4w7j6xyj19dm63073amd4n7fw4zm3qnn4x02fk2011iw8fq7i"; + name = "parinfer"; + }; + packageRequires = [ aggressive-indent cl-lib dash ]; + meta = { + homepage = "https://melpa.org/#/parinfer"; + license = lib.licenses.free; + }; + }) {}; parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "parsebib"; @@ -23142,12 +23604,12 @@ persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "persp-mode"; - version = "2.7"; + version = "2.9"; src = fetchFromGitHub { owner = "Bad-ptr"; repo = "persp-mode.el"; - rev = "2c559083fa316b97b76e25c491a45aec5f2fe501"; - sha256 = "091k1pnkw4a62di6lj7gkczzpgf2jsxpj3brpfjs8gkcgx07vxsh"; + rev = "56bc86c345be1a9fcea8acdf340cf87fa1869400"; + sha256 = "1hcz5ld259vsfcx6mfqm8raksi0nrndh21bn712ij0bx6gmy7vq1"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/caad63d14f770f07d09b6174b7b40c5ab06a1083/recipes/persp-mode"; @@ -23415,12 +23877,12 @@ pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pip-requirements"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "Wilfred"; repo = "pip-requirements.el"; - rev = "733ec3e4c30875944601b566e9dba6ef05812fcd"; - sha256 = "1dsg49156mfhkd8ip4ny03sc06zchxr1qpbcx48f5sn4m9j5d3vs"; + rev = "93e0595f037e3a95c1c1cd6f00f7e052a9a25912"; + sha256 = "016r7y5nfnx6iws3hq4xnyrcv00y6zmd453psxhivi896wb8szfq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa/recipes/pip-requirements"; @@ -23959,12 +24421,12 @@ prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }: melpaBuild { pname = "prodigy"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "rejeep"; repo = "prodigy.el"; - rev = "7034873908a616853b3a65258a7580a3b402e8a2"; - sha256 = "0r32rjfsbna0g2376gdv0c0im1lzw1cwbp9690rgqjj95ls4saa3"; + rev = "3bacca898db9b3493883c95f923a87eb1ce807eb"; + sha256 = "1whnk1902f8q03clm9xlfl47gkpsywf3mx0ykp70c1q496ab39qj"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/04686b7a450ccd4631ecf1d9bcd51572c21fd20d/recipes/prodigy"; @@ -24084,12 +24546,12 @@ projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }: melpaBuild { pname = "projectile-rails"; - version = "0.10.2"; + version = "0.11.0"; src = fetchFromGitHub { owner = "asok"; repo = "projectile-rails"; - rev = "70ec237ce49172ccc4daa536505749e3d4701469"; - sha256 = "0jvj0lxy7mhkv8ql472zz6wyrmh72cw1z9n1200z5g8p4n7jfjsj"; + rev = "c3a54723005d015d5d4364e4c74617dfd10ee294"; + sha256 = "1gywkxm9qk7y5za6fzjizxlc1lvwwa4mhadcyf1pxpq2119yhqy0"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b16532bb8d08f7385bca4b83ab4e030d7b453524/recipes/projectile-rails"; @@ -24123,6 +24585,27 @@ license = lib.licenses.free; }; }) {}; + projectile-variable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }: + melpaBuild { + pname = "projectile-variable"; + version = "0.0.1"; + src = fetchFromGitHub { + owner = "zonuexe"; + repo = "projectile-variable"; + rev = "810394eabf330325a86ec6f60c69e160eb837ac3"; + sha256 = "183azck3bi4qwpprcc07kvwm3piwqgql7ryy1czvmw3kbdmk1rpj"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/ff603b43235f546cd47f72e675aee88d5f41e855/recipes/projectile-variable"; + sha256 = "1cj8nwxf1jp5q5zzxp92fxla6jhwzd21gw649ar6mygi4hgymsji"; + name = "projectile-variable"; + }; + packageRequires = [ cl-lib emacs projectile ]; + meta = { + homepage = "https://melpa.org/#/projectile-variable"; + license = lib.licenses.free; + }; + }) {}; projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "projekt"; @@ -24189,12 +24672,12 @@ protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "protobuf-mode"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "google"; repo = "protobuf"; - rev = "1a586735085e817b1f52e53feec92ce418049f69"; - sha256 = "16wmr1fgdqpf84fkq90cxvccfsxx7h0q0wzqkbg8vdjmka412g09"; + rev = "a428e42072765993ff674fda72863c9f1aa2d268"; + sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b4e7f5f641251e17add561991d3bcf1fde23467b/recipes/protobuf-mode"; @@ -24294,12 +24777,12 @@ pug-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "pug-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "hlissner"; repo = "emacs-pug-mode"; - rev = "48d5977e5efcf3650a1628b5cbffffdd164cd773"; - sha256 = "1wiiarxh0lcxvy56f1rxdbk1iwhdynl2xn6v8nr35bw1l82b1j9g"; + rev = "bff32a818ccc9e400210b942bd5e67fa21551148"; + sha256 = "1ad5n8v40acj17qficbzrnixbmg5wplmbd8h1z9hdxhbrkwy5323"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/b3710aac9f3df3a23238af1f969c462b3692f260/recipes/pug-mode"; @@ -24441,12 +24924,12 @@ py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-autopep8"; - version = "0.7.0"; + version = "2016.1"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-autopep8.el"; - rev = "685414b19106b99a4384fa0c9ce4817c659e0e81"; - sha256 = "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd"; + rev = "68e12d8788c91c7ec53a68acf1d23adb2ffa4788"; + sha256 = "16fmym6hvi2lx0mmbrrhld1vzki5iqfqx2m0xa9021gjjzb33lw6"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/c400e0f3cfe70821e621fe85d239b4f6596d5171/recipes/py-autopep8"; @@ -24462,12 +24945,12 @@ py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-isort"; - version = "0.8"; + version = "2016.1"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-isort.el"; - rev = "cfbb576784fe4501909c15299607ce2a2d0bf164"; - sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr"; + rev = "e67306f459c47c53a65604e4eea88a3914596560"; + sha256 = "08i55gv392wc12x8v3dca0dmz8a8p9ljsqhyajsb6qv1k120wqhx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/44377d11da07b49c8dc6887c948cc5ddfc065bd2/recipes/py-isort"; @@ -24483,12 +24966,12 @@ py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "py-yapf"; - version = "0.3"; + version = "2016.1"; src = fetchFromGitHub { owner = "paetzke"; repo = "py-yapf.el"; - rev = "56807d28bf288afec2e2999982074bdd5e9bf932"; - sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg"; + rev = "a878304202ad827a1f3de3dce1badd9ca8731146"; + sha256 = "1mmzqdigxx46my0h9497l25cjydy3vykg6slxkch4dzvhhlbap48"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/3306c6906d4b21868b9407de27fbebdaed3d00d5/recipes/py-yapf"; @@ -24882,12 +25365,12 @@ ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ranger"; - version = "0.9.8.2"; + version = "0.9.8.4"; src = fetchFromGitHub { owner = "ralesi"; repo = "ranger.el"; - rev = "70af0a00a93f5b27671b75083ed041ed417b5b63"; - sha256 = "0vdrqrdsfyybfi66nf81af7zfavaawysqdfy1zr5a26b7qd64812"; + rev = "cbde94a417d9d93fcee74de119aae867cbe772d7"; + sha256 = "0v3y77z8l5lg1ppl4szp9k80wjjnmlyxqjmmakc5l2vkq98gzcpq"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/0207e754f424823fb48e9c065c3ed9112a0c445b/recipes/ranger"; @@ -24966,12 +25449,12 @@ rc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "rc-mode"; - version = "1.0.6"; + version = "1.0.13"; src = fetchFromGitHub { owner = "mrhmouse"; repo = "rc-mode.el"; - rev = "b9b48e24a55083e4911f2b497ed4d9676a192e88"; - sha256 = "06ln916fim58q44g67zlnsipfxcramyrqbm9adh52mdbk44j4bf9"; + rev = "fe2e0570bf9c19a292e16b18fd4b0a256df5d93f"; + sha256 = "0skjg3l3ss8nlrpnpjjflmf7wjib4jfarkmx4438nc6vm6553fmn"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/d8062b2e5b2744a6e614b389cca7e7f21b582f6f/recipes/rc-mode"; @@ -25572,6 +26055,27 @@ license = lib.licenses.free; }; }) {}; + ripgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "ripgrep"; + version = "0.2.0"; + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "ripgrep.el"; + rev = "77e8aa61b5b893c037d87117943a164514c6145f"; + sha256 = "1xs8h2g02jdb05c07bk9qfvxvfchgzhccj5yhkxbnpxqmxpcskdc"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/e8d789818876e959a1a59690f1dd7d4efa6d608b/recipes/ripgrep"; + sha256 = "1j9c3mhcyhs4xf44z6fnlvmb81pps25bp43gdqvp0954i068mgah"; + name = "ripgrep"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/ripgrep"; + license = lib.licenses.free; + }; + }) {}; robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }: melpaBuild { pname = "robe"; @@ -25932,16 +26436,16 @@ sage-shell-mode = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "sage-shell-mode"; - version = "0.1.1"; + version = "0.2.1"; src = fetchFromGitHub { - owner = "stakemori"; + owner = "sagemath"; repo = "sage-shell-mode"; - rev = "26303698cbd807b4cbaa241b0671f7e542a3bbe4"; - sha256 = "1124akipvrcmkd66slklgap2jdvb8iksldd8sjvg9n25kp0wd0vr"; + rev = "2cfc3b712796d1ed22e9c8a39d24e11316aab065"; + sha256 = "14wcnv78dwkxaq4g45kw0p34y5c5snscix0ar22bbryclqr929qy"; }; recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/ff7cefd5497aec9ed271fd783625fed445c4ac12/recipes/sage-shell-mode"; - sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx"; + url = "https://raw.githubusercontent.com/milkypostman/melpa/eb875c50c2f97919fd0027869c5d9970e1eaf373/recipes/sage-shell-mode"; + sha256 = "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv"; name = "sage-shell-mode"; }; packageRequires = [ cl-lib deferred emacs ]; @@ -26265,6 +26769,27 @@ license = lib.licenses.free; }; }) {}; + sexy-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sexy-monochrome-theme"; + version = "1.0"; + src = fetchFromGitHub { + owner = "nuncostans"; + repo = "sexy-monochrome-theme"; + rev = "64570387a30ec5ac685cb11824ee24f8890572e1"; + sha256 = "0fbm7gqg17blfpb5lybqvqw9qifsqjiprw65ih3asvrgynrxh2ra"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/9a09ffb7d271773f6cfa7c7eeaba45a717a5bdca/recipes/sexy-monochrome-theme"; + sha256 = "1qmbb2aaa1lc18l9kk42iq466hy2mg7565b0gb7hdvfqsi05d8dg"; + name = "sexy-monochrome-theme"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sexy-monochrome-theme"; + license = lib.licenses.free; + }; + }) {}; shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "shackle"; @@ -27045,12 +27570,12 @@ smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "smartparens"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "Fuco1"; repo = "smartparens"; - rev = "48c1436d0eb63e3a6ce91920546b392df3860bf2"; - sha256 = "0pvgnfg8a8w7c1nmrwyhfc0j7clzb290kwkid0c8kz275mb9nm3k"; + rev = "2350913f1db3b3744d2ff23c9f0f1676c8c9289e"; + sha256 = "1bz8k56w50mfdsyg3m7x4iibkzv4jiwwlxqlqmxclx9l45hz4ppx"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/bd98f85461ef7134502d4f2aa8ce1bc764f3bda3/recipes/smartparens"; @@ -27504,6 +28029,27 @@ license = lib.licenses.free; }; }) {}; + sphinx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "sphinx-mode"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "Fuco1"; + repo = "sphinx-mode"; + rev = "3d6e3059350593dc077f06f54c33869b9e28f7bc"; + sha256 = "0l3a8swmf3sm54ayk2ahh1i5j1hf0hd822dfmx50kgwi4wpv48sp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/269acf093c3aa508479bf532a4e07c9c6d568c72/recipes/sphinx-mode"; + sha256 = "16p5xlj4q9fyhz70r73w48fivwzpz9mcq710qqxqaap1aajkh84b"; + name = "sphinx-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/sphinx-mode"; + license = lib.licenses.free; + }; + }) {}; splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "splitjoin"; @@ -27651,27 +28197,6 @@ license = lib.licenses.free; }; }) {}; - ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: - melpaBuild { - pname = "ssh-config-mode"; - version = "20160326.20.550"; - src = fetchFromGitHub { - owner = "jhgorrell"; - repo = "ssh-config-mode-el"; - rev = "3656cebd647918bd71f66e70810b9148e44f19a7"; - sha256 = "08nx1iwvxqs1anng32w3c2clhnjf45527j0gxz5fy6h9svmb921q"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/9ce38cac422ad82f8b77a1757490daa1f5e284b0/recipes/ssh-config-mode"; - sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb"; - name = "ssh-config-mode"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/ssh-config-mode"; - license = lib.licenses.free; - }; - }) {}; stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "stan-mode"; @@ -28155,12 +28680,12 @@ swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "swift-mode"; - version = "0.4.0"; + version = "2.1.2"; src = fetchFromGitHub { owner = "chrisbarrett"; repo = "swift-mode"; - rev = "4e9da69ba776ec2a4a97c75534e6274bffc4fc8a"; - sha256 = "07xrcg33vsw19kz692hm7blzvnf7b6isllsz79fvs8q3l5c9mfjx"; + rev = "92119801203e2991543cbf943cc101673bd190bd"; + sha256 = "182lzswrkrzihcd5vmcwq94aqn2aj1j38ra0j3vcgk114rayy6dk"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/19cb133191cd6f9623e99e958d360113595e756a/recipes/swift-mode"; @@ -28173,6 +28698,27 @@ license = lib.licenses.free; }; }) {}; + swift3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "swift3-mode"; + version = "2.1.1"; + src = fetchFromGitHub { + owner = "taku0"; + repo = "swift3-mode"; + rev = "ea34d46bf9a4293e75ffdac9500d34989316d9e9"; + sha256 = "1hwc3fxv87hmw0a0mgl8khfzf1p7yp2izkc02z8f1vbkaibmmawp"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0ca9071199230d3c4c1b2e3a501736df87095fd3/recipes/swift3-mode"; + sha256 = "14vm05p8ix09v73dkmf03i56yib8yk6h2r1zc9m4ym80fki4f520"; + name = "swift3-mode"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://melpa.org/#/swift3-mode"; + license = lib.licenses.free; + }; + }) {}; swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivy, lib, melpaBuild }: melpaBuild { pname = "swiper"; @@ -28427,12 +28973,12 @@ systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "systemd"; - version = "1.4"; + version = "1.4.1"; src = fetchFromGitHub { owner = "holomorph"; repo = "systemd-mode"; - rev = "b03e616f0d0fbd512c32afcf87a596eae509abc2"; - sha256 = "0wqmpvqv5dbnniv7xpvmhw75h9xh3q5ndkrpzz3pk5b94drgm5s3"; + rev = "7769000ba6b395dfaa2c6b0fce48ae5d5cd9a035"; + sha256 = "1vqcqrq8qk9n512rbwi2lcvjiy0wqmybwa2lmrkv49yshqjhm5ld"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/ca810e512c357d1d0130aeeb9b46b38c595e3351/recipes/systemd"; @@ -28655,6 +29201,48 @@ license = lib.licenses.free; }; }) {}; + term-manager = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "term-manager"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "term-manager"; + rev = "0bca2e7e3b6e906ec67696bc0be952988ca7f733"; + sha256 = "0ybmszjb2lrgqp3zixpxy0lp2l9axw3mz2d4n2kmajh8ckbr576v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/0b2f7d8c8fcbb535432f8e70729d69a572e49a1a/recipes/term-manager"; + sha256 = "0ab388ki7vr1wpz81bvbl2fskq9zz5bicdf5gqfg01qzv5l75iza"; + name = "term-manager"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://melpa.org/#/term-manager"; + license = lib.licenses.free; + }; + }) {}; + term-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, term-manager }: + melpaBuild { + pname = "term-projectile"; + version = "0.1.1"; + src = fetchFromGitHub { + owner = "IvanMalison"; + repo = "term-manager"; + rev = "0bca2e7e3b6e906ec67696bc0be952988ca7f733"; + sha256 = "0ybmszjb2lrgqp3zixpxy0lp2l9axw3mz2d4n2kmajh8ckbr576v"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/5260876280148fae28a459f07932cebb059b560e/recipes/term-projectile"; + sha256 = "1mzyzjxkdfvf1kq9m3c1f6y6xzj1qq53rixawmnzmil5cmznvwag"; + name = "term-projectile"; + }; + packageRequires = [ projectile term-manager ]; + meta = { + homepage = "https://melpa.org/#/term-projectile"; + license = lib.licenses.free; + }; + }) {}; term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "term-run"; @@ -29347,6 +29935,27 @@ license = lib.licenses.free; }; }) {}; + typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + melpaBuild { + pname = "typescript-mode"; + version = "0.1"; + src = fetchFromGitHub { + owner = "ananthakumaran"; + repo = "typescript.el"; + rev = "abc0751c0e3f316a0064fc7342ffb89b49b02e15"; + sha256 = "0lgsyqzfjqhygs8a3icnfsp6y20h2rqrk4wbyc1xfmkbahs7qk8y"; + }; + recipeFile = fetchurl { + url = "https://raw.githubusercontent.com/milkypostman/melpa/d3f534a1e2cee4ad2e32e32802c5080207417b3d/recipes/typescript-mode"; + sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha"; + name = "typescript-mode"; + }; + packageRequires = []; + meta = { + homepage = "https://melpa.org/#/typescript-mode"; + license = lib.licenses.free; + }; + }) {}; typit = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, mmt }: melpaBuild { pname = "typit"; @@ -30740,12 +31349,12 @@ with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "with-editor"; - version = "2.5.3"; + version = "2.5.5"; src = fetchFromGitHub { owner = "magit"; repo = "with-editor"; - rev = "6f41998405796336575b1fce49b84667feaa9b9f"; - sha256 = "12bw86l8756rwfgnik0kywqafw8idv8ncdxlbaybix70r2iaa61y"; + rev = "c05420c75edaca71b15326d1fba629be9054749f"; + sha256 = "1nblk82yxmfxqnjz87xyjcak9jg9rk68657bxajh0l8rlf918yd4"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/8c52c840dc35f3fd17ec660e113ddbb53aa99076/recipes/with-editor"; @@ -30908,12 +31517,12 @@ ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "ws-butler"; - version = "0.3"; + version = "0.5"; src = fetchFromGitHub { owner = "lewang"; repo = "ws-butler"; - rev = "106d313c0dad532c2da3cc78770a8a2f0396aa85"; - sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f"; + rev = "b59e36b2451193bf96176f5a006bf506770a40f3"; + sha256 = "0ij88qr7gk07dchhjsn3nlk8fqgbkp4qhvn14dqxndn3zr64ix7v"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/f1645a51d487c8902eb6e59fb1884f85f48cec6f/recipes/ws-butler"; @@ -31304,25 +31913,6 @@ license = lib.licenses.free; }; }) {}; - yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild { - pname = "yatex"; - version = "1.78"; - src = fetchhg { - url = "https://www.yatex.org/hgrepos/yatex/"; - rev = "2521a95043af"; - sha256 = "0l7nxjc67mg2ddi7cf9vm744yps26zz64hqq7g0cfycjsgzg517v"; - }; - recipeFile = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/04867a574773e8794335a2664d4f5e8b243f3ec9/recipes/yatex"; - sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6"; - name = "yatex"; - }; - packageRequires = []; - meta = { - homepage = "https://melpa.org/#/yatex"; - license = lib.licenses.free; - }; - }) {}; yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: melpaBuild { pname = "yaxception"; @@ -31449,22 +32039,22 @@ license = lib.licenses.free; }; }) {}; - zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }: + zerodark-theme = callPackage ({ all-the-icons, fetchFromGitHub, fetchurl, flycheck, lib, magit, melpaBuild, powerline, s }: melpaBuild { pname = "zerodark-theme"; - version = "1.8"; + version = "3.5"; src = fetchFromGitHub { owner = "NicolasPetton"; repo = "zerodark-theme"; - rev = "c993631342d04a33f717e4161c60cf4fa7afe4a9"; - sha256 = "1yyx5c897b5nl1svqv8m0f6cy68cm20zi39ihabr8cdc0zywcjsi"; + rev = "e9205855c61c9afbfef061c3fd3703c3f7b39095"; + sha256 = "1lfhr4hxbr522nfd7blx21k8kfrwawqrqg6s8hx2hcjzjabfssjz"; }; recipeFile = fetchurl { url = "https://raw.githubusercontent.com/milkypostman/melpa/72ef967a9bea2e100ae17aad1a88db95820f4f6a/recipes/zerodark-theme"; sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9"; name = "zerodark-theme"; }; - packageRequires = []; + packageRequires = [ all-the-icons flycheck magit powerline s ]; meta = { homepage = "https://melpa.org/#/zerodark-theme"; license = lib.licenses.free; diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix index 7cf85d3cdab..03121edada0 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix @@ -91,9 +91,6 @@ self: # upstream issue: missing file header initsplit = markBroken super.initsplit; - # upstream issue: missing dependency - jade = null; - # upstream issue: missing file header jsfmt = markBroken super.jsfmt; diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 700e494cfa7..d7ca335214f 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -1,10 +1,10 @@ { callPackage }: { org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org"; - version = "20160905"; + version = "20161003"; src = fetchurl { - url = "http://orgmode.org/elpa/org-20160905.tar"; - sha256 = "01zm7s5qbh1xvxddd93i6cmz3m7x2s67zwzah5q5l3hgnvbx750q"; + url = "http://orgmode.org/elpa/org-20161003.tar"; + sha256 = "1q59s9ir9x8ig4nfx6vbq3dj3ah01sjwvqax2x2dqxn2mk2igr4x"; }; packageRequires = []; meta = { @@ -14,10 +14,10 @@ }) {}; org-plus-contrib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "org-plus-contrib"; - version = "20160905"; + version = "20161003"; src = fetchurl { - url = "http://orgmode.org/elpa/org-plus-contrib-20160905.tar"; - sha256 = "1wx51iqg1cfrf220yslp2lq9s7klbv6bbxq0d2ygj47yjikkf39r"; + url = "http://orgmode.org/elpa/org-plus-contrib-20161003.tar"; + sha256 = "0phi7jdkv7m4y7q7ilkz0dfw9g11d52dd34pv41dvawf032wvwn7"; }; packageRequires = []; meta = { diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix deleted file mode 100644 index c026d058b4e..00000000000 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.2.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake }: - -stdenv.mkDerivation (rec { - name = "ProofGeneral-4.2"; - - src = fetchurl { - url = http://proofgeneral.inf.ed.ac.uk/releases/ProofGeneral-4.2.tgz; - sha256 = "09qb0myq66fw17v4ziz401ilsb5xlxz1nl2wsp69d0vrfy0bcrrm"; - }; - - sourceRoot = name; - - buildInputs = [ emacs texinfo texLive perl which ]; - - prePatch = - '' sed -i "Makefile" \ - -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ - s|/sbin/install-info|install-info|g" - - - # Workaround for bug #458 - # ProofGeneral 4.2 byte-compilation fails with Emacs 24.2.90 - # http://proofgeneral.inf.ed.ac.uk/trac/ticket/458 - sed -i "Makefile" \ - -e "s|(setq byte-compile-error-on-warn t)||g" - - sed -i "bin/proofgeneral" -e's/which/type -p/g' - - # @image{ProofGeneral} fails, so remove it. - sed -i '94d' doc/PG-adapting.texi - sed -i '101d' doc/ProofGeneral.texi - ''; - - preBuild = '' - make clean; - ''; - - installPhase = - # Copy `texinfo.tex' in the right place so that `texi2pdf' works. - '' cp -v "${automake}/share/"automake-*/texinfo.tex doc - make install install-doc - ''; - - meta = { - description = "Proof General, an Emacs front-end for proof assistants"; - longDescription = '' - Proof General is a generic front-end for proof assistants (also known as - interactive theorem provers), based on the customizable text editor Emacs. - ''; - homepage = http://proofgeneral.inf.ed.ac.uk; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.unix; # arbitrary choice - }; -}) diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix similarity index 56% rename from pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix rename to pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix index 815863ac6da..0f7ac1d1dc8 100644 --- a/pkgs/applications/editors/emacs-modes/proofgeneral/4.3pre.nix +++ b/pkgs/applications/editors/emacs-modes/proofgeneral/4.4.nix @@ -1,44 +1,38 @@ -{ stdenv, fetchurl, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }: +{ stdenv, fetchFromGitHub, emacs, texinfo, texLive, which, automake, enableDoc ? false }: -stdenv.mkDerivation (rec { - name = "ProofGeneral-4.3pre150313"; +stdenv.mkDerivation rec { + name = "ProofGeneral-${version}"; + version = "4.4"; - src = fetchurl { - url = "http://proofgeneral.inf.ed.ac.uk/releases/${name}.tgz"; - sha256 = "1jq5ykkk14xr5qcn4kyxmi5ls0fibr0y47gfygzm1mzrfvz9aw3f"; + src = fetchFromGitHub { + owner = "ProofGeneral"; + repo = "PG"; + rev = "v${version}"; + sha256 = "0bdfk91wf71z80mdfnl8hpinripndcjgdkz854zil6521r84nqk8"; }; - sourceRoot = name; - - buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive; + buildInputs = [ emacs which ] ++ stdenv.lib.optionals enableDoc [ texinfo texLive ]; prePatch = '' sed -i "Makefile" \ -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \ s|/sbin/install-info|install-info|g" - sed -i "bin/proofgeneral" -e's/which/type -p/g' - # @image{ProofGeneral} fails, so remove it. - sed -i '94d' doc/PG-adapting.texi + chmod +x bin/proofgeneral + + # @image{ProofGeneral-image} fails, so remove it. + sed -i '91d' doc/PG-adapting.texi sed -i '96d' doc/ProofGeneral.texi + '' + stdenv.lib.optionalString enableDoc + # Copy `texinfo.tex' in the right place so that `texi2pdf' works. + '' cp -v "${automake}/share/"automake-*/texinfo.tex doc ''; patches = [ ./pg.patch ]; - preBuild = '' - make clean; - ''; - - installPhase = - if enableDoc - then - # Copy `texinfo.tex' in the right place so that `texi2pdf' works. - '' cp -v "${automake}/share/"automake-*/texinfo.tex doc - make install install-doc - '' - else "make install"; + installTargets = [ "install" ] ++ stdenv.lib.optional enableDoc "install-doc"; meta = { description = "Proof General, an Emacs front-end for proof assistants"; @@ -50,4 +44,4 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; # arbitrary choice }; -}) +} diff --git a/pkgs/applications/editors/emacs-modes/tramp/default.nix b/pkgs/applications/editors/emacs-modes/tramp/default.nix new file mode 100644 index 00000000000..b0cfe997908 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/tramp/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl, emacs, texinfo }: + +stdenv.mkDerivation rec { + name = "tramp-2.3.0"; + src = fetchurl { + url = "mirror://gnu/tramp/${name}.tar.gz"; + sha256 = "1srwm24lwyf00w1661wbx03xg6j943dk05jhwnwdjf99m82cqbgi"; + }; + buildInputs = [ emacs texinfo ]; + meta = { + description = "Transparently access remote files from Emacs. Newer versions than built-in."; + homepage = https://www.gnu.org/software/tramp; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/editors/emacs-24/at-fdcwd.patch b/pkgs/applications/editors/emacs/at-fdcwd.patch similarity index 100% rename from pkgs/applications/editors/emacs-24/at-fdcwd.patch rename to pkgs/applications/editors/emacs/at-fdcwd.patch diff --git a/pkgs/applications/editors/emacs-25/builder.sh b/pkgs/applications/editors/emacs/builder.sh similarity index 100% rename from pkgs/applications/editors/emacs-25/builder.sh rename to pkgs/applications/editors/emacs/builder.sh diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs/default.nix similarity index 55% rename from pkgs/applications/editors/emacs-25/default.nix rename to pkgs/applications/editors/emacs/default.nix index a8d994012e2..08223ef82ef 100644 --- a/pkgs/applications/editors/emacs-25/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,12 +1,13 @@ { stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif -, libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls +, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO -, autoconf, automake , withX ? !stdenv.isDarwin +, withGTK2 ? true, gtk2 ? null , withGTK3 ? false, gtk3 ? null , withXwidgets ? false, webkitgtk24x ? null, wrapGAppsHook ? null, glib_networking ? null -, withGTK2 ? true, gtk2 +, withCsrc ? true +, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null }: assert (libXft != null) -> libpng != null; # probably a bug @@ -19,71 +20,84 @@ assert withXwidgets -> withGTK3 && webkitgtk24x != null; let toolkit = - if withGTK3 then "gtk3" - else if withGTK2 then "gtk2" + if withGTK2 then "gtk2" + else if withGTK3 then "gtk3" else "lucid"; in - stdenv.mkDerivation rec { - name = "emacs-25.1-rc2"; - - builder = ./builder.sh; + name = "emacs-${version}${versionModifier}"; + version = "25.1"; + versionModifier = ""; src = fetchurl { - url = "ftp://alpha.gnu.org/gnu/emacs/pretest/${name}.tar.xz"; - sha256 = "1hffvyvl50mrivdv6lp92sbxi3l2zhblj8npmpbzk47zpl1mzm2v"; + url = "mirror://gnu//emacs/${name}.tar.xz"; + sha256 = "0cwgyiyymnx4xdg99dm2drfxcyhy2jmyf0rkr9fwj9mwwf77kwhr"; }; - patches = lib.optionals stdenv.isDarwin [ - ./at-fdcwd.patch - ]; + patches = lib.optional stdenv.isDarwin ./at-fdcwd.patch; - postPatch = '' - sed -i 's|/usr/share/locale|${gettext}/share/locale|g' lisp/international/mule-cmds.el - ''; + nativeBuildInputs = [ pkgconfig ] + ++ lib.optionals srcRepo [ autoconf automake texinfo ]; buildInputs = - [ ncurses gconf libxml2 gnutls alsaLib pkgconfig texinfo acl gpm gettext - autoconf automake ] - ++ stdenv.lib.optional stdenv.isLinux dbus - ++ stdenv.lib.optionals withX + [ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ] + ++ lib.optional stdenv.isLinux dbus + ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft imagemagick gconf ] - ++ stdenv.lib.optional (withX && withGTK2) gtk2 - ++ stdenv.lib.optional (withX && withGTK3) gtk3 - ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo - ++ stdenv.lib.optionals withXwidgets [webkitgtk24x wrapGAppsHook glib_networking]; + ++ lib.optional (withX && withGTK2) gtk2 + ++ lib.optional (withX && withGTK3) gtk3 + ++ lib.optional (stdenv.isDarwin && withX) cairo + ++ lib.optionals withXwidgets [ webkitgtk24x wrapGAppsHook glib_networking ]; - propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; + propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ]; hardeningDisable = [ "format" ]; - configureFlags = - (if stdenv.isDarwin + configureFlags = [ "--with-modules" ] ++ + (if stdenv.isDarwin then [ "--with-ns" "--disable-ns-self-contained" ] else if withX then [ "--with-x-toolkit=${toolkit}" "--with-xft" ] else [ "--with-x=no" "--with-xpm=no" "--with-jpeg=no" "--with-png=no" "--with-gif=no" "--with-tiff=no" ]) - ++ stdenv.lib.optional withXwidgets "--with-xwidgets"; + ++ lib.optional withXwidgets "--with-xwidgets"; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX) - "-I${cairo.dev}/include/cairo"; + preConfigure = lib.optionalString srcRepo '' + ./autogen.sh + '' + '' + substituteInPlace lisp/international/mule-cmds.el \ + --replace /usr/share/locale ${gettext}/share/locale - preBuild = '' - find . -name '*.elc' -delete + for makefile_in in $(find . -name Makefile.in -print); do + substituteInPlace $makefile_in --replace /bin/pwd pwd + done ''; + installTargets = "tags install"; + postInstall = '' - mkdir -p $out/share/emacs/site-lisp/ + mkdir -p $out/share/emacs/site-lisp cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el - '' + stdenv.lib.optionalString stdenv.isDarwin '' + $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el + + rm -rf $out/var + rm -rf $out/share/emacs/${version}/site-lisp + '' + lib.optionalString withCsrc '' + for srcdir in src lisp lwlib ; do + dstdir=$out/share/emacs/${version}/$srcdir + mkdir -p $dstdir + find $srcdir -name "*.[chm]" -exec cp {} $dstdir \; + cp $srcdir/TAGS $dstdir + echo '((nil . ((tags-file-name . "TAGS"))))' > $dstdir/.dir-locals.el + done + '' + lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv nextstep/Emacs.app $out/Applications ''; meta = with stdenv.lib; { - description = "GNU Emacs 25 (pre), the extensible, customizable text editor"; + description = "The extensible, customizable GNU text editor"; homepage = http://www.gnu.org/software/emacs/; license = licenses.gpl3Plus; maintainers = with maintainers; [ chaoflow lovek323 peti the-kenny jwiegley ]; diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs/macport-24.5.nix similarity index 98% rename from pkgs/applications/editors/emacs-24/macport-24.5.nix rename to pkgs/applications/editors/emacs/macport-24.5.nix index 23133ec262c..885538dc883 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.5.nix +++ b/pkgs/applications/editors/emacs/macport-24.5.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "--enable-mac-app=$$out/Applications" ]; - CFLAGS = "-O3"; + CFLAGS = "-O3 -DMAC_OS_X_VERSION_MAX_ALLOWED=1090"; LDFLAGS = "-O3 -L${ncurses.out}/lib"; postInstall = '' diff --git a/pkgs/applications/editors/emacs/macport-25.1.nix b/pkgs/applications/editors/emacs/macport-25.1.nix new file mode 100644 index 00000000000..81e77c725d9 --- /dev/null +++ b/pkgs/applications/editors/emacs/macport-25.1.nix @@ -0,0 +1,91 @@ +{ stdenv, fetchurl, ncurses, pkgconfig, texinfo, libxml2, gnutls, gettext, autoconf, automake +, AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit +, ImageCaptureCore, GSS, ImageIO # These may be optional +}: + +stdenv.mkDerivation rec { + emacsName = "emacs-25.1"; + name = "${emacsName}-mac-6.0"; + + builder = ./builder.sh; + + src = fetchurl { + url = "ftp://ftp.gnu.org/gnu/emacs/${emacsName}.tar.xz"; + sha256 = "19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33"; + }; + + macportSrc = fetchurl { + url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; + sha256 = "2f7a3fd826e6dea541ada04f4a1ff2903a87a1f736b89c5b90bf7bb820568e34"; + }; + + 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 $sourceRoot $name + tar xzf $macportSrc + mv $name $sourceRoot + ''; + + postPatch = '' + patch -p1 < patch-mac + substituteInPlace lisp/international/mule-cmds.el \ + --replace /usr/share/locale ${gettext}/share/locale + ''; + + 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"; + 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 25, 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/site-start.el b/pkgs/applications/editors/emacs/site-start.el new file mode 100644 index 00000000000..b41ca92db08 --- /dev/null +++ b/pkgs/applications/editors/emacs/site-start.el @@ -0,0 +1,35 @@ +;;; NixOS specific load-path +(setq load-path + (append (reverse (mapcar (lambda (x) (concat x "/share/emacs/site-lisp/")) + (split-string (or (getenv "NIX_PROFILES") "")))) + load-path)) + +;;; Make `woman' find the man pages +(eval-after-load 'woman + '(setq woman-manpath + (append (reverse (mapcar (lambda (x) (concat x "/share/man/")) + (split-string (or (getenv "NIX_PROFILES") "")))) + woman-manpath))) + +;;; Make tramp work for remote NixOS machines +(eval-after-load 'tramp + '(add-to-list 'tramp-remote-path "/run/current-system/sw/bin")) + +;;; C source directory +;;; +;;; Computes the location of the C source directory from the path of +;;; the current file: +;;; from: /nix/store/-emacs-/share/emacs/site-lisp/site-start.el +;;; to: /nix/store/-emacs-/share/emacs//src/ +(let ((emacs + (file-name-directory ;; .../emacs/ + (directory-file-name ;; .../emacs/site-lisp + (file-name-directory load-file-name)))) ;; .../emacs/site-lisp/ + (version + (file-name-as-directory + (concat + (number-to-string emacs-major-version) + "." + (number-to-string emacs-minor-version)))) + (src (file-name-as-directory "src"))) + (setq find-function-C-source-directory (concat emacs version src))) diff --git a/pkgs/applications/editors/geany/with-vte.nix b/pkgs/applications/editors/geany/with-vte.nix index 679125b5ec4..7689ebad0f0 100644 --- a/pkgs/applications/editors/geany/with-vte.nix +++ b/pkgs/applications/editors/geany/with-vte.nix @@ -1,8 +1,8 @@ -{ runCommand, makeWrapper, geany, gnome }: +{ runCommand, makeWrapper, geany, gnome2 }: let name = builtins.replaceStrings ["geany-"] ["geany-with-vte-"] geany.name; in runCommand "${name}" { nativeBuildInputs = [ makeWrapper ]; } " mkdir -p $out ln -s ${geany}/share $out - makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome.vte}/lib + makeWrapper ${geany}/bin/geany $out/bin/geany --prefix LD_LIBRARY_PATH : ${gnome2.vte}/lib " diff --git a/pkgs/applications/editors/gobby/default.nix b/pkgs/applications/editors/gobby/default.nix index c023da0bc95..32998700c23 100644 --- a/pkgs/applications/editors/gobby/default.nix +++ b/pkgs/applications/editors/gobby/default.nix @@ -1,7 +1,7 @@ { avahiSupport ? false # build support for Avahi in libinfinity , gnomeSupport ? false # build support for Gnome(gnome-vfs) , stdenv, fetchurl, pkgconfig -, gtkmm, gsasl, gtksourceview, libxmlxx, libinfinity, intltool +, gtkmm2, gsasl, gtksourceview, libxmlxx, libinfinity, intltool , gnome_vfs ? null}: let @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { sha256 = "165x0r668ma5blziisvbr8qig3jw9hf7i6w8r7wwvz3wsac3bswc"; }; - buildInputs = [ pkgconfig gtkmm gsasl gtksourceview libxmlxx libinf intltool ] + buildInputs = [ pkgconfig gtkmm2 gsasl gtksourceview libxmlxx libinf intltool ] ++ stdenv.lib.optional gnomeSupport gnome_vfs; configureFlags = '' diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 40972f50fe7..325345e8718 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -240,24 +240,24 @@ in pycharm-community = buildPycharm rec { name = "pycharm-community-${version}"; - version = "2016.2.2"; + version = "2016.2.3"; description = "PyCharm Community Edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "1v6vy4xh0n8wdjc25clxg57z7ria11x1zdba4j1hjs2z6l80kxbb"; + sha256 = "0nph0dp0a2y6vrbc1a2d5iy1fzhm4wbkp6kpdk6mcfpnz5ppz84f"; }; wmClass = "jetbrains-pycharm-ce"; }; pycharm-professional = buildPycharm rec { name = "pycharm-professional-${version}"; - version = "2016.2.2"; + version = "2016.2.3"; description = "PyCharm Professional Edition"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/python/${name}.tar.gz"; - sha256 = "08x2x6lhr9100lmw1dq8rkz4mlyj4avcj2hpbd5qqybx9j4g6g44"; + sha256 = "0pjgdwpkbf6fgrhml97inmsjavz1n9l4ns1pnhv3mssnribg3vm1"; }; wmClass = "jetbrains-pycharm"; }; diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index a5b0f2e400a..055816a798d 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2 }: stdenv.mkDerivation rec { version = "0.8.18.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; - buildInputs = [ intltool pkgconfig gtk ]; + buildInputs = [ intltool pkgconfig gtk2 ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 9644cb2d5c7..68f5e14891f 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem -, dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf +, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, systemd, libnotify }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss + stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr diff --git a/pkgs/applications/editors/monodevelop/default.nix b/pkgs/applications/editors/monodevelop/default.nix index cdf1daabea7..44c61d16ec8 100644 --- a/pkgs/applications/editors/monodevelop/default.nix +++ b/pkgs/applications/editors/monodevelop/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchgit, fetchNuGet , autoconf, automake, pkgconfig, shared_mime_info, intltool -, glib, mono, gtk-sharp, gnome, gnome-sharp, unzip +, glib, mono, gtk-sharp-2_0, gnome2, gnome-sharp, unzip , dotnetPackages }: @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ autoconf automake pkgconfig shared_mime_info intltool - mono gtk-sharp gnome-sharp unzip + mono gtk-sharp-2_0 gnome-sharp unzip pkgconfig dotnetPackages.NUnit dotnetPackages.NUnitRunners @@ -57,9 +57,9 @@ stdenv.mkDerivation rec { for prog in monodevelop mdtool; do patch -p 0 $out/bin/$prog < export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp}:\$MONO_GAC_PREFIX + > export MONO_GAC_PREFIX=${gnome-sharp}:${gtk-sharp-2_0}:\$MONO_GAC_PREFIX > export PATH=${mono}/bin:\$PATH - > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome.libgnomeui gnome.gnome_vfs gnome-sharp gtk-sharp gtk-sharp.gtk ]}:\$LD_LIBRARY_PATH + > export LD_LIBRARY_PATH=${stdenv.lib.makeLibraryPath [ glib gnome2.libgnomeui gnome2.gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]}:\$LD_LIBRARY_PATH > EOF done diff --git a/pkgs/applications/editors/notepadqq/default.nix b/pkgs/applications/editors/notepadqq/default.nix new file mode 100644 index 00000000000..0de33d6d194 --- /dev/null +++ b/pkgs/applications/editors/notepadqq/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchgit, pkgconfig, which, qtbase }: + +let + version = "0.53.0"; +in stdenv.mkDerivation { + name = "notepadqq-${version}"; + src = fetchgit { + url = "https://github.com/notepadqq/notepadqq.git"; + rev = "3b0751277fb268ec72b466b37d0f0977c536bc1b"; + sha256 = "0hw94mn2xg2r58afvz1xg990jinv9aa33942zgwq54qwj61r93hi"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkgconfig which + ]; + + buildInputs = [ + qtbase.qtsvg qtbase.qtwebkit qtbase.qttools + ]; + + preConfigure = '' + export LRELEASE="lrelease" + ''; + + meta = { + homepage = "http://notepadqq.altervista.org/"; + description = "Notepad++-like editor for the Linux desktop"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ rszibele ]; + }; +} diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix index c42940440ae..58893d08589 100644 --- a/pkgs/applications/editors/nvpy/default.nix +++ b/pkgs/applications/editors/nvpy/default.nix @@ -1,6 +1,6 @@ -{ pkgs, fetchurl, tk, buildPythonApplication, pythonPackages }: +{ pkgs, fetchurl, tk, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { version = "0.9.7"; name = "nvpy-${version}"; diff --git a/pkgs/applications/editors/scite/default.nix b/pkgs/applications/editors/scite/default.nix index b2ac66c1e08..989d3e42a6f 100644 --- a/pkgs/applications/editors/scite/default.nix +++ b/pkgs/applications/editors/scite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk }: +{ stdenv, fetchurl, pkgconfig, gtk2 }: let version = "3.3.7"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig gtk2 ]; sourceRoot = "scintilla/gtk"; buildPhase = '' diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index 1f4be1ac508..9cf5bd97d0a 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -1,6 +1,6 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk, makeDesktopItem }: +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, makeDesktopItem }: let - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo]; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo]; in assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 4eb428f37d8..c7badf6a77c 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, glib, xorg, cairo, gtk, pango, makeWrapper, openssl, bzip2, +{ fetchurl, stdenv, glib, xorg, cairo, gtk2, pango, makeWrapper, openssl, bzip2, pkexecPath ? "/var/setuid-wrappers/pkexec", libredirect, gksuSupport ? false, gksu}: @@ -6,8 +6,8 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; assert gksuSupport -> gksu != null; let - build = "3114"; - libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango]; + build = "3126"; + libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk2 cairo pango]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" ] ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo"; in let @@ -20,13 +20,13 @@ in let fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2"; - sha256 = "0xrfx76ilw5hlx26hv9zx1kw8q9qf76646yyjmn36p6mq9vs6y0d"; + sha256 = "0acff4wj1s61x3xszdd93lkhaqa26lb7ryqdxnbphxzhf2jfzzwj"; } else fetchurl { name = "sublimetext-${build}.tar.bz2"; url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2"; - sha256 = "0nmi2gkpz56a47a0f56nx6nl3sl7gif035517gx2v82113y9nh66"; + sha256 = "0ykj33fq86iv7f9zx76h90pl9y86iri0idhlj09a6prhk8p17nqq"; }; dontStrip = true; diff --git a/pkgs/applications/editors/supertux-editor/default.nix b/pkgs/applications/editors/supertux-editor/default.nix index 8dcc718e7bb..a9f236a57ae 100644 --- a/pkgs/applications/editors/supertux-editor/default.nix +++ b/pkgs/applications/editors/supertux-editor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mono, gtk-sharp, pkgconfig, makeWrapper, gnome, gtk }: +{ stdenv, fetchFromGitHub, mono, gtk-sharp-2_0, pkgconfig, makeWrapper, gnome2, gtk2 }: stdenv.mkDerivation rec { version = "git-2014-08-20"; name = "supertux-editor-${version}"; @@ -10,19 +10,19 @@ stdenv.mkDerivation rec { sha256 = "08y5haclgxvcii3hpdvn1ah8qd0f3n8xgxxs8zryj02b8n7cz3vx"; }; - buildInputs = [mono gtk-sharp pkgconfig makeWrapper gnome.libglade gtk ]; + buildInputs = [mono gtk-sharp-2_0 pkgconfig makeWrapper gnome2.libglade gtk2 ]; installPhase = '' mkdir -p $out/bin $out/lib/supertux-editor cp *.{dll,dll.config,exe} $out/lib/supertux-editor makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor \ --add-flags "$out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') makeWrapper "${mono}/bin/mono" $out/bin/supertux-editor-debug \ --add-flags "--debug $out/lib/supertux-editor/supertux-editor.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --suffix LD_LIBRARY_PATH : $(echo $NIX_LDFLAGS | sed 's/ -L/:/g;s/ -rpath /:/g;s/-rpath //') ''; diff --git a/pkgs/applications/editors/tecoc/default.nix b/pkgs/applications/editors/tecoc/default.nix new file mode 100644 index 00000000000..a3f58012e53 --- /dev/null +++ b/pkgs/applications/editors/tecoc/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchgit +, ncurses }: + +stdenv.mkDerivation rec { + + name = "tecoc-git-${version}"; + version = "20150606"; + + src = fetchgit { + url = "https://github.com/blakemcbride/TECOC.git"; + rev = "d7dffdeb1dfb812e579d6d3b518545b23e1b50cb"; + sha256 = "11zfa73dlx71c0hmjz5n3wqcvk6082rpb4sss877nfiayisc0njj"; + }; + + buildInputs = [ ncurses ]; + + configurePhase = '' + cp src/makefile.linux src/Makefile + ''; + buildPhase = '' + make CC=${stdenv.cc}/bin/cc -C src/ + ''; + installPhase = '' + mkdir -p $out/bin $out/share/doc/${name} $out/lib/teco/macros + cp src/tecoc $out/bin + cp src/aaout.txt doc/* $out/share/doc/${name} + cp lib/* lib2/* $out/lib/teco/macros + (cd $out/bin + ln -s tecoc Make + ln -s tecoc mung + ln -s tecoc teco + ln -s tecoc Inspect ) + ''; + + meta = with stdenv.lib; { + description = "A clone of the good old TECO editor"; + longDescription = '' + For those who don't know: TECO is the acronym of Tape Editor and + COrrector (because it was a paper tape edition tool in its debut + days). Now the acronym follows after Text Editor and Corrector, + or Text Editor Character-Oriented. + + TECO is a character-oriented text editor, originally developed + bu Dan Murphy at MIT circa 1962. It is also a Turing-complete + imperative interpreted programming language for text + manipulation, done via user-loaded sets of macros. In fact, Emacs + was born as a set of Editor MACroS for TECO. + + TECOC is a portable C implementation of TECO-11. + ''; + homepage = https://github.com/blakemcbride/TECOC; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.unix; + }; +} +# TODO: test in other platforms - especially Darwin diff --git a/pkgs/applications/editors/textadept/default.nix b/pkgs/applications/editors/textadept/default.nix index f412a9bada2..1e24054b996 100644 --- a/pkgs/applications/editors/textadept/default.nix +++ b/pkgs/applications/editors/textadept/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg, fetchurl, fetchzip, gtk, glib, pkgconfig, unzip, ncurses, zip }: +{ stdenv, fetchhg, fetchurl, fetchzip, gtk2, glib, pkgconfig, unzip, ncurses, zip }: let # Textadept requires a whole bunch of external dependencies. # The build system expects to be able to download them with wget. @@ -43,22 +43,23 @@ let # These lists are taken from the Makefile. - scintilla_tgz = "scintilla365.tgz"; + scintilla_tgz = "scintilla367.tgz"; + tre_zip = "cdce45e8dd7a3b36954022b4a4d3570e1ac5a4f8.zip"; scinterm_zip = "scinterm_1.8.zip"; - scintillua_zip = "scintillua_3.6.5-1.zip"; - lua_tgz = "lua-5.3.2.tar.gz"; + scintillua_zip = "scintillua_3.6.7-1.zip"; + lua_tgz = "lua-5.3.3.tar.gz"; lpeg_tgz = "lpeg-1.0.0.tar.gz"; lfs_zip = "v_1_6_3.zip"; - luautf8_zip = "0.1.1.zip"; lspawn_zip = "lspawn_1.5.zip"; luajit_tgz = "LuaJIT-2.0.3.tar.gz"; libluajit_tgz = "libluajit_2.0.3.x86_64.tgz"; - gtdialog_zip = "gtdialog_1.2.zip"; + gtdialog_zip = "gtdialog_1.3.zip"; cdk_tgz = "cdk-5.0-20150928.tgz"; termkey_tgz = "libtermkey-0.17.tar.gz"; bombay_zip = "bombay.zip"; 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; gtdialog_url = "http://foicica.com/gtdialog/download/" + gtdialog_zip; lspawn_url = "http://foicica.com/lspawn/download/" + lspawn_zip; @@ -67,7 +68,6 @@ let lua_url = "http://www.lua.org/ftp/" + lua_tgz; lpeg_url = "http://www.inf.puc-rio.br/~roberto/lpeg/" + lpeg_tgz; lfs_url = "https://github.com/keplerproject/luafilesystem/archive/" + lfs_zip; - luautf8_url = "https://github.com/starwing/luautf8/archive/" + luautf8_zip; luajit_url = "http://luajit.org/download/" + luajit_tgz; libluajit_url = "http://foicica.com/textadept/download/" + libluajit_tgz; cdk_url = "http://invisible-mirror.net/archives/cdk/" + cdk_tgz; @@ -75,13 +75,13 @@ let termkey_url = "http://www.leonerd.org.uk/code/libtermkey/" + termkey_tgz; - get_scintilla = get_url scintilla_url "1s5zbkn5f3vs8gbnjlkfzw4b137y12m3c89lyc4pmvqvrvxgyalj"; + get_scintilla = get_url scintilla_url "0rh1xgd06qcnj4l0vi8g4i94vi63s76366b8hhqky3iqdjgwsxpi"; + get_tre = get_url tre_url "0mw8npwk5nnhc33352j4akannhpx77kqvfam8jdq1n4yf8js1gi7"; get_scinterm = get_url scinterm_url "02ax6cjpxylfz7iqp1cjmsl323in066a38yklmsyzdl3w7761nxi"; - get_scintillua = get_url scintillua_url "0s4q7a9mgvxh0msi18llkczhcgafaiizw9qm1p9w18r2a7wjq9wc"; - get_lua = get_url lua_url "13x6knpv5xsli0n2bib7g1nrga2iacy7qfy63i798dm94fxwfh67"; + get_scintillua = get_url scintillua_url "0fhyjrkfj2cvxnql65687nx1d0sfyg5lbrxmylyzhnfh4s4jnwmq"; + get_lua = get_url lua_url "18mcfbbmjyp8f2l9yy7n6dzk066nq6man0kpwly4bppphilc04si"; get_lpeg = get_url lpeg_url "13mz18s359wlkwm9d9iqlyyrrwjc6iqfpa99ai0icam2b3khl68h"; get_lfs = get_url_zip lfs_url "1hxcnqj53540ysyw8fzax7f09pl98b8f55s712gsglcdxp2g2pri"; - get_luautf8_zip = get_url_zip luautf8_url "1dgmxdk88njpic4d4sn2wzlni4b6sfqcsmh2hrraxivpqf9ps7f7"; get_lspawn = get_url lspawn_url "09c6v9irblay2kv1n7i59pyj9g4xb43c6rfa7ba5m353lymcwwqi"; get_luajit = get_url luajit_url "0ydxpqkmsn2c341j4r2v6r5r0ig3kbwv3i9jran3iv81s6r6rgjm"; get_libluajit = get_url libluajit_url "1nhvcdjpqrhd5qbihdm3bxpw84irfvnw2vmfqnsy253ay3dxzrgy"; @@ -93,12 +93,12 @@ let get_deps = get_scintilla + + get_tre + get_scinterm + get_scintillua + get_lua + get_lpeg + get_lfs - + get_luautf8_zip + get_lspawn + get_luajit + get_libluajit @@ -108,17 +108,17 @@ let + get_termkey; in stdenv.mkDerivation rec { - version = "8.7"; + version = "9.0"; name = "textadept-${version}"; buildInputs = [ - gtk glib pkgconfig unzip ncurses zip + gtk2 glib pkgconfig unzip ncurses zip ]; src = fetchhg { url = http://foicica.com/hg/textadept; rev = "textadept_${version}"; - sha256 = "1gi73wk11w3rbkxqqdp8z9g83qiyhx6gxry221vxjxpqsl9pvhlf"; + sha256 = "1fkxblf2db4i0kbfww94xwps7nbn88qc4fwghrm4dcszcq32jlfi"; }; preConfigure = '' diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index a128899d24e..5f2fffa5f50 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -5,12 +5,12 @@ let # qtEnv = with qt5; env "qt-${qtbase.version}" [ qtbase qttools ]; in stdenv.mkDerivation rec { name = "tiled-${version}"; - version = "0.16.1"; + version = "0.17.0"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/bjorn/tiled/archive/v${version}.tar.gz"; - sha256 = "0s1i6yhm1z9ayzjh8cprcc9jvj5m87l9snyqg6w7zlj3q9zn4rn6"; + sha256 = "0c9gykxmq0sk0yyfdq81g9psd922scqzn5asskjydj84d80f5z7p"; }; nativeBuildInputs = [ pkgconfig qmakeHook ]; diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index f0d76eae3b4..4ab0ca3f27c 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -1,7 +1,7 @@ # TODO tidy up eg The patchelf code is patching gvim even if you don't build it.. # but I have gvim with python support now :) - Marc args@{pkgs, source ? "default", fetchurl, fetchFromGitHub, stdenv, ncurses, pkgconfig, gettext -, composableDerivation, lib, config, glib, gtk, python, perl, tcl, ruby +, composableDerivation, lib, config, glib, gtk2, python, perl, tcl, ruby , libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu , libICE @@ -42,7 +42,7 @@ composableDerivation { } (fix: rec { name = "vim_configurable-${version}"; - version = "7.4.826"; + version = "8.0.0005"; enableParallelBuilding = true; # test this @@ -54,7 +54,7 @@ composableDerivation { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "04hp2gqbbj9h872bgj1g9xcaj5qlg9q45v6by2ch9n105dng9aj3"; + sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; }; "vim-nox" = @@ -69,17 +69,11 @@ composableDerivation { prePatch = "cd src"; - # if darwin support is enabled, we want to make sure we're not building with - # OS-installed python framework - patches = stdenv.lib.optionals - (stdenv.isDarwin && (config.vim.darwin or true)) - [ ./python_framework.patch ]; - configureFlags = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; nativeBuildInputs - = [ ncurses pkgconfig gtk libX11 libXext libSM libXpm libXt libXaw libXau + = [ ncurses pkgconfig gtk2 libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib libICE ]; # most interpreters aren't tested yet.. (see python for example how to do it) diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index 1c81cda7ce9..1511b386579 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { name = "vim-${version}"; - version = "7.4.1585"; + version = "8.0.0005"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "1kjdwpka269i4cyl0rmnmzg23dl26g65k26h32w8ayzfm3kbj123"; + sha256 = "0ys3l3dr43vjad1f096ch1sl3x2ajsqkd03rdn6n812m7j4wipx0"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/python_framework.patch b/pkgs/applications/editors/vim/python_framework.patch deleted file mode 100644 index ba4ddef889f..00000000000 --- a/pkgs/applications/editors/vim/python_framework.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/auto/configure -+++ b/auto/configure -@@ -5895,13 +5895,6 @@ - eof - eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" - rm -f -- "${tmp_mkf}" -- if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ -- "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then -- vi_cv_path_python_plibs="-framework Python" -- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then -- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" -- fi -- else - if test "${vi_cv_var_python_version}" = "1.4"; then - vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" - else -@@ -5921,7 +5914,6 @@ - vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" - vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` - --fi - - if ${vi_cv_dll_name_python+:} false; then : - $as_echo_n "(cached) " >&6 diff --git a/pkgs/applications/editors/vis/default.nix b/pkgs/applications/editors/vis/default.nix index 41994563ee3..a28890e2466 100644 --- a/pkgs/applications/editors/vis/default.nix +++ b/pkgs/applications/editors/vis/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromGitHub, unzip, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper, makeDesktopItem , ncurses, libtermkey, lpeg, lua , acl ? null, libselinux ? null -, version ? "2016-07-15" -, rev ? "5c2cee9461ef1199f2e80ddcda699595b11fdf08" -, sha256 ? "1jmsv72hq0c2f2rnpllvd70cmxbjwfhynzwaxx24f882zlggwsnd" +, version ? "2016-08-24" +, rev ? "010dcd60ffda37027908f2a0b20c751b83ca975e" +, sha256 ? "0bpbyi5yq50zw0hkh326pmdcnm91paf1yz4853dcq63y0ddv89jp" }: stdenv.mkDerivation rec { - name = "vis-nightly-${version}"; + name = "vis-unstable-${version}"; inherit version; src = fetchFromGitHub { @@ -17,15 +17,14 @@ stdenv.mkDerivation rec { owner = "martanne"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ - unzip pkgconfig ncurses libtermkey lua lpeg - ] ++ stdenv.lib.optional stdenv.isLinux [ + ] ++ stdenv.lib.optionals stdenv.isLinux [ acl libselinux ]; @@ -34,18 +33,38 @@ stdenv.mkDerivation rec { LUA_PATH="${lpeg}/share/lua/${lua.luaversion}/?.lua"; postInstall = '' + mkdir -p "$out/share/applications" + 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 VIS_PATH : "$out/share/vis" + --prefix VIS_PATH : "\$HOME/.config:$out/share/vis" ''; + desktopItem = makeDesktopItem rec { + name = "vis"; + exec = "vis %U"; + type = "Application"; + icon = "accessories-text-editor"; + comment = meta.description; + desktopName = "vis"; + genericName = "Text editor"; + categories = stdenv.lib.concatStringsSep ";" [ + "Application" "Development" "IDE" + ]; + mimeType = stdenv.lib.concatStringsSep ";" [ + "text/plain" "application/octet-stream" + ]; + startupNotify = "false"; + terminal = "true"; + }; + meta = with stdenv.lib; { description = "A vim like editor"; homepage = http://github.com/martanne/vis; license = licenses.isc; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix index 78964e316c5..f69c9706e37 100644 --- a/pkgs/applications/editors/vscode/default.nix +++ b/pkgs/applications/editors/vscode/default.nix @@ -1,17 +1,22 @@ { stdenv, lib, callPackage, fetchurl, unzip, atomEnv, makeDesktopItem }: let - version = "1.4.0"; - rev = "6276dcb0ae497766056b4c09ea75be1d76a8b679"; + version = "1.5.1"; + rev = "07d663dc1bd848161edf4cd4ce30cce410d3d877"; - sha256 = if stdenv.system == "i686-linux" then "1k228kv1v2765qnz6zw41h79fddwx5pcy9v9jyhsrwyla83fx4ar" - else if stdenv.system == "x86_64-linux" then "1v0am0xpgnlwb3k35v7wxlv22035444ii3v5gv6hf1xbnybsa7lm" - else if stdenv.system == "x86_64-darwin" then "0395wnq8wi9x382l51wf8wiaclx7bjf5p0j39gq8y6j2ww8y2z7n" + sha256 = if stdenv.system == "i686-linux" then "1a2854snjdmfhzx6qwib4iw3qjhlmlf09dlsbbvh24zbrjphnd85" + else if stdenv.system == "x86_64-linux" then "0gg2ad7sp02ffv7la61hh9h4vfw8qkfladbhwlh5y4axbbrx17r7" + else if stdenv.system == "x86_64-darwin" then "18q4ldnmm619vv8yx6rznpznpcc19zjczmcidr34552i5qfg5xsz" else throw "Unsupported system: ${stdenv.system}"; - urlMod = if stdenv.system == "i686-linux" then "linux-ia32" - else if stdenv.system == "x86_64-linux" then "linux-x64" - else if stdenv.system == "x86_64-darwin" then "darwin" + urlBase = "https://az764295.vo.msecnd.net/stable/${rev}/"; + + urlStr = if stdenv.system == "i686-linux" then + urlBase + "code-stable-code_${version}-1473369468_i386.tar.gz" + else if stdenv.system == "x86_64-linux" then + urlBase + "code-stable-code_${version}-1473370243_amd64.tar.gz" + else if stdenv.system == "x86_64-darwin" then + urlBase + "VSCode-darwin-stable.zip" else throw "Unsupported system: ${stdenv.system}"; in stdenv.mkDerivation rec { @@ -19,7 +24,7 @@ in inherit version; src = fetchurl { - url = "https://az764295.vo.msecnd.net/stable/${rev}/VSCode-${urlMod}-stable.zip"; + url = urlStr; inherit sha256; }; @@ -33,7 +38,9 @@ in categories = "GNOME;GTK;Utility;TextEditor;Development;"; }; - buildInputs = [ unzip ]; + buildInputs = if stdenv.system == "x86_64-darwin" + then [ unzip ] + else [ ]; installPhase = '' mkdir -p $out/lib/vscode $out/bin diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 880053e05c2..cce683067e7 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, xlibsWrapper, sqlite, gsl , qwt, fcgi, pythonPackages, libspatialindex, libspatialite, qscintilla, postgresql, makeWrapper -, qjson, qca2, txt2tags +, qjson, qca2, txt2tags, openssl , withGrass ? false, grass }: stdenv.mkDerivation rec { name = "qgis-2.16.2"; - buildInputs = [ gdal qt4 flex bison proj geos xlibsWrapper sqlite gsl qwt qscintilla + buildInputs = [ gdal qt4 flex openssl bison proj geos xlibsWrapper sqlite gsl qwt qscintilla fcgi libspatialindex libspatialite postgresql qjson qca2 txt2tags ] ++ (stdenv.lib.optional withGrass grass) ++ - (with pythonPackages; [ numpy psycopg2 requests2 ]) ++ [ pythonPackages.qscintilla ]; + (with pythonPackages; [ numpy psycopg2 requests2 pythonPackages.qscintilla sip ]); nativeBuildInputs = [ cmake makeWrapper ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' - export LD_LIBRARY_PATH=`pwd`/output/lib:$LD_LIBRARY_PATH + export LD_LIBRARY_PATH=`pwd`/output/lib:${stdenv.lib.makeLibraryPath [ openssl ]}:$LD_LIBRARY_PATH ''; src = fetchurl { @@ -32,7 +32,8 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/qgis \ - --prefix PYTHONPATH : $PYTHONPATH + --prefix PYTHONPATH : $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ openssl ]} ''; meta = { diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 6d507c5d227..c7d1adfdd18 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -11,11 +11,12 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "6.9.5-2"; - sha256 = "09h3rpr1jnzd7ipy5d16r2gi0bwg4hk5khwzv4cyhv1xzs8pk7pj"; + version = "6.9.6-2"; + sha256 = "139h9lycxw3lszn052m34xm0rqyanin4nb529vxjcrkkzqilh91r"; patches = []; } # Freeze version on mingw so we don't need to port the patch too often. + # FIXME: This version has multiple security vulnerabilities // lib.optionalAttrs (stdenv.cross.libc or null == "msvcrt") { version = "6.9.2-0"; sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7"; diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix index 5ab7d4d8a69..a8d0d490f8b 100644 --- a/pkgs/applications/graphics/PythonMagick/default.nix +++ b/pkgs/applications/graphics/PythonMagick/default.nix @@ -2,7 +2,7 @@ let - version = "0.9.12"; + version = "0.9.14"; in @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { name = "pythonmagick-${version}"; src = fetchurl { - url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.xz"; - sha256 = "1l1kr3d7l40fkxgs6mrlxj65alv2jizm9hhgg9i9g90a8qj8642b"; + url = "mirror://imagemagick/python/releases/PythonMagick-${version}.tar.xz"; + sha256 = "1flkdfi3c19wy2qcfzax1cqvmmri10rvmhc2y85gmagqvv01zz22"; }; buildInputs = [python boost pkgconfig imagemagick]; diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix index 79d6ff06578..2a78f509429 100644 --- a/pkgs/applications/graphics/ahoviewer/default.nix +++ b/pkgs/applications/graphics/ahoviewer/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, - gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip, + gtkmm2, glibmm, libxml2, libsecret, curl, unrar, libzip, librsvg, gst_all_1, autoreconfHook, makeWrapper }: stdenv.mkDerivation { name = "ahoviewer-1.4.6"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ]; - buildInputs = [ glibmm libconfig gtkmm glibmm libxml2 + buildInputs = [ glibmm libconfig gtkmm2 glibmm libxml2 libsecret curl unrar libzip librsvg gst_all_1.gstreamer gst_all_1.gst-plugins-good diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index 3c121211e3f..a27590ccd4d 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { builder = ./builder.sh; src = fetchurl { url = http://tarballs.nixos.org/batik-1.6.zip; - md5 = "edff288fc64f968ff96ca49763d50f3c"; + sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6"; }; buildInputs = [unzip]; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 4866ba92add..22ac473bdd9 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchurl, cmake, pkgconfig, gtk, freetype, fontconfig, lcms, +{ stdenv, fetchurl, cmake, pkgconfig, gtk2, freetype, fontconfig, lcms, flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, - perlXMLParser, python, pygtk, gettext, intltool, babl, gegl, + perlXMLParser, pythonPackages, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygtk; +in stdenv.mkDerivation rec { name = "cinepaint-1.1"; src = fetchurl { @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0b5g4bkq62yiz1cnb2vfij0a8fw5w5z202v5dm4dh89k7cj0yq4w"; }; - buildInputs = [ libpng gtk freetype fontconfig lcms flex libtiff libjpeg + buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 2a4d52088e8..e75d5193fd3 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -11,12 +11,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "2.0.5"; + version = "2.0.6"; name = "darktable-${version}"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "00hap68yvfdif6a4lpbhn4jx1n68mpd2kj473kml1xby9swp32w9"; + sha256 = "1h9qwxyvcv0fc6y5b6l2x4jd5mmw026blhjkcihj00r1aa3c2s13"; }; buildInputs = diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 6200048c41d..a8f38d61f9d 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext +{stdenv, fetchurl, gtk2, pkgconfig, perl, perlXMLParser, libxml2, gettext , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl , withGNOME ? false, libgnomeui }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ gtk perlXMLParser libxml2 gettext python libxml2Python docbook5 + [ gtk2 perlXMLParser libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl ] ++ stdenv.lib.optional withGNOME libgnomeui; diff --git a/pkgs/applications/graphics/digikam/5.1.nix b/pkgs/applications/graphics/digikam/5.1.nix new file mode 100644 index 00000000000..6bd572e99bb --- /dev/null +++ b/pkgs/applications/graphics/digikam/5.1.nix @@ -0,0 +1,120 @@ +{ stdenv, fetchurl, cmake, ecm, makeQtWrapper + +# For `digitaglinktree` +, perl, sqlite + +, qtbase +, qtxmlpatterns +, qtsvg +, qtwebkit + +, kconfigwidgets +, kcoreaddons +, kdoctools +, kfilemetadata +, knotifications +, knotifyconfig +, ktextwidgets +, kwidgetsaddons +, kxmlgui + +, bison +, boost +, eigen +, exiv2 +, flex +, jasper +, lcms2 +, lensfun +, libgphoto2 +, libkipi +, liblqr1 +, libusb1 +, marble +, mysql +, opencv +, threadweaver + +# For panorama and focus stacking +, enblend-enfuse +, hugin +, gnumake + +, oxygen +}: + +stdenv.mkDerivation rec { + name = "digikam-${version}"; + version = "5.1.0"; + + src = fetchurl { + url = "http://download.kde.org/stable/digikam/${name}.tar.xz"; + sha256 = "1w97a5cmg39dgmjgmjwa936gcrmxjms3h2ww61qi1lny84p5x4a7"; + }; + + nativeBuildInputs = [ cmake ecm makeQtWrapper ]; + + buildInputs = [ + qtbase + qtxmlpatterns + qtsvg + qtwebkit + + kconfigwidgets + kcoreaddons + kdoctools + kfilemetadata + knotifications + knotifyconfig + ktextwidgets + kwidgetsaddons + kxmlgui + + bison + boost + eigen + exiv2 + flex + jasper + lcms2 + lensfun + libgphoto2 + libkipi + liblqr1 + libusb1 + marble.unwrapped + mysql + opencv + threadweaver + + oxygen + ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DLIBUSB_LIBRARIES=${libusb1.out}/lib" + "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0" + "-DENABLE_MYSQLSUPPORT=1" + "-DENABLE_INTERNALMYSQL=1" + ]; + + fixupPhase = '' + substituteInPlace $out/bin/digitaglinktree \ + --replace "/usr/bin/perl" "${perl}/bin/perl" \ + --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" + + wrapQtProgram $out/bin/digikam \ + --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin" + + wrapQtProgram $out/bin/showfoto + ''; + + meta = { + description = "Photo Management Program"; + license = stdenv.lib.licenses.gpl2; + homepage = http://www.digikam.org; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 380e5d29886..40fe178d625 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; nativeBuildInputs = [ makeWrapper xorg.libXt ] - ++ stdenv.lib.optional doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; + ++ stdenv.lib.optionals doCheck [ perlPackages.TestCommand perlPackages.TestHarness ]; buildInputs = [ xorg.libX11 xorg.libXinerama imlib2 libjpeg libpng curl libexif ]; diff --git a/pkgs/applications/graphics/freecad/default.nix b/pkgs/applications/graphics/freecad/default.nix index 482abe2126f..c58d9e0bda1 100644 --- a/pkgs/applications/graphics/freecad/default.nix +++ b/pkgs/applications/graphics/freecad/default.nix @@ -1,8 +1,9 @@ { stdenv, fetchurl, cmake, coin3d, xercesc, ode, eigen, qt4, opencascade, gts -, boost, zlib, python, swig, gfortran, soqt, libf2c, makeWrapper -, matplotlib, pycollada, pyside, pysideTools, pysideShiboken, pivy }: +, boost, zlib, python27Packages, swig, gfortran, soqt, libf2c, makeWrapper }: -stdenv.mkDerivation rec { +let + pythonPackages = python27Packages; +in stdenv.mkDerivation rec { name = "freecad-${version}"; version = "0.16"; @@ -11,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "02cfw5wlb04j0ymhk4skrm7rvbz13hpv995asf9v8q6wn2s1mivc"; }; - buildInputs = [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost + buildInputs = with pythonPackages; [ cmake coin3d xercesc ode eigen qt4 opencascade gts boost zlib python swig gfortran soqt libf2c makeWrapper matplotlib pycollada pyside pysideShiboken pysideTools pivy ]; diff --git a/pkgs/applications/graphics/gcolor2/default.nix b/pkgs/applications/graphics/gcolor2/default.nix index c7113801b61..b9cf229e8c8 100644 --- a/pkgs/applications/graphics/gcolor2/default.nix +++ b/pkgs/applications/graphics/gcolor2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, perl, perlXMLParser, pkgconfig } : +{stdenv, fetchurl, gtk2, perl, perlXMLParser, pkgconfig } : let version = "0.4"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ stdenv.mkDerivation { [ ./gcolor2-amd64.patch ] else [ ]; -buildInputs = [ gtk perl perlXMLParser pkgconfig ]; +buildInputs = [ gtk2 perl perlXMLParser pkgconfig ]; meta = { description = "Simple GTK+2 color selector"; diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index 952d23bbc48..9149e19819f 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk, libpng, exiv2 +{ stdenv, fetchurl, pkgconfig, autoconf, automake, gtk2, libpng, exiv2 , lcms, intltool, gettext, fbida }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-gps" ]; buildInputs = [ - pkgconfig autoconf automake gtk libpng exiv2 lcms intltool gettext + pkgconfig autoconf automake gtk2 libpng exiv2 lcms intltool gettext ]; postInstall = '' diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index 48278f5aac5..4b380ed1886 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk, glib, gdk_pixbuf +{ stdenv, fetchurl, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf , pango, cairo, freetype, fontconfig, lcms, libpng, libjpeg, poppler, libtiff , webkit, libmng, librsvg, libwmf, zlib, libzip, ghostscript, aalib, jasper -, python, pygtk, libart_lgpl, libexif, gettext, xorg, wrapPython }: +, pythonPackages, libart_lgpl, libexif, gettext, xorg }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) pygtk wrapPython python; +in stdenv.mkDerivation rec { name = "gimp-${version}"; version = "2.8.18"; @@ -19,7 +21,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig intltool babl gegl gtk glib gdk_pixbuf pango cairo + [ pkgconfig intltool babl gegl gtk2 glib gdk_pixbuf pango cairo freetype fontconfig lcms libpng libjpeg poppler libtiff webkit libmng librsvg libwmf zlib libzip ghostscript aalib jasper python pygtk libart_lgpl libexif gettext xorg.libXpm @@ -35,7 +37,7 @@ stdenv.mkDerivation rec { --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; - passthru = { inherit gtk; }; # probably its a good idea to use the same gtk in plugins ? + passthru = { gtk = gtk2; }; # probably its a good idea to use the same gtk in plugins ? #configureFlags = [ "--disable-print" ]; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 74abc06bc4e..9fd669551de 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,7 +5,7 @@ { pkgs, gimp }: let - inherit (pkgs) stdenv fetchurl pkgconfig glib; + inherit (pkgs) stdenv fetchurl pkgconfig glib fetchFromGitHub; inherit (gimp) targetPluginDir targetScriptDir; pluginDerivation = a: stdenv.mkDerivation ({ @@ -57,6 +57,7 @@ rec { sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure ''; + hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; homepage = http://www.gimp.org; @@ -116,6 +117,25 @@ rec { "; }; + resynthesizer2 = pluginDerivation { + /* menu: + Filters/Map/Resynthesize + Filters/Enhance/Smart enlarge + Filters/Enhance/Smart sharpen + Filters/Enhance/Smart remove selection + */ + name = "resynthesizer-2.0.1"; + buildInputs = [ gimp pkgs.fftw pkgs.autoreconfHook ] + ++ gimp.nativeBuildInputs; + makeFlags = "GIMP_LIBDIR=$out/lib/gimp/2.0/"; + src = fetchFromGitHub { + owner = "bootchk"; + repo = "resynthesizer"; + rev = "2.0.1"; + sha256 = "1d214s0jsqxz83l9dd8vhnz3siw9fyw7xdhhir25ra7jiwxc99hd"; + }; + }; + texturize = pluginDerivation { name = "texturize-2.1"; buildInputs = [ gimp ] ++ gimp.nativeBuildInputs; diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix index 1587ceb4037..6c892f1bfd4 100644 --- a/pkgs/applications/graphics/giv/default.nix +++ b/pkgs/applications/graphics/giv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk, glib, +{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib, pcre, cfitsio, perl, gob2, vala_0_23, libtiff, json_glib }: stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installPhase = "scons install"; - buildInputs = [ gdk_pixbuf pkgconfig gtk glib scons pcre cfitsio perl gob2 vala_0_23 libtiff + buildInputs = [ gdk_pixbuf pkgconfig gtk2 glib scons pcre cfitsio perl gob2 vala_0_23 libtiff json_glib ]; meta = { diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix index 80391ae061e..801e9c5f502 100644 --- a/pkgs/applications/graphics/gqview/default.nix +++ b/pkgs/applications/graphics/gqview/default.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, pkgconfig, gtk, libpng}: +{stdenv, fetchurl, pkgconfig, gtk2, libpng}: -assert pkgconfig != null && gtk != null && libpng != null; +assert pkgconfig != null && gtk2 != null && libpng != null; # Note that we cannot just copy gtk's png attribute, since gtk might # not be linked against png. -# !!! assert libpng == gtk.libpng; +# !!! assert libpng == gtk2.libpng; stdenv.mkDerivation { name = "gqview-2.1.5"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0ilm5s7ps9kg4f5hzgjhg0xhn6zg0v9i7jnd67zrx9h7wsaa9zhj"; }; - buildInputs = [pkgconfig gtk libpng]; + buildInputs = [pkgconfig gtk2 libpng]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 70d8feaa275..2e573e09b31 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, bzip2, freetype, graphviz, ghostscript -, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz -, libX11, libwebp, quantumdepth ? 8}: +{ stdenv, fetchurl, fetchpatch, bzip2, freetype, graphviz, ghostscript +, libjpeg, libpng, libtiff, libxml2, zlib, libtool, xz, libX11 +, libwebp, quantumdepth ? 8 }: let version = "1.3.25"; in @@ -12,7 +12,21 @@ stdenv.mkDerivation { sha256 = "17xcc7pfcmiwpfr1g8ys5a7bdnvqzka53vg3kkzhwwz0s99gljyn"; }; - patches = [ ./disable-popen.patch ]; + patches = [ + ./disable-popen.patch + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7996_CVE-2016-7997.patch"; + sha256 = "0xsby2z8n7cnnln7szjznq7iaabq323wymvdjra59yb41aix74r2"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part1.patch"; + sha256 = "02s0x9bkbnm5wrd0d2x9ld4d9z5xqpfk310lyylyr5zlnhqxmwgn"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/g/graphicsmagick/1.3.25-4/debian/patches/CVE-2016-7800_part2.patch"; + sha256 = "1h4xv3i1aq5avsd584rwa5sa7ca8f7w9ggmh7j2llqq5kymwsv5f"; + }) + ]; configureFlags = [ "--enable-shared" diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 76086b87eb2..ac3840a12a7 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}.3"; + version = "${major}.4"; major = "3.4"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${name}.tar.xz"; - sha256 = "0pc2xl6kwhi5l3d0dj6nzdcj2vpihs7y1s3l1hwir8zy7cpx23y1"; + sha256 = "154bdc8c1940209f1e3d9c60184efef45b0d24f5f7f7f59b819e9c08e19c2981"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { exiv2 libjpeg libtiff gstreamer libraw libsoup libsecret libchamplain librsvg libwebp json_glib webkit lcms2 bison flex ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/gthumb; description = "Image browser and viewer for GNOME"; diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index f06f2f15d5c..29e43a93c98 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "hugin-2016.0.0"; + name = "hugin-2016.2.0"; src = fetchurl { url = "mirror://sourceforge/hugin/${name}.tar.bz2"; - sha256 = "1rk5bgsvszv9bza46jxwr3i3qgiha2rza5v8lbwkqn4b4idv0c5h"; + sha256 = "058zd63vx29yrx2pphbbll7kzcxkai22q26lpw13rn4lvp41pasl"; }; buildInputs = [ diff --git a/pkgs/applications/graphics/imlibsetroot/default.nix b/pkgs/applications/graphics/imlibsetroot/default.nix new file mode 100644 index 00000000000..4fdfb87f134 --- /dev/null +++ b/pkgs/applications/graphics/imlibsetroot/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, libX11, libXinerama, imlib2 }: + +stdenv.mkDerivation rec { + name = "imlibsetroot-${version}"; + version = "1.2"; + src = fetchurl { + url = "http://robotmonkeys.net/wp-content/uploads/2010/03/imlibsetroot-12.tar.gz"; + sha256 = "8c1b3b7c861e4d865883ec13a96b8e4ab22464a87d4e6c67255b17a88e3cfd1c"; + }; + + buildInputs = [ libX11 imlib2 libXinerama ]; + buildPhase = '' + gcc -g imlibsetroot.c -o imlibsetroot \ + `imlib2-config --cflags` `imlib2-config --libs` \ + -I/include/X11/extensions -lXinerama -lX11 + ''; + installPhase = '' + mkdir -p $out/bin + install -m 755 imlibsetroot $out/bin + ''; + + meta = with stdenv.lib; { + description = "A Xinerama Aware Background Changer"; + homepage = "http://robotmonkeys.net/2010/03/30/imlibsetroot/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ lucas8 ]; + }; +} diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 25cf3a990d1..ce8a22fd90f 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, gtk, libXft -, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm +{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, perlXMLParser, libXft +, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm2 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool -, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge +, gsl, python, poppler, imagemagick, libwpg, librevenge , libvisio, libcdr, libexif, unzip, automake114x, autoconf , boxMakerPlugin ? false # boxmaker plugin }: let + pythonEnv = python.withPackages(ps: with ps; [ pyxml numpy lxml ]); boxmaker = fetchurl { # http://www.inkscapeforum.com/viewtopic.php?f=11&t=10403 @@ -42,15 +43,13 @@ stdenv.mkDerivation rec { --replace "#if __cplusplus >= 201103L" "#if true" ''; - propagatedBuildInputs = [ - # Python is used at run-time to execute scripts, e.g., those from - # the "Effects" menu. - python pyxml numpy lxml - ]; + # Python is used at run-time to execute scripts, e.g., those from + # the "Effects" menu. + propagatedBuildInputs = [ pythonEnv ]; buildInputs = [ - pkgconfig perl perlXMLParser gtk libXft libpng zlib popt boehmgc - libxml2 libxslt glib gtkmm glibmm libsigcxx lcms boost gettext + pkgconfig perl perlXMLParser libXft libpng zlib popt boehmgc + libxml2 libxslt glib gtkmm2 glibmm libsigcxx lcms boost gettext makeWrapper intltool gsl poppler imagemagick libwpg librevenge libvisio libcdr libexif automake114x autoconf ] ++ stdenv.lib.optional boxMakerPlugin unzip; @@ -71,13 +70,6 @@ stdenv.mkDerivation rec { } # Make sure PyXML modules can be found at run-time. - for i in "$out/bin/"* - do - wrapProgram "$i" --prefix PYTHONPATH : \ - "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml}):$(toPythonPath ${numpy})" \ - --prefix PATH : ${python}/bin || \ - exit 2 - done rm "$out/share/icons/hicolor/icon-theme.cache" ''; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 8d6c15129cb..c9587b222d9 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchsvn, buildPythonApplication, python, pyGtkGlade, makeWrapper, pyexiv2, pythonPackages, fbida, which }: +{ stdenv, fetchsvn, pythonPackages, makeWrapper, fbida, which }: -buildPythonApplication rec { +let + inherit (pythonPackages) python; +in pythonPackages.buildPythonApplication rec { name = "jbrout-${version}"; version = "338"; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index f5987684c00..a446ab5dd18 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, unzip, ftgl, glew, asciidoc , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff -, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }: +, gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: stdenv.mkDerivation rec { version = "0.8.0.5"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng boost boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl unzip ftgl glew asciidoc - gtkmm glibmm gtkglext pangox_compat libXmu + gtkmm2 glibmm gtkglext pangox_compat libXmu ]; #doCheck = false; diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index 88f3937335b..c88c3337c92 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, python27Packages }: +{ stdenv, fetchurl, python27Packages }: -buildPythonApplication rec { - namePrefix = ""; +python27Packages.buildPythonApplication rec { name = "mcomix-${version}"; version = "1.2.1"; diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix index c3f06544bb4..515b834b41e 100644 --- a/pkgs/applications/graphics/mirage/default.nix +++ b/pkgs/applications/graphics/mirage/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPythonApplication, python, pygtk, pillow, libX11, gettext }: +{ stdenv, fetchurl, pythonPackages, libX11, gettext }: -buildPythonApplication rec { - namePrefix = ""; - name = "mirage-0.9.5.2"; +pythonPackages.buildPythonApplication rec { + name = "mirage-${version}"; + version = "0.9.5.2"; src = fetchurl { url = "mirror://sourceforge/mirageiv/${name}.tar.bz2"; @@ -17,7 +17,7 @@ buildPythonApplication rec { sed -i "s@/usr/local/share/locale@$out/share/locale@" mirage.py ''; - propagatedBuildInputs = [ pygtk pillow ]; + propagatedBuildInputs = with pythonPackages; [ pygtk pillow ]; meta = { description = "Simple image viewer written in PyGTK"; diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index be8df8ef16d..27d6c207e68 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl, gettext, glib, gtk, hicolor_icon_theme, json_c -, lcms2, libpng , makeWrapper, pkgconfig, pygtk, python, pythonPackages +{ stdenv, fetchurl, gettext, glib, gtk2, hicolor_icon_theme, json_c +, lcms2, libpng , makeWrapper, pkgconfig, pythonPackages , scons, swig }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygtk numpy; +in stdenv.mkDerivation rec { name = "mypaint-${version}"; version = "1.1.0"; @@ -13,11 +15,11 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gettext glib gtk json_c lcms2 libpng makeWrapper pkgconfig pygtk + gettext glib gtk2 json_c lcms2 libpng makeWrapper pkgconfig pygtk python scons swig ]; - propagatedBuildInputs = [ hicolor_icon_theme pythonPackages.numpy ]; + propagatedBuildInputs = [ hicolor_icon_theme numpy ]; buildPhase = "scons prefix=$out"; diff --git a/pkgs/applications/graphics/pqiv/default.nix b/pkgs/applications/graphics/pqiv/default.nix index 3fd9d47374a..25c6fc36c6c 100644 --- a/pkgs/applications/graphics/pqiv/default.nix +++ b/pkgs/applications/graphics/pqiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, getopt, which, pkgconfig, gtk } : +{ stdenv, fetchurl, getopt, which, pkgconfig, gtk2 } : stdenv.mkDerivation (rec { name = "pqiv-0.12"; @@ -8,7 +8,7 @@ stdenv.mkDerivation (rec { sha256 = "646c69f2f4e7289913f6b8e8ae984befba9debf0d2b4cc8af9955504a1fccf1e"; }; - buildInputs = [ getopt which pkgconfig gtk ]; + buildInputs = [ getopt which pkgconfig gtk2 ]; preConfigure='' substituteInPlace configure --replace /bin/bash "$shell" diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 35c0ca2aff9..9d147a635f3 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, imlib2, file, lcms2, libexif } : +{ stdenv, fetchurl, pkgconfig, gtk2, imlib2, file, lcms2, libexif } : stdenv.mkDerivation (rec { version = "2.3.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation (rec { sha256 = "1rlf5h67vhj7n1y7jqkm9k115nfnzpwngj3kzqsi2lg676srclv7"; }; - buildInputs = [ pkgconfig gtk imlib2 file lcms2 libexif ]; + buildInputs = [ pkgconfig gtk2 imlib2 file lcms2 libexif ]; preBuild='' substituteInPlace Makefile --replace /usr/local "$out" diff --git a/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake new file mode 100644 index 00000000000..7be7cb63f70 --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/ReleaseInfo.cmake @@ -0,0 +1,4 @@ +set(GIT_BRANCH master) +set(GIT_VERSION 4.2.1115) +set(GIT_CHANGESET 0821eea7b6a4ac2fce1fcf644e06078e161e41e3) +set(GIT_TAGDISTANCE 1115) diff --git a/pkgs/applications/graphics/rawtherapee/default.nix b/pkgs/applications/graphics/rawtherapee/default.nix index aeb427348ca..50eb7749031 100644 --- a/pkgs/applications/graphics/rawtherapee/default.nix +++ b/pkgs/applications/graphics/rawtherapee/default.nix @@ -1,34 +1,42 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gtk, cmake, pixman, libpthreadstubs, gtkmm, libXau -, libXdmcp, lcms2, libiptcdata, libcanberra, fftw, expat, pcre, libsigcxx -, mercurial # Not really needed for anything, but it fails if it does not find 'hg' +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx }: stdenv.mkDerivation rec { - name = "rawtherapee-4.2"; - + version = "4.2.1025"; + name = "rawtherapee-" + version; + src = fetchFromGitHub { owner = "Beep6581"; repo = "RawTherapee"; - rev = "4.2"; - sha256 = "1v4px239vlmk9l8wbzlvlyni4ns12icxmgfz21m86jkd10pj5dgr"; + rev = "dc4bbe906ba92ddc66f98a3c26ce19822bfb99ab"; + sha256 = "0c5za9s8533fiyl32378dq9rgd5044xi8y0wm2gkr7krbdnx74l3"; }; - - buildInputs = [ pkgconfig gtk cmake pixman libpthreadstubs gtkmm libXau libXdmcp - lcms2 libiptcdata mercurial libcanberra fftw expat pcre libsigcxx ]; - patchPhase = '' - patch -p1 < ${./sigc++_fix.patch} + buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; + + patches = [ + ./fix-glibmm-output.patch + ]; + + cmakeFlags = [ + "-DPROC_TARGET_NUMBER=2" + ]; + + CMAKE_CXX_FLAGS = "-std=c++11 -Wno-deprecated-declarations -Wno-unused-result"; + + postUnpack = '' + echo "set(HG_VERSION $version)" > $sourceRoot/ReleaseInfo.cmake ''; - NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result"; - enableParallelBuilding = true; meta = { description = "RAW converter and digital photo processing software"; homepage = http://www.rawtherapee.com/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [viric jcumming mahe]; + maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/graphics/rawtherapee/dev.nix b/pkgs/applications/graphics/rawtherapee/dev.nix new file mode 100644 index 00000000000..71e41faaaef --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/dev.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pkgconfig, cmake, pixman, libpthreadstubs, gtkmm2, libXau +, libXdmcp, lcms2, libiptcdata, libcanberra_gtk2, fftw, expat, pcre, libsigcxx +}: + +stdenv.mkDerivation rec { + name = "rawtherapee-git-2016-10-10"; + + src = fetchFromGitHub { + owner = "Beep6581"; + repo = "RawTherapee"; + rev = "0821eea7b6a4ac2fce1fcf644e06078e161e41e3"; + sha256 = "1nwb6b1qrpdyigwig7bvr42lf7na1ngm0q2cislcvb2v1nmk6nlz"; + }; + + buildInputs = [ pkgconfig cmake pixman libpthreadstubs gtkmm2 libXau libXdmcp + lcms2 libiptcdata libcanberra_gtk2 fftw expat pcre libsigcxx ]; + + NIX_CFLAGS_COMPILE = "-std=gnu++11 -Wno-deprecated-declarations -Wno-unused-result"; + + # Copy generated ReleaseInfo.cmake so we don't need git. File was + # generated manually using `./tools/generateReleaseInfo` in the + # source folder. Make sure to regenerate it when updating. + preConfigure = '' + cp ${./ReleaseInfo.cmake} ./ReleaseInfo.cmake + ''; + + enableParallelBuilding = true; + + meta = { + description = "RAW converter and digital photo processing software"; + homepage = http://www.rawtherapee.com/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [ viric jcumming mahe the-kenny ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch b/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch new file mode 100644 index 00000000000..3c87ce64e26 --- /dev/null +++ b/pkgs/applications/graphics/rawtherapee/fix-glibmm-output.patch @@ -0,0 +1,23 @@ +From ca0afa8d5f3cc7d09b6bab32d155a87c550f0d7b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fl=C3=B6ssie?= +Date: Sat, 1 Oct 2016 12:38:24 +0200 +Subject: [PATCH] Fix incompatibility with glibmm 2.50 (#3440) + +Kudos to @Hombre57 for the suggestion. +--- + rtgui/dirbrowser.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rtgui/dirbrowser.cc b/rtgui/dirbrowser.cc +index d3fc8bf..6f25f0f 100644 +--- a/rtgui/dirbrowser.cc ++++ b/rtgui/dirbrowser.cc +@@ -59,7 +59,7 @@ std::vector listSubDirs (const Glib::RefPtr& dir, bool + } catch (const Glib::Exception& exception) { + + if (options.rtSettings.verbose) { +- std::cerr << "Failed to list subdirectories of \"" << dir << "\": " << exception.what () << std::endl; ++ std::cerr << "Failed to list subdirectories of \"" << dir->get_basename() << "\": " << exception.what () << std::endl; + } + + } diff --git a/pkgs/applications/graphics/rawtherapee/sigc++_fix.patch b/pkgs/applications/graphics/rawtherapee/sigc++_fix.patch deleted file mode 100644 index eeeefb733df..00000000000 --- a/pkgs/applications/graphics/rawtherapee/sigc++_fix.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/rtgui/adjuster.cc b/rtgui/adjuster.cc -index f73dd8a..a7a069c 100644 ---- a/rtgui/adjuster.cc -+++ b/rtgui/adjuster.cc -@@ -17,7 +17,7 @@ - * along with RawTherapee. If not, see . - */ - #include "adjuster.h" --#include -+#include - #include - #include "multilangmgr.h" - #include "../rtengine/rtengine.h" -diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc -index 134c0d7..8ce1808 100644 ---- a/rtgui/preferences.cc -+++ b/rtgui/preferences.cc -@@ -16,7 +16,7 @@ - * You should have received a copy of the GNU General Public License - * along with RawTherapee. If not, see . - */ --#include -+#include - #include "preferences.h" - #include "multilangmgr.h" - #include "splash.h" -diff --git a/rtgui/thresholdadjuster.cc b/rtgui/thresholdadjuster.cc -index 6b41329..19cde25 100644 ---- a/rtgui/thresholdadjuster.cc -+++ b/rtgui/thresholdadjuster.cc -@@ -17,7 +17,7 @@ - * along with RawTherapee. If not, see . - */ - #include "thresholdadjuster.h" --#include -+#include - #include - #include "multilangmgr.h" - #include "../rtengine/rtengine.h" -diff --git a/rtgui/tonecurve.cc b/rtgui/tonecurve.cc -index 2e439e1..5f14200 100644 ---- a/rtgui/tonecurve.cc -+++ b/rtgui/tonecurve.cc -@@ -18,7 +18,7 @@ - */ - #include "tonecurve.h" - #include "adjuster.h" --#include -+#include - #include - #include "ppversion.h" - #include "edit.h" diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index b5abe34581a..bd19ef3c43b 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk, pkgconfig, libusb ? null}: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null}: stdenv.mkDerivation rec { name = "sane-frontends-1.0.14"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sed -e '/SANE_CAP_ALWAYS_SETTABLE/d' -i src/gtkglue.c ''; - buildInputs = [sane-backends libX11 gtk pkgconfig] ++ + buildInputs = [sane-backends libX11 gtk2 pkgconfig] ++ (if libusb != null then [libusb] else []); meta = { diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index b3a432c96df..de07a4f1a89 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk, pkgconfig, libpng +{ stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng , libusb ? null , gimpSupport ? false, gimp_2_8 ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { chmod a+rX -R . ''; - buildInputs = [libpng sane-backends sane-frontends libX11 gtk pkgconfig ] + buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 pkgconfig ] ++ (if libusb != null then [libusb] else []) ++ stdenv.lib.optional gimpSupport gimp_2_8; diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix index 8af753ac29c..8a24eab2200 100644 --- a/pkgs/applications/graphics/simple-scan/default.nix +++ b/pkgs/applications/graphics/simple-scan/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool -, libusb1, libxml2, pkgconfig, sane-backends, vala_0_23, wrapGAppsHook +, libusb1, libxml2, pkgconfig, sane-backends, vala_0_32, wrapGAppsHook , gnome3 }: stdenv.mkDerivation rec { name = "simple-scan-${version}"; - version = "3.21.1"; + version = "${major_version}.0.1"; + major_version = "3.22"; src = fetchurl { - sha256 = "00w206isni8m8qd9m8x0644s1gqg11pvgnw6zav33b0bs2h2kk79"; - url = "https://launchpad.net/simple-scan/3.21/${version}/+download/${name}.tar.xz"; + url = "https://launchpad.net/simple-scan/${major_version}/${version}/+download/${name}.tar.xz"; + sha256 = "0l1b3llkdlqq0bcjx1cadba67l2zb4zfykdaprpjbjbr6gkbc1f5"; }; - buildInputs = [ cairo colord glib gusb gtk3 libusb1 libxml2 sane-backends - vala_0_23 ]; + buildInputs = [ cairo colord glib gnome3.defaultIconTheme gusb gtk3 libusb1 libxml2 sane-backends vala_0_32 ]; nativeBuildInputs = [ intltool itstool pkgconfig wrapGAppsHook ]; configureFlags = [ "--disable-packagekit" ]; @@ -27,18 +27,8 @@ stdenv.mkDerivation rec { ''; postInstall = '' - ( - cd ${gnome3.defaultIconTheme}/share/icons/Adwaita - - for f in `find . | grep 'scanner\.'` - do - local outFile="`echo "$out/share/icons/hicolor/$f" | sed \ - -e 's#/devices/#/apps/#g' \ - -e 's#scanner\.#simple-scan\.#g'`" - mkdir -p "`realpath -m "$outFile/.."`" - cp "$f" "$outFile" - done - ) + mkdir -p $out/share/icons + mv $out/share/simple-scan/icons/* $out/share/icons/ ''; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 23a37ab43ae..fc8e7a62c2b 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk, gettext, bzip2, zlib +{ fetchurl, stdenv, pkgconfig, gtk2, gettext, bzip2, zlib , libjpeg, libtiff, cfitsio, exiv2, lcms2, gtkimageview, lensfun }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk gtkimageview gettext bzip2 zlib + [ pkgconfig gtk2 gtkimageview gettext bzip2 zlib libjpeg libtiff cfitsio exiv2 lcms2 lensfun ]; diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix index cc456465ba6..4542de2d42f 100644 --- a/pkgs/applications/graphics/xara/default.nix +++ b/pkgs/applications/graphics/xara/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, automake, gettext, freetype, libxml2, pango, pkgconfig -, wxGTK, gtk, perl, zip}: +, wxGTK, gtk2, perl, zip}: stdenv.mkDerivation { name = "xaralx-0.7r1785"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ automake pkgconfig gettext perl zip ]; - buildInputs = [ wxGTK gtk libxml2 freetype pango ]; + buildInputs = [ wxGTK gtk2 libxml2 freetype pango ]; configureFlags = "--disable-svnversion"; diff --git a/pkgs/applications/graphics/xournal/default.nix b/pkgs/applications/graphics/xournal/default.nix index 53d0473638a..b81efb08d8a 100644 --- a/pkgs/applications/graphics/xournal/default.nix +++ b/pkgs/applications/graphics/xournal/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, ghostscript, atk, gtk, glib, fontconfig, freetype +, ghostscript, atk, gtk2, glib, fontconfig, freetype , libgnomecanvas, libgnomeprint, libgnomeprintui , pango, libX11, xproto, zlib, poppler , autoconf, automake, libtool, pkgconfig}: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ghostscript atk gtk glib fontconfig freetype + ghostscript atk gtk2 glib fontconfig freetype libgnomecanvas libgnomeprint libgnomeprintui pango libX11 xproto zlib poppler ]; diff --git a/pkgs/applications/graphics/xzgv/default.nix b/pkgs/applications/graphics/xzgv/default.nix index 053e1137e39..99931442945 100644 --- a/pkgs/applications/graphics/xzgv/default.nix +++ b/pkgs/applications/graphics/xzgv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, pkgconfig, texinfo }: +{ stdenv, fetchurl, gtk2, pkgconfig, texinfo }: stdenv.mkDerivation rec { name = "xzgv-${version}"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/xzgv/xzgv-${version}.tar.gz"; sha256 = "1rh432wnvzs434knzbda0fslhfx0gngryrrnqkfm6gwd2g5mxcph"; }; - buildInputs = [ gtk pkgconfig texinfo ]; + buildInputs = [ gtk2 pkgconfig texinfo ]; patches = [ ./fix-linker-paths.patch ]; postPatch = '' substituteInPlace config.mk \ diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index d31e9234e09..88bf87b0a84 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk, glib +{ stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib , gdk_pixbuf }: assert stdenv.system == "i686-linux"; @@ -20,7 +20,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; + [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ]; passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux"; diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 655fa5b9405..b339d8aeb7b 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.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "manuelschneid3r"; repo = "albert"; rev = "v${version}"; - sha256 = "1x8fpc6rnjifh405p385avdaww4v8ld6qwczqwmkzgbcn15gman7"; + sha256 = "12ag30l3dd05hg0d08ax4c8dvp24lgd677szkq445xzvvhggxr37"; }; nativeBuildInputs = [ cmake makeQtWrapper ]; @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { wrapQtProgram $out/bin/albert ''; - meta = { + meta = with stdenv.lib; { homepage = https://github.com/manuelSchneid3r/albert; description = "Desktop agnostic launcher"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.ericsagnes ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ericsagnes ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/artha/default.nix b/pkgs/applications/misc/artha/default.nix index a8914a9014d..3294d18e70b 100644 --- a/pkgs/applications/misc/artha/default.nix +++ b/pkgs/applications/misc/artha/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus_glib, gtk, pkgconfig, wordnet }: +{ stdenv, fetchurl, dbus_glib, gtk2, pkgconfig, wordnet }: stdenv.mkDerivation rec { name = "artha-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0qr4ihl7ma3cq82xi1fpzvf74mm9vsg0j035xvmcp3r6rmw2fycx"; }; - buildInputs = [ dbus_glib gtk pkgconfig wordnet ]; + buildInputs = [ dbus_glib gtk2 pkgconfig wordnet ]; meta = with stdenv.lib; { description = "An offline thesaurus based on WordNet"; diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index 0df0a564731..6cc6cc5d9b9 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk, xdg_utils }: +{ stdenv, fetchurl, unzip, mono, avrgcclibc, avrdude, gtk2, xdg_utils }: stdenv.mkDerivation rec { name = "avrdudess-2.2.20140102"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { cat >> "$out/bin/avrdudess" << __EOF__ #!${stdenv.shell} - export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk mono]}" + export LD_LIBRARY_PATH="${stdenv.lib.makeLibraryPath [gtk2 mono]}" # We need PATH from user env for xdg-open to find its tools, which # typically depend on the currently running desktop environment. export PATH="${stdenv.lib.makeBinPath [ avrgcclibc avrdude xdg_utils ]}:\$PATH" diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix index 14416c24d23..283e7f19907 100644 --- a/pkgs/applications/misc/batti/default.nix +++ b/pkgs/applications/misc/batti/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, gettext, pythonPackages -, gtk, gdk_pixbuf, upower +, gtk2, gdk_pixbuf, upower , makeWrapper }: let @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { }; buildInputs = with stdenv.lib; - [ pkgconfig gettext python gtk pygtk dbus-python gdk_pixbuf upower makeWrapper ]; + [ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ]; configurePhase = "true"; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index d76c935f0a6..734364b9ccd 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,8 @@ { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew -, ilmbase, libXi, libX11, libjpeg, libpng, libsamplerate, libsndfile -, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python -, zlib, fftw, opensubdiv, freetype +, ilmbase, libXi, libX11, libXext, libXrender +, libjpeg, libpng, libsamplerate, libsndfile +, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python +, zlib, fftw, opensubdiv, freetype, jemalloc , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit , colladaSupport ? true, opencollada @@ -10,17 +11,18 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.77a"; + name = "blender-2.78"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "0rswx2n52wjr4jpvg1a6mir5das2i752brjzigmm8rhayl0glw1p"; + sha256 = "0hfl7q6phydlk8mbkksnqxj004qqad99xkrp5n9wrz9vrcf3x1hp"; }; buildInputs = - [ boost cmake ffmpeg gettext glew ilmbase libXi libX11 freetype - libjpeg libpng libsamplerate libsndfile libtiff mesa openal - opencolorio openexr openimageio openjpeg python zlib fftw + [ boost cmake ffmpeg gettext glew ilmbase + libXi libX11 libXext libXrender + freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal + opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) ] ++ optional jackaudioSupport libjack2 @@ -38,7 +40,7 @@ stdenv.mkDerivation rec { "-DWITH_CODEC_SNDFILE=ON" "-DWITH_INSTALL_PORTABLE=OFF" "-DWITH_FFTW3=ON" - "-DWITH_SDL=ON" + #"-DWITH_SDL=ON" "-DWITH_GAMEENGINE=ON" "-DWITH_OPENCOLORIO=ON" "-DWITH_SYSTEM_OPENJPEG=ON" diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index 79b4e787eaa..8fb4af6d53e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,19 +1,21 @@ { stdenv, pythonPackages, fetchFromGitHub, - encryptionSupport ? false }: pythonPackages.buildPythonApplication rec { - version = "1.9"; + version = "2.4"; name = "buku-${version}"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; - rev = "e99844876d0d871df80770b1bd76c161276116eb"; - sha256 = "1qwkff61gdjd6w337a5ipfiybzqdwkxdyfa1l4zzm9dj7lsklgq2"; + rev = "v${version}"; + sha256 = "0rmvlpp1pzzgn1hf87ksigj9kp60gfwkvxymb4wiz7dqa57b1q0n"; }; - buildInputs = stdenv.lib.optional encryptionSupport pythonPackages.pycrypto; + buildInputs = [ + pythonPackages.cryptography + pythonPackages.beautifulsoup4 + ]; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index fe5227e395b..d2e618b105b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.66.0"; + version = "2.68.0"; name = "calibre-${version}"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${name}.tar.xz"; - sha256 = "1dbv6p9cq9zj51zvhfy2b7aic2zqa44lmfmq7k7fkqcgb6wmanic"; + sha256 = "0mn6wdws1xxc4yvhp5vdzb5i5c9dsmamyms1njdzs5fv754rszpm"; }; inherit python; @@ -129,14 +129,14 @@ stdenv.mkDerivation rec { ]; categories = "Office"; extraEntries = '' - Actions=ebook-edit ebook-viewer + Actions=Edit;Viewer; - [Desktop Action ebook-edit] + [Desktop Action Edit] Name=Edit E-book Icon=@out@/share/calibre/images/tweak.png Exec=@out@/bin/ebook-edit --detach %F - [Desktop Action ebook-viewer] + [Desktop Action Viewer] Name=E-book Viewer Icon=@out@/share/calibre/images/viewer.png Exec=@out@/bin/ebook-viewer --detach %F diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix new file mode 100644 index 00000000000..09bc8f25b26 --- /dev/null +++ b/pkgs/applications/misc/cheat/default.nix @@ -0,0 +1,20 @@ +{ python3Packages, fetchurl, lib }: + +python3Packages.buildPythonApplication rec { + version = "2.1.26"; + name = "cheat-${version}"; + + propagatedBuildInputs = with python3Packages; [ docopt pygments ]; + + src = fetchurl { + url = "mirror://pypi/c/cheat/${name}.tar.gz"; + sha256 = "0yilm9ba6ll9wzh20gj3lg9mnc50q95m6sqmjp2vcghwgipdixpm"; + }; + + meta = { + description = "cheat allows you to create and view interactive cheatsheets on the command-line"; + maintainers = with lib.maintainers; [ mic92 ]; + license = with lib.licenses; [gpl3 mit]; + homepage = "https://github.com/chrisallenlane/cheat"; + }; +} diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 57f6c229a08..e62236e7ae2 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }: +{ fetchurl, stdenv, intltool, pkgconfig, gtk2, xdotool }: stdenv.mkDerivation rec { name = "clipit-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; }; - buildInputs = [ intltool pkgconfig gtk xdotool ]; + buildInputs = [ intltool pkgconfig gtk2 xdotool ]; meta = with stdenv.lib; { description = "Lightweight GTK+ Clipboard Manager"; diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix new file mode 100644 index 00000000000..3cc334c6765 --- /dev/null +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -0,0 +1,84 @@ +{ stdenv +, fetchFromGitHub +, cmake +, jsoncpp +, libjson_rpc_cpp +, curl +, boost +, leveldb +, cryptopp +, libcpuid +, opencl-headers +, ocl-icd +, miniupnpc +, libmicrohttpd +, gmp +, mesa +, extraCmakeFlags ? [] +}: +stdenv.mkDerivation rec { + name = "cpp-ethereum-${version}"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "ethereum"; + repo = "cpp-ethereum"; + rev = "62ab9522e58df9f28d2168ea27999a214b16ea96"; + sha256 = "1fxgpqhmjhpv0zzs1m3yf9h8mh25dqpa7pmcfy7f9qiqpfdr4zq9"; + }; + + cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" extraCmakeFlags ]; + + configurePhase = '' + export BOOST_INCLUDEDIR=${boost.dev}/include + export BOOST_LIBRARYDIR=${boost.out}/lib + + mkdir -p Build/Install + pushd Build + + cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install $cmakeFlags + ''; + + enableParallelBuilding = true; + + runPath = with stdenv.lib; makeLibraryPath ([ stdenv.cc.cc ] ++ buildInputs); + + installPhase = '' + make install + + mkdir -p $out + + for f in Install/lib/*.so* $(find Install/bin -executable -type f); do + patchelf --set-rpath $runPath:$out/lib $f + done + + cp -r Install/* $out + ''; + + buildInputs = [ + cmake + jsoncpp + libjson_rpc_cpp + curl + boost + leveldb + cryptopp + libcpuid + opencl-headers + ocl-icd + miniupnpc + libmicrohttpd + gmp + mesa + ]; + + dontStrip = true; + + meta = with stdenv.lib; { + decription = "Ethereum C++ client"; + homepage = https://github.com/ethereum/cpp-ethereum; + license = licenses.gpl3; + maintainers = with maintainers; [ artuuge ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/d4x/default.nix b/pkgs/applications/misc/d4x/default.nix index cdcada196b9..b6d6e53b001 100644 --- a/pkgs/applications/misc/d4x/default.nix +++ b/pkgs/applications/misc/d4x/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, openssl, boost }: stdenv.mkDerivation { name = "d4x-2.5.7.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1i1jj02bxynisqapv31481sz9jpfp3f023ky47spz1v1wlwbs13m"; }; - buildInputs = [ gtk glib pkgconfig openssl boost ]; + buildInputs = [ gtk2 glib pkgconfig openssl boost ]; meta = { description = "Graphical download manager"; diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 3e76f6c36e7..33adacefb9d 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -8,8 +8,6 @@ stdenv.mkDerivation rec { sha256 = "172ybxg720r64hp6aah0hqvxklqv1cf8v7kwx0ng5ap0h20jydbw"; }; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - buildInputs = [ qt4 zlib bzip2 ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index 061a10c6a9f..95cae316a71 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, -librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }: +librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }: stdenv.mkDerivation rec { name = "eaglemode-0.86.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig - librsvg glib gtk libXxf86vm libXext poppler xineLib ]; + librsvg glib gtk2 libXxf86vm libXext poppler xineLib ]; # The program tries to dlopen both Xxf86vm and Xext, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix index 7b1bdef4eb5..7abeaf57b64 100644 --- a/pkgs/applications/misc/electrum-dash/default.nix +++ b/pkgs/applications/misc/electrum-dash/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "electrum-dash-${version}"; version = "2.4.1"; @@ -13,7 +13,7 @@ buildPythonApplication rec { dns ecdsa pbkdf2 - protobuf + protobuf3_0 pyasn1 pyasn1-modules pycrypto diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index d5442a2ded8..9e4afc0ae90 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,21 +1,5 @@ { stdenv, fetchurl, pythonPackages }: -let - jsonrpclib = pythonPackages.buildPythonPackage rec { - version = "0.1.7"; - name = "jsonrpclib-${version}"; - src = fetchurl { - url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz"; - sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; - }; - propagatedBuildInputs = [ pythonPackages.cjson ]; - meta = { - homepage = https://pypi.python.org/pypi/jsonrpclib; - license = stdenv.lib.licenses.asl20; - }; - }; -in - pythonPackages.buildPythonApplication rec { name = "electrum-${version}"; version = "2.6.4"; @@ -30,7 +14,7 @@ pythonPackages.buildPythonApplication rec { ecdsa jsonrpclib pbkdf2 - protobuf + protobuf3_0 pyasn1 pyasn1-modules pycrypto @@ -61,14 +45,14 @@ pythonPackages.buildPythonApplication rec { ''; meta = with stdenv.lib; { - description = "Bitcoin thin-client"; + description = "A lightweight Bitcoin wallet"; longDescription = '' An easy-to-use Bitcoin client featuring wallets generated from mnemonic seeds (in addition to other, more advanced, wallet options) and the ability to perform transactions without downloading a copy of the blockchain. ''; - homepage = https://electrum.org; + homepage = https://electrum.org/; license = licenses.mit; maintainers = with maintainers; [ ehmry joachifm np ]; }; diff --git a/pkgs/applications/misc/epdfview/default.nix b/pkgs/applications/misc/epdfview/default.nix index 782ef4ae366..09bef975c85 100644 --- a/pkgs/applications/misc/epdfview/default.nix +++ b/pkgs/applications/misc/epdfview/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk, poppler }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, gtk2, poppler }: stdenv.mkDerivation rec { name = "epdfview-0.1.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1w7qybh8ssl4dffi5qfajq8mndw7ipsd92vkim03nywxgjp4i1ll"; }; - buildInputs = [ pkgconfig gtk poppler ]; + buildInputs = [ pkgconfig gtk2 poppler ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix index f7a8fe4eafc..1165ced11f9 100644 --- a/pkgs/applications/misc/evilvte/default.nix +++ b/pkgs/applications/misc/evilvte/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, makeWrapper, pkgconfig, - gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, + gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg, configH }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xorg.libX11 + gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11 xorg.xproto xorg.kbproto xorg.libXext xorg.xextproto makeWrapper pkgconfig ]; diff --git a/pkgs/applications/misc/fehlstart/default.nix b/pkgs/applications/misc/fehlstart/default.nix index 35b66299c06..548679e4b47 100644 --- a/pkgs/applications/misc/fehlstart/default.nix +++ b/pkgs/applications/misc/fehlstart/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "Small desktop application launcher with reasonable memory footprint"; homepage = https://gitlab.com/fehlstart/fehlstart; - licence = licenses.gpl3; + license = licenses.gpl3; maintainers = [ maintainers.mounium ]; platforms = platforms.all; }; diff --git a/pkgs/applications/misc/fme/default.nix b/pkgs/applications/misc/fme/default.nix index 685c0ecb4ed..30169588501 100644 --- a/pkgs/applications/misc/fme/default.nix +++ b/pkgs/applications/misc/fme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, autoconf, automake, gettext -, fluxbox, bc, gtkmm, glibmm, libglademm, libsigcxx }: +, fluxbox, bc, gtkmm2, glibmm, libglademm, libsigcxx }: stdenv.mkDerivation rec{ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "d1c81a6a38c0faad02943ad65d6d0314bd205c6de841669a2efe43e4c503e63d"; }; - buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm glibmm libglademm libsigcxx ]; + buildInputs = [ pkgconfig autoconf automake gettext fluxbox bc gtkmm2 glibmm libglademm libsigcxx ]; preConfigure = '' ./autogen.sh diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix index 069d07bd82a..a858fefa8c2 100644 --- a/pkgs/applications/misc/get_iplayer/default.nix +++ b/pkgs/applications/misc/get_iplayer/default.nix @@ -1,30 +1,33 @@ -{stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}: -buildPerlPackage { - name = "get_iplayer-2.94"; +{stdenv, fetchurl, atomicparsley, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, rtmpdump}: +buildPerlPackage rec { + name = "get_iplayer-${version}"; + version = "2.97"; buildInputs = [makeWrapper perl]; - propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLSimple]; + propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLLibXML XMLSimple]; preConfigure = "touch Makefile.PL"; doCheck = false; outputs = [ "out" "man" ]; - patchPhase = '' - sed -e 's|^update_script|#update_script|' \ - -e '/WARNING.*updater/d' \ - -i get_iplayer - ''; - - installPhase = '' + installPhase = '' mkdir -p $out/bin $out/share/man/man1 cp get_iplayer $out/bin - wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ ffmpeg flvstreamer vlc rtmpdump ]} --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/get_iplayer --suffix PATH : ${stdenv.lib.makeBinPath [ atomicparsley ffmpeg flvstreamer rtmpdump ]} --prefix PERL5LIB : $PERL5LIB cp get_iplayer.1 $out/share/man/man1 ''; src = fetchurl { - url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.94.tar.gz; - sha256 = "16p0bw879fl8cs6rp37g1hgrcai771z6rcqk2nvm49kk39dx1zi4"; + 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; + homepage = https://squarepenguin.co.uk/; + downloadPage = https://github.com/get-iplayer/get_iplayer/releases; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/applications/misc/gkrellm/default.nix b/pkgs/applications/misc/gkrellm/default.nix index f4fec41b9e6..d6a59a89be6 100644 --- a/pkgs/applications/misc/gkrellm/default.nix +++ b/pkgs/applications/misc/gkrellm/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk, libX11, libSM, libICE +{ fetchurl, stdenv, gettext, pkgconfig, glib, gtk2, libX11, libSM, libICE , IOKit ? null }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "12rc6zaa7kb60b9744lbrlfkxxfniprm6x0mispv63h4kh75navh"; }; - buildInputs = [gettext pkgconfig glib gtk libX11 libSM libICE] + buildInputs = [gettext pkgconfig glib gtk2 libX11 libSM libICE] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/gksu/default.nix b/pkgs/applications/misc/gksu/default.nix index c3f78efd412..0b6ebe06b88 100644 --- a/pkgs/applications/misc/gksu/default.nix +++ b/pkgs/applications/misc/gksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gnome3, libgksu, +{ stdenv, fetchurl, pkgconfig, gtk2, gnome3, libgksu, intltool, libstartup_notification, gtk_doc, wrapGAppsHook }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk gnome3.gconf libstartup_notification gnome3.libgnome_keyring + gtk2 gnome3.gconf libstartup_notification gnome3.libgnome_keyring ]; propagatedBuildInputs = [ diff --git a/pkgs/applications/misc/gnuradio-ais/default.nix b/pkgs/applications/misc/gnuradio-ais/default.nix new file mode 100644 index 00000000000..eda95bc0c5e --- /dev/null +++ b/pkgs/applications/misc/gnuradio-ais/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, cppunit, gnuradio-osmosdr +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-ais-${version}"; + version = "2016-08-26"; + + src = fetchFromGitHub { + owner = "bistromath"; + repo = "gr-ais"; + rev = "1863d1bf8a7709a8dfedb3ddb8e2b99112e7c872"; + sha256 = "1vl3kk8xr2mh5lf31zdld7yzmwywqffffah8iblxdzblgsdwxfl6"; + }; + + buildInputs = [ + cmake pkgconfig boost gnuradio makeWrapper cppunit gnuradio-osmosdr + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + meta = with stdenv.lib; { + description = "Gnuradio block for ais"; + homepage = https://github.com/bistromath/gr-ais; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio-gsm/default.nix b/pkgs/applications/misc/gnuradio-gsm/default.nix new file mode 100644 index 00000000000..a47925cab90 --- /dev/null +++ b/pkgs/applications/misc/gnuradio-gsm/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, cppunit, libosmocore, gnuradio-osmosdr +, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-gsm-${version}"; + version = "2016-08-25"; + + src = fetchFromGitHub { + owner = "ptrkrysik"; + repo = "gr-gsm"; + rev = "3ca05e6914ef29eb536da5dbec323701fbc2050d"; + sha256 = "13nnq927kpf91iqccr8db9ripy5czjl5jiyivizn6bia0bam2pvx"; + }; + + buildInputs = [ + cmake pkgconfig boost gnuradio makeWrapper cppunit libosmocore gnuradio-osmosdr + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:${gnuradio-osmosdr}/lib/${python.libPrefix}/site-packages:$(toPythonPath "$out") + done + ''; + + meta = with stdenv.lib; { + description = "Gnuradio block for gsm"; + homepage = https://github.com/ptrkrysik/gr-gsm; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gnuradio-rds/default.nix b/pkgs/applications/misc/gnuradio-rds/default.nix new file mode 100644 index 00000000000..5e729a75557 --- /dev/null +++ b/pkgs/applications/misc/gnuradio-rds/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, gnuradio +, makeWrapper, pythonSupport ? true, python, swig +}: + +assert pythonSupport -> python != null && swig != null; + +stdenv.mkDerivation rec { + name = "gnuradio-rds-${version}"; + version = "2016-08-27"; + + src = fetchFromGitHub { + owner = "bastibl"; + repo = "gr-rds"; + rev = "5246b75180808d47f321cb26f6c16d7c7a7af4fc"; + sha256 = "008284ya464q4h4fd0zvcn6g7bym231p8fl3kdxncz9ks4zsbsxs"; + }; + + buildInputs = [ + cmake pkgconfig boost gnuradio makeWrapper + ] ++ stdenv.lib.optionals pythonSupport [ python swig ]; + + postInstall = '' + for prog in "$out"/bin/*; do + wrapProgram "$prog" --set PYTHONPATH $PYTHONPATH:$(toPythonPath "$out") + done + ''; + + meta = with stdenv.lib; { + description = "Gnuradio block for radio data system"; + homepage = https://github.com/bastibl/gr-rds; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index e894ace0d45..5d13c18edc3 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } : +{ stdenv, fetchsvn, libxml2, gtk2, curl, pkgconfig } : let version = "31801"; @@ -15,7 +15,7 @@ stdenv.mkDerivation { ignoreExternals = true; }; - buildInputs = [ libxml2 gtk curl ]; + buildInputs = [ libxml2 gtk2 curl ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/gpa/default.nix b/pkgs/applications/misc/gpa/default.nix index 10b8065c623..600a5493121 100644 --- a/pkgs/applications/misc/gpa/default.nix +++ b/pkgs/applications/misc/gpa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, gpgme, libgpgerror, libassuan }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2, gpgme, libgpgerror, libassuan }: stdenv.mkDerivation rec { name = "gpa-0.9.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0d235hcqai7m3qb7m9kvr2r4qg4714f87j9fdplwrlz1p4wdfa38"; }; - buildInputs = [ intltool pkgconfig gtk gpgme libgpgerror libassuan ]; + buildInputs = [ intltool pkgconfig gtk2 gpgme libgpgerror libassuan ]; meta = with stdenv.lib; { description = "Graphical user interface for the GnuPG"; diff --git a/pkgs/applications/misc/gpscorrelate/default.nix b/pkgs/applications/misc/gpscorrelate/default.nix index c6b48af5c06..5026fea0e35 100644 --- a/pkgs/applications/misc/gpscorrelate/default.nix +++ b/pkgs/applications/misc/gpscorrelate/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk +{ fetchurl, stdenv, pkgconfig, exiv2, libxml2, gtk2 , libxslt, docbook_xsl, docbook_xml_dtd_42 }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig exiv2 libxml2 gtk + pkgconfig exiv2 libxml2 gtk2 libxslt docbook_xsl docbook_xml_dtd_42 ]; diff --git a/pkgs/applications/misc/gpsprune/default.nix b/pkgs/applications/misc/gpsprune/default.nix index 789f2d7c3fa..1f263a2b1dd 100644 --- a/pkgs/applications/misc/gpsprune/default.nix +++ b/pkgs/applications/misc/gpsprune/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gpsprune-${version}"; - version = "18.4"; + version = "18.5"; src = fetchurl { url = "http://activityworkshop.net/software/gpsprune/gpsprune_${version}.jar"; - sha256 = "0wrkvff3c1w66373m2w2ib07rkn3rmbp3n7ixz72qd1swvbk6xx1"; + sha256 = "0xd97b7rs5i41hyih6zdbvls090903yfr1r9lflq93dyqhmzpdhn"; }; phases = [ "installPhase" ]; diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix index 03d333e59e6..623cb12f932 100644 --- a/pkgs/applications/misc/green-pdfviewer/default.nix +++ b/pkgs/applications/misc/green-pdfviewer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk }: +{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }: stdenv.mkDerivation rec { name = "green-pdfviewer-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0d0lv33flhgsxhc77kfp2avdz5gvml04r8l1j95yjz2rr096lzlj"; }; - buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk ]; + buildInputs = [ poppler pkgconfig gdk_pixbuf SDL gtk2 ]; patches = [ ./gdk-libs.patch diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index 07cecc2d84e..5db5b25947e 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte +{ stdenv, fetchurl, gtk2, glib, pkgconfig, libgnome, libgnomeui, vte , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zb6zpq7qmn6bflbgfwisyg3vrjr23yi1c1kqvwndl1f0shr8qyl"; }; - buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia + buildInputs = [ gtk2 glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ncurses libtool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix index aa6a4bd689a..3191c00e9ec 100644 --- a/pkgs/applications/misc/hamster-time-tracker/default.nix +++ b/pkgs/applications/misc/hamster-time-tracker/default.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { docbook2x libxslt gnome_doc_utils intltool dbus_glib hicolor_icon_theme ]; - propagatedBuildInputs = with pythonPackages; [ pygobject pygtk pyxdg gnome_python dbus-python sqlite3 ]; + propagatedBuildInputs = with pythonPackages; [ pygobject2 pygtk pyxdg gnome_python dbus-python sqlite3 ]; configurePhase = '' python waf configure --prefix="$out" diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c183f70a289..cc4f0d2e773 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,17 +2,23 @@ buildGoPackage rec { name = "hugo-${version}"; - version = "v0.16"; - rev = "8b54843a0db694facbaf368af4e777d0ae5fb992"; + version = "0.17"; goPackagePath = "github.com/spf13/hugo"; src = fetchFromGitHub { - inherit rev; owner = "spf13"; repo = "hugo"; - sha256 = "135mrdi8i56z9m2sihjrdfab6lrczbfgavwvfrngvi1zxnx7scmv"; + rev = "v${version}"; + sha256 = "1h5d7m019r4zhk7xlcdbn4z3w6x7jq2lcdgq7w377688rk58wbgp"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; + + meta = { + description = "A fast and modern static website engine."; + homepage = https://gohugo.io; + maintainers = with stdenv.lib.maintainers; [ schneefux ]; + license = stdenv.lib.licenses.asl20; + }; } diff --git a/pkgs/applications/misc/hugo/deps.json b/pkgs/applications/misc/hugo/deps.json deleted file mode 100644 index 53967d1bff0..00000000000 --- a/pkgs/applications/misc/hugo/deps.json +++ /dev/null @@ -1,317 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/inconshreveable/mousetrap", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/mousetrap", - "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa", - "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/hashicorp/hcl", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/hcl", - "rev": "54864211433d45cb780682431585b3e573b49e4a", - "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-multierror", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-multierror", - "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5", - "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/mitchellh/mapstructure", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/mapstructure", - "rev": "281073eb9eb092240d33ef253c404f1cca550309", - "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", - "fetch": { - "type": "git", - "url": "https://github.com/shurcooL/sanitized_anchor_name", - "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", - "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" - } - }, - { - "goPackagePath": "github.com/russross/blackfriday", - "fetch": { - "type": "git", - "url": "https://github.com/russross/blackfriday", - "rev": "d18b67ae0afd61dae240896eae1785f00709aa31", - "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf" - } - }, - { - "goPackagePath": "github.com/yosssi/ace", - "fetch": { - "type": "git", - "url": "https://github.com/yosssi/ace", - "rev": "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d", - "sha256": "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k" - } - }, - { - "goPackagePath": "github.com/spf13/viper", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/viper", - "rev": "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd", - "sha256": "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0" - } - }, - { - "goPackagePath": "github.com/spf13/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/pflag", - "rev": "367864438f1b1a3c7db4da06a2f55b144e6784e0", - "sha256": "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp" - } - }, - { - "goPackagePath": "github.com/spf13/jwalterweatherman", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/jwalterweatherman", - "rev": "33c24e77fb80341fe7130ee7c594256ff08ccc46", - "sha256": "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z" - } - }, - { - "goPackagePath": "github.com/fsnotify/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8", - "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm" - } - }, - { - "goPackagePath": "github.com/magiconair/properties", - "fetch": { - "type": "git", - "url": "https://github.com/magiconair/properties", - "rev": "c265cfa48dda6474e208715ca93e987829f572f8", - "sha256": "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3" - } - }, - { - "goPackagePath": "github.com/bep/inflect", - "fetch": { - "type": "git", - "url": "https://github.com/bep/inflect", - "rev": "b896c45f5af983b1f416bdf3bb89c4f1f0926f69", - "sha256": "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3" - } - }, - { - "goPackagePath": "github.com/eknkc/amber", - "fetch": { - "type": "git", - "url": "https://github.com/eknkc/amber", - "rev": "91774f050c1453128146169b626489e60108ec03", - "sha256": "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis" - } - }, - { - "goPackagePath": "github.com/spf13/afero", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/afero", - "rev": "1a8ecf8b9da1fb5306e149e83128fc447957d2a8", - "sha256": "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw" - } - }, - { - "goPackagePath": "github.com/spf13/cast", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cast", - "rev": "27b586b42e29bec072fe7379259cc719e1289da6", - "sha256": "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x" - } - }, - { - "goPackagePath": "github.com/spf13/cobra", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cobra", - "rev": "bc81c21bd0d8be5ba2d6630a505d79d4467566e7", - "sha256": "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r" - } - }, - { - "goPackagePath": "github.com/dchest/cssmin", - "fetch": { - "type": "git", - "url": "https://github.com/dchest/cssmin", - "rev": "fb8d9b44afdc258bfff6052d3667521babcb2239", - "sha256": "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s" - } - }, - { - "goPackagePath": "github.com/spf13/fsync", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/fsync", - "rev": "eefee59ad7de621617d4ff085cf768aab4b919b1", - "sha256": "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p" - } - }, - { - "goPackagePath": "github.com/cpuguy83/go-md2man", - "fetch": { - "type": "git", - "url": "https://github.com/cpuguy83/go-md2man", - "rev": "2724a9c9051aa62e9cca11304e7dd518e9e41599", - "sha256": "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj" - } - }, - { - "goPackagePath": "github.com/miekg/mmark", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/mmark", - "rev": "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a", - "sha256": "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa" - } - }, - { - "goPackagePath": "github.com/spf13/nitro", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/nitro", - "rev": "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8", - "sha256": "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/purell", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/purell", - "rev": "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3", - "sha256": "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb" - } - }, - { - "goPackagePath": "github.com/pkg/sftp", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/sftp", - "rev": "d4c18e7ffdc496a38de67dde6e29b2f364afc472", - "sha256": "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/kyokomi/emoji", - "fetch": { - "type": "git", - "url": "https://github.com/kyokomi/emoji", - "rev": "17c5e7085c9d59630aa578df67f4469481fbe7a9", - "sha256": "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp" - } - }, - { - "goPackagePath": "github.com/pkg/errors", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/errors", - "rev": "494e70f7620561491c2ca11e185bbef4b70060da", - "sha256": "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/urlesc", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/urlesc", - "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587", - "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni" - } - } -] diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix new file mode 100644 index 00000000000..70781708f6e --- /dev/null +++ b/pkgs/applications/misc/hugo/deps.nix @@ -0,0 +1,344 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "54864211433d45cb780682431585b3e573b49e4a"; + sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; + sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; + sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"; + }; + } + { + goPackagePath = "github.com/yosssi/ace"; + fetch = { + type = "git"; + url = "https://github.com/yosssi/ace"; + rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d"; + sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + fetch = { + type = "git"; + url = "https://github.com/spf13/viper"; + rev = "ec4eb2fa8549869ae7a2accd4fcc83d1c0555c15"; + sha256 = "018niqyrg09andj3g08jalflq2ypz9bp7qb1mbk50kfly29lkih7"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "b83537d79690b75cac5e021b036ae16792bf0f20"; + sha256 = "19blhq00rnynv11nnvixisx4h1429rp5bik13k661ixw0421qqyx"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + fetch = { + type = "git"; + url = "https://github.com/spf13/jwalterweatherman"; + rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; + sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + fetch = { + type = "git"; + url = "https://github.com/magiconair/properties"; + rev = "c265cfa48dda6474e208715ca93e987829f572f8"; + sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"; + }; + } + { + goPackagePath = "github.com/bep/inflect"; + fetch = { + type = "git"; + url = "https://github.com/bep/inflect"; + rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; + sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; + }; + } + { + goPackagePath = "github.com/eknkc/amber"; + fetch = { + type = "git"; + url = "https://github.com/eknkc/amber"; + rev = "91774f050c1453128146169b626489e60108ec03"; + sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + fetch = { + type = "git"; + url = "https://github.com/spf13/afero"; + rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8"; + sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cast"; + rev = "27b586b42e29bec072fe7379259cc719e1289da6"; + sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7"; + sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"; + }; + } + { + goPackagePath = "github.com/dchest/cssmin"; + fetch = { + type = "git"; + url = "https://github.com/dchest/cssmin"; + rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; + sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; + }; + } + { + goPackagePath = "github.com/spf13/fsync"; + fetch = { + type = "git"; + url = "https://github.com/spf13/fsync"; + rev = "eefee59ad7de621617d4ff085cf768aab4b919b1"; + sha256 = "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; + sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + }; + } + { + goPackagePath = "github.com/miekg/mmark"; + fetch = { + type = "git"; + url = "https://github.com/miekg/mmark"; + rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a"; + sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"; + }; + } + { + goPackagePath = "github.com/spf13/nitro"; + fetch = { + type = "git"; + url = "https://github.com/spf13/nitro"; + rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; + sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3"; + sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + fetch = { + type = "git"; + url = "https://github.com/pkg/sftp"; + rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472"; + sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/kyokomi/emoji"; + fetch = { + type = "git"; + url = "https://github.com/kyokomi/emoji"; + rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9"; + sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "494e70f7620561491c2ca11e185bbef4b70060da"; + sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587"; + sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"; + }; + } + { + goPackagePath = "github.com/nicksnyder/go-i18n"; + fetch = { + type = "git"; + url = "https://github.com/nicksnyder/go-i18n"; + rev = "e6c90c3ceece7f43060f843b495c3c9c031f5575"; + sha256 = "1i1hqvq05lk12wnrhayca66pvfbyjnj7dm0lr0hn5qhb2i8k84kd"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "45932ad32dfdd20826f5671da37a5f3ce9f26a8d"; + sha256 = "1rs25xqlpz2j9gqii144qnkvhsgzhwgy9ild7yvxhnbs2mybgix7"; + }; + } + { + goPackagePath = "github.com/pelletier/go-buffruneio"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-buffruneio"; + rev = "df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d"; + sha256 = "0jwn2g4jfdb3wvpqisd8h055099pwx6c5i3bb4zxk5l9vybg1c5f"; + }; + } +] diff --git a/pkgs/applications/misc/hyperterm/default.nix b/pkgs/applications/misc/hyperterm/default.nix index b3e0ef71c3c..59cd9ac2696 100644 --- a/pkgs/applications/misc/hyperterm/default.nix +++ b/pkgs/applications/misc/hyperterm/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl, dpkg, gtk, atk, glib, pango, gdk_pixbuf, cairo +{ stdenv, lib, fetchurl, dpkg, gtk2, atk, glib, pango, gdk_pixbuf, cairo , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver , GConf, nss, nspr, alsaLib, cups, expat, libudev, libpulseaudio }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc gtk atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libXrender libX11 libXtst libXScrnSaver GConf nss nspr alsaLib cups expat libudev libpulseaudio ]; diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index 810c7f2586f..71418732a48 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null); let name = "ikiwiki"; - version = "3.20150614"; + version = "3.20160905"; lib = stdenv.lib; in @@ -31,8 +31,8 @@ stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; - sha256 = "0sbs58d7faap1wp2rv7kf3gy3hid1hcpspgqs9wwms2qcki9kwa2"; + url = "mirror://debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz"; + sha256 = "1xbjj5qpxh7f05b69z9vvajg05zv63fj8js77c47yx01xifgd3vn"; }; buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index fd9077a619c..8e5c5d6206c 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, db, gtk, bzip2 }: +{ stdenv, fetchurl, db, gtk2, bzip2 }: stdenv.mkDerivation { name = "jigdo-0.7.3"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8"; }; - buildInputs = [ db gtk bzip2 ]; + buildInputs = [ db gtk2 bzip2 ]; configureFlags = "--without-libdb"; diff --git a/pkgs/applications/misc/keepass-plugins/keefox/default.nix b/pkgs/applications/misc/keepass-plugins/keefox/default.nix index e32f0b7ca01..cb48ff22bef 100644 --- a/pkgs/applications/misc/keepass-plugins/keefox/default.nix +++ b/pkgs/applications/misc/keepass-plugins/keefox/default.nix @@ -1,12 +1,12 @@ { stdenv, buildEnv, fetchurl, mono, unzip }: let - version = "1.5.4"; + version = "1.6.3"; drv = stdenv.mkDerivation { name = "keefox-${version}"; src = fetchurl { url = "https://github.com/luckyrat/KeeFox/releases/download/v${version}/${version}.xpi"; - sha256 = "c7c30770beb0ea32cbdee5311d03a9910fb7772695af3aa655e4ae64cd4d8335"; + sha256 = "dc26c51a6b3690d4bec527c3732a72f67a85b804c60db5e699260552e2dd2bd9"; }; meta = { diff --git a/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix new file mode 100644 index 00000000000..5e43486b075 --- /dev/null +++ b/pkgs/applications/misc/keepass-plugins/keepasshttp/default.nix @@ -0,0 +1,30 @@ +{ stdenv, buildEnv, fetchFromGitHub, mono }: + +let + version = "1.8.4.1"; + drv = stdenv.mkDerivation { + name = "keepasshttp-${version}"; + src = fetchFromGitHub { + owner = "pfn"; + repo = "keepasshttp"; + rev = "${version}"; + sha256 = "1074yv0pmzdwfwkx9fh7n2igdqwsyxypv55khkyng6synbv2p2fd"; + }; + + meta = { + description = "KeePass plugin to expose password entries securely (256bit AES/CBC) over HTTP"; + homepage = https://github.com/pfn/keepasshttp; + platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl3; + }; + + pluginFilename = "KeePassHttp.plgx"; + + installPhase = '' + mkdir -p $out/lib/dotnet/keepass/ + cp $pluginFilename $out/lib/dotnet/keepass/$pluginFilename + ''; + }; +in + # Mono is required to compile plugin at runtime, after loading. + buildEnv { name = drv.name; paths = [ mono drv ]; } diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix index 391410628ba..5eaad6514e1 100644 --- a/pkgs/applications/misc/keepass/default.nix +++ b/pkgs/applications/misc/keepass/default.nix @@ -8,11 +8,11 @@ # plugin derivations in the Nix store and nowhere else. with builtins; buildDotnetPackage rec { baseName = "keepass"; - version = "2.33"; + version = "2.34"; src = fetchurl { url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip"; - sha256 = "0n4rkx2awyq1gbqiby1lkf2zw82brji96s4fkjsahmci528a882i"; + sha256 = "e3f184e4deddd1aa5ee2b52e2373c772d3f3975e5eddb2fd729eb27b437011aa"; }; sourceRoot = "."; @@ -20,7 +20,7 @@ with builtins; buildDotnetPackage rec { buildInputs = [ unzip makeWrapper icoutils ]; pluginLoadPathsPatch = - let outputLc = toString (add 8 (length plugins)); + let outputLc = toString (add 7 (length plugins)); patchTemplate = readFile ./keepass-plugins.patch; loadTemplate = readFile ./keepass-plugins-load.patch; loads = diff --git a/pkgs/applications/misc/keepass/keepass-plugins-load.patch b/pkgs/applications/misc/keepass/keepass-plugins-load.patch index 872b6c06d78..b7bea38e4c8 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins-load.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins-load.patch @@ -1 +1 @@ -+ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass"); ++ m_pluginManager.LoadAllPlugins("$PATH$/lib/dotnet/keepass", SearchOption.TopDirectoryOnly, new string[] {}); diff --git a/pkgs/applications/misc/keepass/keepass-plugins.patch b/pkgs/applications/misc/keepass/keepass-plugins.patch index 1a32d77806a..1793f04a170 100644 --- a/pkgs/applications/misc/keepass/keepass-plugins.patch +++ b/pkgs/applications/misc/keepass/keepass-plugins.patch @@ -1,13 +1,45 @@ --- old/KeePass/Forms/MainForm.cs +++ new/KeePass/Forms/MainForm.cs -@@ -384,9 +384,$OUTPUT_LC$ @@ namespace KeePass.Forms - m_pluginManager.Initialize(m_pluginDefaultHost); - +@@ -386,42 +386,$OUTPUT_LC$ @@ namespace KeePass.Forms m_pluginManager.UnloadAllPlugins(); -- if(AppPolicy.Current.Plugins) -- m_pluginManager.LoadAllPlugins(UrlUtil.GetFileDirectory( -- WinUtil.GetExecutable(), false, true)); -+ if(AppPolicy.Current.Plugins) { + if(AppPolicy.Current.Plugins) + { +- string[] vExclNames = new string[] { +- AppDefs.FileNames.Program, AppDefs.FileNames.XmlSerializers, +- AppDefs.FileNames.NativeLib32, AppDefs.FileNames.NativeLib64, +- AppDefs.FileNames.ShInstUtil +- }; +- +- string strPlgRoot = UrlUtil.GetFileDirectory( +- WinUtil.GetExecutable(), false, true); +- m_pluginManager.LoadAllPlugins(strPlgRoot, SearchOption.TopDirectoryOnly, +- vExclNames); +- +- if(!NativeLib.IsUnix()) +- { +- string strPlgSub = UrlUtil.EnsureTerminatingSeparator(strPlgRoot, +- false) + AppDefs.PluginsDir; +- m_pluginManager.LoadAllPlugins(strPlgSub, SearchOption.AllDirectories, +- vExclNames); +- } +- else // Unix +- { +- try +- { +- DirectoryInfo diPlgRoot = new DirectoryInfo(strPlgRoot); +- foreach(DirectoryInfo diSub in diPlgRoot.GetDirectories()) +- { +- if(diSub == null) { Debug.Assert(false); continue; } +- +- if(string.Equals(diSub.Name, AppDefs.PluginsDir, +- StrUtil.CaseIgnoreCmp)) +- m_pluginManager.LoadAllPlugins(diSub.FullName, +- SearchOption.AllDirectories, vExclNames); +- } +- } +- catch(Exception) { Debug.Assert(false); } +- } +- } $DO_LOADS$+ } // Delete old files *after* loading plugins (when timestamps diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix index bd0118c75f4..a3c140b6e6c 100644 --- a/pkgs/applications/misc/kiwix/default.nix +++ b/pkgs/applications/misc/kiwix/default.nix @@ -1,7 +1,7 @@ { stdenv, callPackage, overrideCC, fetchurl, makeWrapper, pkgconfig , zip, python, zlib, which, icu, libmicrohttpd, lzma, ctpp2, aria2, wget, bc , libuuid, glibc, libX11, libXext, libXt, libXrender, glib, dbus, dbus_glib -, gtk, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk +, gtk2, gdk_pixbuf, pango, cairo , freetype, fontconfig, alsaLib, atk }: let @@ -98,7 +98,7 @@ stdenv.mkDerivation rec { rm $out/bin/kiwix makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \ - --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ + --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus_glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \ --suffix PATH : ${aria2}/bin ''; diff --git a/pkgs/applications/misc/libosmocore/default.nix b/pkgs/applications/misc/libosmocore/default.nix new file mode 100644 index 00000000000..7a0eadf74e5 --- /dev/null +++ b/pkgs/applications/misc/libosmocore/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pcsclite, pkgconfig +}: + +stdenv.mkDerivation rec { + name = "libosmocore-${version}"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "osmocom"; + repo = "libosmocore"; + rev = "8649d57f507d359c99a89654aac7e19ce22db282"; + sha256 = "08mcpy9ljwb1i3l4cmlwn024q2psk5gg9f0ylgh99hy1ffx0n7am"; + }; + + buildInputs = [ + autoreconfHook pcsclite pkgconfig + ]; + + preConfigure = '' + autoreconf -i -f + ''; + + meta = with stdenv.lib; { + description = "libosmocore"; + homepage = https://github.com/osmocom/libosmocore; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mog ]; + }; +} diff --git a/pkgs/applications/misc/lighthouse/default.nix b/pkgs/applications/misc/lighthouse/default.nix index 6bd834846b6..f6bfe61e5aa 100644 --- a/pkgs/applications/misc/lighthouse/default.nix +++ b/pkgs/applications/misc/lighthouse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig -, libX11, libxcb, cairo, gtk, pango, python27, python3 +, libX11, libxcb, cairo, gtk2, pango, python27, python3 }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libX11 libxcb cairo gtk pango python27 python3 + pkgconfig libX11 libxcb cairo gtk2 pango python27 python3 ]; makeFlags = [ "PREFIX=\${out}" ]; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 5b764912f73..e350a9a9530 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,6 +1,8 @@ -{ stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl +{ stdenv, lib, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl , gtk3, openjpeg, jbig2dec, mujs, xsel, openssl, freetype, ncurses }: +assert lib.versionAtLeast (lib.getVersion ocaml) "4.02"; + let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { name = "llpp-${version}"; diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index d9b03fd86e1..9fa112375c5 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -1,38 +1,99 @@ -{ stdenv, fetchurl, pkgconfig, libX11, gdk_pixbuf, cairo, libXft, gtk2, fribidi }: +{ stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem +, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte +, harfbuzz #substituting glyphs with opentype fonts +, fribidi, m17n_lib #bidi and encoding +, openssl, libssh2 #build-in ssh +}: stdenv.mkDerivation rec { name = "mlterm-${version}"; - version = "3.3.8"; + version = "3.7.2"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${name}/${name}.tar.gz"; - sha256 = "088pgxynzxxii7wdmjp2fdkxydirx4k05588zkhlzalkb5l8ji1i"; + sha256 = "1b24w8hfck1ylfkdz9z55vlmsb36q9iyfr0i9q9y98dfk0f0rrw8"; }; - buildInputs = [ pkgconfig libX11 gdk_pixbuf cairo libXft gtk2 fribidi ]; + nativeBuildInputs = [ pkgconfig autoconf ]; + buildInputs = [ + libX11 gdk_pixbuf.dev cairo libXft gtk3 vte + harfbuzz fribidi m17n_lib openssl libssh2 + ]; + #bad configure.ac and Makefile.in everywhere preConfigure = '' - sed -ie 's#-L/usr/local/lib -R/usr/local/lib##g' \ + sed -ie 's;-L/usr/local/lib -R/usr/local/lib;;g' \ xwindow/libtype/Makefile.in \ main/Makefile.in \ - java/Makefile.in \ + tool/mlfc/Makefile.in \ tool/mlimgloader/Makefile.in \ - tool/registobmp/Makefile.in \ - tool/mlconfig/Makefile.in - sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' tool/mlconfig/po/Makefile.in.in + tool/mlconfig/Makefile.in \ + xwindow/libotl/Makefile.in + sed -ie 's;cd ..srcdir. && rm -f ...lang..gmo.*;;g' \ + tool/mlconfig/po/Makefile.in.in + #utmp and mlterm-fb + substituteInPlace configure.in \ + --replace "-m 2755 -g utmp" " " \ + --replace "-m 4755 -o root" " " + substituteInPlace configure \ + --replace "-m 2755 -g utmp" " " \ + --replace "-m 4755 -o root" " " ''; + NIX_LDFLAGS = " + -L${stdenv.cc.cc.lib}/lib + -lX11 -lgdk_pixbuf-2.0 -lcairo -lfontconfig -lfreetype -lXft + -lvte-2.91 -lgtk-3 -lharfbuzz -lfribidi -lm17n + " + stdenv.lib.optionalString (openssl != null) " + -lcrypto + " + stdenv.lib.optionalString (libssh2 != null) " + -lssh2 + "; configureFlags = [ - "--with-imagelib=gdk-pixbuf" + "--with-x=yes" + "--with-gui=xlib,fb" + "--with-imagelib=gdk-pixbuf" #or mlimgloader depending on your bugs of choice "--with-type-engines=cairo,xft,xcore" - "--with-x" - "--enable-ind" + "--with-gtk=3.0" + "--enable-ind" #indic scripts + "--enable-fribidi" #bidi scripts + "--enable-m17nlib" #character encodings + "--with-tools=mlclient,mlconfig,mlcc,mlterm-menu,mlimgloader,registobmp,mlfc" + #mlterm-menu and mlconfig depend on enabling gnome3.at-spi2-core + #and configuring ~/.mlterm/key correctly. + ] ++ stdenv.lib.optional (libssh2 == null) [ + "--disable-ssh2" ]; + postInstall = '' + mkdir -p "$out/share/icons/hicolor/scalable/apps" + cp contrib/icon/mlterm-icon.svg "$out/share/icons/hicolor/scalable/apps/mlterm.svg" + + mkdir -p "$out/share/icons/hicolor/48x48/apps" + cp contrib/icon/mlterm-icon-gnome2.png "$out/share/icons/hicolor/48x48/apps/mlterm.png" + + mkdir -p "$out/share/applications" + cp $desktopItem/share/applications/* $out/share/applications + ''; + + desktopItem = makeDesktopItem rec { + name = "mlterm"; + exec = "mlterm %U"; + icon = "mlterm"; + type = "Application"; + comment = "Terminal emulator"; + desktopName = "mlterm"; + genericName = "Terminal emulator"; + categories = stdenv.lib.concatStringsSep ";" [ + "Application" "System" "TerminalEmulator" + ]; + startupNotify = "false"; + }; + meta = with stdenv.lib; { homepage = https://sourceforge.net/projects/mlterm/; license = licenses.bsd2; - maintainers = [ maintainers.vrthra ]; + maintainers = with maintainers; [ vrthra ramkromberg ]; platforms = with platforms; linux; }; } diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index ccdb47c4b60..336b136c56d 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; goPackagePath = "github.com/michaeldv/mop"; - goDeps = ./deps.json; + goDeps = ./deps.nix; preConfigure = '' for i in $(find . -type f);do diff --git a/pkgs/applications/misc/mop/deps.json b/pkgs/applications/misc/mop/deps.json deleted file mode 100644 index d2c59589dc2..00000000000 --- a/pkgs/applications/misc/mop/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/nsf/termbox-go", - "fetch": { - "type": "git", - "url": "https://github.com/nsf/termbox-go", - "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b", - "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh" - } - } -] diff --git a/pkgs/applications/misc/mop/deps.nix b/pkgs/applications/misc/mop/deps.nix new file mode 100644 index 00000000000..4081cd1ddaa --- /dev/null +++ b/pkgs/applications/misc/mop/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } +] diff --git a/pkgs/applications/misc/multisync/default.nix b/pkgs/applications/misc/multisync/default.nix index fc55b275dd0..5c00bddd9d2 100644 --- a/pkgs/applications/misc/multisync/default.nix +++ b/pkgs/applications/misc/multisync/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig +{ stdenv, fetchurl, gtk2, glib, ORBit2, libbonobo, libtool, pkgconfig , libgnomeui, GConf, automake, autoconf }: stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf + [ gtk2 glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf automake autoconf ]; diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index d52f88ad553..e1926ce386f 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -18,15 +18,19 @@ stdenv.mkDerivation rec { url = "http://git.ghostscript.com/?p=mupdf.git;a=commitdiff_plain;h=39b0f07dd960f34e7e6bf230ffc3d87c41ef0f2e;hp=fa1936405b6a84e5c9bb440912c23d532772f958"; sha256 = "1g9fkd1f5rx1z043vr9dj4934qf7i4nkvbwjc61my9azjrrc3jv7"; }) + (fetchpatch { + name = "mupdf-696941-fix-use-after-free.patch"; + url = "http://git.ghostscript.com/?p=mupdf.git;a=patch;h=fa1936405b6a84e5c9bb440912c23d532772f958"; + sha256 = "02j9b6my1h3rb0sz9yp6gi7c4ldi3mz0z9s5i8g9cl0arxyzys5h"; + }) # Compatibility with new openjpeg (fetchpatch { - name = "mupdf-1.5-openjpeg-2.1.0.patch"; - url = "https://git.archlinux.org/svntogit/community.git/plain/trunk/mupdf-1.5-openjpeg-2.1.0.patch?h=packages/mupdf&id=ca5e3ef6c7788ccfb6011d785078bc47762f19e5"; - sha256 = "0f18793q9fd22h3lclm8wahvc8az4v08an6lzy8mczrkl8mcgm3k"; + name = "mupdf-1.9a-openjpeg-2.1.1.patch"; + url = "https://git.archlinux.org/svntogit/community.git/plain/mupdf/trunk/0001-mupdf-openjpeg.patch?id=9083dac2a398bfe694d31a0c6a0a839c5a756e53"; + sha256 = "14ndgy3w1sl25km9bcc2zfcxrcihqjw1sdzkpcw5g1mi7gcgxp3g"; }) ]; - NIX_CFLAGS_COMPILE= [ "-fPIC" ]; makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ zlib libX11 libXcursor libXext harfbuzz mesa libXrandr libXinerama freetype libjpeg jbig2dec openjpeg ]; @@ -78,7 +82,7 @@ stdenv.mkDerivation rec { repositories.git = git://git.ghostscript.com/mupdf.git; description = "Lightweight PDF viewer and toolkit written in portable C"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ viric vrthra ]; + maintainers = with maintainers; [ viric vrthra fpletz ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 775d344643e..fbb10bc9ceb 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -1,32 +1,72 @@ -{ stdenv, fetchurl, makeWrapper, autoreconfHook, boost, file -, glib, glibc, libgnome_keyring, gnome_keyring, gtk, gtkmm, intltool -, libctemplate, libglade -, libiodbc -, libgnome, libsigcxx, libuuid, libxml2, libzip, lua, mesa, mysql -, pango, pcre, pkgconfig, sqlite, sudo -, pythonPackages +{ stdenv, fetchurl, makeWrapper, cmake, pkgconfig +, glibc, gnome_keyring, gtk, gtkmm, pcre, swig, sudo +, mysql, libxml2, libctemplate, libmysqlconnectorcpp +, vsqlite, tinyxml, gdal, libiodbc, libpthreadstubs +, libXdmcp, libuuid, libzip, libgnome_keyring, file +, pythonPackages, jre, autoconf, automake, libtool +, boost, glibmm, libsigcxx, pangomm, libX11, openssl +, proj, cairo, libglade }: let inherit (pythonPackages) pexpect pycrypto python paramiko; in stdenv.mkDerivation rec { pname = "mysql-workbench"; - version = "5.2.47"; + version = "6.3.7"; name = "${pname}-${version}"; src = fetchurl { - url = "http://mirror.cogentco.com/pub/mysql/MySQLGUITools/mysql-workbench-gpl-${version}-src.tar.gz"; - sha256 = "1343fn3msdxqfpxw0kgm0mdx5r7g9ra1cpc8p2xhl7kz2pmqp4p6"; + url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; + sha256 = "1v4k04facdn2qzflf0clf3ir5hghqlabq89ssm2s4x1nqdniz544"; }; - buildInputs = [ autoreconfHook boost file glib glibc libgnome_keyring gtk gtkmm intltool - libctemplate libglade libgnome libiodbc libsigcxx libuuid libxml2 libzip lua makeWrapper mesa - mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ]; + buildInputs = [ cmake pkgconfig glibc gnome_keyring gtk gtk.dev gtkmm pcre swig python sudo + paramiko mysql libxml2 libctemplate libmysqlconnectorcpp vsqlite tinyxml gdal libiodbc file + libpthreadstubs libXdmcp libuuid libzip libgnome_keyring libgnome_keyring.dev jre autoconf + automake libtool boost glibmm glibmm.dev libsigcxx pangomm libX11 pexpect pycrypto openssl + proj cairo cairo.dev makeWrapper libglade ] ; + + prePatch = '' + for f in backend/wbpublic/{grt/spatial_handler.h,grtui/geom_draw_box.h,objimpl/db.query/db_query_Resultset.cpp} ; + do + sed -i 's@#include ext/antlr-runtime/fix-configure + #!${stdenv.shell} + echo "fixing bundled antlr3c configure" ; + sed -i 's@/usr/bin/file@${file}/bin/file@' configure + sed -i '12121d' configure + EOF + chmod +x ext/antlr-runtime/fix-configure + sed -i '236s@&&@& ''${PROJECT_SOURCE_DIR}/ext/antlr-runtime/fix-configure &@' CMakeLists.txt - preConfigure = '' substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv" + substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "/usr/lib/x86_64-linux-gnu" "${proj}/lib" + patchShebangs $(pwd)/library/mysql.parser/grammar/build-parser + patchShebangs $(pwd)/tools/get_wb_version.sh ''; + NIX_CFLAGS_COMPILE = [ + "-I${libsigcxx}/lib/sigc++-2.0/include" + "-I${pangomm}/lib/pangomm-1.4/include" + "-I${glibmm}/lib/giomm-2.4/include" + ]; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++11" + "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" + "-DCTemplate_INCLUDE_DIR=${libctemplate}/include" + "-DCAIRO_INCLUDE_DIRS=${cairo.dev}/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include" + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${gtk.dev}/include" + "-DGTK2_GTKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gtkmm-2.4/include" + "-DGTK2_GDKMMCONFIG_INCLUDE_DIR=${gtkmm}/lib/gdkmm-2.4/include" + "-DGTK2_GLIBMMCONFIG_INCLUDE_DIR=${glibmm}/lib/glibmm-2.4/include" + ]; + postInstall = '' patchShebangs $out/share/mysql-workbench/extras/build_freetds.sh @@ -52,7 +92,7 @@ in stdenv.mkDerivation rec { # used because we cannot clean up after ourselves due to the exec call. # Start gnome-keyring-daemon, export the environment variables it asks us to set. -for expr in $( gnome-keyring-daemon --components=ssh,pkcs11 --start ) ; do eval "export "$expr ; done +for expr in $( gnome-keyring-daemon --start ) ; do eval "export "$expr ; done # Prepare fifo pipe. FIFOCTL="/tmp/gnome-keyring-daemon-ctl.$$.fifo" diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 53b1106a223..51b29a5c04c 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, gtk, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, +{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ gtk SDL fontconfig freetype imlib2 SDL_image mesa + buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ]; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index b39b73c830f..fa0097272ff 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,6 +1,41 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages, fetchurl }: -pythonPackages.buildPythonApplication rec { +let + + tornado_4_0_1 = pythonPackages.buildPythonPackage rec { + name = "tornado-${version}"; + version = "4.0.1"; + + propagatedBuildInputs = with pythonPackages; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; + + src = fetchurl { + url = "mirror://pypi/t/tornado/${name}.tar.gz"; + sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df"; + }; + }; + + sockjs-tornado = pythonPackages.buildPythonPackage rec { + name = "sockjs-tornado-${version}"; + version = "1.0.2"; + + src = fetchurl { + url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; + sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv"; + }; + + # This is needed for compatibility with OctoPrint + propagatedBuildInputs = [ tornado_4_0_1 ]; + + meta = with stdenv.lib; { + description = "SockJS python server implementation on top of Tornado framework"; + homepage = http://github.com/mrjoes/sockjs-tornado/; + license = licenses.mit; + platforms = platforms.all; + maintainers = with maintainers; [ abbradar ]; + }; + }; + +in pythonPackages.buildPythonApplication rec { name = "OctoPrint-${version}"; version = "1.2.15"; diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix index 9e52c629a24..1985b644884 100644 --- a/pkgs/applications/misc/openbox-menu/default.nix +++ b/pkgs/applications/misc/openbox-menu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, menu-cache }: stdenv.mkDerivation rec { name = "openbox-menu-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l"; }; - buildInputs = [ pkgconfig glib gtk menu-cache ]; + buildInputs = [ pkgconfig glib gtk2 menu-cache ]; patches = [ ./with-svg.patch ]; diff --git a/pkgs/applications/misc/pcmanfm-qt/default.nix b/pkgs/applications/misc/pcmanfm-qt/default.nix deleted file mode 100644 index 5b270f15fb6..00000000000 --- a/pkgs/applications/misc/pcmanfm-qt/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, fetchFromGitHub -, cmake -, pkgconfig -, qt5 -, menu-cache -, libfm -, elementary-icon-theme -}: - -let - version = "0.11.0"; - - buildInputsCommon = [ cmake pkgconfig qt5.qtbase qt5.qttools qt5.qtx11extras menu-cache libfm ]; - - libfm-qt = stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "libfm-qt"; - - src = fetchFromGitHub { - owner = "lxde"; - repo = pname; - rev = version; - sha256 = "0a8rd0m66l6n2jl7fin74byyy69pyc6rgnfkpmkbi6561l903592"; - }; - - buildInputs = buildInputsCommon; - }; - -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - pname = "pcmanfm-qt"; - - src = fetchFromGitHub { - owner = "lxde"; - repo = pname; - rev = version; - sha256 = "139l8m32sqcjmydppbv24iqnfsbl5b4rqmqzdayvlh6haf1ihinn"; - }; - - - buildInputs = buildInputsCommon ++ [ libfm-qt qt5.makeQtWrapper ]; - - postPatch = '' - substituteInPlace pcmanfm/settings.cpp --replace \"elementary\" \"Elementary\" - ''; - - postInstall = '' - wrapQtProgram $out/bin/pcmanfm-qt \ - --prefix XDG_DATA_DIRS : "${elementary-icon-theme}/share" - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/lxde/pcmanfm-qt"; - license = licenses.gpl2Plus; - description = "File manager with QT interface"; - maintainers = with maintainers; [ obadz ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/pcmanfm/default.nix b/pkgs/applications/misc/pcmanfm/default.nix index bf1bed08ed4..e6d96b099fa 100644 --- a/pkgs/applications/misc/pcmanfm/default.nix +++ b/pkgs/applications/misc/pcmanfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, intltool, libfm, libX11, pango, pkgconfig }: +{ stdenv, fetchurl, glib, gtk2, intltool, libfm, libX11, pango, pkgconfig }: stdenv.mkDerivation rec { name = "pcmanfm-1.2.4"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "04z3vd9si24yi4c8calqncdpb9b6mbj4cs4f3fs86i6j05gvpk9q"; }; - buildInputs = [ glib gtk intltool libfm libX11 pango pkgconfig ]; + buildInputs = [ glib gtk2 intltool libfm libX11 pango pkgconfig ]; meta = with stdenv.lib; { homepage = "http://blog.lxde.org/?cat=28/"; diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix index 0978da3512b..919935a41ee 100644 --- a/pkgs/applications/misc/pdfmod/default.nix +++ b/pkgs/applications/misc/pdfmod/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnome_doc_utils, intltool, lib -, mono, gtk-sharp, gnome-sharp, hyena +, mono, gtk-sharp-2_0, gnome-sharp, hyena , which, makeWrapper, glib, gnome3, poppler, wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; buildInputs = [ - pkgconfig gnome_doc_utils intltool mono gtk-sharp gnome-sharp + pkgconfig gnome_doc_utils intltool mono gtk-sharp-2_0 gnome-sharp hyena which makeWrapper wrapGAppsHook ]; @@ -31,9 +31,9 @@ stdenv.mkDerivation rec { postInstall = '' makeWrapper "${mono}/bin/mono" "$out/bin/pdfmod" \ --add-flags "$out/lib/pdfmod/PdfMod.exe" \ - --prefix MONO_GAC_PREFIX : ${gtk-sharp} \ + --prefix MONO_GAC_PREFIX : ${gtk-sharp-2_0} \ --prefix MONO_GAC_PREFIX : ${gnome-sharp} \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp gtk-sharp.gtk poppler ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ glib gnome-sharp gnome3.gconf gtk-sharp-2_0 gtk-sharp-2_0.gtk poppler ]} ''; dontStrip = true; diff --git a/pkgs/applications/misc/pmenu/default.nix b/pkgs/applications/misc/pmenu/default.nix index 4798ae5a024..9b376684284 100644 --- a/pkgs/applications/misc/pmenu/default.nix +++ b/pkgs/applications/misc/pmenu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, pythonPackages, gnome }: +{ stdenv, fetchFromGitLab, pythonPackages, gnome2 }: stdenv.mkDerivation rec { name = "pmenu-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pythonPackages.wrapPython ]; - buildInputs = [ pythonPackages.pygtk gnome.gnome_menus ]; + buildInputs = [ pythonPackages.pygtk gnome2.gnome_menus ]; pythonPath = [ pythonPackages.pygtk ]; diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index cca8d05ea5c..eee2dffb0e1 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchzip, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }: +{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }: stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "1.1.3"; + version = "1.1.4"; - src = fetchzip { - url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz"; - sha256 = "114rqvd2jl98c75zmhdwfmp44kxa4v459naiivb4w020d60ziq7l"; + src = fetchFromGitHub { + owner = "IJHack"; + repo = "QtPass"; + rev = "v${version}"; + sha256 = "0jxb15jn6vv54wb2z52wv9b2mq38xff8akyzwj5xx2332bc9xra2"; }; buildInputs = [ git gnupg pass qtbase qtsvg qttools ]; diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix index 7969695f1ad..0a32fdf748e 100644 --- a/pkgs/applications/misc/ranger/default.nix +++ b/pkgs/applications/misc/ranger/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, python, w3m, file }: +{ stdenv, fetchurl, pythonPackages, w3m, file, less }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "ranger-1.7.2"; meta = { @@ -15,11 +15,13 @@ buildPythonApplication rec { sha256 = "0yaviybviwdvfg2a0pf2kk28g10k245499xmbpqlai7fv91f7xll"; }; - propagatedBuildInputs = [ python.modules.curses file ]; + propagatedBuildInputs = [ pythonPackages.python.modules.curses file ]; preConfigure = '' substituteInPlace ranger/ext/img_display.py \ --replace /usr/lib/w3m ${w3m}/libexec/w3m + substituteInPlace ranger/__init__.py \ + --replace "DEFAULT_PAGER = 'less'" "DEFAULT_PAGER = '${stdenv.lib.getBin less}/bin/less'" for i in ranger/config/rc.conf doc/config/rc.conf ; do substituteInPlace $i --replace /usr/share $out/share diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix index d4da0fbd314..9d333da01cb 100644 --- a/pkgs/applications/misc/redis-desktop-manager/default.nix +++ b/pkgs/applications/misc/redis-desktop-manager/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { qtquick1 qtquickcontrols qtsvg qttools ]; - configurePhase = "true"; + dontUseQmakeConfigure = true; buildPhase = '' srcdir=$PWD diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index e62deb9a348..3fe0503d7f9 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, gettext, intltool, makeWrapper, pkgconfig , geoclue2 -, guiSupport ? true, hicolor_icon_theme, gtk3, python, pygobject3, pyxdg +, guiSupport ? true, hicolor_icon_theme, librsvg, gtk3, python, pygobject3, pyxdg , drmSupport ? true, libdrm , randrSupport ? true, libxcb , vidModeSupport ? true, libX11, libXxf86vm @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ geoclue2 ] - ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme gtk3 python - pygobject3 pyxdg ] + ++ stdenv.lib.optionals guiSupport [ hicolor_icon_theme librsvg gtk3 + python pygobject3 pyxdg ] ++ stdenv.lib.optionals drmSupport [ libdrm ] ++ stdenv.lib.optionals randrSupport [ libxcb ] ++ stdenv.lib.optionals vidModeSupport [ libX11 libXxf86vm ]; @@ -41,9 +41,9 @@ stdenv.mkDerivation rec { substituteInPlace src/redshift-gtk/redshift-gtk \ --replace "/usr/bin/env python3" "${python}/bin/${python.executable}" ''; - postInstall = stdenv.lib.optionalString guiSupport '' wrapProgram "$out/bin/redshift-gtk" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix PYTHONPATH : "$PYTHONPATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$out/share:${hicolor_icon_theme}/share" diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix index 7cd318681e2..69eda23b143 100644 --- a/pkgs/applications/misc/rxvt_unicode/default.nix +++ b/pkgs/applications/misc/rxvt_unicode/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (rec { meta = { description = "A clone of the well-known terminal emulator rxvt"; homepage = "http://software.schmorp.de/pkg/rxvt-unicode.html"; + downloadPage = "http://dist.schmorp.de/rxvt-unicode/Attic/"; maintainers = [ stdenv.lib.maintainers.mornfall ]; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix new file mode 100644 index 00000000000..29d7067e235 --- /dev/null +++ b/pkgs/applications/misc/styx/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, caddy, asciidoctor }: + +stdenv.mkDerivation rec { + name = "styx-${version}"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "styx-static"; + repo = "styx"; + rev = "v${version}"; + sha256 = "1bcd0ss628mhchrl85fy6acxcxqvm1d3qywfaxhikahl1r7inpwg"; + }; + + server = caddy.bin; + + nativeBuildInputs = [ asciidoctor ]; + + setSourceRoot = "cd styx-*/src; export sourceRoot=`pwd`"; + + installPhase = '' + mkdir $out + install -D -m 777 $sourceRoot/styx.sh $out/bin/styx + + mkdir -p $out/share/styx + cp -r $sourceRoot/sample $out/share/styx + + mkdir -p $out/share/doc/styx + asciidoctor $sourceRoot/doc/manual.doc -o $out/share/doc/styx/index.html + + substituteAllInPlace $out/bin/styx + substituteAllInPlace $out/share/doc/styx/index.html + ''; + + meta = with stdenv.lib; { + description = "Nix based static site generator"; + maintainers = with maintainers; [ ericsagnes ]; + homepage = https://styx-static.github.io/styx-site/; + downloadPage = https://github.com/styx-static/styx/; + platforms = platforms.all; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index 1a42d9a90e6..584b8f6a296 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gettext, gtk, gconf +{ fetchurl, stdenv, pkgconfig, gettext, gtk2, gconf , curl, libexif, sqlite, libxml2 }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "15q2kkrv4mfsivfdzjgpxr7s2amw7d501q2ayjl3ff4vmvfn5516"; }; - buildInputs = [ pkgconfig gettext gtk gconf curl libexif sqlite libxml2 ]; + buildInputs = [ pkgconfig gettext gtk2 gconf curl libexif sqlite libxml2 ]; # bogus includes fail with newer library version postPatch = '' diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix index 9283469fcc3..333ed411941 100644 --- a/pkgs/applications/misc/tasksh/default.nix +++ b/pkgs/applications/misc/tasksh/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "tasksh-${version}"; - version = "1.0.0"; + version = "1.1.0"; enableParallelBuilding = true; src = fetchurl { - url = "http://taskwarrior.org/download/tasksh-latest.tar.gz"; - sha256 = "0ll6pwhw4wsdffacsmpq46fqh084p9mdaa777giqbag3b8gwik4s"; + url = "http://taskwarrior.org/download/${name}.tar.gz"; + sha256 = "0900nzfgvhcc106pl68d0v0qszvdc34yi59mw70b34b2gmkwdxzf"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index 7ca5f962403..29befb7f25a 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,8 +1,6 @@ -{ stdenv, fetchurl, python, pygtk, notify, keybinder, vte, gettext, intltool -, makeWrapper -}: +{ stdenv, fetchurl, pythonPackages, keybinder, vte, gettext, intltool }: -stdenv.mkDerivation rec { +pythonPackages.buildPythonApplication rec { name = "terminator-${version}"; version = "0.98"; @@ -11,18 +9,11 @@ stdenv.mkDerivation rec { sha256 = "1h965z06dsfk38byyhnsrscd9r91qm92ggwgjrh7xminzsgqqv8a"; }; - buildInputs = [ - python pygtk notify keybinder vte gettext intltool makeWrapper - ]; + propagatedBuildInputs = with pythonPackages; [ pygtk notify keybinder vte gettext intltool ]; - installPhase = '' - python setup.py --without-icon-cache install --prefix="$out" + #setupPyBuildFlags = [ "--without-icon-cache" ]; - for file in "$out"/bin/*; do - wrapProgram "$file" \ - --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH" - done - ''; + doCheck = false; meta = with stdenv.lib; { description = "Terminal emulator with support for tiling and tabs"; diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 33c42e3dc1d..837d736d10d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper +{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses, makeWrapper, symlinkJoin , configFile ? null }: let - version = "11"; + version = "12"; termite = stdenv.mkDerivation { name = "termite-${version}"; src = fetchgit { url = "https://github.com/thestinger/termite"; rev = "refs/tags/v${version}"; - sha256 = "1cw4yw7n9m2si8b7zcfyz9pyihncabxm5g39v1mxslfajxgwzmd8"; + sha256 = "0s6dyg3vcqk5qcx90bs24wdnd3p56rdjdcanx4pcxvp6ksjl61jz"; }; postPatch = "sed '1i#include ' -i termite.cc"; @@ -37,13 +37,13 @@ let platforms = platforms.all; }; }; -in if configFile == null then termite else stdenv.mkDerivation { +in if configFile == null then termite else symlinkJoin { name = "termite-with-config-${version}"; + paths = [ termite ]; nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' - mkdir -p $out/etc/xdg/termite/ $out/bin - ln -s ${termite}/bin/termite $out/bin/termite - wrapProgram $out/bin/termite --add-flags "--config ${configFile}" + postBuild = '' + wrapProgram $out/bin/termite \ + --add-flags "--config ${configFile}" ''; passthru.terminfo = termite.terminfo; } diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix index 40810adbbdc..f72f4fdc567 100644 --- a/pkgs/applications/misc/tint2/default.nix +++ b/pkgs/applications/misc/tint2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, pkgconfig, cmake, gettext, cairo, pango, pcre -, glib , imlib2, gtk, libXinerama , libXrender, libXcomposite, libXdamage +, glib , imlib2, gtk2, libXinerama , libXrender, libXcomposite, libXdamage , libX11 , libXrandr, librsvg, libpthreadstubs , libXdmcp , libstartup_notification , hicolor_icon_theme, wrapGAppsHook }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake gettext wrapGAppsHook ]; - buildInputs = [ cairo pango pcre glib imlib2 gtk libXinerama libXrender + buildInputs = [ cairo pango pcre glib imlib2 gtk2 libXinerama libXrender libXcomposite libXdamage libX11 libXrandr librsvg libpthreadstubs libXdmcp libstartup_notification hicolor_icon_theme ]; diff --git a/pkgs/applications/misc/udiskie/default.nix b/pkgs/applications/misc/udiskie/default.nix new file mode 100644 index 00000000000..6a326dba39c --- /dev/null +++ b/pkgs/applications/misc/udiskie/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, asciidoc-full, gettext +, gobjectIntrospection, gtk3, hicolor_icon_theme, libnotify, librsvg +, pythonPackages, udisks2, wrapGAppsHook }: + +pythonPackages.buildPythonApplication rec { + name = "udiskie-${version}"; + version = "1.5.1"; + + src = fetchFromGitHub { + owner = "coldfix"; + repo = "udiskie"; + rev = version; + sha256 = "01x5fvllb262x6r3547l23z7p6hr7ddz034bkhmj2cqmf83sxwxd"; + }; + + buildInputs = [ + asciidoc-full # For building man page. + hicolor_icon_theme + wrapGAppsHook + librsvg # required for loading svg icons (udiskie uses svg icons) + ]; + + propagatedBuildInputs = [ + gettext gobjectIntrospection gtk3 libnotify pythonPackages.docopt + pythonPackages.pygobject3 pythonPackages.pyyaml udisks2 + ]; + + postBuild = "make -C doc"; + + postInstall = '' + mkdir -p $out/share/man/man8 + cp -v doc/udiskie.8 $out/share/man/man8/ + ''; + + # tests require dbusmock + doCheck = false; + + meta = with stdenv.lib; { + description = "Removable disk automounter for udisks"; + license = licenses.mit; + homepage = https://github.com/coldfix/udiskie; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/misc/vifm/default.nix b/pkgs/applications/misc/vifm/default.nix index 2e8f747e724..00e1d10df10 100644 --- a/pkgs/applications/misc/vifm/default.nix +++ b/pkgs/applications/misc/vifm/default.nix @@ -21,12 +21,10 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin garbas ]; platforms = platforms.linux; license = licenses.gpl2; - }; - - passthru = { - updateInfo = { - downloadPage = "http://vifm.sf.net"; - }; + downloadPage = "http://vifm.info/downloads.shtml"; + homepage = "http://vifm.info/"; + inherit version; + updateWalker = true; }; } diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 50749681f2c..1e7c7f654b5 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk, expat, curl +{ fetchurl, stdenv, makeWrapper, pkgconfig, intltool, gettext, gtk2, expat, curl , gpsd, bc, file, gnome_doc_utils, libexif, libxml2, libxslt, scrollkeeper , docbook_xml_dtd_412, gexiv2, sqlite, gpsbabel, expect }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09kq0sxs2czps0d6xzgkkp41746v44ip63m72qvfs7rsrnqj7qnz"; }; - buildInputs = [ makeWrapper pkgconfig intltool gettext gtk expat curl gpsd bc file gnome_doc_utils + buildInputs = [ makeWrapper pkgconfig intltool gettext gtk2 expat curl gpsd bc file gnome_doc_utils libexif libxml2 libxslt scrollkeeper docbook_xml_dtd_412 gexiv2 sqlite ]; diff --git a/pkgs/applications/misc/webthree-umbrella/default.nix b/pkgs/applications/misc/webthree-umbrella/default.nix deleted file mode 100644 index 6ada451edf1..00000000000 --- a/pkgs/applications/misc/webthree-umbrella/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ stdenv -, fetchgit -, cmake -, boost -, gmp -, jsoncpp -, leveldb -, cryptopp -, libcpuid -, miniupnpc -, libjson_rpc_cpp -, curl -, libmicrohttpd -, mesa - -, withOpenCL ? false -, opencl-headers ? null -, ocl-icd ? null - -, withGUI ? false -, qtwebengine ? null -, qtbase ? null -, qtdeclarative ? null - -, withProfiling ? false -, gperftools ? null - -, withEVMJIT ? false -, llvm ? null -, zlib ? null -, ncurses ? null - -, extraCmakeFlags ? [] -}: - -assert withOpenCL -> (opencl-headers != null) && (ocl-icd != null); -assert withGUI -> (qtwebengine != null) && (qtbase != null) && (qtdeclarative != null); -assert withProfiling -> (gperftools != null); -assert withEVMJIT -> (llvm != null) && (zlib != null) && (ncurses != null); - -stdenv.mkDerivation rec { - name = "cpp-ethereum-${version}"; - version = "1.2.9"; - - src = fetchgit { - url = https://github.com/ethereum/webthree-umbrella.git; - rev = "850479b159a0bfa316fd261ab96b0a043acd766c"; - sha256 = "0k8w8gqzy71x77p0p85r38gfdnzrlzk2yvb3ablml9ppg4qb4ch5"; - }; - - cmakeFlags = with stdenv.lib; concatStringsSep " " (flatten [ - "-DCMAKE_BUILD_TYPE=Release" - "-DGUI=${toString withGUI}" - "-DETHASHCL=${toString withOpenCL}" - "-DPROFILING=${toString withProfiling}" - "-DEVMJIT=${toString withEVMJIT}" - (optional withOpenCL [ - "-DCMAKE_INCLUDE_PATH=${opencl-headers}/include" - "-DCMAKE_LIBRARY_PATH=${ocl-icd}/lib" - ]) - (optional withEVMJIT "-DCMAKE_PREFIX_PATH=${llvm}") - extraCmakeFlags - ]); - - configurePhase = '' - export BOOST_INCLUDEDIR=${boost.dev}/include - export BOOST_LIBRARYDIR=${boost.out}/lib - - mkdir -p Build/Install - pushd Build - - cmake .. -DCMAKE_INSTALL_PREFIX=$(pwd)/Install $cmakeFlags - ''; - - buildInputs = with stdenv.lib; [ - cmake - boost - gmp - jsoncpp - leveldb - cryptopp - libcpuid - miniupnpc - libjson_rpc_cpp - curl - libmicrohttpd - mesa - (optional withOpenCL [ - opencl-headers - ocl-icd - ]) - (optional withGUI [ - qtwebengine - qtbase - qtdeclarative - ]) - (optional withProfiling gperftools) - (optional withEVMJIT [ - llvm - zlib - ncurses - ]) - ]; - - runPath = with stdenv.lib; (makeLibraryPath (flatten [ stdenv.cc.cc buildInputs ])); - - installPhase = '' - make install - - mkdir -p $out - - for f in Install/lib/*.so* $(find Install/bin -executable -type f); do - patchelf --set-rpath $runPath:$out/lib $f - done - - cp -r Install/* $out - ''; - - dontStrip = true; - - meta = with stdenv.lib; { - decription = "Umbrella project for the Ethereum C++ implementation"; - homepage = https://github.com/ethereum/webthree-umbrella.git; - license = licenses.gpl3; - maintainers = with maintainers; [ artuuge ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 5918f3ef378..e59a3e98943 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/misc/wego/deps.json b/pkgs/applications/misc/wego/deps.json deleted file mode 100644 index 5bfb64ffbc5..00000000000 --- a/pkgs/applications/misc/wego/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/mattn/go-colorable", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-colorable", - "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe", - "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6" - } - }, - { - "goPackagePath": "github.com/schachmat/ingo", - "fetch": { - "type": "git", - "url": "https://github.com/schachmat/ingo", - "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38", - "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb" - } - } -] diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix new file mode 100644 index 00000000000..408b3908d8f --- /dev/null +++ b/pkgs/applications/misc/wego/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; + sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + }; + } + { + goPackagePath = "github.com/schachmat/ingo"; + fetch = { + type = "git"; + url = "https://github.com/schachmat/ingo"; + rev = "fab41e4e62cbef5d92998746ec25f7e195100f38"; + sha256 = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"; + }; + } +] diff --git a/pkgs/applications/misc/workrave/default.nix b/pkgs/applications/misc/workrave/default.nix index e9e34518932..8c554da0362 100644 --- a/pkgs/applications/misc/workrave/default.nix +++ b/pkgs/applications/misc/workrave/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch , autoconf, automake, gettext, intltool, libtool, pkgconfig , libICE, libSM, libXScrnSaver, libXtst, cheetah -, glib, glibmm, gtk, gtkmm, atk, pango, pangomm, cairo, cairomm +, glib, glibmm, gtkmm2, atk, pango, pangomm, cairo, cairomm , dbus, dbus_glib, GConf, gconfmm, gdome2, gstreamer, libsigcxx }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ libICE libSM libXScrnSaver libXtst cheetah - glib glibmm gtk gtkmm atk pango pangomm cairo cairomm + glib glibmm gtkmm2 atk pango pangomm cairo cairomm dbus dbus_glib GConf gconfmm gdome2 gstreamer libsigcxx ]; diff --git a/pkgs/applications/misc/xautoclick/default.nix b/pkgs/applications/misc/xautoclick/default.nix index 1a71a2756d1..32daf108c1c 100644 --- a/pkgs/applications/misc/xautoclick/default.nix +++ b/pkgs/applications/misc/xautoclick/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xorg, pkgconfig -, gtkSupport ? true, gtk +, gtkSupport ? true, gtk2 , qtSupport ? true, qt4 }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0h522f12a7v2b89411xm51iwixmjp2mp90rnizjgiakx9ajnmqnm"; }; buildInputs = [ xorg.libX11 xorg.libXtst xorg.xinput xorg.libXi xorg.libXext pkgconfig ] - ++ stdenv.lib.optionals gtkSupport [ gtk ] + ++ stdenv.lib.optionals gtkSupport [ gtk2 ] ++ stdenv.lib.optionals qtSupport [ qt4 ]; patchPhase = '' substituteInPlace configure --replace /usr/X11R6 ${xorg.libX11.dev} diff --git a/pkgs/applications/misc/xmind/default.nix b/pkgs/applications/misc/xmind/default.nix new file mode 100644 index 00000000000..a578c53f0e7 --- /dev/null +++ b/pkgs/applications/misc/xmind/default.nix @@ -0,0 +1,63 @@ +{ stdenv, lib, dpkg, fetchurl, gtk2, jre, libXtst, makeWrapper }: + +stdenv.mkDerivation rec { + name = "xmind-${version}"; + version = "7.5-update1"; + + src = if stdenv.system == "i686-linux" then fetchurl { + url = "http://dl2.xmind.net/xmind-downloads/${name}-linux_i386.deb"; + sha256 = "04kr6pw0kwy715bp9wcnqnw1k5wl65xa87lhljrskm291p402jy1"; + } else if stdenv.system == "x86_64-linux" then fetchurl { + url = "http://dl2.xmind.net/xmind-downloads/${name}-linux_amd64.deb"; + sha256 = "1j2ynhk7p3m3vd6c4mjwpnlzqgfj5c4q3zydab3nfwncwx6gaqj9"; + } else throw "platform ${stdenv.system} not supported!"; + + nativeBuildInputs = [ dpkg makeWrapper ]; + + unpackCmd = "mkdir root ; dpkg-deb -x $curSrc root"; + + dontBuild = true; + dontPatchELF = true; + dontStrip = true; + + libPath = lib.makeLibraryPath [ gtk2 libXtst ]; + + installPhase = '' + mkdir -p $out + cp -r usr/lib/xmind $out/libexec + cp -r usr/bin usr/share $out + rm $out/libexec/XMind.ini + mv etc/XMind.ini $out/libexec + + patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + $out/libexec/XMind + + wrapProgram $out/libexec/XMind \ + --prefix LD_LIBRARY_PATH : "${libPath}" + + substituteInPlace "$out/bin/XMind" \ + --replace '/usr/lib/xmind' "$out/libexec" + + ln -s ${jre} $out/libexec/jre + ''; + + meta = with stdenv.lib; { + description = "Mind-mapping software"; + longDescription = '' + XMind is a mind mapping and brainstorming software. In addition + to the management elements, the software can capture ideas, + clarify thinking, manage complex information, and promote team + collaboration for higher productivity. + + It supports mind maps, fishbone diagrams, tree diagrams, + organization charts, spreadsheets, etc. Normally, it is used for + knowledge management, meeting minutes, task management, and + GTD. Meanwhile, XMind can read FreeMind and MindManager files, + and save to Evernote. + ''; + homepage = http://www.xmind.net/; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ michalrus ]; + }; +} diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix index 8e3165b75d2..ca0d7775ece 100644 --- a/pkgs/applications/misc/xneur/default.nix +++ b/pkgs/applications/misc/xneur/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, xorg, pcre, gstreamer, glib, libxml2 -, aspell, cairo, imlib2, xosd, libnotify, gtk, pango, atk, enchant, +, aspell, cairo, imlib2, xosd, libnotify, gtk2, pango, atk, enchant, gdk_pixbuf}: let s = import ./src-for-default.nix; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 pkgconfig pcre gstreamer glib libxml2 aspell cairo xorg.libXpm imlib2 xosd xorg.libXt xorg.libXext xorg.libXi libnotify - gtk pango enchant gdk_pixbuf + gtk2 pango enchant gdk_pixbuf ]; preConfigure = '' @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.dev}/include/gtk-2.0" + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk2.out}/lib/gtk-2.0/include" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0" export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 8131ad29060..c0e26af4274 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -11,7 +11,7 @@ , nspr, systemd, kerberos , utillinux, alsaLib , bison, gperf -, glib, gtk, dbus_glib +, glib, gtk2, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage, cups @@ -116,7 +116,7 @@ let nspr nss systemd utillinux alsaLib bison gperf kerberos - glib gtk dbus_glib + glib gtk2 dbus_glib libXScrnSaver libXcursor libXtst mesa pciutils protobuf speechd libXdamage pythonPackages.gyp pythonPackages.ply pythonPackages.jinja2 diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 973669f87cd..7402a8bae29 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -5,7 +5,7 @@ , enableSELinux ? false , enableNaCl ? false , enableHotwording ? false -, gnomeSupport ? false +, gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false @@ -22,7 +22,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix { - inherit enableSELinux enableNaCl enableHotwording gnomeSupport + inherit enableSELinux enableNaCl enableHotwording gnomeSupport gnome gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport hiDPISupport; }; diff --git a/pkgs/applications/networking/browsers/chromium/update.nix b/pkgs/applications/networking/browsers/chromium/update.nix index bd7e256bfa9..23f06569fa9 100644 --- a/pkgs/applications/networking/browsers/chromium/update.nix +++ b/pkgs/applications/networking/browsers/chromium/update.nix @@ -157,9 +157,7 @@ in rec { fi ''; - impureEnvVars = [ - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - ]; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; }; in { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 5645f02d8fe..dfac55a18b6 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 = "1w7h24jblbpvg49iap1cpsd0gwal1p7m7i2yqw12rcn0hqz4hc31"; - sha256bin64 = "006pksc1ibdqcshsal55ps4qizj706zh1jrph6152znafl5hjb7i"; - version = "53.0.2785.92"; + sha256 = "0f6cqvhlg06lrf4bzaiwzm9yi3fi1dk5jrzvjcg7alw3mzrmh2wv"; + sha256bin64 = "02cv9vc1l2nlwa4a0lc7cj9c9czrwp1jd8d024bq16a5fvmhl01l"; + version = "54.0.2840.50"; }; dev = { - sha256 = "1n6cq9fani9cl4qxx82iaiv40n4d6y5ns9mk63na1m5pdcjbaqhw"; - sha256bin64 = "0iypx2p7xqc03i5mc85ilf162gdpn4x2vkb1kgzhlzhq8nvq0y9d"; - version = "54.0.2840.8"; + sha256 = "06kcymwi0wfir7w10g8viayk2h0b5a66dav76mlia4lm30p502kz"; + sha256bin64 = "0mgamiffnnkaw8c68b5kyna84x7hlhrzmqfc36kzf434fmm8v5d6"; + version = "55.0.2873.0"; }; stable = { - sha256 = "1w7h24jblbpvg49iap1cpsd0gwal1p7m7i2yqw12rcn0hqz4hc31"; - sha256bin64 = "0nma1h5npx6vp5fww50xdznadq7yf5604w02w8h5mq3an4pn4g1j"; - version = "53.0.2785.92"; + sha256 = "1hyw0z7dsfaxyy8b4mvnfjy5yj0160hzz9m0wj3vn9zvkfvmhan5"; + sha256bin64 = "0n0px7yi94gdxq7p6pjqfdz04bnh3mcvbaccjaglj6h5p0jc8abq"; + version = "53.0.2785.143"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d782f4a7b53..7a87b1df386 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -2,6 +2,7 @@ , alsaLib , atk , cairo +, curl , cups , dbus_glib , dbus_libs @@ -25,7 +26,7 @@ , libXinerama , libXrender , libXt -, libcanberra +, libcanberra_gtk2 , libgnome , libgnomeui , defaultIconTheme @@ -75,6 +76,7 @@ stdenv.mkDerivation { alsaLib atk cairo + curl cups dbus_glib dbus_libs @@ -98,7 +100,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra + libcanberra_gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix index b4e683372e1..057468d7fd6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix @@ -4,189 +4,189 @@ # ruby generate_sources.rb 46.0.1 > sources.nix { - version = "48.0.2"; + version = "49.0"; sources = [ - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ach/firefox-48.0.2.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "2e06c639284e5258e9bba9f02f3d21df6a3a37e3dc55667b2836e9eb68ad5ab24ccd99f82714da14231b5c6a301a40acaf9763ca19b920bb4f6acf535dc753b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ach/firefox-48.0.2.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "d0777aa0a5128f9ea0b0929781a7d86ad81e72bc8c204e8f026d37bac120d0e210b0a0c8ed42aabd378f96fe52237a103ea25c773b49ea814d06862e770e3180"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/af/firefox-48.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "81cddaae3ab0ac26b3cb5faefddfb088addea7f5d112a317d5c56c16cdae2801539e7c9c4fd9d77a14ad77db7a96a75767d5c08b3858455b801adab8a997da02"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/af/firefox-48.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "5020fda908bcc8b3bb937c5ea4f5a78e74cf836488937f3c4c6f6533a57d5e086e88a85fefac3983407254e3f9a9e2a0b03167095ba9b6e30e69b7381dfe756f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/an/firefox-48.0.2.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "a47b6bd64f1e654ed9041035c36ddda60cedaf634327fd005f9610390a53433da21f12fbe4a3225d756755544a01b9fea463965c47c08145103b357e5b1071b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/an/firefox-48.0.2.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "31d116e6e1950ae3e93ad0ac744967f00699a04f3df89f9e0e4a2cea62e2a9675f7499ca41fcc2acbb91a72cbe3cd74f057dc25a6db947b1b5448fb0d92decdb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ar/firefox-48.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "bb9acd986a258cdc8c368aa1375cee500bf45be31821220c90d562bcc3d526bafc5362c91d4dbd7a003955adc9f26adfe8d62403cf3b9004b82f3880a5b58db7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ar/firefox-48.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "dc4ae811b19887c8f039b046ec2d48d4aaf628f7869e471c97b637e5daaa0e0b0b96fa327ab3b2ba3a184ffbf91213f4cb619d2d2a396b22849782ac41f7f31b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/as/firefox-48.0.2.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "d9dd79d56912bc65e4993214ff58f7dc725077a62e391495acb6aa4b50c371d1c843811e5c511408dc3b343df0056bf33efc1e8f16177f4549ee49fe7b22ccdb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/as/firefox-48.0.2.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "f8278a0141814f2b0e1ac4bb0e94e6d566e97943fabfd7561e249de6a2da9650edfc42456e503ed2473d7df65b4f1949d5fe423b79f9519d59a1ece121361029"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ast/firefox-48.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "e1aca0b09d6c7ef78eff26e88d817a203ffc142f9be998ba08be74dce67da8ae4c728853c6f6f19a4b18fb439ed01fab556718a4f991a206bf5cc069232665a4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ast/firefox-48.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "53ab2cc04741152f11fd4f7ad70eec7f927c7aa70997cf9d3069736a13bafa3b26dcabe610cb5dc10243a1b6b00f22bf9d6bc05afd26d0b7de254f55412c5805"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/az/firefox-48.0.2.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "39649887ca38ed1beb819227d80f5c75b0fbc08c537d6af48755c35a0ecc195127d9cf4c1af05a09b0e9e604144f5e9e00ad57d1cf895cc3f0142b482c98980a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/az/firefox-48.0.2.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "5c75fb1a34fa9fa447f7b279ef57cd0701baeeb95a2dee48b878d01d7e33eeba3d7985ef375317080a1a74732bebc4c26883bedfd00578d1a653deb2a250ca6e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/be/firefox-48.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "7879202dc251f9f2dce656058e51a724b7e49e9b03db8bf5921448b8e48b74186c40425ef51a84be6df810819ce2e297895017ac748b30221e3cad73c80eb0eb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/be/firefox-48.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "35291f1c2326af74938c953ecb55e55951ceb8fe10443f39edd2b505dfd137be161f8c4a1e776e3ef75311f52609ce74cc5c13fb78f59893cbf7d7bdcb4c7162"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/bg/firefox-48.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "07d630045d9c99655ef04b6de10e34e4c1eb6a38f5a1eed4f08f90ce0f61ca9129235e48882005c0c98eb962273ac644a46dd4cdf76b748ad1b007a018b7f1ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/bg/firefox-48.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "457d65bb0afa6c755048191a24eaef286f5fbd9b68b020abf554c7ad978398605947cf276ce09d4447cca4b64f053b956af805196c45617f2f14911598a75f6b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/bn-BD/firefox-48.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "a355957e649ab82a6693e8da580b075111fa14bb1efa722397e3fc56c1dd14e6bc4f1315c7a74f1dc47aca228d0faa59db358b7f2baf79939f480c2e4113781b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/bn-BD/firefox-48.0.2.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "612ef87c01fe221c6e546f110efe228a73e632312af5ee3a4324904aba028365d06c9aaf080eb010b90f653d0aeb4a19f78a0abd15ee02688102cfd4f4c15f5f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/bn-IN/firefox-48.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "43e41905c397a2e311ab1a326f70070e0a1b922dd38301cfe9af17ae7916f2b697e1f3d218bbfd26741492d10ab5f6623a182691f036dbb653996d87cba10861"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/bn-IN/firefox-48.0.2.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "29299d5174cc226330f7d89b734b15f934a8dbf6c577e81f37b362ce8fc2adf4d8f901f2ddbdf90d8d43181e369b5e339408604b5cd0bea8a2c6eeca5e319957"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/br/firefox-48.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "38ed922491f7690cc9aa62a4d9703c7d83dd67b067f3901a8ce34a3f937063fefacc0991530a79c66581554a86c564f8d0468f9a3aaf500c56abcc89ae4d872b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/br/firefox-48.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "efbb2ccf082f2ac5b5d580f02642730b934e367fc4b6e841c53fc651b43c129ad092c0028d810d94aed102f01b521838dd81a0137cf057e903ccc78e182911b6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/bs/firefox-48.0.2.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "d9183190513145a246db8592631b22c61cb895fd8b8b5294c772da1c584f63cfdfdf67ab664cea5045611a9366521d91ec3ddeb74079a1046886ede1c0421ea5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/bs/firefox-48.0.2.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "140a0e65e8995702986e3c85fd38ef5b729911405156a3d3fbc37d7c10685a88300850c339ddb94687994bfa8482fa1f93690e3781d3e02f8f90f8f6eee17371"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ca/firefox-48.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "d80b1716eeafb294b2e1d68791e9d84b45285851361f732ec84688b5c440da1c30b669ac01b7a77bf8e065523d77d0a5a4e997a98a82652100b2111177c5567a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ca/firefox-48.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "12282634abc6acbd0877436258657116d1a0ea07f90b04447d8ce372c950e3b5288de9ae76a867b1af5c2d4dc2c85efbb349df616eaca95aa03774d7dd331c7a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/cak/firefox-48.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "407f1eb4b637a8abdc342b61ed898a5900d9914e5fc67c9c9f44327221dcbcb2fba0e27e9b1af5540d25ad282e9765d1c91bc70ec4a7ac641404ce05d83ea22e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/cak/firefox-48.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "a611f37240c3b22e715121d64ed636a650620022edadf8090cd4a51769373c669f230efd39316244b4d727244e093087fb88754aafdeba2948b0bff3316092e5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/cs/firefox-48.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "e7c7a1564944bbbc5852d11c11480bc03366cfaaacd132f2252a9322fe4f4cc94cc4d7853b56b4c5a130882f254fce4d791a047e5d141dc5143c97d5248da72f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/cs/firefox-48.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "d6931627e77fd8e4e0c445573e05a5e96bc6a2a47193cf2fb21403d0c10bdf009eb699d1cad6daee787e569d3508fb85f6edd8ffea80b69d6afed724d568ea50"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/cy/firefox-48.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "15df651ea244c39150534bcb467649467c636281b7442af8ef5f2a296104b39ee951202b950fd6a960b10ff54fcea0f37a0b2a8f76cb969fbd9ed57e5a92d66b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/cy/firefox-48.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "0b168a6fc6f181303f7398ee3366f18bb2b256d654229da9cfa46ce0b424b4d5d414652509df3ca6600ddc7a9adf823050165d716a3d376a08563457af3e6696"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/da/firefox-48.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "64ef134d5839659c096d556e7060ee07ec160c59adc9ca3105eddbdc1c2b2b166e00996b2a88422461c7bdecdcd71b917e4ce1df8e92912542c413845ace7c69"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/da/firefox-48.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "cd477b4c541fa16f8c4054f670143c6605b7beb48fbe1b26948c50435e11f0d4fbcf907f192b53a1419a2be8589daf5c1efcae013366567a8c0003da0186593f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/de/firefox-48.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "6768f6445dabcd1e98ed27a8a28b930a160c7717b688ea38e0930055c59c123fcd7f52d0159dd2b2425978fd9e8e2d0e4e0877e6bba659f840836ff68b2e6c67"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/de/firefox-48.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "6dd6fe70fc26f4b7fbcc1e7ec212263e4e6822d365704364ae8f4ef3ede45a68ea1651e65c02f36e90dc44f2462a874703cfa02bc45e74bf0ab19bc31267e471"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/dsb/firefox-48.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "328e30142ed129560ca2a23de9963f40cdb0ff87454a9257b00b9bdd9b5d566b6f2f263c484f3c58c8e52ae6de5221a1ca936f7960ce01d88f7ba4c9b97f789e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/dsb/firefox-48.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "7e57b66afdfca30e7c770ec87d7ffcbdc644c54e01e037bb348709c8f091d82da48a3ff3a3dd8187f12f5ba1f94599f8aa8ed375c7e6bd90a2f787b3b5a09340"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/el/firefox-48.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "ea715903a796e386aa1d1bca22a0dc3cde08690efc17ecaa8380f086fdb0968292a838296adb4c78ac30b7c93baabd4dc19d088ffd890e11c76b58d9baf73efd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/el/firefox-48.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "1bf80e3b64c95d74b7893e2ee36947f293f574c49461d742d7f47ea990d198fa78d9d3f9c04ec3c4d81745549a23b2a502497766441c61098b9ccd5f9169f191"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/en-GB/firefox-48.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "4db30d4d7140cdeafb41353133c9ea5679f5eeae8fdafde86887d6ac3553d1d0db74f2e189219f6f7cb9a8d33f2c2eef58b3280fd0d435593109ab5058404eab"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/en-GB/firefox-48.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "4b9d24e2faff85cf56012baa7c4d32b29173f903a5c19b0ebc20c7959ae291be39ee875f98f08a07d16aacc0fa5e7633245e265f11b30c64f703f22c889abf7c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/en-US/firefox-48.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "656ddb1fc57f2308cd5a6b376828676d9c7529dca18751e5ec6f4b903b47cc31c15f6fb70717605219051f8a54a89d9c579cd70327e2029ca374953671d9d1e6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/en-US/firefox-48.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "ea8a1edee8ac64720a2694d0ed0ccecbc38d1b1aa6b65fa87969b31189f624549d3e3712052c55e0aebc65119701e88d4397bf01c8526b3ba662e6583acec815"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/en-ZA/firefox-48.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "27b805f5f89f999bf5a95f174dcc6d611dd297e8ae094e1557300d12311963a3410ad0c077355e2cb31d0e134f0d015fbdf7662e2f172174a1abb24dabdb4040"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/en-ZA/firefox-48.0.2.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "abad4283afed609217799fd3f97e6dd1b89d5844344a68912f712a8796613db371259883b92292fa12a33c923692f7302f63123431fbcba590c780fe4a9e2517"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/eo/firefox-48.0.2.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "04fd9ec015150c9c8d26c69e7e0213caeb3a880b162eee48123b0355f73488bf667d5217cdcd2c45cd3cd5fc88c01ad02b4e2cc40b220beb93d55d64689206c6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/eo/firefox-48.0.2.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "fabb940bc6f392ed1f5e6e0fe23947d28e1b8143f29784509eeac361050921f1fc97ffe18e51f47026b7a69178ddbb367e4dec6cda45feccfc6876e9e178d6f1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/es-AR/firefox-48.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "01015a8756aaaa012fe35ba9d8192304fe8a22af6a512a644b20794446a31738b9142e03492db10e0e237a63cb3ffa2f581e700df00dfa3f4616157782cddf28"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/es-AR/firefox-48.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "0383d5df8041ee2ba1d32b9b1e090c50a4b911bcfe5354d0cc43a09355a790882afe5a9a837dcf2d9f4456ac75594112c5e3f520400e23d7bc91d37499ac9533"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/es-CL/firefox-48.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "4d74b9de4b4f0ab8ec43290d7f11c0439a1050e8561ae5192ff4fd3d0576d7d1857c9e616ed75b6fe7da5207e284b9713cb7184e65b093e101cbcb25fd90f74f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/es-CL/firefox-48.0.2.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "77aa56f1fca65c9374f15f012ecf1bbe439b99ed6ebe9823cd7f820e06cb10014033a4f6abb914969d0a5b03564385910af2569eb060c6065b7d1ceab5bbe7ef"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/es-ES/firefox-48.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "9e93a646c345a5c129bd9472601dc9d1cf3955ee0e6ad44a4b55f2dec7dba7d133c865d2c8b59383f48b1a870e2e02f781c93ced3811b03873e9c2d241ba0513"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/es-ES/firefox-48.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "488b79aba6acefe5a7973d63ba034eacc8894fd2e5aaea6c010af84975f45f00c49e85c003e876f1636a00dd396c6071511c84f61c0b6961ab677cee6b31ac3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/es-MX/firefox-48.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "d2c353bc74b35d13f0e018ac8f8a1c3bba211524269b82188504e4b76701a2db2b085bea9c293caee4cd8ea8251d1c871ef0628bf7fe17123a0ca4475611dcc2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/es-MX/firefox-48.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "6bfea70619b2d9e853b36ad93ddc4b5b09c98279541eb737dda98009e61642fb9066ea097230fdfd942286d94fe512365fb48fa30ffddbde898589a471e02f89"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/et/firefox-48.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "c527a2736b3fabb6b248816e04373235281a5dd0f1275108fc006db1f2e48485bd5f413169f698f94d015aab2d6d8a00ba638a35eb574556453af2b8a2c20172"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/et/firefox-48.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "f3fad1f2f0256d0bdfabb3ce20eb475c1f54c762e3af1fec90565eb18cd7ef3603586c79821bfadca27eb7db42aad3a887abb348f955d394c8bbaad909314ce7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/eu/firefox-48.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "772423ee4b87e308d1dbda39265e6671a6576c3b950abcd2dbabe2491a8cc5b5b6fa8ddbb00504efa2f5f43b59339423ef1347a3a92b8f00f61ea4be5bab2c20"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/eu/firefox-48.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "0b87aff412594848f1aca67e766c2423e1f28ad294a42feb894a69514fbd97efe97e6c119a19daba21c8d09f6e205ecc94bf1c4d150a5b684f7990494dcd2524"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/fa/firefox-48.0.2.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "9d8c4f63297198054074bf244f947cb92db29f70695c69c6fd54cc18844653e4dae1447543c8ad8b8687c20231d72b6965e59d552aafb6f4c35bde89839b3909"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/fa/firefox-48.0.2.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "7f3248c02c142ec88a9a32eed0a3f9802b6ad18a6fa56a28f2b5fd580ca917850352bbb4193559686f9e95f53e8e85727afd500eb03e3b5181180a1e5022328a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ff/firefox-48.0.2.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "fc160572277bfdb35cd3fb9c5a5b0a39710c78de4782ed679b96ae00c6cdf22b14d99d62462679bb4ab9bd68b8f7dc3cf43fb390a382e31120c91b24a98993f9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ff/firefox-48.0.2.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "c192466b8f92186a80895f5bfe1094747b214ace2135c72cbb19bd71a7fb7b77491c8af4648a88dcbf2a1235d73a408c6122d7b46fe923633bce8d7113f03298"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/fi/firefox-48.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "98bb77f6ad8b39d506e4fb0666386332fa22f01f4b7362fd614ea951c3520b7f692e8282d1aa175d94d43c46c267c941d4cfd0d19b454a7345ce13f7a264b6bf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/fi/firefox-48.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "14bf0b3a34dd2a6a7b5d0dcf8f5c0313e643f8a730afda92ab94afcf8505bed895724098e991c28344851288180d25e18b5327c44c742918d7e83007177cfb6c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/fr/firefox-48.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "b6a4ba15cc2c4d0f9aac90789e86f69d983e7dd33b744d213fa856259b57192e403ec67fce870d710782f0c0d3c24ae23a38bcb101d60efc967e87bf9efc43af"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/fr/firefox-48.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "dba11e63b3435fe2665f5437147d854ac590394e1f270bc0ea9638f0f8622a8639ce54c74fb2ef0b75cc6df2eeaf28fa21ae4aec6a41637fa2b107581970ec4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/fy-NL/firefox-48.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "6be75948bacadfb5de5f49f5a1455294e5a511aaa30cd9575823c91b304b1f433fa5e10c146d971497f23052e6e2db2111d740ffb9e48ea8aafac81fd5477ff8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/fy-NL/firefox-48.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "6e7e28ff66b29d39e87625711da4d83e376cca5521f8734b25b60b34e9bd350fb6b24a982306b902bfacbf367d9ebc3bb0d1de0d9d4f7fec39f5629aaeaec79b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ga-IE/firefox-48.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "22a3def2c74cefd8d7a254f4b746b1d131d9bc508f686c2027ad29bafd31a4e414d10a94d0c8c8ab7a4ac59b8a453e98183ce5e7597fd1624710803c139e704a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ga-IE/firefox-48.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "cc5ada6a14ca46a89a8d20deefd7da57b012ec1cf2a271e6327de676639217b67d60208c9bbf4ea88418b5447ca62dd2addc584613e55a51afe04b3fbafe4a60"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/gd/firefox-48.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "1c25a5d9c95c38faa1f9ee2709b1dbd2c3adad7b7c0d18a56dfb0e16b61cb0b47683e259d2876e2cce5a25c738fcec422939e417e3cc71229917af043a6425ac"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/gd/firefox-48.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "c4f68019652565cb4fd9c3f7da7ff476442a6d2f168531db40f29524bf4b4961b04de98effefdbff935c8a7bd110fad0cd72aa229500348bda16807d55fa5de6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/gl/firefox-48.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "a74a1c2f18c2955f643315bf896d7ad2ca2b0f42c84622244c8ecb448911acb9a8aceb27e15b7f643c95293d7afef625ad7c6b927732e670f811a99287ccce3b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/gl/firefox-48.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "51cb84043f5bccb269c39fd7d043445d70a750ebc13fa85d902aabeafdd72d6696eaf0b955a0e040abec44c9134ba6709b67f7b635b80ad45eb78fa5a1013d44"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/gn/firefox-48.0.2.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "f05f87f4be059f08a874cd28b5eea0a8be071bf548e726f9e14a47f0d96f9d0d9417cebb92919020fd5fc40801e83455a543270d61ce83652909508eac43d5a2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/gn/firefox-48.0.2.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "29f9a5895df46fb1844e447b1289b791d42b14250f814875afe67873cb00aba43d62175f29debc5d099abb9b0b4050465d2180d25987ec721d747ab46f433f47"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/gu-IN/firefox-48.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "b45dcf6d34b54bf69f36f49fd71589257ed6ce039315e50737c2ef4434917fb6b8dac18a4ee903575808d02762282620b9830c564578b87c1d4a5bd5a2234d30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/gu-IN/firefox-48.0.2.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "efe560a176f13da9995ca59e5b8858d0c7a06c91aeebf361affcbecb0f0de88c977d33b15eb8ec9f80f305000b0ef2b621addf44cfa9ff4fbfb740b937b441f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/he/firefox-48.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "314706b90bfd6ea3c94c28f880284992b0886897a4576c5c55b6bc2b02aa31e7050ccc11af1d5a085633a7fe65dd5fd03a435fc378c64ca5ddaa10ed91853f58"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/he/firefox-48.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "44b716392d79a000732a3ce2737f2367f65d855481c7a0d75f33898812a49abcbe73ed6c57a983035a6628b5f80ecf3921a336e4f45c964a7d52145c71c73b48"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hi-IN/firefox-48.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "03b36a04acfaf4a2e79a0e34368292723aa9aabbb2f4a0f0508dc8a7c7511133d18973ae08fe00b2ea571976ed6acabec44092694fc230c4cdaeee174d6aacb5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hi-IN/firefox-48.0.2.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "7d1b3d4e3b33c61d63671f4ec4a36e422c2ae99c192231bfd70d98c68b81a8ea61b0538e8efa47a3ad4b23ba58e405dcdd8044a7403aa1ff241aaf4ab76d4eec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hr/firefox-48.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "eb445e988d3ad1b009c1a8f92e07aafc38babcc8641c92b161efede4b7079731e72140d609cadf6220bbba23e3146ccabfd7fe875836c962ca4b12f451e8ac00"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hr/firefox-48.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "dbb8fa4458a36c403f68642c41c15fbd9cf1e7a703805ebdde827b9bf25752885c0263c1a604f37d0508994513259a2e3719b288fa9ed4d0b563d82e0e5f0dd9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hsb/firefox-48.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "e2b7c81ff1c57f1e656169fd206f33660718278468f062e46249b875babc6598857bcfcb884ac658ebe907e745413c82d948d8bf7a0ec34617a55cb0ae90f7e9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hsb/firefox-48.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "14544652977e0faa49cb5727e283e1e6cf59df14194b67777ee151e37ea68c53ed8efb2b5000233ffe8efa530ca881d4e84a7b5bf281a0f51d8baffb115f11fe"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hu/firefox-48.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "072c40fac3ce476abed251140e71b1c537aa61ba29460bc26a6cbf224a43fd926cd2e690929c108e0437537025fe0a45fdda71fc2ac6637385a0e75678330cf8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hu/firefox-48.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "e9893aaab901d03e9563bf84839577d55942f8d78d1f520388922392d7e7101d7752354816696f6fb1ab77bc2473b0cdaa7b2c62d6412c33c6616353f0b9a984"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/hy-AM/firefox-48.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "bd4f2e7a1c9c7ab1558caced2716acd3e0d3441873dc00f1fcef9e20bc2b25e1d3ec3d520a378c3b8fe9bac36a500d745516f16f14aa9b530c9ad940565690f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/hy-AM/firefox-48.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "e36ba4db7706d08d03c84cf3a78c20c60e7e67ebed01943d54b1483ec86e5b2f17dc7a1319c29863e7f6fd3b35ff390d1b462692c06c8ec26c164c0daa251dfb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/id/firefox-48.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "61cba41c80783921039ecb5038bc16da52e8191e38b8dd8d276225fe21f6bf1c8628d0e8f15292e02fa07a962ca355d7173f0dce6cd3b2259f87b823d2ce70ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/id/firefox-48.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "12ca05a297c65780d1a2df33aec2bed06498db34e98283053b1f7082e96fd83f92d320a8db91d7e4bd44405c21c5d276913f47403da479cacb3a082f6d1e43fa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/is/firefox-48.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "7df3200095a8b8b02bbf41f1a160e4557e059e514ffa4ef25c0dc0e274c319677d134cd8d2583e4ec51bed68091ca7cb8b13bf6e26afd682398ed285dc055da7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/is/firefox-48.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "c55649493a8bd47a9d53ffc8d6c22f741550fc40124f54bce320c96a73316e6c48229e12d0615c48b55e873b3ddddf38320987af5a109db68f53646e3c8206a1"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/it/firefox-48.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "f42fc4acdb2f30650c62dd8ff440e1def00920a1481f8f008565517bb535459773f8c7a39d7d89edcac91b683f92eeeac41c0c4d4c5d4fbf6d74f66ddf528a07"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/it/firefox-48.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "c7828610404f8bf93f3dde1feaf713e3111a7d3a6db792b013ecfc0dc225782d537d5842ac35af292451a7c5e475407655f246881472575d2912d0c607b52c30"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ja/firefox-48.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "9464f9a33ca3d0fbee32df31d1fe677ff298b21209986db8cc4893ff9414a96b885fa408f36d32c95e68274e2815a77be02c3859754c217874a5d3c0b6d280d6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ja/firefox-48.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "d150ad3102d90bcb755bd91c9960710c64518b7ffa445a6f4e15055a449eb9aeb4203084180cf2234c000dbe98620ac91fc9dc453415cb7e981457c43d08ae4f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/kk/firefox-48.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "d28ad5965aa76f2525164045a06118a289cd543b1b9afd7e0681da4739467858a2c1eaf3a7aab1002c3c18d51a3a5623801d974c0230b78a07a664016d302b33"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/kk/firefox-48.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "4846ea6f4834cb21b609d1c71b3efbd75bc5a98b63cda04d152c18e0b22ff5980004e01d09aeb83a108ba2c401e655e5b6b2e5ea1a2e9fd707b1bb409c46f3c9"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/km/firefox-48.0.2.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "6d3fca317792c6929e55fc0757f72decbbd2f714f259fe53eeb549d0b85984745dd1177aa15d68bc352a541703d1d3f4983943b03c4d3cdc2edb6e57c1cfc2dc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/km/firefox-48.0.2.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "c719b3631626d57da3d14a1ae356122b3df1f3c92a1633e2f85ecdaed9ac83abf066cd2ea5ce679e6e38dbc1d1f6839e2f3df9ff2f8e217f25bd25900693f47e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/kn/firefox-48.0.2.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "76faf5f9b98e4a13a42c71df7411fa51c0b6def1d973970c149b18adfa36b2e2eb14c94e3371d303abb3d0c7e226d9d42b15cb7a77d161fe404a4c567fea01ca"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/kn/firefox-48.0.2.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "a772a4adf418adf933bf82379cc3b69c4f5e426ed63d4d6458a87b005a59070cd035a483718dedb433d9401f4da4dbec70e0a5e920f5046478a1aaa4547547e2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ko/firefox-48.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "0ada95e8e3367ac30c91be660a037de18c5bb9edaf10d8a078d8c5f37c954717c3e33b710249274faf5e95409f9f67cef28f28d2ab34e452deae4fb66ab01bad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ko/firefox-48.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "dda86dbbd40721ac85c9b8486dd54a33fc5978ca79312cabfeb7700e0fbba809062c3b6be61e6c784c6b479f435d4ab886c2a6788dd115585af9e9f277ba6192"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/lij/firefox-48.0.2.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "f9053b301331d36710e31fe6d2172a98af5219e9900d60810bb02eaf1f19e6f4db6e0500de6ef6e77acd4705fdb0bc5025e9db52ef44bb79d82c674b53eee6e0"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/lij/firefox-48.0.2.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "63a4b697a1295b92b93d8602abb027be6a07cc58c45ade11957f716d91b3670015901ae6f5a667c4119798f4135c59be128f3c8e97c7ed6dc69b7f2f40c7d58d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/lt/firefox-48.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "77dc96b596e3010cdad83d3ce2b23f075672ddae73999652fbff24c85ef7ec0a749c1793b77eb7d34bb9c8beb6803d97c8ccc84b8f6ec02a8629c895d1a3400f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/lt/firefox-48.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "f7252d515e700fae4ffe31219b0135629d50487359947ad2b6d7a61e578b20997b95c4c2a7930b93f1b59ab9262a8b28bcfad22c14fc98029043339e3f2318aa"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/lv/firefox-48.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "44d97dc8855004fd91b96155592edd4f6ac9e92257814eae2727df0a4e1df496e1be13fb95c0e2ba6d0e31e8ea12df659317cc5ac8d005322075c9d8d13a67ec"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/lv/firefox-48.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "1fa86b8f8cfaec70db3c6033276f1b5a943e2065d78754f873c7ca99897f0195e0793bec936d2471b814a90c5a211a9653d8ef5480d64cd1fa9c49d7f8ed34bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/mai/firefox-48.0.2.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "df4e98b7414b58c145e7fe82b78c66c5d8a7fa8dbb34f78b91f9160ce3bb9e22ab065485de15e13d3660186760a9cb3c88403e8955ad092064eaab29f8dfe9b2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/mai/firefox-48.0.2.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "7bf726777eaa92f4a18107c4be48024cb2a7ae4a3aa9d94cf55a6b0fa46ab7256f097e7f7c610ae1f748c376063b7dd275f03dc7664e86fc738b867671e5d231"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/mk/firefox-48.0.2.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "7c48c47f916ac8389b5b10bae29d40820b59b3e52fc86b1408c426f4ed662f49243fbe6e7267b17ed3ff9dc179b435fbfa2516dce974972097fb39985039b4e3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/mk/firefox-48.0.2.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "b184dc34a47a9336190ff0090140b47ca345b9445dfe40133ed08ba30bb9966e1f7b5488a5289ddc4d84cb4de0b7121824ed6570afe857f0da8ebf6ab26a5c4b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ml/firefox-48.0.2.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "cb363c7b01ba9d252375b4f01d9515561bec11d72655730aa7c05d95d8ac4ba58288c64638543bcc48fb36387e6ea4e4604f34616d8b90ea068e09f7bfb8be61"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ml/firefox-48.0.2.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "789aaaf1495740adbcc4ffc90ffe0e3dd2b7d1822444bea6676bddcad228aaecb0a67916560cac892067383f2faca06b066782e8a40f39928e7cdf2370a3f0f8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/mr/firefox-48.0.2.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "d6a45cf0bf37fcf67369bfd9a3e0fd2a3fa4b1538a905e419915d5eaa350f812739de97179f2efcedf5aa2fa0571f555fe4012bd05a39adc331a34bab934808e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/mr/firefox-48.0.2.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "46bac718bade7205bd307b7c1ec9957d245c18d305f08d9c2263e070128f49d4fb7e4fbd3b1270866a1aeae8e726a21e7befb884af8d86bf323bc6723cc05c63"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ms/firefox-48.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "490fc881444dcdda259719b2545de34b8a3759d6f13a4d66cdd449fb629948bf6ded39576a2ffa53ef6d83ff16854c8c0b8521001ce3f43abf1f35387c8d6191"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ms/firefox-48.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "fc4c0588aeec05fdb2d65adadbacb210d04470e9588b3950d2011ab0e667311aed76262888f9870a4ce409370d8ed19b3d481437bef72960b151f76d0eb7ecb4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/nb-NO/firefox-48.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "d75931b47ede66d7c5025c4fabfdd918f21b0f66a9d8c2a5e772d3d26d941926da4f0852ac8dab92dc9236a0aec4b5cc1eadf5132d00721a91676cff1d7076cb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/nb-NO/firefox-48.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "e42a91e469b87235a8deed1e4564899287dd568d0ae93ebe139d499d9d5f59aafc327178a86f36f5f44d90ffb404907c80643f00f1160014708f061afe1e17a6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/nl/firefox-48.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "e0dbe6187eadcf305546f2916c8d21c6ae6dfa634aa30b51002a8d2ddda412cb35fd2c6cf5a44ab42c9805ec3a6c3322132e5121b04476935d7f67d30291011f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/nl/firefox-48.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "56b674761390018c7bbfdc8523b0ccef1d66576478cee43a6464d6df3e0da741ed9775e7ab48abf57028f62f43d91d8a0e7b17a8ce301c87ee576f9daaceb1f5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/nn-NO/firefox-48.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "a18693969b1d3f8824ecdc705c3b577dc1288cd5ba47ca0e3cd8e88d0a5a01927f87e56a2beff62d3ca9e6aa325619221f2f134c8c95b0687a49bc0f2cfc2ada"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/nn-NO/firefox-48.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "73874b50e63de07f73de2feac7a907dfb4e0eb014d913ea433c2f7d3ce9050b8ba811b72884ff7129a149ee38a30603246aaa55d81f11bb80e9fdfff87ba9120"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/or/firefox-48.0.2.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "de8dc3c4b91e96c5e49b32197e1351717cd1b359ba3802c9f0fd39516f25d4df7a9a57b4d4058d32e1d31af3c0ca8e1a8fd3fb4edbdb9718dc51f0881499bb0e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/or/firefox-48.0.2.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "999a71a5f978e2cf507966ac465ae170b4c01602c703b7ee85fa02224c8edb0f789d35bb0a20a5f72c86782a95943e9f8f4bfca301fd74ecc7f063f35bfe1f4c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/pa-IN/firefox-48.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "7378012baf763bdab21238f306244be208c20ade796cb15e2801133f0ac8b00cd92a86403d9591d5c2af94ea6fafd7162953ce88b5e9148fd447118128b2398f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/pa-IN/firefox-48.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "b20490e7303aeecb8d7b158464dd1a4f4b70979d74d0c4f2f15661abd0403dacb4674ea1bc2a09ce5b04ebed2987eab4475e839786e63dfb2f1eedfc44ec021c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/pl/firefox-48.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "e0cf99f816eeca80e7f2a5344b11202be124e1fa1f7a2c206ffb5c349556e0a2d5a7a3c653538bbb867c0a4d19eb9126c947806e0f021b68a9268d1913a178c3"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/pl/firefox-48.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "fe27c64b344f6d02e09e240f1a8c45236c9632c2ea9422ede227ef4c1890bb81c049a8c320e4a53cc818c129927e289f8279a64cf15655563958af23b4ca7076"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/pt-BR/firefox-48.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "868461b1d4d971ae4af0010bffa03012940758fd5ae10c05045c77fd5bd0f50997775a1c390f1cdc553197eceb583de47659ce84055145a290ca81e6e66a0a36"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/pt-BR/firefox-48.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "ff50b389d0c653db38a4ab8bf3b28095ca81b30340e973315bfccedfc737e9e853711d813fb08c52178e9948f49f7ec1bf7ae7958d611c1998fe938a9478b657"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/pt-PT/firefox-48.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "6a786c014c60268c8d24ca99e40106571fcc1777afef117a0125f7a78658f41cdcab4b16bfc2dd4c7ee520af0753b0b4180fcdcf32eaca8dfec7975146a08a60"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/pt-PT/firefox-48.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "56e911a6b2839a10c3d06b76bcdf0b746fb45fa0ced80c466d240a31cf7e6aba6df21b98dec1a4d3bf11baba2f530dbf06d1f94706b622acd2b08f2b2ef9ebf4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/rm/firefox-48.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "88fe9ad3d7afc11e195f40ec0bddb4ab5e04446e08f9317f82733e32e536d32b2a68a1ebb235f8cca828555c4b315911dbba178159f12f8bb2cad64a8a44511a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/rm/firefox-48.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "5153adba79e65368d1e901dc557d311b637d8e9b0506ba979246bd1ab6d5e31e2d885a73be704488457e051e81467412bd45a6c74d30e20198d9309f6ce59dd6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ro/firefox-48.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "faea58185a6bf7d57134b218a058ed4a3abf4d51dec96a5f5dde0f04daf2a2c8c76846bef8b8b43ed7fce05b4c6431fad52ee61f4e47ad62be95ef8b8914a726"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ro/firefox-48.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "319792a258e2ba40cceeabf5b0879c2572811484046bf34fa04b213c083391de20da1bcdb654294ac961a8b818f0c9c9287f32948e65eb50f3a85f43b15e538b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ru/firefox-48.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "ec44f3a0d95beaebf99e9492c7457ecf3857899d4587e8d27ecbd2205d5b4a1c1d0159f471ccdff01b5d9efdeda9dcdf28bb84bbd12c73e676ea0baeafe0afbf"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ru/firefox-48.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "3525382dcd7b2ee2f3ce847245216c0b8925679d539ef2f83e43d9062be06724db6f66b9b4747f3e20c5e7355e4b6ecabd816c07f201f2afe921570905cd0a3f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/si/firefox-48.0.2.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "6cb64f9fa85fe4adddaf68f0a221da8b2dd92625b2302102ad530c15d51c6ca1994ba53a300ab1c054da1fc20c5073deb308a46060ee6d7ab6ca843a930a6138"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/si/firefox-48.0.2.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "499dd5b16a48ecca536379fec41fc9ebefc71ae12963bac44dd0d76014709e2ab219869f3b3fb08f5196b051ec8a7e519fb994b15613559b38b35c4e6d8bbfcc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sk/firefox-48.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "11a73be8c2f801be0a46831b81980c2a9b2b9a4a645a710d01fb0d9a8e2de91ee18ea57c23b73b25e091bf88b15351a8fa261c349e9768d200172ea053e5c465"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sk/firefox-48.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "07e1462282e2484b58ba6b413034081a3e99ac907d7285f207530cb46d6ee61a6b166bb9d8820ca696789b57a0dcc3c1dc058975688d06b63b32f8a7a65974d2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sl/firefox-48.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "64d0b5cfefc8e98c8ede5497164be13854334f72d1e526a08d43d6712e6286ae509347805e9329cb38bb8f4708615d51e56221309198071c0b6ecd6c7dfdfbb5"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sl/firefox-48.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "d6e727ca07084eefc02b2287a286daf6302ea0cc3c8fcc22f238ce2c9074e95c0ec031068acdeb34277786670a91faf85027c9ae5acb963d150b1a89e534f98f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/son/firefox-48.0.2.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "9ac81b861b81d7cd4e9e71b6cf72a1bd8469c8190371b93b41034596148d831ef7f231b84de9cb8e520d7e3e92e83fdaf2290bca5e9c578ade17e0dfab41293a"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/son/firefox-48.0.2.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "9759f52732b9a84b8c6b3237356b0ec1c2aa0a2a1db79164cee491e761a9e10d88e931f73a5bbf0b7ed184738c44d12e542903577e1f0811f823853d43daf2d4"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sq/firefox-48.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "c7bc8ec81124127735d49d74bb12b77de24a5a851c34c3728adc752596e04c6b1ebeaf1a361fbca36631135cd9e385664adaef4d3c76ecea4d41cf88d7b6adfd"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sq/firefox-48.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "aa7b7c20f372f23d507aa7bfd088b2d2306b267a3cbf1b0004400d29b96187d9ea74a77933b9dcc42ef081d7dcb8db56b397d37ff001c61bed22976a6435d3b8"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sr/firefox-48.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "cdef642d72e3c3e33c1e2cfb8a5005249719390ce732b06ffeb15b01a77539263605fd8657ac8cbe8acfa2c92b2e1c0dd2168728ae2578e25453d6d79c06a17b"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sr/firefox-48.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "f12bbabaefb8811d3babe7b3673fd7f281645bb8bba0372594cca4fee4e0b81afedf46378fef714c1e624ede6039c913f66bb227a2d076a6950a0e623606adad"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/sv-SE/firefox-48.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "dac4342478d5a8e2743c6cbb44f58774be0b9bb96d9ec7a94b4ef41d093e76a511ff914d323ee5aa55cd8a00292c477e41eb0bb9fe37cfd91c89fae432a661b7"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/sv-SE/firefox-48.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "44323f6ff400058dad98f2e7a2f82afd52d706fecd34e7a6dd1780f45b6af77d2f6e892e2aa33784e4624f40ec5251e494ad0b8f95bbc11351dca94c599b405f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/ta/firefox-48.0.2.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "cac58900c6d169d1ef3828b4627c36c86224e21a011141c8bbf9fd3df3ea3bcddb5ba821d7d8ac9f5e6f5e348d1ae3cd92cbf2c151d380c22cb925f595cb637e"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/ta/firefox-48.0.2.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "38fba18d8edc2a4fd614a39b77aeeafeafea98e1dbc3bc2863284bbc2b7b07d28b273da9e3fa0bcabac90bd8049dc295db3d28e0dd0f1f522bb496f06d7e7c5d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/te/firefox-48.0.2.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "25adccb31523a1159fa9022791198869d87c8ef44deb8e3d7626a2500ddd82fa977d3c294d755b7e0385eb4dc80e00067091da78c65ece26e45b3ab9f2a4676c"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/te/firefox-48.0.2.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "550ba329d8c968fda79d0dbc7291f83bfd66227ba60a79c697cfb29a81216d3323853a651e401a0a8d02c658093330470b42bc0b91f4e27bcde368b33072ed8f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/th/firefox-48.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "a41abdaa15a97e55e0062a9f114a80bdc0e750112c15fe7204124aa1f9e54ad3caa1515caf145cf5e5269f41d1b32d8a0c2fa6691612e1b36fbcbc685ba17f79"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/th/firefox-48.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "ecd440389c07042aaf7aad74a135562eaf60c23f840bea0b9b3b62438610c0adf8de1c2ca57ab700f70913ee498317d92fd1c00f92d1af5d6d50a95c15d9bf72"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/tr/firefox-48.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "06b828afd3c9a89aaa448d9a8e18579142cf19d0008c409e115bb0148c4cb298eb2e896bdf20f3593f5f873489eb9b701104643d6088218c98e7b2ed44a6a775"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/tr/firefox-48.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "3107986002dd0b05fc10de856a532c40d5c38291bfbea07948b2c4fefe9cc2d4f5d8567b0e9856ec7fbbc7004078bc485a572b1a1dacf444db5c71aa7684edc6"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/uk/firefox-48.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "9e6d5854a468c5ecc942735c89d740fc8e304053f6e07a9caa3960dbf95e4cb9a6c7c0dd2e9e951bb49314c4cf0385a5a99ad7df6700ba21b9816f6aa3c77689"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/uk/firefox-48.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "ef021c365d2ef8d2eeaa6a92ac5d9d979361de30e2de06c7442f2085d66719a9fa876f77393737778f5b8afa29cff1898a0ac638df2e45b6c54e0c25c7c9b2b2"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/uz/firefox-48.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "d15770f8b6db9f55ecaff13d27a0c2559c032870873930c420fcd2d94c79ef3853138e42fe4205b5ac8af33aafcd6b2130c712025ef49801717b153e416058bc"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/uz/firefox-48.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "4b47c53585f3ed44d80d0099596ab710dc6565499c2f9ce0ed38ac24274882d5bdab16260c4c67c73b1b93b4fe9a8ceb0ca135b2d432fdae28c91025d1cb2e9d"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/vi/firefox-48.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "2d2dfc0c5515dac6bbc337acb41d72aad101837caa75257a1e369991ca93dac0bbc4cc3b31c8457f76ccba18afc9751eba33b9f602777a65d65da5ce0c208858"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/vi/firefox-48.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "7afafaee8de0e47d8e9919bb60da7cd361b18ee15b764522d9609e44e1aeac3ca8b5ffa97c23430a66efc4f38c28a5ffdc05bb4a46734ad2e3388f587b16110f"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/xh/firefox-48.0.2.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "b86ceb71c96d19e92af81604925b005eef63c7a55ce5fd9c1176017c9938389c30a5d91134c3d900a4a0635dcad7b25233f39848f9b50fee4e1ca1520dcf2c95"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/xh/firefox-48.0.2.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "c6ed1a65b72d6d63b4c031da93fa1e07cca97027d2a3dedc15e9cd2ffc21b371236e1b2cdeae02534e37c7efe6112cdbce0e5924e872c76e057cd59445ceef04"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/zh-CN/firefox-48.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "90ea550631d4b3a314b56896d1eeff147e42e41667a94f6457fd18cd2c4bf0e18ca3134e4dc20696a2a30ad9795cfeb454908cb99c580b30bd5eb147e53004cb"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/zh-CN/firefox-48.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "3ef020131a05958aff64d5d313aa8bcb92801d1ea0215406532efa55cbc66291d976e7aaa9bb11b38d35634d3e2ead7f838a7d908066e0b36b65d41767d38583"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-i686/zh-TW/firefox-48.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "8725261467ff069d523d6e813ca04a8912a21df2fada21cfc8c9442aada3a882fbab7468fed376a2a16be121caf68e74de21fffbd1b9345bd68923dffa2c4a31"; } - { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/48.0.2/linux-x86_64/zh-TW/firefox-48.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "172fe85c404b8ae7e073e11953a74896a07238c89077fc487be2dbb52a43fa183dd1ec17fb43971b2ada95c8c85a6aeb2b5bd9b637f0de8a3322a57b18783255"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ach/firefox-49.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; sha512 = "b082245bf287224c9487d650305cbc8cc8a602c36b526fc0174f56489bbe211dfff78ec40ad2dcf8df5eb4d951c352fdba5fe4b7a3181b54b54d1304ce9cfdfe"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ach/firefox-49.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; sha512 = "0c724d60357c817d78a4430103a50188db56f9e6b915cffc1d5177675727e1f253bdec37244651bfe1d055974a202306424f59e43c97c41c31954fa931c73f7c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/af/firefox-49.0.tar.bz2"; locale = "af"; arch = "linux-i686"; sha512 = "0cde959ebafc32dd5bb34af6bd7eb30a556ab6092459766a52e60621f545051300b41c3212786afb5a2e01cd3dc744fda72fd1461f4d2770e734537df930c7fb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/af/firefox-49.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; sha512 = "59d8b7ae0db4720811e9d85f00055eb2f702a24cd9a1e0b6fc6cc1b07d55559d02976a6cc176063c777f391f5c1206c647cbdfaa8c880c4d97b3764e42ce3fb9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/an/firefox-49.0.tar.bz2"; locale = "an"; arch = "linux-i686"; sha512 = "e0a5d4993fc3088b517330278228d87d27871c2c6b07b1c771c3af274bdb7968de36cd16d78d1056dfd32773a3e813d38728bea3f5177d83c7ad87645f339aa4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/an/firefox-49.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; sha512 = "d10c9bda25fdf945c11dc83abb088ef5758c7cefc6c1eab2db246d680c8bf97517bf7839710481684f03c6339089fdc1c01f6eedd88e1c675320e4f7898ed2ab"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ar/firefox-49.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; sha512 = "6f9d6f15dfd5af271d4e0a7944d2a37c17c755278ac9c951bb8c2e6602f71bacd0aa63297e041f1422364f0125310af8179975d023bd7cf0e01556695b720981"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ar/firefox-49.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; sha512 = "374ab7e28f5ef960b6d0ba6ffa2bef136d697916dbbcfb8d87186c9bc25aff188063d81bd250a6581c0e1870f222526ac7bf179f6960ffb34c08974b0f6a4be7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/as/firefox-49.0.tar.bz2"; locale = "as"; arch = "linux-i686"; sha512 = "ea216d3def6e83a8dd6db481d3477747ba87049f668b41906c40abcce9913758aebe478c3ccd258b5267d6c9ad013bac3652fc6496811fb96e4639ad8adc829e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/as/firefox-49.0.tar.bz2"; locale = "as"; arch = "linux-x86_64"; sha512 = "f25cd18e71f331c906edfafa229f93336c92f792d023f7ad87f77d7ff59a80bdeb9a9d77fec585d623dc13c9694d3c256262c1bc9396e996fb713decf7c5991a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ast/firefox-49.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; sha512 = "2bcd3c9d217389ad200896d3e8f79b3708c0df0f255e1e3241156ce6bcf61123b839eda1e7700313b0fdd77cc4857f5ce321df228fc4133d7be475427d41550a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ast/firefox-49.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; sha512 = "a408ab3ac9ebb6b0f2ad6fc67577617597ddae3ef944d72648246c538da7d7dea6af260323ec061c43a1e84c3946cc879ea9ac85e19f780459021832186a66b2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/az/firefox-49.0.tar.bz2"; locale = "az"; arch = "linux-i686"; sha512 = "ef7def291ac82d2675b9bd65907451a1ae1cc7e6f9ba33a99801230a945aa801b9e31b74fc66038644cd9b2d77eba4cbaf4de5af2be14351dbe06b6cd46ebb60"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/az/firefox-49.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; sha512 = "7b9df427933588e40fcdd99486b28a3a1df4bb2c7de54aa9feca2c4a3b0aafcbc86005962af228e5a57a5c48d84cc1104d95505dfae6d70f0d58297d22425849"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/be/firefox-49.0.tar.bz2"; locale = "be"; arch = "linux-i686"; sha512 = "4605f9e2b679ee41bb0b2ef915d7eafebc2018ad6291d4732468b264917691561c49b7497e2bcb4bd9b121dab239c1c35a837e622538410b1c3fb2056cb0b401"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/be/firefox-49.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; sha512 = "e0864d2534562c794ecb790dc1859d37ba400bf79e06fbcef571e2dff36458d515fe42e50bcc5ec172d2643225d146ea38065b1b595061252001a75d595ec82e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bg/firefox-49.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; sha512 = "4da00516d997ecaaf9ccd27b54e2d52916246f24ce28b62ac62451cf77f37611eccbea6b494b36c56d352327ebaa25a1de3fad4ebd8f076a113d204126591ed9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bg/firefox-49.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; sha512 = "973290680cf923eaeab4a0ca2fc6950bc7445b5579c6d4c73845a3881b545ad1aaf9fbafa5d37fa45f271f4a3fd38eefc2d7a756d7dedaa08a52f55955473929"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bn-BD/firefox-49.0.tar.bz2"; locale = "bn-BD"; arch = "linux-i686"; sha512 = "5fb2558b29c80b45208ba36874442e31d406c0a1b4c46ac8accc930b1ab98f1a24ea51d4172a2b2942af5475d21cc19db798b0db2032599f02eca60f7ee5cd30"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bn-BD/firefox-49.0.tar.bz2"; locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "db253c316e328385431d89ee373ac782b42ecc89c7aa6305253e85ba331b15513bf6295bd7f867ee298e2067afd4cec4c6a00e8645b94a31be14f4a1b89e64fb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bn-IN/firefox-49.0.tar.bz2"; locale = "bn-IN"; arch = "linux-i686"; sha512 = "574c3f178d81f2a2cf5aac98577b3f6e384a5adbbd4b2645111a3829cd0a7962a8304bf42d7dd29ca5e37311bf1b1e8b62634cac823d1bbfd832a71a2fb5cc3d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bn-IN/firefox-49.0.tar.bz2"; locale = "bn-IN"; arch = "linux-x86_64"; sha512 = "2b5e63643bc6a39f7493ee2e3744ca6b0c5a0c6251f4b1af32ab911f71cb5219d5506910bccc8f0168353c3fd0ab7d1eedf487ee7406f5a1852e010f6261cc02"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/br/firefox-49.0.tar.bz2"; locale = "br"; arch = "linux-i686"; sha512 = "efd72e7824440c1220ee34f578176d1b1652f2ca31cb4f28f7343bfa4d7cd91f40ead137b879fef39840d790e76b4261724f68175e8eaadc7a55f0b9ecce5538"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/br/firefox-49.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; sha512 = "17abd7de76cbc9b1871886d09a0c35df49d7acb3736b3a6c616a200932565170864ebbf1dc6b320ace2a0c95de1b892aae170fd3be794e9c27025f0c19c435f5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/bs/firefox-49.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; sha512 = "8ef4c39bcf10068156bdce5bb3df64753914476f92ce565b7fd681a674d6a45a5005efd2a7c4969bddb8eadbe11ddee7fa8ea206868b8505024b6688cd11c47d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/bs/firefox-49.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; sha512 = "3e25aa90f2348725517858299ac6ec3b1febad9dc2080f17484113c23e43862a1abf06d473c623bb0764a589ab68e3295c48b997ba3e76f21d5e04e0ecfdedaf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ca/firefox-49.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; sha512 = "4120e2c2cfd3183c294be353243f32631f34f8e3ddd0767b5772a355058c3148557e606d1971e1a89da349fbcab56072366342f8a7f03d2b702a0ee55d1a6268"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ca/firefox-49.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; sha512 = "e3d8e3d060ad6cf28cbe06d51b21c26285f89cdc32695eede992d6953f9d62068f6951506f02e32e1ada37034abf095b1d6dd7a57076ae0eeac9ff939e2e84c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cak/firefox-49.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; sha512 = "5b27d128df2101f08a59dcd46f66ba7c07434b29e9729ece3c4681d7a5b6a4330023bfddda42ad5f1765c1ea3c1401f2664c019b0f84c182f709e91520813f7d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cak/firefox-49.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; sha512 = "ea241cee1ef1ddc3545f4af9b0ad4e93a7879e04fc0c11e2288b3ea59d1ba2a5db36a048d5eebe0f69319b40ed6654866c498879ab50970124dbfa904f5929a2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cs/firefox-49.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; sha512 = "93080871362ee9f8d07993fc2e509beb6e6abe496ab1b9cf8451979e65c25b7a6e4eda0759ec6d6631a1dd04874cea08e4e0e777bd0429ec6525563777040b02"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cs/firefox-49.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; sha512 = "9aaec753784c6e5db6fd48a2fe134cf4a9c008ff3f5ca09a17c5982b7389f2949c6551a004e0bac723c91ec5e20dab46221b35aa3f94974b5fc14629cb375096"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/cy/firefox-49.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; sha512 = "843b18d25d94808737283b2b572902d999bf34ea17fe620319b3b15bf004d0b5526c89416d6f09ab84a6087353212e0e1a72fc3ef8df50acb7336da2819d4830"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/cy/firefox-49.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; sha512 = "caa53c6ab2c4f8127fa637d8b8df9727e31b0c0ec9da8e016447cf8e1333cd82e0e41b93917821ceb8db59c558761ca52f4dd34fc4916e1b70499f491a9b3ecb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/da/firefox-49.0.tar.bz2"; locale = "da"; arch = "linux-i686"; sha512 = "c4a441053cb6c116cb35817e03774690ad540b6f9c6865c6a64d4751137c3935c5c2422cafc60f10f4b9d393a6418c2862c8e05f8ce814abd1e028f867114901"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/da/firefox-49.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; sha512 = "8cb552f986e49d590659901f438e6f10d494445758d09798285285629f2cd11e7da39e828f56793673d70f5616b3ae9bea10d18c859f89190fb4998f5d75cab5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/de/firefox-49.0.tar.bz2"; locale = "de"; arch = "linux-i686"; sha512 = "50f7a3e44c19e56d4845423065a47b6ccd12d353b10ff2ed21798a668e77fd37da86824a9da2b740f95d6f83af9a33eb3c50d8539db7d27a421606139212a71d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/de/firefox-49.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; sha512 = "2678fdbd4a9ee6281eee6a04b3586d2e577110fdf98e8a589d934dddbbc4be565ef50d4b457709758a732506b56084938144d5d2e0b95a9fcba5afc3c826ad02"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/dsb/firefox-49.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; sha512 = "6fd71b3130ea4571ff4456876219f5720f99e190b92ea0615c6fdb519fed1dbc4432ecc65205a92023bfcf6c1ac49a622dca3dc0e3f362dd4a82253baffbd220"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/dsb/firefox-49.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; sha512 = "a23f6f93bb47ab231ee670817a28187e78ebbd459d4151444fd39b68b2c44990f06f8c90c850628ff8e88ab262c0aef48d990d4c235aeceb4d252249326bb16d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/el/firefox-49.0.tar.bz2"; locale = "el"; arch = "linux-i686"; sha512 = "12406ba82fc63d94245188dc5e3a1afe8e97f00ced23d19b0f463806b1fe98fd49daaf9e7caea0f1b0a6f6bfd05237a1231bca5b6a49298c8e9a1ceabf5f3a94"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/el/firefox-49.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; sha512 = "dd4f50c2201652a912dbd5ee7b6e3053c2519d0fcc13ea683ff7c6f6b1ff80ed5ff27215980def1de5254c658dbcb59df13f5be09ca9acc7f41e5711c9819d6f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-GB/firefox-49.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; sha512 = "4ce5cbeefef030ba020f1f4ca674587734729d1451c072efc8bf7486b3f0929b9720ff399bb7acb80afbbd39997e218c47ad2a9c6b248c97695248e9b3448c65"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-GB/firefox-49.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; sha512 = "ff7b4aaf59af5524d015ad680cd684e705cc9bd97b9afd459d829261d2b9f43a39a9a6cf56374b69e5e23674f97ac08e6ea4babc1732efb013e289c6c7835b8e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-US/firefox-49.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; sha512 = "d3815b311f7798c4c2dae7682c93ec32fa374fbddf5bc696cf13f048a2a6b1b35ba6b5700a30f0c0727ba346905e846da38402b8bdbb6b15549cbc2aa0d9446c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-US/firefox-49.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; sha512 = "eecb07437e814ddb9c9331fde306b1531dd225866d91a7b15412aef905e89d753332940f2da7b6bc53e7d73c348091ef58b8304f95775378c4bff1a740c18162"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/en-ZA/firefox-49.0.tar.bz2"; locale = "en-ZA"; arch = "linux-i686"; sha512 = "c1e47313c2a07b5d33ab09d00148cf62e09ae566e0601518e0d3f65805e258c65fffbb240197f46e52d21c93b171d7cff64a74a3d7d9ac4ad8849a7648718165"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/en-ZA/firefox-49.0.tar.bz2"; locale = "en-ZA"; arch = "linux-x86_64"; sha512 = "50a5a6df373af7620b6fb3166a3c7ea06a73ed6d14d9dab46c1f7fb885f6a7da6a4fd7b1fa7e44b91f3dcf2e2b432e140f9ace19f51e35c7e7fb5994e024b5f1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/eo/firefox-49.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; sha512 = "9424ac023e76cf2c41e9bf50d941ae59a73ca716050c98401ebc6a7f2c891e22fe399bfab105454206dec7e503c05c16afd9605e44bbf9f3827b429a3372e416"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/eo/firefox-49.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; sha512 = "bf8338a6ebc3c9c3f21249367e6d288b06fa31988ab110d11fd136a7575501531d5e7cb687d15cc883468d3f852ceb015c0570e42b355ddea5f384eb1dab53c0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-AR/firefox-49.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; sha512 = "6b5e1014d1c5379c6a461c8835459dc6bb030ec0b898aee547f122b1b92ae284d4fa2a2bd93893f43faeee5c30e3ddcef1bbd06abb655178fdf2d080af5bb137"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-AR/firefox-49.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; sha512 = "d9625988b3754c2c0bd89aedf78bff52c53404ea8d47f642726767e6a11d18059c4e9e261bc5f5eee02dcf820a184020aa504570b32d3ced6d15beb82bc6916c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-CL/firefox-49.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; sha512 = "3cb9ff0f823aa1b8f2f33d2ad39763df9992ff84be75c1c4685ee34a3f3d1e614869f4d31a95f16c86e540318736845814c143a6bf26a5e6324df466e1ea02aa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-CL/firefox-49.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; sha512 = "1010add5bb4418960b77cdef8f1267ef9ba98fe9d7d82bbe7d125ed23589ad9b2f934af82e35e477bedeae324e9fa862354e268ca829346061bbe4308cf2b107"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-ES/firefox-49.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; sha512 = "d64fcf43f71de119c4e5916943ff17b5e47e4c51c7482b4ebd9e90ae411cd1a302c6e246dde3a90ae5bd29d33f3915529633a3b87120ae571a90e6bf3e676c87"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-ES/firefox-49.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; sha512 = "ce0d7b320514c975dfe74b9d6cf63a51162c68e40d4addbfddc378377a0788b501b6e6b80787137987196cff286fd62021cf99d9ef128bdaf2a9a271e6e83ed7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/es-MX/firefox-49.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; sha512 = "097d9e98cbb024042325188fa4744acc28035fa89788c613a579a74ae8619d02a16a49e7b73a8b4cce95102d9388bb3a857036c17b825be1b12acf7a8ab7568c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/es-MX/firefox-49.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; sha512 = "3cc5950e78621a31b11a3b1cc0946d41d4cf1eade23dd92c818df6f5f2bf60db228d278999610f80b2383feb5b8e1e78b90532135d8111c5ebc3b628d4804845"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/et/firefox-49.0.tar.bz2"; locale = "et"; arch = "linux-i686"; sha512 = "5be378c889cf86aa71e2c234ec090db8d8a67a778fe2fb8b271e141e931082e93c086aace526026ef57888accc8cc52d37827dfaa6e975d0a3b1710f27a02902"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/et/firefox-49.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; sha512 = "1754850a8415771904ae90b8096d3d04a3fe75df3aa87c1ea967bcfcb747483f2171ded2c8f3f091eaacfab3a2587b3be4a0009384fac74627c53135173a3508"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/eu/firefox-49.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; sha512 = "e6356d13de9445e11e6b0a1908d2ab10ffb559c907a8e6d06cff090afbfcd4a557e1bc16ff13caeee61818d2044fbacc65ace65a7d27428aaa071cc52b453404"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/eu/firefox-49.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; sha512 = "15d3cbb376dfa269eace5b2910172256b79787e16f1eaaaa7dd002e92d73f50540398f0097146e6d494e173e2f1c2f0dd7bbc4c7d52f3dbfc98ad6e376fc5bc5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fa/firefox-49.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; sha512 = "151f18d14cd3be6360c36fa63c4cb605078fdc9146c3e28605d626fd85886561159275cc1dad44bb130f8b530da09aa897e3a23e061fc044c61ed74c930ce81e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fa/firefox-49.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; sha512 = "5810155928327671fac79d99b114c16f96120f3ca6c26c286c37d23d7fe71dfba2e8b9f0236a16a2cc6d1fc9fe2bd84278b6e5ddf25aa7876d672c6c157d2065"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ff/firefox-49.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; sha512 = "5716afa43a8efa70b2261906b990b376aa1505c206446273156f75c0fe8ce9cf0713e40a72125b4f0999cfa6d7d7d55872221a3effedde2f31abd4bad15085a1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ff/firefox-49.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; sha512 = "bb85b1f71568d117d27d891978ea14b65340027803fdf0693a0a2c42b9429c7a57462c5e3b0acfa133a6a133ac4faf31ba83faa417587c1a35c3ae752d0be5a8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fi/firefox-49.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; sha512 = "ed3a084f08985d9f4021327fc9b597bf184ef37e067ed6f96573337f63aae35f96f887594d9620d57c840ac6b2259add0e2a029b0a7f86d25bd3217cee609daf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fi/firefox-49.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; sha512 = "f4d137824175b1231b662d800270bd59f1d1eb8a5d3c975f15a1f9a1efa4c9def03af0d82c0243e05e4113d1b23a7e08da35019f66c3e0f257d5f26cf0259bb1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fr/firefox-49.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; sha512 = "0583f12e50318ae7eba691251e94a9828a227d1ca462ac1ef0dadc6371aab88838cc3cfe9c6ddcb9899b81111cfdc851d7a9dd9e82cbd89eeab29c02d3e2bd23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fr/firefox-49.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; sha512 = "b12009c61cd54c7ad8d60a8d358b3f8fed9fd09172ae928d477844437c276fbf04021a2c367565923e204a6e3170857bc910a20364d66232bd4c3142dd7afc47"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/fy-NL/firefox-49.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; sha512 = "8e35ee5c5b323daf54624cf2dffe306a2a59b490d28c516c6537fd2cc6430e52e6134729dc98f03fef945c06d888cff690939f6c2fd418b2d99991bd8f4acc35"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/fy-NL/firefox-49.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "5b070c19834d6ecff8f607ed2cfb149dcd487d128620f79e1ecbd9fc874e594f5af43fa34f1543263f244f51b8d748af99c8a1cd8b10207e4014658e3f18ff36"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ga-IE/firefox-49.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; sha512 = "482d840f25a6d734d530f81aabd30e516cf8070e0f43e0dea13af1745463a478c3f84f61eb305beb2440cdd3c1e219336c7dce8edf0197d21e87b3adde0eee17"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ga-IE/firefox-49.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "fcf48da92e7b86d5a7bd59f09a919cab41bb72c33a73768fafbb93a970a254546df3b090b7aa3414ec25bc9b97b0c16b66ad57fca4a04218c07d8865e1bcbbcc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gd/firefox-49.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; sha512 = "e6c244ea5ba25ed59695e961deffac3f99b9bfa03c1416c7c52d25d8be26c438813f3531c7dad243dc0ab36e6aab0c6485ffeebdec16e5ad47d4f6b5b3718edf"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gd/firefox-49.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; sha512 = "6cc1052e440888ca0114c6c7fb7ffc3c08cf9fc5ae5f38be0fd94dbda8e2230936f3046761983840a9b909b472852474641418b80eb5e268686b0f94ec2da39a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gl/firefox-49.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; sha512 = "69d928c79b5cefce463f4831363395954787690a0d0b6dadc9f9e89ddeba9f210c71a1a6b7504a35722b0f36cc871dacc82bf40b2b9bee454f871c045919ca10"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gl/firefox-49.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; sha512 = "190a8504b7ae9e72e06f0848a6c0746164fc208c7a7554caccd8e81f65f0ab914796f9e811095b8ecf50c6ec9b213856e3969bb8631f1734bd74255908eb2a42"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gn/firefox-49.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; sha512 = "801acc36c2821035af178d6ba779897041d2a7dfa760eb0e5dbfe578877fb62e40547fb5c26d0f6442ae0eba5b333616ede8d746565325fbb2d8e5b1d870e699"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gn/firefox-49.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; sha512 = "79db4de1e92e21264f2ec1bc8b9bf334adec8a48cc207b2d691ffc570bfff4d48da0a51accbab1b64395dc7679d1650fb158d8f4516de48004be7e3cf4b1932c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/gu-IN/firefox-49.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; sha512 = "2520fb3d79e8a37b954a83cd4195ba79547fd12fde3c2a91f13a8d0ae9dd165f07cda6e7ffa9f9c3edc0e81998ff6e9343fac49bffd8d707010083adddf553a7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/gu-IN/firefox-49.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; sha512 = "0864172462c8ca9bd162c8227e59f4684f6a90106c864a36224d58fd749b2d19d1496c6b877e432a1b8a6c680f9cde63d50352223def13ce8da4d5806de56a93"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/he/firefox-49.0.tar.bz2"; locale = "he"; arch = "linux-i686"; sha512 = "f1a595f504376d70531e5eb04efa86797705d869d462c7505909b416840040f2f7fc2a27718de6a743a9b2d37e5abd443674ba2f389882d9ecda86707adf8b8a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/he/firefox-49.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; sha512 = "4a4a7ed80a016812dcae29079c0f0badbdd39c020418dfbe07e05dca97b7632c9bc689bc084f7e957da6046cb2cdc74a7e0d9f06d358701c80f73e702cffb2fa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hi-IN/firefox-49.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; sha512 = "608477ed47c0d4cf9cbe33a240775dc10009546c4834012257839dee6d516b527051118c92ca8bc289a9f868cdaf432c1c44247efdf8d53e9cca87db02837bfa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hi-IN/firefox-49.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; sha512 = "9d2e91b8df386a3263b82cf88a945b5cc7de1a9fa3515b52c48f27ed1c8dd9b4edf471b588ba9c5a9d1eabebd7dc0fca89b33c0fff7ef6a0030a4474a158dbda"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hr/firefox-49.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; sha512 = "354d3cb33707ceb6a9d4d3f20304ad252e8f2efa36882f512c4382663b05ea70428f2978d2f9fd8871006cfba8a74d46f66b288bc0f2093218b0383d6248790a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hr/firefox-49.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; sha512 = "d5ee0aad4e91596503309d0028dc636550ac9f9fc5d36b1352026dda8de2c5a931175d96fb98192d93e52236b6c89c42fb9b56f2a69c484108281d2fae4dcbba"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hsb/firefox-49.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; sha512 = "d18f984de95199e074d7d115f2a685f3d99d890cefd216e6d6fced2f5a8f71f0275729c5d35107f0810538373bf46e1ed04f541e1933cf0d4feac89e9bf44931"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hsb/firefox-49.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; sha512 = "91e39217abcc24eb11fba06d95da8ff61355efc4c60be213197eca86359d6ce386ec890534ded720ec40814a7c347c6e2ff100fcf8a75697c40a06da496b078c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hu/firefox-49.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; sha512 = "e6f1ee393c56d6f156b2f6c263460df19e7e52d6aeeee668702911fe0f016cabd8900db8a774b89ec74d43c5963c39cd8db75862a350565a13d9382964c9adc9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hu/firefox-49.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; sha512 = "8f404fa390e70b54903267def0a458046ec6bf68bf8515352a61849a7ff72ac26c849c6bf69b992d3212268316ac8b954535aef9979b8edd4493481be6c8f9ae"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/hy-AM/firefox-49.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; sha512 = "e2adbeb30ac0b272e4e62dcf1876579dd3bfe0ab1d5f5385edc07c6a04d62d38cecbc584bbab12c1ba27377f7680d5a2a740e621c5a89d6fc616bca13e988661"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/hy-AM/firefox-49.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "7ce1778d1facd77af248f20f7b63ba5d20c13407dfa3ac25307777691d7f4f4844e421c1a6011867b8c7e18f2172f1905f81cf833268610042823525d1179932"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/id/firefox-49.0.tar.bz2"; locale = "id"; arch = "linux-i686"; sha512 = "6d98e771905f729de5890bbd75dc1131bfccc901638aaf362ce139c9341c417c8292e2f362adbd46ab8c8675c8f59f9a523a41b760a2f3dbadc96debeadc3a2a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/id/firefox-49.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; sha512 = "7feab0aadd4aaaa30d4a9a528ad1ce4737ee14c32df5d7c672708ec02b5f9567bf9f985d64c3064b86917de9c25fe10ce3b361c81bc5be1fba54439f287143c9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/is/firefox-49.0.tar.bz2"; locale = "is"; arch = "linux-i686"; sha512 = "6fa9e14841a790ecb83969ab803fc90c73da1fc974af17cb0814abfc22d3d334538feb2b121b0bc976ea247f12242c7a9e0eca1a544492ae6c51376dd4f41677"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/is/firefox-49.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; sha512 = "18924e3085893b1182e60e490dee1332278bcd030ddf4ed0a05f1dc2cdd9ccafa5885b7eba6361d647e562cddfa3675d16708338073e88ad010b2cee4f8fa0c2"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/it/firefox-49.0.tar.bz2"; locale = "it"; arch = "linux-i686"; sha512 = "c67b8d3836c388c8433a779e55c23790ca906ca812b28c7d0d97261627e5c57534b8d0311ba50ae1876055745a8ad20911b482b53ab0eedf0d9767578082cbc6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/it/firefox-49.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; sha512 = "705518c053e6af3a3b23e66b019c3ee1e51d73a75755663ccc671335f1ac3fb5b8c941a4f09dbe21abb279474d0cfb822beb115b51cd3edaf32f72154c661f21"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ja/firefox-49.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; sha512 = "585800058eb00b56bb6509886cd4f51ab9d9fb80de5c4b63f60a1b9bf5779a1b9f5310a99d746fcd8931c7eb2bb078ddd444518b624a73cbdfb535bbe38f759b"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ja/firefox-49.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; sha512 = "4dd92b0d0261649ffe51d20898cd633fd35efba7c8a55585a8fad9fb5b49ee6be53dea58deb0fc84ed13355406f0a663a78ad2a41cd6f1cd52b63e1c1ab8724a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/kk/firefox-49.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; sha512 = "a199ed24401d183745166d82929305c742a2a1cbed24ef09c91259515564bd5e5b86e30125285766f820755e65bd8e62eddb3079092243b88a4a91e5d5ca47b4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/kk/firefox-49.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; sha512 = "413078071b8ca1c9ff8c971e1fc8ae7b23e93414c8eee70820fb8662a4197f4f7ac7f8db11e7aacb2a914c3846be43a2aff9ed13f18c065bf7fd467807c51a50"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/km/firefox-49.0.tar.bz2"; locale = "km"; arch = "linux-i686"; sha512 = "c0ab421db1c33783e201762a3790d807e54f789ed16c2bdd372223cf10207995d91e45f600ee9df778fa4548fa0e09ae1f432b11cf4fbb1e50b4c46c5a805bfc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/km/firefox-49.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; sha512 = "5e50bcf2b9a70efe7ddfad9d05d4eef954c7da7d8ebad7ad6ff15b7464b46f636db49612f5d42294fff4e8225e8919934253f6acf4ffe4ad5967c75a6ba33be9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/kn/firefox-49.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; sha512 = "123bffa9583f8e5db3e94668baafb581aa5af023b3ca646e052360761b46be086b128a5a3c7b518f38bb9c57dc49df82ad9e88caf289655609708735421a4490"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/kn/firefox-49.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; sha512 = "06b7bc1716f64c84f580e62051e437129624c02d6c5def9a4fa8b3489f6302e263e977743731ccf123a1eecc70d1cb4ab6a83cf0ec80fdaf82d4d11421ec3b31"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ko/firefox-49.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; sha512 = "bf8ceaaa462c253fbdfff2d57feba1fb649d74e7ade09f9e6120597ecd7e7bbabcae6d32da09764ed660d173f8f28eef993366876928145947a1befaeb564597"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ko/firefox-49.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; sha512 = "e3dd9441bc01aca97ab96763ce086c1c52b33781fdb90083431c15a5a057a5e51092cd79adbc10793d6159dec30d72704577e1dfebc68bb02f7182645a38528d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lij/firefox-49.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; sha512 = "e47d12ed8959ab76c670e98fdee111e9a1897ca58a82730239ce1544c24d0149a40066666da74fd941b6653d19d65f75b7064391fd45a47d4926d6f4d3a6a771"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lij/firefox-49.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; sha512 = "81521acf4cc49a3e4dc7c4af58b7f048a949d170b95789001bf5cc02cade557042cce3b5243927e28c4c2bfebccaf1e4667bf0ce42871a51475baec2dc116fd4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lt/firefox-49.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; sha512 = "2c9b2df1e811ecb5488ddc012c7c408b067901ad6329bfd6fa0838e7cccdb63eaf3c7bbf9ea5be5ff2f03aae8acf6b62612a90126209bbfece59a00b41a73598"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lt/firefox-49.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; sha512 = "587ae06c7639043ea347ef68bc1b143baf0d507d1e98ab0b5bcf5d3f6ae364c3d77d2855550ebf6f63f972fecebc9d7bd05eebe4227bde512f9b2a4c72f4d0a4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/lv/firefox-49.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; sha512 = "833a69b97e5f74ef1829ae80a91dd6219b20918b5a8e0faa272bb1defdda1704a4e17e21892f15d606d74d644a4506196b83b33000f8ef8697aeef85c4f5315e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/lv/firefox-49.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; sha512 = "059d16aa412e31eb6453002b46a26384b125aaa1d212a22747ad465f6ccdc2cabfaef88a63479a04878f6c662ef45da0caed62b8e0c5a4cb8bf5037a820b34c5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mai/firefox-49.0.tar.bz2"; locale = "mai"; arch = "linux-i686"; sha512 = "df520edb25360d686cef1d8eb3c3566581a2f71e2b6a6119e2d6eed7c2004d3193d1e2784d3ae575ee5f750956f8eb83558d5793786abcf075ca991e78a610ea"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mai/firefox-49.0.tar.bz2"; locale = "mai"; arch = "linux-x86_64"; sha512 = "6562f84949698c920b220982a32e04a6686a4a3690e97db835e0a648952035217f49e0f7d4c8441cf31130e80a952bdda986b7d943f4b5cdbead9ab6c316a0e6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mk/firefox-49.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; sha512 = "3db4b5257edbf0f03585f7fe7ac0d2ddf269d2fc2c4ccb6cb17f62b61e4c152c02b54a5ae32cfdeb1f6eafba82a3db44ec1c8f82de5187226ded7ee2f6a0e442"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mk/firefox-49.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; sha512 = "4a09dd37f58904b1b5790dc23d7a81caa34e69bb663b7946ae9a7bba9d139696ce14b662ecdadc453a0021f33df90503110685b59f4bde528b53d8fa4ce68fd8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ml/firefox-49.0.tar.bz2"; locale = "ml"; arch = "linux-i686"; sha512 = "39d7b2342c9a2dfe07a643e0f15b6f0368c331d1576f075d6e864122f91bba8ad8af43619fdfd1cc880337267a7bf0e885879e60cee22dc3d4e4cd8c23713bd1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ml/firefox-49.0.tar.bz2"; locale = "ml"; arch = "linux-x86_64"; sha512 = "2a0d77e1e542b6a6a32c4cb122400b1b1023111cf234bbaf8e0d7c23e572283e163142b7de7c35108a2098e88352a31b118ed6914d07a832b8d155297cc317b0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/mr/firefox-49.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; sha512 = "ccdbdeefd26a0a6e005028976d0549a22fde6ce5c054806c15aba6447595785789eec0365d3a48712f2077e834b68e46ae6ea085ca776a9cb6b5bf326929b0d5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/mr/firefox-49.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; sha512 = "a5053f31dc8ea124756933ecc79870887d89fde3c6bfe0aee4d930a778edac865d3a929d2afbb714629ec77717aa1bba19d7647ddd3784951dd4510d76dc95d4"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ms/firefox-49.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; sha512 = "83b325c1c175dd01b3a04f35533e6adb0b82a5629a1be4e560a2eb65bc705c3d4e762db9fe8faa59aeb02cd55eeb95f1f587fca555ea1c5f5e353a6fb8edd550"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ms/firefox-49.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; sha512 = "674ac356543ffe310e0adae210ca8f01f287130eab80a610428ba854bce781c3fb281f6a2d2ce540acf66a650de3b9f960f1a7a0606c93576f0f02f5a1179865"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nb-NO/firefox-49.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; sha512 = "8efba2a1704c6c37fd91776d40f702aa9fc1951dae23aa164d8dc50cc14e22e047ac88f93a5090f15782fab37be1c0d1448ccf641e1426313bfd013488585da7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nb-NO/firefox-49.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "799179660bc918c5fb0c9781581ed0dac0ec7932dbf897fbb632a1fc8e7b310161b6d0d13d34d6259380e51be726e4afc1875abf3ae4a2a3bbc3454711f503cb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nl/firefox-49.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; sha512 = "d5ae51a144176a1748c3d7060d6e81e71975faf8ce02daefc53f087524e6afbc101c16e32fca2568f38d438cb748cd7194d64a6e89c6ceaab00d3adfff154ea8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nl/firefox-49.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; sha512 = "ee514f354a05630ac3135afdc668d59780626ab58e01f88d4d60effad71b8772f5bbced8fd2616e53236d75a32bb9ab7c187c399942f1d3c58fe7cdc7449f715"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/nn-NO/firefox-49.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; sha512 = "6f4c1959d9fd6d793908ca790b74c96f609167211aeb814ce630c0a57842c5d1a22e67697e71871cc9e04a2bb1b4c72603ede8cbcbade3702a07e24831b9bfbd"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/nn-NO/firefox-49.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "5159f3b060724bbdbc7f7575955d1143eda0d7e38eb4ed7efa29e82908311a351a4597f3ac374023574ec8021a1ea26a439379357eee5710aab6ff9b6e59cf39"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/or/firefox-49.0.tar.bz2"; locale = "or"; arch = "linux-i686"; sha512 = "a2057b3d615c61075a1667ac3b55fde78f8e037f6b67496faf7590067b0b4192065af8818b189f0eedf4c0a22e9cc6a0e35095cfc2f832168dadd174fa0b0cfa"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/or/firefox-49.0.tar.bz2"; locale = "or"; arch = "linux-x86_64"; sha512 = "e109c47b21d7dd4f18fb728f2f20322cfaa26574e43be5bc8b100fbc6272a8117ea00575bda525fe2876415e4127393882c41a252786f9857346b732255981c0"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pa-IN/firefox-49.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; sha512 = "54dfeaf8cf5ae829f802e985ec4b4ccf12bdc967df9ce5e35bd19b4cbb932fffb425127519703d576ba58ede507f97d609caf2168be1159acec9aadaf393f24f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pa-IN/firefox-49.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "4abd39707f2fc415b12a9041e1763978d90ddfbb167fd7ac901002a155e5b82f7c9299e446aa4de222e35f894b29a51b25b0ce0803ec54480788a52b9740679d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pl/firefox-49.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; sha512 = "df54680a948595d2a889c5d92e321f64161081a0618bf9227593ba22db57b9dd639e245637d5a2473da7dec46a81487720ce8651963223ac368f1cd52504fe06"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pl/firefox-49.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; sha512 = "2230bc383cdad5d6ecdbab7f2890d511420d89bd4de3b52f987c1d62c81153b8ce47ecf25f74c210572c50f8ac90f289f235d95df14c69bbb16dc5a817c146b8"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pt-BR/firefox-49.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; sha512 = "c5155061326efd963a43d44add6644c42ef1b84fb07e0ffaa8e9f2d8b5f213d614ccea04d8251435aac6c88523e759449e7b91c49317fd19380c33d39572ab4c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pt-BR/firefox-49.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "b2757aaba8b0078b23a9e8c12c26ee2699a93e19029deeef37809086e57d23ac4c58338268d814774a6c8aa2c727efbb12205256795c5e19ca9ebe5b1cfb59cc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/pt-PT/firefox-49.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; sha512 = "e3c6728add0ed5a320da8abfec1dd2bf63952e38a01f71601bc882789be771423fdf5625c35c9b4c0d278c0c3ea646e0409b09596f74f16a6397568524815b8d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/pt-PT/firefox-49.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "8763f5917f2945536524af90916301e94ec60ec7cf1e5d3d128e9c72f01f25924d34f65e48708cd2a9aafe9f3a4d4beac26d83e8803b7e2bb3c6eaf630dfeda5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/rm/firefox-49.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; sha512 = "ed1285152ef25a0471846f1aef7785a7958246d078cf78617e543de851d0b1722964b0428a3216d7d4feb40a8c2b76faf9802ed7c278a95592f252897415f4f7"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/rm/firefox-49.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; sha512 = "f7d042a502a7c7cbe4af94e3649170cbcc52d3d925ff6158245aa60935fd09ebd743a29edee2b78908232e0e98cc1a1c40a50c6e19b6ca037c0b2f6249f39e60"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ro/firefox-49.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; sha512 = "2dc4658d7b9aad11ee14a036db8e6171c5a912f93ed24e94b951c188f418eb7180e4621ad0d540eb9878ae8664f202287e09aa3636eaa1afc2cbdcf7606e6232"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ro/firefox-49.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; sha512 = "b5643df75ab40c4830afdc88d010e50c0c2fb7b9560caf985c80d84a0744b47fcc08f5d3dfa3a45bfc55f4ec22adf49e9cfe9513fa3d645887b813a0ae8bea4e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ru/firefox-49.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; sha512 = "b74c8e4e82e113b07f901d66108e505010087f8a44664b172af8625bd622dedd178a94a9391d29af22347f309cc8d455cfc4392d1bdf7fefb2dfd7bc35ccc3fc"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ru/firefox-49.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; sha512 = "eae3cf9a4588f99ff93d6ab08943872bdc4b215f1442aa1dd5d2ba9f1866264b767753a84de033e0979f24518876b536f8476840523920a7a1e1a94779080e29"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/si/firefox-49.0.tar.bz2"; locale = "si"; arch = "linux-i686"; sha512 = "69b3282ddd9b4cc57775cf1b13bfae3dcb7efe6c04f5279bb2d055ddeac0a008b05bbc82e12768521c075b83a8a7c37b8ec8d9ae01b022cea309b7155642495c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/si/firefox-49.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; sha512 = "fee048d1f5a743f5c9ec01241b87ed3c1c5c725423348b29bc76eb2ff9b23ab39b9fc5374e82b43412efe6e3b5a10cbe8b559b1c2b3289ae763901032c877496"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sk/firefox-49.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; sha512 = "ebad91e8633219cd7a5fe14712c83b8ad5e8931d201f42c67d61d955293de1adc836eff993450acd6df02211b7219cd2f4e274ecc515d6e422f77cbff4245118"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sk/firefox-49.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; sha512 = "b02a2ff848f6da677ae77d873e3d2ad77b6c650efbf44b967a1e2b704bb813875ffb39be9f7fbc1a39ac31060a6214266c4649c6e665b24a53c23c3e6b126258"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sl/firefox-49.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; sha512 = "de23536009e3d11816304f3bfc49d7ba77c4427907ae91a337e41ddb301cd188ff9802bbb42d6505e0b559d7107a2f150675e7c5ec53e9f3c689daee6a100c3c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sl/firefox-49.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; sha512 = "ee47a01e1673eca4101c69f67e639ad6dba6272502affa1c5af3081cf4bc8ee9cd3156006c14f8eccb687139913c61ef582aa567e6d35ff8630a075072e9b6fb"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/son/firefox-49.0.tar.bz2"; locale = "son"; arch = "linux-i686"; sha512 = "de572494fd7ec09ab71d6b65e51fa2bf16934ed26fc7a21e74d55f3b6309075d830b6c41bd37887ebcdf9eed46a0e2093a853d8b4733bf112b4d06582afc239f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/son/firefox-49.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; sha512 = "bae6e78ca201f0ba6f3c882cee89fcb5c5a46149d54d114196d689bb5b26e785fe3a3ff0a659a10d140e5530de847ea4d775cfc919d8e36be1ff21f0452f585f"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sq/firefox-49.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; sha512 = "c1a3828372703a06ff71752de271a5e6e999be5be2cc7bbf3ae7b1c23737035a3cb0685113806d98f96e62873818ee2d8a113822966499c1f54578e0570105a9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sq/firefox-49.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; sha512 = "491fea89f4d662061d1ff4b7a91756aceaa1bf336733d68f2ec775eff0505a98397ac7eabc9e411d38e3b96298a7c7f948b389b4574a277e490d364416dce010"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sr/firefox-49.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; sha512 = "e7ef9c19f485a50b46a2944283e3d2e46c82c68e350786e3bf31720367a682464e096ec7b3045f740c8af981be76be94d1c8965a1f10cf5271be4328edfb5a9a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sr/firefox-49.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; sha512 = "7fbf31358db27264452544742c5589e8cc57d0b2998748545d63ad8f88d6e6d43f358cc72fbde6004edf9370a32b7d5e53d7b6aa831c86271742ad007e9e3304"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/sv-SE/firefox-49.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; sha512 = "cde0b52a9b03c2673a13cc330c8d47308d84e43d7e70183cacd53252572b25c97d932fabed06dddfc395a8a192717a28f5b8fa175f857d90209971462ab45a09"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/sv-SE/firefox-49.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "c2a4297b7f096b187fbfd59166e10182090eed5a9063d90ddad591fd0b235ae145f22829a7d36176f8c18d760c177882131749eb29d76ddeda062f17da07f9af"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/ta/firefox-49.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; sha512 = "d8e7dc079889db15438a8e59ee42b78ff818014cc03136efa9a69a238f36a3c0db3fec073ba156280e427c8d67ac54f606eac390854337edcf6ecc751cbb8695"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/ta/firefox-49.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; sha512 = "881280f9799000fbfe664c7b67ced2bea2d9c99400ae7aa5a5e8274472306f5d6ca030d7eb7ce060c98c308d887af1bc00558c48cc1915ada7b43940d955c224"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/te/firefox-49.0.tar.bz2"; locale = "te"; arch = "linux-i686"; sha512 = "f628a62da53b356b0543b59ecb8ac3eab72956de499761fbec7e93c1c415929f0c0571c274c16a5412c69c709ef1c82b6f35bbee2d48286c092ad6b7fccf4e8c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/te/firefox-49.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; sha512 = "a3f2bc14ac0e3961ed75ad5c221374a91373a637cea05e023c87c2b06bc2beb63ab7470c1bf6da95304b5afe615ef05c0843cc508ff491b549e73a9e65d17d59"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/th/firefox-49.0.tar.bz2"; locale = "th"; arch = "linux-i686"; sha512 = "cf5196484a6408a3ba27f440909492c542305fb47dc463e5e54801f264efb274916484bb7b5850c34eb6fd3937a484fe3800d807e40c0d1a3bc902040fabf1b1"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/th/firefox-49.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; sha512 = "8f70f70faaeeba6cff2326dba2b43f4e80924e7f11666ede7474e896dbba42cfba650b0e9328d2b432474b06fc0ec738edaacf2b17e8acf549d5d7b590f75f3c"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/tr/firefox-49.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; sha512 = "1af9ff1d8376ec7eba385ac88d17bea0cdf02885b88d501f77b40d5402f9d918ed42cb8e4ce2e33610eb3f57ca5a26850acf6cfe83954bec205ee33a6d74fc31"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/tr/firefox-49.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; sha512 = "9a8ead1fdd4cf3cd49c8e3d626cc721ed79d949b91a9646157360c4d74381ccc6e32118adbae46ee060d8e0b7e5eaccdfad9af42beea216c1bdcb081a14e91a6"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/uk/firefox-49.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; sha512 = "c105b652cafd9baf5b8d3f8ebcd64ad1ace6da89d9746ee65fbee00891b2a4ad821c9a181cf1d6ddeb3b75dca08cace3b7e74f1e357aac5a6f08960499efdd4d"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/uk/firefox-49.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; sha512 = "01eeb3f62f2ee7377811aa38ec69426fbbb0fccac23e91d0202a7c35ede59eeab1d534fce6dfa7c51fb083626fbc9b3cfba48793c7d0fe625e1163d14fccf36a"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/uz/firefox-49.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; sha512 = "38259f998ff94528b1f466cfdc332f0fcd10b3ec4da3e0f88a5b3966eb7fc703763f2b9e4fabfc71ec286e9349d47c8c929b036f539dfef833411c6bae32d6e3"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/uz/firefox-49.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; sha512 = "dfdaa4540b742911226034fa75127c5de88ee3e97e10e7c29514df1331e5d8e3d1b8798f7050083c18a71838c6210343d6e63343ce6964ace885ac8172438314"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/vi/firefox-49.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; sha512 = "634f54f7d54f1b47a401b319eb8053ab08e43711650117a0155757280b6824eafa9d9f9ab6887cddce1d9c8190f949194d93cd9741d76bdf3df5d82a27b767d9"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/vi/firefox-49.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; sha512 = "b9cfd74289669d4d2ee49e216ae0eed15aa2377d54c632ec0d15f9799867a0bf24ad2efe17047fe63e3fdf2d9e486c33c1d96926872106053a36968e5f546714"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/xh/firefox-49.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; sha512 = "26c6bf5c9d2d1007d93d95351e3f9bd7ea246cee6b40ea77f7e26087d8612f709a01829a7e5bcfff8bdee4f7874c36966ae229b86a31f74c724deda875221de5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/xh/firefox-49.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; sha512 = "153e6a2c1644e00bdc950f092f99c515aa079dbafdbd618287639f00481af22a4acaca7e8d4aeb0e78e004eaf17a11911425ce8296b67298b4b6bfafd2d4dc23"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/zh-CN/firefox-49.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; sha512 = "a24bc352a98315fab4a64cb1078b35b1531b559b3f044cb349a2d4f52e4ee54b27510e8b0c9e3aa2d891dcb17036e1ab057bf3b6395cd73147314e413894d90e"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/zh-CN/firefox-49.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "a9b26841eceda1c9cea02f3b0b4707d8c79ad78c26fecbd5d6a69fdcdbbf087d487252934b2e6f02f89c29644f241beba1a555b67d22a396e60db8c5e21b9512"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-i686/zh-TW/firefox-49.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; sha512 = "a81cfb6d197d99476dd9d4386df40a7b507d9fdbf6c8966aa20bed2537c7689c3ae0e09f5053f66b9e3d5f4a462157d4d09de371c31cecc5c64a8c6e1501ffd5"; } + { url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/49.0/linux-x86_64/zh-TW/firefox-49.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "2c98d22cfe74847143601acc36adceba62d93ca90adc8c2b8044bbeb101ef39f7ddc19210cd0905542cc8205cd2dfaf9709fdd3d6596113b9ca1eca522ebd7eb"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 3e93c560ebb..1f3b3977e8f 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, gtk3, pango, perl, python, zip, libIDL +{ lib, stdenv, fetchurl, pkgconfig, gtk2, gtk3, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite @@ -30,7 +30,7 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 + [ pkgconfig gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa @@ -113,6 +113,14 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { "$out/bin/firefox" --version ''; + postFixup = + # Fix notifications. LibXUL uses dlopen for this, unfortunately; see #18712. + '' + patchelf --set-rpath "${lib.getLib libnotify + }/lib:$(patchelf --print-rpath "$out"/lib/firefox-*/libxul.so)" \ + "$out"/lib/firefox-*/libxul.so + ''; + meta = { description = "A web browser" + lib.optionalString (pname == "firefox-esr") " (Extended Support Release)"; homepage = http://www.mozilla.com/en-US/firefox/; @@ -121,7 +129,8 @@ common = { pname, version, sha512 }: stdenv.mkDerivation rec { }; passthru = { - inherit gtk nspr version; + inherit nspr version; + gtk = gtk2; isFirefox3Like = true; browserName = "firefox"; ffmpegSupport = lib.versionAtLeast version "46.0"; @@ -132,14 +141,14 @@ in { firefox-unwrapped = common { pname = "firefox"; - version = "48.0.2"; - sha512 = "d5addb0cd01e2aeb0fd9387800e82e385f3986716887840322d261d772a442f6fdb1d910cd53f2373f0fb82ed0b2a45356ac83f3ef230e14a2b9db8999ad8a4e"; + version = "49.0.1"; + sha512 = "0b1lmsxazd32xxlbbzg01xam7qc9m7abv6fnl1ixv4dz0xpfc88l1zikskghhdk9snzglyl3lidgnbkli9039g3gf9m06yv77gasmkg"; }; firefox-esr-unwrapped = common { pname = "firefox-esr"; - version = "45.3.0esr"; - sha512 = "ee618aec579625122c3e511a7ac83ac4db9718f5695b6fe6250717602178bae9bb7e5ebe8764f4d33ecf44d3db13abfed0d24c1ec71e64a1087fb6d5a579b0c0"; + version = "45.4.0esr"; + sha512 = "2955e02f829a10186a8b22320fb97d4b0fc2b45721fcffa6295653fd760d516ae72b5656547685ba1e0699b381e28044996d9ee12a8738842b4e6b8acd296715"; }; } diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index c9adde4f15b..4da73326177 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , gnash, flashplayer, hal-flash -, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra +, MPlayerPlugin, gecko_mediaplayer, ffmpeg, gst_all, xorg, libpulseaudio, libcanberra_gtk2 , supportsJDK, jrePlugin, icedtea_web , trezor-bridge, bluejeans, djview4, adobe-reader , google_talk_plugin, fribid, gnome3/*.gnome_shell*/ @@ -54,7 +54,7 @@ let ++ lib.optional (enableAdobeFlash && (cfg.enableAdobeFlashDRM or false)) hal-flash ++ lib.optional (config.pulseaudio or false) libpulseaudio; gst-plugins = with gst_all; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]; - gtk_modules = [ libcanberra ]; + gtk_modules = [ libcanberra_gtk2 ]; in stdenv.mkDerivation { diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 10d50792fac..531c5a7cf3d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -4,7 +4,7 @@ , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr, expat, cups -, dbus_libs, gtk, gdk_pixbuf, gcc +, dbus_libs, gtk2, gdk_pixbuf, gcc # Will crash without. , systemd @@ -44,7 +44,7 @@ let glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite alsaLib libXdamage libXtst libXrandr expat cups - dbus_libs gtk gdk_pixbuf gcc + dbus_libs gtk2 gdk_pixbuf gcc systemd libexif liberation_ttf curl utillinux xdg_utils wget diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index a22612993c5..1d287f4100c 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -41,8 +41,7 @@ stdenv.mkDerivation rec { zeitgeist ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" + cmakeFlags = [ "-DUSE_ZEITGEIST=${if zeitgeistSupport then "ON" else "OFF"}" "-DHALF_BRO_INCOM_WEBKIT2=ON" "-DUSE_GTK3=1" diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix index a2e98fb436e..6f8e327a6c3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, gtk, glib, gdk_pixbuf, dpkg, libXext, libXfixes +{ stdenv, fetchurl, xorg, gtk2, glib, gdk_pixbuf, dpkg, libXext, libXfixes , libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio }: @@ -7,10 +7,10 @@ with stdenv.lib; let rpathInstaller = makeLibraryPath - [gtk glib stdenv.cc.cc]; + [gtk2 glib stdenv.cc.cc]; rpathPlugin = makeLibraryPath - ([ stdenv.cc.cc gtk glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid); + ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid); in diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index 5ed1636aa65..81fca6614a5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -14,7 +14,7 @@ , libXcursor , libXt , libvdpau -, gtk +, gtk2 , glib , pango , cairo @@ -70,11 +70,11 @@ let in stdenv.mkDerivation rec { name = "flashplayer-${version}"; - version = "11.2.202.632"; + version = "11.2.202.637"; src = fetchurl { url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip"; - sha256 = "0nf2d7jn8g6bp9vilkwwkkh6pm05fg3h73njsn4yvx3285k73lpn"; + sha256 = "0xp1pxhrnam4yi8wfwaifqx7m2im0zx2xv8xgbdm0llrzbkc57mh"; }; nativeBuildInputs = [ unzip ]; @@ -94,6 +94,8 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchELF = true; + preferLocalBuild = true; + outputs = [ "out" ] ++ lib.optional is-i686 "sa"; installPhase = '' @@ -118,7 +120,7 @@ stdenv.mkDerivation rec { rpath = lib.makeLibraryPath [ zlib alsaLib curl nspr fontconfig freetype expat libX11 - libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf + libXext libXrender libXcursor libXt gtk2 glib pango atk cairo gdk_pixbuf libvdpau nss ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix index d149cd40d8c..82a1c271225 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/gmtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, pkgconfig, gtk, GConf, alsaLib }: +{ stdenv, fetchurl, intltool, pkgconfig, gtk2, GConf, alsaLib }: stdenv.mkDerivation rec { name = "gmtk-1.0.9b"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "07y5hd94qhvlk9a9vhrpznqaml013j3rq52r3qxmrj74gg4yf4zc"; }; - buildInputs = [ intltool pkgconfig gtk GConf alsaLib ]; + buildInputs = [ intltool pkgconfig gtk2 GConf alsaLib ]; meta = { platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 0f549be9ac4..3e89fb731d3 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo -, libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl +{ stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo +, libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus_glib, alsaLib, libpulseaudio, systemd, pango }: @@ -10,13 +10,13 @@ let baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; rpathPlugin = makeLibraryPath - [ mesa + [ mesa_noglu xorg.libXt xorg.libX11 xorg.libXrender cairo libpng - gtk + gtk2 glib fontconfig freetype @@ -26,7 +26,7 @@ let rpathProgram = makeLibraryPath [ gdk_pixbuf glib - gtk + gtk2 xorg.libX11 xorg.libXcomposite xorg.libXfixes @@ -98,6 +98,10 @@ stdenv.mkDerivation rec { mkdir -p $(dirname $preload) gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC echo $preload > $plugins/extra-ld-preload + + # Prevent a dependency on gcc. + strip -S $preload + patchELF $preload ''; dontStrip = true; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index a00905cf937..fe7cb477371 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -2,7 +2,7 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, cups, xz , gstreamer, gst_plugins_base, libxml2 -, gtkSupport ? true, glib, gtk, pango, gdk_pixbuf, cairo, atk +, gtkSupport ? true, glib, gtk2, pango, gdk_pixbuf, cairo, atk , kdeSupport ? false, qt4, kdelibs }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { libXft freetype fontconfig libXrender libuuid expat gstreamer libxml2 gst_plugins_base ] - ++ stdenv.lib.optionals gtkSupport [ glib gtk pango gdk_pixbuf cairo atk ] + ++ stdenv.lib.optionals gtkSupport [ glib gtk2 pango gdk_pixbuf cairo atk ] ++ stdenv.lib.optionals kdeSupport [ kdelibs qt4 ]; libPath = stdenv.lib.makeLibraryPath buildInputs @@ -84,5 +84,8 @@ stdenv.mkDerivation rec { homepage = http://www.opera.com; description = "Web browser"; license = stdenv.lib.licenses.unfree; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } diff --git a/pkgs/applications/networking/browsers/surf/default.nix b/pkgs/applications/networking/browsers/surf/default.nix index fcaaec63b9e..ae6ce3dd2c3 100644 --- a/pkgs/applications/networking/browsers/surf/default.nix +++ b/pkgs/applications/networking/browsers/surf/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, makeWrapper, gtk, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: +{stdenv, fetchurl, makeWrapper, gtk2, webkit, pkgconfig, glib, glib_networking, libsoup, gsettings_desktop_schemas, patches ? null}: stdenv.mkDerivation rec { name = "surf-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0jj93izd8fizxfa6ln9w1h9bwki81sz5dhskh5x1rl34zd38aq4m"; }; - buildInputs = [ gtk makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; + buildInputs = [ gtk2 makeWrapper webkit gsettings_desktop_schemas pkgconfig glib libsoup ]; # Allow users set their own list of patches inherit patches; diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix index 4b768602c6e..6ac8d9f1f6e 100644 --- a/pkgs/applications/networking/browsers/uzbl/default.nix +++ b/pkgs/applications/networking/browsers/uzbl/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, python3, makeWrapper, pygtk -, webkit, glib_networking, gsettings_desktop_schemas, pythonPackages +{ stdenv, fetchurl, pkgconfig, python3, makeWrapper +, webkit, glib_networking, gsettings_desktop_schemas, python2Packages }: # This package needs python3 during buildtime, # but Python 2 + packages during runtime. @@ -40,5 +40,5 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 makeWrapper ]; buildInputs = [ gsettings_desktop_schemas webkit ]; - propagatedBuildInputs = [ pygtk pythonPackages.six ]; + propagatedBuildInputs = with python2Packages; [ pygtk six ]; } diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index ddaaa68f60d..55dfb05cb3e 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking +{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk2, glib_networking , gsettings_desktop_schemas, makeWrapper }: @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0d9rankzgmnx5423pyfkbxy0qxw3ck2vrdjdnlhddy15wkk87i9f"; }; - buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup pkgconfig webkit gsettings_desktop_schemas ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix index e2d5061b92e..c98910cb08c 100644 --- a/pkgs/applications/networking/browsers/vimprobable2/default.nix +++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk, libsoup, libX11, perl, +{ stdenv, fetchurl, makeWrapper, glib, glib_networking, gtk2, libsoup, libX11, perl, pkgconfig, webkit, gsettings_desktop_schemas }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13jdximksh9r3cgd2f8vms0pbsn3x0gxvyqdqiw16xp5fmdx5kzr"; }; - buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; + buildInputs = [ makeWrapper gtk2 libsoup libX11 perl pkgconfig webkit gsettings_desktop_schemas ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d9f694a7eab..8509140552e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -4,23 +4,24 @@ , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp , libuuid, xz , gstreamer, gst_plugins_base, libxml2 -, glib, gtk, pango, gdk_pixbuf, cairo, atk, gnome3 +, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3 , nss, nspr , patchelf }: let - version = "1.3"; - build = "551.30-1"; + version = "1.4"; + build = "589.29-1"; fullVersion = "stable_${version}.${build}"; info = if stdenv.is64bit then { arch = "amd64"; - sha256 = "89d0630c9df56cfb12a87f23430179f6d14a8c57fb029d1c8d28ab06c98b7640"; + sha256 = "14sb58qrqnqcpkzacwnwfln558p018zargppxq21p5ic8s92v1g6"; } else { arch = "i386"; - sha256 = "0a7e07833f5359e38516222767da63edeca92177cbb6d4ef4946a6ef7c7b2946"; + sha256 = "0c4l9ji5xlxwzcjsrvxjkx53j76y777fj6hh7plfkkanlrfkryac"; }; + in stdenv.mkDerivation rec { product = "vivaldi"; name = "${product}-${version}"; @@ -38,7 +39,7 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr - atk alsaLib dbus_libs cups gtk gdk_pixbuf libexif ffmpeg systemd + atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst_plugins_base pango cairo gnome3.gconf patchelf @@ -65,6 +66,17 @@ in stdenv.mkDerivation rec { cp -r opt "$out" mkdir "$out/bin" ln -s "$out/opt/vivaldi/vivaldi" "$out/bin/vivaldi" + mkdir -p "$out/share" + cp -r usr/share/{applications,xfce4} "$out"/share + substituteInPlace "$out"/share/applications/*.desktop \ + --replace /usr/bin/vivaldi-stable "$out"/bin/vivaldi + local d + for d in 16 22 24 32 48 64 128 256; do + mkdir -p "$out"/share/icons/hicolor/''${d}x''${d}/apps + ln -s \ + "$out"/opt/vivaldi/product_logo_''${d}.png \ + "$out"/share/icons/hicolor/''${d}x''${d}/apps/vivaldi.png + done ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/c14/default.nix b/pkgs/applications/networking/c14/default.nix new file mode 100644 index 00000000000..188ccdd71d4 --- /dev/null +++ b/pkgs/applications/networking/c14/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "c14-cli-2016-09-09"; + goPackagePath = "github.com/online-net/c14-cli"; + subPackages = [ "cmd/c14" ]; + + src = fetchFromGitHub { + owner = "online-net"; + repo = "c14-cli"; + rev = "e7c7c3cb214fd06df63530a4e861210e7a0a1b6c"; + sha256 = "1k53lii2c04j8cy1bnyfvckl9fglprxp75cmbg15lrp9iic2w22a"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "C14 is designed for data archiving & long-term backups."; + homepage = "https://www.online.net/en/c14"; + license = licenses.mit; + maintainers = with maintainers; [ apeyroux ]; + }; +} diff --git a/pkgs/applications/networking/c14/deps.nix b/pkgs/applications/networking/c14/deps.nix new file mode 100644 index 00000000000..60b6b738438 --- /dev/null +++ b/pkgs/applications/networking/c14/deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"; + sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "87d4004f2ab62d0d255e0a38f1680aa534549fe3"; + sha256 = "0d51avdl4z38f7jd8qmzrzyh4gxkcjpxd0vvma9zfqhmqy15jqhb"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "ed8eb9e318d7a84ce5915b495b7d35e0cfe7b5a8"; + sha256 = "034fhyqmiqmn0v9gdbdmm0ca5d0pki2q1ch1rd34p9kh9574mjyq"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; + sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; + }; + } + { + goPackagePath = "github.com/online-net/c14-cli"; + fetch = { + type = "git"; + url = "https://github.com/online-net/c14-cli"; + rev = "e7c7c3cb214fd06df63530a4e861210e7a0a1b6c"; + sha256 = "1k53lii2c04j8cy1bnyfvckl9fglprxp75cmbg15lrp9iic2w22a"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "d77da356e56a7428ad25149ca77381849a6a5232"; + sha256 = "11id286pkzyswxcx2xz6185fzh0nz6yzkk055dd6z02gvinl6pqa"; + }; + } +] diff --git a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix index d258c493aa1..1caf1ce0bc8 100644 --- a/pkgs/applications/networking/cluster/chronos/chronos-deps.nix +++ b/pkgs/applications/networking/cluster/chronos/chronos-deps.nix @@ -10,9 +10,5 @@ stdenv.mkDerivation { buildInputs = [ curl ]; - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix new file mode 100644 index 00000000000..62dbbcf2149 --- /dev/null +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -0,0 +1,28 @@ +# This file was generated by go2nix. +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "machine-${version}"; + version = "0.8.1"; + + goPackagePath = "github.com/docker/machine"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "docker"; + repo = "machine"; + sha256 = "0l4a5bqfw8i8wrl5yzkqy848r7vdx6hw8p5m3z3vzabvsmsjjwy7"; + }; + + postFixup = '' + mv $bin/bin/cmd $bin/bin/docker-machine + ''; + + meta = with stdenv.lib; { + homepage = https://docs.docker.com/machine/; + description = "Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage Docker Engine on the hosts."; + license = licenses.asl20; + maintainers = with maintainers; [ offline tailhook ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix new file mode 100644 index 00000000000..80747e44bf5 --- /dev/null +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: + +buildGoPackage rec { + name = "kops-${version}"; + version = "1.4.0"; + rev = "v${version}"; + + goPackagePath = "k8s.io/kops"; + + src = fetchFromGitHub { + inherit rev; + owner = "kubernetes"; + repo = "kops"; + sha256 = "1jwgn7l8c639j5annwymqjdw5mcajwn58y21042jy5lhgdh8pdf5"; + }; + + buildInputs = [go-bindata]; + subPackages = ["cmd/kops"]; + + preBuild = '' + (cd go/src/k8s.io/kops + go-bindata -o upup/models/bindata.go -pkg models -prefix upup/models/ upup/models/...) + ''; + + meta = with stdenv.lib; { + description = "Easiest way to get a production Kubernetes up and running"; + homepage = https://github.com/kubernetes/kops; + license = licenses.asl20; + maintainers = with maintainers; [offline]; + }; +} diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 6768df2df02..ac7d94d5c9a 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { preConfigure = '' substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo} - + substituteInPlace 3rdparty/libprocess/include/process/subprocess.hpp \ --replace '"sh"' '"${bash}/bin/bash"' @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/launcher/executor.cpp \ --replace '"sh"' '"${bash}/bin/bash"' - + substituteInPlace src/launcher/fetcher.cpp \ --replace '"gzip' '"${gzip}/bin/gzip' \ --replace '"tar' '"${gnutar}/bin/tar' \ @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/python/cli/src/mesos/cli.py \ --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'" - + substituteInPlace src/slave/containerizer/mesos/launch.cpp \ --replace '"sh"' '"${bash}/bin/bash"' @@ -83,7 +83,7 @@ in stdenv.mkDerivation rec { substituteInPlace src/linux/perf.cpp \ --replace '"perf ' '"${perf}/bin/perf ' - + substituteInPlace src/linux/systemd.cpp \ --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"' @@ -180,5 +180,8 @@ in stdenv.mkDerivation rec { description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks"; maintainers = with maintainers; [ cstrahan kevincox offline rushmorem ]; platforms = platforms.linux; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } diff --git a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix index f8d5dd2c9d6..b6fcbaafbb1 100644 --- a/pkgs/applications/networking/cluster/mesos/mesos-deps.nix +++ b/pkgs/applications/networking/cluster/mesos/mesos-deps.nix @@ -10,9 +10,5 @@ stdenv.mkDerivation { buildInputs = [ curl ]; - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - impureEnvVars = ["http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; } diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index c82d671a523..1985d6ad3f2 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,24 +1,42 @@ -{ stdenv, fetchgit, go, git, which }: +{ stdenv, fetchFromGitHub, go, which }: +let + version = "1.3.0"; + versionMajor = "1"; + versionMinor = "3"; +in stdenv.mkDerivation rec { name = "openshift-origin-${version}"; - version = "1.0.1"; + inherit version; - src = fetchgit { - url = https://github.com/openshift/origin.git; - rev = "1b601951daa44964c9bc7e4a2264d65489e3a58c"; - sha256 = "0hvipgnkpph81jx6h6bar49j5zkrxzi6h71b4y75c0l7af129wdi"; - leaveDotGit = true; - deepClone = true; + src = fetchFromGitHub { + owner = "openshift"; + repo = "origin"; + rev = "v${version}"; + sha256 = "07s7xv8x8pch68j7lsw29im0axi07x32ag9wh9aqa0y570q9xgxy"; }; - buildInputs = [ go git which ]; + buildInputs = [ go which ]; - buildPhase = "hack/build-go.sh"; + patchPhase = '' + patchShebangs ./hack + ''; + + buildPhase = '' + export GOPATH=$(pwd) + # Openshift build require this variables to be set + # unless there is a .git folder which is not the case with fetchFromGitHub + export OS_GIT_VERSION=${version} + export OS_GIT_MAJOR=${versionMajor} + export OS_GIT_MINOR=${versionMinor} + make build + ''; installPhase = '' + export GOOS=$(go env GOOS) + export GOARCH=$(go env GOARCH) mkdir -p "$out/bin" - cp _output/local/go/bin/* "$out/bin/" + mv _output/local/bin/$GOOS/$GOARCH/* "$out/bin/" ''; meta = with stdenv.lib; { @@ -27,6 +45,5 @@ stdenv.mkDerivation rec { homepage = http://www.openshift.org; maintainers = with maintainers; [offline]; platforms = [ "x86_64-linux" ]; - broken = true; }; } diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 79074d2d28e..b4c20e22680 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] - ++ optional mesosSupport [ mesos ]; + ++ optional mesosSupport mesos; untarDir = "${name}-bin-cdh4"; installPhase = '' diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 72b38a00e0e..d6ae08444bc 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "terraform-${version}"; - version = "0.7.2"; + version = "0.7.5"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/terraform"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "hashicorp"; repo = "terraform"; - sha256 = "002jg4iwg4g4hkg4hm3szlkyagqzipln3l44b8azh1a7vh1m8cp2"; + sha256 = "1s338zhynn8wmhsqhq58njgxv6mwic7d8yxb7zcj2x4b78i7hqa0"; }; postInstall = '' @@ -27,5 +27,6 @@ buildGoPackage rec { description = "Tool for building, changing, and versioning infrastructure"; homepage = "https://www.terraform.io/"; license = licenses.mpl20; + maintainers = with maintainers; [ zimbatm ]; }; } diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix new file mode 100644 index 00000000000..3ceb9c4d816 --- /dev/null +++ b/pkgs/applications/networking/corebird/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, gtk3, json_glib, sqlite, libsoup, gettext, vala_0_32 +, automake, autoconf, libtool, pkgconfig, gnome3, gst_all_1, wrapGAppsHook }: + +stdenv.mkDerivation rec { + version = "1.3.3"; + name = "corebird-${version}"; + + src = fetchFromGitHub { + owner = "baedert"; + repo = "corebird"; + rev = version; + sha256 = "09k0jrhjqrmpvyz5pf1g7wkidflkhpvw5869a95vnhfxjd45kzs3"; + }; + + preConfigure = '' + ./autogen.sh + ''; + + nativeBuildInputs = [ automake autoconf libtool pkgconfig wrapGAppsHook ]; + + buildInputs = [ + gtk3 json_glib sqlite libsoup gettext vala_0_32 gnome3.rest + ] ++ (with gst_all_1; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav ]); + + meta = { + description = "Native Gtk+ Twitter client for the Linux desktop"; + longDescription = "Corebird is a modern, easy and fun Twitter client."; + homepage = http://corebird.baedert.org; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.jonafato ]; + }; +} diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix index eb5d12ed82c..bb4a4a71009 100644 --- a/pkgs/applications/networking/davmail/default.nix +++ b/pkgs/applications/networking/davmail/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }: +{ fetchurl, stdenv, jre, glib, libXtst, gtk2, makeWrapper }: stdenv.mkDerivation rec { name = "davmail-4.7.2"; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp ./* $out/bin/ -R - wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + wrapProgram $out/bin/davmail.sh --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} ''; } diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 3b64d7af43b..3f1b5dad727 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/networking/drive/deps.json b/pkgs/applications/networking/drive/deps.json deleted file mode 100644 index a1d1fde7727..00000000000 --- a/pkgs/applications/networking/drive/deps.json +++ /dev/null @@ -1,164 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "google.golang.org/api", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/google-api-go-client", - "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80", - "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8" - } - }, - { - "goPackagePath": "google.golang.org/cloud", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/gocloud", - "rev": "6335269abf9002cf5a84613c13cda6010842b834", - "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf" - } - }, - { - "goPackagePath": "golang.org/x/oauth2", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/oauth2", - "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a", - "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8" - } - }, - { - "goPackagePath": "github.com/mattn/go-isatty", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-isatty", - "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449", - "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt", - "rev": "957d850b5158a4eebf915476058e720f43459584", - "sha256": "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf" - } - }, - { - "goPackagePath": "github.com/cheggaaa/pb", - "fetch": { - "type": "git", - "url": "https://github.com/cheggaaa/pb", - "rev": "e648e12b78cedf14ebb2fc1855033f07b034cfbb", - "sha256": "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam" - } - }, - { - "goPackagePath": "github.com/odeke-em/cli-spinner", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cli-spinner", - "rev": "610063bb4aeef25f7645b3e6080456655ec0fb33", - "sha256": "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c" - } - }, - { - "goPackagePath": "github.com/odeke-em/statos", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/statos", - "rev": "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6", - "sha256": "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs" - } - }, - { - "goPackagePath": "github.com/odeke-em/exponential-backoff", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/exponential-backoff", - "rev": "96e25d36ae36ad09ac02cbfe653b44c4043a8e09", - "sha256": "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6" - } - }, - { - "goPackagePath": "github.com/odeke-em/extractor", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/extractor", - "rev": "801861aedb854c7ac5e1329e9713023e9dc2b4d4", - "sha256": "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1" - } - }, - { - "goPackagePath": "github.com/odeke-em/meddler", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/meddler", - "rev": "d2b51d2b40e786ab5f810d85e65b96404cf33570", - "sha256": "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x" - } - }, - { - "goPackagePath": "github.com/odeke-em/xon", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/xon", - "rev": "d580be739d723da4f6378083128f93017b8ab295", - "sha256": "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc" - } - }, - { - "goPackagePath": "github.com/odeke-em/cache", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cache", - "rev": "b51b08cb6cf889deda6c941a5205baecfd16f3eb", - "sha256": "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4" - } - }, - { - "goPackagePath": "github.com/odeke-em/command", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/command", - "rev": "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561", - "sha256": "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62" - } - }, - { - "goPackagePath": "github.com/odeke-em/log", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/log", - "rev": "cad53c4565a0b0304577bd13f3862350bdc5f907", - "sha256": "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w" - } - }, - { - "goPackagePath": "github.com/odeke-em/pretty-words", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/pretty-words", - "rev": "9d37a7fcb4ae6f94b288d371938482994458cecb", - "sha256": "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl" - } - }, - { - "goPackagePath": "github.com/skratchdot/open-golang", - "fetch": { - "type": "git", - "url": "https://github.com/skratchdot/open-golang", - "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e", - "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac" - } - } -] diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix new file mode 100644 index 00000000000..ad5a8f7c4e6 --- /dev/null +++ b/pkgs/applications/networking/drive/deps.nix @@ -0,0 +1,164 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "6335269abf9002cf5a84613c13cda6010842b834"; + sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "957d850b5158a4eebf915476058e720f43459584"; + sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"; + }; + } + { + goPackagePath = "github.com/cheggaaa/pb"; + fetch = { + type = "git"; + url = "https://github.com/cheggaaa/pb"; + rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb"; + sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"; + }; + } + { + goPackagePath = "github.com/odeke-em/cli-spinner"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/cli-spinner"; + rev = "610063bb4aeef25f7645b3e6080456655ec0fb33"; + sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"; + }; + } + { + goPackagePath = "github.com/odeke-em/statos"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/statos"; + rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6"; + sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs"; + }; + } + { + goPackagePath = "github.com/odeke-em/exponential-backoff"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/exponential-backoff"; + rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09"; + sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"; + }; + } + { + goPackagePath = "github.com/odeke-em/extractor"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/extractor"; + rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4"; + sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"; + }; + } + { + goPackagePath = "github.com/odeke-em/meddler"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/meddler"; + rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570"; + sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"; + }; + } + { + goPackagePath = "github.com/odeke-em/xon"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/xon"; + rev = "d580be739d723da4f6378083128f93017b8ab295"; + sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc"; + }; + } + { + goPackagePath = "github.com/odeke-em/cache"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/cache"; + rev = "b51b08cb6cf889deda6c941a5205baecfd16f3eb"; + sha256 = "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4"; + }; + } + { + goPackagePath = "github.com/odeke-em/command"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/command"; + rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"; + sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"; + }; + } + { + goPackagePath = "github.com/odeke-em/log"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/log"; + rev = "cad53c4565a0b0304577bd13f3862350bdc5f907"; + sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"; + }; + } + { + goPackagePath = "github.com/odeke-em/pretty-words"; + fetch = { + type = "git"; + url = "https://github.com/odeke-em/pretty-words"; + rev = "9d37a7fcb4ae6f94b288d371938482994458cecb"; + sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"; + }; + } + { + goPackagePath = "github.com/skratchdot/open-golang"; + fetch = { + type = "git"; + url = "https://github.com/skratchdot/open-golang"; + rev = "c8748311a7528d0ba7330d302adbc5a677ef9c9e"; + sha256 = "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac"; + }; + } +] diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 4e6be596fba..90c6bce6506 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -23,11 +23,11 @@ let # NOTE: When updating, please also update in current stable, # as older versions stop working - version = "9.4.49"; + version = "11.4.22"; sha256 = { - "x86_64-linux" = "0gkm4jhcn3pqaizmki98rbqb7mqyf6mjgmpslas1wr94q5msyrpd"; - "i686-linux" = "08h5jxan6l9h4zfmvc5q2652dyplih2avayy8f9h8mppirpg68px"; + "x86_64-linux" = "1fpwknf8as2h6d8d11nb8i0q4ap5r6fvii919b3pj5d29jgfd25l"; + "i686-linux" = "1dv60ijb93464js34vk3l8hm8a57zdpkzhrfkv2kp3v3172cqj8s"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = diff --git a/pkgs/applications/networking/errbot/default.nix b/pkgs/applications/networking/errbot/default.nix index 5b8140bfa51..f37f10d5209 100644 --- a/pkgs/applications/networking/errbot/default.nix +++ b/pkgs/applications/networking/errbot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -pythonPackages.buildPythonPackage rec { +pythonPackages.buildPythonApplication rec { name = "errbot-${version}"; version = "4.2.2"; @@ -23,7 +23,7 @@ pythonPackages.buildPythonPackage rec { webtest bottle threadpool rocket-errbot requests2 jinja2 pyopenssl colorlog Yapsy markdown ansi pygments dns pep8 daemonize pygments-markdown-lexer telegram irc slackclient - pyside sleekxmpp hypchat + pyside sleekxmpp hypchat pytest ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 532ab361313..0a938766e93 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, ocamlPackages, zlib }: +{ stdenv, fetchurl, zlib +, ocaml, ocamlfuse, findlib, gapi_ocaml, ocaml_sqlite3, camlidl }: stdenv.mkDerivation rec { name = "google-drive-ocamlfuse-${version}"; @@ -9,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1hjm6hyva9sl6lddb0372wsy7f76105iaxh976yyzfn3b4ran6ab"; }; - buildInputs = [ zlib ] ++ (with ocamlPackages; [ocaml ocamlfuse findlib gapi_ocaml ocaml_sqlite3 camlidl]); + buildInputs = [ zlib ocaml 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 c671ea0a586..dbb7b3fe237 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 +, gsm, speex, portaudio, spandsp, libuuid, ccache }: stdenv.mkDerivation rec { version = "0.4.20"; @@ -13,6 +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 ]; makeFlags = [ "LIBRE_MK=${libre}/share/re/re.mk" @@ -21,6 +22,7 @@ stdenv.mkDerivation rec { "LIBREM_PATH=${librem}" ''PREFIX=$(out)'' "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" @@ -29,7 +31,7 @@ stdenv.mkDerivation rec { "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=" "USE_G722=" "USE_G722_1=" + "USE_BV32=" "USE_COREAUDIO=" "USE_G711=1" "USE_G722=1" "USE_G722_1=" "USE_ILBC=" "USE_OPUS=" "USE_SILK=" ] ++ stdenv.lib.optional (stdenv.cc.cc != null) "SYSROOT_ALT=${stdenv.cc.cc}" diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix index e771db3795b..f0b74370c3c 100644 --- a/pkgs/applications/networking/instant-messengers/blink/default.nix +++ b/pkgs/applications/networking/instant-messengers/blink/default.nix @@ -4,7 +4,7 @@ pythonPackages.buildPythonApplication rec { name = "blink-${version}"; version = "2.0.0"; - + src = fetchurl { url = "http://download.ag-projects.com/BlinkQt/${name}.tar.gz"; sha256 = "07hvy45pavgkvdlh4wbz3shsxh4fapg96qlqmfymdi1nfhwghb05"; @@ -15,8 +15,7 @@ pythonPackages.buildPythonApplication rec { sed -i 's|@out@|'"''${out}"'|g' blink/resources.py ''; - propagatedBuildInputs = with pythonPackages;[ pyqt4 cjson sipsimple twisted - ]; + propagatedBuildInputs = with pythonPackages; [ pyqt4 cjson sipsimple twisted ]; buildInputs = [ pythonPackages.cython zlib libvncserver libvpx ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 3096d7dea2b..8506b5f138b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf -, glib, gnome, gtk, libnotify, libX11, libXcomposite, libXcursor, libXdamage +, glib, gnome2, gtk2, libnotify, libX11, libXcomposite, libXcursor, libXdamage , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango , systemd, libXScrnSaver }: @@ -17,7 +17,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype - gdk_pixbuf glib gnome.GConf gtk libnotify libX11 libXcomposite + gdk_pixbuf glib gnome2.GConf gtk2 libnotify libX11 libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst nspr nss pango systemd libXScrnSaver ]; diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix new file mode 100644 index 00000000000..8d7b16337f2 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/franz/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, makeDesktopItem +, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: + +let + bits = if stdenv.system == "x86_64-linux" then "x64" + else "ia32"; + + version = "4.0.4"; + + desktopItem = makeDesktopItem rec { + name = "Franz"; + exec = name; + icon = "franz"; + desktopName = name; + genericName = "Franz messenger"; + categories = "Network;"; + }; +in stdenv.mkDerivation rec { + name = "franz-${version}"; + src = fetchurl { + url = "https://github.com/meetfranz/franz-app/releases/download/${version}/Franz-linux-${bits}-${version}.tgz"; + sha256 = if bits == "x64" then + "0ssym0jfrig474g6j67g1jfybjkxnyhbqqjvrs8z6ihwlyd3rrk5" else + "16l9jma2hiwzl9l41yhrwribcgmxca271rq0cfbbm9701mmmciyy"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + deps = with xorg; [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib + cups expat stdenv.cc.cc + + udev libnotify + ]; + + unpackPhase = '' + tar xzf $src + ''; + + installPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Franz + patchelf --set-rpath "$out/share/franz:${stdenv.lib.makeLibraryPath deps}" Franz + + mkdir -p $out/bin $out/share/franz + cp -r * $out/share/franz + ln -s $out/share/franz/Franz $out/bin + + mkdir -p $out/share/applications $out/share/pixmaps + ln -s ${desktopItem}/share/applications/* $out/share/applications + ln -s $out/share/franz/resources/app.asar.unpacked/assets/franz.png $out/share/pixmaps + ''; + + meta = with stdenv.lib; { + description = "A free messaging app that combines chat & messaging services into one application"; + homepage = http://meetfranz.com; + license = licenses.free; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8d9cf434e5d..cc0c07daca4 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk +{ stdenv, fetchurl, python, intltool, pkgconfig, libX11 , ldns, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null , enableE2E ? true , enableRST ? true -, enableSpelling ? true, gtkspell ? null +, enableSpelling ? true, gtkspell2 ? null , enableNotifications ? false , extraPythonPackages ? pkgs: [] }: @@ -14,18 +14,18 @@ assert enableJingle -> farstream != null && gst_plugins_bad != null && libnice != null; assert enableE2E -> pythonPackages.pycrypto != null; assert enableRST -> pythonPackages.docutils != null; -assert enableSpelling -> gtkspell != null; +assert enableSpelling -> gtkspell2 != null; assert enableNotifications -> pythonPackages.notify != null; with stdenv.lib; stdenv.mkDerivation rec { name = "gajim-${version}"; - version = "0.16.5"; + version = "0.16.6"; src = fetchurl { url = "http://www.gajim.org/downloads/0.16/gajim-${version}.tar.bz2"; - sha256 = "14fhcqnkqygh91132dnf1idayj4r3iqbwb44sd3mxv20n6ribh55"; + sha256 = "1p3qwzy07f0wkika9yigyiq167l2k6wn12flqa7x55z4ihbysmqk"; }; patches = [ @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { src/features_window.py sed -i -e "s|'drill'|'${ldns}/bin/drill'|" src/common/resolver.py '' + optionalString enableSpelling '' - sed -i -e 's|=.*find_lib.*|= "${gtkspell}/lib/libgtkspell.so"|' \ + sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|' \ src/gtkspell.py ''; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - pythonPackages.pygobject pythonPackages.pyGtkGlade + pythonPackages.pygobject2 pythonPackages.pyGtkGlade pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg pythonPackages.nbxmpp diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 02d0267fcaf..e2f99f20e7c 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -4,7 +4,7 @@ let - version = "4.26.0.1657"; + version = "4.27.0.1658"; rpath = stdenv.lib.makeLibraryPath [ xdg_utils @@ -44,7 +44,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client/pool/HipChat4-${version}-Linux.deb"; - sha256 = "1ififcy1lhm0g4x9sprwfxlg34pkarkypww5ywsf8hvbcdnj02gp"; + sha256 = "1f0rgy5p9xcxfll6prir49vb7hjlnqx6xjaxlimhca4l30jvdsvn"; } else throw "HipChat is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/kadu/default.nix b/pkgs/applications/networking/instant-messengers/kadu/default.nix index 44cf13e2917..904002c3b44 100644 --- a/pkgs/applications/networking/instant-messengers/kadu/default.nix +++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig" ''; - cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS' -DCMAKE_BUILD_TYPE=Release"; + cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'"; prePatch = '' patchShebangs . diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 4ef2c81449a..3ae3f7bb3dd 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "mcabber-${version}"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "1phzfsl6cfzaga140dm8bb8q678j0qsw29cc03rw4vkcxa8kh577"; + sha256 = "16hkb7v1sqp1gqj94darwwrv23alqaiqdhqjq8gjd6f3l05bprj4"; }; buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ]; @@ -23,5 +23,7 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ pSub ]; platforms = with platforms; linux; + updateWalker = true; + downloadURLRegexp = "mcabber-[0-9.]+[.]tar[.][a-z0-9]+$"; }; } diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix index 00650bb685d..3d70990f462 100644 --- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix +++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub , perl, xulrunner, cmake, perlPackages, zip, unzip, pkgconfig -, libpulseaudio, glib, gtk, pixman, nspr, nss, libXScrnSaver +, libpulseaudio, glib, gtk2, pixman, nspr, nss, libXScrnSaver , scrnsaverproto }: @@ -17,9 +17,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake zip unzip ]; buildInputs = - [ perl xulrunner libpulseaudio glib gtk pixman nspr + [ perl xulrunner libpulseaudio glib gtk2 pixman nspr nss libXScrnSaver scrnsaverproto - ] ++ [ perlPackages.SubName gtk glib ]; + ] ++ [ perlPackages.SubName gtk2 glib ]; postPatch = '' sed -e '1i#include ' -i src/rtp/otRTPDecoder.cpp src/rtp/otRTPEncoder.cpp diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix index 245894147dc..4a53513061a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk }: +{ stdenv, fetchurl, pkgconfig, pidgin, texLive, imagemagick, glib, gtk2 }: let version = "1.5.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [pkgconfig]; - buildInputs = [gtk glib pidgin]; + buildInputs = [gtk2 glib pidgin]; makeFlags = "PREFIX=$(out)"; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix new file mode 100644 index 00000000000..cc58736afa5 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-facebook/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pidgin, glib, json_glib, mercurial, autoreconfHook } : + +stdenv.mkDerivation rec { + name = "purple-facebook-${version}"; + version = "2016-04-09"; + + src = fetchFromGitHub { + owner = "dequis"; + repo = "purple-facebook"; + rev = "66ee77378d82"; + sha256 = "0kr9idl79h70lacd3cvpmzvfd6il3b5xm2fj1sj96l7bjhiw9s3y"; + }; + + preAutoreconf = "./autogen.sh"; + + makeFlags = [ + "PLUGIN_DIR_PURPLE=/lib/pidgin/" + "DATA_ROOT_DIR_PURPLE=/share" + "DESTDIR=$(out)" + ]; + + postInstall = '' + mkdir -p $out/lib/purple-2 + cp pidgin/libpurple/protocols/facebook/.libs/*.so $out/lib/purple-2/ + ''; + + buildInputs = [ pidgin glib json_glib mercurial autoreconfHook]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Facebook protocol plugin for libpurple"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ davorb ]; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix index 494496e4807..7134b3179d0 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-hangouts/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "purple-hangouts-hg-${version}"; - version = "2016-07-17"; + version = "2016-10-01"; src = fetchhg { url = "https://bitbucket.org/EionRobb/purple-hangouts/"; - rev = "2c60a5e"; - sha256 = "1m8132ywg9982q3yiqgy1hzm61wkgi590425pp8yk1q03yipd6zb"; + rev = "00e28b7"; + sha256 = "08jllhhww3cqlw6dg9w1hli3havdfzb47grcdl184537gl2bl49d"; }; buildInputs = [ pidgin glib json_glib protobuf protobufc ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 9123f6b39ed..def683882dc 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk, gtkspell, aspell -, gstreamer, gst_plugins_base, gst_plugins_good, startupnotification, gettext -, perl, perlXMLParser, libxml2, nss, nspr, farsight2 +{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk2, gtkspell2, aspell +, gst_all_1, startupnotification, gettext +, perl, perlXMLParser, libxml2, nss, nspr, farstream, farsight2 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , lib, python, libICE, libXext, libSM , openssl ? null @@ -14,21 +14,23 @@ let unwrapped = stdenv.mkDerivation rec { name = "pidgin-${version}"; majorVersion = "2"; - version = "${majorVersion}.10.11"; + version = "${majorVersion}.11.0"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj"; + sha256 = "0crkggjj6y07v1kdwil9vw532b0vrs6p33nmlvdkpnl60m2169pp"; }; inherit nss ncurses; nativeBuildInputs = [ makeWrapper ]; + NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; + buildInputs = [ - gtkspell aspell - gstreamer gst_plugins_base gst_plugins_good startupnotification - libxml2 nss nspr farsight2 + gtkspell2 aspell startupnotification + gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good + libxml2 nss nspr farstream farsight2 libXScrnSaver ncurses python avahi dbus dbus_glib intltool libidn libICE libXext libSM @@ -38,10 +40,10 @@ let unwrapped = stdenv.mkDerivation rec { ++ (lib.optional (libgcrypt != null) libgcrypt); propagatedBuildInputs = [ - pkgconfig gtk perl perlXMLParser gettext + pkgconfig gtk2 perl perlXMLParser gettext ]; - patches = [./pidgin-makefile.patch ./add-search-path.patch ]; + patches = [ ./pidgin-makefile.patch ./add-search-path.patch ]; configureFlags = [ "--with-nspr-includes=${nspr.dev}/include/nspr" diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch index 2812496effa..049d404a8d5 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-makefile.patch @@ -1,15 +1,16 @@ -diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am ---- pidgin-2.6.4/pidgin/Makefile.am 2009-11-30 04:13:54.000000000 +0100 -+++ pidgin-2.6.4.new/pidgin/Makefile.am 2009-12-27 17:30:58.000000000 +0100 -@@ -200,6 +200,7 @@ +diff --git a/pidgin/Makefile.am b/pidgin/Makefile.am +index 84d927b..1467c19 100644 +--- a/pidgin/Makefile.am ++++ b/pidgin/Makefile.am +@@ -151,6 +151,7 @@ pidgin_LDADD = \ $(GLIB_LIBS) \ $(DBUS_LIBS) \ $(GSTREAMER_LIBS) \ + $(GSTINTERFACES_LIBS) \ + $(GSTVIDEO_LIBS) \ $(XSS_LIBS) \ $(SM_LIBS) \ - $(INTLLIBS) \ -@@ -224,6 +225,7 @@ +@@ -171,6 +172,7 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ $(GLIB_CFLAGS) \ $(GSTREAMER_CFLAGS) \ @@ -17,18 +18,19 @@ diff -ru pidgin-2.6.4/pidgin/Makefile.am pidgin-2.6.4.new/pidgin/Makefile.am $(DEBUG_CFLAGS) \ $(GTK_CFLAGS) \ $(DBUS_CFLAGS) \ -diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in ---- pidgin-2.6.4/pidgin/Makefile.in 2009-11-30 05:12:21.000000000 +0100 -+++ pidgin-2.6.4.new/pidgin/Makefile.in 2009-12-27 17:30:36.000000000 +0100 -@@ -645,6 +645,7 @@ +diff --git a/pidgin/Makefile.in b/pidgin/Makefile.in +index 0d51e25..dd5d879 100644 +--- a/pidgin/Makefile.in ++++ b/pidgin/Makefile.in +@@ -703,6 +703,7 @@ EXTRA_DIST = \ @ENABLE_GTK_TRUE@ $(GLIB_LIBS) \ @ENABLE_GTK_TRUE@ $(DBUS_LIBS) \ @ENABLE_GTK_TRUE@ $(GSTREAMER_LIBS) \ +@ENABLE_GTK_TRUE@ $(GSTINTERFACES_LIBS) \ + @ENABLE_GTK_TRUE@ $(GSTVIDEO_LIBS) \ @ENABLE_GTK_TRUE@ $(XSS_LIBS) \ @ENABLE_GTK_TRUE@ $(SM_LIBS) \ - @ENABLE_GTK_TRUE@ $(INTLLIBS) \ -@@ -666,6 +667,7 @@ +@@ -723,6 +724,7 @@ EXTRA_DIST = \ @ENABLE_GTK_TRUE@ -I$(top_srcdir) \ @ENABLE_GTK_TRUE@ $(GLIB_CFLAGS) \ @ENABLE_GTK_TRUE@ $(GSTREAMER_CFLAGS) \ @@ -36,23 +38,25 @@ diff -ru pidgin-2.6.4/pidgin/Makefile.in pidgin-2.6.4.new/pidgin/Makefile.in @ENABLE_GTK_TRUE@ $(DEBUG_CFLAGS) \ @ENABLE_GTK_TRUE@ $(GTK_CFLAGS) \ @ENABLE_GTK_TRUE@ $(DBUS_CFLAGS) \ -diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.am pidgin-2.6.4.new/pidgin/plugins/Makefile.am ---- pidgin-2.6.4/pidgin/plugins/Makefile.am 2009-11-30 04:13:57.000000000 +0100 -+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.am 2009-12-27 16:58:50.000000000 +0100 -@@ -137,6 +137,7 @@ - $(DEBUG_CFLAGS) \ +diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am +index 3bb8c22..6d1e869 100644 +--- a/pidgin/plugins/Makefile.am ++++ b/pidgin/plugins/Makefile.am +@@ -145,6 +145,7 @@ AM_CPPFLAGS = \ $(GTK_CFLAGS) \ + $(UNITY_CFLAGS) \ $(GSTREAMER_CFLAGS) \ + $(GSTINTERFACES_CFLAGS) \ $(PLUGIN_CFLAGS) # -diff -ru pidgin-2.6.4/pidgin/plugins/Makefile.in pidgin-2.6.4.new/pidgin/plugins/Makefile.in ---- pidgin-2.6.4/pidgin/plugins/Makefile.in 2009-11-30 05:12:22.000000000 +0100 -+++ pidgin-2.6.4.new/pidgin/plugins/Makefile.in 2009-12-27 16:59:13.000000000 +0100 -@@ -644,6 +644,7 @@ - $(DEBUG_CFLAGS) \ +diff --git a/pidgin/plugins/Makefile.in b/pidgin/plugins/Makefile.in +index 82a34aa..1f7db00 100644 +--- a/pidgin/plugins/Makefile.in ++++ b/pidgin/plugins/Makefile.in +@@ -781,6 +781,7 @@ AM_CPPFLAGS = \ $(GTK_CFLAGS) \ + $(UNITY_CFLAGS) \ $(GSTREAMER_CFLAGS) \ + $(GSTINTERFACES_CFLAGS) \ $(PLUGIN_CFLAGS) diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 3b7b96b778f..8190be65e75 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ] ++ stdenv.lib.optional isx86_64 dclxvi diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.json b/pkgs/applications/networking/instant-messengers/pond/deps.json deleted file mode 100644 index c4d600a2ab3..00000000000 --- a/pkgs/applications/networking/instant-messengers/pond/deps.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/agl/ed25519", - "fetch": { - "type": "git", - "url": "https://github.com/agl/ed25519", - "rev": "278e1ec8e8a6e017cd07577924d6766039146ced", - "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/agl/go-gtk", - "fetch": { - "type": "git", - "url": "https://github.com/agl/go-gtk", - "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15", - "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d" - } - } -] diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.nix b/pkgs/applications/networking/instant-messengers/pond/deps.nix new file mode 100644 index 00000000000..55850f0a89c --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pond/deps.nix @@ -0,0 +1,47 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + fetch = { + type = "git"; + url = "https://github.com/agl/ed25519"; + rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; + sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/agl/go-gtk"; + fetch = { + type = "git"; + url = "https://github.com/agl/go-gtk"; + rev = "91c1edb38c241d73129e6b098ca1c9fa83abfc15"; + sha256 = "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"; + }; + } +] diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix new file mode 100644 index 00000000000..e1cfb2fcedd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, makeDesktopItem +, xorg, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig +, gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify }: + +let + bits = if stdenv.system == "x86_64-linux" then "x64" + else "ia32"; + + version = "0.4.4"; + + myIcon = fetchurl { + url = "https://raw.githubusercontent.com/saenzramiro/rambox/9e4444e6297dd35743b79fe23f8d451a104028d5/resources/Icon.png"; + sha256 = "0r00l4r5mlbgn689i3rp6ks11fgs4h2flvrlggvm2qdd974d1x0b"; + }; + + desktopItem = makeDesktopItem rec { + name = "Rambox"; + exec = name; + icon = myIcon; + desktopName = name; + genericName = "Rambox messenger"; + categories = "Network;"; + }; +in stdenv.mkDerivation rec { + name = "rambox-${version}"; + src = fetchurl { + url = "https://github.com/saenzramiro/rambox/releases/download/${version}/Rambox-${version}-${bits}.tar.gz"; + sha256 = if bits == "x64" then + "05xwabwij7fyifrypahcplymz46k01rzrwgp5gn79hh023w259i0" else + "16j17rc8mld96mq1rxnwmxwfa2q5b44s40c56mwh34plqyn546l2"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + deps = with xorg; [ + gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus + libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes + libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib + cups expat stdenv.cc.cc + + udev libnotify + ]; + + installPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Rambox + patchelf --set-rpath "$out/share/rambox:${stdenv.lib.makeLibraryPath deps}" Rambox + + mkdir -p $out/bin $out/share/rambox + cp -r * $out/share/rambox + ln -s $out/share/rambox/Rambox $out/bin + + mkdir -p $out/share/applications + ln -s ${desktopItem}/share/applications/* $out/share/applications + ''; + + meta = with stdenv.lib; { + description = "Free and Open Source messaging and emailing app that combines common web applications into one"; + homepage = http://rambox.pro; + license = licenses.mit; + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + platforms = ["i686-linux" "x86_64-linux"]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix index 78814fcb4b2..c035fc62665 100644 --- a/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix +++ b/pkgs/applications/networking/instant-messengers/salut-a-toi/default.nix @@ -12,7 +12,7 @@ in stdenv.mkDerivation rec { buildInputs = with pythonPackages; [ - python twisted urwid beautifulsoup wxPython pygobject + python twisted urwid beautifulsoup wxPython pygobject2 wokkel dbus-python pyfeed wrapPython setuptools ]; diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index 64911271f5e..9f2fee47d8d 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, dpkg -, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome +, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, glib, gnome2 , libnotify, nspr, nss, systemd, xorg }: let - version = "2.1.2"; + version = "2.2.1"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -16,10 +16,10 @@ let fontconfig freetype glib - gnome.GConf - gnome.gdk_pixbuf - gnome.gtk - gnome.pango + gnome2.GConf + gnome2.gdk_pixbuf + gnome2.gtk + gnome2.pango libnotify nspr nss @@ -43,7 +43,7 @@ let if stdenv.system == "x86_64-linux" then fetchurl { url = "https://slack-ssb-updates.global.ssl.fastly.net/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "0bmz9d0p6676lzl4qxy6xmcampr2ilkc0mhh67860kcxjaz6sms6"; + sha256 = "1x08bmkanllv3lpi2s722xs7qia8igf6zxzkc3g7vs5jms3mdrad"; } else throw "Slack is not supported on ${stdenv.system}"; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index de8d0c19b4f..980d21572cc 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,19 +1,20 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "xmpp-client-${version}"; - version = "20160110-${stdenv.lib.strings.substring 0 7 rev}"; - rev = "525bd26cf5f56ec5aee99464714fd1d019c119ff"; + version = "20160916-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "abbf9020393e8caae3e8996a16ce48446e31cf0e"; goPackagePath = "github.com/agl/xmpp-client"; - src = fetchgit { + src = fetchFromGitHub { + owner = "agl"; + repo = "xmpp-client"; inherit rev; - url = "https://github.com/agl/xmpp-client"; - sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253"; + sha256 = "0j9mfr208cachzm39i8b94v5qk9hws278vv2ms9ma4wn16wns81s"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "An XMPP client with OTR support"; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json deleted file mode 100644 index 7ac2b86cc21..00000000000 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - } -] diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix new file mode 100644 index 00000000000..caa41024fc6 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } +] diff --git a/pkgs/applications/networking/irc/hexchat/default.nix b/pkgs/applications/networking/irc/hexchat/default.nix index da47ec6580b..bc1d0344490 100644 --- a/pkgs/applications/networking/irc/hexchat/default.nix +++ b/pkgs/applications/networking/irc/hexchat/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, lua, perl, python -, libtool, pciutils, dbus_glib, libcanberra, libproxy +{ stdenv, fetchurl, pkgconfig, gtk2, lua, perl, python +, libtool, pciutils, dbus_glib, libcanberra_gtk2, libproxy , libsexy, enchant, libnotify, openssl, intltool , desktop_file_utils, hicolor_icon_theme }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk lua perl python pciutils dbus_glib libcanberra libproxy + gtk2 lua perl python pciutils dbus_glib libcanberra_gtk2 libproxy libsexy libnotify openssl desktop_file_utils hicolor_icon_theme ]; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index a467cead17c..5fd45368536 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { - version = "0.8.19"; + version = "0.8.20"; name = "irssi-${version}"; src = fetchurl { urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ]; - sha256 = "0ny8dry1b8siyc5glaxcwzng0d2mxnwxk74v64f8xplqhrvlnkzy"; + sha256 = "0riz2wsdcs5hx5rwynm99fi01973lfrss21y8qy30dw2m9v0zqpm"; }; buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ]; diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix index 38c2c3c2930..4d73648edf7 100644 --- a/pkgs/applications/networking/irc/irssi/otr/default.nix +++ b/pkgs/applications/networking/irc/irssi/otr/default.nix @@ -1,5 +1,11 @@ -{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +{ stdenv, fetchurl, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }: +let + versionFix = fetchurl { + url = https://patch-diff.githubusercontent.com/raw/cryptodotis/irssi-otr/pull/60.patch; + sha256 = "18fk9nbzf3fvhvvvkrxv5l004hhimapqb6ra09m83268kbl4q3jy"; + }; +in with stdenv.lib; stdenv.mkDerivation rec { name = "irssi-otr-${version}"; @@ -12,12 +18,14 @@ stdenv.mkDerivation rec { sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg"; }; - patchPhase = '' + prePatch = '' sed -i 's,/usr/include/irssi,${irssi}/include/irssi,' src/Makefile.am sed -i "s,/usr/lib/irssi,$out/lib/irssi," configure.ac sed -i "s,/usr/share/irssi,$out/share/irssi," help/Makefile.am ''; + patches = [ versionFix ]; + preConfigure = "sh ./bootstrap"; buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ]; diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index 75e5cc4db43..71358c806d8 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -20,12 +20,12 @@ let in stdenv.mkDerivation rec { - version = "1.5"; + version = "1.6"; name = "weechat-${version}"; src = fetchurl { url = "http://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "0n4cbhh9a7qq6y70ac9b4r0kb7hydwsic99h45ppr2jly322fvij"; + sha256 = "0d1wcpsxx13clcf1ygcn5hsa1pjkck4xznbjbxphbdxd5whsbv3k"; }; cmakeFlags = with stdenv.lib; [] @@ -50,7 +50,9 @@ stdenv.mkDerivation rec { ++ optional tclSupport tcl ++ extraBuildInputs; - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=/etc/ssl/certs/ca-certificates.crt"; + NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}" + # Fix '_res_9_init: undefined symbol' error + + (stdenv.lib.optionalString stdenv.isDarwin "-DBIND_8_COMPAT=1"); postInstall = with stdenv.lib; '' NIX_PYTHONPATH="$out/lib/${python.libPrefix}/site-packages" diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index 62a58c42cd4..346dba3acd5 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, wrapGAppsHook -, curl, dbus, dbus_glib, enchant, gtk, gnutls, gnupg, gpgme, hicolor_icon_theme -, libarchive, libcanberra, libetpan, libnotify, libsoup, libxml2, networkmanager +, curl, dbus, dbus_glib, enchant, gtk2, gnutls, gnupg, gpgme, hicolor_icon_theme +, libarchive, libcanberra_gtk2, libetpan, libnotify, libsoup, libxml2, networkmanager , openldap , perl, pkgconfig, poppler, python, shared_mime_info, webkitgtk2 , glib_networking, gsettings_desktop_schemas @@ -55,13 +55,13 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ curl dbus dbus_glib gtk gnutls gsettings_desktop_schemas hicolor_icon_theme + [ curl dbus dbus_glib gtk2 gnutls gsettings_desktop_schemas hicolor_icon_theme libetpan perl pkgconfig python wrapGAppsHook glib_networking ] ++ optional enableSpellcheck enchant ++ optionals (enablePgp || enablePluginSmime) [ gnupg gpgme ] ++ optional enablePluginArchive libarchive - ++ optional enablePluginNotificationSounds libcanberra + ++ optional enablePluginNotificationSounds libcanberra_gtk2 ++ optional enablePluginNotificationDialogs libnotify ++ optional enablePluginFancy libsoup ++ optional enablePluginRssyl libxml2 diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 0be5e0bd57e..2bc9b3babbd 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,16 +1,14 @@ -{ stdenv, fetchurl, fetchpatch, ncurses, which, perl, autoreconfHook +{ stdenv, fetchurl, ncurses, which, perl , gdbm ? null , openssl ? null , cyrus_sasl ? null , gpgme ? null -, aclocal ? null , headerCache ? true , sslSupport ? true , saslSupport ? true , gpgmeSupport ? true , imapSupport ? true -, withSidebar ? false -, withTrash ? false +, withSidebar ? true }: assert headerCache -> gdbm != null; @@ -22,11 +20,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mutt-${version}"; - version = "1.6.2"; + version = "1.7.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${name}.tar.gz"; - sha256 = "13hxmji7v9m2agmvzrs7gzx8s3c9jiwrv7pbkr7z1kc6ckq2xl65"; + sha256 = "1pyns0xw52s4yma1a93pdcl4dirs55q2m1hd7w1r11nlhf7giip9"; }; buildInputs = @@ -34,8 +32,7 @@ stdenv.mkDerivation rec { ++ optional headerCache gdbm ++ optional sslSupport openssl ++ optional saslSupport cyrus_sasl - ++ optional gpgmeSupport gpgme - ++ optional withSidebar autoreconfHook; + ++ optional gpgmeSupport gpgme; configureFlags = [ (enableFeature headerCache "hcache") @@ -60,18 +57,6 @@ stdenv.mkDerivation rec { ] ++ optional sslSupport "--with-ssl" ++ optional saslSupport "--with-sasl"; - patches = - optional withTrash (fetchpatch { - name = "trash.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/trash.patch?h=mutt-sidebar"; - sha256 = "1hrib9jk28mqd02nzv0sx01jfdabzvnwcc5qjc3810zfglzc1nql"; - }) ++ - optional withSidebar (fetchpatch { - name = "sidebar.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/sidebar.patch?h=mutt-sidebar"; - sha256 = "1l63wj7kw41jrh00mcxdw4p4vrbc9wld42s99liw8kz2aclymq5m"; - }); - meta = { description = "A small but very powerful text-based mail client"; homepage = http://www.mutt.org; diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index be4ce9e41f2..c1c7947cd0a 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -2,14 +2,14 @@ , cyrus_sasl, gdbm, gpgme, kerberos, libidn, notmuch, openssl }: stdenv.mkDerivation rec { - version = "20160827"; + version = "20160910"; name = "neomutt-${version}"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = "neomutt-${version}"; - sha256 = "1gam2iyy75drlp9ap1hlfb38i0p6zwgw09m08m5x50dbp3lxf7xp"; + sha256 = "1i1idqk9l3njqsiw8n8jgjawcz9n9h5180qvpxfwg7sg9zx2sjhj"; }; buildInputs = diff --git a/pkgs/applications/networking/mailreaders/sylpheed/default.nix b/pkgs/applications/networking/mailreaders/sylpheed/default.nix index 65c1001ae78..b1cdd509f98 100644 --- a/pkgs/applications/networking/mailreaders/sylpheed/default.nix +++ b/pkgs/applications/networking/mailreaders/sylpheed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk +{ stdenv, fetchurl, pkgconfig, gtk2 , openssl ? null , gpgme ? null @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig gtk ] + [ pkgconfig gtk2 ] ++ optional sslSupport openssl ++ optional gpgSupport gpgme; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index f2b2f6dfa5c..c1bcd9ac541 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -15,7 +15,7 @@ , glibc , gst_plugins_base , gstreamer -, gtk +, gtk2 , kerberos , libX11 , libXScrnSaver @@ -26,7 +26,7 @@ , libXinerama , libXrender , libXt -, libcanberra +, libcanberra_gtk2 , libgnome , libgnomeui , mesa @@ -87,7 +87,7 @@ stdenv.mkDerivation { glibc gst_plugins_base gstreamer - gtk + gtk2 kerberos libX11 libXScrnSaver @@ -98,7 +98,7 @@ stdenv.mkDerivation { libXinerama libXrender libXt - libcanberra + libcanberra_gtk2 libgnome libgnomeui mesa diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix index 0ff4d5a5f2a..f8509a46248 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix @@ -4,123 +4,123 @@ # ruby generate_sources.rb 45.1.1 > sources.nix { - version = "45.3.0"; + version = "45.4.0"; sources = [ - { locale = "ar"; arch = "linux-i686"; sha512 = "a2d1728cec3775a3a012ada32a8934fa1a94ff0af315e395e765c94873593c4e2ddb1ec5acee33a83f2970137087ff1fd6ba23b0bbea3780e4f67a3b46146911"; } - { locale = "ar"; arch = "linux-x86_64"; sha512 = "d29362ecf4abe3cb7224058ffb421feafe5ddb277ad8cae407907c0939028e7e03079ec3b6a691cf260ea29908be7df4377dbc626704da622548056f45b6e9d7"; } - { locale = "ast"; arch = "linux-i686"; sha512 = "51fb3626875acbf78f0d2337feee07aeaca24dec59042a2b6374afb205dce099df477ab3384e0e9c545fe68ac13af921a8d3a1c4c93f721d7831f3aca15e4783"; } - { locale = "ast"; arch = "linux-x86_64"; sha512 = "660376e67491f11d484ff112b8b8d1dc9187a7bb7f7ff1e8665d3693e5eee9737bff8f23f69f4d71b2d3f3be0ad4d816febb4894bb17ac911e19ef18411fc667"; } - { locale = "be"; arch = "linux-i686"; sha512 = "be5fed683ee9b325f135e65fc6f641d81b7294f3d13f411b36b4e73d68a8b8592d0c93fa6ad55fc9aa8a281a5d2069f3f8dcf029038d867f3b87baf8e4a93411"; } - { locale = "be"; arch = "linux-x86_64"; sha512 = "4b92f1999478d9a97737b31f34ca78bcbf6d657297b0ef791327c73d89a1737a29df9eaca47aed3e0f1ddf0d4925ba6c0a51584ca8009237ea98fec9007e69b9"; } - { locale = "bg"; arch = "linux-i686"; sha512 = "76d2450774254052ee216644f53025ffd4a928932955d856e16141a95b557fc327b17f01d4c47ff3b7f8a8c267a6a78511c126980554bf64f5fa5c06eba758fe"; } - { locale = "bg"; arch = "linux-x86_64"; sha512 = "53f2463e8838e6dc53fd1212745f401dbbffec484036745114f04e90e2270421efb0e579724023f1a153e2fbf5afb9e31b383b9d0a8e74ec15cdd17aff04b58c"; } - { locale = "bn-BD"; arch = "linux-i686"; sha512 = "c798161824be7fd3253308b3157c0dfb5dbec085f2b530fa4a7cd8992b8e602031c0c8f6959449a3a7f988f10b00b1f99f331b017c8d38358a017e54c2ff5166"; } - { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "8f8fafa9a79696a81e2e4a7e033edec1e37c44fc6b4a5a20cea0853f88ac978fa536109a81f5fe7baf574af6e1778975b8df5e0a47a0c6cb8161dd19f3e2c067"; } - { locale = "br"; arch = "linux-i686"; sha512 = "9007da613fd8930e669da228197d5be59d53a26f94453523ae468a0b4172adb4509e5ae1677ca21421031238910d19f45323fb09ef52ac95205f1fa3a1d8ce46"; } - { locale = "br"; arch = "linux-x86_64"; sha512 = "57cead8865a052981729f55f85f402329dd4151cf3f89ad5c6cc1a83a068a9ba1e309db521ecde1cf90a3737b04a7d992087a68b93506ce0ab4a7ea26253b761"; } - { locale = "ca"; arch = "linux-i686"; sha512 = "5401395d2e57ada9b62fd1d8a90006e60884a38086fe74bc720109d1fd8d989292bcb2781c1b30f19fbfcb867bf157bf33c3948463ab1e0fd8ddbfbc790b492d"; } - { locale = "ca"; arch = "linux-x86_64"; sha512 = "1d69ddc33643c7227d80cbb61087a73ff46c79e1531479531201b4e49a53400fc576f445306dad20b318f189e8b739179390f9ca7fd340e2d2cac46650569da6"; } - { locale = "cs"; arch = "linux-i686"; sha512 = "25a9c864e60aced998c1599786a9cb3db92c02b9d855c7500fd466cd92f4bc8ff6fc7c5cb37c52b3dbba990ae4ce0eee1854f4f3459b4c2ce50e4e4ccd3ff445"; } - { locale = "cs"; arch = "linux-x86_64"; sha512 = "0b1b72a4f43192afa03fcf17e234fa6d09ab20cccadc0a58682b37c96a576c31d2e5022d3d778992c188b826816d7d36e56fbf4055a0be2213e45062a162939d"; } - { locale = "cy"; arch = "linux-i686"; sha512 = "b69312902ede9687c804a068f9fcf70c0c3c68786d92c72a5b38ed38e9773382223e5d09a2067632b02ae9e2f224c85e0c95de9ada535e0b8e37ce5f6aa86006"; } - { locale = "cy"; arch = "linux-x86_64"; sha512 = "bd03a664a14c2b7271db1ae66f65fada02eb995da9d8466f345d25b40bbd7f836e48e9e8f19276f7109e5e42effc3be70d0c20705d386620319c6e2c920027c4"; } - { locale = "da"; arch = "linux-i686"; sha512 = "2fce874759494b51d9f9081f26985834527984cec849f1f07ebd0f3b7523bdeb7a39cae6d17f021e82972f392ae7cc33d6b81606f81afc7bc35a75698889905d"; } - { locale = "da"; arch = "linux-x86_64"; sha512 = "c7fd6b68f50c2ea4abb2d72dfb804db0e5ff3a8dd932f36fb7e9f194f4a12469bf64785ba18ad6f989b5456e6a0387c17fcf421075341998dce315f658b70058"; } - { locale = "de"; arch = "linux-i686"; sha512 = "8661fd16bcb94fba14156ea0d569364b495dd470359491b482f6e9c957a6ffd1c9b3a60728d6a0755a1789d6c3029952bead677df38d3f7e972469cd877d96a2"; } - { locale = "de"; arch = "linux-x86_64"; sha512 = "c98b8afbd38e3ea31196a2dfdd3e8a13639aed9a3052a25dbcf851139a75167481b67c94542be310c5a2fd8850c8396ff2fbb57ac14b0158c87b6e30562d1eb6"; } - { locale = "dsb"; arch = "linux-i686"; sha512 = "2e5f781f0ea57f4cc129693d5085d17047ecdde3273a97b83717e793bef2693ddd543078c667635e2603e5a4867fdee60cecf0fe47170f84d31456c72f4753a1"; } - { locale = "dsb"; arch = "linux-x86_64"; sha512 = "fcaad0f6ea4f9610bbfb5efd414005ab1b62d13799e2f0ff0188c0e262910c881f0e7ca838c6d18df0bc629eb26e4dc34e48635fb64029f484c0fe3aec12cef0"; } - { locale = "el"; arch = "linux-i686"; sha512 = "d71b2805881cf5b7f0c06e398289907f224bbb58ffe676c32587f98cdfa6d80b1a8497bf4d1d515a4b1ba8472f5250dc7df178a0fd47baf51746409c18157d69"; } - { locale = "el"; arch = "linux-x86_64"; sha512 = "89309f36b503f1be5a23f24def962a7ed6604369fc1e3a254deaf3fca6b020837813e7b3a5896320620301eb14025c604121c4b6727f1362d6783da6256be039"; } - { locale = "en-GB"; arch = "linux-i686"; sha512 = "233fb74c88ff43fc5520fef6fc052019551405ed43e786448c9b7921fb620b81b8b1569dbd3c57b7e8a0aa34043b29fa388100ab0ad66545bb84675de43d4b9b"; } - { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "70dddef3561b53d359ed59205dd77d661f6842a7ac4a62d79f2f2576a7d2b9a8735ae7e48759b669bade841dd7329857d4c273fd6e202f1ae22201b7d461def3"; } - { locale = "en-US"; arch = "linux-i686"; sha512 = "bf1f75d614dc0e401981b81d84911f2e13a1c8fc668b8a7c531963162ac293f72d6252aceb4447c97c57cc3b632452de6475f294f82090751141c3f8f681b868"; } - { locale = "en-US"; arch = "linux-x86_64"; sha512 = "5b7ba243783d5bd3eb1acc6cad872b5f2885cf289d33274932ceee2159295c84230f692a1338fc4c4c3e1947436917251ed54a6995922b4777bdee7e5303ec29"; } - { locale = "es-AR"; arch = "linux-i686"; sha512 = "9fddac56cc41a0b83c794ad7b7744573a6039c736d785a46666fb5c40360aae0397d129e523a7ac8b7e9b07295b56741e96e8cea770533c7c3611c209f9ae5ad"; } - { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "f7d7a051bc7411d2811aa5672da7aff51ee96065eb26e47e9eda721c0e125a529353a6290195cc257f36e44dbca6d81dff1342478a52b0d700f7def335135440"; } - { locale = "es-ES"; arch = "linux-i686"; sha512 = "b0b32a37d13b76899037c7d34e2444cb45d54166516c6f6f141ae4713e5cca36827c0c02f4d9614a1c7eb5d9d859087586dda3e311d221f19091414557f9b713"; } - { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "918affe04e2dbf1f8d2f65a8a16cb30d575631d323eeb5cd29e76f2b30d003337e35792e57f78ca6bf8abd253f005296b44b71ecd4c48d055456b8820a2b8551"; } - { locale = "et"; arch = "linux-i686"; sha512 = "7a2aaa9e81fa166ad66ef6a275ea1e1b1f333946e73bd22c7954b78641949a870e8c4ff38f763ef22bbf25cf81ad0138e5d4b154b1d2cb90126ef53e56b6e676"; } - { locale = "et"; arch = "linux-x86_64"; sha512 = "cfb751a0d94cbc3e130abe78dceb81117750b16c9665860a083a71554ce96e9102fa3c8b084c7acf07c9e10a8fe30e54e5964a214486c2bd16d93678a4b6948d"; } - { locale = "eu"; arch = "linux-i686"; sha512 = "c99dd3738739f06963cf3e31d72831d8861c898ac512b0563f0d9ab21e671fed55c0e16e07ff87e058873095204a81f1756d77453e792bcc522c81d6ac26638c"; } - { locale = "eu"; arch = "linux-x86_64"; sha512 = "4726d30ed22d79edca4d3a6082ecf40cb107b28aeebcc1ed21faca951cd955fca524d4c16f4e9ac71fd57651c2392d79c5adcafea9a7dadbe84dc3e3511f47f4"; } - { locale = "fi"; arch = "linux-i686"; sha512 = "3fe4ae74f046a0fcf95570ff7cd00abfa63567153bbabd036ecd8cccf1aab075b19e43642e247c741165d3990f1690d4c7f4b3eb16aaa34188d1bd17c202e06d"; } - { locale = "fi"; arch = "linux-x86_64"; sha512 = "5e76a85eb66d62c2fcd42d0274e43c052131bd2a8d54bce256e417782d1b97985cc9a917fba18ab1118e72fd3bacb94abdf5620c1be9a7225f6c9b62f1eb0e02"; } - { locale = "fr"; arch = "linux-i686"; sha512 = "216e084442018d1e5925d4deb14c11bda248d5015696b22167693f2534dd98049dd385bc3061348085113487b93cfea675cb7ea528ca4385022b33860b39633a"; } - { locale = "fr"; arch = "linux-x86_64"; sha512 = "6fbb2935899d94b3f56b27c131e2574f6735fba4147430a1dd5cd8728db29b90fd1416bc3661b1a3a927f496e9d716ae165ed8c65951184c2b1e07c962f876df"; } - { locale = "fy-NL"; arch = "linux-i686"; sha512 = "f752dbe8d2e90c0b5e60faa0b34280050463ea1bdda0749c9d46a46f08339e5952eacf70f0765144677362c9dad51c24a3bdffeb89e309563e472484f436993f"; } - { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "302d8bf3941e0dff52918202f7f885dcb14ae9504baf52686a5c9201a644d469c57925181074ac0789d437d9bd8bfa965ae2ccbd54f51dbe2bc352b29d4a1e9c"; } - { locale = "ga-IE"; arch = "linux-i686"; sha512 = "be52801d6995cd377d451a640e319c2b812d83d62cbb2c3bf7063a18f03838f9b758add09875aa9e4e973b3ce3ac285f6f3486a7495590acf5672ccb900e5528"; } - { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "a475b35c3fbd9fee3e4fd1475b9d3138d58df296744660dd8cc1932f121bbe9b1a2324c6452a4159b5c97a3846f38e92b9214a512d739a897cffeb40805cc0c7"; } - { locale = "gd"; arch = "linux-i686"; sha512 = "88e209d87e38dd950b1248351d6b0518f63dd27423d2f30df1b177740dda4fb3568e19361b066ddd758fe071a7f2c747f8ff9307d6745b9d68002bb34be5dc77"; } - { locale = "gd"; arch = "linux-x86_64"; sha512 = "a56c26c2393323a8ec9190a89b3c1a4a27de9086222791e6cc84de0f640e2700274b92ffda0a21aa1de39684443108499122a12fbf5ceec3df69301132cf3463"; } - { locale = "gl"; arch = "linux-i686"; sha512 = "bc180ce7132641596151a1b6516b6ab9aa6070c542fbe90be7e440580c8f7a488348ba238922e33c8aea10505814604d5f5568d03978bcc75db536a31f66c4ce"; } - { locale = "gl"; arch = "linux-x86_64"; sha512 = "92bba67974146f832d91c6d023b60a7d4dd3f0391f4df9744379035bbf6fe2ca43d8eb81e05184658da34d5519b310f06fe4429287874ba618d3720931ef89a6"; } - { locale = "he"; arch = "linux-i686"; sha512 = "37da8123306823963ac02c9756d5ce3e76207ee0a1652fdad42cf2c8467062f1369c8f6640625fdc049e2c024d6ed71cb3c9c669d18e1d737246d510102d1d89"; } - { locale = "he"; arch = "linux-x86_64"; sha512 = "62bb1f1735c13ac7adef4ce922eff64aba486bb2274691b8c3df12c4d87c30660dd2054e6fa314f56a690a0a8bf3533237d0d4bce89f83cc7a955e8de3f9fc43"; } - { locale = "hr"; arch = "linux-i686"; sha512 = "b36128139442da20bdda63bf325a12e6f7467fe8f1baf8a56a3b0c55c8cce45f8c5a629b25a97b12c86e10fc12cddc2edd9aeea651bb9026427c6486270d80a2"; } - { locale = "hr"; arch = "linux-x86_64"; sha512 = "ec3c826ed484ced10b417320d50f3c0c9b955b71eb656b2469c7a3268d712579901cba904a789f5f6a2fab6d7707401ff1ea0e112a575091c4196d7bd178387d"; } - { locale = "hsb"; arch = "linux-i686"; sha512 = "274b913c0a5c293b45c622c360380560c62b19772c0d5616d46040b6330cc5c330177084f743f2edc2624c88bcafda748fcd3beae606adf7eafbc4711845517e"; } - { locale = "hsb"; arch = "linux-x86_64"; sha512 = "5af289d7d57645959c0b1f1437239e8ed989720c586b6dff7734bd675258f6876b467b2e4a29686ac0f703685e41204b702df758ea25410271ecad9d9beee203"; } - { locale = "hu"; arch = "linux-i686"; sha512 = "fff9201e818d17b8ed453d272c5095625edac664555fc028efa9f08d23ad151d5aa22e3ddd9ee0eae9d0dfdfac27ca882107f12aa023741bcbd20be61e11c457"; } - { locale = "hu"; arch = "linux-x86_64"; sha512 = "cbe561fbd504b14c59e5db745dcbf83edbb5bf1813f86888419d0dc5cab43bc700f96782c36d1bc8c8732311758209faee5d9755e872e626c0a6012e5be6e441"; } - { locale = "hy-AM"; arch = "linux-i686"; sha512 = "954e697b2400b93fc575c7336a613d3d63702e80a12617a9c86b08e294bf4dad54c2cae4669525e88ecb55a0c029bab028105659a12656f03ce2ba0f0a7e71b1"; } - { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "9e27956960fb2154e8c4b895123ceb0cbc8538f3f4563e2888db2d056605de0612a629c66f3db9a9acc3db7032ef39b553a9791a11489e89b6485c00f0e1b903"; } - { locale = "id"; arch = "linux-i686"; sha512 = "bdedb03a25ec664c0443fa4e1e0d5dfa84ac5644e2a5dcefc67a714b71c2d18d9a38962e7ca2661f4d0d4d518d3e4eab51fb499efc32825a0446387cd22ed34e"; } - { locale = "id"; arch = "linux-x86_64"; sha512 = "2c18f2b919a64f540e5a1e59a430d1c710959711757e06fb38a12b67f0ff139ddde822ef7cdf5836a32d3bf904e56fb56e9d8d97f9d49cf35b67650be54e131c"; } - { locale = "is"; arch = "linux-i686"; sha512 = "73e866f713fc38ab7e56b97c985db69d49bdea2007c84e2ba54638f07433fc37a1a65a1189dd2b847394811e57ba8c767e20756686ec7fc86dcc3248168b110d"; } - { locale = "is"; arch = "linux-x86_64"; sha512 = "031c069a6c6dd79f21594dcd64801c9f11bf4e41ba8efd3b17020fdebae585ea746910c0186a5dcfb5a073ff33807d8324932e5ef3c2e04b5d35e24a714f2cd2"; } - { locale = "it"; arch = "linux-i686"; sha512 = "86bf4650fabfb9716d228e8449792b620a0692e3f5c6af19398cb37b1079cdf79f42795e16cd13c6ed261c1a81b7b3a23ba305299d03bcf1d716ee0ccade903d"; } - { locale = "it"; arch = "linux-x86_64"; sha512 = "5225af86242544e4fdc176fa68463c9ab03e4066ae57266f112aec179f7085b7621df7e46e34302bc3e3e30dc713eb45af568b86bfb1a4fa6b01f50fe677b5b2"; } - { locale = "ja"; arch = "linux-i686"; sha512 = "401e4c7b9831f2a3342764b6a2de732c89fe5687ff1e611c4ba1b630f22936c0343b3ef5ec444925ccc68c8ad45cd98d67ca502c32094adb567bfa64481e82c0"; } - { locale = "ja"; arch = "linux-x86_64"; sha512 = "7962eaef19bc5bdcf5f3aa9dad6df110ffed9b247d13dd61f3c4c170e4c854985d061847b84058bac35c16391821bdbbf5ed05120687cfc75c4baeba2de6f5ee"; } - { locale = "ko"; arch = "linux-i686"; sha512 = "d09e2083db577b308a65d1600bf15cbc6cae7b5137c66782d922a28588803a58348f87df5b9cb2cf9ca00713d542d441c5947475b551c8d5d929dc6293c00a48"; } - { locale = "ko"; arch = "linux-x86_64"; sha512 = "b8689c851b176ec82b73566bffecff54c0e6c85efcae7deb9dd542360fd7a0f8a6f8e53c193060dc36a98203ad7024a0c1d408ac2348f59fd9f3cbd591a17e5e"; } - { locale = "lt"; arch = "linux-i686"; sha512 = "8d5bd77d3d5d1b6168b65458bbb4f2409c447cfb6d019fcf7f8d81b3d4d486203533d3acb8a59257e664296636ee5b192b237ebf070b37a729926ff11bd81090"; } - { locale = "lt"; arch = "linux-x86_64"; sha512 = "7314e8138a913c7610227cbbf71d535f85bf008e09610d742d996be391ff4be0e9dd4daed8fa3ccf1e1556e5c66982e3f2cea0d34d76d78588fe9926420af75f"; } - { locale = "nb-NO"; arch = "linux-i686"; sha512 = "6b1cbcd9888b400ebcb4eccd416e12d09f29431a4afa3b890b05721d1c4108c35549c2f70800ca386f3b21c66b42be3d00a730d4fd2a4ba9c62069c92ab726f7"; } - { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "27f278b9f54b563f0aa907448eba04b4f84c9ab33eadb4737a662058e904e68baa481625c0303764ac7416cf5cad7bcf94a651db981fbcf94ab8e93625555415"; } - { locale = "nl"; arch = "linux-i686"; sha512 = "d932296e6cc61c634ab09a66328335e0c6049e9d6ca660a862dce3cbe8cc0900fb3bdc0956b82c9f70f18f5c68c1f37acacdd7a3b8a697acd24df1197683aea3"; } - { locale = "nl"; arch = "linux-x86_64"; sha512 = "010e833b541b1a9ef20d10a1678b7b25cf2a9268cfc6b6f0f1c1e5b1803bfdc4cd214b9e3a86132f1335531f107773dfe01f9f4dcd996262dc2c3ece491b36a4"; } - { locale = "nn-NO"; arch = "linux-i686"; sha512 = "b2ed20a973248031fb63b5652f6eea2c572c1fc2d8dc780db4cfa6a0450ccc211effc1d79ac67718b444f0247f8659d134586a0abe829df4090f65b1cdb59d93"; } - { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "5924aaeeb828464552b0de572ce24cbb94558aa30d599cb518d7dae74e6974d7da9ac5035c5bb2195fe826a8197907c29f02f5f0e83e36c84bb023b208fb56c7"; } - { locale = "pa-IN"; arch = "linux-i686"; sha512 = "6ac911f182c6c9b7e2617118efb76285136f0320d99f49401e5732841ffd846770bdd7ec98a200922536cfbd855debd037bdbe279b0f43e644d6e107afd73e68"; } - { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "e16db609e60e4c79336e31d267af552124b2d2b62fac0066e0a84a6e48f082a46699010a9f2540df30ff5c1d4f8d481c4cfc4caea4acc68f50ab83f996105209"; } - { locale = "pl"; arch = "linux-i686"; sha512 = "90217da5f30de60aef9da734355d6b5e0a93526e0d8f91db6c21405e2666df12d1ae37acb94638966b1bff6e3de3713c5243b683e4d321b916125ef89af42c15"; } - { locale = "pl"; arch = "linux-x86_64"; sha512 = "b77b19d6c413a92ae3c0da43f989725b3d74fd9d7c1f343711ea73d5a10e4310f005a2d728fa708fcad3b281c5694964ab91966df00b2667a7a8ef616c3a86eb"; } - { locale = "pt-BR"; arch = "linux-i686"; sha512 = "d4ce84451941a9382d4fa6225b697e2bea2f72dcf76c72b779bd1e3d955803d7ad3bcbed47e9a7dafde72cd20bfa1e8616b691d275e1e390b2af415e0ea9610c"; } - { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "c3585047b7b5611e5925f873e3a996142e9b73b5f5389729f3b609f3554030d39a988183f15aa2a5d07036fecc147cdd0abc02b13601a0e02e794c40cada5b40"; } - { locale = "pt-PT"; arch = "linux-i686"; sha512 = "e28dce49f6660bea1f56f2515ae539701cc160956318305464ea6b8cf1cf6be21fa8b97b30b234eec9f7e5bc3987ed939b5eca50174ab148a988706f00a2ef0f"; } - { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "81a225e7d4f56b0c231d690b4da3f819a1549e8f5194cd6dd2da23d7909c24d9f5f9262e6bec5eee8701ce510980426c7d2612149c4c88da68f910cb7b046d1e"; } - { locale = "rm"; arch = "linux-i686"; sha512 = "c4c724f0be3d6a1ada175ec87f840b177ab2a074d5ec858a49732ca7b5289a7d3b1e09b9d0e5c195e1e7565175cdef35e5b6e6e1a3344d7e307f9901e0ca1e6f"; } - { locale = "rm"; arch = "linux-x86_64"; sha512 = "8e55f3b680a7b7d4299e59360413a339a99569af8c3a890cb95437c76dfd903f5fc60b6abfb3820e4dbd7d637015ebf8600f351f858022b535709879c9b0608a"; } - { locale = "ro"; arch = "linux-i686"; sha512 = "cf91019d92850db3954690a403c13948f53d79574d874aa10effeac92d759d1b5e62cad9184f58c29b6e478903a4c6f4e27cc3e7e2457605332e361da5ab3ab4"; } - { locale = "ro"; arch = "linux-x86_64"; sha512 = "ed1106a9855752c951f232de0946665914051dda0e9ded0052b4ef10b7f8d19ce3994165eabeb8b2a1f04009fb7909a48c79c484451335ee24541ab3eee52f4c"; } - { locale = "ru"; arch = "linux-i686"; sha512 = "e3175d29cee4f253f7adf4f1d9b9826840e434d11d0c3f10fd9163f904ca315764b4943fb9d2c8a2324aedaac26047e95b6cf87c3218bc5b941e0b9a07e2b49f"; } - { locale = "ru"; arch = "linux-x86_64"; sha512 = "62c15a60e2d600068273695f00e4d37416cd7c1804bbc814a3e0b7c0de2a3f23a03b4d6fa5666f25971b7726bd0cde1fccb40cde1e95522704c14252d52384dd"; } - { locale = "si"; arch = "linux-i686"; sha512 = "a94106b78937fa105eb254044f5ba808edb17b7b0f9b2b56ad918a48566ed43e181b652f4b4feb37d81ed749a5ecd9bd6997cfe6fd1cd7fc001567d9a888f582"; } - { locale = "si"; arch = "linux-x86_64"; sha512 = "974c8349b19e34e9262a98b44c691354061a8f802c8ce47609251023eb91a97096cc107fbd653e9ef9536deb81259cead57b5bcebadb602af8fe51b7e1224fc6"; } - { locale = "sk"; arch = "linux-i686"; sha512 = "63fea9c688a89717b5626e407abf82e650916ede2f01189a54d33e4af366474b39383c2d64bde4bfdfdde3bfe767afb8677b1638b3b327c8a387d0dc00b1318e"; } - { locale = "sk"; arch = "linux-x86_64"; sha512 = "96684db63e28088ca0d1f6c3bc30b3075ee2f135900359060add36a34d539132655ec403847acd4d7823bf80d6fb5f7ce7a0c618031b64f6af725a8b3c4c5a22"; } - { locale = "sl"; arch = "linux-i686"; sha512 = "6279d3656f2b0a71e7082fd728bd2b551b16838263d7f83a32eebbb28e6d69df11be3f25db259a464428529ddf389f221048f445f0a0f34de1c263aca6fc48ae"; } - { locale = "sl"; arch = "linux-x86_64"; sha512 = "c69e0ae0d72229c59ca0fa68789c1bdab1ceff5159906ccb27766b854b677328cb1c305d5568c058b93c4e512fd5b7f7626531c5a6f1655519f0c07ecc02308f"; } - { locale = "sq"; arch = "linux-i686"; sha512 = "d63f84b4e5d8b9728e354487b243c3de604c571af39e43a7552cebdf28139271a8acab85bd1dfc6506e1231bb1ed49dc127f3b0400c9fdaeba2bf6c3ea78829d"; } - { locale = "sq"; arch = "linux-x86_64"; sha512 = "df10b39b6cc461c2418d8b297fed5f7ce34e31a0892737b99076b11095602f250b7018af109555a0ce7959695e00c56835786a9ca10573bfca07d1f21af7dedb"; } - { locale = "sr"; arch = "linux-i686"; sha512 = "57f710812a1f26212ad0cbc4a3506424d36d0560f5d7d17f8e01d7ed4836fb7a385753b17388b30074cd00985ce7edd7882cb5c326b89840cc816f0b5f1c19cd"; } - { locale = "sr"; arch = "linux-x86_64"; sha512 = "88a92d428e32b7c3f63fc898c1c3a448ef3b78afde1334d86dc4e68819f05cb8cba9816e875aaf36f52f1f04c42f9833d690c43dc5eedff3743416a76d33f38d"; } - { locale = "sv-SE"; arch = "linux-i686"; sha512 = "f86b0d7fd4f5875dee70ec00efe7f4c99a59d34e877b21288c89f9d5c83d04b31eeafe7dadc01ee5bd91a76363dace2da86e5bc219909fa06d47c5351931efc4"; } - { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "8994b908589746e5d8dc980b5dd06294988399be8e1ced10c6d4b3a6da440f69d6de7f101b9f96723fe55afdc21a7336c141058aa7fc70d283533e5fdd096b85"; } - { locale = "ta-LK"; arch = "linux-i686"; sha512 = "852a0132af6ed9d0c3da36025e0183b9c5bfc4a34af7870373989602059f05f6f5f779439c68ce577e6821295c2aa45135a2b90624b941c736089c391364e566"; } - { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "bf8332314c43a8f2709be4440e9eace27ce4ca097d0db7a25de99ac6447606fda297bdccd5d7bf865a964f5276f04371a022134c22962fa5743cc90f4e1a627e"; } - { locale = "tr"; arch = "linux-i686"; sha512 = "e46e71d28a9bf4eefe453ad3841bfdbc261594e2b29322bc2e5cc072957674e1121c246d3be3fb56c84f64692d048f6792be526dd600dc85d5b2d7f5d2aaeab4"; } - { locale = "tr"; arch = "linux-x86_64"; sha512 = "1c5d2d1f01129aa4456c166120ab21dd021e92bcd9ba9f4c1d2911699f856516bd9c9a5ae356397d117ae376fc5a44eb3b3880a2fe7e4f61a3b5bc581544f2b1"; } - { locale = "uk"; arch = "linux-i686"; sha512 = "7b3acee5c624600f908ec6ff7e664d2414a3fc48208bd54baf0cf209f66460e560137a52445805ccfb410913f2ab8ecee30f4a702fbe0c8bf758bf89411d06fe"; } - { locale = "uk"; arch = "linux-x86_64"; sha512 = "3b90f1a04c8922889182b81c88a071de2ff54f3524110739878e80738513216ba133ab973219eef822d7c1f605c1d2fa1b32fdbee2451e4c6427a27f9d25599a"; } - { locale = "vi"; arch = "linux-i686"; sha512 = "bd37a54a586e91b29c668a2995fc37ec5b2e6d0bab5af640575981aff2be91e97181f5f89e0c4720979fac38b19530c056562a2c4a07c3b9868b347ea5f7f831"; } - { locale = "vi"; arch = "linux-x86_64"; sha512 = "a571cfd9e0e43e9ebf5d29969a9af08c16c3fb44abad302207ee17018b105cb7079a0e3da02433264cddfc2da7922296c41f4d5ee76d722b07211c9cb78c8caa"; } - { locale = "zh-CN"; arch = "linux-i686"; sha512 = "6560d28c15ec9e46787d8eaa1fd9b20630828f15b2ebea98591e25123e5c51a90e12889ac2474467f9d1e3e41b88ae3cacc75ebb67391af0abbe18aaffa29a48"; } - { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "0ad5965f5028c7d0642cdbb140caabab24536e9bb386b6b14c59af52758e667a6217c7251445c462d3c283c72215a449545f06a1d176ad178a17ed51640715c3"; } - { locale = "zh-TW"; arch = "linux-i686"; sha512 = "a44dc60451845e27560ba41ff5a37446f955076e0da8cbf8ed9ffe06c217dee8847f57c6a58913581ccd4d4039b0f2b570b660882e68bd0e9050371cd1220022"; } - { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "17cbdb81577522510f7538d843755f09465700f558d164e6e292070859c9e298165e16c57e5c6db109be6b570666986fd506b60ce6b8ea6f983070c36c5b28c4"; } + { locale = "ar"; arch = "linux-i686"; sha512 = "8db134f67ea813c12d97b0a44fb6169f42b45b8f9e7e151cb6389ee6628e301c95b5ca7492ec5c803cd44225b1929539e81c4df840bb533ef12740c4b9b82f28"; } + { locale = "ar"; arch = "linux-x86_64"; sha512 = "b3da97b15b71aa536d0acdf08e9e980ddd1917113579db8c9058068bd104b3029c721bf1bac1c9ed56c39540bdb7fd667605259b1c2a8d910401259d2cb0e3e5"; } + { locale = "ast"; arch = "linux-i686"; sha512 = "2e83efd53b191d7bee999fa45f09583c818377443b9bbf3203b7f11a31b67d371e34980267cc509c47a57b4a6540b1f7f4293252f02138b24869c29bfc64423d"; } + { locale = "ast"; arch = "linux-x86_64"; sha512 = "9d9ef1a1bcbb32cf04e26ad499bf1f8122b3b1a964e6c4eb6726d2271fba28c78f0d7bc60641d8cc6c2a0e1153a25483a6f8eb12568128045f7d6cf5ed6746d3"; } + { locale = "be"; arch = "linux-i686"; sha512 = "21cf44b0eb90d3662ef690c56a393bd4453809631209c8953156a1b59b6011fce407c4b3d54d956e5c376f36dac663cd874b4c917f41b9132e445968fd7bc439"; } + { locale = "be"; arch = "linux-x86_64"; sha512 = "ce33a0750430a462aa07ad8995656dbf2689077746de8ee42ec361c544ccd53e182192f95f6ac755ee739035b5f2a2c8233ac1c37c0d156c4a2aabb39806039d"; } + { locale = "bg"; arch = "linux-i686"; sha512 = "fe763ecd1a572ed6e3864aa9d934b821fae2f91f02d959e22e96314e26271a9f5695930a0388fadd6bd34e0f7ab6938a48bfd346901e139128e0e24483c36d90"; } + { locale = "bg"; arch = "linux-x86_64"; sha512 = "935bc0f19a45314341f76cb53dc4c617a5104a0a17c56f60679974eaec9fc8d9ee609d543a5a310bf4d1e8db6cdc54b660db5b2b85af7838dc5711e10ecff77c"; } + { locale = "bn-BD"; arch = "linux-i686"; sha512 = "d9bdc81c10d1ef370275d3f152669ca50a7fb2b126cdd396d63aa8b7c97a46d815b1fa77b8135887b0f6c825ba87617c81e1f3698e455d75b2bc9862e47fe761"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha512 = "0b420e4168df1a0b7ff8e4983892de9b08cf644a6e7b28c090477b3efe557a7a34a17ac90a722b497298759d98c1a3346ff84789598359e4052a35b44b3bbba2"; } + { locale = "br"; arch = "linux-i686"; sha512 = "5e0726512ff28ee00498a4a8493d4f00e8375950fe8489c3e5906b37bf057c76eca66ccea8aaf7e165ca56b02ed14041efcab8b75170ae4daa2b2df2bf2ddc8f"; } + { locale = "br"; arch = "linux-x86_64"; sha512 = "1240f62d8a0530ead4b19983a36bdd894b5f812c82b68c49a4f7d9a961e0ff2542244ef405e03bb281ec65f070e815246487347a99bec76dd3509ec4512c1d47"; } + { locale = "ca"; arch = "linux-i686"; sha512 = "ce79eebfe0a93a9e15237317fa3dcca6fd6f20c90adf431366e5d30ce026da0f4af4e1be0745cfa6620b2a75838fbed93a85ed0695c486eb46b58cfb3cea3571"; } + { locale = "ca"; arch = "linux-x86_64"; sha512 = "f290ac184b7086349a173b1597341731b6c696c8806b3b5adb8e7f0121f298ae9971f8f96981662bac72079f03d7d2ce17f0c385662d06657a1519d7bf32ef64"; } + { locale = "cs"; arch = "linux-i686"; sha512 = "a06b8a0db00b35ba16541a72623fc764c87c45e15e69079b757449e9c67988764f65bf6ae214ac4a0c0c541549fb6fb48bd1dbb2efe02541e3bda12938e2d787"; } + { locale = "cs"; arch = "linux-x86_64"; sha512 = "b96dca42026adb793ab5d37544d42ff8d5668adbff6a94f6c37a33ea63eb87622a7eeee8c02976b16c1d8c38b3348387aa46daa2bf5ccfd66f2a176ba4c113ff"; } + { locale = "cy"; arch = "linux-i686"; sha512 = "dee0395f80b3e0db7b6cedf3d7e22b574f3f2734da518db684ab8ddfb502a127d2e0c75849819638ea61fd8604b84f8b1118c036d8ffd5f444ebd8adce19fa2e"; } + { locale = "cy"; arch = "linux-x86_64"; sha512 = "8162ba8abda1906ce0fa78455faf823ce4bf6eaab9ecafa50b5669f2485861f59fe2be3820d75d7f168432ede5e9ced170928e883ebd06f8ab3145065f31e610"; } + { locale = "da"; arch = "linux-i686"; sha512 = "f5bee461d1e0ba0ffc1de1fee05d41d0aa9db904061a7e4947d2a22ce8e3eb9ab40e15ace81a9cb248f72b5c08b699b39b46031f5673045eefe2e3346e7ae18a"; } + { locale = "da"; arch = "linux-x86_64"; sha512 = "dab187762c44a7092136d5b12be43bb3675c37dbaa1ffb36171e9cc76ffd94fd0f80872008bd686515f0a84c3adc9c36d5eff9240e871dff457145bc21981777"; } + { locale = "de"; arch = "linux-i686"; sha512 = "35994979446f4bcf5a6b79875e84999188d8ee58143b741e583302b29c0619566b5d4d65e640156168974e4c59c7d454ffeac47a8aaf35c344bcf2ec44520334"; } + { locale = "de"; arch = "linux-x86_64"; sha512 = "ae7169f84c945cd7886ef0ee84a1e57cb3017ad89b991c0f8dfb36d5537c2d9253345e111916a234c228a99e153c9d8c2f5bbb61e3d4d5fcbe95f507d863b735"; } + { locale = "dsb"; arch = "linux-i686"; sha512 = "1b10d6c4da26452c89089c2938db3559cc46c098baf917ebbcfc1d107bd9591630749aeae87a5b9e8819ebb5e4ad2b7d5321531bbdc3045df604e3929d2d6d93"; } + { locale = "dsb"; arch = "linux-x86_64"; sha512 = "c6195bdf00e05921a19eb37a74c34794cb08d8b8cd43609eed9f64bbe89788d9c87a45df449cc400e6cee31b7ac6f02ce57083581c85885acd620931c657a833"; } + { locale = "el"; arch = "linux-i686"; sha512 = "e7d7f38fecea77d93bb99656a6dd566c6f396e108910152917cd1c908f09d1f276385ed771d5500feac572356e688e43ab3a91651d64bd7d522db9daaa4f32ef"; } + { locale = "el"; arch = "linux-x86_64"; sha512 = "bec617a64ce06f7aacfd936cb85f29684d1afc4246c05f1de6bf1e11819a44eec0e395a446e64676fe6453ce41f173f938a845fb50a625e3f5bb325098e09d11"; } + { locale = "en-GB"; arch = "linux-i686"; sha512 = "c06fcb56eafbe894e15a0380f49ce5455c95b2b6c9520ef3b15f699778a575e5c643db5797e72441a68e063bce0bd4c0003cd0b58c78c7d1a744223598ab3549"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha512 = "1b095d5e254c2eef894b9954f42031b6e7eedbf0c753ac3e9f7b51b152dfb9c21d90ace238fe5bd58c63292587e477d23121dd0f96f7489b7564ae1bca27eef7"; } + { locale = "en-US"; arch = "linux-i686"; sha512 = "7561111abeda21de3c4c9f585528ea9fc76409b15c0679b22743180f3b987aefac19ff45a682519511e347b0881e0f924f4efe35a782ceb4da9c6af05132fb78"; } + { locale = "en-US"; arch = "linux-x86_64"; sha512 = "2beacec69acea8bdc98b5a7df5111318c6b47bbe1bb4356d3f9a2ce3b783ce6fad01a3ef11658c9d24d89e5c3f3e5c71de6b6623e93187d1221c25d415dac3c4"; } + { locale = "es-AR"; arch = "linux-i686"; sha512 = "c6d1fc35bb89ed23b5f4e3be2fa6c28c3e29a7e821be1ae79345bb26a6db1ecae67b27f7ac9d3bd5bd803b6c7613aba3f0ad35cb07b607c1030f84a365da2b2c"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha512 = "e3c95879782c17963e9f17dfde11a416502bb89d5c712ae445bd476e1bc1fb76bb0716764150b2b1f92ab8487d736c39f29ceb023f226b92f8c07bfb7da8e76e"; } + { locale = "es-ES"; arch = "linux-i686"; sha512 = "3f8f3263650fd4722da121566cd9afe8e671005eafee26f550a940dd76b1ed02c3f34f32f886c2cb2e2b1ed029f9997f2686a2494f4b24b6f32a7bcb8226f6aa"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha512 = "587ca874ed5e035291099db107cf29f19562c0adb785c33ad92bab9d5eac2f2615143b5587bf7da7df61c071995eaf7894e5733d2fb311ffa14671c14aed54d3"; } + { locale = "et"; arch = "linux-i686"; sha512 = "a08b99a3e444135d538f3b53669a2f4e900f86406e74076a2ca986c7d9bf55661aac248fa564eda3b6bd491cd284690da9c61a56a43f2884167998a10b666785"; } + { locale = "et"; arch = "linux-x86_64"; sha512 = "97043053f1512e6ac7298208e219bd2cd8dd1abd403ecbae90e365aa69b098becdef3f6cec9998fc71b237d78e3b7693fa93cf9452317bf1f4793425f23c0b5d"; } + { locale = "eu"; arch = "linux-i686"; sha512 = "2de3d5915801e62196339e6acaa7f601740212a59f4ec6c684cb40c830bc6fdab843b3497a168bc6b2889f80449900406c05cabb3ba656d7d6b0be5750a31aab"; } + { locale = "eu"; arch = "linux-x86_64"; sha512 = "834f9e712183f14af927ccb719325dad1a7f778d7d3beeec87cbb559d039b8764efb9447b8a0e40eb0ad55c88b525e5bbc2e2f5729c11b173ef86f63e4f92974"; } + { locale = "fi"; arch = "linux-i686"; sha512 = "b8b1c42b3ab0a365c9a478fea0e83ac49b709dd2d117c1d8ed6fd7946b5dd32a1d3907b653c5aa0fada4ba8cc365ee9fc723fbbed76219a7c5d4b70eb68dbf65"; } + { locale = "fi"; arch = "linux-x86_64"; sha512 = "64b5bc313fa64abc56961b0c6abdcc6fa72cd321f422857fece9bfb3673747d5992d96dc9d98a76c71148b6261ea9a750147c94f171c548170c0681d597d8402"; } + { locale = "fr"; arch = "linux-i686"; sha512 = "45e7a37ac6c18d31e834b88789d6039bed489bc1cb4601399b3cf76feef52c3c36249e297750d39e3e3071c2d90a1ff6f0bcfef8bec89997ac552cceff88e78f"; } + { locale = "fr"; arch = "linux-x86_64"; sha512 = "02a31ae95b6a6dac76eabd8e1de27ff50f29725be221841a738f60e41306d39ea050b73f78105561344d042ed988955e1801b5379bcecadccc89481c3bfcc13e"; } + { locale = "fy-NL"; arch = "linux-i686"; sha512 = "bc14d4d16f0b196eaf92d551df6b565bfdf56806dc97714e97db7fd201c6e4e80df0485f77ff4bc5218b8c2f96a01a39f87c6c3e156c5c0cd72a8b932248370e"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha512 = "025411d23fae36123a86b72818b486412aad0f532631e4c48da5dea9b41d7b2875aba463a4a721e422cc4b141c8cce155dab01fd7056dfbadd435cd3e3061f08"; } + { locale = "ga-IE"; arch = "linux-i686"; sha512 = "56d20e9bd013dea41f8686f7ab4da48b1c96e0d93c7639e990daf174cf7c9313ab659eb9256f8ee52adc9659d6ce766921eab1a24a0f963a8a8dc1d614ed34e9"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha512 = "1bd36aababa4fa8e47bb62d9a49b2a5303b5b0404f5ea370fd4b6b152327766a42bc6c15a85c693aaf532b9c3aa8598911e313a861d3eb946bb4ac8d0642de6f"; } + { locale = "gd"; arch = "linux-i686"; sha512 = "bc0f98937cb2c2ef98ebf6625179f77d36d12f6c95eb413cd570f4b3a9fbe733888b57ef946fcde2daf59183291a8bd1258e8c7f80b260e6af3138c8b83117f9"; } + { locale = "gd"; arch = "linux-x86_64"; sha512 = "d2729fddbd4db455b1f2b738d9bbd6d155db664c01ba6617128728caffe8f96aada8b02d49fb1b90695c4bf37db6960f51d6c074b5df94ab4e74996370679d2a"; } + { locale = "gl"; arch = "linux-i686"; sha512 = "6306be1026b9127e455a3b0c720f7de495811c3bfb578090ee33d8b4200bec3390c006767d45ce165b57325f1c41e98ce078cf78bdf0a2e9d0bf5fd704cf8374"; } + { locale = "gl"; arch = "linux-x86_64"; sha512 = "cb977c4f60041ccba81ae9708b381d8e073c2041104549973f33695d6f08663d23fc9dccc112d6fd9e4c61847211ecd2b762b81d842853ff80a7b813955295c9"; } + { locale = "he"; arch = "linux-i686"; sha512 = "e39c70ed7711a4c7c5baf0594917e2727bf0d081f9d38d2f0d539e557fa9c20e639c3e98ef8926cdc9f57ffee2c4b8896b044bd1fe9aeca39e64af2b56e35dfd"; } + { locale = "he"; arch = "linux-x86_64"; sha512 = "86ad9d155916dbf7318fe054286b8808bd6072735b6264db61d51745abaa975311776d9a15da13b9f6c536e78714501f1855291bcf59b49cebc047da112fcc91"; } + { locale = "hr"; arch = "linux-i686"; sha512 = "e82a125725373a5fcadb4ad010809fd307f5caea4bbdb428cce3c267da197bc73355f655397283fc6bf93838ce41896b7d6dd1174fc56526a04b61559babf42d"; } + { locale = "hr"; arch = "linux-x86_64"; sha512 = "ba8928e57b1eeeaa2b1e1b95ef87908247695b09d3f7220113820cc13a07223088a1c0468e362488b303a60456e2d63c631150025715d3a4b66b6a6204e31c9b"; } + { locale = "hsb"; arch = "linux-i686"; sha512 = "276a97640f24aade9d0658529e13d4e50b70bd5e98d30c43d7af6e0cdb368d3a54ed9365aea9cc03bef6938bb3c7dc0649ca09543278538fea5dc24a15ab5072"; } + { locale = "hsb"; arch = "linux-x86_64"; sha512 = "ab527b02bc792b2fe2a939a82b5ef4797f7ae94144a5161e11722d46d38da75203139faa85655248e4aba12090d79a46a0db0310b32ec0db02c4e68e932f0d2f"; } + { locale = "hu"; arch = "linux-i686"; sha512 = "34e1f7e790deb7d4594f2edcf6ba1641730bdb6ceb72fb08071daed02713de8ff6931e3986fb3125646ecb3d2f299e5bf5028fc0425ac9790d57d4aace9e81f0"; } + { locale = "hu"; arch = "linux-x86_64"; sha512 = "e7df1f64c41110d56959237555ff3a066b8d503f28c6d504c7080f3af2548d5ee66a60771872065222db57624b40d1a647aa278f89c04fa3c520730147227c83"; } + { locale = "hy-AM"; arch = "linux-i686"; sha512 = "356ac76891199061fd4698c51903ddc7e92858252a6ca502543b0403790b9b80ba8799e847a00331f19b6ab56d2e3d02fac79ec7b5502ed8227c5abd82ad3fc3"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha512 = "410ca6dbd22d870ec4d74e0dc19b65009d860e93b905dc43ae0d5086f83ad1dbae81d2213b0f39afbd5e428287d0f35e5c7b923df594494e66fcf08d4663cf82"; } + { locale = "id"; arch = "linux-i686"; sha512 = "ddab3b64afba2862a18879845cea3945fd3a34295ab07e5c7f53435ef8af005fdaa3beb5fedbee27818917a320fa5e1d1cdc618ac1767db9ceb1bf3c912720b0"; } + { locale = "id"; arch = "linux-x86_64"; sha512 = "4b26928f579b56c965992b4425a9af6d85fd7a288d699942448ff8f331833e53625f0d48e62794356ed7056ce75d0efa3fcce3f3be9acee099060b4c5a20e281"; } + { locale = "is"; arch = "linux-i686"; sha512 = "8ad9065d628cddc34fad8afb5477edc2ecbac7add4162c87e6790bbee58e8d40e40b087f879fd09a44f180b30e3929bcfe2ed268fe5bd549c0d5c011be7d974a"; } + { locale = "is"; arch = "linux-x86_64"; sha512 = "f2a14977d98e0e7575dbe1f3f068472bb90d25a9c333ed191ee17fbf647b1c47143136ef7fc1871bcdbf3b55c2d414a05a119a7a2337b9cd05f039d74915c727"; } + { locale = "it"; arch = "linux-i686"; sha512 = "18a3951092f38dded053b25658da79188aff3a3dd6e008f269b0b4c32151f7d2d2483932145ccc50c6c9d199af94b43abde65b61e8b1093d9b4c52692382d8ca"; } + { locale = "it"; arch = "linux-x86_64"; sha512 = "f834a9ba6f6cc2745d4e54eb73ef174e913009e82e989d1386e8598f9f83c32fa65de6902de641b62ebbf183a25f0037d119bb61884f3548d8f425fa63c9f5d0"; } + { locale = "ja"; arch = "linux-i686"; sha512 = "f91904e585e30ac18e4065046ec184607705bce423ea79aadbecf32fa0f9f598a439ae8f955e79389c411f0836dd6bcf9a74e1e78cb70471a3c523a807e43c41"; } + { locale = "ja"; arch = "linux-x86_64"; sha512 = "3052946955110d0f1df66df9933079bbe0b0247f9eef0a07c02c43f6463055bcde33e27b7ec1beb511e70f3b524d55ab404a0be755599f9e15f1902b4eb457c4"; } + { locale = "ko"; arch = "linux-i686"; sha512 = "e0f79d30960bff54ee064ae381dd89b877c2f5055424eaf017382f6b2d1d0b34544cf3d88fefce8f2e294e84477e5109a17fca83083b0c5602ea5d0eec7b9c0c"; } + { locale = "ko"; arch = "linux-x86_64"; sha512 = "ce515c74e7d69394f79ff7adf6ffe2118b0dc76f49672f19cbc299b21705ba18a88c6780f88bf28bcbf208ad33914da13031617a20494160d771ec09c10a798d"; } + { locale = "lt"; arch = "linux-i686"; sha512 = "f9d00ec17abd13d575d651caad02e1a46adef760ca6b706df31708375b7c721f3cfd1d99964cc2e16615f5fc422855dba8fa722d57b355782dba1541cf32e1e1"; } + { locale = "lt"; arch = "linux-x86_64"; sha512 = "2572ee32695dd0abf10a486453a3ca9d7fc26e88993a374677fb5f96edb319a5ba2892d8f9a236195ecd8199a7936d3969830571411ea35a8dc1f229089595e2"; } + { locale = "nb-NO"; arch = "linux-i686"; sha512 = "26db6cf82400b4a1bff5747d4e301c46f3391b97e28b64716e2b2dcfb2ab2da583142b487f90fe0798bee3cdf49d5965b9d9b124e95f1d65b32c9f84c42a7ebc"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha512 = "9b83eed9b3e93a5ddf463aa631bb4905abb8e02574e1be8a4cc9fe5cea7f3aee743b0f570a748fba67adbf6096a8443378ddfeedaa9cb0aa8f072dadf906929d"; } + { locale = "nl"; arch = "linux-i686"; sha512 = "ff00b25886df3a9ff0eb9c4c9a1b34be21edc69ac20f0d994b9dd9b0618037c92c15ead664b071d09766a0e764acb5e118185dc3f08c42f2cca62c4c70fc8ffe"; } + { locale = "nl"; arch = "linux-x86_64"; sha512 = "6796f4f3d1525a3b617c99eacec76c1cdc5c8fcadc39120d1da052518cb663093c695060b37120ea6337e21b9fcc20c5a5119878ba1068553772f2d8ed89db32"; } + { locale = "nn-NO"; arch = "linux-i686"; sha512 = "ab236204028e79bb98e78b2900b434f1237e407e864d346fae975d123fa87e727710e41e19625b6c69548497cd9d7716467dc01002e4ff6025301a141125c723"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha512 = "0544c952ae8fddf43b784bab00aa9d4fd05566e06b9df15990ea91cc65aace6066855a8bdc3f6e6eb01e2a7030a49df67962de4af8d9d84d003cb2553af71006"; } + { locale = "pa-IN"; arch = "linux-i686"; sha512 = "618d3e621bed807521f4b933a44e8e87b38b2843a5f85f59a83a60a3df6e13a96d1b3c250a9d77200b03be69116cbdeb33c7e2e2b4d02b8672ab90f0e303dfe3"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha512 = "226844283b3aa5dd4f224a85101529099c8fde81aed5d354b685953019b27d445ac3347f642ea93145be4dce328c4f1711e0bd21bd9f5a2b97e6b822130546cd"; } + { locale = "pl"; arch = "linux-i686"; sha512 = "4ba51ed645292165343bd104dc36ba0126435fdc06764e587379ed4de6a89a9f7711890f5f12f6176851ffcfbcd267cc1927b6e8c2a710d505cb3bbc7120209c"; } + { locale = "pl"; arch = "linux-x86_64"; sha512 = "2702db95f2e166dd5097ae7c2c83fea39f666a0a9e811e7876042e6b5ee0dcad6061fb6b6950a2f8fd8f97c434476155b8e2a306e1fee5cc54100e2d2ec7d619"; } + { locale = "pt-BR"; arch = "linux-i686"; sha512 = "ec7bb46f323030f180bb7e83b40e421a245ca4a1aec5f548a2bde1796db00fec415889cca836394b172b1923638e61eba4b71f56bf8aaa55b902deaa7f57842e"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha512 = "48406e53ba5276f3721cc5a9af825aa48215862134addefdb136ccc013dc63ca664baa820c2f34f4dd02e79e747bcd4ab73b59ab71773f05c5fede7bfc005745"; } + { locale = "pt-PT"; arch = "linux-i686"; sha512 = "27f8bfc56044d000c8c43c759c16c3eb891a0d3b6aa4d62a18477a3dd816f0b67e899a1ec375376ee83fa97d0d2d836fcb5b1eb3407b09b194600206072d6c49"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha512 = "7fa5298de1e5128b4895491d99ab5222f23c1e36e2f07582b6e970de95f45b6ae89a8e4a03b394d0910129ca16be593a47217124b1619ec567ec9d470fe78100"; } + { locale = "rm"; arch = "linux-i686"; sha512 = "2e25f6ed8e9c92a888c9b2fc0105d5912a9b85fe438c8889728d5522aebf23e86655af2066046e9ed0ea232a59d19b4affe73fa14d4e15af7cb337fef4438b49"; } + { locale = "rm"; arch = "linux-x86_64"; sha512 = "c2adc7519b2a6670e7c0e7190c6788a5c5c8882b86bbd58c3472de51e958a22126c575413b6a604eca737d120b1da1863f35702f65220bb0e7f81e4deaa21587"; } + { locale = "ro"; arch = "linux-i686"; sha512 = "ac7c8df9f06cf03c4b91e22668697bc74fff7dfa2edbf6873786e98acd5bf79535d8ad9a913811ed3567cb7e4427a8b3751a7adb011bd0567e433064e712be43"; } + { locale = "ro"; arch = "linux-x86_64"; sha512 = "f4f80a8b25410b2a48c95dad316fc98b9f5391f08d3df699628b4bf9e343d00ded9cd1ff71b0d5e441ffe6c6a2edae29790a93b5e2117d7343a537d6cbd0738b"; } + { locale = "ru"; arch = "linux-i686"; sha512 = "73009743b635761c1ac5d588837084cfb7041f639fc81646d2b6ad7bd92be5d7f742562c8c5522248f20dbca7fd430826617ae706821f107911303d416cb5f4c"; } + { locale = "ru"; arch = "linux-x86_64"; sha512 = "cd2dbc81d761077f4fcff759dcb2ff02ae0e61b0b91007e7514081926e9f3cb2bcd2e65fc3ca44ad5d07caa4e4bd9e450feb25bc184f8c136ea3aa6cc4d05968"; } + { locale = "si"; arch = "linux-i686"; sha512 = "d5a416aff2e5fd3b294d8028ee6008c9086b9c5fdb15b52b8810e9e623865b946d46e1b812849ecd7331923f7e7ba01711a909396c8676db917b2a36f7370504"; } + { locale = "si"; arch = "linux-x86_64"; sha512 = "8284411d705c804fb0e90f7358e79e0687ef892342ed06c2030803d07b1a901e7f1a6ac2acb375eac10566b1885826c4fa187d3517a2bea35222bd2604d3992a"; } + { locale = "sk"; arch = "linux-i686"; sha512 = "c905adaeca4c3daa57cd54d9a7ce49762e4ab4d32594dffcbf5b9d581409a9f7a0eea1abb51ffa94c35433d20cfd0be3baa914d9821e8f754cdcdb80de7a82fc"; } + { locale = "sk"; arch = "linux-x86_64"; sha512 = "2741ea21d5714836116595529f4e240accf95ae1e549ac4cb083669beb20d40e7fdeb7805a836ada5d4310e31d74c8bebb1cb5c8f48b3fa585edfd880109b2a1"; } + { locale = "sl"; arch = "linux-i686"; sha512 = "b61cb4971cfd9701dc8aad80848e41bdd399a53fc3282d72e7a866b782cebce928bbc163d2557c24dd0fa3f51f2d2cc40e27fc578d39392d00c15ad08d0df3ad"; } + { locale = "sl"; arch = "linux-x86_64"; sha512 = "47491dfb70268c3ef00d4599e487fc2af35277de2746a106f59eb1b0813a4201c1e3ff735b0d7b48ea23bf3aac18fa1bb8e0c7948651e421f2677b988633e3ca"; } + { locale = "sq"; arch = "linux-i686"; sha512 = "7773088708cc1ca1c115acaafc2d1456b854a413daf9622c2d267dc33e8a4727b6836743c9cfaf8c5694c729241e317a53b8411e37b8d4f94b67bc02c2878e41"; } + { locale = "sq"; arch = "linux-x86_64"; sha512 = "db776cedad7842e02a87347e2f97aa5e583e2d1e2859659032e338b5c855f24241a4a1950fdb3a13b6dec643a73a7cb5f7e527ecdf50deafa5138c9f273d3408"; } + { locale = "sr"; arch = "linux-i686"; sha512 = "e9eb4827e12db0173643bab8ffca55d50238a1184a2e2ae3543248400f39685b999a068ddab523e429c2667f2966e4a0a09c432837f5e852065459cda67e96b4"; } + { locale = "sr"; arch = "linux-x86_64"; sha512 = "a38c5f80c0e6a442d035f7b4c18a350421948e9246ac65389959978cfe51f317644c06ecc567bb09739bee0303e4e2b8920bc7903900eabe92ad244e20370345"; } + { locale = "sv-SE"; arch = "linux-i686"; sha512 = "d7692def00b3a47e86fc01ad192a610352a6c958e53d1b2e4ac6d27a017643e2c0e9887a173268278b9ee7d2e3116368a8dde4d2fce6ea9b56a2bb3963a31ba7"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha512 = "4656a0d46d358476fcba3be275740a289d79159fa346f4903cac0830341f9a630f1eb0c007d8429cde47821c441d01e792634d32d6e7b94f1bb2c94f18a56563"; } + { locale = "ta-LK"; arch = "linux-i686"; sha512 = "d6ed8ef83f1d4af62a5c2f92c791822d1b711ed4a51d9656c0e73dbe20510efe017f615537c892b43e43a5503ace92652faa5fa5f2d9956349386fe784fe0dc5"; } + { locale = "ta-LK"; arch = "linux-x86_64"; sha512 = "7a994549f4f8c33b185d094e5d207942b62bdf983546aec357404b46e74ec0b790c9b83ffd3cf3687b5bf09457cdbc14593af30ea425718baeb5ecc5703ec15b"; } + { locale = "tr"; arch = "linux-i686"; sha512 = "c5833f7c43919a842f7b840a35ec8752401c24c559d620cdbdc83e70d77e5fbb5a364e44ac3c5f1f1339d9752b9a9825ac0e00d314aa9025760800fc4fc3ce18"; } + { locale = "tr"; arch = "linux-x86_64"; sha512 = "f1338235583f5888fb7bd30c4c66341bf7ebc4a771e76571e22a5ef445398c9d2ced0f2f93d99bb2f180fa73a4a1f3560616570c8711e54d40a9b931e5eeb4d1"; } + { locale = "uk"; arch = "linux-i686"; sha512 = "a40710948603a427c098619be1f203f2e7182eeb697de2b1dfdf824e556353b133839f0e5ce929fa9e31e70b1f248053bddeeba394dfb74e6c747aaa537d1df0"; } + { locale = "uk"; arch = "linux-x86_64"; sha512 = "5dc6979da2242e45c5ca8a4ca50dd2858c1781256e5b2a9b8bed84e1b2af9f98e5ddea285e49549b3afc1a98df2ab89d74c99a6082309f0150ff426c1d9449c0"; } + { locale = "vi"; arch = "linux-i686"; sha512 = "fa795ede70edb6c6237502cde8acdb7d5573db1d995d5e96f274b83f8ea0b827c37a5bcfc74b4aa99f1e15bf8dd68e30d756a0bcecc9e5946c2c5e275dad29bd"; } + { locale = "vi"; arch = "linux-x86_64"; sha512 = "de8a0e22cfc727ccbc460a26a0cb80985c1957da99b050f6f00e4b20b050ba605d815577d392504d0a5e53ba4e12045f3a9a36626ed21682c493259fe0400ecf"; } + { locale = "zh-CN"; arch = "linux-i686"; sha512 = "381d66fc71d3f03f979ccd76aef75fdcf8eb2e182b4a0fa81c08976d195bd696d0213482d40ab365f2dad594587ba8359df4db2cf8febd8d724d5c50f3ba72ed"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha512 = "d988114967c4656a13fa3fd562166e7444811ce16c5fc2af06619a47b941b8e07de0993a5593f2e5bad22ff6e856e969dc4cedb9c8df0f532a807e4a30b0c2ef"; } + { locale = "zh-TW"; arch = "linux-i686"; sha512 = "097a53d990af79e54e445e05c35fc08c86c0d003a04c48daadebb8dc0bd13f57072a82da01c3ae293f4a6766b3e2082bebe12bbb2a8c2f1c7d8eab23eecc2262"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha512 = "9d4dd9e429623009e21b41383776864804803affc9837068bbafd7507bbc5ed70362582da0adb5c811d21c068a96bb4725c4581bf81ac0acb3d57b19fdb4fff6"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index b03698f10fa..ded4e66e366 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, which, m4, gtk, pango, perl, python, zip, libIDL +{ stdenv, fetchurl, pkgconfig, which, m4, gtk2, pango, perl, python, zip, libIDL , libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, alsaLib, nspr, nss, libnotify , yasm, mesa, sqlite, unzip, makeWrapper, pysqlite @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; buildInputs = # from firefox30Pkgs.xulrunner, without gstreamer and libvpx - [ pkgconfig which libpng gtk perl zip libIDL libjpeg zlib bzip2 + [ pkgconfig which libpng gtk2 perl zip libIDL libjpeg zlib bzip2 python dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file alsaLib nspr nss libnotify xorg.pixman yasm mesa diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 26dcbe20079..92fe9c9d01b 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -37,6 +37,7 @@ let "CONFIG+=no-bundled-speex" ] ++ optional (!speechdSupport) "CONFIG+=no-speechd" ++ optional jackSupport "CONFIG+=no-oss CONFIG+=no-alsa CONFIG+=jackaudio" + ++ optional (!iceSupport) "CONFIG+=no-ice" ++ (overrides.configureFlags or [ ]); preConfigure = '' @@ -103,16 +104,16 @@ let "CONFIG+=no-client" ]; - buildInputs = [ libcap ] ++ optional iceSupport [ zeroc_ice ]; + buildInputs = [ libcap ] ++ optional iceSupport zeroc_ice; }; stableSource = rec { - version = "1.2.16"; + version = "1.2.17"; qtVersion = 4; src = fetchurl { url = "https://github.com/mumble-voip/mumble/releases/download/${version}/mumble-${version}.tar.gz"; - sha256 = "1ikswfm7zhwqcwcc1fwk0i9jjgqng49s0yilw50s34bgg1h3im7b"; + sha256 = "176br3b0pv5sz3zvgzsz9rxr3n79irlm902h7n1wh4f6vbph2dhw"; }; }; diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix index ae60ae11309..f3fdea59e48 100644 --- a/pkgs/applications/networking/newsreaders/liferea/default.nix +++ b/pkgs/applications/networking/newsreaders/liferea/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, intltool, python, pygobject3 +{ stdenv, fetchurl, pkgconfig, intltool, pythonPackages , glib, gnome3, pango, libxml2, libxslt, sqlite, libsoup, glib_networking , webkitgtk, json_glib, gobjectIntrospection, gst_all_1 , libnotify , makeWrapper }: -let pname = "liferea"; - version = "1.10.19"; -in -stdenv.mkDerivation rec { +let + pname = "liferea"; + version = "1.10.19"; + inherit (pythonPackages) python pygobject3; +in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 9ca5ace2caf..e8885edaa2a 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,9 +1,9 @@ { spellChecking ? true -, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null +, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null , perl, pcre, gmime, gettext, intltool, dbus_glib, libnotify }: -assert spellChecking -> gtkspell != null; +assert spellChecking -> gtkspell2 != null; let version = "0.139"; in @@ -15,8 +15,8 @@ stdenv.mkDerivation { sha1 = "01ea0361a6d81489888e6abb075fd552999c3c60"; }; - buildInputs = [ pkgconfig gtk perl gmime gettext intltool dbus_glib libnotify ] - ++ stdenv.lib.optional spellChecking gtkspell; + buildInputs = [ pkgconfig gtk2 perl gmime gettext intltool dbus_glib libnotify ] + ++ stdenv.lib.optional spellChecking gtkspell2; enableParallelBuilding = true; diff --git a/pkgs/applications/networking/p2p/ldcpp/default.nix b/pkgs/applications/networking/p2p/ldcpp/default.nix index 53b7b7748b2..b540ffd0967 100644 --- a/pkgs/applications/networking/p2p/ldcpp/default.nix +++ b/pkgs/applications/networking/p2p/ldcpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, pkgconfig, gtk, bzip2, libglade, openssl +{ stdenv, fetchurl, scons, pkgconfig, gtk2, bzip2, libglade, openssl , libX11, boost, zlib, libnotify }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = http://launchpad.net/linuxdcpp/1.1/1.1.0/+download/linuxdcpp-1.1.0.tar.bz2; sha256 = "12i92hirmwryl1qy0n3jfrpziwzb82f61xca9jcjwyilx502f0b6"; }; - buildInputs = [ scons pkgconfig gtk bzip2 libglade openssl libX11 boost libnotify ]; + buildInputs = [ scons pkgconfig gtk2 bzip2 libglade openssl libX11 boost libnotify ]; installPhase = '' export NIX_LDFLAGS="$NIX_LDFLAGS -lX11"; diff --git a/pkgs/applications/networking/p2p/opentracker/default.nix b/pkgs/applications/networking/p2p/opentracker/default.nix index 52378bac55e..abddc22c285 100644 --- a/pkgs/applications/networking/p2p/opentracker/default.nix +++ b/pkgs/applications/networking/p2p/opentracker/default.nix @@ -1,24 +1,28 @@ { stdenv, fetchgit, libowfat, zlib }: stdenv.mkDerivation { - name = "opentracker-2014-08-03"; + name = "opentracker-2016-10-02"; + src = fetchgit { - url = "https://github.com/masroore/opentracker.git"; - rev = "9a26b3d203755577879315ecc2b515d0e22793cb"; - sha256 = "1ayj3j9jv6h26jfhw93wcw7lvhwyfnc20kkicvskalwzw51mpsz8"; + url = "git://erdgeist.org/opentracker"; + rev = "0ebc0ed6a3e3b7acc9f9e338cc23cea5f4f22f61"; + sha256 = "0qi0a8fygjwgs3yacramfn53jdabfgrlzid7q597x9lr94anfpyl"; }; - + buildInputs = [ libowfat zlib ]; - + installPhase = '' - mkdir -p $out/bin + mkdir -p $out/bin $out/share/doc cp opentracker $out/bin + cp opentracker.conf.sample $out/share/doc + runHook postInstall ''; - + meta = with stdenv.lib; { - homepage = https://github.com/masroore/opentracker; - license = "beer-ware"; + homepage = https://erdgeist.org/arts/software/opentracker/; + license = licenses.beerware; platforms = platforms.linux; - description = "Bittorrent tracker project aiminf for minimal resource usage and is intended to run at your wlan router"; + description = "Bittorrent tracker project which aims for minimal resource usage and is intended to run at your wlan router."; + maintainers = with maintainers; [ makefu ]; }; } diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix index f3c94e8577f..620b8601d7d 100644 --- a/pkgs/applications/networking/p2p/qbittorrent/default.nix +++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix @@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null); with stdenv.lib; stdenv.mkDerivation rec { name = "qbittorrent-${version}"; - version = "3.3.5"; + version = "3.3.7"; src = fetchurl { url = "mirror://sourceforge/qbittorrent/${name}.tar.xz"; - sha256 = "1nh4lr4kbgh6rrsjax2a4lg82vn1ld0rnqjpp7sb6vpz8ikavk9q"; + sha256 = "0h2ccqmjnm0x0qjvd0vz5hk7dy9qbqhiqvxywqjhip7sj1585p3j"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix index 39c1fd02b2b..4b881445323 100644 --- a/pkgs/applications/networking/p2p/retroshare/0.6.nix +++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix @@ -36,7 +36,8 @@ stdenv.mkDerivation { qmakeFlags="$qmakeFlags DESTDIR=$out" ''; - enableParallelBuilding = true; + # gui/settings/PluginsPage.h:25:28: fatal error: ui_PluginsPage.h: No such file or directory + enableParallelBuilding = false; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix index 421fd9afb16..3a6a71843a2 100644 --- a/pkgs/applications/networking/p2p/transgui/default.nix +++ b/pkgs/applications/networking/p2p/transgui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, pkgconfig, makeDesktopItem, unzip, fpc, lazarus, -libX11, glib, gtk, gdk_pixbuf, pango, atk, cairo, openssl }: +libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }: stdenv.mkDerivation rec { name = "transgui-5.0.1-svn-r${revision}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig unzip fpc lazarus stdenv.cc - libX11 glib gtk gdk_pixbuf pango atk cairo openssl + libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl ]; NIX_LDFLAGS = " diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix index 4f64e947f09..f8ec7ec01d9 100644 --- a/pkgs/applications/networking/remote/citrix-receiver/default.nix +++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix @@ -8,7 +8,7 @@ , tzdata , cacert , glib -, gtk +, gtk2 , atk , gdk_pixbuf , cairo @@ -56,13 +56,13 @@ stdenv.mkDerivation rec { makeWrapper busybox file - gtk + gtk2 gdk_pixbuf ]; libPath = stdenv.lib.makeLibraryPath [ glib - gtk + gtk2 atk gdk_pixbuf cairo @@ -135,7 +135,7 @@ stdenv.mkDerivation rec { makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \ --set ICAROOT "$ICAInstDir" \ - --set GTK_PATH "${gtk.out}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \ + --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" \ --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ --set LD_LIBRARY_PATH "$libPath" \ diff --git a/pkgs/applications/networking/remote/freerdp/default.nix b/pkgs/applications/networking/remote/freerdp/default.nix index cf1a8552b25..05ec51d6681 100644 --- a/pkgs/applications/networking/remote/freerdp/default.nix +++ b/pkgs/applications/networking/remote/freerdp/default.nix @@ -62,5 +62,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.linux; + broken = true; }; } diff --git a/pkgs/applications/networking/remote/freerdp/unstable.nix b/pkgs/applications/networking/remote/freerdp/unstable.nix index cc6ec9bd231..5483e942076 100644 --- a/pkgs/applications/networking/remote/freerdp/unstable.nix +++ b/pkgs/applications/networking/remote/freerdp/unstable.nix @@ -1,20 +1,24 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, zlib, libX11, libXcursor -, libXdamage, libXext, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv +, libXdamage, libXext, libXrender, glib, alsaLib, ffmpeg, libxkbfile, libXinerama, libXv , substituteAll , libpulseaudio ? null, cups ? null, pcsclite ? null , buildServer ? true, optimize ? true }: stdenv.mkDerivation rec { - name = "freerdp-1.2.0-beta1"; + name = "freerdp-2.0-dev"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; - rev = "1.2.0-beta1+android7"; - sha256 = "08nn18jydblrif1qs92pakzd3ww7inr0i378ssn1bjp09lm1bkk0"; + rev = "1855e36179fb197e713d41c4ef93e19cf1f0be2f"; + sha256 = "1lydkh6by0sjy6dl57bzg7c11ccyp24s80pwxw9h5kmxkbw6mx5q"; }; + prePatch = '' + substituteInPlace "libfreerdp/freerdp.pc.in" --replace "Requires:" "Requires: @WINPR_PKG_CONFIG_FILENAME@" + ''; + patches = [ ] ++ stdenv.lib.optional (pcsclite != null) (substituteAll { @@ -23,7 +27,7 @@ stdenv.mkDerivation rec { }); buildInputs = [ - cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext glib + cmake pkgconfig openssl zlib libX11 libXcursor libXdamage libXext libXrender glib alsaLib ffmpeg libxkbfile libXinerama libXv cups libpulseaudio pcsclite ]; @@ -38,7 +42,6 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional buildServer "-DWITH_SERVER=ON" ++ stdenv.lib.optional optimize "-DWITH_SSE2=ON"; - meta = with stdenv.lib; { description = "A Remote Desktop Protocol Client"; longDescription = '' @@ -51,4 +54,3 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; } - diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix index 05019f83353..503632c009b 100644 --- a/pkgs/applications/networking/remote/putty/default.nix +++ b/pkgs/applications/networking/remote/putty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }: +{ stdenv, fetchurl, ncurses, gtk2, pkgconfig, autoconf, automake, perl, halibut, libtool }: stdenv.mkDerivation rec { version = "0.67"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { cd unix ''; - buildInputs = [ gtk ncurses pkgconfig autoconf automake perl halibut libtool ]; + buildInputs = [ gtk2 ncurses pkgconfig autoconf automake perl halibut libtool ]; meta = with stdenv.lib; { description = "A Free Telnet/SSH Client"; diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 6257c5f95eb..90c80db0a02 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -1,9 +1,13 @@ -{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper -, glib, gtk, gettext, libxkbfile, libgnome_keyring, libX11 -, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, makeWrapper +, glib, gtk3, gettext, libxkbfile, libgnome_keyring, libX11 +, freerdp, libssh, libgcrypt, gnutls, makeDesktopItem +, pcre, webkitgtk, libdbusmenu-gtk3, libappindicator-gtk3 +, libvncserver, libpthreadstubs, libXdmcp, libxkbcommon +, libsecret, spice_protocol, spice_gtk, epoxy, at_spi2_core +, openssl }: let - version = "1.0.0"; + version = "1.2.0-rcgit.15"; desktopItem = makeDesktopItem { name = "remmina"; @@ -15,29 +19,45 @@ let categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; }; + # Latest release of remmina refers to thing that aren't yet in + # a FreeRDP release so we need to build one from git source + # See also https://github.com/FreeRDP/Remmina/pull/731 + # Remove when FreeRDP release catches up with this commit + freerdp_git = stdenv.lib.overrideDerivation freerdp (args: { + name = "freerdp-git-2016-09-30"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "FreeRDP"; + rev = "dbb353db92e7a5cb0be3c73aa950fb1113e627ec"; + sha256 = "1nhm4v6z9var9hasp4bkmhvlrksbdizx95swx19shizfc82s9g4y"; + }; + }); + in stdenv.mkDerivation { name = "remmina-${version}"; - src = fetchurl { - url = "https://github.com/downloads/FreeRDP/Remmina/Remmina-${version}.tar.gz"; - sha256 = "7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731"; + src = fetchFromGitHub { + owner = "FreeRDP"; + repo = "Remmina"; + rev = "v${version}"; + sha256 = "07lj6a7x9cqcff18pwfkx8c8iml015zp6sq29dfcxpfg4ai578h0"; }; buildInputs = [ cmake pkgconfig makeWrapper - glib gtk gettext libxkbfile libgnome_keyring libX11 - freerdp libssh libgcrypt gnutls ]; + glib gtk3 gettext libxkbfile libgnome_keyring libX11 + freerdp_git libssh libgcrypt gnutls + pcre webkitgtk libdbusmenu-gtk3 libappindicator-gtk3 + libvncserver libpthreadstubs libXdmcp libxkbcommon + libsecret spice_protocol spice_gtk epoxy at_spi2_core + openssl ]; - cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF"; - - patches = [ ./lgthread.patch ]; + cmakeFlags = "-DWITH_VTE=OFF -DWITH_TELEPATHY=OFF -DWITH_AVAHI=OFF -DWINPR_INCLUDE_DIR=${freerdp_git}/include/winpr2"; postInstall = '' mkdir -pv $out/share/applications - mkdir -pv $out/share/icons cp ${desktopItem}/share/applications/* $out/share/applications - cp -r $out/share/remmina/icons/* $out/share/icons wrapProgram $out/bin/remmina --prefix LD_LIBRARY_PATH : "${libX11.out}/lib" ''; diff --git a/pkgs/applications/networking/remote/remmina/lgthread.patch b/pkgs/applications/networking/remote/remmina/lgthread.patch deleted file mode 100644 index 2d8e60f7572..00000000000 --- a/pkgs/applications/networking/remote/remmina/lgthread.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix [undefined reference to `g_thread_init'] as suggested by -http://ragnermagalhaes.blogspot.ru/2007/09/undefined-reference-to-gthreadinit.html - -diff -ru FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt FreeRDP-Remmina-356c033/remmina/CMakeLists.txt ---- FreeRDP-Remmina-356c033.orig/remmina/CMakeLists.txt 2013-11-05 12:43:27.660276912 +0400 -+++ FreeRDP-Remmina-356c033/remmina/CMakeLists.txt 2013-11-05 12:53:39.607018349 +0400 -@@ -132,6 +132,8 @@ - endif() - endif() - -+set( CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgthread-2.0" ) -+ - add_subdirectory(po) - add_subdirectory(icons) - add_subdirectory(desktop) - diff --git a/pkgs/applications/networking/sniffers/etherape/default.nix b/pkgs/applications/networking/sniffers/etherape/default.nix index f5104665562..5bc5bafe7db 100644 --- a/pkgs/applications/networking/sniffers/etherape/default.nix +++ b/pkgs/applications/networking/sniffers/etherape/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libtool, gtk, libpcap, libglade, libgnome, libgnomeui +{ stdenv, fetchurl, pkgconfig, libtool, gtk2, libpcap, libglade, libgnome, libgnomeui , gnomedocutils, scrollkeeper, libxslt }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-scrollkeeper" ]; buildInputs = [ - pkgconfig libtool gtk libpcap libglade libgnome libgnomeui gnomedocutils + pkgconfig libtool gtk2 libpcap libglade libgnome libgnomeui gnomedocutils scrollkeeper libxslt ]; diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index bbd08f00577..99df01afa6a 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, perl, flex, bison, libpcap, libnl, c-ares , gnutls, libgcrypt, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib , zlib -, withGtk ? false, gtk ? null, pango ? null, cairo ? null, gdk_pixbuf ? null +, withGtk ? false, gtk2 ? null, pango ? null, cairo ? null, gdk_pixbuf ? null , withQt ? false, qt4 ? null }: -assert withGtk -> !withQt && gtk != null; +assert withGtk -> !withQt && gtk2 != null; assert withQt -> !withGtk && qt4 != null; with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation { bison flex perl pkgconfig libpcap lua5 openssl libgcrypt gnutls geoip libnl c-ares python libcap glib zlib ] ++ optional withQt qt4 - ++ (optionals withGtk [gtk pango cairo gdk_pixbuf]); + ++ (optionals withGtk [gtk2 pango cairo gdk_pixbuf]); patches = [ ./wireshark-lookup-dumpcap-in-path.patch ]; diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix index c1907c44e58..3190d999a91 100644 --- a/pkgs/applications/networking/sync/backintime/common.nix +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }: +{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }: let inherit (python3Packages) python dbus-python keyring; @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a"; }; - buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfsFuse encfs ]; + buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; installFlags = [ "DEST=$(out)" ]; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix new file mode 100644 index 00000000000..dc10b8d2ec8 --- /dev/null +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fetchhg, fetchbzr, fetchsvn }: + +buildGoPackage rec { + name = "rclone-${version}"; + version = "1.33"; + + goPackagePath = "github.com/ncw/rclone"; + + src = fetchFromGitHub { + owner = "ncw"; + repo = "rclone"; + rev = "v${version}"; + sha256 = "00y48ww40x73xpdvkzfhllwvbh9a2ffmmkc6ri9343wvmb53laqk"; + }; + + goDeps = ./deps.nix; + + meta = { + description = "Command line program to sync files and directories to and from major cloud storage"; + homepage = "http://rclone.org"; + license = stdenv.lib.licenses.mit; + maintainers = [ ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/networking/sync/rclone/deps.nix b/pkgs/applications/networking/sync/rclone/deps.nix new file mode 100644 index 00000000000..4fd802f66c0 --- /dev/null +++ b/pkgs/applications/networking/sync/rclone/deps.nix @@ -0,0 +1,219 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "bazil.org/fuse"; + fetch = { + type = "git"; + url = "https://github.com/bazil/fuse"; + rev = "371fbbdaa8987b715bdd21d6adc4c9b20155f748"; + sha256 = "1x5p301py7mcxgwklfm6pqqkzssln0nfzllng49pnk60m03ilp4w"; + }; + } + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "90296fd601ebfc594192e722a022663b0c3f8756"; + sha256 = "0qg0d1afhqmpfaq2lh29c87d18s5148yshg0s295dhzdn1m9nhww"; + }; + } + { + goPackagePath = "github.com/Unknwon/goconfig"; + fetch = { + type = "git"; + url = "https://github.com/Unknwon/goconfig"; + rev = "5aa4f8cd5a472c2411c778b4680f59f2223f1966"; + sha256 = "0r6na17sz762c1dyn6gb16v2zhvzg6krmz7pcjg1m0l5wxdf4n0d"; + }; + } + { + goPackagePath = "github.com/VividCortex/ewma"; + fetch = { + type = "git"; + url = "https://github.com/VividCortex/ewma"; + rev = "c595cd886c223c6c28fc9ae2727a61b5e4693d85"; + sha256 = "0f09886vm4rkhgqqh2b20r8rws4syvny3la107hh6qby027bpab2"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "13a12060f716145019378a10e2806c174356b857"; + sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa"; + sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; + }; + } + { + goPackagePath = "github.com/google/go-querystring"; + fetch = { + type = "git"; + url = "https://github.com/google/go-querystring"; + rev = "9235644dd9e52eeae6fa48efd539fdc351a0af53"; + sha256 = "0q398679fwp7vlnpd2rlzz452a7a4qvpcspak81psfl3xwimpzgq"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-httpclient"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-httpclient"; + rev = "31f0106b4474f14bc441575c19d3a5fa21aa1f6c"; + sha256 = "1iz95p7fl43smyh1lzjnwk6gq9y7q15m2qdkf0f4kxf3x5731v9i"; + }; + } + { + goPackagePath = "github.com/ncw/go-acd"; + fetch = { + type = "git"; + url = "https://github.com/ncw/go-acd"; + rev = "56da839497f9854a91f99fe752c33c7977a6f48b"; + sha256 = "1va6hpl73ps443r0s2icplcx113gkhmi2gbsgpaw2iii5lji5085"; + }; + } + { + goPackagePath = "github.com/ncw/swift"; + fetch = { + type = "git"; + url = "https://github.com/ncw/swift"; + rev = "b964f2ca856aac39885e258ad25aec08d5f64ee6"; + sha256 = "0c86ap1zb56r6g96cnbn5j3i3r96c5l8rl98h3sxlqi5agwp3km4"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + fetch = { + type = "git"; + url = "https://github.com/ogier/pflag"; + rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; + sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + }; + } + { + goPackagePath = "github.com/rfjakob/eme"; + fetch = { + type = "git"; + url = "https://github.com/rfjakob/eme"; + rev = "601d0e278ceda9aa2085a61c9265f6e690ef5255"; + sha256 = "1ryh5f2a42psrqcpjh73shk3p0mva2vcyyfav4nhxmfqall77k5z"; + }; + } + { + goPackagePath = "github.com/skratchdot/open-golang"; + fetch = { + type = "git"; + url = "https://github.com/skratchdot/open-golang"; + rev = "75fb7ed4208cf72d323d7d02fd1a5964a7a9073c"; + sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; + sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/stacktic/dropbox"; + fetch = { + type = "git"; + url = "https://github.com/stacktic/dropbox"; + rev = "58f839b21094d5e0af7caf613599830589233d20"; + sha256 = "1psmxpnn40ri9bgjvivljnd4p977f635mh3w7m5mglxxgc9392pi"; + }; + } + { + goPackagePath = "github.com/tsenart/tb"; + fetch = { + type = "git"; + url = "https://github.com/tsenart/tb"; + rev = "19f4c3d79d2bd67d0911b2e310b999eeea4454c1"; + sha256 = "148vy4xij5qm8dq5plyczx2wbpi4gpg8ksr5r3b4m8j0z1kjws8y"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; + sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; + sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "3c3a985cb79f52a3190fbc056984415ca6763d01"; + sha256 = "0c7x8wkya56z03j2qfm61932npsddgqyggi75hkla9755d1inqlv"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; + sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "eb84d1a029af1654777e7ba65c979085305c3e38"; + sha256 = "0ldmzcx5lxa81lcr39djcvyhd0ls11jlswj5877rinq3505ayf5l"; + }; + } + { + goPackagePath = "github.com/stretchr/testify/"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c"; + sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl"; + }; + } +] diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 99a9e7462c2..3d8733635ee 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.14.6"; + version = "0.14.8"; name = "syncthing-${version}"; src = fetchFromGitHub { - owner = "syncthing"; - repo = "syncthing"; - rev = "v${version}"; - sha256 = "1w8a46c6r3rddfl9xbx7j2mavai4dm9h8flpm4qr0bsd6whf60hz"; + owner = "syncthing"; + repo = "syncthing"; + rev = "v${version}"; + sha256 = "0zhxgl6pgf60x99cappdfzk7h23g37hlanh72bwypx7pwbvhc91l"; }; buildInputs = [ go ]; @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Open Source Continuous File Synchronization"; license = stdenv.lib.licenses.mpl20; maintainers = with stdenv.lib.maintainers; [ pshendry joko peterhoeg ]; - platforms = with stdenv.lib.platforms; linux ++ freebsd ++ openbsd ++ netbsd; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/syncthing/inotify-deps.json b/pkgs/applications/networking/syncthing/inotify-deps.json deleted file mode 100644 index e0cc9680e22..00000000000 --- a/pkgs/applications/networking/syncthing/inotify-deps.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "goPackagePath": "github.com/cenkalti/backoff", - "fetch": { - "type": "git", - "url": "https://github.com/cenkalti/backoff", - "rev": "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6", - "sha256": "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh" - } - }, - { - "goPackagePath": "github.com/gobwas/glob", - "fetch": { - "type": "git", - "url": "https://github.com/gobwas/glob", - "rev": "ce6abff51712df5da11095fb41dd4b0353559797", - "sha256": "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m" - } - }, - { - "goPackagePath": "github.com/syncthing/syncthing", - "fetch": { - "type": "git", - "url": "https://github.com/syncthing/syncthing", - "rev": "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8", - "sha256": "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9" - } - }, - { - "goPackagePath": "github.com/zillode/notify", - "fetch": { - "type": "git", - "url": "https://github.com/zillode/notify", - "rev": "2da5cc9881e8f16bab76b63129c7781898f97d16", - "sha256": "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40" - } - } -] \ No newline at end of file diff --git a/pkgs/applications/networking/syncthing/inotify-deps.nix b/pkgs/applications/networking/syncthing/inotify-deps.nix new file mode 100644 index 00000000000..302e5ee10e1 --- /dev/null +++ b/pkgs/applications/networking/syncthing/inotify-deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; + sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "ce6abff51712df5da11095fb41dd4b0353559797"; + sha256 = "1gxv4nnn3f9hw1ncdmhsr8fbfdma2h713ima7b4k28gxydfa8i9m"; + }; + } + { + goPackagePath = "github.com/syncthing/syncthing"; + fetch = { + type = "git"; + url = "https://github.com/syncthing/syncthing"; + rev = "66a506e72b9dcc749d09a03cb120ba86bbf3d7f8"; + sha256 = "0is4f1r3im2bbmbca9fafzxffikxaf86vd6f851831fk5wi4pzw9"; + }; + } + { + goPackagePath = "github.com/zillode/notify"; + fetch = { + type = "git"; + url = "https://github.com/zillode/notify"; + rev = "2da5cc9881e8f16bab76b63129c7781898f97d16"; + sha256 = "0qwsj730p5mivp2xw9zr5vq8xr7rr9cxjmi564wgmsn7dcvqnr40"; + }; + } +] diff --git a/pkgs/applications/networking/syncthing/inotify.nix b/pkgs/applications/networking/syncthing/inotify.nix index 4f001794e86..ea8d73cb863 100644 --- a/pkgs/applications/networking/syncthing/inotify.nix +++ b/pkgs/applications/networking/syncthing/inotify.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "194pbz9zzxaz0vri93czpbsxl85znlba2gy61mjgyr0dm2h4s6yw"; }; - goDeps = ./inotify-deps.json; + goDeps = ./inotify-deps.nix; meta = { homepage = https://github.com/syncthing/syncthing-inotify; diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 9f436d21bc3..5735dd68bcd 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; postPatch = '' # Mostly a cosmetic change diff --git a/pkgs/applications/networking/syncthing012/deps.json b/pkgs/applications/networking/syncthing012/deps.json deleted file mode 100644 index b21f2ef6a16..00000000000 --- a/pkgs/applications/networking/syncthing012/deps.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/bkaradzic/go-lz4", - "fetch": { - "type": "git", - "url": "https://github.com/bkaradzic/go-lz4", - "rev": "74ddf82598bc4745b965729e9c6a463bedd33049", - "sha256": "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1" - } - }, - { - "goPackagePath": "github.com/calmh/luhn", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/luhn", - "rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632", - "sha256": "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/vitrun/qart", - "fetch": { - "type": "git", - "url": "https://github.com/vitrun/qart", - "rev": "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0", - "sha256": "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8" - } - }, - { - "goPackagePath": "github.com/calmh/du", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/du", - "rev": "3c0690cca16228b97741327b1b6781397afbdb24", - "sha256": "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa" - } - }, - { - "goPackagePath": "github.com/calmh/xdr", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/xdr", - "rev": "e467b5aeb65ca8516fb3925c84991bf1d7cc935e", - "sha256": "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra" - } - }, - { - "goPackagePath": "github.com/juju/ratelimit", - "fetch": { - "type": "git", - "url": "https://github.com/juju/ratelimit", - "rev": "772f5c38e468398c4511514f4f6aa9a4185bc0a0", - "sha256": "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p" - } - }, - { - "goPackagePath": "github.com/thejerf/suture", - "fetch": { - "type": "git", - "url": "https://github.com/thejerf/suture", - "rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7", - "sha256": "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy", - "rev": "723cc1e459b8eea2dea4583200fd60757d40097a", - "sha256": "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h" - } - }, - { - "goPackagePath": "github.com/syndtr/goleveldb", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/goleveldb", - "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0", - "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb" - } - } -] diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix new file mode 100644 index 00000000000..44e18c2f606 --- /dev/null +++ b/pkgs/applications/networking/syncthing012/deps.nix @@ -0,0 +1,128 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/bkaradzic/go-lz4"; + fetch = { + type = "git"; + url = "https://github.com/bkaradzic/go-lz4"; + rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; + sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; + }; + } + { + goPackagePath = "github.com/calmh/luhn"; + fetch = { + type = "git"; + url = "https://github.com/calmh/luhn"; + rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; + sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/vitrun/qart"; + fetch = { + type = "git"; + url = "https://github.com/vitrun/qart"; + rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0"; + sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"; + }; + } + { + goPackagePath = "github.com/calmh/du"; + fetch = { + type = "git"; + url = "https://github.com/calmh/du"; + rev = "3c0690cca16228b97741327b1b6781397afbdb24"; + sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; + }; + } + { + goPackagePath = "github.com/calmh/xdr"; + fetch = { + type = "git"; + url = "https://github.com/calmh/xdr"; + rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; + sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; + sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; + }; + } + { + goPackagePath = "github.com/thejerf/suture"; + fetch = { + type = "git"; + url = "https://github.com/thejerf/suture"; + rev = "99c1f2d613756768fc4299acd9dc621e11ed3fd7"; + sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; + sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/goleveldb"; + rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; + sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; + }; + } +] diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 4ec939a0129..059c68b77e6 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1b7mi1l20jhj09kyh0bq14qzz8vdhhyf35gzwsq43mn6rc7h0b4f"; }; - preInstall = '' + prePatch = '' sed -i -e "s|/usr/local/bin|$out/bin|g" -e "s|/usr/share|$out/share|g" Makefile antiword.h ''; diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix new file mode 100644 index 00000000000..ca003da9c46 --- /dev/null +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +stdenv.mkDerivation rec { + name = "bean-add-2016-10-03"; + + src = fetchFromGitHub { + owner = "simon-v"; + repo = "bean-add"; + rev = "41deacc09b992db5eede34fefbfb2c0faeba1652"; + sha256 = "09xdsskk5rc3xsf1v1vq7nkdxrxy8w2fixx2vdv8c97ak6a4hrca"; + }; + + propagatedBuildInputs = with python3Packages; [ python readline ]; + + installPhase = '' + mkdir -p $out/bin/ + cp bean-add $out/bin/bean-add + chmod +x $out/bin/bean-add + ''; + + meta = { + homepage = https://github.com/simon-v/bean-add/; + description = "beancount transaction entry assistant"; + + # The (only) source file states: + # License: "Do what you feel is right, but don't be a jerk" public license. + + maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix index 5c87218e306..ef824f57a35 100644 --- a/pkgs/applications/office/gnucash/2.6.nix +++ b/pkgs/applications/office/gnucash/2.6.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile -, intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice +, intltool, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers , pango, gdk_pixbuf @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { intltool pkgconfig libxml2 libxslt glibcLocales file gettext swig enchant bzip2 isocodes # glib, gtk... - glib gtk goffice webkit + glib gtk2 goffice webkit # gnome... dconf gconf libgnomecanvas gsettings_desktop_schemas # financial @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { ''; # The following settings fix failures in the test suite. It's not required otherwise. - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk pango gdk_pixbuf ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk2 pango gdk_pixbuf ]; preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash"; doCheck = true; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 7ef77dc2562..1eedf1f313b 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk, libgnomeui, libofx +{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx , libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui , intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade , libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig libxml2 gconf glib gtk libgnomeui libgtkhtml gtkhtml + pkgconfig libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml libgnomeprint goffice enchant gettext intltool perl guile slibGuile swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index ba37a3ef428..fcd9f954a67 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,9 +1,10 @@ { stdenv, fetchurl, pkgconfig, intltool, perl, perlXMLParser -, goffice, gnome3, makeWrapper, gtk3, bison -, python, pygobject3 +, goffice, gnome3, makeWrapper, gtk3, bison, pythonPackages }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject3; +in stdenv.mkDerivation rec { name = "gnumeric-1.12.32"; src = fetchurl { diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix index d4790edbb3e..3f3b5c2966c 100644 --- a/pkgs/applications/office/keepnote/default.nix +++ b/pkgs/applications/office/keepnote/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, pythonPackages, pygtk }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonApplication { +pythonPackages.buildPythonApplication { name = "keepnote-0.7.8"; namePrefix = ""; @@ -9,7 +9,7 @@ buildPythonApplication { sha256 = "0nhkkv1n0lqf3zn17pxg5cgryv1wwlj4hfmhixwd76rcy8gs45dh"; }; - propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk ]; + propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade ]; # Testing fails. doCheck = false; diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 2516cfd4597..f375da17504 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { KDEDIRS = libalkimia; - patches = [ ./qgpgme.patch ]; + patches = [ + ./qgpgme.patch + ./seqaccessmgrtest.patch + ]; meta = { homepage = http://kmymoney2.sourceforge.net/; diff --git a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch new file mode 100644 index 00000000000..d01a433ba09 --- /dev/null +++ b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch @@ -0,0 +1,26 @@ +Fix tests for 32bit builds until we can bring these upstream +diff --git a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp +index dcb4b4a..e803203 100644 +--- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp ++++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp +@@ -58,13 +58,13 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor() + QCOMPARE(m->m_nextPayeeID, 0ul); + QCOMPARE(m->m_nextScheduleID, 0ul); + QCOMPARE(m->m_nextReportID, 0ul); +- QCOMPARE(m->m_institutionList.count(), 0ul); +- QCOMPARE(m->m_accountList.count(), 5ul); +- QCOMPARE(m->m_transactionList.count(), 0ul); +- QCOMPARE(m->m_transactionKeys.count(), 0ul); +- QCOMPARE(m->m_payeeList.count(), 0ul); +- QCOMPARE(m->m_tagList.count(), 0ul); +- QCOMPARE(m->m_scheduleList.count(), 0ul); ++ QCOMPARE(m->m_institutionList.count(), (size_t)0); ++ QCOMPARE(m->m_accountList.count(), (size_t)5); ++ QCOMPARE(m->m_transactionList.count(), (size_t)0); ++ QCOMPARE(m->m_transactionKeys.count(), (size_t)0); ++ QCOMPARE(m->m_payeeList.count(), (size_t)0); ++ QCOMPARE(m->m_tagList.count(), (size_t)0); ++ QCOMPARE(m->m_scheduleList.count(), (size_t)0); + + QCOMPARE(m->m_dirty, false); + QCOMPARE(m->m_creationDate, QDate::currentDate()); diff --git a/pkgs/applications/office/libreoffice/README.md b/pkgs/applications/office/libreoffice/README.md new file mode 100644 index 00000000000..eb21fe2f441 --- /dev/null +++ b/pkgs/applications/office/libreoffice/README.md @@ -0,0 +1,10 @@ +LibreOffice +=========== + +To generate `libreoffice-srcs.nix`: + + nix-shell default-gen-shell.nix --run generate + +To generate `libreoffice-srcs-still.nix`: + + nix-shell still-gen-shell.nix --run generate diff --git a/pkgs/applications/office/libreoffice/default-gen-shell.nix b/pkgs/applications/office/libreoffice/default-gen-shell.nix new file mode 100644 index 00000000000..36603097123 --- /dev/null +++ b/pkgs/applications/office/libreoffice/default-gen-shell.nix @@ -0,0 +1,29 @@ +{ pkgs ? (import {}) }: + +with pkgs; + +let + + primary-src = callPackage ./default-primary-src.nix {}; + +in + +stdenv.mkDerivation { + name = "generate-libreoffice-srcs-shell"; + + buildCommand = "exit 1"; + + downloadList = stdenv.mkDerivation { + name = "libreoffice-${primary-src.version}-download-list"; + inherit (primary-src) src version; + builder = ./download-list-builder.sh; + }; + + buildInputs = [ python3 ]; + + shellHook = '' + function generate { + python3 generate-libreoffice-srcs.py > libreoffice-srcs.nix + } + ''; +} diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix new file mode 100644 index 00000000000..553719a1c60 --- /dev/null +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -0,0 +1,17 @@ +{ fetchurl }: + +rec { + major = "5"; + minor = "2"; + patch = "2"; + tweak = "2"; + + subdir = "${major}.${minor}.${patch}"; + + version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; + + src = fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "1q6rv935g633ngg10hzi23sg0wqfq2apyffagk7mj1kan2hflljr"; + }; +} diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index caf500d2b97..8a69ca8eeb3 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -18,23 +18,15 @@ , kdeIntegration ? false }: +let + primary-src = import ./default-primary-src.nix { inherit fetchurl; }; +in + +with { inherit (primary-src) major minor subdir version; }; + let lib = stdenv.lib; langsSpaces = lib.concatStringsSep " " langs; - major = "5"; - minor = "2"; - patch = "0"; - tweak = "4"; - subdir = "${major}.${minor}.${patch}"; - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { - inherit name md5; - url = if brief then - "http://dev-www.libreoffice.org/src/${subDir}${name}" - else - "http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}"; - }; fetchSrc = {name, sha256}: fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; @@ -42,32 +34,29 @@ let }; srcs = { - third_party = [ (fetchurl rec { + third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; - md5 = "185d60944ea767075d27247c3162b3bc"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; - }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs.nix)); + }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "0a3dnqm9k1skp7jvg354fdn84y0ylvnjzpd4v2r2mbz8vc4p3ld5"; + sha256 = "0nxwf3b63gzb04svb6z1hi3qf95i90pwda5gpmlrfrq6250n3bpi"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1gyakwbbsd3aykf0gsanyg6p4g4qixj1rh6qxspln70afl3kxm90"; + sha256 = "1gm23i0snhcm4svciypm0qiviiqv9zpiyplkh22baccs7li3kih1"; }; }; in stdenv.mkDerivation rec { name = "libreoffice-${version}"; - src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1v3bbk2afq61gs3l4qvc1r6y0ylr21jzbm3wcnyq9c3bbyw43pj7"; - }; + inherit (primary-src) src; # Openoffice will open libcups dynamically, so we link it directly # to make its dlopen work. @@ -87,7 +76,7 @@ in stdenv.mkDerivation rec { postUnpack = '' mkdir -v $sourceRoot/src - '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} @@ -242,7 +231,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk + freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst @@ -254,6 +243,7 @@ in stdenv.mkDerivation rec { libxshmfence libatomic_ops graphite2 harfbuzz librevenge libe-book libmwaw glm glew ncurses libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper + gdb ] ++ lib.optional kdeIntegration kde4.kdelibs; diff --git a/pkgs/applications/office/libreoffice/download-list-builder.sh b/pkgs/applications/office/libreoffice/download-list-builder.sh new file mode 100644 index 00000000000..c054e2c72cb --- /dev/null +++ b/pkgs/applications/office/libreoffice/download-list-builder.sh @@ -0,0 +1,3 @@ +source $stdenv/setup + +tar --extract --file=$src libreoffice-$version/download.lst -O > $out diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py new file mode 100755 index 00000000000..3d56c74e3ab --- /dev/null +++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.py @@ -0,0 +1,307 @@ +#!/usr/bin/env python3 + +""" +Converts the LibreOffice `download.lst` file into a Nix expression. + +Requires an environment variable named `downloadList` identifying the path +of the input file, and writes the result to stdout. + +todo - Ideally we would move as much as possible into derivation dependencies. +""" +import collections, itertools, json, re, subprocess, sys, os + +def main(): + + packages = list(get_packages()) + + for x in packages: + print(x, file=sys.stderr) + + print('[') + + for x in packages: + + md5 = x['md5'] + tarball = x['tarball'] + + url = construct_url(x) + print('url: {}'.format(url), file=sys.stderr) + + path = download(url, tarball, md5) + print('path: {}'.format(path), file=sys.stderr) + + sha256 = get_sha256(path) + print('sha256: {}'.format(sha256), file=sys.stderr) + + print(' {') + print(' name = "{}";'.format(tarball)) + print(' url = "{}";'.format(url)) + print(' sha256 = "{}";'.format(sha256)) + print(' md5 = "{}";'.format(md5)) + print(' md5name = "{}-{}";'.format(md5,tarball)) + print(' }') + + print(']') + + +def construct_url(x): + if x['brief']: + return 'http://dev-www.libreoffice.org/src/{}{}'.format( + x.get('subdir', ''), x['tarball']) + else: + return 'http://dev-www.libreoffice.org/src/{}{}-{}'.format( + x.get('subdir', ''), x['md5'], x['tarball']) + + +def download(url, name, md5): + cmd = ['nix-prefetch-url', url, md5, '--print-path', + '--type', 'md5', '--name', name] + proc = subprocess.run(cmd, stdout=subprocess.PIPE, check=True, + universal_newlines=True) + return proc.stdout.split('\n')[1].strip() + + +def get_sha256(path): + cmd = ['sha256sum', path] + proc = subprocess.run(cmd, stdout=subprocess.PIPE, check=True, + universal_newlines=True) + return proc.stdout.split(' ')[0].strip() + + +def get_packages(): + """ + All of the package data: What's parsed from download.lst, + plus our additions. + """ + return apply_additions(get_packages_from_download_list(), + get_additions()) + + +def get_additions(): + """ + A mapping from package name (the all-caps identifiers used in + `download.lst`) to a dict of additional attributes to set on the package. + """ + with open('./libreoffice-srcs-additions.json') as f: + return json.load(f) + + +def apply_additions(xs, additions): + for x in xs: + yield dict_merge([x, + additions.get(x['name'], {})]) + + +def get_packages_from_download_list(): + """ + The result of parsing `download.lst`: A list of dicts containing keys + 'name', 'tarball', 'md5', 'brief'. + """ + + def lines(): + for x in sub_symbols(parse_lines(get_lines())): + + interpretation = interpret(x) + + if interpretation == 'unrecognized': + print_skipped_line(x) + else: + yield dict_merge([x, + interpretation]) + + def cluster(xs): + """ + Groups lines according to their order within the file, to support + packages that are listed in `download.lst` more than once. + """ + keys = ['tarball', 'md5', 'brief'] + a = {k: [x for x in xs if k in x['attrs']] for k in keys} + return zip(*[a[k] for k in keys]) + + def packages(): + for (name, group) in groupby(lines(), lambda x: x['name']): + for xs in cluster(group): + yield {'name': name, + 'attrs': dict_merge(x['attrs'] for x in xs), + 'index': min(x['index'] for x in xs)} + + for x in sorted(packages(), key=lambda x: x['index']): + yield dict_merge([{'name': x['name']}, + x['attrs']]) + + +def dict_merge(xs): + """ + >>> dict_merge([{1: 2}, {3: 4}, {3: 5}]) + {1: 2, 3: 4} + """ + return dict(collections.ChainMap(*xs)) + + +def groupby(xs, f): + """ + >>> groupby([1, 2, 3, 4], lambda x: x % 2) + [(0, [2, 4]), (1, [1, 3])] + """ + for (k, iter) in itertools.groupby(sorted(xs, key=f), f): + group = list(iter) + yield (f(group[0]), group) + + +def get_lines(): + + download_list = os.getenv('downloadList') + + with open(download_list) as f: + return f.read().splitlines() + + +def print_skipped_line(x): + + print('Skipped line {}: {}'.format(x['index'], + x['original']), + file=sys.stderr) + + +def parse_lines(lines): + """ + Input: List of strings (the lines from `download.lst` + Output: Iterator of dicts with keys 'key', 'value', and 'index' + """ + for (index, line) in enumerate(lines): + + x = { 'index': index, 'original': line } + + result = parse_line(line) + + if result == 'nothing': + pass + elif result == 'unrecognized': + print_skipped_line(x) + else: + yield dict_merge([x, + result]) + + +def parse_line(line): + """ + Input: A string + Output: One of 1. A dict with keys 'key', 'value' + 2. 'nothing' (if the line contains no information) + 2. 'unrecognized' (if parsing failed) + """ + + if re.match('\s*(#.*)?$', line): + return 'nothing' + + match = re.match('\s*export\s+([^:\s]+)\s*:=\s*(.*)$', line) + + if match: + return { + 'key': match.group(1), + 'value': match.group(2).strip() + } + else: + return 'unrecognized' + + +def sub_symbols(xs): + """ + Do substitution of variables across all lines. + + >>> sub_symbols([{'key': 'a', 'value': 'x'}, + ... {'key': 'c': 'value': '$(a)yz'}]) + [{'key': 'a', 'value': 'x'}, {'key': 'c': 'value': 'xyz'}] + """ + + xs = list(xs) + + symbols = {x['key']: x for x in xs} + + def get_value(k): + x = symbols.get(k) + return x['value'] if x is not None else None + + for x in xs: + yield dict_merge([{'value': sub_str(x['value'], get_value)}, + x]) + + +def sub_str(string, func): + """ + Do substitution of variables in a single line. + + >>> sub_str("x = $(x)", lambda k: {'x': 'a'}[k]) + "x = a" + """ + + def func2(m): + x = m.group(1) + result = func(x) + return result if result is not None else x + + return re.sub(r'\$\(([^\$\(\)]+)\)', func2, string) + + +def interpret(x): + """ + Input: Dict with keys 'key' and 'value' + Output: One of 1. Dict with keys 'name' and 'attrs' + 2. 'unrecognized' (if interpretation failed) + """ + for f in [interpret_md5, interpret_tarball_with_md5, interpret_tarball]: + result = f(x) + if result is not None: + return result + + return 'unrecognized' + + +def interpret_md5(x): + """ + >>> interpret_md5("ODFGEN_MD5SUM", "32572ea48d9021bbd6fa317ddb697abc") + {'name': 'ODFGEN', 'attrs': {'md5': '32572ea48d9021bbd6fa317ddb697abc'}} + """ + + match = re.match('^(.*)_MD5SUM$', x['key']) + + if match: + return {'name': match.group(1), + 'attrs': {'md5': x['value']}} + + +def interpret_tarball(x): + """ + >>> interpret_tarball("FREEHAND_TARBALL", "libfreehand-0.1.1.tar.bz2") + {'name': 'FREEHAND', + 'attrs': {'tarball': 'libfreehand-0.1.1.tar.bz2', 'brief': True}} + """ + + match = re.match('^(.*)_TARBALL$', x['key']) + + if match: + return {'name': match.group(1), + 'attrs': {'tarball': x['value'], 'brief': True}} + + +def interpret_tarball_with_md5(x): + """ + >>> interpret_tarball_with_md5("CLUCENE_TARBALL",\ + "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz") + {'name': 'CLUCENE', + 'attrs': {'tarball': 'clucene-core-2.3.3.4.tar.gz', + 'md5': '48d647fbd8ef8889e5a7f422c1bfda94', 'brief': False}} + """ + + match = {'key': re.match('^(.*)_TARBALL$', x['key']), + 'value': re.match('(?P[0-9a-fA-F]{32})-(?P.+)$', + x['value'])} + + if match['key'] and match['value']: + return {'name': match['key'].group(1), + 'attrs': {'tarball': match['value'].group('tarball'), + 'md5': match['value'].group('md5'), + 'brief': False}} + + +main() diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh deleted file mode 100755 index 0c92a1c5553..00000000000 --- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh +++ /dev/null @@ -1,70 +0,0 @@ -#!/run/current-system/sw/bin/bash - -# Ideally we would move as much as possible into derivation dependencies - -# Take the list of files from the main package, ooo.lst.in - -# This script wants an argument: download list file - -cat <&2; - eval "${line#* }"; - ;; - \#*) - echo Skipping comment: "$line" >&2; - ;; - *_MD5SUM\ :=*) - read tbline; - line=${line##* }; - line=${line##*:=}; - if [ "${tbline#*VERSION_MICRO}" != "$tbline" ]; then - verline=${tbline##* }; - read tbline; - tbline=${tbline##* }; - tbline=${tbline##*:=}; - md5=$line - name=$tbline; - name="${name/\$([A-Z]*_VERSION_MICRO)/$verline}" - else - tbline=${tbline##* }; - tbline=${tbline##*:=}; - md5=$line - name=$tbline; - fi - brief=true; - write_entry; - ;; - *_TARBALL\ :=*) - line=${line##* }; - line=${line##*:=}; - line="${line#,}" - md5=${line:0:32}; - name=${line:33}; - name="${name%)}" - brief=false; - write_entry; - ;; - *) - echo Skipping: "$line" >&2; - ;; - esac -done - -echo ']' diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json new file mode 100644 index 00000000000..75d4cced92a --- /dev/null +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.json @@ -0,0 +1,3 @@ +{ + "LIBGLTF": {"subdir": "libgltf/"} +} diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh deleted file mode 100644 index d505aa7a4cb..00000000000 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh +++ /dev/null @@ -1 +0,0 @@ -EVAL additions_libgltf=' subDir = "libgltf/";' diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix index 0d626728c9a..d2010d81a8a 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-still.nix @@ -1,528 +1,737 @@ [ -{ - name = "libabw-0.1.1.tar.bz2"; - md5 = "7a3815b506d064313ba309617b6f5a0b"; - brief = true; -} -{ - name = "commons-logging-1.2-src.tar.gz"; - md5 = "ce977548f1cbf46918e93cd38ac35163"; - brief = true; -} -{ - name = "apr-1.4.8.tar.gz"; - md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; - brief = true; -} -{ - name = "apr-util-1.5.3.tar.gz"; - md5 = "71a11d037240b292f824ba1eb537b4e3"; - brief = true; -} -{ - name = "boost_1_59_0.tar.bz2"; - md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87"; - brief = true; -} -{ - name = "bsh-2.0b5-src.zip"; - md5 = "ec1941a74d3ef513c4ce57a9092b74e1"; - brief = false; -} -{ - name = "bzip2-1.0.6.tar.gz"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - brief = false; -} -{ - name = "cairo-1.10.2.tar.gz"; - md5 = "f101a9e88b783337b20b2e26dfd26d5f"; - brief = false; -} -{ - name = "libcdr-0.1.2.tar.bz2"; - md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; - brief = true; -} -{ - name = "clucene-core-2.3.3.4.tar.gz"; - md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; - brief = false; -} -{ - name = "libcmis-0.5.0.tar.gz"; - md5 = "5821b806a98e6c38370970e682ce76e8"; - brief = false; -} -{ - name = "CoinMP-1.7.6.tgz"; - md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; - brief = true; -} -{ - name = "collada2gltf-master-cb1d97788a.tar.bz2"; - md5 = "4b87018f7fff1d054939d19920b751a0"; - brief = false; -} -{ - name = "cppunit-1.13.2.tar.gz"; - md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; - brief = true; -} -{ - name = "converttexttonumber-1-5-0.oxt"; - md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; - brief = false; -} -{ - name = "curl-7.43.0.tar.bz2"; - md5 = "11bddbb452a8b766b932f859aaeeed39"; - brief = true; -} -{ - name = "libe-book-0.1.2.tar.bz2"; - md5 = "6b48eda57914e6343efebc9381027b78"; - brief = true; -} -{ - name = "epm-3.7.tar.gz"; - md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; - brief = false; -} -{ - name = "libetonyek-0.1.6.tar.bz2"; - md5 = "77ff46936dcc83670557274e7dd2aa33"; - brief = true; -} -{ - name = "expat-2.1.1.tar.bz2"; - md5 = "7380a64a8e3a9d66a9887b01d0d7ea81"; - brief = true; -} -{ - name = "Firebird-2.5.4.26856-0.tar.bz2"; - md5 = "7a17ec9889424b98baa29e001a054434"; - brief = true; -} -{ - name = "fontconfig-2.8.0.tar.gz"; - md5 = "77e15a92006ddc2adbb06f840d591c0e"; - brief = false; -} -{ - name = "crosextrafonts-20130214.tar.gz"; - md5 = "368f114c078f94214a308a74c7e991bc"; - brief = false; -} -{ - name = "crosextrafonts-carlito-20130920.tar.gz"; - md5 = "c74b7223abe75949b4af367942d96c7a"; - brief = false; -} -{ - name = "dejavu-fonts-ttf-2.35.zip"; - md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; - brief = false; -} -{ - name = "gentiumbasic-fonts-1.10.zip"; - md5 = "35efabc239af896dfb79be7ebdd6e6b9"; - brief = false; -} -{ - name = "liberation-fonts-ttf-1.07.4.tar.gz"; - md5 = "134d8262145fc793c6af494dcace3e71"; - brief = false; -} -{ - name = "liberation-fonts-ttf-2.00.1.tar.gz"; - md5 = "5c781723a0d9ed6188960defba8e91cf"; - brief = false; -} -{ - name = "LinLibertineG-20120116.zip"; - md5 = "e7a384790b13c29113e22e596ade9687"; - brief = false; -} -{ - name = "open-sans-font-ttf-1.10.tar.gz"; - md5 = "7a15edea7d415ac5150ea403e27401fd"; - brief = false; -} -{ - name = "pt-serif-font-1.0000W.tar.gz"; - md5 = "c3c1a8ba7452950636e871d25020ce0d"; - brief = false; -} -{ - name = "source-code-font-1.009.tar.gz"; - md5 = "0279a21fab6f245e85a6f85fea54f511"; - brief = false; -} -{ - name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - md5 = "edc4d741888bc0d38e32dbaa17149596"; - brief = false; -} -{ - name = "libfreehand-0.1.1.tar.bz2"; - md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; - brief = true; -} -{ - name = "freetype-2.4.8.tar.bz2"; - md5 = "dbf2caca1d3afd410a29217a9809d397"; - brief = false; -} -{ - name = "glew-1.12.0.zip"; - md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; - brief = false; -} -{ - name = "glm-0.9.4.6-libreoffice.zip"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - brief = false; -} -{ - name = "glyphy-0.2.0.tar.bz2"; - md5 = "5d303fb955beb9bf112267316ca9d021"; - brief = false; -} -{ - name = "graphite-minimal-1.3.6.tgz"; - md5 = "17df8301bcc459e83f8a8f3aca6183b2"; - brief = false; -} -{ - name = "harfbuzz-0.9.40.tar.bz2"; - md5 = "0e27e531f4c4acff601ebff0957755c2"; - brief = true; -} -{ - name = "hsqldb_1_8_0.zip"; - md5 = "17410483b5b5f267aa18b7e00b65e6e0"; - brief = false; -} -{ - name = "hunspell-1.3.3.tar.gz"; - md5 = "4967da60b23413604c9e563beacc63b4"; - brief = false; -} -{ - name = "hyphen-2.8.8.tar.gz"; - md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; - brief = false; -} -{ - name = "icu4c-56_1-src.tgz"; - md5 = "c4a2d71ff56aec5ebfab2a3f059be99d"; - brief = false; -} -{ - name = "flow-engine-0.9.4.zip"; - md5 = "ba2930200c9f019c2d93a8c88c651a0f"; - brief = false; -} -{ - name = "flute-1.1.6.zip"; - md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; - brief = false; -} -{ - name = "libbase-1.1.6.zip"; - md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; - brief = false; -} -{ - name = "libfonts-1.1.6.zip"; - md5 = "3bdf40c0d199af31923e900d082ca2dd"; - brief = false; -} -{ - name = "libformula-1.1.7.zip"; - md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; - brief = false; -} -{ - name = "liblayout-0.2.10.zip"; - md5 = "db60e4fde8dd6d6807523deb71ee34dc"; - brief = false; -} -{ - name = "libloader-1.1.6.zip"; - md5 = "97b2d4dba862397f446b217e2b623e71"; - brief = false; -} -{ - name = "librepository-1.1.6.zip"; - md5 = "8ce2fcd72becf06c41f7201d15373ed9"; - brief = false; -} -{ - name = "libserializer-1.1.6.zip"; - md5 = "f94d9870737518e3b597f9265f4e9803"; - brief = false; -} -{ - name = "libxml-1.1.7.zip"; - md5 = "ace6ab49184e329db254e454a010f56d"; - brief = false; -} -{ - name = "sacjava-1.3.zip"; - md5 = "39bb3fcea1514f1369fcfc87542390fd"; - brief = false; -} -{ - name = "jpegsrc.v9a.tar.gz"; - md5 = "3353992aecaee1805ef4109aadd433e7"; - brief = true; -} -{ - name = "libjpeg-turbo-1.4.2.tar.gz"; - md5 = "86b0d5f7507c2e6c21c00219162c3c44"; - brief = true; -} -{ - name = "language-subtag-registry-2016-02-10.tar.bz2"; - md5 = "d1e7c55a0383f7d720d3ead0b6117284"; - brief = true; -} -{ - name = "JLanguageTool-1.7.0.tar.bz2"; - md5 = "b63e6340a02ff1cacfeadb2c42286161"; - brief = false; -} -{ - name = "lcms2-2.6.tar.gz"; - md5 = "f4c08d38ceade4a664ebff7228910a33"; - brief = true; -} -{ - name = "libatomic_ops-7_2d.zip"; - md5 = "c0b86562d5aa40761a87134f83e6adcf"; - brief = true; -} -{ - name = "libeot-0.01.tar.bz2"; - md5 = "aa24f5dd2a2992f4a116aa72af817548"; - brief = true; -} -{ - name = "libexttextcat-3.4.4.tar.bz2"; - md5 = "10d61fbaa6a06348823651b1bd7940fe"; - brief = false; -} -{ - name = "libgltf-0.0.2.tar.bz2"; - md5 = "d63a9f47ab048f5009d90693d6aa6424"; - brief = true; - subDir = "libgltf/"; -} -{ - name = "liblangtag-0.5.8.tar.bz2"; - md5 = "aa899eff126216dafe721149fbdb511b"; - brief = false; -} -{ - name = "xmlsec1-1.2.14.tar.gz"; - md5 = "1f24ab1d39f4a51faf22244c94a6203f"; - brief = false; -} -{ - name = "libxml2-2.9.4.tar.gz"; - md5 = "ae249165c173b1ff386ee8ad676815f5"; - brief = false; -} -{ - name = "libxslt-1.1.28.tar.gz"; - md5 = "9667bf6f9310b957254fdcf6596600b7"; - brief = false; -} -{ - name = "lp_solve_5.5.tar.gz"; - md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; - brief = false; -} -{ - name = "mariadb_client-2.0.0-src.tar.gz"; - md5 = "a233181e03d3c307668b4c722d881661"; - brief = false; -} -{ - name = "mdds_0.12.1.tar.bz2"; - md5 = "ef2560ed5416652a7fe195305b14cebe"; - brief = true; -} -{ - name = "libmspub-0.1.2.tar.bz2"; - md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; - brief = true; -} -{ - name = "libmwaw-0.3.7.tar.bz2"; - md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; - brief = true; -} -{ - name = "mysql-connector-c++-1.1.4.tar.gz"; - md5 = "7239a4430efd4d0189c4f24df67f08e5"; - brief = false; -} -{ - name = "mythes-1.2.4.tar.gz"; - md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; - brief = false; -} -{ - name = "neon-0.30.1.tar.gz"; - md5 = "231adebe5c2f78fded3e3df6e958878e"; - brief = false; -} -{ - name = "nss-3.22.2-with-nspr-4.12.tar.gz"; - md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; - brief = false; -} -{ - name = "libodfgen-0.1.6.tar.bz2"; - md5 = "32572ea48d9021bbd6fa317ddb697abc"; - brief = true; -} -{ - name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; - md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; - brief = true; -} -{ - name = "openldap-2.4.31.tgz"; - md5 = "804c6cb5698db30b75ad0ff1c25baefd"; - brief = false; -} -{ - name = "openssl-1.0.2h.tar.gz"; - md5 = "9392e65072ce4b614c1392eefc1f23d0"; - brief = true; -} -{ - name = "liborcus-0.9.2.tar.gz"; - md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0"; - brief = true; -} -{ - name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - md5 = "593f0aa47bf2efc0efda2d28fae063b2"; - brief = true; -} -{ - name = "libpagemaker-0.0.2.tar.bz2"; - md5 = "795cc7a59ace4db2b12586971d668671"; - brief = true; -} -{ - name = "pixman-0.24.4.tar.bz2"; - md5 = "c63f411b3ad147db2bcce1bf262a0e02"; - brief = false; -} -{ - name = "libpng-1.6.19.tar.gz"; - md5 = "3121bdc77c365a87e054b9f859f421fe"; - brief = true; -} -{ - name = "poppler-0.26.4.tar.gz"; - md5 = "35c0660065d023365e9854c13e289d12"; - brief = true; -} -{ - name = "postgresql-9.2.1.tar.bz2"; - md5 = "c0b4799ea9850eae3ead14f0a60e9418"; - brief = false; -} -{ - name = "Python-3.3.5.tgz"; - md5 = "803a75927f8f241ca78633890c798021"; - brief = true; -} -{ - name = "Python-3.5.0.tgz"; - md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; - brief = true; -} -{ - name = "raptor2-2.0.9.tar.gz"; - md5 = "4ceb9316488b0ea01acf011023cf7fff"; - brief = false; -} -{ - name = "rasqal-0.9.30.tar.gz"; - md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; - brief = false; -} -{ - name = "redland-1.0.16.tar.gz"; - md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; - brief = false; -} -{ - name = "librevenge-0.0.4.tar.bz2"; - md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; - brief = true; -} -{ - name = "rhino1_5R5.zip"; - md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; - brief = false; -} -{ - name = "serf-1.2.1.tar.bz2"; - md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; - brief = true; -} -{ - name = "swingExSrc.zip"; - md5 = "35c94d2df8893241173de1d16b6034c0"; - brief = false; -} -{ - name = "ucpp-1.3.2.tar.gz"; - md5 = "0168229624cfac409e766913506961a8"; - brief = false; -} -{ - name = "vigra1.6.0.tar.gz"; - md5 = "d62650a6f908e85643e557a236ea989c"; - brief = false; -} -{ - name = "libvisio-0.1.5.tar.bz2"; - md5 = "cbee198a78b842b2087f32d33c522818"; - brief = true; -} -{ - name = "libwpd-0.10.1.tar.bz2"; - md5 = "79b56bcc349264d686a67994506ad199"; - brief = true; -} -{ - name = "libwpg-0.3.1.tar.bz2"; - md5 = "dfd066658ec9d2fb2262417039a8a1c3"; - brief = true; -} -{ - name = "libwps-0.4.2.tar.bz2"; - md5 = "8a6c55542ce80203dd6d3b1cba99d4e5"; - brief = true; -} -{ - name = "xsltml_2.1.2.zip"; - md5 = "a7983f859eafb2677d7ff386a023bc40"; - brief = false; -} -{ - name = "zlib-1.2.8.tar.gz"; - md5 = "44d667c142d7cda120332623eab69f40"; - brief = true; -} + { + name = "libabw-0.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; + sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; + md5 = "7a3815b506d064313ba309617b6f5a0b"; + md5name = "7a3815b506d064313ba309617b6f5a0b-libabw-0.1.1.tar.bz2"; + } + { + name = "commons-logging-1.2-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; + sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; + md5 = "ce977548f1cbf46918e93cd38ac35163"; + md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz"; + } + { + name = "apr-1.4.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/apr-1.4.8.tar.gz"; + sha256 = "1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49"; + md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; + md5name = "eff9d741b0999a9bbab96862dd2a2a3d-apr-1.4.8.tar.gz"; + } + { + name = "apr-util-1.5.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/apr-util-1.5.3.tar.gz"; + sha256 = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"; + md5 = "71a11d037240b292f824ba1eb537b4e3"; + md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.tar.gz"; + } + { + name = "boost_1_59_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_59_0.tar.bz2"; + sha256 = "727a932322d94287b62abb1bd2d41723eec4356a7728909e38adb65ca25241ca"; + md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87"; + md5name = "6aa9a5c6a4ca1016edd0ed1178e3cb87-boost_1_59_0.tar.bz2"; + } + { + name = "bsh-2.0b5-src.zip"; + url = "http://dev-www.libreoffice.org/src/ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip"; + sha256 = "90993aa17a786996653fc5fcf148e879fb3689b8678f9ba99b376a5a13dff513"; + md5 = "ec1941a74d3ef513c4ce57a9092b74e1"; + md5name = "ec1941a74d3ef513c4ce57a9092b74e1-bsh-2.0b5-src.zip"; + } + { + name = "bzip2-1.0.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; + md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; + md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + } + { + name = "cairo-1.10.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + sha256 = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"; + md5 = "f101a9e88b783337b20b2e26dfd26d5f"; + md5name = "f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + } + { + name = "libcdr-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.2.tar.bz2"; + sha256 = "d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e"; + md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; + md5name = "6e3062b55b149d7b3c6aedb3bb5b86e2-libcdr-0.1.2.tar.bz2"; + } + { + name = "clucene-core-2.3.3.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; + md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; + md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + } + { + name = "libcmis-0.5.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz"; + sha256 = "a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6"; + md5 = "5821b806a98e6c38370970e682ce76e8"; + md5name = "5821b806a98e6c38370970e682ce76e8-libcmis-0.5.0.tar.gz"; + } + { + name = "CoinMP-1.7.6.tgz"; + url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; + md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; + md5name = "1cce53bf4b40ae29790d2c5c9f8b1129-CoinMP-1.7.6.tgz"; + } + { + name = "collada2gltf-master-cb1d97788a.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb"; + md5 = "4b87018f7fff1d054939d19920b751a0"; + md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + } + { + name = "cppunit-1.13.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"; + sha256 = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f"; + md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; + md5name = "d1c6bdd5a76c66d2c38331e2d287bc01-cppunit-1.13.2.tar.gz"; + } + { + name = "converttexttonumber-1-5-0.oxt"; + url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; + md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; + md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + } + { + name = "curl-7.43.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2"; + sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9"; + md5 = "11bddbb452a8b766b932f859aaeeed39"; + md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2"; + } + { + name = "libe-book-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; + sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; + md5 = "6b48eda57914e6343efebc9381027b78"; + md5name = "6b48eda57914e6343efebc9381027b78-libe-book-0.1.2.tar.bz2"; + } + { + name = "epm-3.7.tar.gz"; + url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; + md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; + md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + } + { + name = "libetonyek-0.1.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; + sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; + md5 = "77ff46936dcc83670557274e7dd2aa33"; + md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2"; + } + { + name = "expat-2.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.1.1.tar.bz2"; + sha256 = "aff584e5a2f759dcfc6d48671e9529f6afe1e30b0cd6a4cec200cbe3f793de67"; + md5 = "7380a64a8e3a9d66a9887b01d0d7ea81"; + md5name = "7380a64a8e3a9d66a9887b01d0d7ea81-expat-2.1.1.tar.bz2"; + } + { + name = "Firebird-2.5.4.26856-0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/Firebird-2.5.4.26856-0.tar.bz2"; + sha256 = "4e775dcf218640d3af507a816aef0060f52a295b9ee5f66ec66f0b0564da18d3"; + md5 = "7a17ec9889424b98baa29e001a054434"; + md5name = "7a17ec9889424b98baa29e001a054434-Firebird-2.5.4.26856-0.tar.bz2"; + } + { + name = "fontconfig-2.8.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + sha256 = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"; + md5 = "77e15a92006ddc2adbb06f840d591c0e"; + md5name = "77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + } + { + name = "crosextrafonts-20130214.tar.gz"; + url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; + md5 = "368f114c078f94214a308a74c7e991bc"; + md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + } + { + name = "crosextrafonts-carlito-20130920.tar.gz"; + url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; + md5 = "c74b7223abe75949b4af367942d96c7a"; + md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + } + { + name = "dejavu-fonts-ttf-2.35.zip"; + url = "http://dev-www.libreoffice.org/src/d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + sha256 = "7e0d00f20080784c3a38a845d5858c161af14f0073d9474cdbfdedae883cc747"; + md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; + md5name = "d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + } + { + name = "gentiumbasic-fonts-1.10.zip"; + url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + sha256 = "f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b"; + md5 = "35efabc239af896dfb79be7ebdd6e6b9"; + md5name = "35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + } + { + name = "liberation-fonts-ttf-1.07.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + sha256 = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"; + md5 = "134d8262145fc793c6af494dcace3e71"; + md5name = "134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + } + { + name = "liberation-fonts-ttf-2.00.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + sha256 = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504"; + md5 = "5c781723a0d9ed6188960defba8e91cf"; + md5name = "5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + } + { + name = "LinLibertineG-20120116.zip"; + url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; + md5 = "e7a384790b13c29113e22e596ade9687"; + md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + } + { + name = "open-sans-font-ttf-1.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; + sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8"; + md5 = "7a15edea7d415ac5150ea403e27401fd"; + md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; + } + { + name = "pt-serif-font-1.0000W.tar.gz"; + url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; + sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa"; + md5 = "c3c1a8ba7452950636e871d25020ce0d"; + md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; + } + { + name = "source-code-font-1.009.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce"; + md5 = "0279a21fab6f245e85a6f85fea54f511"; + md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + } + { + name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; + md5 = "edc4d741888bc0d38e32dbaa17149596"; + md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + } + { + name = "libfreehand-0.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; + sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; + md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; + md5name = "8cf70c5dc4d24d2dc4a107f509d2d6d7-libfreehand-0.1.1.tar.bz2"; + } + { + name = "freetype-2.4.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + sha256 = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"; + md5 = "dbf2caca1d3afd410a29217a9809d397"; + md5name = "dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + } + { + name = "glew-1.12.0.zip"; + url = "http://dev-www.libreoffice.org/src/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + sha256 = "6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4"; + md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; + md5name = "3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + } + { + name = "glm-0.9.4.6-libreoffice.zip"; + url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; + md5 = "bae83fa5dc7f081768daace6e199adc3"; + md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + } + { + name = "glyphy-0.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + sha256 = "9a8f629f7ea40ba118199a37adee8f2dfb084cffa5f7f4db3a47b8b0075777be"; + md5 = "5d303fb955beb9bf112267316ca9d021"; + md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + } + { + name = "graphite-minimal-1.3.6.tgz"; + url = "http://dev-www.libreoffice.org/src/17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz"; + sha256 = "db27e1a6092b8ea00b5f8eec2a3ea500756fbb769c1023a1afc3386c5918d1b8"; + md5 = "17df8301bcc459e83f8a8f3aca6183b2"; + md5name = "17df8301bcc459e83f8a8f3aca6183b2-graphite-minimal-1.3.6.tgz"; + } + { + name = "harfbuzz-0.9.40.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-0.9.40.tar.bz2"; + sha256 = "1771d53583be6d91ca961854b2a24fb239ef0545eed221ae3349abae0ab8321f"; + md5 = "0e27e531f4c4acff601ebff0957755c2"; + md5name = "0e27e531f4c4acff601ebff0957755c2-harfbuzz-0.9.40.tar.bz2"; + } + { + name = "hsqldb_1_8_0.zip"; + url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; + md5 = "17410483b5b5f267aa18b7e00b65e6e0"; + md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + } + { + name = "hunspell-1.3.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz"; + sha256 = "a7b2c0de0e2ce17426821dc1ac8eb115029959b3ada9d80a81739fa19373246c"; + md5 = "4967da60b23413604c9e563beacc63b4"; + md5name = "4967da60b23413604c9e563beacc63b4-hunspell-1.3.3.tar.gz"; + } + { + name = "hyphen-2.8.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; + md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; + md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + } + { + name = "icu4c-56_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz"; + sha256 = "3a64e9105c734dcf631c0b3ed60404531bce6c0f5a64bfe1a6402a4cc2314816"; + md5 = "c4a2d71ff56aec5ebfab2a3f059be99d"; + md5name = "c4a2d71ff56aec5ebfab2a3f059be99d-icu4c-56_1-src.tgz"; + } + { + name = "flow-engine-0.9.4.zip"; + url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; + md5 = "ba2930200c9f019c2d93a8c88c651a0f"; + md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + } + { + name = "flute-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; + md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; + md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + } + { + name = "libbase-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; + md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; + md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + } + { + name = "libfonts-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; + md5 = "3bdf40c0d199af31923e900d082ca2dd"; + md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + } + { + name = "libformula-1.1.7.zip"; + url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; + md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; + md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + } + { + name = "liblayout-0.2.10.zip"; + url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; + md5 = "db60e4fde8dd6d6807523deb71ee34dc"; + md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + } + { + name = "libloader-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; + md5 = "97b2d4dba862397f446b217e2b623e71"; + md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + } + { + name = "librepository-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; + md5 = "8ce2fcd72becf06c41f7201d15373ed9"; + md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + } + { + name = "libserializer-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; + md5 = "f94d9870737518e3b597f9265f4e9803"; + md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + } + { + name = "libxml-1.1.7.zip"; + url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; + md5 = "ace6ab49184e329db254e454a010f56d"; + md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + } + { + name = "sacjava-1.3.zip"; + url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; + md5 = "39bb3fcea1514f1369fcfc87542390fd"; + md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + } + { + name = "jpegsrc.v9a.tar.gz"; + url = "http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz"; + sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"; + md5 = "3353992aecaee1805ef4109aadd433e7"; + md5name = "3353992aecaee1805ef4109aadd433e7-jpegsrc.v9a.tar.gz"; + } + { + name = "libjpeg-turbo-1.4.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.4.2.tar.gz"; + sha256 = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e"; + md5 = "86b0d5f7507c2e6c21c00219162c3c44"; + md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz"; + } + { + name = "language-subtag-registry-2016-02-10.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-02-10.tar.bz2"; + sha256 = "1e3a74b39e999bc9ff9fb0dd6fa6a64a0ed6bf7f0775ff3756e7c9e8db45a353"; + md5 = "d1e7c55a0383f7d720d3ead0b6117284"; + md5name = "d1e7c55a0383f7d720d3ead0b6117284-language-subtag-registry-2016-02-10.tar.bz2"; + } + { + name = "JLanguageTool-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; + md5 = "b63e6340a02ff1cacfeadb2c42286161"; + md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + } + { + name = "lcms2-2.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"; + sha256 = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"; + md5 = "f4c08d38ceade4a664ebff7228910a33"; + md5name = "f4c08d38ceade4a664ebff7228910a33-lcms2-2.6.tar.gz"; + } + { + name = "libatomic_ops-7_2d.zip"; + url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; + sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; + md5 = "c0b86562d5aa40761a87134f83e6adcf"; + md5name = "c0b86562d5aa40761a87134f83e6adcf-libatomic_ops-7_2d.zip"; + } + { + name = "libeot-0.01.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; + md5 = "aa24f5dd2a2992f4a116aa72af817548"; + md5name = "aa24f5dd2a2992f4a116aa72af817548-libeot-0.01.tar.bz2"; + } + { + name = "libexttextcat-3.4.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; + sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163"; + md5 = "10d61fbaa6a06348823651b1bd7940fe"; + md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; + } + { + name = "libgltf-0.0.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"; + sha256 = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"; + md5 = "d63a9f47ab048f5009d90693d6aa6424"; + md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2"; + } + { + name = "liblangtag-0.5.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; + sha256 = "08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa"; + md5 = "aa899eff126216dafe721149fbdb511b"; + md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; + } + { + name = "xmlsec1-1.2.14.tar.gz"; + url = "http://dev-www.libreoffice.org/src/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"; + sha256 = "390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a"; + md5 = "1f24ab1d39f4a51faf22244c94a6203f"; + md5name = "1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"; + } + { + name = "libxml2-2.9.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"; + md5 = "ae249165c173b1ff386ee8ad676815f5"; + md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + } + { + name = "libxslt-1.1.28.tar.gz"; + url = "http://dev-www.libreoffice.org/src/9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"; + sha256 = "5fc7151a57b89c03d7b825df5a0fae0a8d5f05674c0e7cf2937ecec4d54a028c"; + md5 = "9667bf6f9310b957254fdcf6596600b7"; + md5name = "9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz"; + } + { + name = "lp_solve_5.5.tar.gz"; + url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; + md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; + md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + } + { + name = "mariadb_client-2.0.0-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; + md5 = "a233181e03d3c307668b4c722d881661"; + md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + } + { + name = "mdds_0.12.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds_0.12.1.tar.bz2"; + sha256 = "23565e9d7810a6ac30478833813db847f80e927b414a7be07b7cc03ed3aae83d"; + md5 = "ef2560ed5416652a7fe195305b14cebe"; + md5name = "ef2560ed5416652a7fe195305b14cebe-mdds_0.12.1.tar.bz2"; + } + { + name = "libmspub-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; + sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; + md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; + md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2"; + } + { + name = "libmwaw-0.3.7.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.7.tar.bz2"; + sha256 = "a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427"; + md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; + md5name = "4a8a53a9d997cf0e2bd208178797dbfb-libmwaw-0.3.7.tar.bz2"; + } + { + name = "mysql-connector-c++-1.1.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; + sha256 = "a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585"; + md5 = "7239a4430efd4d0189c4f24df67f08e5"; + md5name = "7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; + } + { + name = "mythes-1.2.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; + md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; + md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + } + { + name = "neon-0.30.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"; + md5 = "231adebe5c2f78fded3e3df6e958878e"; + md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + } + { + name = "nss-3.22.2-with-nspr-4.12.tar.gz"; + url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e"; + md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; + md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + } + { + name = "libodfgen-0.1.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; + md5 = "32572ea48d9021bbd6fa317ddb697abc"; + md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2"; + } + { + name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; + sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; + md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; + md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2"; + } + { + name = "openldap-2.4.31.tgz"; + url = "http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6"; + md5 = "804c6cb5698db30b75ad0ff1c25baefd"; + md5name = "804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + } + { + name = "openssl-1.0.2h.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz"; + sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; + md5 = "9392e65072ce4b614c1392eefc1f23d0"; + md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; + } + { + name = "liborcus-0.9.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.9.2.tar.gz"; + sha256 = "adcf90f6cb1e6546ef1ea11277db39cb875786ea4b283e37f5e37c8c09b4952b"; + md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0"; + md5name = "e6efcbe50a5fd4d50d513c9a7a4139b0-liborcus-0.9.2.tar.gz"; + } + { + name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; + md5 = "593f0aa47bf2efc0efda2d28fae063b2"; + md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + } + { + name = "libpagemaker-0.0.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.2.tar.bz2"; + sha256 = "43be46721affcb5a967406c09acfc36c79d2d968917fe36a21cc004230a01e0f"; + md5 = "795cc7a59ace4db2b12586971d668671"; + md5name = "795cc7a59ace4db2b12586971d668671-libpagemaker-0.0.2.tar.bz2"; + } + { + name = "pixman-0.24.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + sha256 = "3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc"; + md5 = "c63f411b3ad147db2bcce1bf262a0e02"; + md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + } + { + name = "libpng-1.6.19.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.19.tar.gz"; + sha256 = "9f977ac8e4e3d4d5b001b32243f111eeec21bb6b59e583f2fb41fd2e48840352"; + md5 = "3121bdc77c365a87e054b9f859f421fe"; + md5name = "3121bdc77c365a87e054b9f859f421fe-libpng-1.6.19.tar.gz"; + } + { + name = "poppler-0.26.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.26.4.tar.gz"; + sha256 = "e05a4d8d8252a564ec7a96a99af772042b2d85275ffda8043f427dde31e97fe8"; + md5 = "35c0660065d023365e9854c13e289d12"; + md5name = "35c0660065d023365e9854c13e289d12-poppler-0.26.4.tar.gz"; + } + { + name = "postgresql-9.2.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + sha256 = "db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461"; + md5 = "c0b4799ea9850eae3ead14f0a60e9418"; + md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + } + { + name = "Python-3.3.5.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"; + sha256 = "916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168"; + md5 = "803a75927f8f241ca78633890c798021"; + md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz"; + } + { + name = "Python-3.5.0.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.0.tgz"; + sha256 = "584e3d5a02692ca52fce505e68ecd77248a6f2c99adf9db144a39087336b0fe0"; + md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; + md5name = "a56c0c0b45d75a0ec9c6dee933c41c36-Python-3.5.0.tgz"; + } + { + name = "raptor2-2.0.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + sha256 = "e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef"; + md5 = "4ceb9316488b0ea01acf011023cf7fff"; + md5name = "4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + } + { + name = "rasqal-0.9.30.tar.gz"; + url = "http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + sha256 = "abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd"; + md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; + md5name = "b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + } + { + name = "redland-1.0.16.tar.gz"; + url = "http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + sha256 = "d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd"; + md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; + md5name = "32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + } + { + name = "librevenge-0.0.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; + md5name = "5b9ac52ec77d4d19157cf5962ebc0aea-librevenge-0.0.4.tar.bz2"; + } + { + name = "rhino1_5R5.zip"; + url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; + md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; + md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + } + { + name = "serf-1.2.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; + md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; + md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2"; + } + { + name = "swingExSrc.zip"; + url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; + md5 = "35c94d2df8893241173de1d16b6034c0"; + md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + } + { + name = "ucpp-1.3.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; + md5 = "0168229624cfac409e766913506961a8"; + md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + } + { + name = "vigra1.6.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"; + sha256 = "1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f"; + md5 = "d62650a6f908e85643e557a236ea989c"; + md5name = "d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"; + } + { + name = "libvisio-0.1.5.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; + sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; + md5 = "cbee198a78b842b2087f32d33c522818"; + md5name = "cbee198a78b842b2087f32d33c522818-libvisio-0.1.5.tar.bz2"; + } + { + name = "libwpd-0.10.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; + sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; + md5 = "79b56bcc349264d686a67994506ad199"; + md5name = "79b56bcc349264d686a67994506ad199-libwpd-0.10.1.tar.bz2"; + } + { + name = "libwpg-0.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; + sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; + md5 = "dfd066658ec9d2fb2262417039a8a1c3"; + md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; + } + { + name = "libwps-0.4.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.2.tar.bz2"; + sha256 = "254b8aeb36a3b58eabf682b04a5a6cf9b01267e762c7dc57d4533b95f30dc587"; + md5 = "8a6c55542ce80203dd6d3b1cba99d4e5"; + md5name = "8a6c55542ce80203dd6d3b1cba99d4e5-libwps-0.4.2.tar.bz2"; + } + { + name = "xsltml_2.1.2.zip"; + url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; + md5 = "a7983f859eafb2677d7ff386a023bc40"; + md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + } + { + name = "zlib-1.2.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"; + sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"; + md5 = "44d667c142d7cda120332623eab69f40"; + md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz"; + } ] diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 219b7e20632..bf9150b98ec 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -1,533 +1,744 @@ [ -{ - name = "libabw-0.1.1.tar.bz2"; - md5 = "7a3815b506d064313ba309617b6f5a0b"; - brief = true; -} -{ - name = "commons-logging-1.2-src.tar.gz"; - md5 = "ce977548f1cbf46918e93cd38ac35163"; - brief = true; -} -{ - name = "apr-1.4.8.tar.gz"; - md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; - brief = true; -} -{ - name = "apr-util-1.5.3.tar.gz"; - md5 = "71a11d037240b292f824ba1eb537b4e3"; - brief = true; -} -{ - name = "boost_1_60_0.tar.bz2"; - md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe"; - brief = true; -} -{ - name = "breakpad.zip"; - md5 = "415ce291aa6f2ee1d5db7b62bf62ade8"; - brief = true; -} -{ - name = "bsh-2.0b6-src.zip"; - md5 = "beeca87be45ec87d241ddd0e1bad80c1"; - brief = false; -} -{ - name = "bzip2-1.0.6.tar.gz"; - md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; - brief = false; -} -{ - name = "cairo-1.10.2.tar.gz"; - md5 = "f101a9e88b783337b20b2e26dfd26d5f"; - brief = false; -} -{ - name = "libcdr-0.1.2.tar.bz2"; - md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; - brief = true; -} -{ - name = "clucene-core-2.3.3.4.tar.gz"; - md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; - brief = false; -} -{ - name = "libcmis-0.5.1.tar.gz"; - md5 = "3270154f0f40d86fce849b161f914101"; - brief = true; -} -{ - name = "CoinMP-1.7.6.tgz"; - md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; - brief = true; -} -{ - name = "collada2gltf-master-cb1d97788a.tar.bz2"; - md5 = "4b87018f7fff1d054939d19920b751a0"; - brief = false; -} -{ - name = "cppunit-1.13.2.tar.gz"; - md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; - brief = true; -} -{ - name = "converttexttonumber-1-5-0.oxt"; - md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; - brief = false; -} -{ - name = "curl-7.43.0.tar.bz2"; - md5 = "11bddbb452a8b766b932f859aaeeed39"; - brief = true; -} -{ - name = "libe-book-0.1.2.tar.bz2"; - md5 = "6b48eda57914e6343efebc9381027b78"; - brief = true; -} -{ - name = "epm-3.7.tar.gz"; - md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; - brief = false; -} -{ - name = "libetonyek-0.1.6.tar.bz2"; - md5 = "77ff46936dcc83670557274e7dd2aa33"; - brief = true; -} -{ - name = "expat-2.2.0.tar.bz2"; - md5 = "2f47841c829facb346eb6e3fab5212e2"; - brief = true; -} -{ - name = "Firebird-2.5.5.26952-0.tar.bz2"; - md5 = "b0b5293991fcf07347b38431c80be1d4"; - brief = true; -} -{ - name = "fontconfig-2.8.0.tar.gz"; - md5 = "77e15a92006ddc2adbb06f840d591c0e"; - brief = false; -} -{ - name = "crosextrafonts-20130214.tar.gz"; - md5 = "368f114c078f94214a308a74c7e991bc"; - brief = false; -} -{ - name = "crosextrafonts-carlito-20130920.tar.gz"; - md5 = "c74b7223abe75949b4af367942d96c7a"; - brief = false; -} -{ - name = "dejavu-fonts-ttf-2.35.zip"; - md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; - brief = false; -} -{ - name = "gentiumbasic-fonts-1.10.zip"; - md5 = "35efabc239af896dfb79be7ebdd6e6b9"; - brief = false; -} -{ - name = "liberation-fonts-ttf-1.07.4.tar.gz"; - md5 = "134d8262145fc793c6af494dcace3e71"; - brief = false; -} -{ - name = "liberation-fonts-ttf-2.00.1.tar.gz"; - md5 = "5c781723a0d9ed6188960defba8e91cf"; - brief = false; -} -{ - name = "LinLibertineG-20120116.zip"; - md5 = "e7a384790b13c29113e22e596ade9687"; - brief = false; -} -{ - name = "open-sans-font-ttf-1.10.tar.gz"; - md5 = "7a15edea7d415ac5150ea403e27401fd"; - brief = false; -} -{ - name = "pt-serif-font-1.0000W.tar.gz"; - md5 = "c3c1a8ba7452950636e871d25020ce0d"; - brief = false; -} -{ - name = "source-code-font-1.009.tar.gz"; - md5 = "0279a21fab6f245e85a6f85fea54f511"; - brief = false; -} -{ - name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; - md5 = "edc4d741888bc0d38e32dbaa17149596"; - brief = false; -} -{ - name = "libfreehand-0.1.1.tar.bz2"; - md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; - brief = true; -} -{ - name = "freetype-2.4.8.tar.bz2"; - md5 = "dbf2caca1d3afd410a29217a9809d397"; - brief = false; -} -{ - name = "glew-1.12.0.zip"; - md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; - brief = false; -} -{ - name = "glm-0.9.4.6-libreoffice.zip"; - md5 = "bae83fa5dc7f081768daace6e199adc3"; - brief = false; -} -{ - name = "glyphy-0.2.0.tar.bz2"; - md5 = "5d303fb955beb9bf112267316ca9d021"; - brief = false; -} -{ - name = "graphite2-minimal-1.3.8.tgz"; - md5 = "4311dd9ace498b57c85f611e0670df64"; - brief = false; -} -{ - name = "harfbuzz-1.2.6.tar.bz2"; - md5 = "9f4b6831c86135faef011e991f59f77f"; - brief = true; -} -{ - name = "hsqldb_1_8_0.zip"; - md5 = "17410483b5b5f267aa18b7e00b65e6e0"; - brief = false; -} -{ - name = "hunspell-1.4.1.tar.gz"; - md5 = "33d370f7fe5a030985e445a5672b2067"; - brief = false; -} -{ - name = "hyphen-2.8.8.tar.gz"; - md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; - brief = false; -} -{ - name = "icu4c-57_1-src.tgz"; - md5 = "976734806026a4ef8bdd17937c8898b9"; - brief = false; -} -{ - name = "flow-engine-0.9.4.zip"; - md5 = "ba2930200c9f019c2d93a8c88c651a0f"; - brief = false; -} -{ - name = "flute-1.1.6.zip"; - md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; - brief = false; -} -{ - name = "libbase-1.1.6.zip"; - md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; - brief = false; -} -{ - name = "libfonts-1.1.6.zip"; - md5 = "3bdf40c0d199af31923e900d082ca2dd"; - brief = false; -} -{ - name = "libformula-1.1.7.zip"; - md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; - brief = false; -} -{ - name = "liblayout-0.2.10.zip"; - md5 = "db60e4fde8dd6d6807523deb71ee34dc"; - brief = false; -} -{ - name = "libloader-1.1.6.zip"; - md5 = "97b2d4dba862397f446b217e2b623e71"; - brief = false; -} -{ - name = "librepository-1.1.6.zip"; - md5 = "8ce2fcd72becf06c41f7201d15373ed9"; - brief = false; -} -{ - name = "libserializer-1.1.6.zip"; - md5 = "f94d9870737518e3b597f9265f4e9803"; - brief = false; -} -{ - name = "libxml-1.1.7.zip"; - md5 = "ace6ab49184e329db254e454a010f56d"; - brief = false; -} -{ - name = "sacjava-1.3.zip"; - md5 = "39bb3fcea1514f1369fcfc87542390fd"; - brief = false; -} -{ - name = "jpegsrc.v9a.tar.gz"; - md5 = "3353992aecaee1805ef4109aadd433e7"; - brief = true; -} -{ - name = "libjpeg-turbo-1.4.2.tar.gz"; - md5 = "86b0d5f7507c2e6c21c00219162c3c44"; - brief = true; -} -{ - name = "language-subtag-registry-2016-02-10.tar.bz2"; - md5 = "d1e7c55a0383f7d720d3ead0b6117284"; - brief = true; -} -{ - name = "JLanguageTool-1.7.0.tar.bz2"; - md5 = "b63e6340a02ff1cacfeadb2c42286161"; - brief = false; -} -{ - name = "lcms2-2.6.tar.gz"; - md5 = "f4c08d38ceade4a664ebff7228910a33"; - brief = true; -} -{ - name = "libatomic_ops-7_2d.zip"; - md5 = "c0b86562d5aa40761a87134f83e6adcf"; - brief = true; -} -{ - name = "libeot-0.01.tar.bz2"; - md5 = "aa24f5dd2a2992f4a116aa72af817548"; - brief = true; -} -{ - name = "libexttextcat-3.4.4.tar.bz2"; - md5 = "10d61fbaa6a06348823651b1bd7940fe"; - brief = false; -} -{ - name = "libgltf-0.0.2.tar.bz2"; - md5 = "d63a9f47ab048f5009d90693d6aa6424"; - brief = true; - subDir = "libgltf/"; -} -{ - name = "liblangtag-0.5.8.tar.bz2"; - md5 = "aa899eff126216dafe721149fbdb511b"; - brief = false; -} -{ - name = "xmlsec1-1.2.20.tar.gz"; - md5 = "ce12af00283eb90d9281956524250d6e"; - brief = false; -} -{ - name = "libxml2-2.9.4.tar.gz"; - md5 = "ae249165c173b1ff386ee8ad676815f5"; - brief = false; -} -{ - name = "libxslt-1.1.29.tar.gz"; - md5 = "a129d3c44c022de3b9dcf6d6f288d72e"; - brief = false; -} -{ - name = "lp_solve_5.5.tar.gz"; - md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; - brief = false; -} -{ - name = "mariadb_client-2.0.0-src.tar.gz"; - md5 = "a233181e03d3c307668b4c722d881661"; - brief = false; -} -{ - name = "mdds-1.2.0.tar.bz2"; - md5 = "9f3383fb7bae825eab69f3a6ec1d74b2"; - brief = true; -} -{ - name = "mDNSResponder-576.30.4.tar.gz"; - md5 = "940057ac8b513b00e8e9ca12ef796762"; - brief = true; -} -{ - name = "libmspub-0.1.2.tar.bz2"; - md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; - brief = true; -} -{ - name = "libmwaw-0.3.7.tar.bz2"; - md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; - brief = true; -} -{ - name = "mysql-connector-c++-1.1.4.tar.gz"; - md5 = "7239a4430efd4d0189c4f24df67f08e5"; - brief = false; -} -{ - name = "mythes-1.2.4.tar.gz"; - md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; - brief = false; -} -{ - name = "neon-0.30.1.tar.gz"; - md5 = "231adebe5c2f78fded3e3df6e958878e"; - brief = false; -} -{ - name = "nss-3.22.2-with-nspr-4.12.tar.gz"; - md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; - brief = false; -} -{ - name = "libodfgen-0.1.6.tar.bz2"; - md5 = "32572ea48d9021bbd6fa317ddb697abc"; - brief = true; -} -{ - name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; - md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; - brief = true; -} -{ - name = "openldap-2.4.31.tgz"; - md5 = "804c6cb5698db30b75ad0ff1c25baefd"; - brief = false; -} -{ - name = "openssl-1.0.2h.tar.gz"; - md5 = "9392e65072ce4b614c1392eefc1f23d0"; - brief = true; -} -{ - name = "liborcus-0.11.2.tar.gz"; - md5 = "205badaee72adf99422add8c4c49d669"; - brief = true; -} -{ - name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; - md5 = "593f0aa47bf2efc0efda2d28fae063b2"; - brief = true; -} -{ - name = "libpagemaker-0.0.3.tar.bz2"; - md5 = "5c4985a68be0b79d3f809da5e12b143c"; - brief = true; -} -{ - name = "pixman-0.24.4.tar.bz2"; - md5 = "c63f411b3ad147db2bcce1bf262a0e02"; - brief = false; -} -{ - name = "libpng-1.6.19.tar.gz"; - md5 = "3121bdc77c365a87e054b9f859f421fe"; - brief = true; -} -{ - name = "poppler-0.26.4.tar.gz"; - md5 = "35c0660065d023365e9854c13e289d12"; - brief = true; -} -{ - name = "postgresql-9.2.1.tar.bz2"; - md5 = "c0b4799ea9850eae3ead14f0a60e9418"; - brief = false; -} -{ - name = "Python-3.3.5.tgz"; - md5 = "803a75927f8f241ca78633890c798021"; - brief = true; -} -{ - name = "Python-3.5.0.tgz"; - md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; - brief = true; -} -{ - name = "raptor2-2.0.9.tar.gz"; - md5 = "4ceb9316488b0ea01acf011023cf7fff"; - brief = false; -} -{ - name = "rasqal-0.9.30.tar.gz"; - md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; - brief = false; -} -{ - name = "redland-1.0.16.tar.gz"; - md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; - brief = false; -} -{ - name = "librevenge-0.0.4.tar.bz2"; - md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; - brief = true; -} -{ - name = "rhino1_5R5.zip"; - md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; - brief = false; -} -{ - name = "serf-1.2.1.tar.bz2"; - md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; - brief = true; -} -{ - name = "swingExSrc.zip"; - md5 = "35c94d2df8893241173de1d16b6034c0"; - brief = false; -} -{ - name = "ucpp-1.3.2.tar.gz"; - md5 = "0168229624cfac409e766913506961a8"; - brief = false; -} -{ - name = "libvisio-0.1.5.tar.bz2"; - md5 = "cbee198a78b842b2087f32d33c522818"; - brief = true; -} -{ - name = "libwpd-0.10.1.tar.bz2"; - md5 = "79b56bcc349264d686a67994506ad199"; - brief = true; -} -{ - name = "libwpg-0.3.1.tar.bz2"; - md5 = "dfd066658ec9d2fb2262417039a8a1c3"; - brief = true; -} -{ - name = "libwps-0.4.3.tar.bz2"; - md5 = "027fb17fb9e43553aa6624dc18f830ac"; - brief = true; -} -{ - name = "xsltml_2.1.2.zip"; - md5 = "a7983f859eafb2677d7ff386a023bc40"; - brief = false; -} -{ - name = "zlib-1.2.8.tar.gz"; - md5 = "44d667c142d7cda120332623eab69f40"; - brief = true; -} + { + name = "libabw-0.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; + sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; + md5 = "7a3815b506d064313ba309617b6f5a0b"; + md5name = "7a3815b506d064313ba309617b6f5a0b-libabw-0.1.1.tar.bz2"; + } + { + name = "commons-logging-1.2-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; + sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; + md5 = "ce977548f1cbf46918e93cd38ac35163"; + md5name = "ce977548f1cbf46918e93cd38ac35163-commons-logging-1.2-src.tar.gz"; + } + { + name = "apr-1.4.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/apr-1.4.8.tar.gz"; + sha256 = "1689e415bdfab6aaa41f07836b5dd9ed4901d22ddeb99feffdb2cee3124adf49"; + md5 = "eff9d741b0999a9bbab96862dd2a2a3d"; + md5name = "eff9d741b0999a9bbab96862dd2a2a3d-apr-1.4.8.tar.gz"; + } + { + name = "apr-util-1.5.3.tar.gz"; + url = "http://dev-www.libreoffice.org/src/apr-util-1.5.3.tar.gz"; + sha256 = "76db34cb508e346e3bf69347c29ed1500bf0b71bcc48d54271ad9d1c25703743"; + md5 = "71a11d037240b292f824ba1eb537b4e3"; + md5name = "71a11d037240b292f824ba1eb537b4e3-apr-util-1.5.3.tar.gz"; + } + { + name = "boost_1_60_0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_60_0.tar.bz2"; + sha256 = "686affff989ac2488f79a97b9479efb9f2abae035b5ed4d8226de6857933fd3b"; + md5 = "65a840e1a0b13a558ff19eeb2c4f0cbe"; + md5name = "65a840e1a0b13a558ff19eeb2c4f0cbe-boost_1_60_0.tar.bz2"; + } + { + name = "breakpad.zip"; + url = "http://dev-www.libreoffice.org/src/breakpad.zip"; + sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; + md5 = "415ce291aa6f2ee1d5db7b62bf62ade8"; + md5name = "415ce291aa6f2ee1d5db7b62bf62ade8-breakpad.zip"; + } + { + name = "bsh-2.0b6-src.zip"; + url = "http://dev-www.libreoffice.org/src/beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + sha256 = "9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96"; + md5 = "beeca87be45ec87d241ddd0e1bad80c1"; + md5name = "beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip"; + } + { + name = "bzip2-1.0.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + sha256 = "a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd"; + md5 = "00b516f4704d4a7cb50a1d97e6e8e15b"; + md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; + } + { + name = "cairo-1.10.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + sha256 = "32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41"; + md5 = "f101a9e88b783337b20b2e26dfd26d5f"; + md5name = "f101a9e88b783337b20b2e26dfd26d5f-cairo-1.10.2.tar.gz"; + } + { + name = "libcdr-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.2.tar.bz2"; + sha256 = "d05a986dab9f960e64466072653a900d03f8257b084440d9d16599e16060581e"; + md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2"; + md5name = "6e3062b55b149d7b3c6aedb3bb5b86e2-libcdr-0.1.2.tar.bz2"; + } + { + name = "clucene-core-2.3.3.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + sha256 = "ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab"; + md5 = "48d647fbd8ef8889e5a7f422c1bfda94"; + md5name = "48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz"; + } + { + name = "libcmis-0.5.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; + sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; + md5 = "3270154f0f40d86fce849b161f914101"; + md5name = "3270154f0f40d86fce849b161f914101-libcmis-0.5.1.tar.gz"; + } + { + name = "CoinMP-1.7.6.tgz"; + url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; + sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; + md5 = "1cce53bf4b40ae29790d2c5c9f8b1129"; + md5name = "1cce53bf4b40ae29790d2c5c9f8b1129-CoinMP-1.7.6.tgz"; + } + { + name = "collada2gltf-master-cb1d97788a.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb"; + md5 = "4b87018f7fff1d054939d19920b751a0"; + md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + } + { + name = "cppunit-1.13.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/cppunit-1.13.2.tar.gz"; + sha256 = "3f47d246e3346f2ba4d7c9e882db3ad9ebd3fcbd2e8b732f946e0e3eeb9f429f"; + md5 = "d1c6bdd5a76c66d2c38331e2d287bc01"; + md5name = "d1c6bdd5a76c66d2c38331e2d287bc01-cppunit-1.13.2.tar.gz"; + } + { + name = "converttexttonumber-1-5-0.oxt"; + url = "http://dev-www.libreoffice.org/src/1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + sha256 = "71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3"; + md5 = "1f467e5bb703f12cbbb09d5cf67ecf4a"; + md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; + } + { + name = "curl-7.43.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/curl-7.43.0.tar.bz2"; + sha256 = "baa654a1122530483ccc1c58cc112fec3724a82c11c6a389f1e6a37dc8858df9"; + md5 = "11bddbb452a8b766b932f859aaeeed39"; + md5name = "11bddbb452a8b766b932f859aaeeed39-curl-7.43.0.tar.bz2"; + } + { + name = "libe-book-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; + sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; + md5 = "6b48eda57914e6343efebc9381027b78"; + md5name = "6b48eda57914e6343efebc9381027b78-libe-book-0.1.2.tar.bz2"; + } + { + name = "epm-3.7.tar.gz"; + url = "http://dev-www.libreoffice.org/src/3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + sha256 = "b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91"; + md5 = "3ade8cfe7e59ca8e65052644fed9fca4"; + md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; + } + { + name = "libetonyek-0.1.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; + sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; + md5 = "77ff46936dcc83670557274e7dd2aa33"; + md5name = "77ff46936dcc83670557274e7dd2aa33-libetonyek-0.1.6.tar.bz2"; + } + { + name = "expat-2.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.0.tar.bz2"; + sha256 = "d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff"; + md5 = "2f47841c829facb346eb6e3fab5212e2"; + md5name = "2f47841c829facb346eb6e3fab5212e2-expat-2.2.0.tar.bz2"; + } + { + name = "Firebird-2.5.5.26952-0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/Firebird-2.5.5.26952-0.tar.bz2"; + sha256 = "b33e63ede88184d9ef2ae6760537ab75bfe641513821410b83e837946162b7d1"; + md5 = "b0b5293991fcf07347b38431c80be1d4"; + md5name = "b0b5293991fcf07347b38431c80be1d4-Firebird-2.5.5.26952-0.tar.bz2"; + } + { + name = "fontconfig-2.8.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + sha256 = "fa2a1c6eea654d9fce7a4b1220f10c99cdec848dccaf1625c01f076b31382335"; + md5 = "77e15a92006ddc2adbb06f840d591c0e"; + md5name = "77e15a92006ddc2adbb06f840d591c0e-fontconfig-2.8.0.tar.gz"; + } + { + name = "crosextrafonts-20130214.tar.gz"; + url = "http://dev-www.libreoffice.org/src/368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + sha256 = "c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09"; + md5 = "368f114c078f94214a308a74c7e991bc"; + md5name = "368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz"; + } + { + name = "crosextrafonts-carlito-20130920.tar.gz"; + url = "http://dev-www.libreoffice.org/src/c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + sha256 = "4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a"; + md5 = "c74b7223abe75949b4af367942d96c7a"; + md5name = "c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz"; + } + { + name = "dejavu-fonts-ttf-2.35.zip"; + url = "http://dev-www.libreoffice.org/src/d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + sha256 = "7e0d00f20080784c3a38a845d5858c161af14f0073d9474cdbfdedae883cc747"; + md5 = "d8b5214d35bcd2bfcb2cffa7795b351d"; + md5name = "d8b5214d35bcd2bfcb2cffa7795b351d-dejavu-fonts-ttf-2.35.zip"; + } + { + name = "gentiumbasic-fonts-1.10.zip"; + url = "http://dev-www.libreoffice.org/src/35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + sha256 = "f1691e48d02effdee0701622297394451759f13e0e0b36e788847f4b3e2ba11b"; + md5 = "35efabc239af896dfb79be7ebdd6e6b9"; + md5name = "35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip"; + } + { + name = "liberation-fonts-ttf-1.07.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + sha256 = "61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c"; + md5 = "134d8262145fc793c6af494dcace3e71"; + md5name = "134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"; + } + { + name = "liberation-fonts-ttf-2.00.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + sha256 = "7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504"; + md5 = "5c781723a0d9ed6188960defba8e91cf"; + md5name = "5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"; + } + { + name = "LinLibertineG-20120116.zip"; + url = "http://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + sha256 = "54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5"; + md5 = "e7a384790b13c29113e22e596ade9687"; + md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; + } + { + name = "open-sans-font-ttf-1.10.tar.gz"; + url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; + sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8"; + md5 = "7a15edea7d415ac5150ea403e27401fd"; + md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; + } + { + name = "pt-serif-font-1.0000W.tar.gz"; + url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; + sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa"; + md5 = "c3c1a8ba7452950636e871d25020ce0d"; + md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; + } + { + name = "source-code-font-1.009.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + sha256 = "9b295127164c81bcf28c7ebb687f1555b71796108b443a04d40202b7364e4cce"; + md5 = "0279a21fab6f245e85a6f85fea54f511"; + md5name = "0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz"; + } + { + name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + url = "http://dev-www.libreoffice.org/src/edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + sha256 = "e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61"; + md5 = "edc4d741888bc0d38e32dbaa17149596"; + md5name = "edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + } + { + name = "libfreehand-0.1.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; + sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; + md5 = "8cf70c5dc4d24d2dc4a107f509d2d6d7"; + md5name = "8cf70c5dc4d24d2dc4a107f509d2d6d7-libfreehand-0.1.1.tar.bz2"; + } + { + name = "freetype-2.4.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + sha256 = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"; + md5 = "dbf2caca1d3afd410a29217a9809d397"; + md5name = "dbf2caca1d3afd410a29217a9809d397-freetype-2.4.8.tar.bz2"; + } + { + name = "glew-1.12.0.zip"; + url = "http://dev-www.libreoffice.org/src/3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + sha256 = "6f1083eb034efbc3b2017ef052d58f3e9bd70963ec2acd26b3d59231ee1633d4"; + md5 = "3941e9cab2f4f9d8faee3e8d57ae7664"; + md5name = "3941e9cab2f4f9d8faee3e8d57ae7664-glew-1.12.0.zip"; + } + { + name = "glm-0.9.4.6-libreoffice.zip"; + url = "http://dev-www.libreoffice.org/src/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + sha256 = "d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a"; + md5 = "bae83fa5dc7f081768daace6e199adc3"; + md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; + } + { + name = "glyphy-0.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + sha256 = "9a8f629f7ea40ba118199a37adee8f2dfb084cffa5f7f4db3a47b8b0075777be"; + md5 = "5d303fb955beb9bf112267316ca9d021"; + md5name = "5d303fb955beb9bf112267316ca9d021-glyphy-0.2.0.tar.bz2"; + } + { + name = "graphite2-minimal-1.3.8.tgz"; + url = "http://dev-www.libreoffice.org/src/4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz"; + sha256 = "d16940175822760753e9762d0af9679c9726e64f25955677fe7ab68448601c3b"; + md5 = "4311dd9ace498b57c85f611e0670df64"; + md5name = "4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.3.8.tgz"; + } + { + name = "harfbuzz-1.2.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.2.6.tar.bz2"; + sha256 = "7537bacccb3524df0cd2a4d5bc7e168bcc10e8171e0324f3cd522583868192c1"; + md5 = "9f4b6831c86135faef011e991f59f77f"; + md5name = "9f4b6831c86135faef011e991f59f77f-harfbuzz-1.2.6.tar.bz2"; + } + { + name = "hsqldb_1_8_0.zip"; + url = "http://dev-www.libreoffice.org/src/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + sha256 = "d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370"; + md5 = "17410483b5b5f267aa18b7e00b65e6e0"; + md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; + } + { + name = "hunspell-1.4.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz"; + sha256 = "c4476aff0ced52eec334eae1e8d3fdaaebdd90f5ecd0b57cf2a92a6fd220d1bb"; + md5 = "33d370f7fe5a030985e445a5672b2067"; + md5name = "33d370f7fe5a030985e445a5672b2067-hunspell-1.4.1.tar.gz"; + } + { + name = "hyphen-2.8.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + sha256 = "304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705"; + md5 = "5ade6ae2a99bc1e9e57031ca88d36dad"; + md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; + } + { + name = "icu4c-57_1-src.tgz"; + url = "http://dev-www.libreoffice.org/src/976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz"; + sha256 = "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581"; + md5 = "976734806026a4ef8bdd17937c8898b9"; + md5name = "976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz"; + } + { + name = "flow-engine-0.9.4.zip"; + url = "http://dev-www.libreoffice.org/src/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + sha256 = "233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd"; + md5 = "ba2930200c9f019c2d93a8c88c651a0f"; + md5name = "ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip"; + } + { + name = "flute-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + sha256 = "1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133"; + md5 = "d8bd5eed178db6e2b18eeed243f85aa8"; + md5name = "d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip"; + } + { + name = "libbase-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + sha256 = "75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba"; + md5 = "eeb2c7ddf0d302fba4bfc6e97eac9624"; + md5name = "eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip"; + } + { + name = "libfonts-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + sha256 = "e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743"; + md5 = "3bdf40c0d199af31923e900d082ca2dd"; + md5name = "3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip"; + } + { + name = "libformula-1.1.7.zip"; + url = "http://dev-www.libreoffice.org/src/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + sha256 = "5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b"; + md5 = "3404ab6b1792ae5f16bbd603bd1e1d03"; + md5name = "3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip"; + } + { + name = "liblayout-0.2.10.zip"; + url = "http://dev-www.libreoffice.org/src/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + sha256 = "e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772"; + md5 = "db60e4fde8dd6d6807523deb71ee34dc"; + md5name = "db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip"; + } + { + name = "libloader-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + sha256 = "3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8"; + md5 = "97b2d4dba862397f446b217e2b623e71"; + md5name = "97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip"; + } + { + name = "librepository-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + sha256 = "abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095"; + md5 = "8ce2fcd72becf06c41f7201d15373ed9"; + md5name = "8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip"; + } + { + name = "libserializer-1.1.6.zip"; + url = "http://dev-www.libreoffice.org/src/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + sha256 = "05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343"; + md5 = "f94d9870737518e3b597f9265f4e9803"; + md5name = "f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip"; + } + { + name = "libxml-1.1.7.zip"; + url = "http://dev-www.libreoffice.org/src/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + sha256 = "7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66"; + md5 = "ace6ab49184e329db254e454a010f56d"; + md5name = "ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip"; + } + { + name = "sacjava-1.3.zip"; + url = "http://dev-www.libreoffice.org/src/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + sha256 = "085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045"; + md5 = "39bb3fcea1514f1369fcfc87542390fd"; + md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; + } + { + name = "jpegsrc.v9a.tar.gz"; + url = "http://dev-www.libreoffice.org/src/jpegsrc.v9a.tar.gz"; + sha256 = "3a753ea48d917945dd54a2d97de388aa06ca2eb1066cbfdc6652036349fe05a7"; + md5 = "3353992aecaee1805ef4109aadd433e7"; + md5name = "3353992aecaee1805ef4109aadd433e7-jpegsrc.v9a.tar.gz"; + } + { + name = "libjpeg-turbo-1.4.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.4.2.tar.gz"; + sha256 = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e"; + md5 = "86b0d5f7507c2e6c21c00219162c3c44"; + md5name = "86b0d5f7507c2e6c21c00219162c3c44-libjpeg-turbo-1.4.2.tar.gz"; + } + { + name = "language-subtag-registry-2016-07-19.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2016-07-19.tar.bz2"; + sha256 = "e3dc30bdbfdad442c542dc0e165df9d8d2ba06a357cd55957155d8259d1661dc"; + md5 = "8a037dc60b16bf8c5fe871b33390a4a2"; + md5name = "8a037dc60b16bf8c5fe871b33390a4a2-language-subtag-registry-2016-07-19.tar.bz2"; + } + { + name = "JLanguageTool-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + sha256 = "48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d"; + md5 = "b63e6340a02ff1cacfeadb2c42286161"; + md5name = "b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2"; + } + { + name = "lcms2-2.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/lcms2-2.6.tar.gz"; + sha256 = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"; + md5 = "f4c08d38ceade4a664ebff7228910a33"; + md5name = "f4c08d38ceade4a664ebff7228910a33-lcms2-2.6.tar.gz"; + } + { + name = "libatomic_ops-7_2d.zip"; + url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; + sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; + md5 = "c0b86562d5aa40761a87134f83e6adcf"; + md5name = "c0b86562d5aa40761a87134f83e6adcf-libatomic_ops-7_2d.zip"; + } + { + name = "libeot-0.01.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; + sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; + md5 = "aa24f5dd2a2992f4a116aa72af817548"; + md5name = "aa24f5dd2a2992f4a116aa72af817548-libeot-0.01.tar.bz2"; + } + { + name = "libexttextcat-3.4.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; + sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163"; + md5 = "10d61fbaa6a06348823651b1bd7940fe"; + md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; + } + { + name = "libgltf-0.0.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.0.2.tar.bz2"; + sha256 = "d1cc7297ed1921aa969e26413b4c4e18afc882ce4d2f5a2aa2a2905706f7206b"; + md5 = "d63a9f47ab048f5009d90693d6aa6424"; + md5name = "d63a9f47ab048f5009d90693d6aa6424-libgltf-0.0.2.tar.bz2"; + } + { + name = "liblangtag-0.5.8.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; + sha256 = "08e2f64bfe3f750be7391eb0af53967e164b628c59f02be4d83789eb4f036eaa"; + md5 = "aa899eff126216dafe721149fbdb511b"; + md5name = "aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2"; + } + { + name = "xmlsec1-1.2.20.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz"; + sha256 = "3221593ca50f362b546a0888a1431ad24be1470f96b2469c0e0df5e1c55e7305"; + md5 = "ce12af00283eb90d9281956524250d6e"; + md5name = "ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz"; + } + { + name = "libxml2-2.9.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"; + md5 = "ae249165c173b1ff386ee8ad676815f5"; + md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + } + { + name = "libxslt-1.1.29.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; + sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"; + md5 = "a129d3c44c022de3b9dcf6d6f288d72e"; + md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; + } + { + name = "lp_solve_5.5.tar.gz"; + url = "http://dev-www.libreoffice.org/src/26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + sha256 = "171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695"; + md5 = "26b3e95ddf3d9c077c480ea45874b3b8"; + md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz"; + } + { + name = "mariadb_client-2.0.0-src.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + sha256 = "fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60"; + md5 = "a233181e03d3c307668b4c722d881661"; + md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; + } + { + name = "mdds-1.2.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.2.0.tar.bz2"; + sha256 = "f44fd0635de94c7d490f9a65f74b5e55860d7bdd507951428294f9690fda45b6"; + md5 = "9f3383fb7bae825eab69f3a6ec1d74b2"; + md5name = "9f3383fb7bae825eab69f3a6ec1d74b2-mdds-1.2.0.tar.bz2"; + } + { + name = "mDNSResponder-576.30.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; + sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; + md5 = "940057ac8b513b00e8e9ca12ef796762"; + md5name = "940057ac8b513b00e8e9ca12ef796762-mDNSResponder-576.30.4.tar.gz"; + } + { + name = "libmspub-0.1.2.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; + sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; + md5 = "ff9d0f9dd8fbc523408ea1953d5bde41"; + md5name = "ff9d0f9dd8fbc523408ea1953d5bde41-libmspub-0.1.2.tar.bz2"; + } + { + name = "libmwaw-0.3.7.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.7.tar.bz2"; + sha256 = "a66b3e45a5ba5dd89849a766e128585cac8aaf9e9c6f037040200e5bf31f1427"; + md5 = "4a8a53a9d997cf0e2bd208178797dbfb"; + md5name = "4a8a53a9d997cf0e2bd208178797dbfb-libmwaw-0.3.7.tar.bz2"; + } + { + name = "mysql-connector-c++-1.1.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; + sha256 = "a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585"; + md5 = "7239a4430efd4d0189c4f24df67f08e5"; + md5name = "7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz"; + } + { + name = "mythes-1.2.4.tar.gz"; + url = "http://dev-www.libreoffice.org/src/a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + sha256 = "1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f"; + md5 = "a8c2c5b8f09e7ede322d5c602ff6a4b6"; + md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; + } + { + name = "neon-0.30.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"; + md5 = "231adebe5c2f78fded3e3df6e958878e"; + md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + } + { + name = "nss-3.22.2-with-nspr-4.12.tar.gz"; + url = "http://dev-www.libreoffice.org/src/6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + sha256 = "7bc7e5483fc90071be5facd3043f94c69b153055a369c8f0b751ad374c5ae09e"; + md5 = "6b254cf2f8cb4b27a3f0b8b7b9966ea7"; + md5name = "6b254cf2f8cb4b27a3f0b8b7b9966ea7-nss-3.22.2-with-nspr-4.12.tar.gz"; + } + { + name = "libodfgen-0.1.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; + sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; + md5 = "32572ea48d9021bbd6fa317ddb697abc"; + md5name = "32572ea48d9021bbd6fa317ddb697abc-libodfgen-0.1.6.tar.bz2"; + } + { + name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; + sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; + md5 = "4ca8a6ef0afeefc864e9ef21b9f14bd6"; + md5name = "4ca8a6ef0afeefc864e9ef21b9f14bd6-OpenCOLLADA-master-6509aa13af.tar.bz2"; + } + { + name = "openldap-2.4.31.tgz"; + url = "http://dev-www.libreoffice.org/src/804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + sha256 = "bde845840df4794b869a6efd6a6b1086f80989038e4844b2e4d7d6b57b39c5b6"; + md5 = "804c6cb5698db30b75ad0ff1c25baefd"; + md5name = "804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz"; + } + { + name = "openssl-1.0.2h.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2h.tar.gz"; + sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; + md5 = "9392e65072ce4b614c1392eefc1f23d0"; + md5name = "9392e65072ce4b614c1392eefc1f23d0-openssl-1.0.2h.tar.gz"; + } + { + name = "liborcus-0.11.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.11.2.tar.gz"; + sha256 = "10afc617fd7600fa02bd4467d2e3c7bd058f84e4d672d558e1db90e82dafd256"; + md5 = "205badaee72adf99422add8c4c49d669"; + md5name = "205badaee72adf99422add8c4c49d669-liborcus-0.11.2.tar.gz"; + } + { + name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; + md5 = "593f0aa47bf2efc0efda2d28fae063b2"; + md5name = "593f0aa47bf2efc0efda2d28fae063b2-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + } + { + name = "libpagemaker-0.0.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; + sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; + md5 = "5c4985a68be0b79d3f809da5e12b143c"; + md5name = "5c4985a68be0b79d3f809da5e12b143c-libpagemaker-0.0.3.tar.bz2"; + } + { + name = "pixman-0.24.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + sha256 = "3d1bf79329be76103c7d9632a79962178364371807104a10e5f63ae0551731dc"; + md5 = "c63f411b3ad147db2bcce1bf262a0e02"; + md5name = "c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2"; + } + { + name = "libpng-1.6.24.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.24.tar.gz"; + sha256 = "be46e0d14ccac3800f816ae860d191a1187a40164b7552c44afeee97a9caa0a3"; + md5 = "65213080dd30a9b16193d9b83adc1ee9"; + md5name = "65213080dd30a9b16193d9b83adc1ee9-libpng-1.6.24.tar.gz"; + } + { + name = "poppler-0.46.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/poppler-0.46.0.tar.bz2"; + sha256 = "e3b53c4d1baffb047d4752d68886210fcb279e75cc32c0c61c7165e4d4cf846a"; + md5 = "38c758d84437378ec4f5aae9f875301d"; + md5name = "38c758d84437378ec4f5aae9f875301d-poppler-0.46.0.tar.bz2"; + } + { + name = "postgresql-9.2.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + sha256 = "db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461"; + md5 = "c0b4799ea9850eae3ead14f0a60e9418"; + md5name = "c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2"; + } + { + name = "Python-3.3.5.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.3.5.tgz"; + sha256 = "916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168"; + md5 = "803a75927f8f241ca78633890c798021"; + md5name = "803a75927f8f241ca78633890c798021-Python-3.3.5.tgz"; + } + { + name = "Python-3.5.0.tgz"; + url = "http://dev-www.libreoffice.org/src/Python-3.5.0.tgz"; + sha256 = "584e3d5a02692ca52fce505e68ecd77248a6f2c99adf9db144a39087336b0fe0"; + md5 = "a56c0c0b45d75a0ec9c6dee933c41c36"; + md5name = "a56c0c0b45d75a0ec9c6dee933c41c36-Python-3.5.0.tgz"; + } + { + name = "raptor2-2.0.9.tar.gz"; + url = "http://dev-www.libreoffice.org/src/4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + sha256 = "e26fb9c18e6ebf71100f434070d50196a21d592b715e361850c3b4e789b5f6ef"; + md5 = "4ceb9316488b0ea01acf011023cf7fff"; + md5name = "4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz"; + } + { + name = "rasqal-0.9.30.tar.gz"; + url = "http://dev-www.libreoffice.org/src/b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + sha256 = "abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd"; + md5 = "b12c5f9cfdb6b04efce5a4a186b8416b"; + md5name = "b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz"; + } + { + name = "redland-1.0.16.tar.gz"; + url = "http://dev-www.libreoffice.org/src/32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + sha256 = "d9a274fc086e61119d5c9beafb8d05527e040ec86f4c0961276ca8de0a049dbd"; + md5 = "32f8e1417a64d3c6f2c727f9053f55ea"; + md5name = "32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz"; + } + { + name = "librevenge-0.0.4.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; + sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; + md5 = "5b9ac52ec77d4d19157cf5962ebc0aea"; + md5name = "5b9ac52ec77d4d19157cf5962ebc0aea-librevenge-0.0.4.tar.bz2"; + } + { + name = "rhino1_5R5.zip"; + url = "http://dev-www.libreoffice.org/src/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + sha256 = "1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753"; + md5 = "798b2ffdc8bcfe7bca2cf92b62caf685"; + md5name = "798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip"; + } + { + name = "serf-1.2.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; + sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; + md5 = "4f8e76c9c6567aee1d66aba49f76a58b"; + md5name = "4f8e76c9c6567aee1d66aba49f76a58b-serf-1.2.1.tar.bz2"; + } + { + name = "swingExSrc.zip"; + url = "http://dev-www.libreoffice.org/src/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + sha256 = "64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1"; + md5 = "35c94d2df8893241173de1d16b6034c0"; + md5name = "35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"; + } + { + name = "ucpp-1.3.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + sha256 = "983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776"; + md5 = "0168229624cfac409e766913506961a8"; + md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; + } + { + name = "libvisio-0.1.5.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; + sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; + md5 = "cbee198a78b842b2087f32d33c522818"; + md5name = "cbee198a78b842b2087f32d33c522818-libvisio-0.1.5.tar.bz2"; + } + { + name = "libwpd-0.10.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; + sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; + md5 = "79b56bcc349264d686a67994506ad199"; + md5name = "79b56bcc349264d686a67994506ad199-libwpd-0.10.1.tar.bz2"; + } + { + name = "libwpg-0.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; + sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; + md5 = "dfd066658ec9d2fb2262417039a8a1c3"; + md5name = "dfd066658ec9d2fb2262417039a8a1c3-libwpg-0.3.1.tar.bz2"; + } + { + name = "libwps-0.4.3.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.3.tar.bz2"; + sha256 = "0c30407865a873ff76b6d5b2d2aa599f6af68936638c81ca8292449324042a6c"; + md5 = "027fb17fb9e43553aa6624dc18f830ac"; + md5name = "027fb17fb9e43553aa6624dc18f830ac-libwps-0.4.3.tar.bz2"; + } + { + name = "xsltml_2.1.2.zip"; + url = "http://dev-www.libreoffice.org/src/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + sha256 = "75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870"; + md5 = "a7983f859eafb2677d7ff386a023bc40"; + md5name = "a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip"; + } + { + name = "zlib-1.2.8.tar.gz"; + url = "http://dev-www.libreoffice.org/src/zlib-1.2.8.tar.gz"; + sha256 = "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d"; + md5 = "44d667c142d7cda120332623eab69f40"; + md5name = "44d667c142d7cda120332623eab69f40-zlib-1.2.8.tar.gz"; + } ] diff --git a/pkgs/applications/office/libreoffice/still-gen-shell.nix b/pkgs/applications/office/libreoffice/still-gen-shell.nix new file mode 100644 index 00000000000..c5c17c2aaad --- /dev/null +++ b/pkgs/applications/office/libreoffice/still-gen-shell.nix @@ -0,0 +1,29 @@ +{ pkgs ? (import {}) }: + +with pkgs; + +let + + primary-src = callPackage ./still-primary-src.nix {}; + +in + +stdenv.mkDerivation { + name = "generate-libreoffice-srcs-shell"; + + buildCommand = "exit 1"; + + downloadList = stdenv.mkDerivation { + name = "libreoffice-${primary-src.version}-download-list"; + inherit (primary-src) src version; + builder = ./download-list-builder.sh; + }; + + buildInputs = [ python3 ]; + + shellHook = '' + function generate { + python3 generate-libreoffice-srcs.py > libreoffice-srcs-still.nix + } + ''; +} diff --git a/pkgs/applications/office/libreoffice/still-primary-src.nix b/pkgs/applications/office/libreoffice/still-primary-src.nix new file mode 100644 index 00000000000..33ba558ed29 --- /dev/null +++ b/pkgs/applications/office/libreoffice/still-primary-src.nix @@ -0,0 +1,17 @@ +{ fetchurl }: + +rec { + major = "5"; + minor = "1"; + patch = "5"; + tweak = "2"; + + subdir = "${major}.${minor}.${patch}"; + + version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; + + src = fetchurl { + url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x"; + }; +} diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 681870ac4ca..2963eff83e7 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon -, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which +, bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw @@ -18,23 +18,15 @@ , kdeIntegration ? false }: +let + primary-src = import ./still-primary-src.nix { inherit fetchurl; }; +in + +with { inherit (primary-src) major minor subdir version; }; + let lib = stdenv.lib; langsSpaces = lib.concatStringsSep " " langs; - major = "5"; - minor = "1"; - patch = "5"; - tweak = "2"; - subdir = "${major}.${minor}.${patch}"; - version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; - - fetchThirdParty = {name, md5, brief, subDir ? ""}: fetchurl { - inherit name md5; - url = if brief then - "http://dev-www.libreoffice.org/src/${subDir}${name}" - else - "http://dev-www.libreoffice.org/src/${subDir}${md5}-${name}"; - }; fetchSrc = {name, sha256}: fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; @@ -42,11 +34,11 @@ let }; srcs = { - third_party = [ (fetchurl rec { + third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; - md5 = "185d60944ea767075d27247c3162b3bc"; + sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; - }) ] ++ (map fetchThirdParty (import ./libreoffice-srcs-still.nix)); + }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs-still.nix)); translations = fetchSrc { name = "translations"; @@ -64,10 +56,7 @@ let in stdenv.mkDerivation rec { name = "libreoffice-${version}"; - src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1qg0dj0zwh5ifhmvv4k771nmyqddz4ifn75s9mr1p0nyix8zks8x"; - }; + inherit (primary-src) src; # we only have this problem on i686 ATM patches = if stdenv.is64bit then null else [ @@ -97,7 +86,7 @@ in stdenv.mkDerivation rec { postUnpack = '' mkdir -v $sourceRoot/src - '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' + (stdenv.lib.concatMapStrings (f: "ln -sfv ${f} $sourceRoot/src/${f.md5 or f.outputHash}-${f.name}\nln -sfv ${f} $sourceRoot/src/${f.name}\n") srcs.third_party) + '' ln -sv ${srcs.help} $sourceRoot/src/${srcs.help.name} ln -svf ${srcs.translations} $sourceRoot/src/${srcs.translations.name} @@ -246,7 +235,7 @@ in stdenv.mkDerivation rec { buildInputs = with xorg; [ ant ArchiveZip autoconf automake bison boost cairo clucene_core CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig - freetype GConf getopt gnome_vfs gperf gtk3 gtk + freetype GConf getopt gnome_vfs gperf gtk3 gtk2 hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 7ccf66c055e..9409ab3e669 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -12,14 +12,14 @@ let then "i386" else "amd64"; - shortVersion = "1.16.2-stable"; + shortVersion = "1.16.3-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 "08f61972d5a5e491fcd3d4cf5dfe59ad7e07b3883b7ad50d440868c3057af6fb" - else "9bd139b236143f78b23ff4271c01a20c059622abe9dd125e771e0b5db16b7b7b"; + then "14cxysn1l6s6z8awmqj1glm4146jif0852wiyhjg1dhhh25cvpbv" + else "1hdvawj8g4hpj36xy5ys27h1fa76xcdx8apsxa6hpg5xmxvcamqz"; deps = [ gcc.cc diff --git a/pkgs/applications/office/osmo/default.nix b/pkgs/applications/office/osmo/default.nix index 6da3bf6df83..3209ae0a9c9 100644 --- a/pkgs/applications/office/osmo/default.nix +++ b/pkgs/applications/office/osmo/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libxml2, gettext, libical, libnotify -, libarchive, gtkspell, webkitgtk2, libgringotts }: +{ stdenv, fetchurl, pkgconfig, gtk2, libxml2, gettext, libical, libnotify +, libarchive, gtkspell2, webkitgtk2, libgringotts }: stdenv.mkDerivation rec { name = "osmo-${version}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0vaayrmyiqn010gr11drmhkkg8fkxdmla3gwj9v3zvp5x44kab05"; }; - buildInputs = [ pkgconfig gtk libxml2 gettext libical libnotify libarchive - gtkspell webkitgtk2 libgringotts ]; + buildInputs = [ pkgconfig gtk2 libxml2 gettext libical libnotify libarchive + gtkspell2 webkitgtk2 libgringotts ]; meta = with stdenv.lib; { description = "A handy personal organizer"; diff --git a/pkgs/applications/office/planner/default.nix b/pkgs/applications/office/planner/default.nix index 9222ed5757c..e7fd9450029 100644 --- a/pkgs/applications/office/planner/default.nix +++ b/pkgs/applications/office/planner/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , pkgconfig , intltool -, gnome +, gnome2 , libxslt , python }: @@ -20,15 +20,17 @@ in stdenv.mkDerivation { sha256 = "15h6ps58giy5r1g66sg1l4xzhjssl362mfny2x09khdqsvk2j38k"; }; - buildInputs = [ + buildInputs = with gnome2; [ pkgconfig intltool - gnome.GConf - gnome.gtk - gnome.libgnomecanvas - gnome.libgnomeui - gnome.libglade - gnome.scrollkeeper + + GConf + gtk + libgnomecanvas + libgnomeui + libglade + scrollkeeper + libxslt python ]; diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix index 695db93d4de..5076a8f586e 100644 --- a/pkgs/applications/office/qnotero/default.nix +++ b/pkgs/applications/office/qnotero/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildPythonPackage, python3, python3Packages +{ stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonPackage rec { @@ -14,7 +14,7 @@ python3Packages.buildPythonPackage rec { sha256 = "1d5a9k1llzn9q1qv1bfwc7gfflabh4riplz9jj0hf04b279y1bj0"; }; - propagatedBuildInputs = [ python3 python3Packages.pyqt4 ]; + propagatedBuildInputs = [ python3Packages.pyqt4 ]; patchPhase = '' substituteInPlace ./setup.py \ diff --git a/pkgs/applications/office/scribus/default.nix b/pkgs/applications/office/scribus/default.nix index d592e149588..e1c80c50ee5 100644 --- a/pkgs/applications/office/scribus/default.nix +++ b/pkgs/applications/office/scribus/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, freetype, lcms, libtiff, libxml2 -, libart_lgpl, qt4, python, cups, fontconfig, libjpeg +, libart_lgpl, qt4, pythonFull, cups, fontconfig, libjpeg , zlib, libpng, xorg, cairo, podofo, aspell, boost, cmake }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = with xorg; [ pkgconfig cmake freetype lcms libtiff libxml2 libart_lgpl qt4 - python cups fontconfig + pythonFull cups fontconfig libjpeg zlib libpng podofo aspell cairo boost # for internal 2geom library libXaw libXext libX11 libXtst libXi libXinerama diff --git a/pkgs/applications/office/tagainijisho/default.nix b/pkgs/applications/office/tagainijisho/default.nix index 9283ee1274c..bd7d537a2c6 100644 --- a/pkgs/applications/office/tagainijisho/default.nix +++ b/pkgs/applications/office/tagainijisho/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { /* program */ gpl3Plus /* data */ cc-by-sa-30 ]; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = with maintainers; [ vbgl ]; }; } diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix index 9014e388468..ec33388f086 100644 --- a/pkgs/applications/office/zim/default.nix +++ b/pkgs/applications/office/zim/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject, python }: +{ stdenv, lib, fetchurl, pythonPackages }: # # TODO: Declare configuration options for the following optional dependencies: @@ -7,7 +7,7 @@ # - pyxdg: Need to make it work first (see setupPyInstallFlags). # -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "zim-${version}"; version = "0.65"; namePrefix = ""; @@ -17,7 +17,7 @@ buildPythonApplication rec { sha256 = "15pdq4fxag85qjsrdmmssiq85qsk5vnbp8mrqnpvx8lm8crz6hjl"; }; - propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk pythonPackages.pyxdg pygobject ]; + propagatedBuildInputs = with pythonPackages; [ sqlite3 pyGtkGlade pyxdg pygobject2 ]; preBuild = '' export HOME=$TMP diff --git a/pkgs/applications/science/electronics/geda/default.nix b/pkgs/applications/science/electronics/geda/default.nix index 25934c71e8e..b8406c3255c 100644 --- a/pkgs/applications/science/electronics/geda/default.nix +++ b/pkgs/applications/science/electronics/geda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, guile, gtk, flex, gawk, perl }: +{ stdenv, fetchurl, pkgconfig, guile, gtk2, flex, gawk, perl }: stdenv.mkDerivation rec { name = "geda-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; configureFlags = "--disable-update-xdg-database"; - buildInputs = [ pkgconfig guile gtk flex gawk perl ]; + buildInputs = [ pkgconfig guile gtk2 flex gawk perl ]; meta = with stdenv.lib; { description = "Full GPL'd suite of Electronic Design Automation tools"; diff --git a/pkgs/applications/science/electronics/gerbv/default.nix b/pkgs/applications/science/electronics/gerbv/default.nix index 92d0ceba1cf..7cdcbb7fd19 100644 --- a/pkgs/applications/science/electronics/gerbv/default.nix +++ b/pkgs/applications/science/electronics/gerbv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk, autoreconfHook }: +{ stdenv, fetchgit, pkgconfig, gettext, libtool, automake, autoconf, cairo, gtk2, autoreconfHook }: stdenv.mkDerivation rec { name = "gerbv-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "00jn1xhf6kblxc5gac1wvk8zm12fy6sk81nj3jwdag0z6wk3z446"; }; - buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk autoreconfHook ]; + buildInputs = [ pkgconfig gettext libtool automake autoconf cairo gtk2 autoreconfHook ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix index 32d39d8a609..657d20553b7 100644 --- a/pkgs/applications/science/electronics/gtkwave/default.nix +++ b/pkgs/applications/science/electronics/gtkwave/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: +{stdenv, fetchurl, gtk2, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}: stdenv.mkDerivation rec { name = "gtkwave-3.3.70"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz"; }; - buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ]; + buildInputs = [ gtk2 gperf pkgconfig bzip2 tcl tk judy xz ]; configureFlags = [ "--with-tcl=${tcl}/lib" "--with-tk=${tk}/lib" "--enable-judy" ]; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 56fbf20f52d..9cac49d5189 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -21,11 +21,10 @@ stdenv.mkDerivation rec { sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg"; }) ]; - + sourceRoot = "kicad-${version}"; cmakeFlags = '' - -DCMAKE_BUILD_TYPE=Release -DKICAD_SKIP_BOOST=ON -DKICAD_BUILD_VERSION=${version} -DKICAD_REPO_NAME=stable @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { postUnpack = '' pushd $(pwd) - ''; + ''; postInstall = '' popd @@ -53,7 +52,7 @@ stdenv.mkDerivation rec { make $MAKE_FLAGS make install popd - + pushd kicad-footprints-* mkdir -p $out/share/kicad/modules cp -R *.pretty $out/share/kicad/modules/ diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 257d6993ff5..1f510943400 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0l6944hq79qsyp60i5ai02xwyp8l47q7xdm3js0jfkpf72ag7i42"; }; - buildInputs = [ pkgconfig gtk bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ pkgconfig gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/electronics/xoscope/default.nix b/pkgs/applications/science/electronics/xoscope/default.nix index df7d053d93b..f26b13c5e32 100644 --- a/pkgs/applications/science/electronics/xoscope/default.nix +++ b/pkgs/applications/science/electronics/xoscope/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig}: +{stdenv, fetchurl, gtk2, pkgconfig}: stdenv.mkDerivation rec { name = "xoscope-2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "00xlvvqyw6l1ljbsx1vgx2v1jfh0xacz1a0yhq1dj6yxf5wh58x8"; }; - buildInputs = [ gtk pkgconfig ]; + buildInputs = [ gtk2 pkgconfig ]; # from: https://aur.archlinux.org/packages.php?ID=12140&detail=1 patches = [ ./gtkdepre.diff ]; diff --git a/pkgs/applications/science/geometry/drgeo/default.nix b/pkgs/applications/science/geometry/drgeo/default.nix index 3e5408ac7f5..8db1beedebb 100644 --- a/pkgs/applications/science/geometry/drgeo/default.nix +++ b/pkgs/applications/science/geometry/drgeo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libglade, gtk, guile, libxml2, perl +{ stdenv, fetchurl, libglade, gtk2, guile, libxml2, perl , intltool, libtool, pkgconfig }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; patches = [ ./struct.patch ]; - buildInputs = [libglade gtk guile libxml2 + buildInputs = [libglade gtk2 guile libxml2 perl intltool libtool pkgconfig]; prebuild = '' diff --git a/pkgs/applications/science/logic/coq/8.3.nix b/pkgs/applications/science/logic/coq/8.3.nix index b434063cae9..ec4e530ae52 100644 --- a/pkgs/applications/science/logic/coq/8.3.nix +++ b/pkgs/applications/science/logic/coq/8.3.nix @@ -3,7 +3,10 @@ # However, coq can build without csdp by setting it to null. # In this case some Micromega tactics will search the user's path for the csdp program and will fail if it is not found. -{ stdenv, make, fetchurl, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }: +{ stdenv, lib, make, fetchurl +, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null }: + +assert lib.versionOlder ocaml.version "4"; let version = "8.3pl4"; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 38ba14e83cf..6c421117807 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -14,8 +14,8 @@ let substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" '' else ""; -in +self = stdenv.mkDerivation { name = "coq-${version}"; @@ -62,6 +62,22 @@ stdenv.mkDerivation { envHooks=(''${envHooks[@]} addCoqPath) ''; + passthru = { + emacsBufferSetup = pkgs: '' + ; Propagate coq paths to children + (inherit-local-permanent coq-prog-name "${self}/bin/coqtop") + (inherit-local-permanent coq-dependency-analyzer "${self}/bin/coqdep") + (inherit-local-permanent coq-compiler "${self}/bin/coqc") + ; If the coq-library path was already set, re-set it based on our current coq + (when (fboundp 'get-coq-library-directory) + (inherit-local-permanent coq-library-directory (get-coq-library-directory)) + (coq-prog-args)) + ; Pass proof-general's coq flags to flycheck command (pretty ugly, should probably be part of PG) + (inherit-local-permanent flycheck-command-wrapper-function (lambda (cmd) + (append (funcall (default-value 'flycheck-command-wrapper-function) cmd) (coq-coqtop-prog-args coq-load-path)))) + ''; + }; + meta = with stdenv.lib; { description = "Formal proof management system"; longDescription = '' @@ -76,4 +92,4 @@ stdenv.mkDerivation { maintainers = with maintainers; [ roconnor thoughtpolice vbgl ]; platforms = platforms.unix; }; -} +}; in self diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix index 1f36858ae32..92b5b49cec7 100644 --- a/pkgs/applications/science/logic/eprover/default.nix +++ b/pkgs/applications/science/logic/eprover/default.nix @@ -1,46 +1,29 @@ { stdenv, fetchurl, which }: -let - s = # Generated upstream information - rec { - baseName="eprover"; - version="1.9"; - name="${baseName}-${version}"; - hash="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4"; - url="http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_1.9/E.tgz"; - sha256="0vipapqjg0339lpc98vpvz58m6xkqrhgxylmp0hrnld4lrhmcdn4"; - }; -in -stdenv.mkDerivation { - inherit (s) name; +stdenv.mkDerivation rec { + name = "eprover-${version}"; + version = "1.9.1"; src = fetchurl { - name = "E-${s.version}.tar.gz"; - inherit (s) url sha256; + url = "http://wwwlehre.dhbw-stuttgart.de/~sschulz/WORK/E_DOWNLOAD/V_${version}/E.tgz"; + sha256 = "1vi977mdfqnj04m590aw4896nqzlc4c5rqadjzk86z1zvj7mqnqw"; }; buildInputs = [ which ]; preConfigure = '' - sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' \ - -e 's/^CC *= gcc$//' \ - -i Makefile.vars + sed -e 's/ *CC *= gcc$//' -i Makefile.vars + ''; + configureFlags = "--exec-prefix=$(out) --man-prefix=$(out)/share/man"; + + postInstall = '' + sed -e s,EXECPATH=.\*,EXECPATH=$out/bin, -i $out/bin/eproof{,_ram} ''; - buildPhase = "make install"; - - installPhase = '' - mkdir -p $out/bin - make install - echo eproof -xAuto --tstp-in --tstp-out '"$@"' > $out/bin/eproof-tptp - chmod a+x $out/bin/eproof-tptp - ''; - - meta = { - inherit (s) version; + meta = with stdenv.lib; { description = "Automated theorem prover for full first-order logic with equality"; homepage = http://www.eprover.org/; - license = stdenv.lib.licenses.gpl2; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin gebner ]; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/logic/eprover/default.upstream b/pkgs/applications/science/logic/eprover/default.upstream deleted file mode 100644 index f871d4985bb..00000000000 --- a/pkgs/applications/science/logic/eprover/default.upstream +++ /dev/null @@ -1,3 +0,0 @@ -url http://wwwlehre.dhbw-stuttgart.de/~sschulz/E/Download.html -version_link '[.]tgz$' -version '.*[/]V_([0-9.]+)[/].*' '\1' diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 3bc1441212e..e833b4afbbd 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -20,8 +20,6 @@ stdenv.mkDerivation rec { cd src ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - postInstall = '' wrapProgram $out/bin/linja --prefix PATH : $out/bin:${ninja}/bin ''; diff --git a/pkgs/applications/science/logic/matita/130312.nix b/pkgs/applications/science/logic/matita/130312.nix index 5117ba62e21..573b0ad7e4b 100644 --- a/pkgs/applications/science/logic/matita/130312.nix +++ b/pkgs/applications/science/logic/matita/130312.nix @@ -1,10 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, ocaml_mysql, ocamlnet, ulex08, camlzip, ocaml_pcre, automake, autoconf }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; version = "0.99.1pre130312"; pname = "matita"; - in stdenv.mkDerivation { diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index 0f393b419f1..5495f61bfd8 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -1,10 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, gdome2, ocaml_expat, gmetadom, ocaml_http, lablgtk, lablgtkmathview, ocaml_mysql, ocaml_sqlite3, ocamlnet, ulex08, camlzip, ocaml_pcre }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; version = "0.5.8"; pname = "matita"; - in stdenv.mkDerivation { diff --git a/pkgs/applications/science/logic/redprl/default.nix b/pkgs/applications/science/logic/redprl/default.nix new file mode 100644 index 00000000000..0cbe1d1cb37 --- /dev/null +++ b/pkgs/applications/science/logic/redprl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, mlton }: +stdenv.mkDerivation { + name = "redprl-2016-09-22"; + src = fetchgit { + url = "https://github.com/RedPRL/sml-redprl.git"; + rev = "3215faf0d494f4ac14d6e10172329a161df192c4"; + sha256 = "0pcq4q9xy34j7ziwbly4qxccpkcrl92r9y11bv6hdkbzwm1g2a77"; + fetchSubmodules = true; + }; + buildInputs = [ mlton ]; + patchPhase = '' + patchShebangs ./script/ + ''; + buildPhase = '' + ./script/mlton.sh + ''; + installPhase = '' + mkdir -p $out/bin + mv ./bin/redprl $out/bin + ''; + meta = { + description = "A proof assistant for Nominal Computational Type Theory"; + homepage = "http://www.redprl.org/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.acowley ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index d7c593b736e..ada586fc4e6 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, gtk, gdk_pixbuf, atk, pango, glib, cairo, freetype +{ stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: assert stdenv.isLinux; let libPath = stdenv.lib.makeLibraryPath - [ stdenv.cc.libc stdenv.cc.cc gtk gdk_pixbuf atk pango glib cairo + [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview ] + ":${stdenv.cc.cc.lib}/lib64"; diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index b9db4174c09..19f769e4365 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, groff, utillinux }: +{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, utillinux }: with stdenv.lib; let @@ -7,7 +7,6 @@ let BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \ USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \ TERMCONTROL=-DUSE_TERMIOS \ - NROFF=groff ''; in stdenv.mkDerivation rec { @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "14mnz6smhi3a0rgmwvddk9w3vdisi8khq67i8nqsl47vgs8n1kqg"; }; - buildInputs = [ makeWrapper readline ncurses groff utillinux ]; + buildInputs = [ makeWrapper readline ncurses utillinux ]; configurePhase = '' sed -i 's/all: check_include/all:/' Makefile diff --git a/pkgs/applications/science/math/ecm/default.nix b/pkgs/applications/science/math/ecm/default.nix index 53b289983a4..072d772775c 100644 --- a/pkgs/applications/science/math/ecm/default.nix +++ b/pkgs/applications/science/math/ecm/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl2Plus; homepage = http://ecm.gforge.inria.fr/; maintainers = [ stdenv.lib.maintainers.roconnor ]; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 2c09f572d12..eae4b0ceb62 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,9 +1,5 @@ { stdenv, fetchdarcs, ocaml, findlib, lablgl, camlimages, mesa, freeglut, ocaml_mysql, mysql, mlgmp, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - stdenv.mkDerivation { name = "glsurf-3.3"; @@ -27,5 +23,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; description = "A program to draw implicit surfaces and curves"; + broken = true; }; } diff --git a/pkgs/applications/science/math/pssp/default.nix b/pkgs/applications/science/math/pssp/default.nix index 6ced805b311..e74e17fa44f 100644 --- a/pkgs/applications/science/math/pssp/default.nix +++ b/pkgs/applications/science/math/pssp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk, gsl +{ stdenv, fetchurl, libxml2, readline, zlib, perl, cairo, gtk2, gsl , pkgconfig, gtksourceview, pango, gettext, libglade }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0vri2pzvmm38qaihfvwlry30f40lcnps4blg59ixic4q20ldxf5d"; }; - buildInputs = [ libxml2 readline zlib perl cairo gtk gsl pkgconfig + buildInputs = [ libxml2 readline zlib perl cairo gtk2 gsl pkgconfig gtksourceview pango gettext libglade ]; doCheck = false; diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index 8482bd6fe94..bb52b430f8c 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -3,7 +3,7 @@ , Xaw3d, withXaw3d ? false #, withPVMlib ? false , tcl, tk, withTk ? false -, gtk, withGtk ? false # working ? +, gtk2, withGtk ? false # working ? #, withF2c ? false , ocaml, withOCaml ? false #, withJava ? false @@ -16,12 +16,11 @@ stdenv.mkDerivation rec { name = "scilab-${version}"; src = fetchurl { url = "http://www.scilab.org/download/${version}/${name}-src.tar.gz"; - # md5 coming from http://www.scilab.org/download/index_download.php - md5 = "17a7a6aa52918f33d96777a0dc423658"; + sha256 = "1adk6jqlj7i3gjklvlf1j3il1nb22axnp4rvwl314an62siih0sc"; }; buildInputs = [gfortran ncurses] - ++ lib.optionals withGtk [gtk] + ++ lib.optionals withGtk [gtk2] ++ lib.optionals withOCaml [ocaml] ++ lib.optional withX xlibsWrapper ; @@ -68,5 +67,6 @@ stdenv.mkDerivation rec { description = "Scientific software package for numerical computations (Matlab lookalike)"; # see http://www.scilab.org/legal license = "SciLab"; + broken = true; }; } diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index d45f4a2b210..53ea9ce7212 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,6 +1,6 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, -sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: +sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: stdenv.mkDerivation rec { version = "7.4.42"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi - freeglut libjpeg wxGTK sqlite gtk libXScrnSaver libnotify patchelf libX11 + freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11 libxcb xcbutil ]; diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index fd39f61c863..8d673a15fa8 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkit, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, -doxygen, boost, openscenegraph, gnome, pangox_compat, xorg, git, bash, gtk, makeWrapper }: +doxygen, boost, openscenegraph, gnome2, pangox_compat, xorg, git, bash, gtk2, makeWrapper }: let @@ -17,8 +17,8 @@ stdenv.mkDerivation { buildInputs = [autoconf cmake automake libtool gfortran clang gnumake hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkit which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison - doxygen boost openscenegraph gnome.gtkglext pangox_compat xorg.libXmu - git gtk makeWrapper]; + doxygen boost openscenegraph gnome2.gtkglext pangox_compat xorg.libXmu + git gtk2 makeWrapper]; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 10c777d8601..808af776e28 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, cmake, pkgconfig, python -, libX11, libXpm, libXft, libXext, zlib, lzma, gsl }: +{ stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python +, libX11, libXpm, libXft, libXext, zlib, lzma, gsl, Cocoa }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -10,13 +10,17 @@ stdenv.mkDerivation rec { sha256 = "00f3v3l8nimfkcxpn9qpyh3h23na0mi4wkds2y5gwqh8wh3jryq9"; }; - buildInputs = [ cmake pkgconfig python libX11 libXpm libXft libXext zlib lzma gsl ]; + buildInputs = [ cmake pcre pkgconfig python zlib lzma gsl ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext ] + ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa ] + ; patches = [ (fetchpatch { url = "https://github.com/root-mirror/root/commit/ee9964210c56e7c1868618a4434c5340fef38fe4.patch"; sha256 = "186i7ni75yvjydy6lpmaplqxfb5z2019bgpbhff1n6zn2qlrff2r"; }) + ./sw_vers.patch ]; preConfigure = '' @@ -27,14 +31,43 @@ stdenv.mkDerivation rec { "-Drpath=ON" "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-Dalien=OFF" + "-Dbonjour=OFF" + "-Dcastor=OFF" + "-Dchirp=OFF" + "-Ddavix=OFF" + "-Ddcache=OFF" + "-Dfftw3=OFF" + "-Dfitsio=OFF" + "-Dfortran=OFF" + "-Dgfal=OFF" + "-Dgviz=OFF" + "-Dhdfs=OFF" + "-Dkrb5=OFF" + "-Dldap=OFF" + "-Dmonalisa=OFF" + "-Dmysql=OFF" + "-Dodbc=OFF" + "-Dopengl=OFF" + "-Doracle=OFF" + "-Dpgsql=OFF" + "-Dpythia6=OFF" + "-Dpythia8=OFF" + "-Drfio=OFF" + "-Dsqlite=OFF" + "-Dssl=OFF" + "-Dxml=OFF" + "-Dxrootd=OFF" ] ++ stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.lib.getDev stdenv.cc.libc}/include"; enableParallelBuilding = true; + setupHook = ./setup-hook.sh; + meta = { homepage = "https://root.cern.ch/"; description = "A data analysis framework"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/science/misc/root/setup-hook.sh b/pkgs/applications/science/misc/root/setup-hook.sh new file mode 100644 index 00000000000..197dc78c3c2 --- /dev/null +++ b/pkgs/applications/science/misc/root/setup-hook.sh @@ -0,0 +1,9 @@ +thisroot () { + # Workaround thisroot.sh dependency on man + if [ -z "${MANPATH}" ]; then + MANPATH=: + fi + source @out@/bin/thisroot.sh +} + +envHooks+=(thisroot) diff --git a/pkgs/applications/science/misc/root/sw_vers.patch b/pkgs/applications/science/misc/root/sw_vers.patch new file mode 100644 index 00000000000..3de2b839bf4 --- /dev/null +++ b/pkgs/applications/science/misc/root/sw_vers.patch @@ -0,0 +1,90 @@ +diff --git a/build/unix/compiledata.sh b/build/unix/compiledata.sh +--- a/build/unix/compiledata.sh ++++ b/build/unix/compiledata.sh +@@ -49,7 +49,7 @@ fi + + if [ "$ARCH" = "macosx" ] || [ "$ARCH" = "macosx64" ] || \ + [ "$ARCH" = "macosxicc" ]; then +- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` ++ macosx_minor=7 + SOEXT="so" + if [ $macosx_minor -ge 5 ]; then + if [ "x`echo $SOFLAGS | grep -- '-install_name'`" != "x" ]; then +diff --git a/cmake/modules/SetUpMacOS.cmake b/cmake/modules/SetUpMacOS.cmake +--- a/cmake/modules/SetUpMacOS.cmake ++++ b/cmake/modules/SetUpMacOS.cmake +@@ -12,25 +12,11 @@ set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} /usr/X11R6) + #--------------------------------------------------------------------------------------------------------- + + if (CMAKE_SYSTEM_NAME MATCHES Darwin) +- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" +- COMMAND cut -d . -f 1-2 +- OUTPUT_VARIABLE MACOSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE) +- MESSAGE(STATUS "Found a Mac OS X System ${MACOSX_VERSION}") +- EXECUTE_PROCESS(COMMAND sw_vers "-productVersion" +- COMMAND cut -d . -f 2 +- OUTPUT_VARIABLE MACOSX_MINOR OUTPUT_STRIP_TRAILING_WHITESPACE) +- +- if(MACOSX_VERSION VERSION_GREATER 10.7 AND ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang) + set(libcxx ON CACHE BOOL "Build using libc++" FORCE) +- endif() + +- if(${MACOSX_MINOR} GREATER 4) + #TODO: check haveconfig and rpath -> set rpath true + #TODO: check Thread, define link command + #TODO: more stuff check configure script +- execute_process(COMMAND /usr/sbin/sysctl machdep.cpu.extfeatures OUTPUT_VARIABLE SYSCTL_OUTPUT) +- if(${SYSCTL_OUTPUT} MATCHES 64) +- MESSAGE(STATUS "Found a 64bit system") + set(ROOT_ARCHITECTURE macosx64) + SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}") + SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "${CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS} -m64") +@@ -38,27 +24,6 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m64") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64") + SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m64") +- else(${SYSCTL_OUTPUT} MATCHES 64) +- MESSAGE(STATUS "Found a 32bit system") +- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32") +- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32") +- SET(CMAKE_FORTRAN_FLAGS "${CMAKE_FORTRAN_FLAGS} -m32") +- endif(${SYSCTL_OUTPUT} MATCHES 64) +- endif() +- +- if(MACOSX_VERSION VERSION_GREATER 10.6) +- set(MACOSX_SSL_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.7) +- set(MACOSX_ODBC_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.8) +- set(MACOSX_GLU_DEPRECATED ON) +- set(MACOSX_KRB5_DEPRECATED ON) +- endif() +- if(MACOSX_VERSION VERSION_GREATER 10.9) +- set(MACOSX_LDAP_DEPRECATED ON) +- endif() + + if (CMAKE_COMPILER_IS_GNUCXX) + message(STATUS "Found GNU compiler collection") +@@ -135,7 +100,7 @@ if (CMAKE_SYSTEM_NAME MATCHES Darwin) + endif() + + #---Set Linker flags---------------------------------------------------------------------- +- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -mmacosx-version-min=${MACOSX_VERSION} -Wl,-rpath,@loader_path/../lib") ++ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath,@loader_path/../lib") + + + else (CMAKE_SYSTEM_NAME MATCHES Darwin) +diff --git a/config/root-config.in b/config/root-config.in +--- a/config/root-config.in ++++ b/config/root-config.in +@@ -304,7 +304,7 @@ macosxicc) + ;; + macosx64) + # MacOS X with gcc (GNU cc v4.x) in 64 bit mode +- macosx_minor=`sw_vers | sed -n 's/ProductVersion://p' | cut -d . -f 2` ++ macosx_minor=7 + # cannot find the one linked to libGraf if relocated after built + if [ $macosx_minor -le 4 ]; then + rootlibs="$rootlibs -lfreetype" diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index da6e0cb2805..9b8035fcefe 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,16 +1,16 @@ { fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 -, cmake, makeWrapper, libjpeg }: +, cmake, makeWrapper, libjpeg, python }: -let version = "4.1.0"; in +let version = "4.9.0"; in stdenv.mkDerivation rec { name = "tulip-${version}"; src = fetchurl { url = "mirror://sourceforge/auber/${name}_src.tar.gz"; - sha256 = "1js1f8xdm9g2m66xbhfxa8ixzw6h4gjynxsm83p54l3i0hs3biig"; + sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; }; - buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg ]; + buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index 1b71e45eb82..e8b3bcb16a2 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -31,7 +31,9 @@ stdenv.mkDerivation rec { }; enableParallelBuilding = true; # gazebo needs this so bad - cmakeFlags = [] + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR:PATH=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" ] ++ optional withQuickBuild [ "-DENABLE_TESTS_COMPILATION=False" ] ++ optional withLowMemorySupport [ "-DUSE_LOW_MEMORY_TESTS=True" ] ++ optional withHeadless [ "-DENABLE_SCREEN_TESTS=False" ]; diff --git a/pkgs/applications/version-management/bazaar/default.nix b/pkgs/applications/version-management/bazaar/default.nix index 29dee3f03c5..689daef45ef 100644 --- a/pkgs/applications/version-management/bazaar/default.nix +++ b/pkgs/applications/version-management/bazaar/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pythonPackages }: -stdenv.mkDerivation rec { +pythonPackages.buildPythonApplication rec { version = "2.7"; release = ".0"; name = "bazaar-${version}${release}"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1cysix5k3wa6y7jjck3ckq3abls4gvz570s0v0hxv805nwki4i8d"; }; - buildInputs = [ pythonPackages.python pythonPackages.wrapPython ]; - # Readline support is needed by bzrtools. - pythonPath = [ pythonPackages.readline ]; + propagatedBuildInputs = [ pythonPackages.python.modules.readline ]; + + doCheck = false; # Bazaar can't find the certificates alone patches = [ ./add_certificates.patch ]; @@ -22,11 +22,6 @@ stdenv.mkDerivation rec { --subst-var-by certPath /etc/ssl/certs/ca-certificates.crt ''; - installPhase = '' - python setup.py install --prefix=$out - wrapPythonPrograms - ''; - meta = { homepage = http://bazaar-vcs.org/; description = "A distributed version control system that Just Works"; diff --git a/pkgs/applications/version-management/diffuse/default.nix b/pkgs/applications/version-management/diffuse/default.nix index 2bd4b584724..fa6d4fe1890 100644 --- a/pkgs/applications/version-management/diffuse/default.nix +++ b/pkgs/applications/version-management/diffuse/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, python, pygtk, makeWrapper }: +{ stdenv, fetchurl, python27Packages, makeWrapper }: -stdenv.mkDerivation rec { +let + inherit (python27Packages) pygtk python; +in stdenv.mkDerivation rec { version = "0.4.8"; name = "diffuse-${version}"; diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 4ede1b352ea..9f1d8e9d717 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json deleted file mode 100644 index 914655e2813..00000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/pquerna/ffjson", - "fetch": { - "type": "git", - "url": "https://github.com/pquerna/ffjson", - "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5", - "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a" - } - }, - { - "goPackagePath": "gopkg.in/kothar/go-backblaze.v0", - "fetch": { - "type": "git", - "url": "https://gopkg.in/kothar/go-backblaze.v0", - "rev": "373819725fc560fa962c6cd883b533d2ebec4844", - "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx" - } - } -] diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix new file mode 100644 index 00000000000..479b3e7d637 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/pquerna/ffjson"; + fetch = { + type = "git"; + url = "https://github.com/pquerna/ffjson"; + rev = "674bc015b5b3f50f9bb2561179778586b9af68c5"; + sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"; + }; + } + { + goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/kothar/go-backblaze.v0"; + rev = "373819725fc560fa962c6cd883b533d2ebec4844"; + sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"; + }; + } +] diff --git a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix index fbe509675a1..517602bb633 100644 --- a/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-crypt/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; version = "0.5.0"; maintainers = [ maintainers.dochang ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index ba53994d44c..f8ac8c385e6 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "git-extras-${version}"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { url = "https://github.com/tj/git-extras/archive/${version}.tar.gz"; - sha256 = "d4c028e2fe78abde8f3e640b70f431318fb28d82894dde22772efe8ba3563f85"; + sha256 = "0pr2vf5rajkwjm45zvnwkc13kvk3kyr18axxvmm8drsqdkr8lrjk"; }; phases = [ "unpackPhase" "installPhase" ]; 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 9cbc596bbb1..d80b48a8577 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ }: let - version = "2.10.0"; + version = "2.10.1"; svn = subversionClient.override { perlBindings = true; }; in @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "1rr9zyafb6q3wixyjar6cc7z7vdh1dqa4b5irz3gz1df02n68cy7"; + sha256 = "1ijd1b6szvfw0dmqa3dz1m5g5hbkl9xkb86a9qcjrz0w0vwjvhx9"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix index 3fe7dec8f3b..ff7c652c622 100644 --- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "gitflow"; - version = "1.9.1"; + version = "1.10.0"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "petervanderdoes"; repo = pname; rev = version; - sha256 = "0ad2421r3iq4xrdy46f4rrqbm8r3xphqcsdj3gqy8fnlrmxw5dfw"; + sha256 = "1l67yizbcmgkhz8qn1zam2p04y8ha9b2gb2d89rff9y528b2m5z6"; }; preBuild = '' diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index ff21271956b..98999e93db7 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "hub-${version}"; - version = "2.2.5"; + version = "2.2.8"; src = fetchgit { url = https://github.com/github/hub.git; rev = "refs/tags/v${version}"; - sha256 = "13pab3r2ngac2kljy9jb4lz3g3d6smkwydlx23ydjvyjbg2zb75r"; + sha256 = "1fv4jb9vsbkscnb79gss2mwnd1yf9jhgzw1mhimhx25xizbx1fck"; }; @@ -30,9 +30,8 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/zsh/site-functions" cp "etc/hub.zsh_completion" "$out/share/zsh/site-functions/_hub" -# Broken: https://github.com/github/hub/issues/592 -# mkdir -p "$out/etc/bash_completion.d" -# cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/" + mkdir -p "$out/etc/bash_completion.d" + cp "etc/hub.bash_completion.sh" "$out/etc/bash_completion.d/" # Should we also install provided git-hooks? # ? diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix index 56d8b334e8e..664f4d5147b 100644 --- a/pkgs/applications/version-management/gitinspector/default.nix +++ b/pkgs/applications/version-management/gitinspector/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchzip, buildPythonApplication }: +{ stdenv, fetchzip, pythonPackages}: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "gitinspector-${version}"; version = "0.4.4"; namePrefix = ""; diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix index b322709bde6..863faa16eaf 100644 --- a/pkgs/applications/version-management/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -1,14 +1,14 @@ { stdenv, ruby, bundler, fetchFromGitLab }: stdenv.mkDerivation rec { - version = "3.4.0"; + version = "3.6.0"; name = "gitlab-shell-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-shell"; rev = "v${version}"; - sha256 = "1vhwsiz6n96i6cbcqbf4pa93nzx4xkaph2lmzh0nm4mi5ydl49is"; + sha256 = "1cc8lnz06d1q2hdrgnsqk50wj0x950w81jsalfjxmx5lais4qgg9"; }; buildInputs = [ @@ -56,7 +56,10 @@ stdenv.mkDerivation rec { " *args)" ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + homepage = http://www.gitlab.com/; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; + license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix index b86bf2c40d3..6fe65bb50ab 100644 --- a/pkgs/applications/version-management/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitLab, git, go }: stdenv.mkDerivation rec { - version = "0.7.11"; + version = "0.8.2"; name = "gitlab-workhorse-${version}"; srcs = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1z32nf9qbw050wzl1dsydrs68c9fp5kkvdn58z2g88bbyk6gyivm"; + sha256 = "03y7f9x88sa8gxqaglriwn2793dn3i8dx4qhaarnm0gyrfl3rjag"; }; buildInputs = [ git go ]; @@ -24,7 +24,10 @@ stdenv.mkDerivation rec { make install PREFIX=$out ''; - meta = { - platforms = stdenv.lib.platforms.unix; + meta = with stdenv.lib; { + homepage = http://www.gitlab.com/; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; + license = licenses.mit; }; } diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile index 60aaf99cbd9..eb19a29ef0c 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile +++ b/pkgs/applications/version-management/gitlab/Gemfile @@ -26,7 +26,7 @@ gem 'omniauth-auth0', '~> 1.4.1' gem 'omniauth-azure-oauth2', '~> 0.0.6' gem 'omniauth-bitbucket', '~> 0.0.2' gem 'omniauth-cas3', '~> 1.1.2' -gem 'omniauth-facebook', '~> 3.0.0' +gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' @@ -53,7 +53,7 @@ gem 'browser', '~> 2.2' # Extracting information from a git repository # Provide access to Gitlab::Git library -gem 'gitlab_git', '~> 10.4.7' +gem 'gitlab_git', '~> 10.6.6' # LDAP Auth # GitLab fork with several improvements to original library. For full list of changes @@ -97,9 +97,6 @@ gem 'fog-rackspace', '~> 0.1.1' # for aws storage gem 'unf', '~> 0.1.4' -# Authorization -gem 'six', '~> 0.2.0' - # Seed data gem 'seed-fu', '~> 2.3.5' @@ -209,6 +206,9 @@ gem 'mousetrap-rails', '~> 1.4.6' # Detect and convert string character encoding gem 'charlock_holmes', '~> 0.7.3' +# Faster JSON +gem 'oj', '~> 2.17.4' + # Parse time & duration gem 'chronic', '~> 0.10.2' gem 'chronic_duration', '~> 0.10.6' @@ -298,9 +298,10 @@ group :development, :test do gem 'spring-commands-spinach', '~> 1.1.0' gem 'spring-commands-teaspoon', '~> 0.0.2' - gem 'rubocop', '~> 0.41.2', require: false + gem 'rubocop', '~> 0.42.0', require: false gem 'rubocop-rspec', '~> 1.5.0', require: false gem 'scss_lint', '~> 0.47.0', require: false + gem 'haml_lint', '~> 0.18.2', require: false gem 'simplecov', '0.12.0', require: false gem 'flog', '~> 4.3.2', require: false gem 'flay', '~> 2.6.1', require: false @@ -319,6 +320,7 @@ group :test do gem 'webmock', '~> 1.21.0' gem 'test_after_commit', '~> 0.4.2' gem 'sham_rack', '~> 1.3.6' + gem 'timecop', '~> 0.8.0' end group :production do @@ -349,7 +351,7 @@ gem 'paranoia', '~> 2.0' gem 'health_check', '~> 2.1.0' # System information -gem 'vmstat', '~> 2.1.1' +gem 'vmstat', '~> 2.2' gem 'sys-filesystem', '~> 1.1.6' gem "activerecord-nulldb-adapter" diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock index 38d357e42fe..468000e4d87 100644 --- a/pkgs/applications/version-management/gitlab/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -191,7 +191,7 @@ GEM erubis (2.7.0) escape_utils (1.1.1) eventmachine (1.0.8) - excon (0.49.0) + excon (0.52.0) execjs (2.6.0) expression_parser (0.9.0) factory_girl (4.5.0) @@ -217,8 +217,8 @@ GEM flowdock (0.7.1) httparty (~> 0.7) multi_json - fog-aws (0.9.2) - fog-core (~> 1.27) + fog-aws (0.11.0) + fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) @@ -227,7 +227,7 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-core (1.40.0) + fog-core (1.42.0) builder excon (~> 0.49) formatador (~> 0.2) @@ -281,7 +281,7 @@ GEM diff-lcs (~> 1.1) mime-types (>= 1.16, < 3) posix-spawn (~> 0.3) - gitlab_git (10.4.7) + gitlab_git (10.6.6) activesupport (~> 4.0) charlock_holmes (~> 0.7.3) github-linguist (~> 4.7.0) @@ -324,11 +324,18 @@ GEM grape-entity (0.4.8) activesupport multi_json (>= 1.3.2) + haml (4.0.7) + tilt + haml_lint (0.18.2) + haml (~> 4.0) + rake (>= 10, < 12) + rubocop (>= 0.36.0) + sysexits (~> 1.1) hamlit (2.6.1) temple (~> 0.7.6) thor tilt - hashie (3.4.3) + hashie (3.4.4) health_check (2.1.0) rails (>= 4.0) hipchat (1.5.2) @@ -396,9 +403,9 @@ GEM mime-types (>= 1.16, < 4) mail_room (0.8.0) method_source (0.8.2) - mime-types (2.99.2) + mime-types (2.99.3) mimemagic (0.3.0) - mini_portile2 (2.0.0) + mini_portile2 (2.1.0) minitest (5.7.0) mousetrap-rails (1.4.6) multi_json (1.12.1) @@ -410,7 +417,7 @@ GEM net-ssh (3.0.1) newrelic_rpm (3.16.0.318) nokogiri (1.6.7.2) - mini_portile2 (~> 2.0.0.rc2) + mini_portile2 (~> 2.1.0) pkg-config (~> 1.1.7) numerizer (0.1.1) oauth (0.4.7) @@ -422,6 +429,7 @@ GEM rack (>= 1.2, < 3) octokit (4.3.0) sawyer (~> 0.7.0, >= 0.5.3) + oj (2.17.4) omniauth (1.3.1) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) @@ -439,7 +447,7 @@ GEM addressable (~> 2.3) nokogiri (~> 1.6.6) omniauth (~> 1.2) - omniauth-facebook (3.0.0) + omniauth-facebook (4.0.0) omniauth-oauth2 (~> 1.2) omniauth-github (1.1.2) omniauth (~> 1.0) @@ -586,7 +594,7 @@ GEM railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) - rouge (2.0.5) + rouge (2.0.6) rqrcode (0.7.0) chunky_png rqrcode-rails3 (0.1.7) @@ -614,7 +622,7 @@ GEM rspec-retry (0.4.5) rspec-core rspec-support (3.5.0) - rubocop (0.41.2) + rubocop (0.42.0) parser (>= 2.3.1.1, < 3.0) powerpack (~> 0.1) rainbow (>= 1.99.1, < 3.0) @@ -685,7 +693,6 @@ GEM rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) - six (0.2.0) slack-notifier (1.2.1) slop (3.6.0) spinach (0.8.10) @@ -726,6 +733,7 @@ GEM stringex (2.5.2) sys-filesystem (1.1.6) ffi + sysexits (1.2.0) systemu (2.6.5) task_list (1.0.2) html-pipeline @@ -757,7 +765,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.2) - unicode-display_width (1.1.0) + unicode-display_width (1.1.1) unicorn (4.9.0) kgio (~> 2.6) rack @@ -774,7 +782,7 @@ GEM coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - vmstat (2.1.1) + vmstat (2.2.0) warden (1.2.6) rack (>= 1.0) web-console (2.3.0) @@ -862,7 +870,7 @@ DEPENDENCIES github-linguist (~> 4.7.0) github-markup (~> 1.4) gitlab-flowdock-git-hook (~> 1.0.1) - gitlab_git (~> 10.4.7) + gitlab_git (~> 10.6.6) gitlab_meta (= 7.0) gitlab_omniauth-ldap (~> 1.2.1) gollum-lib (~> 4.2) @@ -870,6 +878,7 @@ DEPENDENCIES gon (~> 6.1.0) grape (~> 0.15.0) grape-entity (~> 0.4.2) + haml_lint (~> 0.18.2) hamlit (~> 2.6.1) health_check (~> 2.1.0) hipchat (~> 1.5.0) @@ -899,12 +908,13 @@ DEPENDENCIES nokogiri (~> 1.6.7, >= 1.6.7.2) oauth2 (~> 1.2.0) octokit (~> 4.3.0) + oj (~> 2.17.4) omniauth (~> 1.3.1) omniauth-auth0 (~> 1.4.1) omniauth-azure-oauth2 (~> 0.0.6) omniauth-bitbucket (~> 0.0.2) omniauth-cas3 (~> 1.1.2) - omniauth-facebook (~> 3.0.0) + omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.0) omniauth-google-oauth2 (~> 0.4.1) @@ -939,7 +949,7 @@ DEPENDENCIES rqrcode-rails3 (~> 0.1.7) rspec-rails (~> 3.5.0) rspec-retry (~> 0.4.5) - rubocop (~> 0.41.2) + rubocop (~> 0.42.0) rubocop-rspec (~> 1.5.0) ruby-fogbugz (~> 0.2.1) ruby-prof (~> 0.15.9) @@ -957,7 +967,6 @@ DEPENDENCIES sidekiq-cron (~> 0.4.0) simplecov (= 0.12.0) sinatra (~> 1.4.4) - six (~> 0.2.0) slack-notifier (~> 1.2.0) spinach-rails (~> 0.2.1) spinach-rerun-reporter (~> 0.0.2) @@ -974,6 +983,7 @@ DEPENDENCIES teaspoon-jasmine (~> 2.2.0) test_after_commit (~> 0.4.2) thin (~> 1.7.0) + timecop (~> 0.8.0) turbolinks (~> 2.5.0) u2f (~> 0.2.1) uglifier (~> 2.7.2) @@ -983,7 +993,7 @@ DEPENDENCIES unicorn-worker-killer (~> 0.4.2) version_sorter (~> 2.1.0) virtus (~> 1.0.1) - vmstat (~> 2.1.1) + vmstat (~> 2.2) web-console (~> 2.0) webmock (~> 1.21.0) wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix index b97a9475c8e..c5b151174e0 100644 --- a/pkgs/applications/version-management/gitlab/default.nix +++ b/pkgs/applications/version-management/gitlab/default.nix @@ -15,7 +15,7 @@ let meta = with lib; { homepage = http://www.gitlab.com/; platforms = platforms.linux; - maintainers = [ ]; + maintainers = with maintainers; [ fpletz ]; license = licenses.mit; }; }; @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { name = "gitlab-${version}"; - version = "8.11.2"; + version = "8.12.1"; buildInputs = [ env ruby bundler tzdata git nodejs procps ]; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "gitlabhq"; repo = "gitlabhq"; rev = "v${version}"; - sha256 = "1id6jsf4mshxis07dqlkgdyqi1v415rp4lx9ix8sjfznchria58b"; + sha256 = "1aq91q89g3xb28v833748y9ywy9d6551zn3hb22cqphjijkn3wgl"; }; patches = [ diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix index 0ea8aa4d621..2525e924be4 100644 --- a/pkgs/applications/version-management/gitlab/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gemset.nix @@ -674,10 +674,10 @@ excon = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0jmdgc4lhlbxccpg79a32vn3qngqipcaaq8bxa0ivfw5mvz0zc0z"; + sha256 = "0aq0mzk95m944ccq4x5bzxb02qbzywc3rzjl5dxhrcaw32hqdjp0"; type = "gem"; }; - version = "0.49.0"; + version = "0.52.0"; }; execjs = { source = { @@ -784,10 +784,10 @@ fog-aws = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0imhhxrw8m031lc912bnlqzgac41sjsip1fa8v845ldmn56kn9zg"; + sha256 = "1zvcsgskxmlhb31wjcbkfi6m8b91y80kcwk61byybld9xl431mwf"; type = "gem"; }; - version = "0.9.2"; + version = "0.11.0"; }; fog-azure = { source = { @@ -800,10 +800,10 @@ fog-core = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1flkprsdm1qr38bzd80wxpkbcwm5zshivbg2k8pjls9i6jh6a0z7"; + sha256 = "0jx4ynsc0b78601xypaamv6j5kw33n6ymqs3iz2fmhdw0k44lnwv"; type = "gem"; }; - version = "1.40.0"; + version = "1.42.0"; }; fog-google = { source = { @@ -958,10 +958,10 @@ gitlab_git = { source = { remotes = ["https://rubygems.org"]; - sha256 = "0xcn55jwc3g53mcj1fjr6qfjcj0awba9lwgd1720d2hkpfiglsai"; + sha256 = "1vg2k3nlws6ghbs80zy3v8yclsx61x36f17r0k8vwv1xwvfhyhgz"; type = "gem"; }; - version = "10.4.7"; + version = "10.6.6"; }; gitlab_meta = { source = { @@ -1037,6 +1037,22 @@ }; version = "0.4.8"; }; + haml = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p"; + type = "gem"; + }; + version = "4.0.7"; + }; + haml_lint = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0shja16n76lw74c3dylml98lbmlcq9i1933davymayfplmyr52wi"; + type = "gem"; + }; + version = "0.18.2"; + }; hamlit = { source = { remotes = ["https://rubygems.org"]; @@ -1048,10 +1064,10 @@ hashie = { source = { remotes = ["https://rubygems.org"]; - sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899"; + sha256 = "1qlqcmrl696f1gg209zcyr81l9c5ynzfwlzl44a081q1fckrdmlx"; type = "gem"; }; - version = "3.4.3"; + version = "3.4.4"; }; health_check = { source = { @@ -1314,10 +1330,10 @@ mime-types = { source = { remotes = ["https://rubygems.org"]; - sha256 = "06lnv0w9j45llai5qhvc1m7w409j5lhnssdzkvv6yw49d632jxkz"; + sha256 = "03j98xr0qw2p2jkclpmk7pm29yvmmh0073d8d43ajmr0h3w7i5l9"; type = "gem"; }; - version = "2.99.2"; + version = "2.99.3"; }; mimemagic = { source = { @@ -1330,10 +1346,10 @@ mini_portile2 = { source = { remotes = ["https://rubygems.org"]; - sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l"; + sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; minitest = { source = { @@ -1455,6 +1471,14 @@ }; version = "4.3.0"; }; + oj = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1krdgjl0agvcxb0bgmdk8zv7ysms8xmx7py7564v69csdkbwd4a5"; + type = "gem"; + }; + version = "2.17.4"; + }; omniauth = { source = { remotes = ["https://rubygems.org"]; @@ -1499,13 +1523,12 @@ version = "1.1.3"; }; omniauth-facebook = { - dependencies = ["omniauth-oauth2"]; source = { remotes = ["https://rubygems.org"]; - sha256 = "0plj56sna4b6c71k03jsng6gq3r5yxhj7h26ndahc9caasgk869c"; + sha256 = "03zjla9i446fk1jkw7arh67c39jfhp5bhkmhvbw8vczxr1jkbbh5"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; omniauth-github = { dependencies = ["omniauth" "omniauth-oauth2"]; @@ -2022,10 +2045,10 @@ rouge = { source = { remotes = ["https://rubygems.org"]; - sha256 = "07nda5cfrxxizcd4ff7ad8z3i0j9jaff8q7q6ddpxcj0s80nvvpi"; + sha256 = "182hp2fh6gd3p5c862i36k6jxkc02mhi08qd94gsyfj3v34ngza0"; type = "gem"; }; - version = "2.0.5"; + version = "2.0.6"; }; rqrcode = { dependencies = ["chunky_png"]; @@ -2104,10 +2127,10 @@ rubocop = { source = { remotes = ["https://rubygems.org"]; - sha256 = "02adr908a9l8nhdfjz137i20w1dv8mbfiamy0m9z9q0fvslfdxly"; + sha256 = "064rh2fhr05mjgsmi1viljn9arcm2ggfaxkpk92ns9kf3ym7dz8v"; type = "gem"; }; - version = "0.41.2"; + version = "0.42.0"; }; rubocop-rspec = { source = { @@ -2356,14 +2379,6 @@ }; version = "1.4.7"; }; - six = { - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1bhapiyjh5r5qjpclfw8i65plvy6k2q4azr5xir63xqglr53viw3"; - type = "gem"; - }; - version = "0.2.0"; - }; slack-notifier = { source = { remotes = ["https://rubygems.org"]; @@ -2504,6 +2519,14 @@ }; version = "1.1.6"; }; + sysexits = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qjng6pllznmprzx8vb0zg0c86hdrkyjs615q41s9fjpmv2430jr"; + type = "gem"; + }; + version = "1.2.0"; + }; systemu = { source = { remotes = ["https://rubygems.org"]; @@ -2666,10 +2689,10 @@ unicode-display_width = { source = { remotes = ["https://rubygems.org"]; - sha256 = "194d70pfxq4d7rrk0vsk1dvj46ns2f350308khi7q5cvnmg3h1xs"; + sha256 = "1b1mb3sj7azfvv166q6rqr0y634wsikiimm17xzn0304lcrw2fiz"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.1"; }; unicorn = { source = { @@ -2725,10 +2748,10 @@ vmstat = { source = { remotes = ["https://rubygems.org"]; - sha256 = "02yf9y7050zk1k7mn7dkp81wwa220kpkpdnlv4bg5mp65w33g5jf"; + sha256 = "10hlfam5gvxjvr5p1f4f81wlv5k81mrlg556rc9525290bcz31f0"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.0"; }; warden = { source = { diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch index a8a0542a882..dec0f752fb7 100644 --- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -37,7 +37,7 @@ index 1470a6e..1b2660d 100644 # Given in number of bytes per git object (e.g. a commit) # This value can be increased if you have very large commits diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb -index 86f5521..3bf006b 100644 +index 195108b..e55b11d 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -192,7 +192,7 @@ Settings.gitlab['user'] ||= 'git' @@ -49,7 +49,7 @@ index 86f5521..3bf006b 100644 end Settings.gitlab['time_zone'] ||= nil Settings.gitlab['signup_enabled'] ||= true if Settings.gitlab['signup_enabled'].nil? -@@ -350,7 +350,7 @@ Settings.backup['upload']['encryption'] ||= nil +@@ -362,7 +362,7 @@ Settings.backup['upload']['encryption'] ||= nil # Settings['git'] ||= Settingslogic.new({}) Settings.git['max_size'] ||= 20971520 # 20.megabytes @@ -100,7 +100,7 @@ index be8fcc7..7642d74 100644 end end diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake -index 60f4636..157641f 100644 +index 5f4a6bb..01b4cfd 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -223,7 +223,7 @@ namespace :gitlab do diff --git a/pkgs/applications/version-management/kdesvn/default.nix b/pkgs/applications/version-management/kdesvn/default.nix index a3301d8acff..d4c67776b52 100644 --- a/pkgs/applications/version-management/kdesvn/default.nix +++ b/pkgs/applications/version-management/kdesvn/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { name = "kdesvn-1.6.0"; src = fetchurl rec { - url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/${md5}/${name}.tar.bz2"; - md5 = "7e6adc98ff4777a06d5752d3f2b58fa3"; + url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/7e6adc98ff4777a06d5752d3f2b58fa3/${name}.tar.bz2"; + sha256 = "15hg6xyx5rqldfhi1yhq5ss15y6crm2is3zqm680z0bndcj6ys05"; }; prePatch = '' diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index d3f5f39dde0..290d27b3736 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pythonPackages, makeWrapper, docutils, unzip +{ stdenv, fetchurl, python2Packages, makeWrapper, docutils, unzip , guiSupport ? false, tk ? null , ApplicationServices, cf-private }: let # if you bump version, update pkgs.tortoisehg too or ping maintainer - version = "3.8.2"; + version = "3.9.1"; name = "mercurial-${version}"; - inherit (pythonPackages) curses docutils hg-git dulwich python; + inherit (python2Packages) curses docutils hg-git dulwich python; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://mercurial-scm.org/release/${name}.tar.gz"; - sha256 = "1zdz42znd6i7c3nf31j0k6frcs68qyniyvcad8k2a1hlarlv2y6b"; + sha256 = "0x6zjl8za6nnlbmyxng4pfrr2h77zi3wbg985262ghjyx33lypk2"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix index 66dd63956d6..4f1f28a7aac 100644 --- a/pkgs/applications/version-management/pijul/default.nix +++ b/pkgs/applications/version-management/pijul/default.nix @@ -31,7 +31,7 @@ buildRustPackage rec { homepage = https://pijul.org/; description = "Fast DVCS based on a categorical theory of patches"; license = licenses.gpl3; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.x86_64; # i686 builds fail due to lmdb maintainers = with maintainers; [ puffnfresh ]; }; } diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 212151b6c4a..01929655081 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -11,7 +11,7 @@ python2Packages.buildPythonApplication rec { sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; }; - pythonPath = with python2Packages; [ configobj dbus-python pygobject pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; + pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; prePatch = '' sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 0cb498fec06..f2786b15f34 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -67,5 +67,8 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = [ maintainers.garbas ]; license = licenses.gpl2; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix index 51d70156e9c..b4b0e74a79c 100644 --- a/pkgs/applications/version-management/smartgithg/default.nix +++ b/pkgs/applications/version-management/smartgithg/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, lib, makeWrapper , jre -, gtk, glib +, gtk2, glib , libXtst , git, mercurial, subversion , which @@ -8,17 +8,16 @@ stdenv.mkDerivation rec { name = "smartgithg-${version}"; - version = "7_1_2"; + version = "8_0_3"; src = fetchurl { url = "http://www.syntevo.com/static/smart/download/smartgit/smartgit-linux-${version}.tar.gz"; - sha256 = "18jw4g2akhj6h9w8378kacv7ws35ndcnc3kkhci9iypwy432ak8d"; + sha256 = "1ghxjg5dm22kwfrq26nqp4qhh6h7f4l4fnf1cx9cksd30ypwy223"; }; - buildInputs = [ - makeWrapper - jre - ]; + nativeBuildInputs = [ makeWrapper ]; + + buildInputs = [ jre ]; buildCommand = let pkg_path = "$out/${name}"; @@ -30,7 +29,7 @@ stdenv.mkDerivation rec { which ]; runtime_lib_paths = lib.makeLibraryPath [ - gtk glib + gtk2 glib libXtst ]; in '' diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 223a10fb983..034bde6911e 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -7,7 +7,7 @@ , saslSupport ? false , stdenv, fetchurl, apr, aprutil, zlib, sqlite , apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null -, sasl ? null, serf ? null +, sasl ? null, serf ? null, openssl }: assert bdbSupport -> aprutil.bdbSupport; @@ -29,7 +29,7 @@ let # Can't do separate $lib and $bin, as libs reference bins outputs = [ "out" "dev" "man" ]; - buildInputs = [ zlib apr aprutil sqlite ] + buildInputs = [ zlib apr aprutil sqlite openssl ] ++ stdenv.lib.optional httpSupport serf ++ stdenv.lib.optional pythonBindings python ++ stdenv.lib.optional perlBindings perl @@ -75,11 +75,13 @@ 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 - substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" - substituteInPlace $f --replace "${zlib.dev}/lib" "${zlib.out}/lib" - substituteInPlace $f --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" - done + for f in $out/lib/*.la; do + substituteInPlace $f \ + --replace "${expat.dev}/lib" "${expat.out}/lib" \ + --replace "${zlib.dev}/lib" "${zlib.out}/lib" \ + --replace "${sqlite.dev}/lib" "${sqlite.out}/lib" \ + --replace "${openssl.dev}/lib" "${openssl.out}/lib" + done ''; inherit perlBindings pythonBindings; diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix index 99d0c2df543..754b7df5153 100644 --- a/pkgs/applications/version-management/tortoisehg/default.nix +++ b/pkgs/applications/version-management/tortoisehg/default.nix @@ -2,11 +2,11 @@ pythonPackages.buildPythonApplication rec { name = "tortoisehg-${version}"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { url = "https://bitbucket.org/tortoisehg/targz/downloads/${name}.tar.gz"; - sha256 = "1v5h5yz9b360ris9p8zsdjxqvaflp9z2b6b7dfb4abn2irv3jip6"; + sha256 = "12bqvkkwkb6m5hls7gipkxbnspfrk1k6l9l0fff0wp1zajnp4pnn"; }; pythonPath = with pythonPackages; [ pyqt4 mercurial qscintilla iniparse ]; diff --git a/pkgs/applications/version-management/vcsh/default.nix b/pkgs/applications/version-management/vcsh/default.nix index af849668875..4f87f4b569c 100644 --- a/pkgs/applications/version-management/vcsh/default.nix +++ b/pkgs/applications/version-management/vcsh/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "1.20141026-1"; + version = "1.20151229-1"; name = "vcsh-${version}"; src = fetchurl { url = "https://github.com/RichiH/vcsh/archive/v${version}.tar.gz"; - sha256 = "1wgrmkygsbmk8zj88kjx9aim2fc44hh2d1a83h4mn2j714pffh33"; + sha256 = "0wgg5zz11ql2v37vby5gbqvnbs80g1q83b9qbvm8d2pqx8bsb0kn"; }; phases = [ "unpackPhase" "installPhase" "fixupPhase" ]; diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index 7990f996ec3..e1ce841ede2 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { a specific OS or host. Supplies a method of encrypting confidential data so it can safely be stored in your repository. ''; - licence = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/video/coriander/default.nix b/pkgs/applications/video/coriander/default.nix index e3c28853403..6eb9e94e969 100644 --- a/pkgs/applications/video/coriander/default.nix +++ b/pkgs/applications/video/coriander/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, libgnomeui, libXv, libraw1394, libdc1394 +{stdenv, fetchurl, pkgconfig, glib, gtk2, libgnomeui, libXv, libraw1394, libdc1394 , SDL, automake, GConf }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { cp ${automake}/share/automake-*/mkinstalldirs . ''; - buildInputs = [ pkgconfig glib gtk libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; + buildInputs = [ pkgconfig glib gtk2 libgnomeui libXv libraw1394 libdc1394 SDL GConf ]; meta = { homepage = http://damien.douxchamps.net/ieee1394/coriander/; diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix index 1506f6e23c9..7785116a835 100644 --- a/pkgs/applications/video/dvd-slideshow/default.nix +++ b/pkgs/applications/video/dvd-slideshow/default.nix @@ -4,7 +4,7 @@ let binPath = lib.makeBinPath [ cdrtools dvdauthor ffmpeg imagemagick lame mjpegtools sox transcode vorbis-tools ]; wrapper = writeScript "dvd-slideshow.sh" '' - #!/bin/bash + #!${stdenv.shell} # wrapper script for dvd-slideshow programs export PATH=${binPath}:$PATH @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { # fix upstream typos substituteInPlace dvd-slideshow \ --replace "version='0.8.4-1'" "version='0.8.4-2'" \ - --replace "mymyecho" "myecho" + --replace "mymyecho" "myecho" ''; installPhase = '' diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 0200b0c70f4..cf17b66ef48 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -3,7 +3,7 @@ , gst_ffmpeg, speex , libogg, libxml2, libjpeg, mesa, libpng, libungif, libtool , boost, freetype, agg, dbus, curl, pkgconfig, gettext -, glib, gtk, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl +, glib, gtk2, gtkglext, pangox_compat, xlibsWrapper, ming, dejagnu, python, perl , freefont_ttf, haxe, swftools , lib, makeWrapper , xulrunner }: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { gettext xlibsWrapper SDL SDL_mixer gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg speex libtool libogg libxml2 libjpeg mesa libpng libungif boost freetype agg - dbus curl pkgconfig glib gtk gtkglext pangox_compat + dbus curl pkgconfig glib gtk2 gtkglext pangox_compat xulrunner makeWrapper ] diff --git a/pkgs/applications/video/gnome-mplayer/default.nix b/pkgs/applications/video/gnome-mplayer/default.nix index 7c1d13fd79d..1096a64887b 100644 --- a/pkgs/applications/video/gnome-mplayer/default.nix +++ b/pkgs/applications/video/gnome-mplayer/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gtk, dbus, dbus_glib, GConf}: +{stdenv, fetchurl, pkgconfig, glib, gtk2, dbus, dbus_glib, GConf}: stdenv.mkDerivation rec { name = "gnome-mplayer-1.0.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1k5yplsvddcm7xza5h4nfb6vibzjcqsk8gzis890alizk07f5xp2"; }; - buildInputs = [pkgconfig glib gtk dbus dbus_glib GConf]; + buildInputs = [pkgconfig glib gtk2 dbus dbus_glib GConf]; meta = { homepage = http://kdekorte.googlepages.com/gnomemplayer; diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 9f257cde21f..1dbe34553b0 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation rec { 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"; @@ -75,6 +74,11 @@ stdenv.mkDerivation rec { cd build ''; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ x265 ]; + preFixup = '' + gappsWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}") + ''; + meta = { homepage = http://handbrake.fr/; description = "A tool for ripping DVDs into video files"; diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix index 9113ff75bfd..8653305f908 100644 --- a/pkgs/applications/video/kazam/default.nix +++ b/pkgs/applications/video/kazam/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python3Packages, gst_all_1, makeWrapper, gobjectIntrospection -, gtk3, libwnck3, keybinder, intltool, libcanberra }: +, gtk3, libwnck3, keybinder, intltool, libcanberra_gtk2 }: python3Packages.buildPythonApplication rec { @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec { patches = [ ./datadir.patch ./bug_1190693.patch ]; prePatch = '' rm setup.cfg - substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra}/bin/canberra-gtk-play" + substituteInPlace kazam/backend/grabber.py --replace "/usr/bin/canberra-gtk-play" "${libcanberra_gtk2}/bin/canberra-gtk-play" ''; # no tests diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index 12fc7151cd0..b36b539176e 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, gnome, librsvg, pygtk, pythonPackages }: +{ stdenv, fetchurl, gnome2, librsvg, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "key-mon-${version}"; version = "1.17"; namePrefix = ""; @@ -11,7 +11,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = - [ gnome.python_rsvg librsvg pygtk pythonPackages.xlib ]; + [ gnome2.python_rsvg librsvg pythonPackages.pygtk pythonPackages.xlib ]; doCheck = false; diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index ea515827087..3d2bf1f1a4f 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -50,7 +50,7 @@ #AMR-WB float support no #AMR-WB IF2 support no -{ stdenv, fetchurl, gtk, libglade, libxml2, libraw1394, libsamplerate, libdv +{ stdenv, fetchurl, gtk2, libglade, libxml2, libraw1394, libsamplerate, libdv , pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext , libX11, glib, cairo, intltool, ffmpeg, libv4l }: @@ -63,7 +63,7 @@ stdenv.mkDerivation { sha256 = "020s05k0ma83rq2kfs8x474pqicaqp9spar81qc816ddfrnh8k8i"; }; - buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv + buildInputs = [ gtk2 libglade libxml2 libraw1394 libsamplerate libdv pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages configureFlags = "--enable-local-ffmpeg=no"; diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix index 2a45c1a9eb2..9e08f2fffb1 100644 --- a/pkgs/applications/video/miro/default.nix +++ b/pkgs/applications/video/miro/default.nix @@ -69,13 +69,13 @@ in buildPythonApplication rec { --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" ''; - buildInputs = with pythonPackages; [ pygtk pygobject ] ++ [ + buildInputs = with pythonPackages; [ pygtk pygobject2 ] ++ [ pkgconfig pyrex096 ffmpeg boost glib gtk2 webkitgtk2 libsoup taglib gsettings_desktop_schemas sqlite ]; propagatedBuildInputs = with pythonPackages; [ - pygobject pygtk pycurl sqlite3 mutagen pycairo dbus-python + pygobject2 pygtk pycurl sqlite3 mutagen pycairo dbus-python pywebkitgtk] ++ [ libtorrentRasterbar gst_python gst_plugins_base gst_plugins_good gst_ffmpeg ] ++ optional enableBonjour avahi; diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix index a0605bb7128..2c5d3d365c1 100644 --- a/pkgs/applications/video/mkcast/default.nix +++ b/pkgs/applications/video/mkcast/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz -, xdpyinfo, makeWrapper, gtk, xorg, gnome3 }: +, xdpyinfo, makeWrapper, gtk2, xorg, gnome3 }: stdenv.mkDerivation rec { name = "mkcast-2015-03-13"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p"; }; - buildInputs = with pythonPackages; [ makeWrapper pygtk gtk xlib ]; + buildInputs = with pythonPackages; [ makeWrapper pygtk gtk2 xlib ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index c98d84dab43..0d02377b714 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -10,23 +10,21 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "9.4.0"; + version = "9.4.2"; src = fetchFromGitHub { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "0bmr0cnxp56flak6fjcn0ld5238h3ngrvy09yqp4790g8xwif35v"; + sha256 = "1dyhlpik8d9z78dg47cha313r0dm9fcjg6hzkmzd2ng9yrq5pmdy"; }; nativeBuildInputs = [ pkgconfig autoconf automake gettext ruby ]; buildInputs = [ - expat - file xdg_utils boost libebml zlib - libmatroska libogg libvorbis flac - (optional withGUI qt5.qtbase) - ]; + expat file xdg_utils boost libebml zlib libmatroska libogg + libvorbis flac + ] ++ optional withGUI qt5.qtbase; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "./drake -j $NIX_BUILD_CORES"; diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index a317e1d4fe5..3a270da21e9 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -1,15 +1,15 @@ -{ stdenv, fetchurl, pkgconfig, freetype, yasm +{ stdenv, fetchurl, fetchpatch, pkgconfig, freetype, yasm, ffmpeg , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? stdenv.isLinux, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? false, libvdpau ? null -, cddaSupport ? true, cdparanoia ? null -, dvdnavSupport ? true, libdvdnav ? null +, cddaSupport ? !stdenv.isDarwin, cdparanoia ? null +, dvdnavSupport ? !stdenv.isDarwin, libdvdnav ? null , bluraySupport ? true, libbluray ? null , amrSupport ? false, amrnb ? null, amrwb ? null , cacaSupport ? true, libcaca ? null @@ -24,6 +24,7 @@ , libpngSupport ? true, libpng ? null , libjpegSupport ? true, libjpeg ? null , useUnfreeCodecs ? false +, darwin ? null }: assert fontconfigSupport -> (fontconfig != null); @@ -83,19 +84,11 @@ let in stdenv.mkDerivation rec { - name = "mplayer-1.1.1"; + name = "mplayer-1.3.0"; src = fetchurl { - # Old kind of URL: - # url = http://tarballs.nixos.org/mplayer-snapshot-20101227.tar.bz2; - # Snapshot I took on 20110423 - - #Transient - #url = http://www.mplayerhq.hu/MPlayer/releases/mplayer-export-snapshot.tar.bz2; - #sha256 = "cc1b3fda75b172f02c3f46581cfb2c17f4090997fe9314ad046e464a76b858bb"; - - url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.1.1.tar.xz"; - sha256 = "ce8fc7c3179e6a57eb3a58cb7d1604388756b8a61764cc93e095e7aff3798c76"; + url = "http://www.mplayerhq.hu/MPlayer/releases/MPlayer-1.3.0.tar.xz"; + sha256 = "0hwqn04bdknb2ic88xd75smffxx63scvz0zvwvjb56nqj9n89l1s"; }; prePatch = '' @@ -103,7 +96,7 @@ stdenv.mkDerivation rec { ''; buildInputs = with stdenv.lib; - [ pkgconfig freetype ] + [ pkgconfig freetype ffmpeg ] ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi @@ -127,6 +120,7 @@ stdenv.mkDerivation rec { ++ optional libpngSupport libpng ++ optional libjpegSupport libjpeg ++ optional bs2bSupport libbs2b + ++ (with darwin.apple_sdk.frameworks; optionals stdenv.isDarwin [ Cocoa OpenGL ]) ; nativeBuildInputs = [ yasm ]; @@ -162,8 +156,8 @@ stdenv.mkDerivation rec { --disable-xanim --disable-ivtv --disable-xvid --disable-xvid-lavc - --enable-vidix - --enable-fbdev + ${optionalString stdenv.isLinux "--enable-vidix"} + ${optionalString stdenv.isLinux "--enable-fbdev"} --disable-ossaudio ''; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index ac4718d9eb2..88b2f9d0945 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, makeWrapper , docutils, perl, pkgconfig, python3, which, ffmpeg , freefont_ttf, freetype, libass, libpthreadstubs -, lua, lua5_sockets, libuchardet, rubberband +, lua, lua5_sockets, libuchardet, libiconv ? null, darwin , x11Support ? true, mesa ? null, @@ -13,18 +13,19 @@ wayland ? null, libxkbcommon ? null +, rubberbandSupport ? !stdenv.isDarwin, rubberband ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , sdl2Support ? true, SDL2 ? null -, alsaSupport ? true, alsaLib ? null +, alsaSupport ? !stdenv.isDarwin, alsaLib ? null , screenSaverSupport ? true, libXScrnSaver ? null , vdpauSupport ? true, libvdpau ? null -, dvdreadSupport ? true, libdvdread ? null -, dvdnavSupport ? true, libdvdnav ? null +, dvdreadSupport ? !stdenv.isDarwin, libdvdread ? null +, dvdnavSupport ? dvdreadSupport, libdvdnav ? null , bluraySupport ? true, libbluray ? null , speexSupport ? true, speex ? null , theoraSupport ? true, libtheora ? null -, pulseSupport ? true, libpulseaudio ? null +, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null , bs2bSupport ? true, libbs2b ? null , cacaSupport ? true, libcaca ? null , libpngSupport ? true, libpng ? null @@ -39,11 +40,12 @@ with stdenv.lib; -let +let available = x: x != null; in assert x11Support -> all available [mesa libX11 libXext libXxf86vm]; assert waylandSupport -> all available [wayland libxkbcommon]; +assert rubberbandSupport -> available rubberband; assert xineramaSupport -> x11Support && available libXinerama; assert xvSupport -> x11Support && available libXv; assert sdl2Support -> available SDL2; @@ -109,7 +111,7 @@ in stdenv.mkDerivation rec { buildInputs = [ ffmpeg freetype libass libpthreadstubs - lua lua5_sockets libuchardet rubberband + lua lua5_sockets libuchardet ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora @@ -118,6 +120,10 @@ in stdenv.mkDerivation rec { ++ optional bluraySupport libbluray ++ optional jackaudioSupport libjack2 ++ optional pulseSupport libpulseaudio + ++ optional stdenv.isDarwin libiconv + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Cocoa CoreAudio ]) + ++ optional rubberbandSupport rubberband ++ optional screenSaverSupport libXScrnSaver ++ optional vdpauSupport libvdpau ++ optional speexSupport speex @@ -158,7 +164,7 @@ in stdenv.mkDerivation rec { homepage = http://mpv.io; license = licenses.gpl2Plus; maintainers = with maintainers; [ AndersonTorres fuuzetsu ]; - platforms = platforms.linux; + platforms = platforms.darwin ++ platforms.linux; longDescription = '' mpv is a free and open-source general-purpose video player, diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix index 1fc0182a68a..eb184933964 100644 --- a/pkgs/applications/video/openshot-qt/default.nix +++ b/pkgs/applications/video/openshot-qt/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { name = "openshot-qt-${version}"; - version = "2.0.7"; + version = "2.1.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "1s4b61fd8cyjy8kvc25mqd97dkxx6gqmz02i42rrcriz51pw8wgh"; + sha256 = "1cyr5m1n6qcb9bzkhh3v6ka91a6x9c50dl5j0ilrc8vj0mb43g8c"; }; buildInputs = [doxygen python3Packages.python makeWrapper ffmpeg]; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { echo "exec ${python3Packages.python.interpreter} $(toPythonPath $out)/launch.py" >>$out/bin/openshot-qt chmod +x $out/bin/openshot-qt wrapProgram $out/bin/openshot-qt \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$PYTHONPATH" + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${libopenshot}):$(toPythonPath ${python3Packages.pyqt5}):$(toPythonPath ${python3Packages.sip}):$(toPythonPath ${python3Packages.httplib2}):$(toPythonPath ${python3Packages.pyzmq}):$PYTHONPATH" ''; doCheck = false; diff --git a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix index 8b583d4ec5c..fdaa049fa42 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot-audio.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot-audio.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "libopenshot-audio-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot-audio"; rev = "v${version}"; - sha256 = "0pgw7vzx3znglwm58187ybhg5maa13n4xcy5hrhzfsp8bqhrwkc7"; + sha256 = "0dxyhnqkjc5y4hra8s17q9lafll6fx0pgibmmjznjm70whqcj8a6"; }; buildInputs = [ diff --git a/pkgs/applications/video/openshot-qt/libopenshot.nix b/pkgs/applications/video/openshot-qt/libopenshot.nix index 2737c48ec83..841587fcab3 100644 --- a/pkgs/applications/video/openshot-qt/libopenshot.nix +++ b/pkgs/applications/video/openshot-qt/libopenshot.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, fetchFromGitHub, callPackage, cmake, doxygen -, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp}: +, imagemagick, ffmpeg, qt55, swig, python3, ruby, unittest-cpp +, cppzmq, czmqpp +}: with stdenv.lib; @@ -8,13 +10,13 @@ let in stdenv.mkDerivation rec { name = "libopenshot-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchFromGitHub { owner = "OpenShot"; repo = "libopenshot"; rev = "v${version}"; - sha256 = "12nfkris7spn8n4s8fvy2f6yk1hqh97wzh1z3fsdxldg4gppi903"; + sha256 = "00051ipb8y4z9j5m5smwm1ahv755k0glarwic8fv5b9fzryfbrdm"; }; patchPhase = '' @@ -28,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake doxygen imagemagick ffmpeg qt55.qtbase qt55.qtmultimedia swig python3 ruby - unittest-cpp + unittest-cpp cppzmq czmqpp ]; LIBOPENSHOT_AUDIO_DIR = "${libopenshot_audio}"; diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index efab9703df3..34c5650e9f7 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -5,11 +5,11 @@ qmakeHook, makeQtWrapper }: stdenv.mkDerivation rec { name = "shotcut-${version}"; - version = "16.08"; + version = "16.10"; src = fetchurl { url = "https://github.com/mltframework/shotcut/archive/v${version}.tar.gz"; - sha256 = "10f32mfj3f8mjp0yi0jb7wc5d3inycn5c1pvqdagjhyyv3rvx9zy"; + sha256 = "0brskci86bwdj2ahjfvv3v254ligjn97bm0f6c8yg46r0jb8q5xw"; }; buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix new file mode 100644 index 00000000000..cca1ed34f6d --- /dev/null +++ b/pkgs/applications/video/streamlink/default.nix @@ -0,0 +1,30 @@ +{ stdenv, pythonPackages, fetchFromGitHub, rtmpdump }: + +pythonPackages.buildPythonApplication rec { + version = "1.14.0-rc1"; + name = "streamlink-${version}"; + + src = fetchFromGitHub { + owner = "streamlink"; + repo = "streamlink"; + rev = "ffc099b16b9a9d2c0c44081d687c50ee2e935f29"; + sha256 = "0ix2k2yd2jzcazkjjb0iczr4bv7pgx873k7bhxgb9zwplklxpw1k"; + }; + + propagatedBuildInputs = (with pythonPackages; [ pycrypto requests2 ]) ++ [ rtmpdump ]; + + meta = with stdenv.lib; { + homepage = https://github.com/streamlink/streamlink; + description = "CLI for extracting streams from various websites to video player of your choosing"; + longDescription = '' + Streamlink is a CLI utility that pipes flash videos from online + streaming services to a variety of video players such as VLC, or + alternatively, a browser. + + Streamlink is a fork of the livestreamer project. + ''; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.dezgeg ]; + }; +} diff --git a/pkgs/applications/video/subtitleeditor/default.nix b/pkgs/applications/video/subtitleeditor/default.nix index e3cd242bd73..3f8f683e0ca 100644 --- a/pkgs/applications/video/subtitleeditor/default.nix +++ b/pkgs/applications/video/subtitleeditor/default.nix @@ -1,10 +1,11 @@ -{ stdenv, fetchurl, pkgconfig, autoconf, automake114x, intltool, - desktop_file_utils, enchant, gnome3, gst_all_1, hicolor_icon_theme, - libsigcxx, libxmlxx, xdg_utils, isocodes, wrapGAppsHook } : +{ stdenv, fetchurl, pkgconfig, intltool, file, desktop_file_utils, + enchant, gnome3, gst_all_1, hicolor_icon_theme, libsigcxx, libxmlxx, + xdg_utils, isocodes, wrapGAppsHook +}: let - ver_maj = "0.52"; - ver_min = "1"; + ver_maj = "0.53"; + ver_min = "0"; in stdenv.mkDerivation rec { @@ -12,11 +13,14 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.gna.org/subtitleeditor/${ver_maj}/subtitleeditor-${ver_maj}.${ver_min}.tar.gz"; - sha256 = "1m8j2i27kjaycvp09b0knp9in61jd2dj852hrx5hvkrby70mygjv"; + sha256 = "087rxignjawby4z3lwnh9m6pcjphl3a0jf7gfp83h92mzcq79b4g"; }; nativeBuildInputs = [ - autoconf automake114x pkgconfig intltool wrapGAppsHook + pkgconfig + intltool + file + wrapGAppsHook ]; buildInputs = [ @@ -35,20 +39,14 @@ stdenv.mkDerivation rec { isocodes ]; - NIX_CFLAGS_COMPILE = "-std=c++11 -DDEBUG"; - enableParallelBuilding = true; - doCheck = true; + # disable check because currently making check in po fails + doCheck = false; hardeningDisable = [ "format" ]; - patches = [ ./subtitleeditor-0.52.1-build-fix.patch ]; - - preConfigure = '' - # ansi overrides -std, see src_configure - sed 's/\(CXXFLAGS\) -ansi/\1/' -i configure.ac configure - ''; + preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; configureFlags = [ "--disable-debug" ]; diff --git a/pkgs/applications/video/subtitleeditor/subtitleeditor-0.52.1-build-fix.patch b/pkgs/applications/video/subtitleeditor/subtitleeditor-0.52.1-build-fix.patch deleted file mode 100644 index 9cce5d2d98f..00000000000 --- a/pkgs/applications/video/subtitleeditor/subtitleeditor-0.52.1-build-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix build errors with gcc-4.9.3 -std=c++11 (after disabling -ansi) - -https://gna.org/bugs/?23714 - -https://bugs.gentoo.org/show_bug.cgi?id=550764 -https://bugs.gentoo.org/show_bug.cgi?id=566328 - ---- a/src/subtitleview.cc 2015-12-24 01:52:29.322622155 +0100 -+++ b/src/subtitleview.cc 2015-12-24 01:52:44.210491213 +0100 -@@ -1363,7 +1363,7 @@ - { - int num; - std::istringstream ss(event->string); -- bool is_num = ss >> num != 0; -+ bool is_num = static_cast(ss >> num) != 0; - // Update only if it's different - if(is_num != get_enable_search()) - set_enable_search(is_num); ---- a/src/utility.h 2015-12-24 01:49:42.205104858 +0100 -+++ b/src/utility.h 2015-12-24 01:50:23.387737071 +0100 -@@ -91,7 +91,7 @@ - std::istringstream s(src); - // return s >> dest != 0; - -- bool state = s >> dest != 0; -+ bool state = static_cast(s >> dest) != 0; - - if(!state) - se_debug_message(SE_DEBUG_UTILITY, "string:'%s'failed.", src.c_str()); ---- a/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:24.125428454 +0100 -+++ b/plugins/actions/dialoguize/dialoguize.cc 2015-12-24 01:06:42.630277006 +0100 -@@ -23,7 +23,7 @@ - * along with this program. If not, see . - */ - --#include -+#include - #include "extension/action.h" - #include "i18n.h" - #include "debug.h" ---- a/plugins/actions/documentmanagement/documentmanagement.old 2015-12-24 01:17:13.914730337 +0100 -+++ b/plugins/actions/documentmanagement/documentmanagement.cc 2015-12-24 01:17:23.339640430 +0100 -@@ -178,9 +178,9 @@ - - ui_id = ui->new_merge_id(); - -- #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/"name, name, name); -- #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/"name, name, name); -- #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/"name, name, name); -+ #define ADD_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/" name, name, name); -+ #define ADD_OPEN_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-open/" name, name, name); -+ #define ADD_SAVE_UI(name) ui->add_ui(ui_id, "/menubar/menu-file/menu-save/" name, name, name); - - ADD_UI("new-document"); - ADD_OPEN_UI("open-document"); diff --git a/pkgs/applications/video/xvidcap/default.nix b/pkgs/applications/video/xvidcap/default.nix index 527d31004b0..c8414bbb83a 100644 --- a/pkgs/applications/video/xvidcap/default.nix +++ b/pkgs/applications/video/xvidcap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk +{ stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gtk2 , scrollkeeper, libglade, libXmu, libX11, libXext, gettext , lame, libXfixes, libXdamage }: @@ -12,7 +12,7 @@ stdenv.mkDerivation { patches = [ ./xlib.patch ]; buildInputs = [ - perl perlXMLParser pkgconfig gtk scrollkeeper + perl perlXMLParser pkgconfig gtk2 scrollkeeper libglade libXmu gettext lame libXdamage libXfixes libXext libX11 ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 8c420b11f55..dfd92685579 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, config , pkgconfig, libtool -, gtk, mesa, readline, libX11, libXpm +, gtk2, mesa, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null , termSupport ? true , ncurses ? null @@ -12,7 +12,7 @@ assert sdlSupport -> (SDL2 != null); assert termSupport -> (ncurses != null); -assert wxSupport -> (gtk != null && wxGTK != null); +assert wxSupport -> (gtk2 != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { busMouse = config.bochs.busMouse or false; buildInputs = with stdenv.lib; - [ pkgconfig libtool gtk mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] @@ -143,7 +143,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional busMouse "--enable-busmouse" ; - NIX_CFLAGS_COMPILE="-I${gtk.dev}/include/gtk-2.0/ -I${libtool}/include/"; + NIX_CFLAGS_COMPILE="-I${gtk2.dev}/include/gtk-2.0/ -I${libtool}/include/"; NIX_LDFLAGS="-L${libtool.lib}/lib"; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix new file mode 100644 index 00000000000..6de68ee32f3 --- /dev/null +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub +, go, libapparmor, apparmor-parser, libseccomp }: + +with lib; + +stdenv.mkDerivation rec { + name = "containerd-${version}"; + version = "0.2.3"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "containerd"; + rev = "v${version}"; + sha256 = "0hlvbd5n4v337ywkc8mnbhp9m8lg8612krv45262n87c2ijyx09s"; + }; + + buildInputs = [ go ]; + + preBuild = '' + ln -s $(pwd) vendor/src/github.com/docker/containerd + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/* $out/bin + ''; + + preFixup = '' + # remove references to go compiler + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out/bin -type f 2>/dev/null) + ''; + + meta = { + homepage = https://containerd.tools/; + description = "A daemon to control runC"; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/docker-distribution/default.nix b/pkgs/applications/virtualization/docker-distribution/default.nix new file mode 100644 index 00000000000..4850d7d9f5f --- /dev/null +++ b/pkgs/applications/virtualization/docker-distribution/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "distribution-${version}"; + version = "2.5.1"; + rev = "v${version}"; + + goPackagePath = "github.com/docker/distribution"; + + src = fetchFromGitHub { + owner = "docker"; + repo = "distribution"; + inherit rev; + sha256 = "08nxcsl9bc3k9gav2mkqccm5byrlfcgy6qaqaywiyza0b0cn4kdc"; + }; + + meta = with stdenv.lib; { + description = "The Docker toolset to pack, ship, store, and deliver content"; + license = licenses.asl20; + maintainers = [ maintainers.globin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 3d69de9c15b..801b93a02de 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,32 +1,34 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, go, sqlite, iproute, bridge-utils, devicemapper -, btrfs-progs, iptables, e2fsprogs, xz, utillinux -, systemd, pkgconfig +{ stdenv, lib, fetchFromGitHub, makeWrapper, pkgconfig, go-md2man +, go, containerd, runc +, sqlite, iproute, bridge-utils, devicemapper, systemd +, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs +, procps }: # https://github.com/docker/docker/blob/master/project/PACKAGERS.md -with stdenv.lib; +with lib; stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.10.3"; + version = "1.12.1"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0bmrafi0p3fm681y165ps97jki0a8ihl9f0bmpvi22nmc1v0sv6l"; + sha256 = "079786dyydjfc8vb6djxh140pc7v16fjl5x2h2q420qc3mrfz5zd"; }; buildInputs = [ - makeWrapper go sqlite iproute bridge-utils devicemapper btrfs-progs - iptables e2fsprogs systemd pkgconfig stdenv.glibc stdenv.glibc.static + makeWrapper pkgconfig go-md2man go + sqlite devicemapper btrfs-progs systemd ]; dontStrip = true; - DOCKER_BUILDTAGS = [ "journald" ] + DOCKER_BUILDTAGS = [] + ++ optional (systemd != null) [ "journald" ] ++ optional (btrfs-progs == null) "exclude_graphdriver_btrfs" ++ optional (devicemapper == null) "exclude_graphdriver_devicemapper"; @@ -39,15 +41,27 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs . export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="20f81dde" + export DOCKER_GITCOMMIT="23cf638" ./hack/make.sh dynbinary ''; + outputs = ["out" "man"]; + + extraPath = makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]; + installPhase = '' - install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker - install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit + install -Dm755 ./bundles/${version}/dynbinary-client/docker-${version} $out/libexec/docker/docker + install -Dm755 ./bundles/${version}/dynbinary-daemon/dockerd-${version} $out/libexec/docker/dockerd + install -Dm755 ./bundles/${version}/dynbinary-daemon/docker-proxy-${version} $out/libexec/docker/docker-proxy makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "${stdenv.lib.makeBinPath [ iproute iptables e2fsprogs xz utillinux ]}" + --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 ${containerd}/bin/containerd $out/libexec/docker/docker-containerd + ln -s ${containerd}/bin/containerd-shim $out/libexec/docker/docker-containerd-shim + ln -s ${runc}/bin/runc $out/libexec/docker/docker-runc # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service @@ -56,9 +70,31 @@ stdenv.mkDerivation rec { 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" + done + done ''; - meta = with stdenv.lib; { + preFixup = '' + # remove references to go compiler, gcc and glibc + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + sed -ri "s,${stdenv.cc.cc},$(echo "${stdenv.cc.cc}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + sed -ri "s,${stdenv.glibc.dev},$(echo "${stdenv.glibc.dev}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out -type f 2>/dev/null) + ''; + + 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; diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix index 3371eb428e6..ac839d9f914 100644 --- a/pkgs/applications/virtualization/openstack/neutron.nix +++ b/pkgs/applications/virtualization/openstack/neutron.nix @@ -62,5 +62,8 @@ pythonPackages.buildPythonApplication rec { description = "Virtual network service for Openstack"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.linux; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix index 618eb766692..a4e0779d3f9 100644 --- a/pkgs/applications/virtualization/openstack/nova.nix +++ b/pkgs/applications/virtualization/openstack/nova.nix @@ -15,6 +15,9 @@ pythonPackages.buildPythonApplication rec { # otherwise migrate.cfg is not installed patchPhase = '' echo "graft nova" >> MANIFEST.in + + # remove transient error test, see http://hydra.nixos.org/build/40203534 + rm nova/tests/unit/compute/test_{shelve,compute_utils}.py ''; # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index e431501cf29..f1ee4426d97 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -15,7 +15,7 @@ with stdenv.lib; let - version = "2.6.1"; + version = "2.7.0"; audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + optionalString pulseSupport "pa," + optionalString sdlSupport "sdl,"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2"; - sha256 = "1l88iqk0swqccrnjwczgl9arqsvy77bis862zxajy7z3dqdzshj9"; + sha256 = "0lqyz01z90nvxpc3nx4djbci7hx62cwvs5zwd6phssds0sap6vij"; }; buildInputs = @@ -47,22 +47,8 @@ stdenv.mkDerivation rec { patches = [ ./no-etc-install.patch - (fetchpatch { - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=fff39a7ad09da07ef490de05c92c91f22f8002f2"; - name = "9pfs-forbid-illegal-path-names.patch"; - sha256 = "081j85p6m7s1cfh3aq1i2av2fsiarlri9gs939s0wvc6pdyb4b70"; - }) - (fetchpatch { - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=805b5d98c649d26fc44d2d7755a97f18e62b438a"; - name = "9pfs-forbid-.-and-..-in-file-names.patch"; - sha256 = "0km6knll492dx745gx37bi6dhmz08cmjiyf479ajkykp0aljii24"; - }) - (fetchpatch { - url = "http://git.qemu.org/?p=qemu.git;a=patch;h=56f101ecce0eafd09e2daf1c4eeb1377d6959261"; - name = "9pfs-directory-traversal-CVE-2016-7116.patch"; - sha256 = "06pr070qj19w5mjxr36bcqxmgpiczncigqsbwfc8ncjhm1h7dmry"; - }) ]; + hardeningDisable = [ "stackprotector" ]; configureFlags = [ "--smbd=smbd" # use `smbd' from $PATH diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index d41002d30dc..6a53ad32b39 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -12,15 +12,15 @@ let stage1Dir = "lib/rkt/stage1-images"; in stdenv.mkDerivation rec { - version = "1.14.0"; + version = "1.15.0"; name = "rkt-${version}"; BUILDDIR="build-${name}"; src = fetchFromGitHub { - rev = "v${version}"; owner = "coreos"; repo = "rkt"; - sha256 = "0wniknmsv6xml3cp6ggjlqvcpwhp4bw1dqdnbm561mchvm69zhc2"; + rev = "v${version}"; + sha256 = "0ppi6r3wr69s6ka1j9xljvq3rw2chp8syyvqcx6ijnzjbwgbwar3"; }; stage1BaseImage = fetchurl { diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix new file mode 100644 index 00000000000..d6686557364 --- /dev/null +++ b/pkgs/applications/virtualization/runc/default.nix @@ -0,0 +1,62 @@ +{ stdenv, lib, fetchFromGitHub, go-md2man +, go, pkgconfig, libapparmor, apparmor-parser, libseccomp }: + +with lib; + +stdenv.mkDerivation rec { + name = "runc-${version}"; + version = "2016-06-15"; + + src = fetchFromGitHub { + owner = "opencontainers"; + repo = "runc"; + rev = "cc29e3dded8e27ba8f65738f40d251c885030a28"; + sha256 = "18fwb3kq10zhhx184yn3j396gpbppy3y4ypb8m2b2pdms39s6pyx"; + }; + + outputs = [ "out" "man" ]; + + hardeningDisable = ["fortify"]; + + buildInputs = [ go-md2man go pkgconfig libseccomp libapparmor apparmor-parser ]; + + makeFlags = ''BUILDTAGS+=seccomp BUILDTAGS+=apparmor''; + + preBuild = '' + patchShebangs . + substituteInPlace libcontainer/apparmor/apparmor.go \ + --replace /sbin/apparmor_parser ${apparmor-parser}/bin/apparmor_parser + ''; + + installPhase = '' + install -Dm755 runc $out/bin/runc + + # 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 + ''; + + preFixup = '' + # remove references to go compiler + while read file; do + sed -ri "s,${go},$(echo "${go}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" $file + done < <(find $out/bin -type f 2>/dev/null) + ''; + + meta = { + homepage = https://runc.io/; + description = "A CLI tool for spawning and running containers according to the OCI specification"; + license = licenses.asl20; + maintainers = with maintainers; [ offline ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index add5f96e7f5..7a43a8b8800 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -1,16 +1,17 @@ {stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib, - libpciaccess, libxcb, libXrandr, libXinerama, libXfixes}: + libpciaccess, libxcb, libXrandr, libXinerama, libXfixes, dbus}: stdenv.mkDerivation rec { - name = "spice-vdagent-0.16.0"; + name = "spice-vdagent-0.17.0"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "0z8gwc5va2i64mjippavmxajdb9az83ffqyhlbynm6dxw131d5av"; + sha256 = "0gdkyylyg1hksg0i0anvznqfli2q39335fnrmcd6847frpc8njpi"; }; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; buildInputs = [ pkgconfig alsaLib spice_protocol glib - libpciaccess libxcb libXrandr libXinerama libXfixes ] ; + libpciaccess libxcb libXrandr libXinerama libXfixes + dbus ] ; meta = { description = "Enhanced SPICE integration for linux QEMU guest"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 8bcf122132e..ef834897022 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,14 +1,15 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext -, libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, libXrandr +, libXcursor, libXmu, qt5, libIDL, SDL, libcap, zlib, libpng, glib, lvm2 +, libXrandr, libXinerama , which, alsaLib, curl, libvpx, gawk, nettools, dbus -, xorriso, makeself, perl, pkgconfig, nukeReferences +, xorriso, makeself, perl, pkgconfig , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , pulseSupport ? false, libpulseaudio ? null , enableHardening ? false , headless ? false +, patchelfUnstable # needed until 0.10 is released }: with stdenv.lib; @@ -16,37 +17,12 @@ with stdenv.lib; let buildType = "release"; - # When changing this, update ./guest-additions and the extpack - # revision/hash as well. See - # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS - # for hashes. - version = "5.0.26"; - - forEachModule = action: '' - for mod in \ - out/linux.*/${buildType}/bin/src/vboxdrv \ - out/linux.*/${buildType}/bin/src/vboxpci \ - out/linux.*/${buildType}/bin/src/vboxnetadp \ - out/linux.*/${buildType}/bin/src/vboxnetflt - do - if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] - then - cp -v out/linux.*/${buildType}/bin/src/vboxdrv/Module.symvers \ - "$mod/Module.symvers" - fi - INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ - make -j $NIX_BUILD_CORES -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ - "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} - done - ''; + inherit (importJSON ./upstream-info.json) version extpackRev extpack main; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "108824"; extensionPack = requireFile rec { - name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; - # IMPORTANT: Hash must be base16 encoded because it's used as an input to - # VBoxExtPackHelperApp! - sha256 = "2f2302c7ba3d00a1258fe8e7767a6eb08dccdc3c31f6e3eeb74063c2c268b104"; + name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRev}.vbox-extpack"; + sha256 = extpack; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) available at: @@ -61,35 +37,36 @@ let }; in stdenv.mkDerivation { - name = "virtualbox-${version}-${kernel.version}"; + name = "virtualbox-${version}"; src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "78dec1369d2c8feefea3c682d95e76c0e99414c56626388035cf4061d4dad62e"; + sha256 = main; }; + outputs = [ "out" "modsrc" ]; + buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor libIDL libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu nukeReferences ] + pkgconfig which libXmu libpng patchelfUnstable ] ++ optional javaBindings jdk ++ optional pythonBindings python ++ optional pulseSupport libpulseaudio - ++ optionals (headless) [ libXrandr libpng ] - ++ optionals (!headless) [ qt4 SDL ]; + ++ optionals (headless) [ libXrandr ] + ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ]; hardeningDisable = [ "fortify" "pic" "stackprotector" ]; prePatch = '' set -x - MODULES_BUILD_DIR=`echo ${kernel.dev}/lib/modules/*/build` - sed -e 's@/lib/modules/`uname -r`/build@'$MODULES_BUILD_DIR@ \ - -e 's@MKISOFS --version@MKISOFS -version@' \ + sed -e 's@MKISOFS --version@MKISOFS -version@' \ -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \ - -i configure + ${optionalString (!headless) '' + -e 's@TOOLQT5BIN=.*@TOOLQT5BIN="${getDev qt5.qtbase}/bin"@' \ + ''} -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 - find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} + 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 @@ -103,11 +80,12 @@ in stdenv.mkDerivation { set +x ''; - patches = optional enableHardening ./hardened.patch; + patches = optional enableHardening ./hardened.patch + ++ [ ./libressl.patch ./qtx11extras.patch ]; postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ - src/apps/adpctl/VBoxNetAdpCtl.cpp + src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp ''; # first line: ugly hack, and it isn't yet clear why it's a problem @@ -131,11 +109,15 @@ in stdenv.mkDerivation { ${optionalString javaBindings '' VBOX_JAVA_HOME := ${jdk} ''} + ${optionalString (!headless) '' + PATH_QT5_X11_EXTRAS_LIB := ${getLib qt5.qtx11extras}/lib + PATH_QT5_X11_EXTRAS_INC := ${getDev qt5.qtx11extras}/include + TOOL_QT5_LRC := ${getDev qt5.qttools}/bin/lrelease + ''} LOCAL_CONFIG ./configure \ ${optionalString headless "--build-headless"} \ - ${optionalString (!headless) "--with-qt4-dir=${qt4}"} \ ${optionalString (!javaBindings) "--disable-java"} \ ${optionalString (!pythonBindings) "--disable-python"} \ ${optionalString (!pulseSupport) "--disable-pulse"} \ @@ -153,7 +135,6 @@ in stdenv.mkDerivation { buildPhase = '' source env.sh kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}" - ${forEachModule "modules"} ''; installPhase = '' @@ -165,9 +146,6 @@ in stdenv.mkDerivation { find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \ -name src -o -exec cp -avt "$libexec" {} + - # Install kernel modules - ${forEachModule "modules_install"} - # Create wrapper script mkdir -p $out/bin for file in VirtualBox VBoxManage VBoxSDL VBoxBalloonCtrl VBoxBFE VBoxHeadless; do @@ -199,15 +177,11 @@ in stdenv.mkDerivation { done ''} - # Get rid of a reference to linux.dev. - nuke-refs $out/lib/modules/*/misc/*.ko + cp -rv out/linux.*/${buildType}/bin/src "$modsrc" ''; passthru = { inherit version; /* for guest additions */ }; - # Workaround for https://github.com/NixOS/patchelf/issues/93 (can be removed once this issue is addressed) - dontPatchELF = true; - meta = { description = "PC emulator"; homepage = http://www.virtualbox.org/; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 56e02519792..5a97d2a8efd 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -12,19 +12,20 @@ stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "7458ee5a7121a7d243fd6a7528ba427945d9120c5efc7cd75b3951fb01f09c59"; + sha256 = (lib.importJSON ../upstream-info.json).guest; }; KERN_DIR = "${kernel.dev}/lib/modules/*/build"; hardeningDisable = [ "pic" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + buildInputs = [ patchelf cdrkit makeWrapper dbus ]; installPhase = '' mkdir -p $out cp -r install/* $out - ''; buildCommand = with xorg; '' diff --git a/pkgs/applications/virtualization/virtualbox/libressl.patch b/pkgs/applications/virtualization/virtualbox/libressl.patch new file mode 100644 index 00000000000..db9b7e7a59d --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/libressl.patch @@ -0,0 +1,47 @@ +diff --git a/src/VBox/Runtime/common/crypto/digest-builtin.cpp b/src/VBox/Runtime/common/crypto/digest-builtin.cpp +index 66b4304..1aaceff 100644 +--- a/src/VBox/Runtime/common/crypto/digest-builtin.cpp ++++ b/src/VBox/Runtime/common/crypto/digest-builtin.cpp +@@ -561,7 +561,7 @@ static PCRTCRDIGESTDESC const g_apDigestOps[] = + * OpenSSL EVP. + */ + +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + /** @impl_interface_method{RTCRDIGESTDESC::pfnNew} */ + static DECLCALLBACK(void*) rtCrDigestOsslEvp_New(void) + { +@@ -597,7 +597,7 @@ static DECLCALLBACK(int) rtCrDigestOsslEvp_Init(void *pvState, void *pvOpaque, b + if (fReInit) + { + pEvpType = EVP_MD_CTX_md(pThis); +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_reset(pThis); + # else + EVP_MD_CTX_cleanup(pThis); +@@ -616,7 +616,7 @@ static DECLCALLBACK(int) rtCrDigestOsslEvp_Init(void *pvState, void *pvOpaque, b + static DECLCALLBACK(void) rtCrDigestOsslEvp_Delete(void *pvState) + { + EVP_MD_CTX *pThis = (EVP_MD_CTX *)pvState; +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + EVP_MD_CTX_reset(pThis); + # else + EVP_MD_CTX_cleanup(pThis); +@@ -661,13 +661,13 @@ static RTCRDIGESTDESC const g_rtCrDigestOpenSslDesc = + NULL, + RTDIGESTTYPE_UNKNOWN, + EVP_MAX_MD_SIZE, +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + 0, + # else + sizeof(EVP_MD_CTX), + # endif + 0, +-# if OPENSSL_VERSION_NUMBER >= 0x10100000 ++# if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER) + rtCrDigestOsslEvp_New, + rtCrDigestOsslEvp_Free, + # else diff --git a/pkgs/applications/virtualization/virtualbox/qtx11extras.patch b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch new file mode 100644 index 00000000000..f5decc211c7 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/qtx11extras.patch @@ -0,0 +1,31 @@ +diff --git a/kBuild/units/qt5.kmk b/kBuild/units/qt5.kmk +index 71b96a3..73391f0 100644 +--- a/kBuild/units/qt5.kmk ++++ b/kBuild/units/qt5.kmk +@@ -994,9 +994,10 @@ else + $(eval $(target)_LIBS += $(PATH_SDK_QT5_LIB)/$(qt_prefix)qtmain$(qt_infix)$(SUFF_LIB) ) + endif + else +- $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) ) ++ $(eval $(target)_LIBS += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/lib$(qt_prefix)Qt5$(module)$(qt_infix)$(SUFF_DLL)) \ ++ $(PATH_QT5_X11_EXTRAS_LIB)/lib$(qt_prefix)Qt5X11Extras$(qt_infix)$(SUFF_DLL)) + endif +- $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) ) ++ $(eval $(target)_INCS += $(addprefix $(PATH_SDK_QT5_INC)/Qt,$(qt_modules)) $(PATH_SDK_QT5_INC) $(PATH_QT5_X11_EXTRAS_INC)/QtX11Extras ) + endif + $(eval $(target)_DEFS += $(foreach module,$(toupper $(qt_modules)), QT_$(module)_LIB) ) + +diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk +index 38db6b0..7dd446b 100644 +--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk ++++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk +@@ -912,9 +912,6 @@ VirtualBox_QT_MODULES = Core Gui + ifdef VBOX_WITH_QTGUI_V5 + # Qt5 requires additional modules: + VirtualBox_QT_MODULES += Widgets PrintSupport +- VirtualBox_QT_MODULES.linux += X11Extras +- VirtualBox_QT_MODULES.solaris += X11Extras +- VirtualBox_QT_MODULES.freebsd += X11Extras + VirtualBox_QT_MODULES.darwin += MacExtras + VirtualBox_QT_MODULES.win += WinExtras + endif # VBOX_WITH_QTGUI_V5 diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py new file mode 100755 index 00000000000..ff1b2e2fffb --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/update.py @@ -0,0 +1,83 @@ +#!/usr/bin/env python3 +import os +import re +import json +import urllib.request + +from distutils.version import LooseVersion + +UPSTREAM_INFO_FILE = os.path.join( + os.path.dirname(os.path.abspath(__file__)), + "upstream-info.json" +) + + +def fetch_latest_version(): + url = "http://download.virtualbox.org/virtualbox/LATEST.TXT" + return urllib.request.urlopen(url).read().strip().decode() + + +def load_upstream_info(): + try: + with open(UPSTREAM_INFO_FILE, 'r') as fp: + return json.load(fp) + except FileNotFoundError: + return {'version': "0"} + + +def save_upstream_info(contents): + remark = "Generated using update.py from the same directory." + contents['__NOTE'] = remark + data = json.dumps(contents, indent=2, sort_keys=True) + with open(UPSTREAM_INFO_FILE, 'w') as fp: + fp.write(data + "\n") + + +def fetch_file_table(version): + url = "http://download.virtualbox.org/virtualbox/{}/SHA256SUMS" + url = url.format(version) + result = {} + for line in urllib.request.urlopen(url): + sha, name = line.rstrip().split() + result[name.lstrip(b'*').decode()] = sha.decode() + return result + + +def update_to_version(version): + extpack_start = 'Oracle_VM_VirtualBox_Extension_Pack-' + version_re = version.replace('.', '\\.') + attribute_map = { + 'extpack': r'^' + extpack_start + r'[^-]+-[^.]+.vbox-extpack$', + 'extpackRev': r'^' + extpack_start + r'[^-]+-([^.]+).vbox-extpack$', + 'main': r'^VirtualBox-' + version_re + r'.tar.bz2$', + 'guest': r'^VBoxGuestAdditions_' + version_re + r'.iso$', + } + table = fetch_file_table(version) + new_attrs = {'version': version} + for attr, searchexpr in attribute_map.items(): + result = [re.search(searchexpr, key) for key in table.keys()] + filtered = filter(lambda m: m is not None, result) + found = [m.groups()[0] if len(m.groups()) > 0 else table[m.group(0)] + for m in filtered if m is not None] + + if len(found) == 0: + msg = "No package found for attribute {}".format(attr) + raise AssertionError(msg) + elif len(found) != 1: + msg = "More than one package found for attribute {}: ".format(attr) + msg += ', '.join(found) + raise AssertionError(msg) + else: + new_attrs[attr] = found[0] + return new_attrs + + +info = load_upstream_info() +latest = fetch_latest_version() +if LooseVersion(info['version']) < LooseVersion(latest): + print("Updating to version {}...".format(latest), end="", flush=True) + new_attrs = update_to_version(latest) + save_upstream_info(new_attrs) + print(" done.") +else: + print("Version {} is already the latest one.".format(info['version'])) diff --git a/pkgs/applications/virtualization/virtualbox/upstream-info.json b/pkgs/applications/virtualization/virtualbox/upstream-info.json new file mode 100644 index 00000000000..3a386004a3f --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/upstream-info.json @@ -0,0 +1,8 @@ +{ + "__NOTE": "Generated using update.py from the same directory.", + "extpack": "607ac3636bd49a738d5c48159b39261369b5487f71fb10afa2ecf869627a12de", + "extpackRev": "110634", + "guest": "cbcf9b9b1000e09911b3d20e1efe529aef8a945cf130f6abffc14a39522cc1ed", + "main": "2e0112b0d85841587b8f212e6ba8f6c35b31e1cce6b6999497dc917cd37e6911", + "version": "5.1.6" +} diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 4b0201bc189..2f65322c356 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -2,7 +2,7 @@ , libuuid, gettext, ncurses, dev86, iasl, pciutils, bzip2 , lvm2, utillinux, procps, texinfo, perl, pythonPackages , glib, bridge-utils, xorg, pixman, iproute, udev, bison -, flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl +, flex, cmake, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , spice_protocol, usbredir, alsaLib, quilt , coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools @@ -40,7 +40,7 @@ stdenv.mkDerivation { dev86 iasl pciutils bzip2 xz texinfo perl yajl pythonPackages.python pythonPackages.wrapPython glib bridge-utils pixman iproute udev bison xorg.libX11 - flex ocaml ocamlPackages.findlib figlet libaio + flex ocamlPackages.ocaml ocamlPackages.findlib figlet libaio checkpolicy pythonPackages.markdown transfig glusterfs acl cmake spice spice_protocol usbredir alsaLib quilt diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index 46b8c8affc7..b641a571b24 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, libXrender, renderproto, gtk, libwnck, pango, cairo +, libXrender, renderproto, gtk2, libwnck, pango, cairo , GConf, libXdamage, damageproto, libxml2, libxslt, glibmm , metacity , libstartup_notification, libpthreadstubs, libxcb, intltool @@ -24,7 +24,7 @@ let sha256="00m73im5kdpbfjg9ryzxnab5qvx5j51gxwr3wzimkrcbax6vb3ph"; }; buildInputs = [cmake pkgconfig - libXrender renderproto gtk libwnck pango cairo + libXrender renderproto gtk2 libwnck pango cairo GConf libXdamage damageproto libxml2 libxslt glibmm libstartup_notification metacity libpthreadstubs libxcb intltool diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 7e23dd60503..b521240b48f 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, libX11, libXmu, libXpm, gtk, libpng, libjpeg, libtiff, librsvg +, libX11, libXmu, libXpm, gtk2, libpng, libjpeg, libtiff, librsvg }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "e14542cc81ea06e64dd4708546f5fd3f5e01884c3e4617885c7ef22af8cf3965"; }; buildInputs = - [ pkgconfig libX11 libXmu libXpm gtk libpng libjpeg libtiff librsvg ]; + [ pkgconfig libX11 libXmu libXpm gtk2 libpng libjpeg libtiff librsvg ]; preConfigure = "patchShebangs ."; diff --git a/pkgs/applications/window-managers/i3/lock-color.nix b/pkgs/applications/window-managers/i3/lock-color.nix index 483c815db01..dd781143d86 100644 --- a/pkgs/applications/window-managers/i3/lock-color.nix +++ b/pkgs/applications/window-managers/i3/lock-color.nix @@ -2,13 +2,14 @@ , xcbutilimage, pam, libX11, libev, cairo, libxkbcommon, libxkbfile }: stdenv.mkDerivation rec { - rev = "63a4c23ec6f0b3f62144122a4277d51caf023e4f"; - name = "i3lock-color-2.7_rev${builtins.substring 0 7 rev}"; + rev = "c8e1aece7301c3c6481bf2f695734f8d273f252e"; + version = "2.7-2016-09-17"; + name = "i3lock-color-${version}"; src = fetchFromGitHub { - owner = "Arcaena"; + owner = "chrjguill"; repo = "i3lock-color"; inherit rev; - sha256 = "1wfp0p85h45l50l6zfk5cr9ynka60vhjlgnyk8mqd5fp0w4ibxip"; + sha256 = "07fpvwgdfxsnxnf63idrz3n1kbyayr53lsfns2q775q93cz1mfia"; }; buildInputs = [ which pkgconfig libxcb xcbutilkeysyms xcbutilimage pam libX11 libev cairo libxkbcommon libxkbfile ]; diff --git a/pkgs/applications/window-managers/lemonbar/default.nix b/pkgs/applications/window-managers/lemonbar/default.nix index 042abf09dad..27cb564d2c6 100644 --- a/pkgs/applications/window-managers/lemonbar/default.nix +++ b/pkgs/applications/window-managers/lemonbar/default.nix @@ -1,27 +1,22 @@ -{ stdenv, fetchFromGitHub, perl, libxcb }: +{ stdenv, fetchurl, perl, libxcb }: -let - version = "1.2pre"; -in - stdenv.mkDerivation rec { - name = "lemonbar-${version}"; +stdenv.mkDerivation rec { + name = "lemonbar-1.2"; - src = fetchFromGitHub { - owner = "LemonBoy"; - repo = "bar"; - rev = "61985278f2af1e4e85d63a696ffedc5616b06bc0"; - sha256 = "0a8djlayimjdg5fj50lpifsv6gkb577bca68wmk9wg9y9n27pgay"; - }; + src = fetchurl { + url = "https://github.com/LemonBoy/bar/archive/v1.2.tar.gz"; + sha256 = "1smz8lh930bnb6a4lrm07l3z2k071kc8p2pljk5wsrch3x2xhimq"; + }; - buildInputs = [ libxcb perl ]; + buildInputs = [ libxcb perl ]; - prePatch = ''sed -i "s@/usr@$out@" Makefile''; + prePatch = ''sed -i "s@/usr@$out@" Makefile''; - meta = with stdenv.lib; { - description = "A lightweight xcb based bar"; - homepage = https://github.com/LemonBoy/bar; - maintainers = [ maintainers.meisternu ]; - license = "Custom"; - platforms = platforms.linux; - }; + meta = with stdenv.lib; { + description = "A lightweight xcb based bar"; + homepage = https://github.com/LemonBoy/bar; + maintainers = [ maintainers.meisternu ]; + license = "Custom"; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/window-managers/lemonbar/xft.nix b/pkgs/applications/window-managers/lemonbar/xft.nix index f5dd944a43d..132c10ae973 100644 --- a/pkgs/applications/window-managers/lemonbar/xft.nix +++ b/pkgs/applications/window-managers/lemonbar/xft.nix @@ -1,27 +1,24 @@ { stdenv, fetchFromGitHub, perl, libxcb, libXft }: -let - version = "2015-07-23"; -in - stdenv.mkDerivation rec { - name = "bar-xft-git-${version}"; +stdenv.mkDerivation rec { + name = "lemonbar-xft-unstable-2016-02-17"; - src = fetchFromGitHub { - owner = "krypt-n"; - repo = "bar"; - rev = "3020df19232153f9e98ae0c8111db3de938a2719"; - sha256 = "0a54yr534jd4l5gjzpypc0y5lh2qb2wsrd662s84jjgq8bpss8av"; - }; + src = fetchFromGitHub { + owner = "krypt-n"; + repo = "bar"; + rev = "a43b801ddc0f015ce8b1211f4c062fad12cd63a9"; + sha256 = "0iqas07qjvabxyvna2m9aj5bcwnkdii1izl9jxha63vz0zlsc4gd"; + }; - buildInputs = [ libxcb libXft perl ]; + buildInputs = [ libxcb libXft perl ]; - prePatch = ''sed -i "s@/usr@$out@" Makefile''; + prePatch = ''sed -i "s@/usr@$out@" Makefile''; - meta = { - description = "A lightweight xcb based bar with XFT-support"; - homepage = https://github.com/krypt-n/bar; - maintainers = [ stdenv.lib.maintainers.hiberno ]; - license = "Custom"; - platforms = stdenv.lib.platforms.linux; - }; + meta = { + description = "A lightweight xcb based bar with XFT-support"; + homepage = https://github.com/krypt-n/bar; + maintainers = [ stdenv.lib.maintainers.hiberno ]; + license = "Custom"; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix index 6a5e4564122..d170c9b7478 100644 --- a/pkgs/applications/window-managers/qtile/default.nix +++ b/pkgs/applications/window-managers/qtile/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, buildPythonApplication, python27Packages, pkgs }: +{ stdenv, fetchFromGitHub, python27Packages, glib, cairo, pango, pkgconfig, libxcb, xcbutilcursor }: let cairocffi-xcffib = python27Packages.cairocffi.override { pythonPath = [ python27Packages.xcffib ]; }; in -buildPythonApplication rec { +python27Packages.buildPythonApplication rec { name = "qtile-${version}"; version = "0.10.4"; @@ -24,12 +24,12 @@ buildPythonApplication rec { postPatch = '' substituteInPlace libqtile/manager.py --subst-var-by out $out - substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib.out} - substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango.out} - substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor.out} + substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${glib.out} + substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pango.out} + substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out} ''; - buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ]; + buildInputs = [ pkgconfig glib libxcb cairo pango python27Packages.xcffib ]; pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline]; diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix index b7f1d9adad1..296de4e1e25 100644 --- a/pkgs/applications/window-managers/trayer/default.nix +++ b/pkgs/applications/window-managers/trayer/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk, libXmu }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2, libXmu }: stdenv.mkDerivation rec { name = "trayer-1.1.6"; - buildInputs = [ pkgconfig gdk_pixbuf gtk libXmu ]; + buildInputs = [ pkgconfig gdk_pixbuf gtk2 libXmu ]; src = fetchFromGitHub { owner = "sargon"; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index d08907b59aa..395541d6250 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "weston-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "09biddxw3ar797kxf9mywjkb2iwky6my39gpp51ni846y7lqdq05"; + sha256 = "ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/build-support/build-fhs-userenv/env.nix b/pkgs/build-support/build-fhs-userenv/env.nix index 1dc71987f54..8bc34d672c9 100644 --- a/pkgs/build-support/build-fhs-userenv/env.nix +++ b/pkgs/build-support/build-fhs-userenv/env.nix @@ -89,6 +89,7 @@ let # symlink other core stuff ln -s /host/etc/localtime localtime + ln -s /host/etc/zoneinfo zoneinfo ln -s /host/etc/machine-id machine-id ln -s /host/etc/os-release os-release diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 8a746ea016e..8a9bd3ecb4d 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -46,7 +46,20 @@ stdenv.mkDerivation { inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin; gnugrep_bin = if nativeTools then "" else gnugrep; - passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; }; + passthru = { + inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; + + emacsBufferSetup = pkgs: '' + ; We should handle propagation here too + (mapc (lambda (arg) + (when (file-directory-p (concat arg "/include")) + (setenv "NIX_CFLAGS_COMPILE" (concat (getenv "NIX_CFLAGS_COMPILE") " -isystem " arg "/include"))) + (when (file-directory-p (concat arg "/lib")) + (setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib"))) + (when (file-directory-p (concat arg "/lib64")) + (setenv "NIX_LDFLAGS" (concat (getenv "NIX_LDFLAGS") " -L" arg "/lib64")))) '(${concatStringsSep " " (map (pkg: "\"${pkg}\"") pkgs)})) + ''; + }; buildCommand = '' diff --git a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh old mode 100644 new mode 100755 index 5a7b92b5ad7..263ea5408e9 --- a/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-solaris-wrapper.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!@shell@ set -e set -u diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 4c5378ea73f..b3db68a665d 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -1,12 +1,36 @@ -{ stdenv, lib, callPackage, runCommand, writeReferencesToFile, writeText, vmTools, writeScript -, docker, shadow, utillinux, coreutils, jshon, e2fsprogs, go, pigz }: +{ + callPackage, + coreutils, + docker, + e2fsprogs, + findutils, + go, + jshon, + lib, + pkgs, + pigz, + runCommand, + rsync, + shadow, + stdenv, + storeDir ? builtins.storeDir, + utillinux, + vmTools, + writeReferencesToFile, + writeScript, + writeText, +}: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. - + rec { + examples = import ./examples.nix { + inherit pkgs buildImage pullImage shadowSetup; + }; + pullImage = callPackage ./pull.nix {}; - + # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. # And we cannot untar it, because then we cannot preserve permissions ecc. tarsum = runCommand "tarsum" { @@ -23,110 +47,138 @@ rec { cp tarsum $out ''; - + # buildEnv creates symlinks to dirs, which is hard to edit inside the overlay VM - mergeDrvs = { drvs, onlyDeps ? false }: + mergeDrvs = { + derivations, + onlyDeps ? false + }: runCommand "merge-drvs" { - inherit drvs onlyDeps; + inherit derivations onlyDeps; } '' - if [ -n "$onlyDeps" ]; then - echo $drvs > $out + if [[ -n "$onlyDeps" ]]; then + echo $derivations > $out exit 0 fi - + mkdir $out - for drv in $drvs; do - echo Merging $drv - if [ -d "$drv" ]; then - cp -drf --preserve=mode -f $drv/* $out/ + for derivation in $derivations; do + echo "Merging $derivation..." + if [[ -d "$derivation" ]]; then + # If it's a directory, copy all of its contents into $out. + cp -drf --preserve=mode -f $derivation/* $out/ else + # Otherwise treat the derivation as a tarball and extract it + # into $out. tar -C $out -xpf $drv || true fi done ''; - - shellScript = text: - writeScript "script.sh" '' - #!${stdenv.shell} - set -e - export PATH=${coreutils}/bin:/bin - - ${text} - ''; + # Helper for setting up the base files for managing users and + # groups, only if such files don't exist already. It is suitable for + # being used in a runAsRoot script. shadowSetup = '' export PATH=${shadow}/bin:$PATH mkdir -p /etc/pam.d - if [ ! -f /etc/passwd ]; then + if [[ ! -f /etc/passwd ]]; then echo "root:x:0:0::/root:/bin/sh" > /etc/passwd echo "root:!x:::::::" > /etc/shadow fi - if [ ! -f /etc/group ]; then + if [[ ! -f /etc/group ]]; then echo "root:x:0:" > /etc/group echo "root:x::" > /etc/gshadow fi - if [ ! -f /etc/pam.d/other ]; then + if [[ ! -f /etc/pam.d/other ]]; then cat > /etc/pam.d/other </dev/null || true)) + parentID=$(cat image/$parentID/json \ + | (jshon -e parent -u 2>/dev/null || true)) done mkdir work mkdir layer mkdir mnt - ${preMount} + ${lib.optionalString (preMount != "") '' + # Execute pre-mount steps + echo "Executing pre-mount steps..." + ${preMount} + ''} if [ -n "$lowerdir" ]; then mount -t overlay overlay -olowerdir=$lowerdir,workdir=work,upperdir=layer mnt @@ -134,13 +186,19 @@ EOF mount --bind layer mnt fi - ${postMount} - + ${lib.optionalString (postMount != "") '' + # Execute post-mount steps + echo "Executing post-mount steps..." + ${postMount} + ''} + umount mnt - pushd layer - find . -type c -exec bash -c 'name="$(basename {})"; touch "$(dirname {})/.wh.$name"; rm "{}"' \; - popd + ( + cd layer + cmd='name="$(basename {})"; touch "$(dirname {})/.wh.$name"; rm "{}"' + find . -type c -exec bash -c "$cmd" \; + ) ${postUmount} ''); @@ -150,76 +208,148 @@ EOF inherit name fromImage fromImageName fromImageTag diskSize; postMount = '' - echo Packing raw image + echo "Packing raw image..." tar -C mnt --mtime=0 -cf $out . ''; }; - - mkPureLayer = { baseJson, contents ? null, extraCommands ? "" }: - runCommand "docker-layer" { - inherit baseJson contents extraCommands; - buildInputs = [ jshon ]; - } '' - mkdir layer - if [ -n "$contents" ]; then - echo Adding contents - for c in $contents; do - cp -drf $c/* layer/ - chmod -R ug+w layer/ - done - fi - pushd layer - ${extraCommands} - popd - - echo Packing layer - mkdir $out - tar -C layer --mtime=0 -cf $out/layer.tar . - ts=$(${tarsum} < $out/layer.tar) - cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json - echo -n "1.0" > $out/VERSION + # Create an executable shell script which has the coreutils in its + # PATH. Since root scripts are executed in a blank environment, even + # things like `ls` or `echo` will be missing. + shellScript = name: text: + writeScript name '' + #!${stdenv.shell} + set -e + export PATH=${coreutils}/bin:/bin + ${text} ''; - mkRootLayer = { runAsRoot, baseJson, fromImage ? null, fromImageName ? null, fromImageTag ? null - , diskSize ? 1024, contents ? null, extraCommands ? "" }: - let runAsRootScript = writeScript "run-as-root.sh" runAsRoot; + # Create a "layer" (set of files). + mkPureLayer = { + # Name of the layer + name, + # JSON containing configuration and metadata for this layer. + baseJson, + # Files to add to the layer. + contents ? null, + # Additional commands to run on the layer before it is tar'd up. + extraCommands ? "" + }: + runCommand "docker-layer-${name}" { + inherit baseJson contents extraCommands; + + buildInputs = [ jshon rsync ]; + } + '' + mkdir layer + if [[ -n "$contents" ]]; then + echo "Adding contents..." + for item in $contents; do + echo "Adding $item" + rsync -a $item/ layer/ + done + else + echo "No contents to add to layer." + fi + + if [[ -n $extraCommands ]]; then + (cd layer; eval "$extraCommands") + fi + + # Tar up the layer and throw it into 'layer.tar'. + echo "Packing layer..." + mkdir $out + tar -C layer --mtime=0 -cf $out/layer.tar . + + # Compute a checksum of the tarball. + echo "Computing layer checksum..." + tarsum=$(${tarsum} < $out/layer.tar) + + # Add a 'checksum' field to the JSON, with the value set to the + # checksum of the tarball. + cat ${baseJson} | jshon -s "$tarsum" -i checksum > $out/json + + # Indicate to docker that we're using schema version 1.0. + echo -n "1.0" > $out/VERSION + + echo "Finished building layer '${name}'" + ''; + + # Make a "root" layer; required if we need to execute commands as a + # privileged user on the image. The commands themselves will be + # performed in a virtual machine sandbox. + mkRootLayer = { + # Name of the image. + name, + # Script to run as root. Bash. + runAsRoot, + # Files to add to the layer. If null, an empty layer will be created. + contents ? null, + # JSON containing configuration and metadata for this layer. + baseJson, + # Existing image onto which to append the new layer. + fromImage ? null, + # Name of the image we're appending onto. + fromImageName ? null, + # Tag of the image we're appending onto. + fromImageTag ? null, + # How much disk to allocate for the temporary virtual machine. + diskSize ? 1024, + # Commands (bash) to run on the layer; these do not require sudo. + extraCommands ? "" + }: + # Generate an executable script from the `runAsRoot` text. + let runAsRootScript = shellScript "run-as-root.sh" runAsRoot; in runWithOverlay { - name = "docker-layer"; - + name = "docker-layer-${name}"; + inherit fromImage fromImageName fromImageTag diskSize; - preMount = lib.optionalString (contents != null) '' - echo Adding contents - for c in ${builtins.toString contents}; do - cp -drf $c/* layer/ - chmod -R ug+w layer/ + preMount = lib.optionalString (contents != null && contents != []) '' + echo "Adding contents..." + for item in ${toString contents}; do + echo "Adding $item..." + rsync -a $item/ layer/ done ''; postMount = '' - mkdir -p mnt/{dev,proc,sys,nix/store} + mkdir -p mnt/{dev,proc,sys} mnt${storeDir} + + # Mount /dev, /sys and the nix store as shared folders. mount --rbind /dev mnt/dev mount --rbind /sys mnt/sys - mount --rbind /nix/store mnt/nix/store + mount --rbind ${storeDir} mnt${storeDir} + # Execute the run as root script. See 'man unshare' for + # details on what's going on here; basically this command + # means that the runAsRootScript will be executed in a nearly + # completely isolated environment. unshare -imnpuf --mount-proc chroot mnt ${runAsRootScript} - umount -R mnt/dev mnt/sys mnt/nix/store - rmdir --ignore-fail-on-non-empty mnt/dev mnt/proc mnt/sys mnt/nix/store mnt/nix - ''; - - postUmount = '' - pushd layer - ${extraCommands} - popd - echo Packing layer + # Unmount directories and remove them. + umount -R mnt/dev mnt/sys mnt${storeDir} + rmdir --ignore-fail-on-non-empty \ + mnt/dev mnt/proc mnt/sys mnt${storeDir} \ + mnt$(dirname ${storeDir}) + ''; + + postUmount = '' + (cd layer; eval "${extraCommands}") + + echo "Packing layer..." mkdir $out tar -C layer --mtime=0 -cf $out/layer.tar . + + # Compute the tar checksum and add it to the output json. + echo "Computing checksum..." ts=$(${tarsum} < $out/layer.tar) cat ${baseJson} | jshon -s "$ts" -i checksum > $out/json + # Indicate to docker that we're using schema version 1.0. echo -n "1.0" > $out/VERSION + + echo "Finished building layer '${name}'" ''; }; @@ -229,105 +359,144 @@ EOF # 4. compute the layer id # 5. put the layer in the image # 6. repack the image - buildImage = args@{ name, tag ? "latest" - , fromImage ? null, fromImageName ? null, fromImageTag ? null - , contents ? null, config ? null, runAsRoot ? null - , diskSize ? 1024, extraCommands ? "" }: + buildImage = args@{ + # Image name. + name, + # Image tag. + tag ? "latest", + # Parent image, to append to. + fromImage ? null, + # Name of the parent image; will be read from the image otherwise. + fromImageName ? null, + # Tag of the parent image; will be read from the image otherwise. + fromImageTag ? null, + # Files to put on the image (a nix store path or list of paths). + contents ? null, + # Docker config; e.g. what command to run on the container. + config ? null, + # Optional bash script to run on the files prior to fixturizing the layer. + extraCommands ? "", + # Optional bash script to run as root on the image when provisioning. + runAsRoot ? null, + # Size of the virtual machine disk to provision when building the image. + diskSize ? 1024, + }: let - baseName = baseNameOf name; + # Create a JSON blob of the configuration. Set the date to unix zero. baseJson = writeText "${baseName}-config.json" (builtins.toJSON { - created = "1970-01-01T00:00:01Z"; - architecture = "amd64"; - os = "linux"; - config = config; + created = "1970-01-01T00:00:01Z"; + architecture = "amd64"; + os = "linux"; + config = config; }); - layer = (if runAsRoot == null - then mkPureLayer { inherit baseJson contents extraCommands; } - else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; }); - result = runCommand "${baseName}.tar.gz" { - buildInputs = [ jshon pigz ]; - + layer = + if runAsRoot == null + then mkPureLayer { inherit name baseJson contents extraCommands; } + else mkRootLayer { inherit name baseJson fromImage fromImageName + fromImageTag contents runAsRoot diskSize + extraCommands; }; + result = runCommand "docker-image-${baseName}.tar.gz" { + buildInputs = [ jshon pigz coreutils findutils ]; imageName = name; imageTag = tag; inherit fromImage baseJson; - layerClosure = writeReferencesToFile layer; - - passthru = { - buildArgs = args; - }; + passthru.buildArgs = args; + passthru.layer = layer; } '' + # Print tar contents: + # 1: Interpreted as relative to the root directory + # 2: With no trailing slashes on directories + # This is useful for ensuring that the output matches the + # values generated by the "find" command + ls_tar() { + for f in $(tar -tf $1 | xargs realpath -ms --relative-to=.); do + if [[ "$f" != "." ]]; then + echo "/$f" + fi + done + } + mkdir image touch baseFiles - if [ -n "$fromImage" ]; then - echo Unpacking base image + if [[ -n "$fromImage" ]]; then + echo "Unpacking base image..." tar -C image -xpf "$fromImage" - - if [ -z "$fromImageName" ]; then + + if [[ -z "$fromImageName" ]]; then fromImageName=$(jshon -k < image/repositories|head -n1) fi - if [ -z "$fromImageTag" ]; then - fromImageTag=$(jshon -e $fromImageName -k < image/repositories|head -n1) + if [[ -z "$fromImageTag" ]]; then + fromImageTag=$(jshon -e $fromImageName -k \ + < image/repositories|head -n1) fi - parentID=$(jshon -e $fromImageName -e $fromImageTag -u < image/repositories) - + parentID=$(jshon -e $fromImageName -e $fromImageTag -u \ + < image/repositories) + for l in image/*/layer.tar; do - tar -tf $l >> baseFiles + ls_tar image/*/layer.tar >> baseFiles done fi chmod -R ug+rw image - + mkdir temp cp ${layer}/* temp/ chmod ug+w temp/* + echo "$(dirname ${storeDir})" >> layerFiles + echo '${storeDir}' >> layerFiles for dep in $(cat $layerClosure); do - find $dep -path "${layer}" -prune -o -print >> layerFiles + find $dep >> layerFiles done - if [ -s layerFiles ]; then - # FIXME: might not be /nix/store - echo '/nix' >> layerFiles - echo '/nix/store' >> layerFiles - fi + echo "Adding layer..." + # Record the contents of the tarball with ls_tar. + ls_tar temp/layer.tar >> baseFiles - echo Adding layer - tar -tf temp/layer.tar >> baseFiles - sed 's/^\.//' -i baseFiles - comm <(sort -u baseFiles) <(sort -u layerFiles) -1 -3 > newFiles - tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles 2>/dev/null || true + # Get the files in the new layer which were *not* present in + # the old layer, and record them as newFiles. + comm <(sort -n baseFiles|uniq) \ + <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles + # Append the new files to the layer. + tar -rpf temp/layer.tar --mtime=0 --no-recursion --files-from newFiles - echo Adding meta - - if [ -n "$parentID" ]; then + echo "Adding meta..." + + # If we have a parentID, add it to the json metadata. + if [[ -n "$parentID" ]]; then cat temp/json | jshon -s "$parentID" -i parent > tmpjson mv tmpjson temp/json fi - + + # Take the sha256 sum of the generated json and use it as the layer ID. + # Compute the size and add it to the json under the 'Size' field. layerID=$(sha256sum temp/json|cut -d ' ' -f 1) size=$(stat --printf="%s" temp/layer.tar) cat temp/json | jshon -s "$layerID" -i id -n $size -i Size > tmpjson mv tmpjson temp/json + # Use the temp folder we've been working on to create a new image. mv temp image/$layerID - + + # Store the json under the name image/repositories. jshon -n object \ -n object -s "$layerID" -i "$imageTag" \ -i "$imageName" > image/repositories + # Make the image read-only. chmod -R a-w image - echo Cooking the image + echo "Cooking the image..." tar -C image --mtime=0 -c . | pigz -nT > $out + + echo "Finished." ''; in - - result; - + result; } diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix new file mode 100644 index 00000000000..05b4a9b4f2d --- /dev/null +++ b/pkgs/build-support/docker/examples.nix @@ -0,0 +1,108 @@ +# Examples of using the docker tools to build packages. +# +# This file defines several docker images. In order to use an image, +# build its derivation with `nix-build`, and then load the result with +# `docker load`. For example: +# +# $ nix-build '' -A dockerTools.examples.redis +# $ docker load < result + +{ pkgs, buildImage, pullImage, shadowSetup }: + +rec { + # 1. basic example + bash = buildImage { + name = "bash"; + contents = pkgs.bashInteractive; + }; + + # 2. service example, layered on another image + redis = buildImage { + name = "redis"; + tag = "latest"; + + # for example's sake, we can layer redis on top of bash or debian + fromImage = bash; + # fromImage = debian; + + contents = pkgs.redis; + runAsRoot = '' + mkdir -p /data + ''; + + config = { + Cmd = [ "/bin/redis-server" ]; + WorkingDir = "/data"; + Volumes = { + "/data" = {}; + }; + }; + }; + + # 3. another service example + nginx = let + nginxPort = "80"; + nginxConf = pkgs.writeText "nginx.conf" '' + user nginx nginx; + daemon off; + error_log /dev/stdout info; + pid /dev/null; + events {} + http { + access_log /dev/stdout; + server { + listen ${nginxPort}; + index index.html; + location / { + root ${nginxWebRoot}; + } + } + } + ''; + nginxWebRoot = pkgs.writeTextDir "index.html" '' +

Hello from NGINX

+ ''; + in + buildImage { + name = "nginx-container"; + contents = pkgs.nginx; + + runAsRoot = '' + #!${pkgs.stdenv.shell} + ${shadowSetup} + groupadd --system nginx + useradd --system --gid nginx nginx + ''; + + config = { + Cmd = [ "nginx" "-c" nginxConf ]; + ExposedPorts = { + "${nginxPort}/tcp" = {}; + }; + }; + }; + + # 4. example of pulling an image. could be used as a base for other images + # + # ***** Currently broken, getting 404s. Perhaps the docker API has changed? + # + # + # debian = pullImage { + # imageName = "debian"; + # imageTag = "jessie"; + # # this hash will need change if the tag is updated at docker hub + # sha256 = "18kd495lc2k35h03bpcbdjnix17nlqbwf6nmq3sb161blf0dk14q"; + # }; + + # 5. example of multiple contents, emacs and vi happily coexisting + editors = buildImage { + name = "editors"; + contents = [ + pkgs.coreutils + pkgs.bash + pkgs.emacs + pkgs.vim + pkgs.nano + ]; + }; +} diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix index a5e7acaf159..0e1b147f6e1 100644 --- a/pkgs/build-support/docker/pull.nix +++ b/pkgs/build-support/docker/pull.nix @@ -26,17 +26,11 @@ let layer = stdenv.mkDerivation { outputHash = sha256; outputHashMode = "recursive"; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ # This variable allows the user to pass additional options to curl "NIX_CURL_FLAGS" ]; - + # Doing the download on a remote machine just duplicates network # traffic, so don't do that. preferLocalBuild = true; diff --git a/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh b/pkgs/build-support/dotnetbuildhelpers/patch-fsharp-targets.sh old mode 100644 new mode 100755 diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 5632eae944c..e366fd1f739 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -1,23 +1,47 @@ # Functions to build elisp files to locally configure emcas buffers. # See https://github.com/shlevy/nix-buffer -{ lib, writeText }: +{ lib, writeText, inherit-local }: { withPackages = pkgs: let - coqs = builtins.filter (x: (builtins.parseDrvName x.name).name == "coq") pkgs; - coq = builtins.head coqs; - pg-setup = if builtins.length coqs == 0 then "" else '' - (setq-local coq-prog-name "${coq}/bin/coqtop") - (setq-local coq-dependency-analyzer "${coq}/bin/coqdep") - (setq-local coq-compiler "${coq}/bin/coqc") - (setq-local coq-library-directory (get-coq-library-directory)) - (coq-prog-args) - ''; + extras = map (x: x.emacsBufferSetup pkgs) (builtins.filter (builtins.hasAttr "emacsBufferSetup") pkgs); in writeText "dir-locals.el" '' + (require 'inherit-local "${inherit-local}/share/emacs/site-lisp/elpa/inherit-local-${inherit-local.version}/inherit-local.elc") + + ; Only set up nixpkgs buffer handling when we have some buffers active + (defvar nixpkgs--buffer-count 0) + (when (eq nixpkgs--buffer-count 0) + ; When generating a new temporary buffer (one whose name starts with a space), do inherit-local inheritance and make it a nixpkgs buffer + (defun nixpkgs--around-generate (orig name) + (if (eq (aref name 0) ?\s) + (let ((buf (funcall orig name))) + (when (inherit-local-inherit-child buf) + (with-current-buffer buf + (make-local-variable 'kill-buffer-hook) + (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count))) + buf) + (funcall orig name))) + (advice-add 'generate-new-buffer :around #'nixpkgs--around-generate) + ; When we have no more nixpkgs buffers, tear down the buffer handling + (defun nixpkgs--decrement-buffer-count () + (setq nixpkgs--buffer-count (1- nixpkgs--buffer-count)) + (when (eq nixpkgs--buffer-count 0) + (advice-remove 'generate-new-buffer #'nixpkgs--around-generate) + (fmakunbound 'nixpkgs--around-generate) + (fmakunbound 'nixpkgs--decrement-buffer-count)))) + (setq nixpkgs--buffer-count (1+ nixpkgs--buffer-count)) + (make-local-variable 'kill-buffer-hook) + (add-hook 'kill-buffer-hook 'nixpkgs--decrement-buffer-count) + + ; Add packages to PATH and exec-path (make-local-variable 'process-environment) + (put 'process-environment 'permanent-local t) + (inherit-local 'process-environment) (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) - (setq-local exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) - ${pg-setup} + (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + + ${lib.concatStringsSep "\n" extras} ''; } diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 45931e6914a..b13def07bb8 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -85,13 +85,14 @@ stdenv.mkDerivation { done siteStart="$out/share/emacs/site-lisp/site-start.el" + siteStartByteCompiled="$siteStart"c # A dependency may have brought the original siteStart, delete it and # create our own # Begin the new site-start.el by loading the original, which sets some # NixOS-specific paths. Paths are searched in the reverse of the order # they are specified in, so user and system profile paths are searched last. - rm -f $siteStart + rm -f $siteStart $siteStartByteCompiled cat >"$siteStart" < { let m = builtins.match "mirror://([a-z]+)/(.*)" url; in if m == null then url else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1); - } diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index a7c76737e1a..2cc45ca4bbf 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -20,13 +20,7 @@ let # "gnu", etc.). sites = builtins.attrNames mirrors; - impureEnvVars = [ - # We borrow these environment variables from the caller to allow - # easy proxy configuration. This is impure, but a fixed-output - # derivation like fetchurl is allowed to do so since its result is - # by definition pure. - "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" - + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars ++ [ # This variable allows the user to pass additional options to curl "NIX_CURL_FLAGS" @@ -118,7 +112,8 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else if sha512 != "" then "sha512" else if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5"; 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 if sha1 != "" then sha1 else + (stdenv.lib.fetchMD5warn "fetchurl" (builtins.head urls_) md5); outputHashMode = if (recursiveHash || executable) then "recursive" else "flat"; diff --git a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh old mode 100644 new mode 100755 index 5a7b92b5ad7..263ea5408e9 --- a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!@shell@ set -e set -u diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix index 19aa57ccd99..4379b1997ae 100644 --- a/pkgs/build-support/grsecurity/default.nix +++ b/pkgs/build-support/grsecurity/default.nix @@ -22,7 +22,11 @@ assert (kernel.version == grsecPatch.kver); overrideDerivation (kernel.override { inherit modDirVersion; kernelPatches = [ grsecPatch ] ++ kernelPatches ++ (kernel.kernelPatches or []); - inherit extraConfig; + extraConfig = '' + GRKERNSEC y + PAX y + ${extraConfig} + ''; ignoreConfigErrors = true; }) (attrs: { nativeBuildInputs = (lib.chooseDevOutputs [ gmp libmpc mpfr ]) ++ (attrs.nativeBuildInputs or []); diff --git a/pkgs/build-support/ocaml/default.nix b/pkgs/build-support/ocaml/default.nix index 50f7627568d..cc2001c66e2 100644 --- a/pkgs/build-support/ocaml/default.nix +++ b/pkgs/build-support/ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, writeText, ocaml, findlib, camlp4 }: +{ stdenv, writeText, ocaml, findlib, ocamlbuild, camlp4 }: { name, version, buildInputs ? [], createFindlibDestdir ? true, @@ -9,26 +9,24 @@ meta ? {}, ... }@args: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; defaultMeta = { platforms = ocaml.meta.platforms or []; }; in assert minimumSupportedOcamlVersion != null -> - stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml_version; + stdenv.lib.versionOlder minimumSupportedOcamlVersion ocaml.version; stdenv.mkDerivation (args // { name = "ocaml-${name}-${version}"; - buildInputs = [ ocaml findlib camlp4 ] ++ buildInputs; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ] ++ buildInputs; setupHook = if setupHook == null && hasSharedObjects then 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}/" '' else setupHook; - inherit ocaml_version; inherit createFindlibDestdir; inherit dontStrip; diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix index 1b4983e3259..0c9625e5140 100644 --- a/pkgs/build-support/rust/fetchcargo.nix +++ b/pkgs/build-support/rust/fetchcargo.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = sha256; - impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ]; + impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; preferLocalBuild = true; } diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh index 189c98cdfa7..ae491e8a7ef 100644 --- a/pkgs/build-support/setup-hooks/multiple-outputs.sh +++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh @@ -16,6 +16,7 @@ _assignFirst() { echo "Error: _assignFirst found no valid variant!" return 1 # none found } + # Same as _assignFirst, but only if "$1" = "" _overrideFirst() { if [ -z "${!1}" ]; then @@ -37,9 +38,10 @@ _overrideFirst outputInclude "$outputDev" _overrideFirst outputLib "lib" "out" _overrideFirst outputDoc "doc" "out" -_overrideFirst outputDocdev "devdoc" REMOVE # documentation for developers +_overrideFirst outputDevdoc "devdoc" REMOVE # documentation for developers # man and info pages are small and often useful to distribute with binaries _overrideFirst outputMan "man" "doc" "$outputBin" +_overrideFirst outputDevman "devman" "devdoc" "$outputMan" _overrideFirst outputInfo "info" "doc" "$outputMan" @@ -136,11 +138,11 @@ _multioutDocs() { moveToOutput share/info "${!outputInfo}" moveToOutput share/doc "${!outputDoc}" - moveToOutput share/gtk-doc "${!outputDocdev}" + moveToOutput share/gtk-doc "${!outputDevdoc}" # the default outputMan is in $bin moveToOutput share/man "${!outputMan}" - moveToOutput share/man/man3 "${!outputDocdev}" + moveToOutput share/man/man3 "${!outputDevman}" } # Move development-only stuff to the desired outputs. diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix index 1022b25c4c9..7fd46f95f99 100644 --- a/pkgs/build-support/substitute/substitute-all.nix +++ b/pkgs/build-support/substitute/substitute-all.nix @@ -1,9 +1,9 @@ -{ stdenv }: +{ stdenvNoCC }: args: # see the substituteAll in the nixpkgs documentation for usage and constaints -stdenv.mkDerivation ({ +stdenvNoCC.mkDerivation ({ name = if args ? name then args.name else baseNameOf (toString args.src); builder = ./substitute-all.sh; inherit (args) src; diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index 8775286b117..d6f390ddfb1 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -1,15 +1,23 @@ -{ lib, stdenv, lndir }: +{ lib, stdenv, stdenvNoCC, lndir }: + +let + + runCommand' = stdenv: name: env: buildCommand: + stdenv.mkDerivation ({ + inherit name buildCommand; + passAsFile = [ "buildCommand" ]; + } // env); + +in rec { # Run the shell command `buildCommand' to produce a store path named # `name'. The attributes in `env' are added to the environment # prior to running the command. - runCommand = name: env: buildCommand: - stdenv.mkDerivation ({ - inherit name buildCommand; - passAsFile = [ "buildCommand" ]; - } // env); + runCommand = runCommandNoCC; + runCommandNoCC = runCommand' stdenvNoCC; + runCommandCC = runCommand' stdenv; # Create a single file. @@ -97,12 +105,16 @@ rec { done < graph ''; + # Quickly create a set of symlinks to derivations. # entries is a list of attribute sets like { name = "name" ; path = "/nix/store/..."; } linkFarm = name: entries: runCommand name {} ("mkdir -p $out; cd $out; \n" + (lib.concatMapStrings (x: "ln -s '${x.path}' '${x.name}';\n") entries)); - # Require file + + # Print an error message if the file with the specified name and + # hash doesn't exist in the Nix store. Do not use this function; it + # produces packages that cannot be built automatically. requireFile = { name ? null , sha256 ? null , sha1 ? null @@ -115,8 +127,8 @@ rec { let msg = if message != null then message else '' - Unfortunately, we may not download file ${name_} automatically. - Please, go to ${url} to download it yourself, and add it to the Nix store + Unfortunately, we cannot download file ${name_} automatically. + Please go to ${url} to download it yourself, and add it to the Nix store using either nix-store --add-fixed ${hashAlgo} ${name_} or @@ -143,30 +155,6 @@ rec { ''; }; - # Search in the environment if the same program exists with a set uid or - # set gid bit. If it exists, run the first program found, otherwise run - # the default binary. - useSetUID = drv: path: - let - name = baseNameOf path; - bin = "${drv}${path}"; - in assert name != ""; - writeScript "setUID-${name}" '' - #!${stdenv.shell} - inode=$(stat -Lc %i ${bin}) - for file in $(type -ap ${name}); do - case $(stat -Lc %a $file) in - ([2-7][0-7][0-7][0-7]) - if test -r "$file".real; then - orig=$(cat "$file".real) - if test $inode = $(stat -Lc %i "$orig"); then - exec "$file" "$@" - fi - fi;; - esac - done - exec ${bin} "$@" - ''; # Copy a path to the Nix store. # Nix automatically copies files to the store before stringifying paths. @@ -174,6 +162,7 @@ rec { # shortened to ${}. copyPathToStore = builtins.filterSource (p: t: true); + # Copy a list of paths to the Nix store. copyPathsToStore = builtins.map copyPathToStore; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 07ea6f6e76b..47f61ab64d6 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1,6 +1,7 @@ { pkgs , kernel ? pkgs.linux , img ? "bzImage" +, storeDir ? builtins.storeDir , rootModules ? [ "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_rng" "ext4" "unix" "9p" "9pnet_virtio" "rtc_cmos" ] }: @@ -128,8 +129,8 @@ rec { mount -t devpts none /fs/dev/pts echo "mounting Nix store..." - mkdir -p /fs/nix/store - mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,cache=loose + mkdir -p /fs${storeDir} + mount -t 9p store /fs${storeDir} -o trans=virtio,version=9p2000.L,cache=loose mkdir -p /fs/tmp /fs/run /fs/var mount -t tmpfs -o "mode=1777" none /fs/tmp @@ -172,7 +173,7 @@ rec { # apparent KVM > 1.5.2 bug. ${pkgs.utillinux}/bin/hwclock -s - export NIX_STORE=/nix/store + export NIX_STORE=${storeDir} export NIX_BUILD_TOP=/tmp export TMPDIR=/tmp export PATH=/empty @@ -220,7 +221,7 @@ rec { ${lib.optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ -nographic -no-reboot \ -device virtio-rng-pci \ - -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ + -virtfs local,path=${storeDir},security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -drive file=$diskImage,if=virtio,cache=unsafe,werror=report \ -kernel ${kernel}/${img} \ @@ -298,7 +299,7 @@ rec { /* Run a derivation in a Linux virtual machine (using Qemu/KVM). By default, there is no disk image; the root filesystem is a tmpfs, - and /nix/store is shared with the host (via the 9P protocol). + and the nix store is shared with the host (via the 9P protocol). Thus, any pure Nix derivation should run unmodified, e.g. the call @@ -434,8 +435,8 @@ rec { chroot=$(type -tP chroot) # Make the Nix store available in /mnt, because that's where the RPMs live. - mkdir -p /mnt/nix/store - ${utillinux}/bin/mount -o bind /nix/store /mnt/nix/store + mkdir -p /mnt${storeDir} + ${utillinux}/bin/mount -o bind ${storeDir} /mnt${storeDir} # Newer distributions like Fedora 18 require /lib etc. to be # symlinked to /usr. @@ -474,7 +475,7 @@ rec { rm /mnt/.debug - ${utillinux}/bin/umount /mnt/nix/store /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"} + ${utillinux}/bin/umount /mnt${storeDir} /mnt/tmp ${lib.optionalString unifiedSystemDir "/mnt/proc"} ${utillinux}/bin/umount /mnt ''; @@ -537,8 +538,7 @@ rec { # Hacky: RPM looks for .spec inside the tarball, so # strip off the hash. - stripHash "$src" - srcName="$strippedName" + srcName="$(stripHash "$src")" cp "$src" "$srcName" # `ln' doesn't work always work: RPM requires that the file is owned by root export HOME=/tmp/home @@ -605,8 +605,8 @@ rec { done # Make the Nix store available in /mnt, because that's where the .debs live. - mkdir -p /mnt/inst/nix/store - ${utillinux}/bin/mount -o bind /nix/store /mnt/inst/nix/store + mkdir -p /mnt/inst${storeDir} + ${utillinux}/bin/mount -o bind ${storeDir} /mnt/inst${storeDir} ${utillinux}/bin/mount -o bind /proc /mnt/proc ${utillinux}/bin/mount -o bind /dev /mnt/dev @@ -654,7 +654,7 @@ rec { rm /mnt/.debug - ${utillinux}/bin/umount /mnt/inst/nix/store + ${utillinux}/bin/umount /mnt/inst${storeDir} ${utillinux}/bin/umount /mnt/proc ${utillinux}/bin/umount /mnt/dev ${utillinux}/bin/umount /mnt @@ -1886,22 +1886,22 @@ rec { }; debian8i386 = { - name = "debian-8.5-jessie-i386"; - fullName = "Debian 8.5 Jessie (i386)"; + name = "debian-8.6-jessie-i386"; + fullName = "Debian 8.6 Jessie (i386)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz; - sha256 = "f87a1ee673b335c28cb6ac87be61d6ef20f32dd847835c2bb7d400a00a464c7f"; + sha256 = "b915c936233609af3ecf9272cd53fbdb2144d463e8472a30507aa112ef5e6a6b"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian8x86_64 = { - name = "debian-8.5-jessie-amd64"; - fullName = "Debian 8.5 Jessie (amd64)"; + name = "debian-8.6-jessie-amd64"; + fullName = "Debian 8.6 Jessie (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz; - sha256 = "df6aea15d5547ae8dc6d7ceadc8bf6499bc5a3907d13231f811bf3c1c22474ef"; + sha256 = "8b80b6608a8fc72509b949efe1730077f0e8383b29c6aed5f86d9f9b51a631d8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index 8eeebf40134..a488cb58e6f 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -10,6 +10,7 @@ stdenv.mkDerivation rec { }; makeFlags = [ "MANDIR=$(out)/share/man" ]; + outputDocdev = "out"; meta = with stdenv.lib; { description = "Linux development manual pages"; diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix index ce38dd9c61a..04683ceddb3 100644 --- a/pkgs/data/documentation/std-man-pages/default.nix +++ b/pkgs/data/documentation/std-man-pages/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v"; }; - outputDocdev = "out"; + outputDevdoc = "out"; installPhase = '' mkdir -p $out/share/man diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 249e5b6841b..114c8ebce98 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l"; }; - outputDocdev = "out"; + outputDevdoc = "out"; preConfigure = " patchShebangs ./configure @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { formatting for easy readability."; homepage = https://github.com/jeaye/stdman; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = [ maintainers.twey ]; }; } diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix index 89e5d83df61..a4ecc24d3a6 100644 --- a/pkgs/data/documentation/zeal/default.nix +++ b/pkgs/data/documentation/zeal/default.nix @@ -2,14 +2,14 @@ , qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }: stdenv.mkDerivation rec { - version = "0.2.1"; + version = "0.3.0"; name = "zeal-${version}"; src = fetchFromGitHub { owner = "zealdocs"; repo = "zeal"; rev = "v${version}"; - sha256 = "1j1nfvkwkb2xdh289q5gdb526miwwqmqjyd6fz9qm5dg467wmwa3"; + sha256 = "1f0nsnily2lsrraj1f8j34lqhiskiyq22clkci7w4h2zfv35j1s0"; }; buildInputs = [ @@ -34,4 +34,3 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [ skeidel ]; }; } - diff --git a/pkgs/data/fonts/cabin/default.nix b/pkgs/data/fonts/cabin/default.nix new file mode 100644 index 00000000000..8e432db8418 --- /dev/null +++ b/pkgs/data/fonts/cabin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "cabin-1.005"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Cabin"; + rev = "982839c790e9dc57c343972aa34c51ed3b3677fd"; + sha256 = "16v7spviphvdh2rrr8klv11lc9hxphg12ddf0qs7xdx801ri0ppn"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A humanist sans with 4 weights and true italics"; + longDescription = '' + The Cabin font family is a humanist sans with 4 weights and true italics, + inspired by Edward Johnston’s and Eric Gill’s typefaces, with a touch of + modernism. Cabin incorporates modern proportions, optical adjustments, and + some elements of the geometric sans. It remains true to its roots, but has + its own personality. + + The weight distribution is almost monotone, although top and bottom curves + are slightly thin. Counters of the b, g, p and q are rounded and optically + adjusted. The curved stem endings have a 10 degree angle. E and F have + shorter center arms. M is splashed. + ''; + homepage = http://www.impallari.com/cabin; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/camingo-code/default.nix b/pkgs/data/fonts/camingo-code/default.nix new file mode 100644 index 00000000000..bc1402270aa --- /dev/null +++ b/pkgs/data/fonts/camingo-code/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "camingo-code-${version}"; + version = "1.0"; + + src = fetchurl { + url = https://github.com/chrissimpkins/codeface/releases/download/font-collection/codeface-fonts.zip; + sha256 = "1gbpfa5mqyhi5yrb6dl708pggiwp002b532fn3axiagb0cxxf02s"; + }; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v camingo-code/*.ttf $out/share/fonts/truetype/ + cp -v camingo-code/*.txt $out/share/doc/${name}/ + ''; + + meta = with stdenv.lib; { + homepage = https://www.myfonts.com/fonts/jan-fromm/camingo-code/; + description = "A monospaced typeface designed for source-code editors"; + platforms = platforms.all; + license = licenses.cc-by-nd-30; + }; +} diff --git a/pkgs/data/fonts/dosis/default.nix b/pkgs/data/fonts/dosis/default.nix new file mode 100644 index 00000000000..28b9ee2f1e7 --- /dev/null +++ b/pkgs/data/fonts/dosis/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "dosis-1.007"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Dosis"; + rev = "12df1e13e58768f20e0d48ff15651b703f9dd9dc"; + sha256 = "0glniyg07z5gx5gsa1ymarg2gsncjyf94wi6j9bf68v5s2w3v7md"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF v1.007 Fontlab/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A very simple, rounded, sans serif family"; + longDescription = '' + Dosis is a very simple, rounded, sans serif family. + + The lighter weights are minimalist. The bolder weights have more + personality. The medium weight is nice and balanced. The overall result is + a family that's clean and modern, and can express a wide range of + voices & feelings. + + It comes in 7 incremental weights: ExtraLight, Light, Book, Medium, + Semibold, Bold & ExtraBold + ''; + homepage = http://www.impallari.com/dosis; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix index 784dfe71007..8051606632d 100644 --- a/pkgs/data/fonts/droid/default.nix +++ b/pkgs/data/fonts/droid/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sourceRoot = "./"; unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + ttfName=$(basename $(stripHash $curSrc)) cp $curSrc ./$ttfName ''; diff --git a/pkgs/data/fonts/encode-sans/default.nix b/pkgs/data/fonts/encode-sans/default.nix new file mode 100644 index 00000000000..e0f79b2722c --- /dev/null +++ b/pkgs/data/fonts/encode-sans/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "encode-sans-1.002"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Encode-Sans"; + rev = "11162b46892d20f55bd42a00b48cbf06b5871f75"; + sha256 = "1v5k79qlsl6nggilmjw56axwwr2b3838x6vqch4lh0dck5ri9w2c"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A versatile sans serif font family"; + longDescription = '' + The Encode Sans family is a versatile workhorse. Featuring a huge range of + weights and widths, it's ready for all kind of typographic challenges. It + also includes Tabular and Old Style figures, as well as full set of Small + Caps and other Open Type features. + + Designed by Pablo Impallari and Andres Torresi. + ''; + homepage = http://www.impallari.com/projects/overview/encode; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 86dd001374f..4fae5378463 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "fira-code-${version}"; - version = "1.201"; + version = "1.203"; src = fetchurl { url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; - sha256 = "11hwpdqj41wvzc8l8zgfb132cxn8kxpxbgiqc2kinc25x2l1ikji"; + sha256 = "0pjziaklmkpl67ybp45q9ndya5adf9x8svhdv9643dq9jsrxbkj1"; }; sourceRoot = "otf"; diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix index 0e41cd4e6b7..62e99079d17 100644 --- a/pkgs/data/fonts/google-fonts/default.nix +++ b/pkgs/data/fonts/google-fonts/default.nix @@ -1,15 +1,34 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "google-fonts"; - version = "2015-11-18"; + name = "google-fonts-${version}"; + version = "2016-08-30"; - src = fetchurl { - url = "https://github.com/google/fonts/archive/a26bc2b9f4ad27266c2587dc0355b3066519844a.tar.gz"; - sha256 = "1aizwzsxg30mjds1628280bs7ishgsfairnx131654gm51aihw8p"; + src = fetchFromGitHub { + owner = "google"; + repo = "fonts"; + rev = "7a4070f65f2ca85ffdf2d465ff5e095005bae197"; + sha256 = "0c20vcsd0jki8drrim68z2ca0cxli4wyh1i1gyg4iyac0a0v8wx3"; }; - phases = [ "unpackPhase" "installPhase" ]; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "13n2icpdp1z7i14rnfwkjdydhbjgdvyl1crd71hfy6l1j2p3kzyf"; + + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + + patchPhase = '' + # These directories need to be removed because they contain + # older or duplicate versions of fonts also present in other + # directories. This causes non-determinism in the install since + # the installation order of font files with the same name is not + # fixed. + rm -rv ofl/alefhebrew \ + ofl/misssaintdelafield \ + ofl/mrbedford \ + ofl/siamreap \ + ofl/terminaldosislight + ''; installPhase = '' dest=$out/share/fonts/truetype @@ -18,10 +37,6 @@ stdenv.mkDerivation rec { chmod -x $dest/*.ttf ''; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - outputHash = "0q03gg0sh2mljlbmhamnxz28d13znh9dzca84p554s7pwg6z4wca"; - meta = with stdenv.lib; { homepage = https://www.google.com/fontsl; description = "Font files available from Google Font"; diff --git a/pkgs/data/fonts/input-fonts/default.nix b/pkgs/data/fonts/input-fonts/default.nix new file mode 100644 index 00000000000..8cfda1a5e9c --- /dev/null +++ b/pkgs/data/fonts/input-fonts/default.nix @@ -0,0 +1,46 @@ +{ stdenv, requireFile, unzip }: + +stdenv.mkDerivation rec { + name = "input-fonts-${version}"; + version = "2016-10-06"; # date of the download and checksum + + src = requireFile { + name = "Input-Font.zip"; + url = "http://input.fontbureau.com/download/"; + sha256 = "06hrsrb5a6hzrgkkhk0gdj92rhgr433vgn4j5g3pd8f1ijlfqn4y"; + }; + + nativeBuildInputs = [ unzip ]; + + phases = [ "unpackPhase" "installPhase" ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + find Input_Fonts -name "*.ttf" -exec cp -a {} "$out"/share/fonts/truetype/ \; + mkdir -p "$out"/share/doc + cp -a *.txt "$out"/share/doc/ + ''; + + meta = with stdenv.lib; { + description = "Fonts for Code, from Font Bureau"; + longDescrition = '' + Input is a font family designed for computer programming, data, + and text composition. It was designed by David Jonathan Ross + between 2012 and 2014 and published by The Font Bureau. It + contains a wide array of styles so you can fine-tune the + typography that works best in your editing environment. + + Input Mono is a monospaced typeface, where all characters occupy + a fixed width. Input Sans and Serif are proportional typefaces + that are designed with all of the features of a good monospace — + generous spacing, large punctuation, and easily distinguishable + characters — but without the limitations of a fixed width. + ''; + homepage = http://input.fontbureau.com; + license = licenses.unfree; + maintainers = with maintainers; [ romildo ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/lato/default.nix b/pkgs/data/fonts/lato/default.nix new file mode 100644 index 00000000000..8d1111090aa --- /dev/null +++ b/pkgs/data/fonts/lato/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "lato-2.0"; + + src = fetchurl { + url = http://www.latofonts.com/download/Lato2OFL.zip; + sha256 = "1f5540g0ja1nx3ddd3ywn77xc81ssrxpq8n3gyb9sabyq2b4xda2"; + }; + + sourceRoot = "Lato2OFL"; + + buildInputs = [ unzip ]; + + installPhase = '' + mkdir -p $out/share/fonts/lato + cp *.ttf $out/share/fonts/lato + ''; + + meta = with stdenv.lib; { + homepage = http://www.latofonts.com/; + + description = '' + Sans-serif typeface family designed in Summer 2010 by Łukasz Dziedzic + ''; + + longDescription = '' + Lato is a sans-serif typeface family designed in the Summer 2010 by + Warsaw-based designer Łukasz Dziedzic ("Lato" means "Summer" in Polish). + In December 2010 the Lato family was published under the open-source Open + Font License by his foundry tyPoland, with support from Google. + + In 2013-2014, the family was greatly extended to cover 3000+ glyphs per + style. The Lato 2.010 family now supports 100+ Latin-based languages, 50+ + Cyrillic-based languages as well as Greek and IPA phonetics. In the + process, the metrics and kerning of the family have been revised and four + additional weights were created. + ''; + + license = licenses.ofl; + platforms = platforms.all; + maintainers = with maintainers; [ chris-martin ]; + }; +} diff --git a/pkgs/data/fonts/libre-baskerville/default.nix b/pkgs/data/fonts/libre-baskerville/default.nix new file mode 100644 index 00000000000..64779b5d388 --- /dev/null +++ b/pkgs/data/fonts/libre-baskerville/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-baskerville-1.000"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Baskerville"; + rev = "2fba7c8e0a8f53f86efd3d81bc4c63674b0c613f"; + sha256 = "0i9ra6ip81zzjxl71p8zwa6ymlmkf4yi5ny22vlwx9a53kbf4ifl"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + mkdir -p $out/share/doc/${name} + cp -v *.ttf $out/share/fonts/truetype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A webfont family optimized for body text"; + longDescription = '' + Libre Baskerville is a webfont family optimized for body text. It's Based + on 1941 ATF Baskerville Specimens but it has a taller x-height, wider + counters and less contrast that allow it to work on small sizes in any + screen. + ''; + homepage = http://www.impallari.com/projects/overview/libre-baskerville; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-bodoni/default.nix b/pkgs/data/fonts/libre-bodoni/default.nix new file mode 100644 index 00000000000..691d5556e8f --- /dev/null +++ b/pkgs/data/fonts/libre-bodoni/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-bodoni-2.000"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Bodoni"; + rev = "995a40e8d6b95411d660cbc5bb3f726ffd080c7d"; + sha256 = "1ncfkvmcxh2lphfra43h8482qglpd965v96agvz092697xwrbyn9"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/v2000 - initial glyphs migration/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "Bodoni fonts adapted for today's web requirements"; + longDescription = '' + The Libre Bodoni fonts are based on the 19th century Morris Fuller + Benton's ATF design, but specifically adapted for today's web + requirements. + + They are a perfect choice for everything related to elegance, style, + luxury and fashion. + + Libre Bodoni currently features four styles: Regular, Italic, Bold and + Bold Italic. + ''; + homepage = https://github.com/impallari/Libre-Bodoni; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-caslon/default.nix b/pkgs/data/fonts/libre-caslon/default.nix new file mode 100644 index 00000000000..5037cb81f39 --- /dev/null +++ b/pkgs/data/fonts/libre-caslon/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-caslon-${version}"; + version = "1.002"; + + srcs = [ + (fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Caslon-Text"; + rev = "c31e21f7e8cf91f18d90f778ce20e66c68219c74"; + name = "libre-caslon-text-${version}-src"; + sha256 = "0zczv9qm8cgc7w1p64mnf0p0fi7xv89zhf1zzf1qcna15kbgc705"; + }) + + (fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Caslon-Display"; + rev = "3491f6a9cfde2bc15e736463b0bc7d93054d5da1"; + name = "libre-caslon-display-${version}-src"; + sha256 = "12jrny3y8w8z61lyw470drnhliji5b24lgxap4w3brp6z3xjph95"; + }) + ]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "libre-caslon-text-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v "libre-caslon-display-${version}-src/fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v libre-caslon-text-${version}-src/README.md libre-caslon-text-${version}-src/FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "Caslon fonts based on hand-lettered American Caslons of 1960s"; + homepage = http://www.impallari.com/librecaslon; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/libre-franklin/default.nix b/pkgs/data/fonts/libre-franklin/default.nix new file mode 100644 index 00000000000..473102d77ef --- /dev/null +++ b/pkgs/data/fonts/libre-franklin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "libre-franklin-1.014"; + + src = fetchFromGitHub { + owner = "impallari"; + repo = "Libre-Franklin"; + rev = "006293f34c47bd752fdcf91807510bc3f91a0bd3"; + sha256 = "0df41cqhw5dz3g641n4nd2jlqjf5m4fkv067afk3759m4hg4l78r"; + }; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + mkdir -p $out/share/doc/${name} + cp -v "fonts/OTF/"*.otf $out/share/fonts/opentype/ + cp -v README.md FONTLOG.txt $out/share/doc/${name} + ''; + + meta = with stdenv.lib; { + description = "A reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic."; + homepage = https://github.com/impallari/Libre-Franklin; + license = licenses.ofl; + maintainers = with maintainers; [ cmfwyp ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/fonts/mplus-outline-fonts/default.nix b/pkgs/data/fonts/mplus-outline-fonts/default.nix index 22a5245ec40..e3d09adba57 100644 --- a/pkgs/data/fonts/mplus-outline-fonts/default.nix +++ b/pkgs/data/fonts/mplus-outline-fonts/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mplus-${version}"; - version = "059"; + version = "061"; src = fetchurl { - url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-059.tar.xz"; - sha256 = "09dzdgqqflpijd3c30m38cyidshawfp4nz162xhn91j9w09y2qkq"; + url = "mirror://sourceforgejp/mplus-fonts/62344/mplus-TESTFLIGHT-${version}.tar.xz"; + sha256 = "1yrv65l2y8f9jmpalqb5iiay7z1x3754mnqpgp2bax72g8k8728g"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/pkgs/data/fonts/roboto-mono/default.nix b/pkgs/data/fonts/roboto-mono/default.nix index 451725a6d80..e9eff414bc1 100644 --- a/pkgs/data/fonts/roboto-mono/default.nix +++ b/pkgs/data/fonts/roboto-mono/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { sourceRoot = "./"; unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + ttfName=$(basename $(stripHash $curSrc)) cp $curSrc ./$ttfName ''; diff --git a/pkgs/data/fonts/roboto-slab/default.nix b/pkgs/data/fonts/roboto-slab/default.nix index ade9fd2350e..5a8a3f3c120 100644 --- a/pkgs/data/fonts/roboto-slab/default.nix +++ b/pkgs/data/fonts/roboto-slab/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { sourceRoot = "./"; unpackCmd = '' - ttfName=$(basename $(stripHash $curSrc; echo $strippedName)) + ttfName=$(basename $(stripHash $curSrc)) cp $curSrc ./$ttfName ''; diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix new file mode 100644 index 00000000000..f4f81f8de8b --- /dev/null +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "maia-icon-theme-${version}"; + version = "2016-09-16"; + + src = fetchFromGitHub { + owner = "manjaro"; + repo = "artwork-maia"; + rev = "f6718cd9c383adb77af54b694c47efa4d581f5b5"; + sha256 = "0f9l3k9abgg8islzddrxgbxaw6vbai5bvz5qi1v2fzir7ykx7bgj"; + }; + + dontBuild = true; + + installPhase = '' + install -dm 755 $out/share/icons + for f in "" "-dark"; do + rm icons$f/CMakeLists.txt + cp -dr --no-preserve='ownership' icons$f $out/share/icons/maia$f + done + ''; + + meta = with stdenv.lib; { + description = "Icons based on Breeze and Super Flat Remix"; + homepage = https://github.com/manjaro/artwork-maia; + license = licenses.free; + maintainers = [ maintainers.mounium ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 414360f2d7a..5c7464098ad 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, numix-icon-theme }: stdenv.mkDerivation rec { - version = "2016-06-10"; + version = "2016-09-27"; package-name = "numix-icon-theme-circle"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "577b8a2a8dd6429f7d3df37b15d9fd7fcbb58d56"; - sha256 = "1zx26ng6z45j1yff2m0cng4nffk8swdq1pya1l2dm7841mx5ram4"; + rev = "481bc1100f01e25e92deb7facf61436b27f9ca8a"; + sha256 = "0fkr7w6z6sz5yblgshr3qr2bszia6dsjszv3gmcbi2xqvjjd8wij"; }; buildInputs = [ numix-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 735d1544cf5..be224f418e8 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2016-06-10"; + version = "2016-10-05"; package-name = "numix-icon-theme"; @@ -10,8 +10,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "numixproject"; repo = package-name; - rev = "8196e9eaa5a60b5c02a9e37a4ca768b07966b41f"; - sha256 = "0cyv0r66vil54y6w317msddq2fjs9zhrdx17m3bx85xpqz67zq5i"; + rev = "e03eb71454c176a98733eafa268ff79995f8159d"; + sha256 = "1f8prwq9zvzfk0ncwzbrwkpjggc8nadny81dqv1cr0014jc85bxi"; }; dontBuild = true; diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index 55be87c9ab7..0004302ab97 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = "--enable-png-creation"; - postInstall = '''${gtk.dev}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; + postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; meta = { description = "A basic set of icons"; diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix index 3ce6dc81a39..5095fce8958 100644 --- a/pkgs/data/misc/cacert/default.nix +++ b/pkgs/data/misc/cacert/default.nix @@ -1,25 +1,49 @@ -{ stdenv, nss, curl, perl }: +{ stdenv, fetchurl, writeText, nss, python +, blacklist ? [] +, includeEmail ? false +}: + +with stdenv.lib; + +let + + certdata2pem = fetchurl { + name = "certdata2pem.py"; + url = "https://anonscm.debian.org/cgit/collab-maint/ca-certificates.git/plain/mozilla/certdata2pem.py?h=debian/20160104"; + sha256 = "0bw11mgfrf19qziyvdnq22kirp0nn54lfsanrg5h6djs6ig1c2im"; + }; + +in stdenv.mkDerivation rec { name = "nss-cacert-${nss.version}"; src = nss.src; - postPatch = '' - unpackFile ${curl.src}; + nativeBuildInputs = [ python ]; - # Remove dependency on LWP, curl is enough. Also, since curl here - # is working on a local file it will not actually get a 200 OK, so - # remove that expectation. - substituteInPlace curl-*/lib/mk-ca-bundle.pl \ - --replace 'use LWP::UserAgent;' "" \ - --replace ' && $out[0] == 200' "" + configurePhase = '' + ln -s nss/lib/ckfw/builtins/certdata.txt + + cat << EOF > blacklist.txt + ${concatStringsSep "\n" (map (c: ''"${c}"'') blacklist)} + EOF + + cp ${certdata2pem} certdata2pem.py + ${optionalString includeEmail '' + # Disable CAs used for mail signing + substituteInPlace certdata2pem.py --replace \[\'CKA_TRUST_EMAIL_PROTECTION\'\] ''' + ''} ''; - nativeBuildInputs = [ curl perl ]; - buildPhase = '' - perl curl-*/lib/mk-ca-bundle.pl -d "file://$(pwd)/nss/lib/ckfw/builtins/certdata.txt" ca-bundle.crt + python certdata2pem.py | grep -vE '^(!|UNTRUSTED)' + + for cert in *.crt; do + echo $cert | cut -d. -f1 | sed -e 's,_, ,g' >> ca-bundle.crt + cat $cert >> ca-bundle.crt + echo >> ca-bundle.crt + done ''; installPhase = '' @@ -27,10 +51,10 @@ stdenv.mkDerivation rec { cp -v ca-bundle.crt $out/etc/ssl/certs ''; - meta = with stdenv.lib; { + meta = { homepage = http://curl.haxx.se/docs/caextract.html; description = "A bundle of X.509 certificates of public Certificate Authorities (CA)"; platforms = platforms.all; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington fpletz ]; }; } diff --git a/pkgs/data/misc/ddccontrol-db/default.nix b/pkgs/data/misc/ddccontrol-db/default.nix index 3757b10754b..3db05bd4d51 100644 --- a/pkgs/data/misc/ddccontrol-db/default.nix +++ b/pkgs/data/misc/ddccontrol-db/default.nix @@ -5,7 +5,7 @@ , libxml2 , pciutils , pkgconfig -, gtk +, gtk2 }: let version = "20061014"; in @@ -23,7 +23,7 @@ stdenv.mkDerivation { libxml2 pciutils pkgconfig - gtk + gtk2 ]; meta = with stdenv.lib; { diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh index 70fd729297c..939305d486a 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/builder.sh @@ -3,5 +3,4 @@ source $stdenv/setup mkdir -p $out/xml/dtd/docbook-ebnf cd $out/xml/dtd/docbook-ebnf cp -p $dtd dbebnf.dtd -stripHash $catalog -cp -p $catalog $strippedName +cp -p $catalog $(stripHash $catalog) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix index 0df76cd2876..e9ff03f7843 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook-ebnf/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { builder = ./builder.sh; dtd = fetchurl { url = http://www.docbook.org/xml/ebnf/1.2b1/dbebnf.dtd; - md5 = "e50f7d38caf4285965c7a247e026fa7c"; + sha256 = "0min5dsc53my13b94g2yd65q1nkjcf4x1dak00bsc4ckf86mrx95"; }; catalog = ./docbook-ebnf.cat; diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 478dd68e8bb..19ad49aa928 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -5,7 +5,7 @@ import ./generic.nix { name = "docbook-xml-4.3"; src = fetchurl { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; - md5 = "ab200202b9e136a144db1e0864c45074"; + sha256 = "0r1l2if1z4wm2v664sqdizm4gak6db1kx9y50jq89m3gxaa8l1i3"; }; meta = { branch = "4.3"; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index b8b3d82ccb6..d3aadbcd5a1 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.18.0"; + version = "1.18.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz"; - sha256 = "17mzbjmz8d2vs8p63r1sk3mppl3l2fhxy2jv24dp75lgqbsvp806"; + sha256 = "08njx6wd505as1vn0yp4mnmf6mb2v28jsipxxx4zhf78v18d2sqc"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index b019951db5f..94ce68f9cb2 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let - inherit (pythonPackages) python pygobject pygtk dbus-python; + inherit (pythonPackages) python pygobject2 pygtk dbus-python; in stdenv.mkDerivation rec { version = "2.28"; name = "gnome-python-${version}.1"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/ ''; - buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome dbus-python gnome_vfs ]; + buildInputs = [ python pkgconfig pygobject2 pygtk glib gtk GConf libgnome dbus-python gnome_vfs ]; doCheck = false; diff --git a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix index 1e2faf3af84..c862bee0c90 100644 --- a/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix +++ b/pkgs/desktops/gnome-2/bindings/python-rsvg/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, gnome, librsvg, pkgconfig, pygtk, python, gtk }: +{ stdenv, fetchurl, gnome2, librsvg, pkgconfig, python27Packages, gtk }: -stdenv.mkDerivation rec { +let + inherit (python27Packages) python pygtk; +in stdenv.mkDerivation rec { ver_maj = "2.32"; ver_min = "0"; version = "${ver_maj}.${ver_min}"; @@ -20,7 +22,7 @@ stdenv.mkDerivation rec { installPhase = "python waf install"; - buildInputs = [ gtk gnome.gnome_python librsvg pkgconfig pygtk python ]; + buildInputs = [ gtk gnome2.gnome_python librsvg pkgconfig pygtk python ]; meta = with stdenv.lib; { homepage = "http://www.pygtk.org"; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix index 11f874a0e89..ff4abf26ac8 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix @@ -2,7 +2,8 @@ , shared_mime_info, desktop_file_utils, libunique, libtool, bzip2 , glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd , librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon -, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}: +, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2 +, libSM }: stdenv.mkDerivation { name = "gnome-control-center-2.32.1"; @@ -14,6 +15,8 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 - libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ]; + libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon + libSM + ]; configureFlags = "--disable-scrollkeeper"; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix index ccabff27549..7678cb3a4b4 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf, upower }: +, intltool, libglade, startup_notification, GConf, upower, libSM }: stdenv.mkDerivation { name = "gnome-session-2.32.1"; @@ -11,7 +11,10 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib gtk libXau libXtst inputproto libglade startup_notification - GConf upower + GConf upower libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; + + # gconf-sanity-check-2 not found + meta.broken = true; } diff --git a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix index 93dfa544ea9..37f99539686 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-2/desktop/gnome-settings-daemon/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk -, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio }: +, intltool, GConf, gnome_desktop, libglade, libgnomekbd, polkit, libpulseaudio +, libSM }: stdenv.mkDerivation { name = "gnome-settings-daemon-2.32.1"; @@ -11,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd polkit - libpulseaudio + libpulseaudio libSM ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/desktops/gnome-2/desktop/vte/default.nix b/pkgs/desktops/gnome-2/desktop/vte/default.nix index b086c64abff..7b23d91e549 100644 --- a/pkgs/desktops/gnome-2/desktop/vte/default.nix +++ b/pkgs/desktops/gnome-2/desktop/vte/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchurl, intltool, pkgconfig, glib, gtk, ncurses -, pythonSupport ? false, python, pygtk}: +, pythonSupport ? false, python27Packages}: -stdenv.mkDerivation rec { +let + inherit (python27Packages) python pygtk; +in stdenv.mkDerivation rec { name = "vte-0.28.2"; src = fetchurl { diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix index b848296d5f0..d1f748c993d 100644 --- a/pkgs/desktops/gnome-2/platform/GConf/default.nix +++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, dbus_glib, glib, ORBit2, libxml2 -, polkit, intltool, dbus_libs, gtk ? null, withGtk ? false }: +, polkit, intltool, dbus_libs, gtk2 ? null, withGtk ? false }: -assert withGtk -> (gtk != null); +assert withGtk -> (gtk2 != null); stdenv.mkDerivation { name = "gconf-2.32.4"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { # polkit requires pam, which requires shadow.h, which is not available on # darwin ++ stdenv.lib.optional (!stdenv.isDarwin) polkit - ++ stdenv.lib.optional withGtk gtk; + ++ stdenv.lib.optional withGtk gtk2; propagatedBuildInputs = [ glib ]; diff --git a/pkgs/desktops/gnome-2/platform/at-spi/default.nix b/pkgs/desktops/gnome-2/platform/at-spi/default.nix index e7f3f565902..6be2a440879 100644 --- a/pkgs/desktops/gnome-2/platform/at-spi/default.nix +++ b/pkgs/desktops/gnome-2/platform/at-spi/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation { sha256 = "0fbh0afzw1gm4r2w68b8l0vhnia1qyzdl407vyxfw4v4fkm1v16c"; }; + hardeningDisable = [ "format" ]; + buildInputs = [ python pkgconfig popt atk gtk libX11 libICE libXtst libXi intltool libbonobo ORBit2 GConf dbus_glib ]; } diff --git a/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix index dbea187cee0..37595ae27d7 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/file-roller/src.nix @@ -1,10 +1,10 @@ # Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { - name = "file-roller-3.20.2"; + name = "file-roller-3.20.3"; src = fetchurl { - url = mirror://gnome/sources/file-roller/3.20/file-roller-3.20.2.tar.xz; - sha256 = "93188a7ac9285cb85551c327082aeaeb51ac39a9722cb96b0e29d5ec2ae353c6"; + url = mirror://gnome/sources/file-roller/3.20/file-roller-3.20.3.tar.xz; + sha256 = "6b5c2de4c6bd52318cacd2a398cdfa45a5f1df8a77c6652a38a6a1d3e53644e9"; }; } diff --git a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix index caff53dcc1d..8625f21f3db 100644 --- a/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/3.20/apps/gnome-maps/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3 , gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook -, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }: +, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup +, webkitgtk }: stdenv.mkDerivation rec { inherit (import ./src.nix fetchurl) name src; @@ -12,7 +13,8 @@ stdenv.mkDerivation rec { gnome3.geocode_glib libchamplain file libsoup gdk_pixbuf librsvg autoreconfHook gnome3.gsettings_desktop_schemas gnome3.evolution_data_server - gnome3.gnome_online_accounts gnome3.defaultIconTheme ]; + gnome3.gnome_online_accounts gnome3.defaultIconTheme + webkitgtk ]; patches = [ ./soup.patch ]; diff --git a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix index f3995e6bc2c..d6962861e5c 100644 --- a/pkgs/desktops/gnome-3/3.20/core/eog/src.nix +++ b/pkgs/desktops/gnome-3/3.20/core/eog/src.nix @@ -4,7 +4,7 @@ fetchurl: { name = "eog-3.20.4"; src = fetchurl { - url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz; - sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n"; + url = mirror://gnome/sources/eog/3.20/eog-3.20.4.tar.xz; + sha256 = "1qsv3brhi8l8fr22nd3d0fwq5xhwspqw0bammhkkq3ga0z6791wn"; }; } diff --git a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix index d50036a597e..13efcd61392 100644 --- a/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/epiphany/default.nix @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { webkitgtk libsoup libsecret gnome_desktop libnotify libtool sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common - gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf ]; + gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf + gnome3.glib_networking ]; NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0"; diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix index e77e9e19970..78fc82ebaed 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-control-center/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper -, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio +, libcanberra_gtk2, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio , gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk , cracklib, python, libkrb5, networkmanagerapplet, networkmanager @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; buildInputs = with gnome3; - [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas + [ pkgconfig intltool ibus gtk glib upower libcanberra_gtk2 gsettings_desktop_schemas libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile diff --git a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix index d0d7bceef61..cf781d24b6f 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gnome-shell/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice - libcroco intltool libsecret pkgconfig libsoup polkit libcanberra gdk_pixbuf librsvg + libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server libical libtool nss gtk gstreamer makeWrapper gdm diff --git a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix index 5f255743313..95785d9ed4d 100644 --- a/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/gsound/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }: +{ stdenv, fetchurl, pkgconfig, glib, libcanberra_gtk2, gobjectIntrospection, libtool, gnome3 }: let majVer = "1.0"; @@ -10,7 +10,7 @@ in stdenv.mkDerivation rec { sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29"; }; - buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ]; + buildInputs = [ pkgconfig glib libcanberra_gtk2 gobjectIntrospection libtool ]; meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; diff --git a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix index a128990b402..8b992d30e80 100644 --- a/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/mutter/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo -, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3 +, pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3 , libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = with gnome3; [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower - gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra + gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2 gnome3.geocode_glib libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ]; diff --git a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix index 194b4aca438..884b328dbe7 100644 --- a/pkgs/desktops/gnome-3/3.20/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/totem/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { patches = [ ./x86.patch ]; - propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject ]; + propagatedBuildInputs = [ gobjectIntrospection python3Packages.pylint python3Packages.pygobject2 ]; configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ]; diff --git a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix index 80699e21289..7d2f0434641 100644 --- a/pkgs/desktops/gnome-3/3.20/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.20/core/vte/default.nix @@ -39,12 +39,12 @@ let baseAttrs = rec { in stdenv.mkDerivation ( baseAttrs // stdenv.lib.optionalAttrs selectTextPatch rec { name = "vte-ng-${version}"; - version = "0.42.4.a"; + version = "0.44.1b-ng"; src = fetchFromGitHub { owner = "thestinger"; repo = "vte-ng"; rev = version; - sha256 = "1w91lz30j5lrskp9ds5j3nn27m5mpdpn7nlcvf5y1w63mpmjg8k1"; + sha256 = "0p61znma9742fd3c6b44rq7j6mhpr6gx2b9rldm3jhb62ss4vsyy"; }; # slightly hacky; I couldn't make it work with autoreconfHook configureScript = "./autogen.sh"; diff --git a/pkgs/desktops/gnome-3/3.20/default.nix b/pkgs/desktops/gnome-3/3.20/default.nix index a1a7390274e..e935552b9f5 100644 --- a/pkgs/desktops/gnome-3/3.20/default.nix +++ b/pkgs/desktops/gnome-3/3.20/default.nix @@ -45,20 +45,15 @@ let hitori gnome-taquin ]; - inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra; + inherit (pkgs) glib gtk2 webkitgtk24x webkitgtk212x gtk3 gtkmm3 libcanberra_gtk2 + clutter clutter-gst clutter_gtk cogl gtkvnc; inherit (pkgs.gnome2) ORBit2; libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; orbit = ORBit2; gnome3 = self // { recurseForDerivations = false; }; - clutter = pkgs.clutter_1_26; - clutter_gtk = pkgs.clutter_gtk_1_8.override { inherit clutter gtk3; }; - clutter-gst_2 = pkgs.clutter-gst; - clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter cogl; }; - cogl = pkgs.cogl_1_22; gtk = gtk3; gtkmm = gtkmm3; - gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; vala = pkgs.vala_0_32; gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; }; webkitgtk = webkitgtk212x; @@ -272,8 +267,7 @@ let glade = callPackage ./apps/glade { }; gnome-boxes = callPackage ./apps/gnome-boxes { - gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; }; - spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; }; + spice_gtk = pkgs.spice_gtk; }; gnome-calendar = callPackage ./apps/gnome-calendar { }; @@ -392,7 +386,7 @@ let gpaste = callPackage ./misc/gpaste { }; pidgin-im-gnome-shell-extension = callPackage ./misc/pidgin { }; - + gtkhtml = callPackage ./misc/gtkhtml { }; pomodoro = callPackage ./misc/pomodoro { }; diff --git a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix index a2c644caf3c..71bb11d4853 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/geary/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, intltool, pkgconfig, gtk3, vala_0_32 , makeWrapper, gdk_pixbuf, cmake, desktop_file_utils -, libnotify, libcanberra, libsecret, gmime +, libnotify, libcanberra_gtk3, libsecret, gmime , libpthreadstubs, sqlite , gnome3, librsvg, gnome_doc_utils, webkitgtk }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils - vala_0_32 webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite + vala_0_32 webkitgtk libnotify libcanberra_gtk3 gnome3.libgee libsecret gmime sqlite libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr gdk_pixbuf librsvg gnome3.defaultIconTheme ]; diff --git a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix index ff176754e38..1c7f712b12c 100644 --- a/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/3.20/misc/pomodoro/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper, - dbus_glib, libcanberra, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base, + dbus_glib, libcanberra_gtk2, gst_all_1, vala_0_32, gnome3, gtk3, gst_plugins_base, glib, gobjectIntrospection, telepathy_glib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ which automake113x intltool glib gobjectIntrospection pkgconfig libtool - makeWrapper dbus_glib libcanberra vala_0_32 gst_all_1.gstreamer + makeWrapper dbus_glib libcanberra_gtk2 vala_0_32 gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome3.gsettings_desktop_schemas gnome3.gnome_desktop gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib diff --git a/pkgs/desktops/kde-4.14/kactivities.nix b/pkgs/desktops/kde-4.14/kactivities.nix index 9a08b58e1ea..a1f9d0d8171 100644 --- a/pkgs/desktops/kde-4.14/kactivities.nix +++ b/pkgs/desktops/kde-4.14/kactivities.nix @@ -7,6 +7,12 @@ kde { sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7"; }; + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; + propagatedBuildInputs = [ kdelibs nepomuk_core ]; meta = { diff --git a/pkgs/desktops/kde-4.14/kde-package/default.nix b/pkgs/desktops/kde-4.14/kde-package/default.nix index bbb540ec10f..4bb961b8d2e 100644 --- a/pkgs/desktops/kde-4.14/kde-package/default.nix +++ b/pkgs/desktops/kde-4.14/kde-package/default.nix @@ -1,11 +1,11 @@ -{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake-2_8, automoc4, perl, pkgconfig +{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake_2_8, automoc4, perl, pkgconfig , release, branch, ignoreList, extraSubpkgs }: let inherit (stdenv.lib) filter fold; inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head; - cmake = cmake-2_8; + cmake = cmake_2_8; in rec { manifest = import (./. + "/${release}.nix"); diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index cbfe2ebf6d5..a66d189a600 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -1,5 +1,5 @@ { kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info -, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio +, libcanberra, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio , networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib }: @@ -18,8 +18,6 @@ kde { NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include"; - passthru.propagatedUserEnvPackages = [ virtuoso ]; - meta = { license = "LGPL"; }; diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index ac62c970eec..554d6acd9eb 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -5,6 +5,12 @@ }: kde { + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; + nativeBuildInputs = [ automoc4 cmake perl pkgconfig ]; cmakeFlags = [ diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix index 3166b94adaa..980cc9ac25c 100644 --- a/pkgs/desktops/kde-5/applications/default.nix +++ b/pkgs/desktops/kde-5/applications/default.nix @@ -57,6 +57,7 @@ let libkexiv2 = callPackage ./libkexiv2.nix {}; libkipi = callPackage ./libkipi.nix {}; libkomparediff2 = callPackage ./libkomparediff2.nix {}; + marble = callPackage ./marble.nix {}; okular = callPackage ./okular.nix {}; print-manager = callPackage ./print-manager.nix {}; spectacle = callPackage ./spectacle.nix {}; diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh index b3c71c44fcf..c23d8a4d757 100644 --- a/pkgs/desktops/kde-5/applications/fetch.sh +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/applications/16.08.0/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/applications/16.08.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/applications/kdelibs/default.nix b/pkgs/desktops/kde-5/applications/kdelibs/default.nix index ec57c908dc5..c7c8c250a83 100644 --- a/pkgs/desktops/kde-5/applications/kdelibs/default.nix +++ b/pkgs/desktops/kde-5/applications/kdelibs/default.nix @@ -9,7 +9,11 @@ kdeApp { name = "kdelibs"; - outputs = [ "out" ]; + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; nativeBuildInputs = [ automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info diff --git a/pkgs/desktops/kde-5/applications/marble.nix b/pkgs/desktops/kde-5/applications/marble.nix new file mode 100644 index 00000000000..8d6ee5a0f7c --- /dev/null +++ b/pkgs/desktops/kde-5/applications/marble.nix @@ -0,0 +1,24 @@ +{ kdeApp, lib, kdeWrapper +, ecm, qtscript, qtsvg, qtquickcontrols +, gpsd +}: + +let + unwrapped = + kdeApp { + name = "marble"; + meta.license = with lib.licenses; [ lgpl21 gpl3 ]; + + nativeBuildInputs = [ ecm ]; + propagatedBuildInputs = [ + qtscript qtsvg qtquickcontrols + gpsd + ]; + + enableParallelBuilding = true; + }; +in +kdeWrapper unwrapped { + targets = [ "bin/marble-qt" ]; + paths = [ unwrapped ]; +} diff --git a/pkgs/desktops/kde-5/applications/srcs.nix b/pkgs/desktops/kde-5/applications/srcs.nix index 4da2717031f..e3ecd24b6db 100644 --- a/pkgs/desktops/kde-5/applications/srcs.nix +++ b/pkgs/desktops/kde-5/applications/srcs.nix @@ -1,2069 +1,2069 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { akonadi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-16.08.0.tar.xz"; - sha256 = "0xml678j47f9xd2dvyvw2v93yklwkvxamrp2v3739iqp03qfc210"; - name = "akonadi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-16.08.1.tar.xz"; + sha256 = "1km4qis98z19b5vy0g8r52mnd4i301ycf9l96a4vw4q56wmss2f1"; + name = "akonadi-16.08.1.tar.xz"; }; }; akonadi-calendar = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-calendar-16.08.0.tar.xz"; - sha256 = "0g61sbj1ifkw349xmwch6hkazs1n6m92jhc1gm8az4zfnipms8yw"; - name = "akonadi-calendar-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-calendar-16.08.1.tar.xz"; + sha256 = "12bz190cww8r34j0543wavf4d9ydkwszxh1ayxkg6hlf67yv2jpf"; + name = "akonadi-calendar-16.08.1.tar.xz"; }; }; akonadi-contacts = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-contacts-16.08.0.tar.xz"; - sha256 = "1c50nnfk8r351a1pc0hyl03gbmnzqvicj6533gbl60104zg0cl49"; - name = "akonadi-contacts-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-contacts-16.08.1.tar.xz"; + sha256 = "09dx4vi1329fgr2gya833p3zwasz4y8vh4fwlis3669zns6nvn6w"; + name = "akonadi-contacts-16.08.1.tar.xz"; }; }; akonadi-mime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-mime-16.08.0.tar.xz"; - sha256 = "0b541y6ir78f5acdlzzr0bv9q8gd1p4rklrm0pcddvs1d28s5ng2"; - name = "akonadi-mime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-mime-16.08.1.tar.xz"; + sha256 = "16hyz28gjp1b0w6l33cgdrli4b777yanryfr8nn1mp4y8p2375fp"; + name = "akonadi-mime-16.08.1.tar.xz"; }; }; akonadi-notes = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-notes-16.08.0.tar.xz"; - sha256 = "0xwrj9y071g1svmwj1nrfff3vr371va7rm8mmx5hw6ringakgxn6"; - name = "akonadi-notes-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-notes-16.08.1.tar.xz"; + sha256 = "1m95zckfr9wlcjsf3h6v2fg7rbivd28gjj2yddrrv7wx57xmky4j"; + name = "akonadi-notes-16.08.1.tar.xz"; }; }; akonadi-search = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/akonadi-search-16.08.0.tar.xz"; - sha256 = "12lpgm5111dd2ny6fdhcxish397x54mcnma504f3ibk7f3brwnmf"; - name = "akonadi-search-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/akonadi-search-16.08.1.tar.xz"; + sha256 = "1qdqzb9achabb3vs7dm3pi3pk3l8rmk6ymmzlxr79l98cfmw39bk"; + name = "akonadi-search-16.08.1.tar.xz"; }; }; analitza = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/analitza-16.08.0.tar.xz"; - sha256 = "1j8axc4618jb45vxp0ii51sr2wh6vmr1f8ycn3xqnd9ln936qqyz"; - name = "analitza-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/analitza-16.08.1.tar.xz"; + sha256 = "1l08g9gzi6aabzh62cg2k4731nbw8hnfb7qy1mjb4yn2gap0c4cd"; + name = "analitza-16.08.1.tar.xz"; }; }; ark = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ark-16.08.0.tar.xz"; - sha256 = "1a8aklvpk5s319665s1c0mnbzknbyhbq2lm79hflal3r28g3acvj"; - name = "ark-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ark-16.08.1.tar.xz"; + sha256 = "1g9qvxw26hqngvbp4i82lmhpbr4nxidv7pj0sg1ji48jzycjbd3q"; + name = "ark-16.08.1.tar.xz"; }; }; artikulate = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/artikulate-16.08.0.tar.xz"; - sha256 = "1j57y5zwp6zpd2hzh01a13m49rbgkzkf3ncfx122d7vih9f8kzvd"; - name = "artikulate-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/artikulate-16.08.1.tar.xz"; + sha256 = "1rbs6yf3pmhp9xj3lpr0h14pb4mylffhav2nb8sb42hw7c3pjycb"; + name = "artikulate-16.08.1.tar.xz"; }; }; audiocd-kio = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/audiocd-kio-16.08.0.tar.xz"; - sha256 = "0ndb7b67yssmsxlnphpkyk4yx9n3xx2w20q4fz55r6zrp7yphm1a"; - name = "audiocd-kio-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/audiocd-kio-16.08.1.tar.xz"; + sha256 = "15x9nv014sdvc80vqldsgxrgickrrda6hrm26jcvp483qzvpjp82"; + name = "audiocd-kio-16.08.1.tar.xz"; }; }; baloo-widgets = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/baloo-widgets-16.08.0.tar.xz"; - sha256 = "0daf0wkz14p82fl7731r1dhcy2w1zqlia722jskzmn4g86c9lf7d"; - name = "baloo-widgets-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/baloo-widgets-16.08.1.tar.xz"; + sha256 = "0lb42ci06xka82147awcwdhw35d1spvhdkfiq3qpbbyq8ajqxq18"; + name = "baloo-widgets-16.08.1.tar.xz"; }; }; blinken = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/blinken-16.08.0.tar.xz"; - sha256 = "16x0l7fajrdgqm6pwhkn1za8bwliw556z6fc4bxm2jgcmdih7znq"; - name = "blinken-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/blinken-16.08.1.tar.xz"; + sha256 = "0xk39mcyad8s8haj2rmg2m7x46qzayl8zivc8v8h28vn80lvhk4v"; + name = "blinken-16.08.1.tar.xz"; }; }; bomber = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/bomber-16.08.0.tar.xz"; - sha256 = "05j7xrcxs0lvniprd9818ck0jrjn6j8hjf773riqzsqr463v183h"; - name = "bomber-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/bomber-16.08.1.tar.xz"; + sha256 = "0rsgwr8vlnfli8zb77l9vdqn60k7kpdxpsaq16nhxxwl2n3780gn"; + name = "bomber-16.08.1.tar.xz"; }; }; bovo = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/bovo-16.08.0.tar.xz"; - sha256 = "184h61fbkrasp9hik21pa45fxhgvvqmsf424n46i93m48fa7vwzl"; - name = "bovo-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/bovo-16.08.1.tar.xz"; + sha256 = "1vc4dv5gh2vif98fz4rcdb8zv20sashq4xbgfvk0xq3ls9j3qdyi"; + name = "bovo-16.08.1.tar.xz"; }; }; calendarsupport = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/calendarsupport-16.08.0.tar.xz"; - sha256 = "04sbgp75vdg69jdjp9wgkcblzcwa7v5hwsdyb2ahz9ga27qsxgan"; - name = "calendarsupport-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/calendarsupport-16.08.1.tar.xz"; + sha256 = "08xvnmlpkwrsdz5fawcddcd5s7dn3zczfk5shk9a00734nc4akkb"; + name = "calendarsupport-16.08.1.tar.xz"; }; }; cantor = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/cantor-16.08.0.tar.xz"; - sha256 = "0j798qxa8j8f6fjkvpag48gcqjrifgxhcm8raccx3bqlxz7145gh"; - name = "cantor-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/cantor-16.08.1.tar.xz"; + sha256 = "1cawdhpmyfb5qgbxil38szghi8q7hslpljzgsn7ma3gy6sqv3k9s"; + name = "cantor-16.08.1.tar.xz"; }; }; cervisia = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/cervisia-16.08.0.tar.xz"; - sha256 = "0azjsigiz26y9fn1i8gaqdzw2bhvdn9v63ii51iazggjb49sk17v"; - name = "cervisia-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/cervisia-16.08.1.tar.xz"; + sha256 = "0apb29k4r2wsf6hn3rl2h1yvmy8npi4dmvjhr02j3gqfxic68vf1"; + name = "cervisia-16.08.1.tar.xz"; }; }; dolphin = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/dolphin-16.08.0.tar.xz"; - sha256 = "0xqyb1qdxg19sp7xwkys9x92cx5wnbjz3sdmr2yc4j56fjqhih3j"; - name = "dolphin-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/dolphin-16.08.1.tar.xz"; + sha256 = "022mnq1x9la8yxim3svf3vj2x43gdp5qd6fwr50lvxw4i4gc8giy"; + name = "dolphin-16.08.1.tar.xz"; }; }; dolphin-plugins = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/dolphin-plugins-16.08.0.tar.xz"; - sha256 = "12pxw5vzznzkd9mr6dshh18mlgk0pmmkqic1mn1i53w0sj9r1zl2"; - name = "dolphin-plugins-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/dolphin-plugins-16.08.1.tar.xz"; + sha256 = "1vi0pwvz76w13gglpbn1dwxbzr5hmwjhdpi64nmbqjgi71i9x2sa"; + name = "dolphin-plugins-16.08.1.tar.xz"; }; }; dragon = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/dragon-16.08.0.tar.xz"; - sha256 = "0vjhrdyshd7rd4i7yn6v1ldi0fsyabwph1pjjdylq1cz4clc7mzi"; - name = "dragon-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/dragon-16.08.1.tar.xz"; + sha256 = "1441jgg8bwvqghz31xnkwwlsayw134q0jiffgh1nis4rxm2rln8h"; + name = "dragon-16.08.1.tar.xz"; }; }; eventviews = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/eventviews-16.08.0.tar.xz"; - sha256 = "1gms9q04icycjcazqkhg0i6mlf01rg45pp3zyndw6l7y3v9gcnq2"; - name = "eventviews-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/eventviews-16.08.1.tar.xz"; + sha256 = "0hp282if9fzw1xv4zdwrvar7wkchi9psl373r1594a7rjz9iby5j"; + name = "eventviews-16.08.1.tar.xz"; }; }; ffmpegthumbs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ffmpegthumbs-16.08.0.tar.xz"; - sha256 = "0nymi6g51xal5cllnp6rqxr7gcanp07njvpc7w02i2daan6cf5li"; - name = "ffmpegthumbs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ffmpegthumbs-16.08.1.tar.xz"; + sha256 = "08gna4lcz6ipjkm2vx862n1w61cxzkskaapsd22zxfmgfhmqyp73"; + name = "ffmpegthumbs-16.08.1.tar.xz"; }; }; filelight = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/filelight-16.08.0.tar.xz"; - sha256 = "1dynl9b4vp8qas23ysbbjmrf71k36z5cwnb2av3k0b53vf8h694p"; - name = "filelight-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/filelight-16.08.1.tar.xz"; + sha256 = "0l059q0vh4yp2y5m0alvcz74g4amiks6yfhh45bd38vkvfay8073"; + name = "filelight-16.08.1.tar.xz"; }; }; gpgmepp = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/gpgmepp-16.08.0.tar.xz"; - sha256 = "0ydwl5qkvxnmzr3f375giykbhj8mm6kv1hywb6kyzafxcwn9ryqf"; - name = "gpgmepp-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/gpgmepp-16.08.1.tar.xz"; + sha256 = "1fqxjfn3mqkar8akpfh0i2lr30bvf99fm2ldsx34x7fq3kh29ys5"; + name = "gpgmepp-16.08.1.tar.xz"; }; }; granatier = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/granatier-16.08.0.tar.xz"; - sha256 = "16j2xap43jpj6v6bclf99805rgpfzxcxnb715malcx69krqacfy2"; - name = "granatier-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/granatier-16.08.1.tar.xz"; + sha256 = "1k270rqcyf37gl1r4086q4r49ssvawy56d32y1n02ph289m3dgl6"; + name = "granatier-16.08.1.tar.xz"; }; }; grantleetheme = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/grantleetheme-16.08.0.tar.xz"; - sha256 = "152b8brnd4q7zmxg4a3xizm56cqxy67aa7gc0znjcg8ga11szrpx"; - name = "grantleetheme-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/grantleetheme-16.08.1.tar.xz"; + sha256 = "10xajrlmkjpz6xl3jg47mdvpf478vvxx3rcwcvd2zxaza9yyakms"; + name = "grantleetheme-16.08.1.tar.xz"; }; }; gwenview = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/gwenview-16.08.0.tar.xz"; - sha256 = "0in10ssq543snsdm4dks2z4hspqiwr0hygc2y8mpcg9kvq11j1w1"; - name = "gwenview-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/gwenview-16.08.1.tar.xz"; + sha256 = "1i55zd0pbgg2xinqzhxpsqx0vqp3dwn4z7bbf85m5cldbi070yv8"; + name = "gwenview-16.08.1.tar.xz"; }; }; incidenceeditor = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/incidenceeditor-16.08.0.tar.xz"; - sha256 = "102chdy0siwnpv9rbxfy7aj1rz4gbwqq6sws7i92paj1k57ln361"; - name = "incidenceeditor-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/incidenceeditor-16.08.1.tar.xz"; + sha256 = "0wl89kwbnqrafflrdphczrn3l5gjgl5fqxvz4z995ri9m98kvgin"; + name = "incidenceeditor-16.08.1.tar.xz"; }; }; jovie = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/jovie-16.08.0.tar.xz"; - sha256 = "0npcs6pq3w6r6wlg4j6dkl4zk9adm8fi84sh8vw89p9iksa2bgjm"; - name = "jovie-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/jovie-16.08.1.tar.xz"; + sha256 = "0nkrcvdsjcpba2awgvk0nv8ni3b5596p2jygxa906w50sjkcf5bk"; + name = "jovie-16.08.1.tar.xz"; }; }; juk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/juk-16.08.0.tar.xz"; - sha256 = "051zsjlq4bfiynkwb6gfx221j0fyvbd01dgx4adjgi15arw0l4kh"; - name = "juk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/juk-16.08.1.tar.xz"; + sha256 = "1kj5iw3hfgqwz08imcfjicgm5m4v7m1fny6da8jidvwzyn46nll4"; + name = "juk-16.08.1.tar.xz"; }; }; kaccessible = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kaccessible-16.08.0.tar.xz"; - sha256 = "1z9i0ylkph3ws5w8qh0h70ykhyjigmjlmmlrnjvxq36mszi2ph5v"; - name = "kaccessible-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kaccessible-16.08.1.tar.xz"; + sha256 = "086spk1aignmb2bry6hbw11nssm99dk38mnk4s89f444ydczs3fs"; + name = "kaccessible-16.08.1.tar.xz"; }; }; kaccounts-integration = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kaccounts-integration-16.08.0.tar.xz"; - sha256 = "0fs5y06j0psg0y97z54yv6mv1w88zm1dbvrmzwdckap9iyhgdk5w"; - name = "kaccounts-integration-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kaccounts-integration-16.08.1.tar.xz"; + sha256 = "0pjj0d8pnnz5zjmkjzb0x157msv0r0hk4h5vdji1jr0bwwhmwaw9"; + name = "kaccounts-integration-16.08.1.tar.xz"; }; }; kaccounts-providers = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kaccounts-providers-16.08.0.tar.xz"; - sha256 = "1sphbdfiqyjcyxvdpbrsfx8jci2k8w1vh56v6hpnv7dn042dmmim"; - name = "kaccounts-providers-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kaccounts-providers-16.08.1.tar.xz"; + sha256 = "1ji88wgvymdh63ykmv12n5gnr0zwmsch56n7wpwn5wvxs34wimqx"; + name = "kaccounts-providers-16.08.1.tar.xz"; }; }; kajongg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kajongg-16.08.0.tar.xz"; - sha256 = "0ydl7pdlp9nrfpxnkznaj6mwdq8w660flf5y3bgvv8jdxnaz7cyn"; - name = "kajongg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kajongg-16.08.1.tar.xz"; + sha256 = "0z8kin497631fa7wls6bi42q32ijqgy674cigcmz9jfgn2hwkbc0"; + name = "kajongg-16.08.1.tar.xz"; }; }; kalarmcal = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kalarmcal-16.08.0.tar.xz"; - sha256 = "0ai9h67w6dwsnw18hkxxwmpar4nf3k0zpv6fd1f1y9mvk2xdr6vw"; - name = "kalarmcal-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kalarmcal-16.08.1.tar.xz"; + sha256 = "10r31l6ak6dbksfj5444ndv06qx0jl4si634hv3i77q20jys1j26"; + name = "kalarmcal-16.08.1.tar.xz"; }; }; kalgebra = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kalgebra-16.08.0.tar.xz"; - sha256 = "0ypwsp8pd72v4h99wcjpjkara3dbzidbjf8xksk7zskyp5c5rqxn"; - name = "kalgebra-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kalgebra-16.08.1.tar.xz"; + sha256 = "1wfiqlhhm36p137wcgpbvnhr6idqwkdann99pb1y463jblrdibv6"; + name = "kalgebra-16.08.1.tar.xz"; }; }; kalzium = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kalzium-16.08.0.tar.xz"; - sha256 = "0vfylw7nw0f4dfi62ala5v1gkg4zf2g36pdl57afbbq1pc8v1qpf"; - name = "kalzium-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kalzium-16.08.1.tar.xz"; + sha256 = "09rz69cqqmicmwm9dj9yzq4l3j4w74ih8wcw0xyky948p3x6dh2r"; + name = "kalzium-16.08.1.tar.xz"; }; }; kamera = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kamera-16.08.0.tar.xz"; - sha256 = "0l0nk3q8m6lww7r8gqdkkhl4s7mv7saxjxs7jkypll1q0686pmk7"; - name = "kamera-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kamera-16.08.1.tar.xz"; + sha256 = "01fvdbwi10pnhwg9q7w5lyr027mpy67mzdwpcwv4h1js6dsi68nz"; + name = "kamera-16.08.1.tar.xz"; }; }; kanagram = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kanagram-16.08.0.tar.xz"; - sha256 = "180hpi4zhmhbmkn9166zpxk9pp3w08pryj33pkq6qcsbsflmnmic"; - name = "kanagram-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kanagram-16.08.1.tar.xz"; + sha256 = "0a2rk092sgp1ysaw7h47y6lmw9z269j7llnw5vzq3mblc2ay2sda"; + name = "kanagram-16.08.1.tar.xz"; }; }; kapman = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kapman-16.08.0.tar.xz"; - sha256 = "1jhiwvi9hx46h1gwf1qmpi6cvyncybhfjsf0m51329cgx2hdfzl5"; - name = "kapman-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kapman-16.08.1.tar.xz"; + sha256 = "0x7b1d6hhl0nwyz8qzcz9nnjv8477ghifzgiyw3g1bx8044wqlsk"; + name = "kapman-16.08.1.tar.xz"; }; }; kapptemplate = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kapptemplate-16.08.0.tar.xz"; - sha256 = "1zdaafrynh083vqr2b587c862qz0220hinmf9dc345gfss244zzf"; - name = "kapptemplate-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kapptemplate-16.08.1.tar.xz"; + sha256 = "1zkq5hpi8y4bny0q8p0aa3s4jpd5bxw18m5jxadjm4gfznnw8afv"; + name = "kapptemplate-16.08.1.tar.xz"; }; }; kate = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kate-16.08.0.tar.xz"; - sha256 = "0z1fqd73il15y0hpjshhmd0cv6l2s3pm90m9l5k0ggg8vy0l1pqv"; - name = "kate-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kate-16.08.1.tar.xz"; + sha256 = "0z1q5lnkqnx40zbxj3bnwg9wrx7xk7xzfwc8i02zzvx50n7qn57n"; + name = "kate-16.08.1.tar.xz"; }; }; katomic = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/katomic-16.08.0.tar.xz"; - sha256 = "14g0fiyxmlpwnfw25z3yxdzhixcahxss7rm4k06km37nzxmcca8l"; - name = "katomic-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/katomic-16.08.1.tar.xz"; + sha256 = "1ilaz15qg1fasd0yv03vcspxx54cbw2m99wl39zzrh7jc3df0ad8"; + name = "katomic-16.08.1.tar.xz"; }; }; kblackbox = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kblackbox-16.08.0.tar.xz"; - sha256 = "0pq9rw1inxm5vjv4bcwklgh90wrz3sirf80v75dy2myiriv02y08"; - name = "kblackbox-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kblackbox-16.08.1.tar.xz"; + sha256 = "1w7rh9m6qwdid2li7xhmsfs0v7q95gyl24529xm17y79k1qxcbm7"; + name = "kblackbox-16.08.1.tar.xz"; }; }; kblocks = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kblocks-16.08.0.tar.xz"; - sha256 = "04si5m0rbshm8h09ln6xqhfnsakrqqm3gi1gyk1agcpa5wr1hfyf"; - name = "kblocks-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kblocks-16.08.1.tar.xz"; + sha256 = "086b8k8zhs9v0rp06z9wx8gaaphc2178px5501rqx6062azxflil"; + name = "kblocks-16.08.1.tar.xz"; }; }; kblog = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kblog-16.08.0.tar.xz"; - sha256 = "1qrdxad83dzjc5lpvj7dcghzkryp0anrp97sk7dlkmf1j7mj5w7n"; - name = "kblog-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kblog-16.08.1.tar.xz"; + sha256 = "1vc2a3c4iz2jm2137zw3i69n6qam2rlhvjr8ybv84xv9s7b3pz25"; + name = "kblog-16.08.1.tar.xz"; }; }; kbounce = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kbounce-16.08.0.tar.xz"; - sha256 = "13a2xzkym62rxvk3haxjca1n8vx13r093r5dzsn9fb0gwc47p60x"; - name = "kbounce-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kbounce-16.08.1.tar.xz"; + sha256 = "0a4khwdrhzg33i4bbz1kb7w2jyzahnj1agcdybpzbqjnczgv4rnn"; + name = "kbounce-16.08.1.tar.xz"; }; }; kbreakout = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kbreakout-16.08.0.tar.xz"; - sha256 = "1b1z702ify3av1275160sz740z1yyfv4x5jxrdzwf554sy8nqigg"; - name = "kbreakout-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kbreakout-16.08.1.tar.xz"; + sha256 = "14i4yyxxd9w72sgdfwp47y8drbdl7lsb8fxgdswg91dpcnm1jmgi"; + name = "kbreakout-16.08.1.tar.xz"; }; }; kbruch = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kbruch-16.08.0.tar.xz"; - sha256 = "15v86pdgpdrkaxa75pj39w7c2x89b1gx3inxvpx51rfcjxdiqsz4"; - name = "kbruch-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kbruch-16.08.1.tar.xz"; + sha256 = "02dyc90ir79swf8vjd53flxqp2imaaa9c5dikflbxiahj4k6rpa4"; + name = "kbruch-16.08.1.tar.xz"; }; }; kcachegrind = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcachegrind-16.08.0.tar.xz"; - sha256 = "0bx0viz57d4qabsw0yl3max042wqzcnqkkvyd7yq1mdkjvywl522"; - name = "kcachegrind-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcachegrind-16.08.1.tar.xz"; + sha256 = "1d7i162a6v7xhykzpszmia7cizrsgh040wk0ql7ijgb838iawflg"; + name = "kcachegrind-16.08.1.tar.xz"; }; }; kcalc = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcalc-16.08.0.tar.xz"; - sha256 = "1pk52k6cid8gppy5m9psfhq20jdcd1z9930yyj2sp9d5ynbk0hxb"; - name = "kcalc-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcalc-16.08.1.tar.xz"; + sha256 = "18nhvmgd0d2m0ji23536fhqykf4xdnnky5x0hy6vkja0dw91aggg"; + name = "kcalc-16.08.1.tar.xz"; }; }; kcalcore = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcalcore-16.08.0.tar.xz"; - sha256 = "124hybji5j7838gxy69w4cafgrkh8wjh40v0iwqkiaq3nwjv3q0n"; - name = "kcalcore-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcalcore-16.08.1.tar.xz"; + sha256 = "12q30gsaw2fr7wx6jpswa7aby8d58wldxagbcdkwcifv78d7bgk7"; + name = "kcalcore-16.08.1.tar.xz"; }; }; kcalutils = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcalutils-16.08.0.tar.xz"; - sha256 = "02dvdxnxl51qml8wmpvay7apq7zww7nf7nqwmli10m79ppdw1jmw"; - name = "kcalutils-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcalutils-16.08.1.tar.xz"; + sha256 = "0fvhy2r5mw871ld18rab4nx9cv52fg7vwkxj31gbvx6rbzbmzsrs"; + name = "kcalutils-16.08.1.tar.xz"; }; }; kcharselect = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcharselect-16.08.0.tar.xz"; - sha256 = "11vyhlx33jjlwp1vri4l1vpzcgi07f86cqcfd84hnyr48v9dnya1"; - name = "kcharselect-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcharselect-16.08.1.tar.xz"; + sha256 = "1mx2biawax867rfq42w0mi4b7v10j17anfq64gx5q6vi79k6jqaj"; + name = "kcharselect-16.08.1.tar.xz"; }; }; kcolorchooser = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcolorchooser-16.08.0.tar.xz"; - sha256 = "0j9s2f2x0vzkl24ajhm8ff1mx6r05j07sjx8v507pbfmxj2h64iz"; - name = "kcolorchooser-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcolorchooser-16.08.1.tar.xz"; + sha256 = "1s490hkjbinhlc3pf2waks9ka8dvkpq3l5vblmd11h1yckbpcdqi"; + name = "kcolorchooser-16.08.1.tar.xz"; }; }; kcontacts = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcontacts-16.08.0.tar.xz"; - sha256 = "063qip4jrcv8qzz1gvq49wjzjsrp8ladaspagqd4jbq65qvnpz96"; - name = "kcontacts-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcontacts-16.08.1.tar.xz"; + sha256 = "198qqs7001m2ywmryx9489jpay1g7i9g04bl9y25jr2a3lf4id87"; + name = "kcontacts-16.08.1.tar.xz"; }; }; kcron = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kcron-16.08.0.tar.xz"; - sha256 = "17bhhvni66wx4ihqzqcn9mglidw7r1lak08jgdbnadxj1nalph8l"; - name = "kcron-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kcron-16.08.1.tar.xz"; + sha256 = "062ndya5r67imkx0fw2whgppfm9j3jwxscfz8vd64g3532kai9n5"; + name = "kcron-16.08.1.tar.xz"; }; }; kde-baseapps = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-baseapps-16.08.0.tar.xz"; - sha256 = "0sajfiwij3znmgmayj1d1q4xmzr0j0a4nb6181j3a360vg5zd42f"; - name = "kde-baseapps-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-baseapps-16.08.1.tar.xz"; + sha256 = "0s9391mx2wh1yvi5ykp5nj3zfr5qvkqpwljjgvhfr2i1a4h24551"; + name = "kde-baseapps-16.08.1.tar.xz"; }; }; kdebugsettings = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdebugsettings-16.08.0.tar.xz"; - sha256 = "08w6b514vrg7100d10m6iwqpgh6ap06dh1b79xax0rqlpcpl40yn"; - name = "kdebugsettings-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdebugsettings-16.08.1.tar.xz"; + sha256 = "0b3940wzm3bl0w0wdjk62ikf6cxlzipckwzq7skpnp115j90pnyp"; + name = "kdebugsettings-16.08.1.tar.xz"; }; }; kde-dev-scripts = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-dev-scripts-16.08.0.tar.xz"; - sha256 = "197w58zhbm6cs54wa4rxf5hmw9gjyvwpabdlfvn1dzr53fx0wlh1"; - name = "kde-dev-scripts-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-dev-scripts-16.08.1.tar.xz"; + sha256 = "1biw748yyiy2xwb4jyx1g4h6v9m0q3qwxh6kc4l7fb9qsjam0222"; + name = "kde-dev-scripts-16.08.1.tar.xz"; }; }; kde-dev-utils = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-dev-utils-16.08.0.tar.xz"; - sha256 = "1a1cxr95sgfpzjcdq0b0jny8lwx734xn3nm9axakq614mq1mqhcw"; - name = "kde-dev-utils-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-dev-utils-16.08.1.tar.xz"; + sha256 = "00dgfclyl95nv5s77w56h472hb02v91fhdx0qkk0vikj2n1z7l9n"; + name = "kde-dev-utils-16.08.1.tar.xz"; }; }; kdeedu-data = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdeedu-data-16.08.0.tar.xz"; - sha256 = "09c9v0h5bys1nx6ll18s91lwghhri1aqnhs86igp81a5k3rgvjf3"; - name = "kdeedu-data-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdeedu-data-16.08.1.tar.xz"; + sha256 = "0qh6ain1qi7l5455j3ir6fq7rs735j2q2czxl2ys8qji5j1yidwa"; + name = "kdeedu-data-16.08.1.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdegraphics-mobipocket-16.08.0.tar.xz"; - sha256 = "183dxwfx4d17wzy81jjjh2v1lhi7hi7glwgd5dh208v30h36h1fv"; - name = "kdegraphics-mobipocket-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdegraphics-mobipocket-16.08.1.tar.xz"; + sha256 = "1lzwlvcf6wp1g2n46811cq2m3h212w161z6kasdg7wf7rcghbmvd"; + name = "kdegraphics-mobipocket-16.08.1.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdegraphics-thumbnailers-16.08.0.tar.xz"; - sha256 = "1i0cfnsh74bic5z4hvrakss55ci3xlfslcmwklp20804ngfkq6h8"; - name = "kdegraphics-thumbnailers-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdegraphics-thumbnailers-16.08.1.tar.xz"; + sha256 = "068cvcnaf8kyls49143w8lwg24hk58byiv23qh2xxv180ps12hkm"; + name = "kdegraphics-thumbnailers-16.08.1.tar.xz"; }; }; kde-l10n-ar = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ar-16.08.0.tar.xz"; - sha256 = "0dkxjb7af1xb3q1c2d4hpl8vn9391fbacfbnahxyil3zqxp0z5i7"; - name = "kde-l10n-ar-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ar-16.08.1.tar.xz"; + sha256 = "0v1h0qciqr4kanb0mb6hjma35spjhp51vx0r7kb3girmv4ik2mii"; + name = "kde-l10n-ar-16.08.1.tar.xz"; }; }; kde-l10n-ast = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ast-16.08.0.tar.xz"; - sha256 = "0x7pjg1x5yw76145biwfyrw8b0nx06xbzc57rqvy8k773qr5zilj"; - name = "kde-l10n-ast-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ast-16.08.1.tar.xz"; + sha256 = "1srk025iqvrwjcks9hcjlzxqmlmfmzn3xlgi1c60nncb046q7xa6"; + name = "kde-l10n-ast-16.08.1.tar.xz"; }; }; kde-l10n-bg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-bg-16.08.0.tar.xz"; - sha256 = "1617b7a1rr43jhj8jdqyircm72jvqcrqqkzl3s8hwi6daprpqik9"; - name = "kde-l10n-bg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-bg-16.08.1.tar.xz"; + sha256 = "014s77imwl3awy3fd4yzdv0k61j1h0rlvnlfk7mzkyyjgxhh9wqg"; + name = "kde-l10n-bg-16.08.1.tar.xz"; }; }; kde-l10n-bs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-bs-16.08.0.tar.xz"; - sha256 = "1vmk5mmrs0d1123cx5y003lkim1kxc9d8x3flsxkpyb1c155nvpw"; - name = "kde-l10n-bs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-bs-16.08.1.tar.xz"; + sha256 = "0ijsbkllls8966hrh19p2062fmnjan0hibl6650ihgypsci15y57"; + name = "kde-l10n-bs-16.08.1.tar.xz"; }; }; kde-l10n-ca = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ca-16.08.0.tar.xz"; - sha256 = "18m2g0iagiaqfbg1lr1i3z9nm4qva0ipl1rh22p2slqivqcrvg51"; - name = "kde-l10n-ca-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ca-16.08.1.tar.xz"; + sha256 = "12kn3skciqmsqwqdpx7n4286cz1w7rdgx4mggvk05db0bhrybjzg"; + name = "kde-l10n-ca-16.08.1.tar.xz"; }; }; kde-l10n-ca_valencia = { - version = "ca_valencia-16.08.0"; + version = "ca_valencia-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ca@valencia-16.08.0.tar.xz"; - sha256 = "1h68h6dzkkhpl5rsdw6ykg9prs9l1xbwwm7mqxxljxsd8bmpdv4g"; - name = "kde-l10n-ca_valencia-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ca@valencia-16.08.1.tar.xz"; + sha256 = "0dfjx9pfzwilz746lrdgpx51cig8wr9igbm7pdidpaz5wryqfsif"; + name = "kde-l10n-ca_valencia-16.08.1.tar.xz"; }; }; kde-l10n-cs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-cs-16.08.0.tar.xz"; - sha256 = "0wg84mxj4sbwi3ck4vdva0fbs7gsyr2xjzk6bd49a70ls9icp39x"; - name = "kde-l10n-cs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-cs-16.08.1.tar.xz"; + sha256 = "1b14wgczd6qfkgy1rfj2dmw0l0vc3jkf1yf0ih5y0s3zqx081k34"; + name = "kde-l10n-cs-16.08.1.tar.xz"; }; }; kde-l10n-da = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-da-16.08.0.tar.xz"; - sha256 = "0jkkqw69bv3r6avcywsxbqy99lbcyfbn3r9ipqcmka3hpss8cf18"; - name = "kde-l10n-da-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-da-16.08.1.tar.xz"; + sha256 = "1hdppgawypnya6sk60bz62cc7dnhh5m1dcq68hx67a9wrf6hw21i"; + name = "kde-l10n-da-16.08.1.tar.xz"; }; }; kde-l10n-de = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-de-16.08.0.tar.xz"; - sha256 = "0g6cglysjzzbc67wv29zqikvgzmq928a3arwd50hjvg85dh50w4f"; - name = "kde-l10n-de-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-de-16.08.1.tar.xz"; + sha256 = "0r0kkrmk4gzn9nhly9c908ajciy9k9rxy8wrqampj4gynxsrc07w"; + name = "kde-l10n-de-16.08.1.tar.xz"; }; }; kde-l10n-el = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-el-16.08.0.tar.xz"; - sha256 = "037wiqbw172rkqlq5709arwkdi8qmhrrqc00rhy612x7m075n2ln"; - name = "kde-l10n-el-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-el-16.08.1.tar.xz"; + sha256 = "1d6ipj1hyjzwlcparbi533iqgvbx9lhdmqnzdhjxnim1hia25wan"; + name = "kde-l10n-el-16.08.1.tar.xz"; }; }; kde-l10n-en_GB = { - version = "en_GB-16.08.0"; + version = "en_GB-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-en_GB-16.08.0.tar.xz"; - sha256 = "0nbkijpaxsi365c6q44wq0wbv0bqgpyhrb1d2a3v7lhcb9jv6ci9"; - name = "kde-l10n-en_GB-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-en_GB-16.08.1.tar.xz"; + sha256 = "102qlxmcynqf30x25ygmh7x6x0d12fbr4dri1nj8rkd8bmi214di"; + name = "kde-l10n-en_GB-16.08.1.tar.xz"; }; }; kde-l10n-eo = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-eo-16.08.0.tar.xz"; - sha256 = "1qsl7r9da29hxqs7y0i17zyzvpfxi9h2srdq345ppyxdk3avbvp7"; - name = "kde-l10n-eo-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-eo-16.08.1.tar.xz"; + sha256 = "131y6259yi3kwzn17a11nx5xmxc1llg105g2x0sfayc7k4i5y24z"; + name = "kde-l10n-eo-16.08.1.tar.xz"; }; }; kde-l10n-es = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-es-16.08.0.tar.xz"; - sha256 = "1hm2rvsbrxmci1939iicms5qb1fbm0f1b27zlhgzmf6j3pmg25b3"; - name = "kde-l10n-es-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-es-16.08.1.tar.xz"; + sha256 = "1qzwfi21cfs5j88hxmkbbrp8isrxv6b6c3ld2s41lj6a67sdw21k"; + name = "kde-l10n-es-16.08.1.tar.xz"; }; }; kde-l10n-et = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-et-16.08.0.tar.xz"; - sha256 = "0ng6qg7sw3dypn7yg7m8803cpqm39x0b9jn2q0f3jmx46ys9kyyi"; - name = "kde-l10n-et-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-et-16.08.1.tar.xz"; + sha256 = "1dci7x9w8dzmzwj5f6c4i9x6v5g68ll9dwfvwf060vy2pnnnlw7g"; + name = "kde-l10n-et-16.08.1.tar.xz"; }; }; kde-l10n-eu = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-eu-16.08.0.tar.xz"; - sha256 = "0dmiipd0l1dza14fyd17g7qwih4n1fzg2fjkx9vhwdzl5anxmb13"; - name = "kde-l10n-eu-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-eu-16.08.1.tar.xz"; + sha256 = "1n21mhqlr3wj6gd9kbfvfck5f1ql1ywanbp084afxqcbx82pb7j3"; + name = "kde-l10n-eu-16.08.1.tar.xz"; }; }; kde-l10n-fa = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fa-16.08.0.tar.xz"; - sha256 = "129i0fhdxab5k8vjiml0ylyja5hz6dmr3x8qarf0mfspwhi7pkna"; - name = "kde-l10n-fa-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fa-16.08.1.tar.xz"; + sha256 = "15ay6hqgpdv80fa3gjksfmjiczr4zwpwh4mj1zdrdm241kdhp1jp"; + name = "kde-l10n-fa-16.08.1.tar.xz"; }; }; kde-l10n-fi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fi-16.08.0.tar.xz"; - sha256 = "1rjzsagskszi14lv1ak6ailfxxiqqq2ry26dz53agq8qd4md19y3"; - name = "kde-l10n-fi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fi-16.08.1.tar.xz"; + sha256 = "130hpabvd2rjd0x11k9yxjl94aslaz90bhf3mfm5bnjjlm8iqwz5"; + name = "kde-l10n-fi-16.08.1.tar.xz"; }; }; kde-l10n-fr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-fr-16.08.0.tar.xz"; - sha256 = "09brqj4xx8apsldxjpx797ggmwv3flm7cbxh39kc3q8c7dpzr4a5"; - name = "kde-l10n-fr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-fr-16.08.1.tar.xz"; + sha256 = "0mkbbba9jldks003cmcdbfiqw7g6nr4majz8skb7srq8ma7sf9x4"; + name = "kde-l10n-fr-16.08.1.tar.xz"; }; }; kde-l10n-ga = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ga-16.08.0.tar.xz"; - sha256 = "1ig3hvy58p7d3j4h6r1nz8yj65mfpamxajmrg3aid56i8rc81ibk"; - name = "kde-l10n-ga-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ga-16.08.1.tar.xz"; + sha256 = "0hmj03ajgijjg3lmrsypff2nxzf61vmvf0qwrxiy3q40vvgj5mbr"; + name = "kde-l10n-ga-16.08.1.tar.xz"; }; }; kde-l10n-gl = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-gl-16.08.0.tar.xz"; - sha256 = "09hrpgxcp2s20d1ia6plkglkhhj8mzfh8d01y0jfc8b1h5br282w"; - name = "kde-l10n-gl-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-gl-16.08.1.tar.xz"; + sha256 = "0n0nim3pkhql2lx9kqplcs6v225c2cirhazsb6ldblkhxbk0hgfb"; + name = "kde-l10n-gl-16.08.1.tar.xz"; }; }; kde-l10n-he = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-he-16.08.0.tar.xz"; - sha256 = "09zf3a0gbs5h5r3mrpc9gkd4l2j9nw1k7vdwahxjpsdhvs1bwx3h"; - name = "kde-l10n-he-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-he-16.08.1.tar.xz"; + sha256 = "0x4rn81ijx2b0z4s2b67d69gnnx0ldl43c311jf0dn9cyadjws07"; + name = "kde-l10n-he-16.08.1.tar.xz"; }; }; kde-l10n-hi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hi-16.08.0.tar.xz"; - sha256 = "1xvvkl5pr3w0s1pizarg0mmkvckxss944a188avqfsqrav642458"; - name = "kde-l10n-hi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hi-16.08.1.tar.xz"; + sha256 = "1if5h20ywpkh85fx95i0mrv993gfj1rm3yp9jzz8x250b6ggbfd5"; + name = "kde-l10n-hi-16.08.1.tar.xz"; }; }; kde-l10n-hr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hr-16.08.0.tar.xz"; - sha256 = "0cyz0ysz9xr93dlq2n758nw2kyi2f8b7h3gr4im7syj05nk0fhb6"; - name = "kde-l10n-hr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hr-16.08.1.tar.xz"; + sha256 = "0fg27qkj23b49hvbksqsiv3jj571b4i9msk82ygzvxl2ay5him52"; + name = "kde-l10n-hr-16.08.1.tar.xz"; }; }; kde-l10n-hu = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-hu-16.08.0.tar.xz"; - sha256 = "0imcb7zd7rzf2nc8darlj4i843gha3ihbi0lvh6pnnmcxvc2dzdh"; - name = "kde-l10n-hu-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-hu-16.08.1.tar.xz"; + sha256 = "1nw0922gk4f89r06fkgqvs092dbi4kjbfxvj86gq98v1ms0pns69"; + name = "kde-l10n-hu-16.08.1.tar.xz"; }; }; kde-l10n-ia = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ia-16.08.0.tar.xz"; - sha256 = "1x14165y0qvpjn3mkg03l4p0mij9a6haxkrbkkqvv1waapifyxsl"; - name = "kde-l10n-ia-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ia-16.08.1.tar.xz"; + sha256 = "0plsffy1khy9cacqhabr1j2g0xi3v21qgydj6phb6d5j82p1c79i"; + name = "kde-l10n-ia-16.08.1.tar.xz"; }; }; kde-l10n-id = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-id-16.08.0.tar.xz"; - sha256 = "1mf3viq3yligqg8vqca31ybs9s59nxmylvwqmg8ndy9ni4mni2wx"; - name = "kde-l10n-id-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-id-16.08.1.tar.xz"; + sha256 = "0ihir3axvkczkik2nnfh4mmqkx2gpmvzri48i34p5dz21n8ca4ha"; + name = "kde-l10n-id-16.08.1.tar.xz"; }; }; kde-l10n-is = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-is-16.08.0.tar.xz"; - sha256 = "07xdlvk3nqc9wsrnd1a0hm6igwc0hnryffs99jvd0dlbq0hzakl3"; - name = "kde-l10n-is-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-is-16.08.1.tar.xz"; + sha256 = "0qrayzxpx1phk2m6kcq5b6i05swds1fis4651r5xk69dc2zqlbjn"; + name = "kde-l10n-is-16.08.1.tar.xz"; }; }; kde-l10n-it = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-it-16.08.0.tar.xz"; - sha256 = "05xir0spl5fbyynwjkf13zzqgwl1mzi97bfjfi1x8jhiq0jqhafn"; - name = "kde-l10n-it-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-it-16.08.1.tar.xz"; + sha256 = "1qhv4rywr9qlszlx8a7crqshr5zmxxgscq8s1c735jcm57bk8wzl"; + name = "kde-l10n-it-16.08.1.tar.xz"; }; }; kde-l10n-ja = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ja-16.08.0.tar.xz"; - sha256 = "1gdngf075021750rxfbrcbbh8wb1nknzclgghsj8j94qb96ij87m"; - name = "kde-l10n-ja-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ja-16.08.1.tar.xz"; + sha256 = "1zwb8r1vanrl4q0mhqgd4qj8smyygqgka4b4zjqr6h2klklwsxsg"; + name = "kde-l10n-ja-16.08.1.tar.xz"; }; }; kde-l10n-kk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-kk-16.08.0.tar.xz"; - sha256 = "0y5qdnkdhc7lnd3casxil757mmklsysm8kvs9i09j4b5ldmkin0r"; - name = "kde-l10n-kk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-kk-16.08.1.tar.xz"; + sha256 = "1zdhfhjxpr73f34nh24y6ddgp3zkqim4dy8mblk84w8wsg80i6gj"; + name = "kde-l10n-kk-16.08.1.tar.xz"; }; }; kde-l10n-km = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-km-16.08.0.tar.xz"; - sha256 = "0a27rhjf40q5003jy3aancaf9qnygmfqk4g7jic1x1d64n3khz9c"; - name = "kde-l10n-km-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-km-16.08.1.tar.xz"; + sha256 = "1qx2cm9cv7b33pkzpfgcqppr6q4qqzf9v152wjfdk096jq6yfijv"; + name = "kde-l10n-km-16.08.1.tar.xz"; }; }; kde-l10n-ko = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ko-16.08.0.tar.xz"; - sha256 = "0g8plf0z329xyiwi4aia96i3psypqsx9wfhnb26kwwgl6vjd4nin"; - name = "kde-l10n-ko-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ko-16.08.1.tar.xz"; + sha256 = "18za5mpnx8xfkpmpjp2i04kl6a2chjgz8g7vhymi01m1dhf7ql5f"; + name = "kde-l10n-ko-16.08.1.tar.xz"; }; }; kde-l10n-lt = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-lt-16.08.0.tar.xz"; - sha256 = "0c5akrzfmjkrf4z8p5yfy9f3q8p6bf3l97aajcj2jzqxmxqrkgxz"; - name = "kde-l10n-lt-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-lt-16.08.1.tar.xz"; + sha256 = "147z5af6qn7c6qrxxzmcc9qkagc4y6nffqal3fsrs84pjrsav72j"; + name = "kde-l10n-lt-16.08.1.tar.xz"; }; }; kde-l10n-lv = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-lv-16.08.0.tar.xz"; - sha256 = "1l0yfc4999sjl01m07rmzw2h9cd0pw2d9j4wa7fjs2pf89z5z2y6"; - name = "kde-l10n-lv-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-lv-16.08.1.tar.xz"; + sha256 = "19pf8khdszfnlfybrsdwm0gbnphr43109b81fa6bsxcc57knagwg"; + name = "kde-l10n-lv-16.08.1.tar.xz"; }; }; kde-l10n-mr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-mr-16.08.0.tar.xz"; - sha256 = "0jnrycqxszxq7mw7kwyhprb7pmrqz5v9kkhqf2bm4k9mf5553a0w"; - name = "kde-l10n-mr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-mr-16.08.1.tar.xz"; + sha256 = "0vwa1mz9igx592bq89fnq7350ln4g5cvdmm1hnay94c5qxc12s0z"; + name = "kde-l10n-mr-16.08.1.tar.xz"; }; }; kde-l10n-nb = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nb-16.08.0.tar.xz"; - sha256 = "1ga30ki4yaa4ajbrjp0fz75r67cvrc801skx31x6d1cw6xjyi72l"; - name = "kde-l10n-nb-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nb-16.08.1.tar.xz"; + sha256 = "1dz3a5bwsmbckdmh2v2crnal7183sqav6y5z01xdq0wyjjy8kizc"; + name = "kde-l10n-nb-16.08.1.tar.xz"; }; }; kde-l10n-nds = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nds-16.08.0.tar.xz"; - sha256 = "1ibv7rq1ap5zmal4bf8a8z285mf6g55bcmli67gvhwfvy13vkg9s"; - name = "kde-l10n-nds-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nds-16.08.1.tar.xz"; + sha256 = "1gjvwg6gmxbvk7q26f7i50ivfmh4s2djl7m9dsaj6rk53cknhd8s"; + name = "kde-l10n-nds-16.08.1.tar.xz"; }; }; kde-l10n-nl = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nl-16.08.0.tar.xz"; - sha256 = "0pysm6sjdls14d8cqmywnljwk2k94q9z7rdm7m3p75p4q778drda"; - name = "kde-l10n-nl-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nl-16.08.1.tar.xz"; + sha256 = "1r3mwnkkr8k3zb87j6lr4lrgq02rccqpp5m273z1c5n0kqcbp50h"; + name = "kde-l10n-nl-16.08.1.tar.xz"; }; }; kde-l10n-nn = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-nn-16.08.0.tar.xz"; - sha256 = "1v3q9jr6ginh24ph99qyb57phm86zwph3xv6zbymg61vghv398q2"; - name = "kde-l10n-nn-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-nn-16.08.1.tar.xz"; + sha256 = "0r38zvmh05mcfh7grayb771mrdl2637xnx75nx7lnvkvmlf6dngh"; + name = "kde-l10n-nn-16.08.1.tar.xz"; }; }; kde-l10n-pa = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pa-16.08.0.tar.xz"; - sha256 = "10c1c6hql80x714msa45cpbgl4nagaf9mydfb160lsvaa1whzzbd"; - name = "kde-l10n-pa-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pa-16.08.1.tar.xz"; + sha256 = "04828d9wsd51g3a45nzddxhxdwwk447qlkswxjzayiy7w6pjspch"; + name = "kde-l10n-pa-16.08.1.tar.xz"; }; }; kde-l10n-pl = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pl-16.08.0.tar.xz"; - sha256 = "1xz33a9af2ccl249ymaqawz1ymrxa5zwhg2gayxk5jmv2fsvhikp"; - name = "kde-l10n-pl-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pl-16.08.1.tar.xz"; + sha256 = "068ab65ivm4qw3hmhv97v8ck2qg7z8aglfwq0lqrlb5famg158di"; + name = "kde-l10n-pl-16.08.1.tar.xz"; }; }; kde-l10n-pt = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pt-16.08.0.tar.xz"; - sha256 = "1wp0i6mlk4nhd7v502kc4gh7zymgiakqlx3jjpjaqsv31igya406"; - name = "kde-l10n-pt-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pt-16.08.1.tar.xz"; + sha256 = "1ix32ry9zzgdwmpqfvzsfdz357l56nwqd42rnszgjzs4sdikl3y8"; + name = "kde-l10n-pt-16.08.1.tar.xz"; }; }; kde-l10n-pt_BR = { - version = "pt_BR-16.08.0"; + version = "pt_BR-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-pt_BR-16.08.0.tar.xz"; - sha256 = "0nv8k2fn8jdv80vcwiri5w937qcp2gj8bjmi3hcc9qirdqh8wjap"; - name = "kde-l10n-pt_BR-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-pt_BR-16.08.1.tar.xz"; + sha256 = "0id10qm9gzg2c9as2np8a0sfnx9acsnf06igvwxnyazar8k831hs"; + name = "kde-l10n-pt_BR-16.08.1.tar.xz"; }; }; kde-l10n-ro = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ro-16.08.0.tar.xz"; - sha256 = "0bqw4zb5hz1wccgicyfd8d8zzhq69jf16f3qr6c6ry345hkx1ywm"; - name = "kde-l10n-ro-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ro-16.08.1.tar.xz"; + sha256 = "1j6vdc62xw4pbn0lz0zmwylc43m9kxn78zx0qn5gc51i2n3sb8bm"; + name = "kde-l10n-ro-16.08.1.tar.xz"; }; }; kde-l10n-ru = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ru-16.08.0.tar.xz"; - sha256 = "1pi549z9wzjsaixn246wq9bqkgy2azhwccwhyy5d0d442d23xwqv"; - name = "kde-l10n-ru-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ru-16.08.1.tar.xz"; + sha256 = "1bqrjgh89yskqx5hpd08z949nplp7f53is1vm9slrvn94hcslc46"; + name = "kde-l10n-ru-16.08.1.tar.xz"; }; }; kde-l10n-sk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sk-16.08.0.tar.xz"; - sha256 = "09lyhmiishxiihnpv9lli329zl4v05q3578ib5nrzrkrlky512m9"; - name = "kde-l10n-sk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sk-16.08.1.tar.xz"; + sha256 = "18w6zbix3iwrgyswlr8390yb3q4fli1krana7pimfhll29wg9s2v"; + name = "kde-l10n-sk-16.08.1.tar.xz"; }; }; kde-l10n-sl = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sl-16.08.0.tar.xz"; - sha256 = "1maz22c0mp8bgj1rcg0ms2cncx0gg82diwpb930shjmivr8zhmrd"; - name = "kde-l10n-sl-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sl-16.08.1.tar.xz"; + sha256 = "1q9gjl8cz02nwy90w31apr8rv5bhp8xanmc6ckijfl7xz5a5r7ig"; + name = "kde-l10n-sl-16.08.1.tar.xz"; }; }; kde-l10n-sr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sr-16.08.0.tar.xz"; - sha256 = "190ww2065537lny8jnm81lqcxpfllhf45snj93zl41pcva4zw4jg"; - name = "kde-l10n-sr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sr-16.08.1.tar.xz"; + sha256 = "019m72c4l486rwq6cm309jsaasz96grv2bb8wrgxy2r69y2qnzqj"; + name = "kde-l10n-sr-16.08.1.tar.xz"; }; }; kde-l10n-sv = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-sv-16.08.0.tar.xz"; - sha256 = "0bl1qz3zqrq8vjbnacvdym9yzycpjhgy62r2577h2ybds31fj81n"; - name = "kde-l10n-sv-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-sv-16.08.1.tar.xz"; + sha256 = "0ml489l1jv07x1d157gacsgnyx95j4fapd0r6q4d2r5mdm77w36b"; + name = "kde-l10n-sv-16.08.1.tar.xz"; }; }; kde-l10n-tr = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-tr-16.08.0.tar.xz"; - sha256 = "1gbm055f4cbcl1h9k2r6fnjnnjj5wss8zyyc16id57ydzvnkdbi1"; - name = "kde-l10n-tr-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-tr-16.08.1.tar.xz"; + sha256 = "008fjcf7p2pk1g4mzsc98vqlaaagf1bkmha323rgqrz07jzjax63"; + name = "kde-l10n-tr-16.08.1.tar.xz"; }; }; kde-l10n-ug = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-ug-16.08.0.tar.xz"; - sha256 = "1hqdh0v83yvn4hnl51hsabkcbn5rhw0xcwn4nzqm6q2ib68rzhal"; - name = "kde-l10n-ug-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-ug-16.08.1.tar.xz"; + sha256 = "1d38j4cyzzxv35i39rmhrlyc097n56gghvwcl16nj55qbm41nb22"; + name = "kde-l10n-ug-16.08.1.tar.xz"; }; }; kde-l10n-uk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-uk-16.08.0.tar.xz"; - sha256 = "00ijcfs6688d822iwg85msk8hxl7qhq5lx3bkw1xwdnmqf0nlxqj"; - name = "kde-l10n-uk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-uk-16.08.1.tar.xz"; + sha256 = "1684139ic7vsr68jfk91kmlvw5bjxm2p2p2zkim0md8gmjw279bd"; + name = "kde-l10n-uk-16.08.1.tar.xz"; }; }; kde-l10n-wa = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-wa-16.08.0.tar.xz"; - sha256 = "0g9jjpn6fzkdvy16mw1yhahrv5y2ybjwi091c01sh9c9rwfj5qpg"; - name = "kde-l10n-wa-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-wa-16.08.1.tar.xz"; + sha256 = "07nalfxn0gw8ygi5cjq5xzyszk4pa4bb2lyll5nfh0h971kiwrk0"; + name = "kde-l10n-wa-16.08.1.tar.xz"; }; }; kde-l10n-zh_CN = { - version = "zh_CN-16.08.0"; + version = "zh_CN-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-zh_CN-16.08.0.tar.xz"; - sha256 = "0997azdrq2i4rfijchr3jz9b6why4hm79cddn1c7wdk3943xz094"; - name = "kde-l10n-zh_CN-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-zh_CN-16.08.1.tar.xz"; + sha256 = "120f7a4qwxjh0l6n0pcckwi0y5lzy99l7p40i032yd4awjm0jdx6"; + name = "kde-l10n-zh_CN-16.08.1.tar.xz"; }; }; kde-l10n-zh_TW = { - version = "zh_TW-16.08.0"; + version = "zh_TW-16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-l10n/kde-l10n-zh_TW-16.08.0.tar.xz"; - sha256 = "04d1awymijlkp2q15vjzs7j6aznpsb4kivc6jx24ly7cp3vn66zm"; - name = "kde-l10n-zh_TW-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-l10n/kde-l10n-zh_TW-16.08.1.tar.xz"; + sha256 = "00z9rld3a76lw3gb621zqclfkdww46fvd86sdws3r6d71zv659h0"; + name = "kde-l10n-zh_TW-16.08.1.tar.xz"; }; }; kdelibs = { - version = "4.14.23"; + version = "4.14.24"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdelibs-4.14.23.tar.xz"; - sha256 = "1k8zn5fmdjrb1v45czz80bvnyp1cbajgsbp2qb988m3k5p7nxzis"; - name = "kdelibs-4.14.23.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdelibs-4.14.24.tar.xz"; + sha256 = "1vs60cwwva59fifhg392c60wwp49bvwmm7m6xlai24wzfgl67rj5"; + name = "kdelibs-4.14.24.tar.xz"; }; }; kdenetwork-filesharing = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdenetwork-filesharing-16.08.0.tar.xz"; - sha256 = "075vimzf0arlkcsnvaq75zipz4w02nx9gcy6vcbwb914ljf05cc1"; - name = "kdenetwork-filesharing-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdenetwork-filesharing-16.08.1.tar.xz"; + sha256 = "0gkyi2s4hiq3i17cizh0c6dzvc7b19d8bcan22jxb6jx6drm8yq3"; + name = "kdenetwork-filesharing-16.08.1.tar.xz"; }; }; kdenlive = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdenlive-16.08.0.tar.xz"; - sha256 = "1qmhqbawxzl3plh6aa9kqcviwm6c4sqa9qi4npn64mjvwap1b9qd"; - name = "kdenlive-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdenlive-16.08.1.tar.xz"; + sha256 = "0aza2y5xybgj8qnfsc4vbpvmvdvscdmv1bqc67nks72z7c48cpfl"; + name = "kdenlive-16.08.1.tar.xz"; }; }; kdepim = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdepim-16.08.0.tar.xz"; - sha256 = "0jcndq5j0j5vyp9k25gbnd18yyfigg0vdrqrsl2m6ybsgwyf3l02"; - name = "kdepim-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdepim-16.08.1.tar.xz"; + sha256 = "0ibbc9whg6wy0ipfza5jjwf5y6lz5cbd30nxj93p3adfd4bl55by"; + name = "kdepim-16.08.1.tar.xz"; }; }; kdepim-addons = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdepim-addons-16.08.0.tar.xz"; - sha256 = "0r5v8q6pila5diqgfny3ky8c94p8rrf1qg5zwa433xpdmz8ip2jg"; - name = "kdepim-addons-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdepim-addons-16.08.1.tar.xz"; + sha256 = "0mbr9m9h79wvklzh6lh5mmq47b69xi2dy589hham3xy69s067g0n"; + name = "kdepim-addons-16.08.1.tar.xz"; }; }; kdepim-apps-libs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdepim-apps-libs-16.08.0.tar.xz"; - sha256 = "1l8y0a52snxzbp245w9m55b3qx9v7wcdh2b046hx0isw8i65jial"; - name = "kdepim-apps-libs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdepim-apps-libs-16.08.1.tar.xz"; + sha256 = "0nwsdham4gf97d0d1wn1v440grbny8rj0gj29z10ia2v3zkx6cgd"; + name = "kdepim-apps-libs-16.08.1.tar.xz"; }; }; kdepim-runtime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdepim-runtime-16.08.0.tar.xz"; - sha256 = "19hc43xiw1g268nkrbg370qmnnmmmnxzgscx88fxb2pnlvqkz0fb"; - name = "kdepim-runtime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdepim-runtime-16.08.1.tar.xz"; + sha256 = "097jxiwv9vg3scc95j563v3y28iv4a6rkq0w2w1d5f499d6bc7wf"; + name = "kdepim-runtime-16.08.1.tar.xz"; }; }; kde-runtime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kde-runtime-16.08.0.tar.xz"; - sha256 = "0k8snjk12abp9bpyc3q6rs46s972czb7jdsphjld8k448hz102kk"; - name = "kde-runtime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kde-runtime-16.08.1.tar.xz"; + sha256 = "0szmm32m3gifdpvib4ik5cwcm0ixz5npfzs0gkasq6k9mnf68z65"; + name = "kde-runtime-16.08.1.tar.xz"; }; }; kdesdk-kioslaves = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdesdk-kioslaves-16.08.0.tar.xz"; - sha256 = "04ci03wyhh7wxvjl0a4rdav2rc1xgz16ylcbswr0aphbacprqckj"; - name = "kdesdk-kioslaves-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdesdk-kioslaves-16.08.1.tar.xz"; + sha256 = "09g4ax7ah52ihdmp9xrymarq945kymkh65qqqd1rgf0zjaj2af7p"; + name = "kdesdk-kioslaves-16.08.1.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdesdk-thumbnailers-16.08.0.tar.xz"; - sha256 = "1a6iiwamzycc25nn8phip17yajyzpn57smsg9rghl8wq057mcllg"; - name = "kdesdk-thumbnailers-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdesdk-thumbnailers-16.08.1.tar.xz"; + sha256 = "0ygkndgfihb8jissn5jq35vd2j73z5i2rdj2jbgik7hrm2rzjzfs"; + name = "kdesdk-thumbnailers-16.08.1.tar.xz"; }; }; kdewebdev = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdewebdev-16.08.0.tar.xz"; - sha256 = "0x7fp4d2s1zi3kawzjzqlhla0bv0ai66k5bldpg58bpbs56h9f1n"; - name = "kdewebdev-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdewebdev-16.08.1.tar.xz"; + sha256 = "1xi72wfj57z06s2d7ijjc2vpi14nqdavcp2gmczp08lf4n7lkfjr"; + name = "kdewebdev-16.08.1.tar.xz"; }; }; kdf = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdf-16.08.0.tar.xz"; - sha256 = "1cj4wkndbl0ywfy6sj6bsar0v5bc0cxh9d8qd7x0m15qnsx43j44"; - name = "kdf-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdf-16.08.1.tar.xz"; + sha256 = "02azfa3j9m95m6ch1h4b5r2cwbyq987rxzyxsldsbna3x80kqpsv"; + name = "kdf-16.08.1.tar.xz"; }; }; kdgantt2 = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdgantt2-16.08.0.tar.xz"; - sha256 = "1kbzx5gxyph5cr1m6g6kw3f988p3aq121k6a3hb2ddjgg8yqaxmi"; - name = "kdgantt2-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdgantt2-16.08.1.tar.xz"; + sha256 = "1qz44461wk2h2bi5xpyrh5s201azqigph3vclp92phy55s12q83s"; + name = "kdgantt2-16.08.1.tar.xz"; }; }; kdiamond = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kdiamond-16.08.0.tar.xz"; - sha256 = "0fpjgkfdzw8kgag3b9rrxyahl6kcmfvlrzw2jci8sz40vd69qw53"; - name = "kdiamond-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kdiamond-16.08.1.tar.xz"; + sha256 = "0w2kxndpjq2s35qz05vsbr1qnd30lnxhmkyxmy5r7qcqkfdjfwbb"; + name = "kdiamond-16.08.1.tar.xz"; }; }; kfloppy = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kfloppy-16.08.0.tar.xz"; - sha256 = "06nmaimw6lch5cdkmvb4x7dpb3d7zcsr7wzvhhh9bbygc3rmhi17"; - name = "kfloppy-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kfloppy-16.08.1.tar.xz"; + sha256 = "133ib3kicmaxryc4623fmayk12gp4nnymi3g3d97kyk0nmrx1vg7"; + name = "kfloppy-16.08.1.tar.xz"; }; }; kfourinline = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kfourinline-16.08.0.tar.xz"; - sha256 = "0zjq3x6ghfa5ckjba4bfwiacwy3yvby3a951bfw5rh813mgn7zsj"; - name = "kfourinline-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kfourinline-16.08.1.tar.xz"; + sha256 = "0114ldvw1826v75az3wdppd4qdnhswiixm03801rsp680fg9fm9s"; + name = "kfourinline-16.08.1.tar.xz"; }; }; kgeography = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kgeography-16.08.0.tar.xz"; - sha256 = "1cgghdxgqxxjhfmsqwnyrw7lzzshnbmi9frnc9gk4hc3w767nyqs"; - name = "kgeography-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kgeography-16.08.1.tar.xz"; + sha256 = "0psxpq1ap8cm3adf5j6hr0z858wx41aag95n8mx7vgyfjgaj81s4"; + name = "kgeography-16.08.1.tar.xz"; }; }; kget = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kget-16.08.0.tar.xz"; - sha256 = "1ygm6l8xxdyi7dzii4hfp0mpwjhyizmrzmhkcmv708z7api19ms8"; - name = "kget-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kget-16.08.1.tar.xz"; + sha256 = "0brihzmn7fz43mi1mf8flkbbk80pv2sg3ny1il4cdkk6nwryk3dn"; + name = "kget-16.08.1.tar.xz"; }; }; kgoldrunner = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kgoldrunner-16.08.0.tar.xz"; - sha256 = "1xmm2wq8f3pc67ip4hz9x3qqpav1rxm2nqdcbn2z7bivcdmv99jr"; - name = "kgoldrunner-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kgoldrunner-16.08.1.tar.xz"; + sha256 = "10bllkkiisb4ci97wzfln5b8bxs5l72k29mbd4qqxhq69r8xqi5c"; + name = "kgoldrunner-16.08.1.tar.xz"; }; }; kgpg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kgpg-16.08.0.tar.xz"; - sha256 = "1d0zfhq5ks5an9716n0b9a8xbwsnm8p7vl701gn8jpzb4w9cvrns"; - name = "kgpg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kgpg-16.08.1.tar.xz"; + sha256 = "0zpq8smwh648jsxkf82pc2xvz980f07ilp2rzd8yr3w2n18gz120"; + name = "kgpg-16.08.1.tar.xz"; }; }; khangman = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/khangman-16.08.0.tar.xz"; - sha256 = "070556i32fcrbirgwpf04ijqwv8izxmhrbf0rwwldrn3lky2mpfa"; - name = "khangman-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/khangman-16.08.1.tar.xz"; + sha256 = "1jz8wardcsip8c3r7s7lz1zn5gifb9jdksi0hdzn1kv1ha70dfyr"; + name = "khangman-16.08.1.tar.xz"; }; }; khelpcenter = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/khelpcenter-16.08.0.tar.xz"; - sha256 = "1js8jxain4w1iz3xs9098js17rf1mnhcfl46qqsc5ks2909450h1"; - name = "khelpcenter-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/khelpcenter-16.08.1.tar.xz"; + sha256 = "0nv7i3dm6d7wr9y34l009fybdlmp4j5891wl9wwzp6ccnw2qls4g"; + name = "khelpcenter-16.08.1.tar.xz"; }; }; kholidays = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kholidays-16.08.0.tar.xz"; - sha256 = "0q87d55wf1qpqn0mjymhx316rqdcwg4w7hn8l0c221g9zyzd53qk"; - name = "kholidays-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kholidays-16.08.1.tar.xz"; + sha256 = "0dcnlbkmpzj58l9qvggsxk54cf1gspax388dniz5ihs07mkksg24"; + name = "kholidays-16.08.1.tar.xz"; }; }; kidentitymanagement = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kidentitymanagement-16.08.0.tar.xz"; - sha256 = "05k7m4vg5s5ks4wsk4xx5ncnbl4gy0w59xdhwyy01vg8hawnldlj"; - name = "kidentitymanagement-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kidentitymanagement-16.08.1.tar.xz"; + sha256 = "1cdm4p62idsmzb3q6ywlqll7ivkrbbraia6bdc3ad9p2m6mjkwkk"; + name = "kidentitymanagement-16.08.1.tar.xz"; }; }; kig = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kig-16.08.0.tar.xz"; - sha256 = "0nm3d1wxhfkxhbab5y3h8scriyy9l35r34rd77pmk00khsl0d965"; - name = "kig-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kig-16.08.1.tar.xz"; + sha256 = "0slpafdkhyfpixm6iypd62y85j85f62fi2yd3hrmq8859qsp7n74"; + name = "kig-16.08.1.tar.xz"; }; }; kigo = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kigo-16.08.0.tar.xz"; - sha256 = "0k9hjbaysiqjn9bgj7pvix0ag1ksyqdcwfdz5rxvvv6l6j3c96hs"; - name = "kigo-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kigo-16.08.1.tar.xz"; + sha256 = "10mrb94vlhg598r4bpydxj2llzh9239c0ziz3yllnw2jh7xw94rs"; + name = "kigo-16.08.1.tar.xz"; }; }; killbots = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/killbots-16.08.0.tar.xz"; - sha256 = "05irljnrkmw2mp7v4hmindhnw7ww26abnibb8fqmj72ryck39asg"; - name = "killbots-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/killbots-16.08.1.tar.xz"; + sha256 = "1fr7vj9y5bh9dcznvslzsp3f20qrmqfaq8jl4rbas08882lx7am4"; + name = "killbots-16.08.1.tar.xz"; }; }; kimap = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kimap-16.08.0.tar.xz"; - sha256 = "1k08m16kpf94w827n4j69sr2v7a855ap8ghg56vhfn24kbxrw9m8"; - name = "kimap-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kimap-16.08.1.tar.xz"; + sha256 = "01nlqmprbzirw0kwqw1m1klwq401nz3sfc51gi1r01ghhskwfjj0"; + name = "kimap-16.08.1.tar.xz"; }; }; kio-extras = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kio-extras-16.08.0.tar.xz"; - sha256 = "03axqhn9f7bdjzflmncxxbvbn0lwyia65qshis4ysqkd0sh0rinn"; - name = "kio-extras-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kio-extras-16.08.1.tar.xz"; + sha256 = "08cis03pzl7ncmpxc6wss7zm4jwgyxqw873ab70mvibcax9wfky0"; + name = "kio-extras-16.08.1.tar.xz"; }; }; kiriki = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kiriki-16.08.0.tar.xz"; - sha256 = "0jz6nm6371z60yrszs0c61sq2b5ny304v5j5bvcd0nx4prdri302"; - name = "kiriki-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kiriki-16.08.1.tar.xz"; + sha256 = "15p205hcvvf9w1bwcciwaq8igf6nspzjili48x13pzcmmgjf46m8"; + name = "kiriki-16.08.1.tar.xz"; }; }; kiten = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kiten-16.08.0.tar.xz"; - sha256 = "1jxxm14ghmmcy6vyzl1r4vz0a63nvykcaqh2pydab0a3b8l2s93b"; - name = "kiten-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kiten-16.08.1.tar.xz"; + sha256 = "1n94jzy50imvhgan3d5av9iifd0g2bn65gi5bxf9yzq48a6npnkv"; + name = "kiten-16.08.1.tar.xz"; }; }; kjumpingcube = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kjumpingcube-16.08.0.tar.xz"; - sha256 = "1kwgqzlwnb8699pdja4w3d7iv25a7ma121p36pvmh457s8zlgwhl"; - name = "kjumpingcube-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kjumpingcube-16.08.1.tar.xz"; + sha256 = "1i8agl9l996yf1x88s1xg2a3gahjjy2swscw5lb35li565rm7vyr"; + name = "kjumpingcube-16.08.1.tar.xz"; }; }; kldap = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kldap-16.08.0.tar.xz"; - sha256 = "03wsvgw5rv4l01iprz2pp0sqvmkyqgk6pgbqk5dfiy8zxiij3j95"; - name = "kldap-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kldap-16.08.1.tar.xz"; + sha256 = "0m28i0rprj36b3ds51ljmhlpkld4ghl0259z9cc5fh4k7pnfi6jr"; + name = "kldap-16.08.1.tar.xz"; }; }; kleopatra = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kleopatra-16.08.0.tar.xz"; - sha256 = "143w1jclw4r7790mygc6a6rrh0x6r98ai699mn351ai9r9z4cfx5"; - name = "kleopatra-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kleopatra-16.08.1.tar.xz"; + sha256 = "0f7ydyfp9iyg3jzrn02x8bm1x41yysixzwlcpl8l3qimibs65840"; + name = "kleopatra-16.08.1.tar.xz"; }; }; klettres = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/klettres-16.08.0.tar.xz"; - sha256 = "1wfnlci02w5llrckbjfjbi6xk2h43bq98m4zgpib5nk8ib4jaffn"; - name = "klettres-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/klettres-16.08.1.tar.xz"; + sha256 = "11xhprq24hq3f7vvifp1ilmcihadxwyk0jmpb643w898kh6qv9hd"; + name = "klettres-16.08.1.tar.xz"; }; }; klickety = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/klickety-16.08.0.tar.xz"; - sha256 = "1jz02spcr46id1qbxmc9wwgws48p3cbqdy032a563c8hacqgac32"; - name = "klickety-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/klickety-16.08.1.tar.xz"; + sha256 = "1hrplywk2b5qkw9ijpkyxgln2zwqj1ja2prp3acqs1683rsdndam"; + name = "klickety-16.08.1.tar.xz"; }; }; klines = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/klines-16.08.0.tar.xz"; - sha256 = "1xwg8pa4k3a68s0bsxbphpm40kkzgchkxw4ha6xpmhva94nx82d1"; - name = "klines-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/klines-16.08.1.tar.xz"; + sha256 = "07754lvllpjb016da1r7y4n72mp07h8bn16mq38qsxa1d0rdjjd6"; + name = "klines-16.08.1.tar.xz"; }; }; kmag = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmag-16.08.0.tar.xz"; - sha256 = "076lni6qv3b5chj0sgcxvj5an4jvhchagk930kihbpfiqg769c61"; - name = "kmag-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmag-16.08.1.tar.xz"; + sha256 = "0d75z94p28zwh7pz7ss75fscwfcphvnxdd4bj0yr1hz4rzk5bmd2"; + name = "kmag-16.08.1.tar.xz"; }; }; kmahjongg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmahjongg-16.08.0.tar.xz"; - sha256 = "0j8c5iz11z5n08fywspvkcizw053kb2s1pxvgp5fr9h93mxn6cmk"; - name = "kmahjongg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmahjongg-16.08.1.tar.xz"; + sha256 = "0xap6jw1gx86k8yhs7mmyp69jg4401551kmrhwbfz8cdpbzdrgz3"; + name = "kmahjongg-16.08.1.tar.xz"; }; }; kmailtransport = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmailtransport-16.08.0.tar.xz"; - sha256 = "1nm5kwr7mq813invmaq72j69lcxyg2i5bmf7d5j4flvxhl3psaz1"; - name = "kmailtransport-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmailtransport-16.08.1.tar.xz"; + sha256 = "052pnk3pqv9g58l5zlpz1mj17x72zrzjds77gd9vavmgmngzz2nd"; + name = "kmailtransport-16.08.1.tar.xz"; }; }; kmbox = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmbox-16.08.0.tar.xz"; - sha256 = "0mwi1sxdxkzfmjvf8rjxnhgs07g6p528km5cfqcsxvz3fcwqmwpd"; - name = "kmbox-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmbox-16.08.1.tar.xz"; + sha256 = "10v9x4i1waqrdq28lk4fvxg8bjpldjajdfsv2qv1wyl28kkr8xkb"; + name = "kmbox-16.08.1.tar.xz"; }; }; kmime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmime-16.08.0.tar.xz"; - sha256 = "1bd063fzzixcgcg17hpq6jxd2hp4y97gfhih2vc63bwf4vfs6vhj"; - name = "kmime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmime-16.08.1.tar.xz"; + sha256 = "188lwyp345vigjgqbljlvw84jsjisfs6drvknx4qvk74a6idj078"; + name = "kmime-16.08.1.tar.xz"; }; }; kmines = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmines-16.08.0.tar.xz"; - sha256 = "0pnqqmb18xzfcknidjrydc714ni4w04xwhshmwlx7i0wpakwkkcw"; - name = "kmines-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmines-16.08.1.tar.xz"; + sha256 = "1m7p0bwpq4ry1dw78nic73jcyf78zyrxc4cw9phdavrwvfvajzng"; + name = "kmines-16.08.1.tar.xz"; }; }; kmix = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmix-16.08.0.tar.xz"; - sha256 = "0sk18bykx1hb3sl476vdbrhnhs1n3ygp79kgil2wx2g6m20q5d3c"; - name = "kmix-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmix-16.08.1.tar.xz"; + sha256 = "0ikiillqsi1s2rl65j8f9883xg5y78a53nfha7wrzav5insyvrd0"; + name = "kmix-16.08.1.tar.xz"; }; }; kmousetool = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmousetool-16.08.0.tar.xz"; - sha256 = "1y9lfri6iw7wkaxrixm613h4wdpszaiggvbailljyl8vx82r4q5z"; - name = "kmousetool-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmousetool-16.08.1.tar.xz"; + sha256 = "0dfmjs9d1pr4sxa5v6fk2bbx4anawm0841spg8vijxikwi67vayk"; + name = "kmousetool-16.08.1.tar.xz"; }; }; kmouth = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmouth-16.08.0.tar.xz"; - sha256 = "1rx46fxfzj32a27yb597xsh1jjxn5h7kb39ywk8f2kkqvcn1dgyl"; - name = "kmouth-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmouth-16.08.1.tar.xz"; + sha256 = "01hin9yzv8zvj1pihr409clci905i3fhrwqz9izk1nhq3djxg7ld"; + name = "kmouth-16.08.1.tar.xz"; }; }; kmplot = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kmplot-16.08.0.tar.xz"; - sha256 = "1syz6dk5ha2znwg5kj34hg2hrbl83wxzxiqznlwpmh2qr4kssrml"; - name = "kmplot-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kmplot-16.08.1.tar.xz"; + sha256 = "069qsi1bk385sil9m75y0zs7nzv8qscrfpdm8iip53fwf10bx5qa"; + name = "kmplot-16.08.1.tar.xz"; }; }; knavalbattle = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/knavalbattle-16.08.0.tar.xz"; - sha256 = "030j6mq6lx3bi96g3nkj5mif996r6dg3df2331c0r0s42icw1mv1"; - name = "knavalbattle-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/knavalbattle-16.08.1.tar.xz"; + sha256 = "0xxx053p42j8r6zlz6vv6avx6iqqm5aq6q3ggjib70w4ixl1wqmp"; + name = "knavalbattle-16.08.1.tar.xz"; }; }; knetwalk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/knetwalk-16.08.0.tar.xz"; - sha256 = "0lnsvpijx5ln5mscg2s46j0xzivhni6wj47yr7lvpkjrgy715c7d"; - name = "knetwalk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/knetwalk-16.08.1.tar.xz"; + sha256 = "15nrfcd6l08lkshh6gyqfawr2b9izsirwdg9mqnnymdji8lg91nl"; + name = "knetwalk-16.08.1.tar.xz"; }; }; kolf = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kolf-16.08.0.tar.xz"; - sha256 = "06v1hyvj7dym9sn8gd7698f1806pr3h6nplxj5p4mm1ckhn6h59z"; - name = "kolf-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kolf-16.08.1.tar.xz"; + sha256 = "040fsd1kdww4yv258w1na3b5x3sxb14dj035rmw1y48lw883g439"; + name = "kolf-16.08.1.tar.xz"; }; }; kollision = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kollision-16.08.0.tar.xz"; - sha256 = "0v3lixqy932v8dnzw892jafsjzxzldmzrcmaah0qnxq9qf9q3x1x"; - name = "kollision-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kollision-16.08.1.tar.xz"; + sha256 = "0w9wsgdqcpgklv31iqhbd79n6qiqk49jkhrc2c6zhmxqp588wy14"; + name = "kollision-16.08.1.tar.xz"; }; }; kolourpaint = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kolourpaint-16.08.0.tar.xz"; - sha256 = "1bfshyfgcgvpjyxzx7yb7ws0kfyb6765nsd7pad2jc7cs5x8x5m7"; - name = "kolourpaint-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kolourpaint-16.08.1.tar.xz"; + sha256 = "1siari77ivnrbllncviy504sz8q1f1mhdpjp45z69hsjn6bw8rcz"; + name = "kolourpaint-16.08.1.tar.xz"; }; }; kompare = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kompare-16.08.0.tar.xz"; - sha256 = "0xx5l2gi031p7z488d5dn805k3likhp444520b2453vlfasmwh9z"; - name = "kompare-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kompare-16.08.1.tar.xz"; + sha256 = "0xmr3g2azrzhrjz1n9sp8wif7rxh574a1mg3prhl636pqcijq1bw"; + name = "kompare-16.08.1.tar.xz"; }; }; konquest = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/konquest-16.08.0.tar.xz"; - sha256 = "18pp4h67wkzimayq3xpz3cqw06dky7k4vhfh4l2lbgm9nvlg3bwl"; - name = "konquest-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/konquest-16.08.1.tar.xz"; + sha256 = "1hsh9n17gqwnash5f8z8zpnwxl0n09zn9hv1qn39zad23vg6fjjd"; + name = "konquest-16.08.1.tar.xz"; }; }; konsole = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/konsole-16.08.0.tar.xz"; - sha256 = "1kn80clbzq5sc6fby1gapw28lpxkbvjbk6c04avbfkg1d25n5mfg"; - name = "konsole-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/konsole-16.08.1.tar.xz"; + sha256 = "0dgphhg2icqagaw16i8z3x3mw8rmmpl3wmafbaca1gn9xw67md1g"; + name = "konsole-16.08.1.tar.xz"; }; }; kontactinterface = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kontactinterface-16.08.0.tar.xz"; - sha256 = "1snafjnmpz6xpldgksxi92dkx0kq1w2xcbkv4a8jqm7mllrxvjvy"; - name = "kontactinterface-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kontactinterface-16.08.1.tar.xz"; + sha256 = "0a8swis8i3dbv9nbbw8ksbghj5pvfsba6kkh2l4lgmkbdi0m9a3s"; + name = "kontactinterface-16.08.1.tar.xz"; }; }; kopete = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kopete-16.08.0.tar.xz"; - sha256 = "1yd69aspsnmrg2f1l33clhpj8l5qqyns1djn63j9v76r4lxkrbnp"; - name = "kopete-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kopete-16.08.1.tar.xz"; + sha256 = "0l2wkf8b2jp6gnr2930xxxz9jqmh6mlms5h8934k89z9x00ha1p5"; + name = "kopete-16.08.1.tar.xz"; }; }; kpat = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kpat-16.08.0.tar.xz"; - sha256 = "038fzs09bijmryka925hx7j4ln7z3f0qdzv7wwm9mkkp5wi4fpi6"; - name = "kpat-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kpat-16.08.1.tar.xz"; + sha256 = "1gpvha8636lwlb1qcdkirs5whil2fh6fp5xd3yh31dppxwryadaf"; + name = "kpat-16.08.1.tar.xz"; }; }; kpimtextedit = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kpimtextedit-16.08.0.tar.xz"; - sha256 = "0bz729yr01p9sjf6bh76pfn3miisas3smxwzy31hh18r9n4f7xsa"; - name = "kpimtextedit-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kpimtextedit-16.08.1.tar.xz"; + sha256 = "1a73s0w49jrblxmzfsp25pknvpggx1p765w2hflij4yr0cb0ganz"; + name = "kpimtextedit-16.08.1.tar.xz"; }; }; kppp = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kppp-16.08.0.tar.xz"; - sha256 = "1gx9ldjfasxfjr8i9pxlbwjdcypg2ffjiwddbp5pw1x6sfmyci7i"; - name = "kppp-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kppp-16.08.1.tar.xz"; + sha256 = "00fv4r6fiq7kkfi3awvk8b7ccj21hm5f7jdgkhacs6np5kv4spnd"; + name = "kppp-16.08.1.tar.xz"; }; }; kqtquickcharts = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kqtquickcharts-16.08.0.tar.xz"; - sha256 = "1bzhql082hgsmcngaclkjlfs7k1hyz17y3prcgw9qgm4nv4i18hq"; - name = "kqtquickcharts-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kqtquickcharts-16.08.1.tar.xz"; + sha256 = "0xy84v0z0mx30ynsym7qian2khck8mfgkm62sfd5v3xkgffhhdyh"; + name = "kqtquickcharts-16.08.1.tar.xz"; }; }; krdc = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/krdc-16.08.0.tar.xz"; - sha256 = "1qq1r49knndy9hz4l04ix6ax2y66q4jq0qmh0b49ldamvm0b27w0"; - name = "krdc-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/krdc-16.08.1.tar.xz"; + sha256 = "1mq867gv8l6i1xlykm0fnfsgz52h60hb3s06aq1rp97yddclr4q1"; + name = "krdc-16.08.1.tar.xz"; }; }; kremotecontrol = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kremotecontrol-16.08.0.tar.xz"; - sha256 = "1z6nhyq6x3kfsfsri3jmvdmkfdrxykc065w7kplfzrqqgnsw12gh"; - name = "kremotecontrol-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kremotecontrol-16.08.1.tar.xz"; + sha256 = "09iyp1sfva7rzxrp7ma90l3ls8yda5hyypvvn3kliv6rap0vrwv5"; + name = "kremotecontrol-16.08.1.tar.xz"; }; }; kreversi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kreversi-16.08.0.tar.xz"; - sha256 = "03z3f09z70f3c2lbvdmr3injjdd8nmwbs2drxcxmkx17p4vg9w1h"; - name = "kreversi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kreversi-16.08.1.tar.xz"; + sha256 = "15g87r85wh4b9vx21bsxp2vavfgzy8kdgwyvv39gg87rl62j7qxf"; + name = "kreversi-16.08.1.tar.xz"; }; }; krfb = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/krfb-16.08.0.tar.xz"; - sha256 = "1rvqk8sm75idnkb99v2mpfl1r32qyjcqcmbhw78lgb8nwpfr8cbs"; - name = "krfb-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/krfb-16.08.1.tar.xz"; + sha256 = "0952cxnfbwab6d1ji6wwx3snv4a9k031h8pph3n47xxr12nkjj19"; + name = "krfb-16.08.1.tar.xz"; }; }; kross-interpreters = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kross-interpreters-16.08.0.tar.xz"; - sha256 = "1njd0j893zw6bdavqiqbzp02g0y1zhb8gmbq0rb46if1q5igj10d"; - name = "kross-interpreters-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kross-interpreters-16.08.1.tar.xz"; + sha256 = "1026amgj0r1r180535mpnm5f780pm7v25ilk7ynf834lad3is95k"; + name = "kross-interpreters-16.08.1.tar.xz"; }; }; kruler = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kruler-16.08.0.tar.xz"; - sha256 = "1rcy5djmwlr4jvi7ig0075z40wfjby3hs7k40nzi3hl3khq2clfg"; - name = "kruler-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kruler-16.08.1.tar.xz"; + sha256 = "0j3hi77wlf5nwdmqiq5g34zb8pdzxn313hmc0k99p1gvkb1xn4zp"; + name = "kruler-16.08.1.tar.xz"; }; }; ksaneplugin = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksaneplugin-16.08.0.tar.xz"; - sha256 = "0439bsn8d0w72f73ixxh205aqvbdbks9n0xxb0dq16d9msykvflm"; - name = "ksaneplugin-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksaneplugin-16.08.1.tar.xz"; + sha256 = "0bx7vaw5vkr7fvmn6ywil8997d1qy6qv7sycxz3ydc5ljg1ansmr"; + name = "ksaneplugin-16.08.1.tar.xz"; }; }; kscd = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kscd-16.08.0.tar.xz"; - sha256 = "1jn7sp0ahgnqn8ws7qsaz9ax9ighx1w9jsgn3l1jqqwal2mz0gbv"; - name = "kscd-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kscd-16.08.1.tar.xz"; + sha256 = "1a6sq2dgkgvhycjxz95xa2b2xdibhl0ky54chj7hmdf43w69bdzc"; + name = "kscd-16.08.1.tar.xz"; }; }; kshisen = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kshisen-16.08.0.tar.xz"; - sha256 = "0asvxgkn3pqws91a93r5wvpafz7zfchk5xmk08b74shscidi4nl6"; - name = "kshisen-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kshisen-16.08.1.tar.xz"; + sha256 = "1j33byc485rxbcf3wk8kra7vxq4r1sg8cpfrlxwiyb9ibk762jlh"; + name = "kshisen-16.08.1.tar.xz"; }; }; ksirk = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksirk-16.08.0.tar.xz"; - sha256 = "0gh6j8ml5062m99ps7wm9nkn5b1w5lcqsjh22rd81cvl8wy48sx4"; - name = "ksirk-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksirk-16.08.1.tar.xz"; + sha256 = "121j8jz9gabdqv5fh4c2qcsg4ndj72xnmavvdrlib8a7qidjzaga"; + name = "ksirk-16.08.1.tar.xz"; }; }; ksnakeduel = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksnakeduel-16.08.0.tar.xz"; - sha256 = "1sd5vjjcg3yr8jcp76ilcql953b0wzk950w1h1lbgrll2hr81bm3"; - name = "ksnakeduel-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksnakeduel-16.08.1.tar.xz"; + sha256 = "1qzqr5ai5d7azh7xmm2vihbz3jzxxvb6qvhpfrix0yf4yr8m8fxz"; + name = "ksnakeduel-16.08.1.tar.xz"; }; }; kspaceduel = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kspaceduel-16.08.0.tar.xz"; - sha256 = "1whvibw0d1gbb28lc04q93wpalsihgqzd9hi1yabwfa5piac9ldb"; - name = "kspaceduel-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kspaceduel-16.08.1.tar.xz"; + sha256 = "0zy6m325gaivwfrr20mfwn8pdgl1i4ym1ymwb5dyw7a5yfi27m7n"; + name = "kspaceduel-16.08.1.tar.xz"; }; }; ksquares = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksquares-16.08.0.tar.xz"; - sha256 = "19rlzka8z7imhv4cbrwajkv4g38qg2mwm8pniyl0w818nj4jbjlp"; - name = "ksquares-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksquares-16.08.1.tar.xz"; + sha256 = "1rccb2qifqfb68apag01i3y97jbrskarf3480p61ixk7lrmbbrx4"; + name = "ksquares-16.08.1.tar.xz"; }; }; kstars = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kstars-16.08.0.tar.xz"; - sha256 = "0zridrc65av69q7yi3k0jq744ifr94wpv725vx3wy8v5wlsc3rcx"; - name = "kstars-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kstars-16.08.1.tar.xz"; + sha256 = "1fwl9hry23lmhyx5ldqspa7hp6bvmjp8kzwi6p9y1kbwzbzmki0k"; + name = "kstars-16.08.1.tar.xz"; }; }; ksudoku = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksudoku-16.08.0.tar.xz"; - sha256 = "15j9kjww92dmy6bvrs4pp2j6xxmz5xpci08wnab5mxsq6f6fghhs"; - name = "ksudoku-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksudoku-16.08.1.tar.xz"; + sha256 = "1msxx4hay0njp7bxjgplq7ylblbr56mf01l70sywj5madvvrmh8y"; + name = "ksudoku-16.08.1.tar.xz"; }; }; ksystemlog = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ksystemlog-16.08.0.tar.xz"; - sha256 = "1ksp8innmziyxjkxdw53sqaz66jf82xp8p2cfypw6r2zb506wq96"; - name = "ksystemlog-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ksystemlog-16.08.1.tar.xz"; + sha256 = "0garxwsgzdc5j6426gv3wqqgxra6qfdlk7xrk6mhlyg3wnwy8lz9"; + name = "ksystemlog-16.08.1.tar.xz"; }; }; kteatime = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kteatime-16.08.0.tar.xz"; - sha256 = "1hqvyypbphsplq5aqdh24wzh7msqh757y1zgpclxl6xbjxx1ys5z"; - name = "kteatime-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kteatime-16.08.1.tar.xz"; + sha256 = "0m6rri4mgr9qzcpxr5ifm1xs5mpmx7nz074gscff662nv4cj1h5n"; + name = "kteatime-16.08.1.tar.xz"; }; }; ktimer = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktimer-16.08.0.tar.xz"; - sha256 = "01gj0i5h08phhw9ds42ql1kmrl5brfasshgbxa9nvgd6i35zjp74"; - name = "ktimer-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktimer-16.08.1.tar.xz"; + sha256 = "0n94r34d24dnpi8rr6lb2vqrx1bz29xb92a63dm3s6pvbrw7zmhr"; + name = "ktimer-16.08.1.tar.xz"; }; }; ktnef = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktnef-16.08.0.tar.xz"; - sha256 = "03fhx1kyzhm1fs0p7i2488r41dbyl2knkapg0cfd8zd0pcnv518f"; - name = "ktnef-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktnef-16.08.1.tar.xz"; + sha256 = "0gjq14gcc34mqx21f74kzqb1575fhckaq13fpf00ascar0s1w0sx"; + name = "ktnef-16.08.1.tar.xz"; }; }; ktouch = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktouch-16.08.0.tar.xz"; - sha256 = "0i60f712bgldvf8dcjpd8hyf3fwlrmly96ddrkd8p5860vdyxxm1"; - name = "ktouch-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktouch-16.08.1.tar.xz"; + sha256 = "0jjn59hjbj5mc0svd8nrnqdwa4xz4wj76512gx1w1lga37ysk5gx"; + name = "ktouch-16.08.1.tar.xz"; }; }; ktp-accounts-kcm = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-accounts-kcm-16.08.0.tar.xz"; - sha256 = "0hfs46fza537cdwmx18430qnwphvqihxa9z0ys7mlhwa8gffa9gq"; - name = "ktp-accounts-kcm-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-accounts-kcm-16.08.1.tar.xz"; + sha256 = "12icgnf165v549nlwzpn3dn7237k7xi3vfg0a1i7r2mzbhdw6xf5"; + name = "ktp-accounts-kcm-16.08.1.tar.xz"; }; }; ktp-approver = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-approver-16.08.0.tar.xz"; - sha256 = "0wvi076x2xxbrd4swf8gbi30fnwa58hxnahl3ri5gpz34c7y5c3v"; - name = "ktp-approver-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-approver-16.08.1.tar.xz"; + sha256 = "08qkcn2avc5aiakn6ksjikd50x5xd1ilwy5cf2fk1jqn6zbxglm0"; + name = "ktp-approver-16.08.1.tar.xz"; }; }; ktp-auth-handler = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-auth-handler-16.08.0.tar.xz"; - sha256 = "0jyff6znszz82h3l92wjzkh9c1csnsyncd34hxvkyarxm6wb1s8f"; - name = "ktp-auth-handler-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-auth-handler-16.08.1.tar.xz"; + sha256 = "0wjz5r287f13p2s34hdjg0sy23xanwnp0274pk2hxbybf9v4ryvi"; + name = "ktp-auth-handler-16.08.1.tar.xz"; }; }; ktp-call-ui = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-call-ui-16.08.0.tar.xz"; - sha256 = "16jw9jap985p411qjkzay83yy1xrnykbnq7f315d7wqxrry3pvf1"; - name = "ktp-call-ui-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-call-ui-16.08.1.tar.xz"; + sha256 = "1gbw3a1yfm6kc85gpqhx6q7kp2fwmjgmxp819w9wrgg1qwmjyxrw"; + name = "ktp-call-ui-16.08.1.tar.xz"; }; }; ktp-common-internals = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-common-internals-16.08.0.tar.xz"; - sha256 = "1l88fnagbq9b63nfvyncq5bylpv6m9h9z1znmz1z67fp5x6lcmh9"; - name = "ktp-common-internals-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-common-internals-16.08.1.tar.xz"; + sha256 = "0ylpwjn3jknp77f8g69mkcj1zcjn9khfhxla6mci4h7cbxka9wdf"; + name = "ktp-common-internals-16.08.1.tar.xz"; }; }; ktp-contact-list = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-contact-list-16.08.0.tar.xz"; - sha256 = "06cd9yzj7lw6v6n9fqjc4lafpi1z0yl2wyipibk47xmwckx5bw9f"; - name = "ktp-contact-list-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-contact-list-16.08.1.tar.xz"; + sha256 = "0ach7dvlch162jyyw01hdlbwwh72gdp6rmmkkx65cf3g0sqhvwp4"; + name = "ktp-contact-list-16.08.1.tar.xz"; }; }; ktp-contact-runner = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-contact-runner-16.08.0.tar.xz"; - sha256 = "10yd1z90q0a8d3qcl07lnvj1j150awl2fjf74njdlxya2s0wgdmq"; - name = "ktp-contact-runner-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-contact-runner-16.08.1.tar.xz"; + sha256 = "0721mys632jn4i040v541997fb5pca2fr2nj9p49bp0r7kmgj6qr"; + name = "ktp-contact-runner-16.08.1.tar.xz"; }; }; ktp-desktop-applets = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-desktop-applets-16.08.0.tar.xz"; - sha256 = "0gbvdq7qpschhc3iq22sm505m3ph4j7r38kfzq6f51gf4284hv9x"; - name = "ktp-desktop-applets-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-desktop-applets-16.08.1.tar.xz"; + sha256 = "1fln9kndpwl8arsr1i8vsicz0cv10r00w4niv163al11yqk3ng5g"; + name = "ktp-desktop-applets-16.08.1.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-filetransfer-handler-16.08.0.tar.xz"; - sha256 = "119q2isisqpbrcffparv73n69869cc6wqih0jr34m85q2c7ifr7p"; - name = "ktp-filetransfer-handler-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-filetransfer-handler-16.08.1.tar.xz"; + sha256 = "01581r1xylj6f78vqqxi0gf5nyj2k3vyyvkz5vjkq7di140mmw97"; + name = "ktp-filetransfer-handler-16.08.1.tar.xz"; }; }; ktp-kded-module = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-kded-module-16.08.0.tar.xz"; - sha256 = "1izc4gvh433gpnbbhdhb2bfx3sx5rj8bdiqcpba43xrvimq5mhbd"; - name = "ktp-kded-module-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-kded-module-16.08.1.tar.xz"; + sha256 = "1dpaay5qkqnxy0q80gqp2mydjngx815xrdmxcvh9pm3c4w0as8lh"; + name = "ktp-kded-module-16.08.1.tar.xz"; }; }; ktp-send-file = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-send-file-16.08.0.tar.xz"; - sha256 = "1lsvs101w2xldi176am896vyihbm7w2js2h033v5p7bswnkg2mgm"; - name = "ktp-send-file-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-send-file-16.08.1.tar.xz"; + sha256 = "1nchxvc2n8a2d02cz8vlazr4fl8gpngl44lq3jymdggz58w8rji9"; + name = "ktp-send-file-16.08.1.tar.xz"; }; }; ktp-text-ui = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktp-text-ui-16.08.0.tar.xz"; - sha256 = "11ybqnkkp2r0wdczc0p3prmq9r3vhk6v81fhl4pnmcypghcgaf3f"; - name = "ktp-text-ui-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktp-text-ui-16.08.1.tar.xz"; + sha256 = "0mj5zih4pbqdc2m62s85ck7r3m12ywh0frg6n4hi8xw909w7x25m"; + name = "ktp-text-ui-16.08.1.tar.xz"; }; }; ktuberling = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/ktuberling-16.08.0.tar.xz"; - sha256 = "1dd66s2ys266jr8pp5x2vvkzlysx93baw1kpiy550rb4gsb3l537"; - name = "ktuberling-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/ktuberling-16.08.1.tar.xz"; + sha256 = "1brm1xdma1d5fcgbyn8nw3pwncnyvxknrwlbr7capgwqn7s9pckl"; + name = "ktuberling-16.08.1.tar.xz"; }; }; kturtle = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kturtle-16.08.0.tar.xz"; - sha256 = "01rphmyn89n32k579mg04gmfkjlphbn55cdqv0km4ngipiv32mj3"; - name = "kturtle-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kturtle-16.08.1.tar.xz"; + sha256 = "1d6kw35dzyq3c62j7pqsl57l8cpw98awr6bdr1v2w8xdiw9xi73c"; + name = "kturtle-16.08.1.tar.xz"; }; }; kubrick = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kubrick-16.08.0.tar.xz"; - sha256 = "081bh8msbfcx9vkdbrlgclwngrxswpmd3hfzjfndhaw8ibp42hsi"; - name = "kubrick-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kubrick-16.08.1.tar.xz"; + sha256 = "1x34gyqa77b03hqs50vajqcmw9yrqxq1f4niyfj43wkw2b4jks9f"; + name = "kubrick-16.08.1.tar.xz"; }; }; kuser = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kuser-16.08.0.tar.xz"; - sha256 = "0yq1jil5nfm2zw5sisvcvrjbxxlzjq3z8vxn41ch0ppfdpcsknjs"; - name = "kuser-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kuser-16.08.1.tar.xz"; + sha256 = "0dkv9x052iavp3hnrvnarm8hv3416kamdizwp3c22w2cfz3q4rdc"; + name = "kuser-16.08.1.tar.xz"; }; }; kwalletmanager = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kwalletmanager-16.08.0.tar.xz"; - sha256 = "174rd9d4yqrdk93hnr5nrzq3b7ilk0hjzhlsy9dqm9pr9yix79g0"; - name = "kwalletmanager-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kwalletmanager-16.08.1.tar.xz"; + sha256 = "1w99076da86qw2271hkknrjc0mfp7f0xi5544kbk76aanaj73wvm"; + name = "kwalletmanager-16.08.1.tar.xz"; }; }; kwordquiz = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/kwordquiz-16.08.0.tar.xz"; - sha256 = "1nngkkwd22nzcj4syayizmhvw8svkrhwa12ab5cfa0fmx30ivz86"; - name = "kwordquiz-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/kwordquiz-16.08.1.tar.xz"; + sha256 = "08n6ajpx5x2vpf63d4fnfw2a4hcfmca2q4nd5y04kl1sccx67zig"; + name = "kwordquiz-16.08.1.tar.xz"; }; }; libgravatar = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libgravatar-16.08.0.tar.xz"; - sha256 = "169sy6lzsvgrhm9arjg84qcy34hm5xwycl09cg2cw6l141c5yyv0"; - name = "libgravatar-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libgravatar-16.08.1.tar.xz"; + sha256 = "1izh80plcd3ss3brl0mi0alics4y53d355smpgjkfqyc80zxs7wz"; + name = "libgravatar-16.08.1.tar.xz"; }; }; libkcddb = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkcddb-16.08.0.tar.xz"; - sha256 = "1qlq62nl11dhsqn61zrvv80mybwzxhcgzdblrxqq8l352y1l916x"; - name = "libkcddb-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkcddb-16.08.1.tar.xz"; + sha256 = "1i9xb96xari03q8fw20laqh5d3fyvigzqkdw6lw61fwxzpjrphk8"; + name = "libkcddb-16.08.1.tar.xz"; }; }; libkcompactdisc = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkcompactdisc-16.08.0.tar.xz"; - sha256 = "1i2pd9xr2i61xb6128dzsf5il2sk3bqp9d8ps45lm4vld73ryxmk"; - name = "libkcompactdisc-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkcompactdisc-16.08.1.tar.xz"; + sha256 = "1qjij6kvvs8k650sg7skbgh0n4wgdkyjdsg8rydg93r0fqh5yagq"; + name = "libkcompactdisc-16.08.1.tar.xz"; }; }; libkdcraw = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkdcraw-16.08.0.tar.xz"; - sha256 = "1cmhj1jpfpaxkkgx4imh79kcd5v3zdg27i971j9z828ysdl8b9rf"; - name = "libkdcraw-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkdcraw-16.08.1.tar.xz"; + sha256 = "05206lbf2j0pry640ja5ajdlmalz4szfg2xzddfp00m87bgxbr2b"; + name = "libkdcraw-16.08.1.tar.xz"; }; }; libkdegames = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkdegames-16.08.0.tar.xz"; - sha256 = "0zh8nw3ndrvinl7qg6zhnzwn3i4qixk3wyxcf1nrfz0m294ys9yf"; - name = "libkdegames-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkdegames-16.08.1.tar.xz"; + sha256 = "11r5bf23fyymqqsj3ckbmya3f0zsdgrd4fw7jkfbxw7bfjjpr890"; + name = "libkdegames-16.08.1.tar.xz"; }; }; libkdepim = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkdepim-16.08.0.tar.xz"; - sha256 = "1n3ijr5v73sd94hj6n0xwplx7019lljv151z0rjn6fakf199p32l"; - name = "libkdepim-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkdepim-16.08.1.tar.xz"; + sha256 = "0p72dk6w0bvn7qikpqlxd7yhlrnn9wqnrq6b6p0ngnzhrsybjffm"; + name = "libkdepim-16.08.1.tar.xz"; }; }; libkeduvocdocument = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkeduvocdocument-16.08.0.tar.xz"; - sha256 = "0sv5p57lk8f0skw2z42whhizk7s3nh5hh0pf9yaxml64clmypwbk"; - name = "libkeduvocdocument-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkeduvocdocument-16.08.1.tar.xz"; + sha256 = "113z6hi6v7mj4z6qk3gj04ah60ys8fn14jwlrxj8xf5qb0fvhzbn"; + name = "libkeduvocdocument-16.08.1.tar.xz"; }; }; libkexiv2 = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkexiv2-16.08.0.tar.xz"; - sha256 = "183h9ifbzwngi5mwdq85n2jx0k67z7dzxnd43k6fv5l6h2b5l7y7"; - name = "libkexiv2-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkexiv2-16.08.1.tar.xz"; + sha256 = "1h7bd3p03xap6m6qpb0ww8ganyb9z7sdk2hpp25ar12snjpfgh0y"; + name = "libkexiv2-16.08.1.tar.xz"; }; }; libkface = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkface-16.08.0.tar.xz"; - sha256 = "175912gzb4w6ndmr164j67z3xwqhy0xpxahnqb3zqlbj0gx10wp2"; - name = "libkface-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkface-16.08.1.tar.xz"; + sha256 = "19fqg7xja2pk6wp4bvamanwpfcs5qiyzsgldpr0q4y650ipbrf4w"; + name = "libkface-16.08.1.tar.xz"; }; }; libkgeomap = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkgeomap-16.08.0.tar.xz"; - sha256 = "0jxk18dfvhrxs6war4p83sfdmn4zld5yl0x81dgmzfh7kc9dhws6"; - name = "libkgeomap-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkgeomap-16.08.1.tar.xz"; + sha256 = "0zlcd4k8yfz9l5skky7vyc2p5hgx2wnan1g0jawi2f2xzsy655nz"; + name = "libkgeomap-16.08.1.tar.xz"; }; }; libkipi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkipi-16.08.0.tar.xz"; - sha256 = "12829kp4sr5hzji26syw3b8awgxhhdpvgdjdid276im3a4xfhmsv"; - name = "libkipi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkipi-16.08.1.tar.xz"; + sha256 = "1mksgr0x446ilbqmb0wb5lh5afj8q7a88r31wzf6x3698n0s9fdb"; + name = "libkipi-16.08.1.tar.xz"; }; }; libkleo = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkleo-16.08.0.tar.xz"; - sha256 = "1n5qv9azkv29w67iwkpbxka213s81dlb8svs0xx2lxfb1z2dvrvh"; - name = "libkleo-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkleo-16.08.1.tar.xz"; + sha256 = "0a216q291vgf4v758l79aywp1f8wn40239jn9gx6ngw3p8zzf357"; + name = "libkleo-16.08.1.tar.xz"; }; }; libkmahjongg = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkmahjongg-16.08.0.tar.xz"; - sha256 = "145gi58yfcbd2magqk873hjwzk02z23zn4h3a95w236gx3r573m5"; - name = "libkmahjongg-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkmahjongg-16.08.1.tar.xz"; + sha256 = "1bvm86xcmx3cdslm98n5kg61rmyc9p86aj8scrp3gb8di1y987zx"; + name = "libkmahjongg-16.08.1.tar.xz"; }; }; libkomparediff2 = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libkomparediff2-16.08.0.tar.xz"; - sha256 = "1fqghzfnzjcfrcdn6av5r27br9qiz48ng1vgj2g2bi1y75bnla6i"; - name = "libkomparediff2-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libkomparediff2-16.08.1.tar.xz"; + sha256 = "1cqd1amnxpylwzw5vdgy29wh1llhrvbqf5kmjxxb3a3kh2rafb53"; + name = "libkomparediff2-16.08.1.tar.xz"; }; }; libksane = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libksane-16.08.0.tar.xz"; - sha256 = "079fy5izsly0qkbrxhkasdk9h2359izsxhaam0mzc24cf9ls2zbr"; - name = "libksane-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libksane-16.08.1.tar.xz"; + sha256 = "0g8vhdknph32736inzf9xbrdi51asb9md254m12cabglb1mfhia3"; + name = "libksane-16.08.1.tar.xz"; }; }; libksieve = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/libksieve-16.08.0.tar.xz"; - sha256 = "014ijwkzz8n53yy2gjm39i85rjakv447lz048kfighpl1m08yjjz"; - name = "libksieve-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/libksieve-16.08.1.tar.xz"; + sha256 = "1paq508fsb1q7nfry3za7ykz41ly3qb6splf65d9n9l8aqbfx9fx"; + name = "libksieve-16.08.1.tar.xz"; }; }; lokalize = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/lokalize-16.08.0.tar.xz"; - sha256 = "0m7sipj53ih3g2pj1a5ny667dj0jaqyrsn46bymkpz9z7rn8z5xs"; - name = "lokalize-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/lokalize-16.08.1.tar.xz"; + sha256 = "1dg6sw4zm7cq4di9zgjc4b1nk73sngc3ilshsr1wgdylpxaq9vrf"; + name = "lokalize-16.08.1.tar.xz"; }; }; lskat = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/lskat-16.08.0.tar.xz"; - sha256 = "0lnpc5sfj4bfb1fz887fgkqs5prnjlsci90fis67rim9b3b45mhd"; - name = "lskat-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/lskat-16.08.1.tar.xz"; + sha256 = "08ds76m66ni7pfmz0cnqx6b1p6l7m8fy5mz54kh9aahchw8lwpmk"; + name = "lskat-16.08.1.tar.xz"; }; }; mailcommon = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/mailcommon-16.08.0.tar.xz"; - sha256 = "1b43rfhnghm8apkl2qwg7i6mx8ci5lpjy1fgp6jrdcxip8yw0172"; - name = "mailcommon-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/mailcommon-16.08.1.tar.xz"; + sha256 = "0f25z2s8bm51p2qxl2srdjf6df9h006ji6y9vn06m1vwsyfzmg3g"; + name = "mailcommon-16.08.1.tar.xz"; }; }; mailimporter = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/mailimporter-16.08.0.tar.xz"; - sha256 = "1bak75qb8x8g1x8kw3f1a20i07hcf8fas5arxjyb9qrs97zx6vbz"; - name = "mailimporter-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/mailimporter-16.08.1.tar.xz"; + sha256 = "18hy1brpl07zcwzwv83mikn17h7xrgyc5q8xqvl5awgn8cj1zk9d"; + name = "mailimporter-16.08.1.tar.xz"; }; }; marble = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/marble-16.08.0.tar.xz"; - sha256 = "1a65w4gir65cy90sxs2x1ig95mgmrk6ai3pv2ah8kwv0gy19qc6f"; - name = "marble-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/marble-16.08.1.tar.xz"; + sha256 = "0fmgqx1nc77agrrcb6qxq0zkndxkxhqybvxpf0dxyd7mpwg00zd2"; + name = "marble-16.08.1.tar.xz"; }; }; messagelib = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/messagelib-16.08.0.tar.xz"; - sha256 = "1442qvhqjm976i20h36xck9lrad29mbhcs2p146q1rggphv9yzb6"; - name = "messagelib-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/messagelib-16.08.1.tar.xz"; + sha256 = "0kjladmrj2plj5kjmjkhh35mlijc2k3q8pdmi91xq0paawlrziyc"; + name = "messagelib-16.08.1.tar.xz"; }; }; minuet = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/minuet-16.08.0.tar.xz"; - sha256 = "07h65zkikpl5wwmw996wihylij1rxbf580fkrcwq6xjh4xk6c950"; - name = "minuet-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/minuet-16.08.1.tar.xz"; + sha256 = "1qa2a3216p8x0vr9i3jw42i134qij4v0jj0625m606ihfs2mfhbq"; + name = "minuet-16.08.1.tar.xz"; }; }; okteta = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/okteta-16.08.0.tar.xz"; - sha256 = "1mnh1p7497206z7szf0aslb9s660iv3bzssbgkkcf96r3n50g96s"; - name = "okteta-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/okteta-16.08.1.tar.xz"; + sha256 = "1q9pni82frj48lncj9ipkvdb120bg49f53p09vcpfxyax6hhnb5k"; + name = "okteta-16.08.1.tar.xz"; }; }; okular = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/okular-16.08.0.tar.xz"; - sha256 = "15qzjmpzwlq2pp0cxfcklsm0dfmla9vp649rzv76bq0qlnb0vnc2"; - name = "okular-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/okular-16.08.1.tar.xz"; + sha256 = "0x3njxxwacy9cj4rzsgphl3za01d59wpbax9wxhxcdwqfi332a0d"; + name = "okular-16.08.1.tar.xz"; }; }; palapeli = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/palapeli-16.08.0.tar.xz"; - sha256 = "0l13i9gc5nqdl0zrmnnzfklv8f4v8anhhmndxs3v0r1rgjs856m4"; - name = "palapeli-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/palapeli-16.08.1.tar.xz"; + sha256 = "15dfh9802kdmlwzjfqciszf4lwy2pr9ypnk1s2i4aj69jwqygn62"; + name = "palapeli-16.08.1.tar.xz"; }; }; parley = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/parley-16.08.0.tar.xz"; - sha256 = "0ljk290z9sx30985848pixpnyyf5bjf7gqb2jfv3qy8gbbkxvrfd"; - name = "parley-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/parley-16.08.1.tar.xz"; + sha256 = "0pwwng4rx82l7j8n9llhwn6779jjhakl84nal1s6fc4i8vack49v"; + name = "parley-16.08.1.tar.xz"; }; }; picmi = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/picmi-16.08.0.tar.xz"; - sha256 = "1ayxzfd6xgb02bliwcrbcnsjqid81afz4mmlvkdg079mzqgnsm5l"; - name = "picmi-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/picmi-16.08.1.tar.xz"; + sha256 = "0lfmswabkkj6snwmx27iv9w5c2qpw6z85rvi997ccrw5yg1627hc"; + name = "picmi-16.08.1.tar.xz"; }; }; pimcommon = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/pimcommon-16.08.0.tar.xz"; - sha256 = "0hdwdwr81viidkcxxg861pay7k3ix96wwcqj4anf1nv0cyg9i76n"; - name = "pimcommon-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/pimcommon-16.08.1.tar.xz"; + sha256 = "1n15i70mgfx0jnl4952gkn05ynpnkqz4fkmwycj0ib0ry9wvi2vh"; + name = "pimcommon-16.08.1.tar.xz"; }; }; poxml = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/poxml-16.08.0.tar.xz"; - sha256 = "1r4b763rs77w03l0wwskqfjbkk83mdbk5w22s7xwr356w6h9mir1"; - name = "poxml-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/poxml-16.08.1.tar.xz"; + sha256 = "0cwnpcagsg1dbvfhra473g7wqmk5x2frw8y3831zwr47y6kgdr0c"; + name = "poxml-16.08.1.tar.xz"; }; }; print-manager = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/print-manager-16.08.0.tar.xz"; - sha256 = "033bdrzr6726a35pf7wi4dw1slfpywi2si26pkxh90863620qa87"; - name = "print-manager-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/print-manager-16.08.1.tar.xz"; + sha256 = "1nhfkw56ri8y2pik3x76v5w3dl39k2a2ajd4gdql627sc3116c5q"; + name = "print-manager-16.08.1.tar.xz"; }; }; rocs = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/rocs-16.08.0.tar.xz"; - sha256 = "0fc8dgaj6n4kqkxs3m7p4g83znmvqx014shx0q5lv0azjr0bp09s"; - name = "rocs-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/rocs-16.08.1.tar.xz"; + sha256 = "1qif7qj67rzljpkmbqjfm0gaji8wk7mc8fbddi7fpczgnz5jcmd5"; + name = "rocs-16.08.1.tar.xz"; }; }; signon-kwallet-extension = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/signon-kwallet-extension-16.08.0.tar.xz"; - sha256 = "1gbd9gf9riyrzi1gd0hxk06n6a86j103zhcwhscg9xh5fz306v3l"; - name = "signon-kwallet-extension-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/signon-kwallet-extension-16.08.1.tar.xz"; + sha256 = "0l68iz23d5k24ciyzdb7iywamfias34yhdcm69dpqpw1jchfcrkv"; + name = "signon-kwallet-extension-16.08.1.tar.xz"; }; }; spectacle = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/spectacle-16.08.0.tar.xz"; - sha256 = "02fcgx8k74dqjn7bpkcydcdcw2jv2sk3w5a9kjwnwr14jcfb28zq"; - name = "spectacle-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/spectacle-16.08.1.tar.xz"; + sha256 = "0a9gka5xllwcdvvdbr8fj91v8zg2hlzhrh6myb0ycj7ang45gc88"; + name = "spectacle-16.08.1.tar.xz"; }; }; step = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/step-16.08.0.tar.xz"; - sha256 = "035qflw50q22ml9nmwdl7ih3ym543dcyizc792cj3axmmhjvbpki"; - name = "step-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/step-16.08.1.tar.xz"; + sha256 = "0135568xaccswfj8zfimh5fbpb8ib3lz2aq9qsw05bbmrjfv4398"; + name = "step-16.08.1.tar.xz"; }; }; svgpart = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/svgpart-16.08.0.tar.xz"; - sha256 = "1z79056lsr4w3abqic4hk7xqnpma0sqq6ir9acrgkw89qiwjinga"; - name = "svgpart-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/svgpart-16.08.1.tar.xz"; + sha256 = "0ws41853wcfj1nbd31mr5qr23rzlijprvbpr1y7wq6g9agdfdwxs"; + name = "svgpart-16.08.1.tar.xz"; }; }; sweeper = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/sweeper-16.08.0.tar.xz"; - sha256 = "0ra8gldnbd6rkqrfrdljdjdh8naw1anga7g367mzik9n8vp0j5y4"; - name = "sweeper-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/sweeper-16.08.1.tar.xz"; + sha256 = "0ywrpdhy61hm61drclk17mlmp8i0717871mc48b5rlpgkxa31aaz"; + name = "sweeper-16.08.1.tar.xz"; }; }; syndication = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/syndication-16.08.0.tar.xz"; - sha256 = "0kg4194lrpda95pr9qk87frfvx4r0lmqvvlivyz4nqd18w9dj4r3"; - name = "syndication-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/syndication-16.08.1.tar.xz"; + sha256 = "06hpw3lr3idrrbv92qd5smnnbv4yvpn5kn99bbx5rjwxbcnrklml"; + name = "syndication-16.08.1.tar.xz"; }; }; umbrello = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/umbrello-16.08.0.tar.xz"; - sha256 = "0jhcdd8awdkky6jzki034ims04n27ix38hnxhldxj94n52crjdgl"; - name = "umbrello-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/umbrello-16.08.1.tar.xz"; + sha256 = "14kalb7fpknsflkxychian1j724kfw4klcb4l361cn53imqq0ngk"; + name = "umbrello-16.08.1.tar.xz"; }; }; zeroconf-ioslave = { - version = "16.08.0"; + version = "16.08.1"; src = fetchurl { - url = "${mirror}/stable/applications/16.08.0/src/zeroconf-ioslave-16.08.0.tar.xz"; - sha256 = "0fb0c24rhkrrna9ymmlrxwf711bx7pnb2v0sx4jsla79r9wr2z0g"; - name = "zeroconf-ioslave-16.08.0.tar.xz"; + url = "${mirror}/stable/applications/16.08.1/src/zeroconf-ioslave-16.08.1.tar.xz"; + sha256 = "00p6hwrc5zhll9vfs5vzff469lgp7xbmvpa2s11ix45wh8d2wm91"; + name = "zeroconf-ioslave-16.08.1.tar.xz"; }; }; } diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix index 2e090255e59..bb123fcdab4 100644 --- a/pkgs/desktops/kde-5/plasma/default.nix +++ b/pkgs/desktops/kde-5/plasma/default.nix @@ -78,7 +78,9 @@ let plasma-desktop = callPackage ./plasma-desktop {}; plasma-integration = callPackage ./plasma-integration.nix {}; plasma-nm = callPackage ./plasma-nm {}; - plasma-pa = callPackage ./plasma-pa.nix {}; + plasma-pa = callPackage ./plasma-pa.nix { + inherit (pkgs.gnome3) gconf; + }; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh index 518c2e63163..5a19edffe9b 100644 --- a/pkgs/desktops/kde-5/plasma/fetch.sh +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.kde.org/stable/plasma/5.7.4/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/plasma/5.8.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/kde-5/plasma/kwin/default.nix index 7af947bcfe8..73e40cdb114 100644 --- a/pkgs/desktops/kde-5/plasma/kwin/default.nix +++ b/pkgs/desktops/kde-5/plasma/kwin/default.nix @@ -21,7 +21,7 @@ plasmaPackage { kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras udev - wayland xcb-util-cursor + wayland xcb-util-cursor xwayland ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); postPatch = '' diff --git a/pkgs/desktops/kde-5/plasma/plasma-pa.nix b/pkgs/desktops/kde-5/plasma/plasma-pa.nix index b0ad9ac69ff..7bf97d745fe 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-pa.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-pa.nix @@ -1,16 +1,17 @@ -{ plasmaPackage, ecm, glib, kdoctools, kconfigwidgets -, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio -, plasma-framework +{ + plasmaPackage, + ecm, + gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, + ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework }: plasmaPackage { name = "plasma-pa"; nativeBuildInputs = [ - ecm - kdoctools + ecm kdoctools ]; propagatedBuildInputs = [ - glib kconfigwidgets kcoreaddons libpulseaudio kdeclarative kglobalaccel - ki18n plasma-framework + gconf glib kconfigwidgets kcoreaddons kdeclarative + kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework ]; } diff --git a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix index 09bba4a709f..1e38c0c74dd 100644 --- a/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix +++ b/pkgs/desktops/kde-5/plasma/plasma-workspace/default.nix @@ -5,10 +5,10 @@ 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, qtquickcontrols, qtscript, qtx11extras, solid, isocodes, - libdbusmenu, libSM, libXcursor, pam, wayland + knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, + kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt, + phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols, qtscript, + qtx11extras, solid, isocodes, libdbusmenu, libSM, libXcursor, pam, wayland }: plasmaPackage { @@ -20,8 +20,8 @@ plasmaPackage { kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon - plasma-framework qtquickcontrols qtscript qtx11extras solid - isocodes libdbusmenu libSM libXcursor pam wayland + plasma-framework qtgraphicaleffects qtquickcontrols qtscript qtx11extras + solid isocodes libdbusmenu libSM libXcursor pam wayland ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/kde-5/plasma/srcs.nix b/pkgs/desktops/kde-5/plasma/srcs.nix index 2531dc66f6c..8ff8f210315 100644 --- a/pkgs/desktops/kde-5/plasma/srcs.nix +++ b/pkgs/desktops/kde-5/plasma/srcs.nix @@ -3,315 +3,323 @@ { bluedevil = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/bluedevil-5.7.4.tar.xz"; - sha256 = "0f6hdl5z9nfakhgsh9lgf1j63wnrw28wdqibahra6n97z5q6ymn9"; - name = "bluedevil-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/bluedevil-5.8.1.tar.xz"; + sha256 = "0j2mrx2qchcl1s13j3bhqrbgx7myq901clb20x4v9bfdcv1j9cp1"; + name = "bluedevil-5.8.1.tar.xz"; }; }; breeze = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/breeze-5.7.4.tar.xz"; - sha256 = "0sjcbn87zk1xnkw19byhqwkldz9j1j10421akc77cwla0qmz1586"; - name = "breeze-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/breeze-5.8.1.tar.xz"; + sha256 = "1s9z8j4jzs951yv1742lq5yh4pz82rkc1d80d7q2yh6964ck733p"; + name = "breeze-5.8.1.tar.xz"; }; }; breeze-grub = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/breeze-grub-5.7.4.tar.xz"; - sha256 = "0gixa1myhim3g06jpvbp5ygkmg1pq8bncigc9njc2fxxy8naj8jf"; - name = "breeze-grub-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/breeze-grub-5.8.1.tar.xz"; + sha256 = "1d3skcj2yg82f5nqghpz9nbz1yb0b5kps3lf28hsq2k2vpqrp4mc"; + name = "breeze-grub-5.8.1.tar.xz"; }; }; breeze-gtk = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/breeze-gtk-5.7.4.tar.xz"; - sha256 = "0igrr82cprk69g19h2lgv265780jbjlgbj1rh1j6hpfccwrwhg0x"; - name = "breeze-gtk-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/breeze-gtk-5.8.1.tar.xz"; + sha256 = "0nmf6h9kvq5l73yqri3xvldyw669a3rgbjmjizzq1qisri3y0qsz"; + name = "breeze-gtk-5.8.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/breeze-plymouth-5.7.4.tar.xz"; - sha256 = "02qn0fvkcq4gd170pakm0ypfmwj51wjascdhylvn9aclmac3j7zk"; - name = "breeze-plymouth-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/breeze-plymouth-5.8.1.tar.xz"; + sha256 = "149af4ja38h9sln7sfi05zxwnd8whhmp849zyxgbvdrjc3xxsvcz"; + name = "breeze-plymouth-5.8.1.tar.xz"; }; }; discover = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/discover-5.7.4.tar.xz"; - sha256 = "00w4n7c7k0lmjkqa6554sg0fh91n8aj01srcq6dz5h5fx1n858wz"; - name = "discover-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/discover-5.8.1.tar.xz"; + sha256 = "01njqp15qlqvkppn83m2y0yf64v53378f7l2zkzcyxx00pvq2ivk"; + name = "discover-5.8.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kactivitymanagerd-5.7.4.tar.xz"; - sha256 = "10v4w8cadrhnc7xpy8j0s1fi10gmcv1vvisi6lc8vqzdil2hk89b"; - name = "kactivitymanagerd-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kactivitymanagerd-5.8.1.tar.xz"; + sha256 = "0pdr4m9qm62v7qansax1jl8va9j4iarmw0iw4cm60m7g6z1aaf4m"; + name = "kactivitymanagerd-5.8.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kde-cli-tools-5.7.4.tar.xz"; - sha256 = "0q2dz8qx2zqsc7d185zvmv1x5wz1mvkb8zs6i2454l2l1jy6934p"; - name = "kde-cli-tools-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kde-cli-tools-5.8.1.tar.xz"; + sha256 = "1bvirh2cbp8cmqrm9h1kdpjdrzbbl9nxsgwh3fw7374k3lsiry01"; + name = "kde-cli-tools-5.8.1.tar.xz"; }; }; kdecoration = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kdecoration-5.7.4.tar.xz"; - sha256 = "160cb3ra9vgxydrgskvsacm50jhwnb0caqmfaj387gcpykxxayl1"; - name = "kdecoration-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kdecoration-5.8.1.tar.xz"; + sha256 = "09d59f10jsvhsh8dwnz9vd4ngiy22si5wcpj0idml4xvkq1sn1gj"; + name = "kdecoration-5.8.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kde-gtk-config-5.7.4.tar.xz"; - sha256 = "0l69d6rj0r9mga2p6rf9vwsalcir140xb3szy2nhdrgqmrka3mbl"; - name = "kde-gtk-config-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kde-gtk-config-5.8.1.tar.xz"; + sha256 = "1yz9abniqjsp8xc4dndcsbvjigff10787fflwczz4f48is611s3f"; + name = "kde-gtk-config-5.8.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kdeplasma-addons-5.7.4.tar.xz"; - sha256 = "0vc865f3903g93r5w8phi9l0rnlblq68nirwblic2j2a2gyjsn4r"; - name = "kdeplasma-addons-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kdeplasma-addons-5.8.1.tar.xz"; + sha256 = "1148kxdkrdyspy5y3wbs4l7asig4imjjlmssn5g0p8h3q8ag8lbx"; + name = "kdeplasma-addons-5.8.1.tar.xz"; }; }; kgamma5 = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kgamma5-5.7.4.tar.xz"; - sha256 = "15y86qhgrfs7p8imabsf45l7rpfis1mcjg4g22phizk17w4rzk92"; - name = "kgamma5-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kgamma5-5.8.1.tar.xz"; + sha256 = "1v390jlfd56v2pins903yx3z4i32dkjf4cg48ah66shxqp2lr55g"; + name = "kgamma5-5.8.1.tar.xz"; }; }; khotkeys = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/khotkeys-5.7.4.tar.xz"; - sha256 = "1lggfcgpq4x1hdvlcjmi3k63rffprhrpjkfvjhryhx62648xb24a"; - name = "khotkeys-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/khotkeys-5.8.1.tar.xz"; + sha256 = "1g3qd9v2mxi8a9556x8hrj30d0wcv0bqr414zxl631c8sm0rwami"; + name = "khotkeys-5.8.1.tar.xz"; }; }; kinfocenter = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kinfocenter-5.7.4.tar.xz"; - sha256 = "0j4l5yw0h0iwqqcfyah1wh5mnrg47nhqmqza7dz13b48n0bpg31l"; - name = "kinfocenter-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kinfocenter-5.8.1.tar.xz"; + sha256 = "0iarh97wpq0l5llasb2ikd2f53v41rilj4f6qj1flmxligs4pwdd"; + name = "kinfocenter-5.8.1.tar.xz"; }; }; kmenuedit = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kmenuedit-5.7.4.tar.xz"; - sha256 = "1g8a092kx68spvrys0b8xjyrnx1y94i5lsi51j1cw0ylgjmqsp3p"; - name = "kmenuedit-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kmenuedit-5.8.1.tar.xz"; + sha256 = "128cqnxw6rkb378p05s33i7yyz6yydnfdbf462ngiq628n6aqvrp"; + name = "kmenuedit-5.8.1.tar.xz"; }; }; kscreen = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kscreen-5.7.4.tar.xz"; - sha256 = "1i0c0znfr2y7b5aczmkym5aflh08sv1f7nfi3j6xmbzcxpfdvidy"; - name = "kscreen-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kscreen-5.8.1.tar.xz"; + sha256 = "0m9ddmp4vi38vkzik8bi5mir1mw66il2dfrf77h7amwfsnkicvfi"; + name = "kscreen-5.8.1.tar.xz"; }; }; kscreenlocker = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kscreenlocker-5.7.4.tar.xz"; - sha256 = "03giy5fxy11bdz6ww5hmgwhnlngcrzk7ahp4l1sd9yf3fd4rav6q"; - name = "kscreenlocker-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kscreenlocker-5.8.1.tar.xz"; + sha256 = "08ibp746w1xp6p5ccyl0p16giwcfrvq3nakwhwvhlwh0lirgvlrh"; + name = "kscreenlocker-5.8.1.tar.xz"; }; }; ksshaskpass = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/ksshaskpass-5.7.4.tar.xz"; - sha256 = "15b0jhpkg086rspjmcpqi0ylnvxvl9wylz13vkaqdm6408d558gg"; - name = "ksshaskpass-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/ksshaskpass-5.8.1.tar.xz"; + sha256 = "0yma28axv91zl0zjanrnwjjws9l187l6m4cjshy4ai77prcyzlqn"; + name = "ksshaskpass-5.8.1.tar.xz"; }; }; ksysguard = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/ksysguard-5.7.4.tar.xz"; - sha256 = "1r96zrplcbfb37r8vxvm2hzq638g979xx9y0jrsyhpzxhxgv4w1w"; - name = "ksysguard-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/ksysguard-5.8.1.tar.xz"; + sha256 = "1msrxhlln561y78gi6rdqzkv9sc0pk3w0znca9fjlsnacl7dbcn9"; + name = "ksysguard-5.8.1.tar.xz"; }; }; kwallet-pam = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kwallet-pam-5.7.4.tar.xz"; - sha256 = "1p3py66qw09s9pcrbn0x356c13w24nrhkgypz0v3kyr51ia1r1jr"; - name = "kwallet-pam-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kwallet-pam-5.8.1.tar.xz"; + sha256 = "1nl0lb71s2sqhdplyfn5xl01q8zrqj544vlmjd2vc1a18p6qlkcy"; + name = "kwallet-pam-5.8.1.tar.xz"; }; }; kwayland-integration = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kwayland-integration-5.7.4.tar.xz"; - sha256 = "05n0m38rmil1zg5clilsic2pq7973nymcr54w6kh93dzrr4r9ls3"; - name = "kwayland-integration-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kwayland-integration-5.8.1.tar.xz"; + sha256 = "1qwdlv7k6r7rzzihvmfhp4bsnz0nlfbi70fxxkdxdr49k1wqhxih"; + name = "kwayland-integration-5.8.1.tar.xz"; }; }; kwin = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kwin-5.7.4.tar.xz"; - sha256 = "06fmk3jpk3zbig46rzsi5wmxa17z0lnh3r0fk9hxdalxdz4c9ws8"; - name = "kwin-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kwin-5.8.1.tar.xz"; + sha256 = "0b1p6vz87ffy30ja5nz9n1q0i1nhjllcr0rfqnwa1b6wkiv7dabl"; + name = "kwin-5.8.1.tar.xz"; }; }; kwrited = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/kwrited-5.7.4.tar.xz"; - sha256 = "14c1rw8vmvi4iffqinkz7pgk49g80hw3mhh2mqk5lqj21rnrliqz"; - name = "kwrited-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/kwrited-5.8.1.tar.xz"; + sha256 = "0sk7lwrwl7h174x7bips9a4nzb4wrfqyby0whp8qjpxq891cxbgy"; + name = "kwrited-5.8.1.tar.xz"; }; }; libkscreen = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/libkscreen-5.7.4.tar.xz"; - sha256 = "1jifb6xi3d541y2c3ipx666dr4wa0i9sc59a4s75cdp82322qvsj"; - name = "libkscreen-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/libkscreen-5.8.1.tar.xz"; + sha256 = "1pgpn49vgjx9ydqvnvvrs87sjc7zkfcyddw00270m6pk76zcxvc4"; + name = "libkscreen-5.8.1.tar.xz"; }; }; libksysguard = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/libksysguard-5.7.4.tar.xz"; - sha256 = "1kkfsjzpraj0hc02mrz93jdp3ha2dv0m28jmwrxd7z059slfyfj0"; - name = "libksysguard-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/libksysguard-5.8.1.tar.xz"; + sha256 = "1l9gwirs6b3iingq6fcv3yfhkqifjwwg0vwpz9041rj4rry4h73p"; + name = "libksysguard-5.8.1.tar.xz"; }; }; milou = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/milou-5.7.4.tar.xz"; - sha256 = "1v117cdsiwg4l6g7x2k0mpgp57a9gc6k95jxxms9d41hqwq8qg6q"; - name = "milou-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/milou-5.8.1.tar.xz"; + sha256 = "0znxcmm0h3ghzy22bpcca3jkxypq9zhlwbka4a7skw7ckl55xszm"; + name = "milou-5.8.1.tar.xz"; }; }; oxygen = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/oxygen-5.7.4.tar.xz"; - sha256 = "1g18h5a3vxa7pxp07wg9g0yzddvjcqs7cnrlrb2mj8r4zdxg4nx3"; - name = "oxygen-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/oxygen-5.8.1.tar.xz"; + sha256 = "0fbj96614f59xkl7ia3k810in793jkmqmzb5csmng19qw1qjg5wk"; + name = "oxygen-5.8.1.tar.xz"; }; }; plasma-desktop = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/plasma-desktop-5.7.4.tar.xz"; - sha256 = "0xm8666acp3149gd9simmbkjpi36fbibpy86ppj0hg26pknc66mr"; - name = "plasma-desktop-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/plasma-desktop-5.8.1.tar.xz"; + sha256 = "1da96cy3pkryhff6f5cnyvvicz8brjjjh17k0rg5vbrd53zgsz4r"; + name = "plasma-desktop-5.8.1.tar.xz"; }; }; plasma-integration = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/plasma-integration-5.7.4.tar.xz"; - sha256 = "0h0pmwhkz052dzv7gk9j2a699912agzx39z9iirhigkwniij8q1x"; - name = "plasma-integration-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/plasma-integration-5.8.1.tar.xz"; + sha256 = "1xfc7nn5gcfccmby7ivwh7clrk1z4k8m1qag14r1rxfv8gnswm67"; + name = "plasma-integration-5.8.1.tar.xz"; }; }; plasma-nm = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/plasma-nm-5.7.4.tar.xz"; - sha256 = "0p5c4n6xc4dw9393l2an320z85mgg8f9wsa04dxdami2638drq9i"; - name = "plasma-nm-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/plasma-nm-5.8.1.tar.xz"; + sha256 = "0v34nvc004zini3i3ya9xw6cvyyh3r7i7z2kijjaqi70vnhx1dp6"; + name = "plasma-nm-5.8.1.tar.xz"; }; }; plasma-pa = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/plasma-pa-5.7.4.tar.xz"; - sha256 = "1zk6kry02vfmm4mwznq5gy7xzjlbpvbb4a749z0zq0nkmlpx78d4"; - name = "plasma-pa-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/plasma-pa-5.8.1.tar.xz"; + sha256 = "1dhqljwn1ihr4wj4785ggja6gvjm5cwfyc5gvmkvb2ls226k2ihb"; + name = "plasma-pa-5.8.1.tar.xz"; }; }; plasma-sdk = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/plasma-sdk-5.7.4.tar.xz"; - sha256 = "11zq31ja965p9xi4k5siki25blmy5lqsmhscq6pysqs7yzijjban"; - name = "plasma-sdk-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/plasma-sdk-5.8.1.tar.xz"; + sha256 = "0gav6b7bnxl9myf440lygiaymj8jmj6b5mf2nr4vnibymiiq6asm"; + name = "plasma-sdk-5.8.1.tar.xz"; + }; + }; + plasma-tests = { + version = "5.8.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.8.1/plasma-tests-5.8.1.tar.xz"; + sha256 = "1g5cx7vbghw2av7c943whgmsasgw612ccb9nl5kdfb0g0icpxalk"; + name = "plasma-tests-5.8.1.tar.xz"; }; }; plasma-workspace = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/plasma-workspace-5.7.4.tar.xz"; - sha256 = "0g8f1wn3cjgxiyvsbgaac91digglrka9lqsf1xr4fj6l7kfvb1ap"; - name = "plasma-workspace-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/plasma-workspace-5.8.1.tar.xz"; + sha256 = "0p7d9a612qqhfm296gg2qda4cqnqy51znbapddyra5dq9ywkhnn0"; + name = "plasma-workspace-5.8.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/plasma-workspace-wallpapers-5.7.4.tar.xz"; - sha256 = "1px6sp59wld8j6b7a22dc61b4x4rk4jv4bdfispkxv9b6nb29pdp"; - name = "plasma-workspace-wallpapers-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/plasma-workspace-wallpapers-5.8.1.tar.xz"; + sha256 = "17xz75pfpgyzynjy7n1bdm2cnbqyrqhi0d7b4ghpvygg0m1iba9s"; + name = "plasma-workspace-wallpapers-5.8.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.7.4"; + version = "1-5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/polkit-kde-agent-1-5.7.4.tar.xz"; - sha256 = "19xw0y1d5cbxs5x79gg8x5nhpsc3lzrk3cq913symg1lz4y8py8l"; - name = "polkit-kde-agent-1-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/polkit-kde-agent-1-5.8.1.tar.xz"; + sha256 = "1q5wfr308ayqarvq0fr049aqfwz36hyx8wl7pirllralnz2wmvgv"; + name = "polkit-kde-agent-1-5.8.1.tar.xz"; }; }; powerdevil = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/powerdevil-5.7.4.tar.xz"; - sha256 = "19vjhs7cccfgvln4zn8wdnawk5xq6l12qi9jkzzxbhds456xqr84"; - name = "powerdevil-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/powerdevil-5.8.1.tar.xz"; + sha256 = "0qkmdnck3im0wd1v9a24p8pxwxi38x7kx1a4z8zddsd8pd8d8sjv"; + name = "powerdevil-5.8.1.tar.xz"; }; }; sddm-kcm = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/sddm-kcm-5.7.4.tar.xz"; - sha256 = "0aljr8pmc65dd6xq4c1i17wasn50nk3p3qwm54rfm9z063qm865h"; - name = "sddm-kcm-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/sddm-kcm-5.8.1.tar.xz"; + sha256 = "0kflarcq3q1gbd1blxpspq918cyxxwyigwv8jsmr29yfx947ik17"; + name = "sddm-kcm-5.8.1.tar.xz"; }; }; systemsettings = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/systemsettings-5.7.4.tar.xz"; - sha256 = "024rqmnw5bdph15ck8zmzxjars77jzh0hfh3yys1c3ydbhnvrc3w"; - name = "systemsettings-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/systemsettings-5.8.1.tar.xz"; + sha256 = "04f0z4gq7zyyljb84na184q1wn6mkr9mg06mfv9zkbamsfaiazd8"; + name = "systemsettings-5.8.1.tar.xz"; }; }; user-manager = { - version = "5.7.4"; + version = "5.8.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.7.4/user-manager-5.7.4.tar.xz"; - sha256 = "002qzlvh911ybffp7d0ln4qn6z87lnikagmcagy5bb3ypg217ijf"; - name = "user-manager-5.7.4.tar.xz"; + url = "${mirror}/stable/plasma/5.8.1/user-manager-5.8.1.tar.xz"; + sha256 = "1bccibypnv58gkmh895w1b9lnmhwda1kypxbd34b9hcldq1dgag7"; + name = "user-manager-5.8.1.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/desktops/lxde/core/lxappearance/default.nix similarity index 57% rename from pkgs/applications/misc/lxappearance/default.nix rename to pkgs/desktops/lxde/core/lxappearance/default.nix index b6e59613b3c..06a0b5b8bff 100644 --- a/pkgs/applications/misc/lxappearance/default.nix +++ b/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -1,17 +1,22 @@ -{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk }: +{ stdenv, fetchurl, intltool, pkgconfig, libX11, gtk2 }: stdenv.mkDerivation rec { - name = "lxappearance-0.6.1"; + name = "lxappearance-0.6.2"; + src = fetchurl{ url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz"; - sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9"; + sha256 = "07r0xbi6504zjnbpan7zrn7gi4j0kbsqqfpj8v2x94gr05p16qj4"; }; - buildInputs = [ intltool libX11 pkgconfig gtk ]; + + nativeBuildInputs = [ pkgconfig intltool ]; + + buildInputs = [ libX11 gtk2 ]; + meta = { description = "A lightweight program for configuring the theme and fonts of gtk applications"; maintainers = [ stdenv.lib.maintainers.hinton ]; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.gpl2; - homepage = "http://lxappearance.sourceforce.net/"; + homepage = "http://lxde.org/"; }; } diff --git a/pkgs/desktops/lxqt/base/liblxqt/default.nix b/pkgs/desktops/lxqt/base/liblxqt/default.nix new file mode 100644 index 00000000000..b973940b9b6 --- /dev/null +++ b/pkgs/desktops/lxqt/base/liblxqt/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "liblxqt"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "12gla3pdg0n28w15qrmha83xm3021xdby8ydwp1qzcips5pa5zac"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + qt5.qtx11extras + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + lxqt.libqtxdg + xorg.libXScrnSaver + ]; + + cmakeFlags = [ + "-DPULL_TRANSLATIONS=NO" + "-DLXQT_ETC_XDG_DIR=/run/current-system/sw/etc/xdg" + ]; + + patchPhase = '' + sed -i 's|set(LXQT_SHARE_DIR .*)|set(LXQT_SHARE_DIR "/run/current-system/sw/share/lxqt")|' CMakeLists.txt + ''; + + meta = with stdenv.lib; { + description = "Core utility library for all LXQt components"; + homepage = https://github.com/lxde/liblxqt; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/base/libqtxdg/default.nix b/pkgs/desktops/lxqt/base/libqtxdg/default.nix new file mode 100644 index 00000000000..47d3fb2e91c --- /dev/null +++ b/pkgs/desktops/lxqt/base/libqtxdg/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "libqtxdg-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = "libqtxdg"; + rev = version; + sha256 = "1s5jw4q6gcivk7mc95ir9q2nry4yyhfwy039ddf5ymh79nynv8vy"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt5.qtbase qt5.qtsvg ]; + + meta = with stdenv.lib; { + description = "Qt implementation of freedesktop.org xdg specs"; + homepage = https://github.com/lxde/libqtxdg; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/base/libsysstat/default.nix b/pkgs/desktops/lxqt/base/libsysstat/default.nix new file mode 100644 index 00000000000..363b3d33d14 --- /dev/null +++ b/pkgs/desktops/lxqt/base/libsysstat/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "libsysstat-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = "libsysstat"; + rev = version; + sha256 = "1swpnz37daj3njkbqddmhaiipfl335c3g675y9afhabg7l4anf1n"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt5.qtbase ]; + + meta = with stdenv.lib; { + description = "Library used to query system info and statistics"; + homepage = https://github.com/lxde/libsysstat; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/libfm-qt/default.nix b/pkgs/desktops/lxqt/core/libfm-qt/default.nix new file mode 100644 index 00000000000..71b6cff5899 --- /dev/null +++ b/pkgs/desktops/lxqt/core/libfm-qt/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, +libfm, menu-cache }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "libfm-qt"; + version = "0.11.1"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "1kgvzjsa4ihlj2clz6y6s95nq0lhg66d1dhkgw3mdqaak7d0pdiz"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + lxqt.liblxqt + lxqt.libqtxdg + ]; + + buildInputs = [ + qt5.qtx11extras + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + xorg.libpthreadstubs + xorg.libXdmcp + libfm + menu-cache + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "Core library of PCManFM-Qt (Qt binding for libfm)"; + homepage = https://github.com/lxde/libfm-qt; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-about/default.nix b/pkgs/desktops/lxqt/core/lxqt-about/default.nix new file mode 100644 index 00000000000..3e3b047dd4e --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-about/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-about"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0739gp3af68cvf8fxqvd203xqzncglmxpklq8mryrs5f1xnqp6gc"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtx11extras + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + postPatch = lxqt.standardPatch; + + meta = with stdenv.lib; { + description = "Dialogue window providing information about LXQt and the system it's running on"; + homepage = https://github.com/lxde/lxqt-about; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-admin/default.nix b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix new file mode 100644 index 00000000000..da47e02dcf1 --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-admin/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, polkit }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-admin"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "17g9v6dyqy5pgpqragpf0sgnfxz2ip2g7xix7kmkna3qyym44b23"; + }; + + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + qt5.qtx11extras + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + polkit + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + postPatch = lxqt.standardPatch; + + meta = with stdenv.lib; { + description = "LXQt system administration tool"; + homepage = https://github.com/lxde/lxqt-admin; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-common/default.nix b/pkgs/desktops/lxqt/core/lxqt-common/default.nix new file mode 100644 index 00000000000..a4b8f000dc7 --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-common/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, xorg, hicolor_icon_theme, xmessage }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-common"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "14nx3zcknwsn713wdnmb2xl15vf21vh13kxscdwmfnd48m5j4m3b"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtx11extras + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + hicolor_icon_theme + xmessage + ]; + + postPatch = lxqt.standardPatch + + '' + substituteInPlace ./startlxqt.in \ + --replace "cp " "cp --no-preserve=mode " \ + --replace xmessage "${xmessage}"/bin/xmessage + ''; + + meta = with stdenv.lib; { + description = "Common files for LXQt"; + homepage = https://github.com/lxde/lxqt-common; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-config/default.nix b/pkgs/desktops/lxqt/core/lxqt-config/default.nix new file mode 100644 index 00000000000..66187a0ae6f --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-config/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-config"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "187x19s0jw20an37v7svkry6p021ply4i3ngh5w2nx5rlqkf63qw"; + }; + + nativeBuildInputs = [ + cmake + pkgconfig + ]; + + buildInputs = [ + qt5.qtbase + qt5.qtx11extras + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + kde5.libkscreen + lxqt.liblxqt + lxqt.libqtxdg + xorg.libpthreadstubs + xorg.libXdmcp + xorg.libXScrnSaver + xorg.libxcb + xorg.libXcursor + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + postPatch = lxqt.standardPatch; + + meta = with stdenv.lib; { + description = "Tools to configure LXQt and the underlying operating system"; + homepage = https://github.com/lxde/lxqt-config; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix new file mode 100644 index 00000000000..7f1f140653f --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-globalkeys/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-globalkeys"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "05kcq21fyz7vnhh9k4nzhskgbghp1slsz14gh9anhya4a567xx0y"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + postPatch = lxqt.standardPatch; + + meta = with stdenv.lib; { + description = "Daemon used to register global keyboard shortcuts"; + homepage = https://github.com/lxde/lxqt-globalkeys; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix new file mode 100644 index 00000000000..477575289bb --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-l10n/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: + +stdenv.mkDerivation rec { + name = "lxqt-l10n-${version}"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "lxde"; + repo = "lxqt-l10n"; + rev = version; + sha256 = "1gwismyjfdd7lwlgfl5jvbxmkbq9v9ia0shm4f7hkkvlpc2y24gk"; + }; + + nativeBuildInputs = [ + cmake + qt5.qtbase + qt5.qtx11extras + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" "$out"/share/lxqt/translations + ''; + + meta = with stdenv.lib; { + description = "Translations of LXQt"; + homepage = https://github.com/lxde/lxqt-l10n; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix new file mode 100644 index 00000000000..1ecef633494 --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-notificationd/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-notificationd"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "001xcvmg7ap5pbssc9pqp4jshgq2h4zxk9rra76xnrby6k8n6p3x"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "The LXQt notification daemon"; + homepage = https://github.com/lxde/lxqt-notificationd; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix new file mode 100644 index 00000000000..202231fbdea --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-openssh-askpass/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-openssh-askpass"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0nz8sv3yrqbzgmd6jahaqaa71axy5x06k091splp9cmab0vzng7c"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "GUI to query passwords on behalf of SSH agents"; + homepage = https://github.com/lxde/lxqt-openssh-askpass; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-panel/default.nix b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix new file mode 100644 index 00000000000..d5786444fad --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-panel/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, +libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, +lxmenu-data }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-panel"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0lwgz6nir4cd50xbmc3arngnw38rb5kqgcsgp3dlq6gpncg45hdq"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + qt5.libdbusmenu + kde5.kwindowsystem + kde5.solid + kde5.kguiaddons + lxqt.liblxqt + lxqt.libqtxdg + lxqt.lxqt-globalkeys + lxqt.libsysstat + xorg.libpthreadstubs + xorg.libXdmcp + libstatgrab + lm_sensors + libpulseaudio + alsaLib + menu-cache + lxmenu-data + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + postPatch = lxqt.standardPatch; + + meta = with stdenv.lib; { + description = "The LXQt desktop panel"; + homepage = https://github.com/lxde/lxqt-panel; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix new file mode 100644 index 00000000000..627f43f8be6 --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-policykit/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-policykit"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0rbqzh8r259cc44f1cb236p9c3lp195zjdsw3w1nz7j7gzv9yjnd"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + qt5.polkit-qt + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "The LXQt PolicyKit agent"; + homepage = https://github.com/lxde/lxqt-policykit; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix new file mode 100644 index 00000000000..aabce857edd --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-powermanagement/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-powermanagement"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "10myxrhlhvr9cmcqv67skzd11c40bgqgf6qdvm5smww2il1mzfwa"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + kde5.solid + kde5.kidletime + lxqt.liblxqt + lxqt.libqtxdg + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "Power management module for LXQt"; + homepage = https://github.com/lxde/lxqt-powermanagement; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix new file mode 100644 index 00000000000..e0a95d23c4e --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-qtplugin/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-qtplugin"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "14bwi1c078arin025jcygz0db9nfr8qla9071ls17bbp4dh14vhx"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase + qt5.qtx11extras + qt5.qttools + qt5.qtsvg + qt5.libdbusmenu + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + postPatch = lxqt.standardPatch; + + meta = with stdenv.lib; { + description = "LXQt Qt platform integration plugin"; + homepage = https://github.com/lxde/lxqt-qtplugin; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-runner/default.nix b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix new file mode 100644 index 00000000000..02d6f90397a --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-runner/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, +menu-cache, muparser }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-runner"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "1gqs1b90km39dbg49g80x770i9jknni4h8y6ka2r1fga35amllkc"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + lxqt.lxqt-globalkeys + menu-cache + muparser + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "Tool used to launch programs quickly by typing their names"; + homepage = https://github.com/lxde/lxqt-runner; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-session/default.nix b/pkgs/desktops/lxqt/core/lxqt-session/default.nix new file mode 100644 index 00000000000..a226169b21a --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-session/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, xdg-user-dirs }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-session"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "1vb8mcy6z1irnd977x5425mbp4c7yc9dhk5552isqss1qb44hpn4"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + xorg.libpthreadstubs + xorg.libXdmcp + xdg-user-dirs + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "An alternative session manager ported from the original razor-session"; + homepage = https://github.com/lxde/lxqt-session; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix new file mode 100644 index 00000000000..ad0885917ae --- /dev/null +++ b/pkgs/desktops/lxqt/core/lxqt-sudo/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt, sudo }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lxqt-sudo"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0nmn0j5qvqpkhlq8yvl8ycn3hijbnwxd32hhmxhcnaq07cmzbg1j"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + sudo + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "GUI frontend for sudo/su"; + homepage = https://github.com/lxde/lxqt-sudo; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix new file mode 100644 index 00000000000..ea2f24d6cf1 --- /dev/null +++ b/pkgs/desktops/lxqt/core/pavucontrol-qt/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, +xdg-user-dirs, libpulseaudio }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "pavucontrol-qt"; + version = "0.1.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "1bis88ykasrnk9a55nnbn832acjz2h76h6i3lbxnb36yq71wan7j"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + xdg-user-dirs + libpulseaudio + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; + homepage = https://github.com/lxde/pavucontrol-qt; + license = licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix new file mode 100644 index 00000000000..bc9cf774017 --- /dev/null +++ b/pkgs/desktops/lxqt/core/pcmanfm-qt/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, xorg, libfm, +menu-cache, lxmenu-data }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "pcmanfm-qt"; + version = "0.11.1"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "04fv23glcnfiszam90iy3gvn2sigyk8zj8a1s43wz8fgjijnws32"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + lxqt.libfm-qt + xorg.libpthreadstubs + xorg.libXdmcp + libfm + menu-cache + lxmenu-data + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; + homepage = https://github.com/lxde/pcmanfm-qt; + license = licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/core/qtermwidget/default.nix b/pkgs/desktops/lxqt/core/qtermwidget/default.nix new file mode 100644 index 00000000000..33f3cc19cf6 --- /dev/null +++ b/pkgs/desktops/lxqt/core/qtermwidget/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, qt5 }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "qtermwidget"; + version = "0.7.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "18dnrzpbijh0xdgx83zs8nlbxk0d7hgzib54fqqvxyrjjy4g9scz"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt5.qtbase ]; + + meta = with stdenv.lib; { + description = "A terminal emulator widget for Qt 5"; + homepage = https://github.com/lxde/qtermwidget; + license = licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix new file mode 100644 index 00000000000..981503cab95 --- /dev/null +++ b/pkgs/desktops/lxqt/default.nix @@ -0,0 +1,66 @@ +{ pkgs, newScope, fetchFromGitHub }: + +let + callPackage = newScope self; + + self = rec { + + # For compiling information, see: + # - https://github.com/lxde/lxqt/wiki/Building-from-source + + standardPatch = '' + for file in $(find . -name CMakeLists.txt); do + substituteInPlace $file \ + --replace "DESTINATION \''${LXQT_ETC_XDG_DIR}" "DESTINATION etc/xdg" \ + --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ + --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \ + --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \ + --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"lib/qt5/plugins" \ + --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations + echo ============================ + echo $file + grep --color=always DESTINATION $file || true + grep --color=always share/lxqt/translations $file || true + grep --color=always platform $file || true + done + echo -------------------------------------------------------- + ''; + + ### BASE + libqtxdg = callPackage ./base/libqtxdg { }; + libsysstat = callPackage ./base/libsysstat { }; + liblxqt = callPackage ./base/liblxqt { }; + + ### CORE 1 + libfm-qt = callPackage ./core/libfm-qt { }; + lxqt-about = callPackage ./core/lxqt-about { }; + lxqt-admin = callPackage ./core/lxqt-admin { }; + lxqt-common = callPackage ./core/lxqt-common { }; + lxqt-config = callPackage ./core/lxqt-config { }; + lxqt-globalkeys = callPackage ./core/lxqt-globalkeys { }; + lxqt-l10n = callPackage ./core/lxqt-l10n { }; + lxqt-notificationd = callPackage ./core/lxqt-notificationd { }; + lxqt-openssh-askpass = callPackage ./core/lxqt-openssh-askpass { }; + lxqt-policykit = callPackage ./core/lxqt-policykit { }; + lxqt-powermanagement = callPackage ./core/lxqt-powermanagement { }; + lxqt-qtplugin = callPackage ./core/lxqt-qtplugin { }; + lxqt-session = callPackage ./core/lxqt-session { }; + lxqt-sudo = callPackage ./core/lxqt-sudo { }; + pavucontrol-qt = callPackage ./core/pavucontrol-qt { }; + qtermwidget = callPackage ./core/qtermwidget { }; + + ### CORE 2 + lxqt-panel = callPackage ./core/lxqt-panel { }; + lxqt-runner = callPackage ./core/lxqt-runner { }; + pcmanfm-qt = callPackage ./core/pcmanfm-qt { }; + + ### OPTIONAL + qterminal = callPackage ./optional/qterminal { }; + compton-conf = callPackage ./optional/compton-conf { }; + obconf-qt = callPackage ./optional/obconf-qt { }; + lximage-qt = callPackage ./optional/lximage-qt { }; + qps = callPackage ./optional/qps { }; + + }; + +in self diff --git a/pkgs/desktops/lxqt/optional/compton-conf/default.nix b/pkgs/desktops/lxqt/optional/compton-conf/default.nix new file mode 100644 index 00000000000..45717fe31e2 --- /dev/null +++ b/pkgs/desktops/lxqt/optional/compton-conf/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, lxqt, libconfig }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "compton-conf"; + version = "0.2.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "04svxawa8l0ciflrspkzi13nnl7bljmfwwrgxn5lb3sw6qdcmdlk"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + libconfig + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "GUI configuration tool for compton X composite manager"; + homepage = https://github.com/lxde/compton-conf; + license = licenses.lgpl21; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/optional/lximage-qt/default.nix b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix new file mode 100644 index 00000000000..ac7055924c4 --- /dev/null +++ b/pkgs/desktops/lxqt/optional/lximage-qt/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt, + libfm, menu-cache, libexif }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "lximage-qt"; + version = "0.5.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "0c5s0c2y73hp7mcxwg31bpn0kmjyhv519d0dxzp3na56n0xk9vl0"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + lxqt.libfm-qt + xorg.libpthreadstubs + xorg.libXdmcp + libfm + menu-cache + libexif + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "The image viewer and screenshot tool for lxqt"; + homepage = https://github.com/lxde/lximage-qt; + license = licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/optional/obconf-qt/default.nix b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix new file mode 100644 index 00000000000..381c998616f --- /dev/null +++ b/pkgs/desktops/lxqt/optional/obconf-qt/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, qt5, kde5, xorg, lxqt, +openbox, hicolor_icon_theme }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "obconf-qt"; + version = "0.11.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "1q3y4sc1kg3hw4869rx4g08y85rnvnxgk8rf8h6amkf5r5561iyk"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + xorg.libpthreadstubs + xorg.libXdmcp + openbox + hicolor_icon_theme + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "The Qt port of obconf, the Openbox configuration tool"; + homepage = https://github.com/lxde/obconf-qt; + license = licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/optional/qps/default.nix b/pkgs/desktops/lxqt/optional/qps/default.nix new file mode 100644 index 00000000000..d39341eb05d --- /dev/null +++ b/pkgs/desktops/lxqt/optional/qps/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, makeDesktopItem }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "qps"; + version = "1.10.16"; + + srcs = fetchFromGitHub { + owner = "QtDesktop"; + repo = pname; + rev = "v${version}"; + sha256 = "1s6hvqfv9hv1cl5pfsmghqn1zqhibr4plq3glzgd8s7swwdnsvjj"; + }; + + desktopItem = makeDesktopItem { + name = "qps"; + exec = "qps"; + icon = "qps"; + comment = "Visual process manager - Qt version of ps/top"; + desktopName = "qps"; + genericName = meta.description; + categories = "System;"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ qt5.qtbase qt5.qtx11extras ]; + + installPhase = '' + mkdir -p $out/{bin,share/{man/man1,doc,icons}} + cp -a src/qps $out/bin/ + cp -a ../README.md $out/share/doc/ + cp -a ../qps.1 $out/share/man/man1/ + cp -a ../icon/icon.xpm $out/share/icons/qps.xpm + ln -sv "${desktopItem}/share/applications" $out/share/ + ''; + + meta = with stdenv.lib; { + description = "The Qt process manager"; + homepage = https://github.com/QtDesktop/qps; + license = licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/lxqt/optional/qterminal/default.nix b/pkgs/desktops/lxqt/optional/qterminal/default.nix new file mode 100644 index 00000000000..7f0f66c6fbe --- /dev/null +++ b/pkgs/desktops/lxqt/optional/qterminal/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, cmake, qt5, kde5, lxqt }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "qterminal"; + version = "0.7.0"; + + srcs = fetchFromGitHub { + owner = "lxde"; + repo = pname; + rev = version; + sha256 = "1g8d66h8avk094wvgqw0mgl9caamdig6bnn4vawshn4j7y8g4n7v"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtx11extras + qt5.qtsvg + kde5.kwindowsystem + lxqt.liblxqt + lxqt.libqtxdg + lxqt.qtermwidget + ]; + + cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; + + meta = with stdenv.lib; { + description = "A lightweight Qt-based terminal emulator"; + homepage = https://github.com/lxde/qterminal; + license = licenses.gpl2; + maintainers = with maintainers; [ romildo ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/desktops/mate/mate-common/default.nix b/pkgs/desktops/mate/mate-common/default.nix index ada4fb7a394..7a7ad23c6bd 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.15"; + major-ver = "1.16"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1r3c0i03ylrlibn4pz4j9qzbnj7b540hyhf98kkzzh680jn59iiy"; + sha256 = "02pj5ry3c7p5sd2mp9dsshy0ij0xgv00bxr4vvmnm027hv2silrl"; }; meta = { diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index e0f370fed76..d9370f318d7 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.15"; - minor-ver = "1"; + major-ver = "1.16"; + minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1x2jn86gcv6spnkvhjg0mzp5qhlb5dw4h8m8qp1hdgzzrzinfr3p"; + sha256 = "0p3z3qarbvrhzj2sdw3f8dp0c7wwjkk9a749bq8rh5gm9m66hibg"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/desktops/mate/mate-icon-theme/default.nix b/pkgs/desktops/mate/mate-icon-theme/default.nix index 9d4adb331ac..8acef033871 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.15"; + major-ver = "1.16"; minor-ver = "0"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/${major-ver}/${name}.tar.xz"; - sha256 = "1jpz3ihmyhyiyqlqz798xgzl3qa31ghymw3yrw6abd7ww0nkwiq9"; + sha256 = "1zldw22p1i76iss8car39pmfagpfxxlfk1fdhvr4x5r6gf36gv7d"; }; nativeBuildInputs = [ pkgconfig intltool iconnamingutils ]; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 5bb7424dc6b..343148da0bc 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -6,15 +6,17 @@ stdenv.mkDerivation rec { version = "${major-ver}.${minor-ver}"; major-ver = gnome3.version; minor-ver = { - "3.18" = "3"; - "3.20" = "10"; + "3.18" = "4"; + "3.20" = "12"; + "3.22" = "3"; }."${major-ver}"; src = fetchurl { url = "http://pub.mate-desktop.org/releases/themes/${major-ver}/${name}.tar.xz"; sha256 = { - "3.18" = "09vglvjnjnm95wxw5b7pn6rf5xrr3nfyqs5c3y1c72z4p3w8qqn5"; - "3.20" = "0bhhidip8qbsq69a9n0dmxfryhvzngiy59vnms6xhya9n7y19hci"; + "3.18" = "1h3z705jrg7gng5glf51ksszjz6v81qq83qvmfpv1v69bwn6fy4b"; + "3.20" = "15s2xp2cq9x8iikvbywr5gl8l33i57i1xvbv4jc2qipnkn3c4yca"; + "3.22" = "0p1rf5q2nr1vsab3pljwycclbrnwylvp88d0dhk8as0d6n6fp85k"; }."${major-ver}"; }; diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix index f6f7c4c3a54..8e3998c05f2 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings.nix @@ -3,21 +3,25 @@ let p_name = "xfce4-settings"; ver_maj = "4.12"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "${p_name}-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4"; + sha256 = "0x35i1cvkqp0hib1knwa58mckdwrfbhaisz4bsx6bbbx385llj7n"; }; patches = [ ./xfce4-settings-default-icon-theme.patch ]; + nativeBuildInputs = + [ pkgconfig intltool + ]; + buildInputs = - [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower - xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon + [ exo gtk libxfce4util libxfce4ui libglade upower xfconf + xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon ]; #TODO: optional packages configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ]; diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index fff958de9a0..f8ede8cae45 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -5,9 +5,10 @@ let callPackage = newScope (deps // xfce_self); deps = { # xfce-global dependency overrides should be here - inherit (pkgs.gnome) libglade libwnck vte gtksourceview; + inherit (pkgs.gnome2) libglade libwnck vte gtksourceview; inherit (pkgs.gnome3) dconf; inherit (pkgs.perlPackages) URI; + gtk = pkgs.gtk2; }; xfce_self = rec { # the lines are very long but it seems better than the even-odd line approach @@ -74,24 +75,26 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od #### PANEL PLUGINS from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}" - xfce4_battery_plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; - xfce4_clipman_plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; - xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; - xfce4_cpugraph_plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; - xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; - xfce4_dict_plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; - xfce4_embed_plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; - xfce4_eyes_plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; - xfce4_fsguard_plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; - xfce4_genmon_plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; - xfce4_netload_plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { }; - xfce4_notes_plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; - xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; - xfce4_verve_plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; - xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; - xfce4_weather_plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; - xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; - xfce4_pulseaudio_plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; + xfce4_battery_plugin = callPackage ./panel-plugins/xfce4-battery-plugin.nix { }; + xfce4_clipman_plugin = callPackage ./panel-plugins/xfce4-clipman-plugin.nix { }; + xfce4_cpufreq_plugin = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix { }; + xfce4_cpugraph_plugin = callPackage ./panel-plugins/xfce4-cpugraph-plugin.nix { }; + xfce4_datetime_plugin = callPackage ./panel-plugins/xfce4-datetime-plugin.nix { }; + xfce4_dict_plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; + xfce4_embed_plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; + xfce4_eyes_plugin = callPackage ./panel-plugins/xfce4-eyes-plugin.nix { }; + xfce4_fsguard_plugin = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix { }; + xfce4_genmon_plugin = callPackage ./panel-plugins/xfce4-genmon-plugin.nix { }; + xfce4-hardware-monitor-plugin = callPackage ./panel-plugins/xfce4-hardware-monitor-plugin.nix { }; + xfce4_netload_plugin = callPackage ./panel-plugins/xfce4-netload-plugin.nix { }; + xfce4_notes_plugin = callPackage ./panel-plugins/xfce4-notes-plugin.nix { }; + xfce4-sensors-plugin = callPackage ./panel-plugins/xfce4-sensors-plugin.nix { }; + xfce4_systemload_plugin = callPackage ./panel-plugins/xfce4-systemload-plugin.nix { }; + xfce4_verve_plugin = callPackage ./panel-plugins/xfce4-verve-plugin.nix { }; + xfce4_xkb_plugin = callPackage ./panel-plugins/xfce4-xkb-plugin.nix { }; + xfce4_weather_plugin = callPackage ./panel-plugins/xfce4-weather-plugin.nix { }; + xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { }; + xfce4_pulseaudio_plugin = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix { }; }; # xfce_self diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix new file mode 100644 index 00000000000..ea17c960b2e --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, intltool, autoreconfHook, gnome2, + libgtop, libxfce4ui, libxfce4util, xfce4panel, lm_sensors +}: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "xfce4-hardware-monitor-plugin"; + version = "1.5.0"; + + src = fetchurl { + url = "https://git.xfce.org/panel-plugins/${pname}/snapshot/${name}.tar.bz2"; + sha256 = "0sqvisr8gagpywq9sfyzqw37hxmj54ii89j5s2g8hx8bng5a98z1"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + intltool + ]; + + buildInputs = [ + gnome2.gtkmm2 + gnome2.libgnomecanvas + gnome2.libgnomecanvasmm + libgtop + libxfce4ui + libxfce4util + xfce4panel + lm_sensors + ]; + + enableParallelBuilding = true; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}"; + description = "Hardware monitor plugin for the XFCE4 panel"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix new file mode 100644 index 00000000000..770f3449023 --- /dev/null +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, pkgconfig, intltool, gnome2, libxfce4ui, + libxfce4util, xfce4panel, libnotify, lm_sensors, hddtemp, netcat +}: + +stdenv.mkDerivation rec { + name = "${pname}-${ver_maj}.${ver_min}"; + pname = "xfce4-sensors-plugin"; + ver_maj = "1.2"; + ver_min = "6"; + + src = fetchurl { + url = "mirror://xfce/src/panel-plugins/${pname}/${ver_maj}/${name}.tar.bz2"; + sha256 = "1h0vpqxcziml3gwrbvd8xvy1mwh9mf2a68dvxsy03rs5pm1ghpi3"; + }; + + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + gnome2.gtk + libxfce4ui + libxfce4util + xfce4panel + libnotify + lm_sensors + hddtemp + netcat + ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--with-pathhddtemp=${hddtemp}/bin/hddtemp" + "--with-pathnetcat=${netcat}/bin/netcat" + ]; + + meta = { + homepage = "http://goodies.xfce.org/projects/panel-plugins/${pname}"; + description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.romildo ]; + }; +} diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index f89947d7d61..ccf6dac895c 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -16,14 +16,14 @@ let ncurses5 = ncurses.override { abiVersion = "5"; }; in stdenv.mkDerivation rec { - version = "1.6.9"; + version = "1.6.12"; name = "arduino${stdenv.lib.optionalString (withGui == false) "-core"}-${version}"; src = fetchFromGitHub { owner = "arduino"; repo = "Arduino"; rev = "${version}"; - sha256 = "0ksd6mkcf41114n0h37q80y1bz3a2q3z8kg6m9i11c3wrj8n80np"; + sha256 = "0rz8dv1mncwx2wkafakxqdi2y0rq3f72fr57cg0z5hgdgdm89lkh"; }; buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline ]; @@ -43,13 +43,8 @@ stdenv.mkDerivation rec { cp -v $file_src $file_dst done - # Loop above creates library_index.json.gz, package_index.json.gz and package_index.json.sig in - # current directory. And now we can inject them into build process. - library_index_url=file://$(pwd)/library_index.json - package_index_url=file://$(pwd)/package_index.json - cd ./arduino-core && ant - cd ../build && ant -Dlibrary_index_url=$library_index_url -Dpackage_index_url=$package_index_url + cd ../build && ant cd .. ''; diff --git a/pkgs/development/arduino/arduino-core/downloads.nix b/pkgs/development/arduino/arduino-core/downloads.nix index 5057d5ac6b5..9d3ed56bee9 100644 --- a/pkgs/development/arduino/arduino-core/downloads.nix +++ b/pkgs/development/arduino/arduino-core/downloads.nix @@ -1,22 +1,6 @@ {fetchurl, optionalAttrs, system}: { - # Following 3 files are snapshots of files that were downloaded from http://download.arduino.cc/ - # Because original URLs update daily. https://github.com/binarin/arduino-indexes also contains script - # for updating those snapshots. - "package_index.json.gz" = fetchurl { - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/package_index.json.gz"; - sha256 = "11y16864bca6h5n03xbk8cw3v9b4xwvjz5mkirkcxslkkf7cx5yg"; - }; - "package_index.json.sig" = fetchurl { - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/package_index.json.sig"; - sha256 = "14ky3qb81mvqswaw9g5cpg5jcjqx6knfm75mzx1si7fbx576amls"; - }; - "library_index.json.gz" = fetchurl { - url = "https://github.com/binarin/arduino-indexes/raw/snapshot-2016-07-18/library_index.json.gz"; - sha256 = "19md4yf4m4wh9vnc3aj0gm3jak1qa591z5yhg0x8lsxx5hr2v85z"; - }; - "build/shared/reference-1.6.6-3.zip" = fetchurl { url = "http://downloads.arduino.cc/reference-1.6.6-3.zip"; sha256 = "119nj1idz85l71fy6a6wwsx0mcd8y0ib1wy0l6j9kz88nkwvggy3"; @@ -29,13 +13,13 @@ url = "http://downloads.arduino.cc/Edison_help_files-1.6.2.zip"; sha256 = "1x25rivmh0zpa6lr8dafyxvim34wl3wnz3r9msfxg45hnbjqqwan"; }; - "build/Firmata-2.5.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Firmata/archive/2.5.2.zip"; - sha256 = "1r75bxvpr17kwhpks9nxxpm5d5qbw0qnhygakv06whan9s0dc5cz"; + "build/Firmata-2.5.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Firmata/archive/2.5.3.zip"; + sha256 = "1ims6bdmwv8lgcvd4ri4i39vqm1q5jbwirmki35bybqqb1sl171v"; }; - "build/Bridge-1.6.2.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Bridge/archive/1.6.2.zip"; - sha256 = "10v557bsxasq8ya09m9157nlk50cbkb0wlzrm54cznzmwc0gx49a"; + "build/Bridge-1.6.3.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Bridge/archive/1.6.3.zip"; + sha256 = "1lha5wkzz63bgcn7bhx4rmgsh9ywa47lffycpyz6qjnl1pvm5mmj"; }; "build/Robot_Control-1.0.2.zip" = fetchurl { url = "https://github.com/arduino-libraries/Robot_Control/archive/1.0.2.zip"; @@ -49,13 +33,13 @@ url = "https://github.com/arduino-libraries/RobotIRremote/archive/1.0.2.zip"; sha256 = "0wkya7dy4x0xyi7wn5aghmr1gj0d0wszd61pq18zgfdspz1gi6xn"; }; - "build/SpacebrewYun-1.0.0.zip" = fetchurl { - url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.0.zip"; - sha256 = "1sklyp92m8i31rfb9b9iw0zvvab1zd7jdmg85fr908xn6k05qhmp"; + "build/SpacebrewYun-1.0.1.zip" = fetchurl { + url = "https://github.com/arduino-libraries/SpacebrewYun/archive/1.0.1.zip"; + sha256 = "1zs6ymlzw66bglrm0x6d3cvr52q85c8rlm525x0wags111xx3s90"; }; - "build/Temboo-1.1.5.zip" = fetchurl { - url = "https://github.com/arduino-libraries/Temboo/archive/1.1.5.zip"; - sha256 = "1ak9b2wrd42n3ak7kcqwg28ianq01acsi5jv4cc031wr0kpq4507"; + "build/Temboo-1.1.7.zip" = fetchurl { + url = "https://github.com/arduino-libraries/Temboo/archive/1.1.7.zip"; + sha256 = "0fq2q6qs0qp15njsl9dif8dkpxgb4cgg8jk3s5y0fcz9lb8m2j50"; }; "build/Esplora-1.0.4.zip" = fetchurl { url = "https://github.com/arduino-libraries/Esplora/archive/1.0.4.zip"; @@ -73,64 +57,68 @@ url = "http://downloads.arduino.cc/libastylej-2.05.1-3.zip"; sha256 = "0a1xy2cdl0xls5r21vy5d2j1dapn1jsdw0vbimlwnzfx7r84mxa6"; }; - "build/liblistSerials-1.1.0.zip" = fetchurl { - url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.0.zip"; - sha256 = "12n3y9y3gfi7i3x6llbwvi59jram02v8yyilv2kd38dm7wrqpw16"; + "build/liblistSerials-1.1.4.zip" = fetchurl { + url = "http://downloads.arduino.cc/liblistSerials/liblistSerials-1.1.4.zip"; + sha256 = "1w0zs155hs5b87i5wj049hfj2jsnf9jk30qq93wz1mxab01261v0"; + }; + "build/shared/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip" = fetchurl { + url = "https://github.com/arduino-libraries/WiFi101-FirmwareUpdater-Plugin/releases/download/v0.8.0/WiFi101-Updater-ArduinoIDE-Plugin-0.8.0.zip"; + sha256 = "0fp4mb1qa3w02hrwd51wf261l8ywcl36mi9wipsrgx2y29pk759z"; }; } // optionalAttrs (system == "x86_64-linux") { - "build/arduino-builder-linux64-1.3.18.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.18.tar.bz2"; - sha256 = "0xbzcmvfa1h22dlvym8v4s68w4r1vdq8pj086sk1iwlkfiq0y4zq"; + "build/arduino-builder-linux64-1.3.21_r1.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-linux64-1.3.21_r1.tar.bz2"; + sha256 = "1cqx5smzm4dhbj2ah191vbbxi0l7xj95c5gcdbgqm9283hrpfrn7"; }; - "build/linux/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "1k793qsv1jdc0m4i9k40l2k7blnarfzy2k3clndl2yirfk0zqm4h"; + "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "124icbjh28cax6pgg6bzrfdi27shsn9mjjshgrr93pczpg8sc0rr"; }; - "build/linux/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-x86_64-pc-linux-gnu.tar.bz2"; - sha256 = "0xm4hfr4binny9f5affnmyrrq3lhrxr66s6ymplgfq9l72kwq9nq"; + "build/linux/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-x86_64-pc-linux-gnu.tar.bz2"; + sha256 = "08b6dbllnvzv1aqx0v037zks4r3vqcx6yxxv040wf431mmf8gd4p"; }; } // optionalAttrs (system == "i686-linux") { - "build/arduino-builder-linux32-1.3.18.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.18.tar.bz2"; - sha256 = "0b6ls31gaagni929v4isr8ivyviid37721ffhgw6mnb8vshcws2d"; + "build/arduino-builder-linux32-1.3.21_r1.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-linux32-1.3.21_r1.tar.bz2"; + sha256 = "1prfwb5scprvd74gihd78ibsdy3806b0fsjhgyj9in4w1q8s3dxj"; }; - "build/linux/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-i686-pc-linux-gnu.tar.bz2"; - sha256 = "07ql6apml1w5gy3ygd1wmj12yr8vg6p3pr8b1gd92wdk97svfj3n"; + "build/linux/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i686-pc-linux-gnu.tar.bz2"; + sha256 = "0s7chsp1jyk477zvfaraf0yacvlzahkwqxpws4k0kjadghg9a27i"; }; - "build/linux/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i686-pc-linux-gnu.tar.bz2"; - sha256 = "1vmzqvkg8z2xp3j5qypzyg26hgymy6vshs4vpax6mr5w4xlxccsr"; + "build/linux/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i686-pc-linux-gnu.tar.bz2"; + sha256 = "1yyn016b5162j94nmqcznfabi5y2ly27z2whr77387bvjnqc8jsz"; }; } // optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.3.18.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.18.tar.bz2"; - sha256 = "01m21r2blh3rwzmjgjn65hivlbj95ddqkjq5xm1yb4b5h3i03mfj"; + "build/arduino-builder-macosx-1.3.21_r1.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-macosx-1.3.21_r1.tar.bz2"; + sha256 = "06y5j1z9jjnqa7v6nl9dflm1qqpf3ar1jc53zxgdgsrb9c473d8l"; }; - "build/linux/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-i386-apple-darwin11.tar.bz2"; - sha256 = "00d9i1vg1zngcd3f52c6d7j2iffb0qs97a1pnag0czbk1pq3w6qi"; + "build/linux/avr-gcc-4.9.2-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-i386-apple-darwin11.tar.bz2"; + sha256 = "12r4a1q7mh1gbasy7lqn0p4acg699lglw7il9d5f5vwd32pmh4ii"; }; - "build/linux/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-i386-apple-darwin11.tar.bz2"; - sha256 = "1rf3dwb4534qzn0gdpbh3155knx07hbbakvv67456s2q18xqvbs1"; + "build/linux/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-i386-apple-darwin11.tar.bz2"; + sha256 = "11703f0r82aq3mmkiy7vwa4jfjhs9826qpp724hbng9dx74kk86r"; }; } // optionalAttrs (system == "armv6l-linux") { - "build/arduino-builder-arm-1.3.18.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.18.tar.bz2"; - sha256 = "1v4vrmv24cajl7hxmyz5nh2y007kmwrcgl6180dlfwpc9526s4p1"; + "build/arduino-builder-arm-1.3.21_r1.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/arduino-builder-arm-1.3.21_r1.tar.bz2"; + sha256 = "1ik6r5n6g20x4pb0vbxbkqxgzj39f13n995ki9xgpsrq22x6g1n4"; }; - "build/linux/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avr-gcc-4.8.1-arduino5-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "0jqmyamvvwiab6ag580h09zkxbpv6i5xn6ganj5b8ld6nwnwvzy8"; + "build/linux/avr-gcc-4.9.2-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avr-gcc-4.9.2-atmel3.5.3-arduino2-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "08b8z7ca0wcgzxmjz6q5ihjrm3i10frnrcqpvwjrlsxw37ah1wvp"; }; - "build/linux/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2" = fetchurl { - url = "http://downloads.arduino.cc/tools/avrdude-6.0.1-arduino5-armhf-pc-linux-gnu.tar.bz2"; - sha256 = "1d7n0jcc6670n803q57hzw8pvp9bmnca9c9fgw3fq5y1vd0i7si3"; + "build/linux/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2" = fetchurl { + url = "http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino6-armhf-pc-linux-gnu.tar.bz2"; + sha256 = "1rybp4hgk0mm7dydr3rj7yx59jzi30s4kyadzkjv13nm4ds209i4"; }; } diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 07dc229bcc2..aeb0c5bf8ac 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, buildPythonApplication, pythonPackages, picocom +{ stdenv, fetchurl, pythonPackages, picocom , avrdude, arduino-core, avrgcclibc }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "ino-0.3.6"; namePrefix = ""; diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index a5900f2ce25..0c8b0f5ce60 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome, pango, sqlite, libxml2, zlib, gmp, smlnj }: +{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { name = "aliceml-1.4-7d44dc8e"; @@ -18,8 +18,8 @@ stdenv.mkDerivation { buildInputs = [ stdenv gcc glibc libtool gnumake autoconf automake - file which zsh m4 gnome.gtk zlib gmp - gnome.libgnomecanvas pango sqlite + file which zsh m4 gnome2.gtk zlib gmp + gnome2.libgnomecanvas pango sqlite libxml2 pkgconfig perl smlnj ]; diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix index 4db3b1b5a8d..fa34b3afe51 100644 --- a/pkgs/development/compilers/as31/default.nix +++ b/pkgs/development/compilers/as31/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc }: +{ stdenv, fetchpatch, fetchurl, yacc }: let @@ -14,6 +14,15 @@ in stdenv.mkDerivation { buildInputs = [ yacc ]; + patches = [ + # CVE-2012-0808 + (fetchpatch { + name = "as31-mkstemps.patch"; + url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=655496;filename=as31-mkstemps.patch;msg=5"; + sha256 = "0iia4wa8m141bwz4588yxb1dp2qwhapcii382sncm6jvwyngwh21"; + }) + ]; + preConfigure = '' chmod +x ./configure ''; diff --git a/pkgs/development/compilers/boo/default.nix b/pkgs/development/compilers/boo/default.nix index 68d3e4d12ed..5fa88ab87e9 100644 --- a/pkgs/development/compilers/boo/default.nix +++ b/pkgs/development/compilers/boo/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, dbus, mono, makeWrapper, nant -, shared_mime_info, gtksourceview, gtk +, shared_mime_info, gtksourceview, gtk2 , targetVersion ? "4.5" }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { buildInputs = [ pkgconfig mono makeWrapper nant shared_mime_info gtksourceview - gtk + gtk2 ]; patches = [ ./config.patch ]; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index 4957706ea0f..fb95372a96f 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,7 +1,10 @@ -{ stdenv, fetchurl, coq, ocamlPackages +{ stdenv, lib, fetchurl +, coq, ocaml, findlib, menhir , tools ? stdenv.cc }: +assert lib.versionAtLeast ocaml.version "4.02"; + stdenv.mkDerivation rec { name = "compcert-${version}"; version = "2.7.1"; @@ -11,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1vhbs1fmr9x2imqyd6yfvkbz763jhjfm9wk4nizf9rn1cvxrjqa4"; }; - buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]); + buildInputs = [ coq ocaml findlib menhir ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index c13118977a1..7037bf3808f 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -68,6 +68,14 @@ let # Change the #error on GCC > 4.9 to a #warning. sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/' + + # Ensure that cmake can find CUDA. + mkdir -p $out/nix-support + echo "cmakeFlags+=' -DCUDA_TOOLKIT_ROOT_DIR=$out'" >> $out/nix-support/setup-hook + + '' + lib.optionalString (lib.versionOlder version "8.0") '' + # Hack to fix building against recent Glibc/GCC. + echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook ''; meta = { diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix index 4adcb995bde..ac7a275d66a 100644 --- a/pkgs/development/compilers/dtc/default.nix +++ b/pkgs/development/compilers/dtc/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "dtc-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = fetchgit { url = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git"; rev = "refs/tags/v${version}"; - sha256 = "0wcn9x2vynwlfxk5c6jrf8lz7qvm1sbb9gh27drk1mx8msdh5hd5"; + sha256 = "0pwhbw930pnksrmkimqqwp4nqj9mmh06bs5b8p5l2cnhnh8lxn3j"; }; nativeBuildInputs = [ flex bison ]; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 1f2be91b13a..704d9d5be64 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , fpc -, gtk, glib, pango, atk, gdk_pixbuf +, gtk2, glib, pango, atk, gdk_pixbuf , libXi, inputproto, libX11, xproto, libXext, xextproto , makeWrapper }: @@ -15,7 +15,7 @@ let name = "lazarus-${version}"; }; buildInputs = [ - fpc gtk glib libXi inputproto + fpc gtk2 glib libXi inputproto libX11 xproto libXext xextproto pango atk stdenv.cc makeWrapper gdk_pixbuf ]; diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index 3f16667d155..24a4135bde1 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -50,7 +50,8 @@ stdenv.mkDerivation rec { -C src/ocaml-output ''; - doCheck = !stdenv.isDarwin; + # https://github.com/FStarLang/FStar/issues/676 + doCheck = false; preCheck = "ulimit -s unlimited"; diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index b46ab8292bf..12e7e23e90b 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -12,7 +12,7 @@ , libelf # optional, for link-time optimizations (LTO) , ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework , zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null +, zip ? null, unzip ? null, pkgconfig ? null, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -62,7 +62,7 @@ let version = "4.5.4"; xproto renderproto xextproto inputproto randrproto ]; - javaAwtGtk = langJava && gtk != null; + javaAwtGtk = langJava && gtk2 != null; /* Cross-gcc settings */ gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; @@ -122,7 +122,7 @@ let version = "4.5.4"; in # We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; +assert gtk2 != null -> (filter (x: x == null) xlibs) == []; stdenv.mkDerivation ({ name = "${name}-${version}" + crossNameAddon; @@ -223,7 +223,7 @@ stdenv.mkDerivation ({ ++ (optional (zlib != null) zlib) ++ (optional langJava boehmgc) ++ (optionals langJava [zip unzip]) - ++ (optionals javaAwtGtk ([gtk pkgconfig libart_lgpl] ++ xlibs)) + ++ (optionals javaAwtGtk ([gtk2 pkgconfig libart_lgpl] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) @@ -332,28 +332,26 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && - hasAttr "propagatedBuildInputs" libcCross) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && + hasAttr "propagatedBuildInputs" libcCross) + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh deleted file mode 100644 index 6087bb30cfb..00000000000 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ /dev/null @@ -1,262 +0,0 @@ -source $stdenv/setup - - -export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy -mkdir $NIX_FIXINC_DUMMY - - -if test "$staticCompiler" = "1"; then - EXTRA_LDFLAGS="-static" -else - EXTRA_LDFLAGS="-Wl,-rpath,$lib/lib" -fi - - -# GCC interprets empty paths as ".", which we don't want. -if test -z "$CPATH"; then unset CPATH; fi -if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi -echo "\$CPATH is \`$CPATH'" -echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" - -if test "$noSysDirs" = "1"; then - - if test -e $NIX_CC/nix-support/orig-libc; then - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$libc_dev/include - - # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" - - else - # Hack: support impure environments. - extraFlags="-isystem /usr/include" - extraLDFlags="-L/usr/lib64 -L/usr/lib" - glibc_libdir="/usr/lib" - export NIX_FIXINC_DUMMY=/usr/include - fi - - extraFlags="-I$NIX_FIXINC_DUMMY $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - # BOOT_CFLAGS defaults to `-g -O2'; since we override it below, - # make sure to explictly add them so that files compiled with the - # bootstrap compiler are optimized and (optionally) contain - # debugging information (info "(gccinstall) Building"). - if test -n "$dontStrip"; then - extraFlags="-O2 -g $extraFlags" - else - # Don't pass `-g' at all; this saves space while building. - extraFlags="-O2 $extraFlags" - fi - - EXTRA_FLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -Wl,$i" - done - - if test -n "$targetConfig"; then - # Cross-compiling, we need gcc not to read ./specs in order to build - # the g++ compiler (after the specs for the cross-gcc are created). - # Having LIBRARY_PATH= makes gcc read the specs from ., and the build - # breaks. Having this variable comes from the default.nix code to bring - # gcj in. - unset LIBRARY_PATH - unset CPATH - if test -z "$crossStageStatic"; then - EXTRA_TARGET_CFLAGS="-B${libcCross}/lib -idirafter ${libcCross}/include" - EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib" - fi - else - if test -z "$NIX_CC_CROSS"; then - EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" - EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" - else - # This the case of cross-building the gcc. - # We need special flags for the target, different than those of the build - # Assertion: - test -e $NIX_CC_CROSS/nix-support/orig-libc - - # Figure out what extra flags to pass to the gcc compilers - # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" - - # Use *real* header files, otherwise a limits.h is generated - # that does not include Glibc's limits.h (notably missing - # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include - - # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)/lib" - - extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" - extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" - - EXTRA_TARGET_CFLAGS="$extraFlags" - for i in $extraLDFlags; do - EXTRA_TARGET_LDFLAGS="$EXTRA_TARGET_LDFLAGS -Wl,$i" - done - fi - fi - - - # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find - # the startfiles. - # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx - # for the startfiles. - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ - CFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - CFLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - FLAGS_FOR_TARGET="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - LDFLAGS_FOR_BUILD="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - LDFLAGS_FOR_TARGET="$EXTRA_TARGET_LDFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) - - if test -z "$targetConfig"; then - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - BOOT_CFLAGS="$EXTRA_FLAGS $EXTRA_LDFLAGS" \ - BOOT_LDFLAGS="$EXTRA_TARGET_CFLAGS $EXTRA_TARGET_LDFLAGS" \ - ) - fi - - if test -n "$targetConfig" -a "$crossStageStatic" == 1; then - # We don't want the gcc build to assume there will be a libc providing - # limits.h in this stagae - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - LIMITS_H_TEST=false \ - ) - else - makeFlagsArray=( \ - "${makeFlagsArray[@]}" \ - LIMITS_H_TEST=true \ - ) - fi -fi - -if test -n "$targetConfig"; then - # The host strip will destroy some important details of the objects - dontStrip=1 -fi - - -preConfigure() { - if test -n "$newlibSrc"; then - tar xvf "$newlibSrc" -C .. - ln -s ../newlib-*/newlib newlib - # Patch to get armvt5el working: - sed -i -e 's/ arm)/ arm*)/' newlib/configure.host - fi - # Bug - they packaged zlib - if test -d "zlib"; then - # This breaks the build without-headers, which should build only - # the target libgcc as target libraries. - # See 'configure:5370' - rm -Rf zlib - fi - - if test -f "$NIX_CC/nix-support/orig-libc"; then - # Patch the configure script so it finds glibc headers. It's - # important for example in order not to get libssp built, - # because its functionality is in glibc already. - sed -i \ - -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$libc_dev/include", \ - gcc/configure - fi - - if test -n "$crossMingw" -a -n "$crossStageStatic"; then - mkdir -p ../mingw - # --with-build-sysroot expects that: - cp -R $libcCross/include ../mingw - configureFlags="$configureFlags --with-build-sysroot=`pwd`/.." - fi - - # Perform the build in a different directory. - mkdir ../build - cd ../build - configureScript=../$sourceRoot/configure -} - - -postConfigure() { - # Don't store the configure flags in the resulting executables. - sed -e '/TOPLEVEL_CONFIGURE_ARGUMENTS=/d' -i Makefile -} - - -preInstall() { - # Make ‘lib64’ a symlink to ‘lib’. - if [ -n "$is64bit" -a -z "$enableMultilib" ]; then - mkdir -p $out/lib - ln -s lib $out/lib64 - fi -} - - -postInstall() { - # Move runtime libraries to $lib. - mkdir -p $lib/lib - ln -s lib $lib/lib64 - moveToOutput "lib/lib*.so" "$lib" - moveToOutput "lib/lib*.so.*[0-9]" "$lib" - moveToOutput "lib/*.la" "$lib" - for i in $lib/lib/*.la; do - substituteInPlace $i --replace $out $lib - done - - # Remove precompiled headers for now. They are very big and - # probably not very useful yet. - find $out/include -name "*.gch" -exec rm -rf {} \; -prune - - # Remove `fixincl' to prevent a retained dependency on the - # previous gcc. - rm -rf $out/libexec/gcc/*/*/install-tools - rm -rf $out/lib/gcc/*/*/install-tools - - # More dependencies with the previous gcc or some libs (gccbug stores the build command line) - rm -rf $out/bin/gccbug - - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $out/libexec/gcc/*/*/*; do - if PREV_RPATH=`patchelf --print-rpath $i`; then - patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i - fi - done - - # Get rid of some "fixed" header files - rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux} - - # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks. - for i in $out/bin/*-gcc*; do - if cmp -s $out/bin/gcc $i; then - ln -sfn gcc $i - fi - done - - for i in $out/bin/c++ $out/bin/*-c++* $out/bin/*-g++*; do - if cmp -s $out/bin/g++ $i; then - ln -sfn g++ $i - fi - done - - # Disable RANDMMAP on grsec, which causes segfaults when using - # precompiled headers. - # See https://bugs.gentoo.org/show_bug.cgi?id=301299#c31 - paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus} - - eval "$postInstallGhdl" -} - -genericBuild diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix deleted file mode 100644 index f98fde69fc4..00000000000 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ /dev/null @@ -1,530 +0,0 @@ -{ stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langFortran ? false -, langJava ? false -, langAda ? false -, langVhdl ? false -, langGo ? false -, profiledCompiler ? false -, staticCompiler ? false -, enableShared ? true -, texinfo ? null -, perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which -, libelf # optional, for link-time optimizations (LTO) -, ppl ? null, cloog ? null # optional, for the Graphite optimization framework. -, zlib ? null, boehmgc ? null -, zip ? null, unzip ? null, pkgconfig ? null, gtk ? null, libart_lgpl ? null -, libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null -, libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null -, libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null -, gnatboot ? null -, enableMultilib ? false -, enablePlugin ? true # whether to support user-supplied plug-ins -, name ? "gcc" -, cross ? null -, binutilsCross ? null -, libcCross ? null -, crossStageStatic ? true -, gnat ? null -, libpthread ? null, libpthreadCross ? null # required for GNU/Hurd -, stripped ? true -, gnused ? null -}: - -assert langJava -> zip != null && unzip != null - && zlib != null && boehmgc != null - && perl != null; # for `--enable-java-home' -assert langAda -> gnatboot != null; -assert langVhdl -> gnat != null; - -# LTO needs libelf and zlib. -assert libelf != null -> zlib != null; - -# Make sure we get GNU sed. -assert stdenv.isDarwin -> gnused != null; - -with stdenv.lib; -with builtins; - -let version = "4.6.4"; - - # Whether building a cross-compiler for GNU/Hurd. - crossGNU = cross != null && cross.config == "i586-pc-gnu"; - - patches = [ ] - ++ optional (cross != null) ../libstdc++-target.patch - ++ optional noSysDirs ./no-sys-dirs.patch - # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its - # target libraries and tools. - ++ optional langAda ../gnat-cflags.patch - ++ optional langVhdl ./ghdl-ortho-cflags.patch - ++ optional langFortran ../gfortran-driving.patch - ++ optional (stdenv.isGNU || crossGNU) ./hurd-sigrtmin.patch; - - javaEcj = fetchurl { - # The `$(top_srcdir)/ecj.jar' file is automatically picked up at - # `configure' time. - - # XXX: Eventually we might want to take it from upstream. - url = "ftp://sourceware.org/pub/java/ecj-4.3.jar"; - sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx"; - }; - - # Antlr (optional) allows the Java `gjdoc' tool to be built. We want a - # binary distribution here to allow the whole chain to be bootstrapped. - javaAntlr = fetchurl { - url = http://www.antlr.org/download/antlr-3.1.3.jar; - sha256 = "1f41j0y4kjydl71lqlvr73yagrs2jsg1fjymzjz66mjy7al5lh09"; - }; - - xlibs = [ - libX11 libXt libSM libICE libXtst libXrender libXrandr libXi - xproto renderproto xextproto inputproto randrproto - ]; - - javaAwtGtk = langJava && gtk != null; - - /* Platform flags */ - platformFlags = let - gccArch = stdenv.lib.attrByPath [ "platform" "gcc" "arch" ] null stdenv; - gccCpu = stdenv.lib.attrByPath [ "platform" "gcc" "cpu" ] null stdenv; - gccAbi = stdenv.lib.attrByPath [ "platform" "gcc" "abi" ] null stdenv; - gccFpu = stdenv.lib.attrByPath [ "platform" "gcc" "fpu" ] null stdenv; - gccFloat = stdenv.lib.attrByPath [ "platform" "gcc" "float" ] null stdenv; - withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; - withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; - withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; - withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; - withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; - in - (withArch + - withCpu + - withAbi + - withFpu + - withFloat); - - /* Cross-gcc settings */ - crossMingw = (cross != null && cross.libc == "msvcrt"); - crossConfigureFlags = let - gccArch = stdenv.lib.attrByPath [ "gcc" "arch" ] null cross; - gccCpu = stdenv.lib.attrByPath [ "gcc" "cpu" ] null cross; - gccAbi = stdenv.lib.attrByPath [ "gcc" "abi" ] null cross; - gccFpu = stdenv.lib.attrByPath [ "gcc" "fpu" ] null cross; - withArch = if gccArch != null then " --with-arch=${gccArch}" else ""; - withCpu = if gccCpu != null then " --with-cpu=${gccCpu}" else ""; - withAbi = if gccAbi != null then " --with-abi=${gccAbi}" else ""; - withFpu = if gccFpu != null then " --with-fpu=${gccFpu}" else ""; - in - "--target=${cross.config}" + - withArch + - withCpu + - withAbi + - withFpu + - (if crossMingw && crossStageStatic then - " --with-headers=${libcCross}/include" + - " --with-gcc" + - " --with-gnu-as" + - " --with-gnu-ld" + - " --with-gnu-ld" + - " --disable-shared" + - " --disable-nls" + - " --disable-debug" + - " --enable-sjlj-exceptions" + - " --enable-threads=win32" + - " --disable-win32-registry" - else if crossStageStatic then - " --disable-libssp --disable-nls" + - " --without-headers" + - " --disable-threads " + - " --disable-libmudflap " + - " --disable-libgomp " + - " --disable-libquadmath" + - " --disable-shared" + - " --disable-decimal-float" # libdecnumber requires libc - else - " --with-headers=${libcCross}/include" + - " --enable-__cxa_atexit" + - " --enable-long-long" + - (if crossMingw then - " --enable-threads=win32" + - " --enable-sjlj-exceptions" + - " --enable-hash-synchronization" + - " --disable-libssp" + - " --disable-nls" + - " --with-dwarf2" + - # I think noone uses shared gcc libs in mingw, so we better do the same. - # In any case, mingw32 g++ linking is broken by default with shared libs, - # unless adding "-lsupc++" to any linking command. I don't know why. - " --disable-shared" + - # To keep ABI compatibility with upstream mingw-w64 - " --enable-fully-dynamic-string" - else (if cross.libc == "uclibc" then - # In uclibc cases, libgomp needs an additional '-ldl' - # and as I don't know how to pass it, I disable libgomp. - " --disable-libgomp" else "") + - " --enable-threads=posix" + - " --enable-nls" + - " --disable-decimal-float") # No final libdecnumber (it may work only in 386) - ); - stageNameAddon = if crossStageStatic then "-stage-static" else - "-stage-final"; - crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips && !stdenv.isDarwin; - -in - -# We need all these X libraries when building AWT with GTK+. -assert gtk != null -> (filter (x: x == null) xlibs) == []; - -stdenv.mkDerivation ({ - name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; - - builder = ./builder.sh; - - srcs = (import ./sources.nix) { - inherit fetchurl optional version; - inherit langC langCC langFortran langJava langAda langGo; - }; - - outputs = [ "out" "lib" ]; - - setOutputFlags = false; - - inherit patches enableMultilib; - - hardeningDisable = [ "format" ]; - - libc_dev = stdenv.cc.libc_dev; - - postPatch = - if (stdenv.isGNU - || (libcCross != null # e.g., building `gcc.crossDrv' - && libcCross ? crossConfig - && libcCross.crossConfig == "i586-pc-gnu") - || (crossGNU && libcCross != null)) - then - # On GNU/Hurd glibc refers to Hurd & Mach headers and libpthread is not - # in glibc, so add the right `-I' flags to the default spec string. - assert libcCross != null -> libpthreadCross != null; - let - libc = if libcCross != null then libcCross else stdenv.glibc; - gnu_h = "gcc/config/gnu.h"; - i386_gnu_h = "gcc/config/i386/gnu.h"; - extraCPPDeps = - libc.propagatedBuildInputs - ++ stdenv.lib.optional (libpthreadCross != null) libpthreadCross - ++ stdenv.lib.optional (libpthread != null) libpthread; - extraCPPSpec = - concatStrings (intersperse " " - (map (x: "-I${x.dev or x}/include") extraCPPDeps)); - extraLibSpec = - if libpthreadCross != null - then "-L${libpthreadCross}/lib ${libpthreadCross.TARGET_LDFLAGS}" - else "-L${libpthread}/lib"; - in - '' echo "augmenting \`CPP_SPEC' in \`${i386_gnu_h}' with \`${extraCPPSpec}'..." - sed -i "${i386_gnu_h}" \ - -es'|CPP_SPEC *"\(.*\)$|CPP_SPEC "${extraCPPSpec} \1|g' - - echo "augmenting \`LIB_SPEC' in \`${gnu_h}' with \`${extraLibSpec}'..." - sed -i "${gnu_h}" \ - -es'|LIB_SPEC *"\(.*\)$|LIB_SPEC "${extraLibSpec} \1|g' - - echo "setting \`NATIVE_SYSTEM_HEADER_DIR' and \`STANDARD_INCLUDE_DIR' to \`${libc.dev}/include'..." - sed -i "${gnu_h}" \ - -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc.dev}/include"|g' - sed -i gcc/config/t-gnu \ - -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc.dev}/include|g' - '' - else if cross != null || stdenv.cc.libc != null then - # On NixOS, use the right path to the dynamic linker instead of - # `/lib/ld*.so'. - let - libc = if libcCross != null then libcCross else stdenv.cc.libc; - in - '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." - for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h - do - grep -q LIBC_DYNAMIC_LINKER "$header" || continue - echo " fixing \`$header'..." - sed -i "$header" \ - -e 's|define[[:blank:]]*\([UCG]\+\)LIBC_DYNAMIC_LINKER\([0-9]*\)[[:blank:]]"\([^\"]\+\)"$|define \1LIBC_DYNAMIC_LINKER\2 "${libc.out}\3"|g' - done - '' - else null; - - inherit noSysDirs staticCompiler langJava crossStageStatic - libcCross crossMingw; - - nativeBuildInputs = [ texinfo which gettext ] - ++ (optional (perl != null) perl) - ++ (optional javaAwtGtk pkgconfig); - - buildInputs = [ gmp mpfr libmpc libelf ] - ++ (optional (ppl != null) ppl) - ++ (optional (cloog != null) cloog) - ++ (optional (zlib != null) zlib) - ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) - ++ (optionals (cross != null) [binutilsCross]) - ++ (optionals langAda [gnatboot]) - ++ (optionals langVhdl [gnat]) - - # The builder relies on GNU sed (for instance, Darwin's `sed' fails with - # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. - ++ (optional stdenv.isDarwin gnused) - ; - - configureFlagsArray = stdenv.lib.optionals - (ppl != null && ppl ? dontDisableStatic && ppl.dontDisableStatic) - [ "--with-host-libstdcxx=-lstdc++ -lgcc_s" ]; - - configureFlags = " - ${if enableMultilib then "--disable-libquadmath" else "--disable-multilib"} - ${if enableShared then "" else "--disable-shared"} - ${if enablePlugin then "--enable-plugin" else ""} - ${if ppl != null then "--with-ppl=${ppl}" else ""} - ${if cloog != null then - "--with-cloog=${cloog} --enable-cloog-backend=isl" - else ""} - ${if langJava then - "--with-ecj-jar=${javaEcj} " + - - # Follow Sun's layout for the convenience of IcedTea/OpenJDK. See - # . - "--enable-java-home --with-java-home=\${prefix}/lib/jvm/jre " - else ""} - ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp.dev} - --with-mpfr=${mpfr.dev} - --with-mpc=${libmpc} - ${if libelf != null then "--with-libelf=${libelf}" else ""} - --disable-libstdcxx-pch - --without-included-gettext - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - } - ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} - ${if !bootstrap then "--disable-bootstrap" else ""} - ${if cross == null then platformFlags else ""} - "; - - targetConfig = if cross != null then cross.config else null; - - buildFlags = if bootstrap then - (if profiledCompiler then "profiledbootstrap" else "bootstrap") - else ""; - - installTargets = - if stripped - then "install-strip" - else "install"; - - crossAttrs = { - patches = patches ++ [ ./hurd-sigrtmin.patch ]; - postPatch = ""; - AR = "${stdenv.cross.config}-ar"; - LD = "${stdenv.cross.config}-ld"; - CC = "${stdenv.cross.config}-gcc"; - CXX = "${stdenv.cross.config}-gcc"; - AR_FOR_TARGET = "${stdenv.cross.config}-ar"; - LD_FOR_TARGET = "${stdenv.cross.config}-ld"; - CC_FOR_TARGET = "${stdenv.cross.config}-gcc"; - NM_FOR_TARGET = "${stdenv.cross.config}-nm"; - CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; - # If we are making a cross compiler, cross != null - NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; - dontStrip = true; - configureFlags = '' - ${if enableMultilib then "" else "--disable-multilib"} - ${if enableShared then "" else "--disable-shared"} - ${if ppl != null then "--with-ppl=${ppl.crossDrv}" else ""} - ${if cloog != null then "--with-cloog=${cloog.crossDrv} --enable-cloog-backend=isl" else ""} - ${if langJava then "--with-ecj-jar=${javaEcj.crossDrv}" else ""} - ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} - ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr.crossDrv}" else ""} - --with-gmp=${gmp.crossDrv} - --with-mpfr=${mpfr.crossDrv} - --with-mpc=${libmpc.crossDrv} - --disable-libstdcxx-pch - --without-included-gettext - --with-system-zlib - --enable-languages=${ - concatStrings (intersperse "," - ( optional langC "c" - ++ optional langCC "c++" - ++ optional langFortran "fortran" - ++ optional langJava "java" - ++ optional langAda "ada" - ++ optional langVhdl "vhdl" - ++ optional langGo "go" - ) - ) - } - ${if langAda then " --enable-libada" else ""} - ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} - ${if cross != null then crossConfigureFlags else ""} - --target=${stdenv.cross.config} - ''; - buildFlags = ""; - }; - - - # Needed for the cross compilation to work - AR = "ar"; - LD = "ld"; - CC = "gcc"; - - # Setting $CPATH and $LIBRARY_PATH to make sure both `gcc' and `xgcc' find - # the library headers and binaries, regarless of the language being - # compiled. - - # Note: When building the Java AWT GTK+ peer, the build system doesn't - # honor `--with-gmp' et al., e.g., when building - # `libjava/classpath/native/jni/java-math/gnu_java_math_GMP.c', so we just - # add them to $CPATH and $LIBRARY_PATH in this case. - # - # Likewise, the LTO code doesn't find zlib. - - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross - - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && - hasAttr "propagatedBuildInputs" libcCross) - libcCross.propagatedBuildInputs))); - - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); - - EXTRA_TARGET_CFLAGS = - if cross != null && libcCross != null then [ - "-idirafter ${libcCross.dev}/include" - ] - ++ optionals (! crossStageStatic) [ - "-B${libcCross.out}/lib" - ] - else null; - - EXTRA_TARGET_LDFLAGS = - if cross != null && libcCross != null then [ - "-Wl,-L${libcCross.out}/lib" - ] - ++ (if crossStageStatic then [ - "-B${libcCross.out}/lib" - ] else [ - "-Wl,-rpath,${libcCross.out}/lib" - "-Wl,-rpath-link,${libcCross.out}/lib" - ]) - ++ optionals (libpthreadCross != null) [ - "-L${libpthreadCross}/lib" - "-Wl,${libpthreadCross.TARGET_LDFLAGS}" - ] - else null; - - passthru = { inherit langC langCC langAda langFortran langVhdl - langGo version; isGNU = true; }; - - enableParallelBuilding = false; - - inherit (stdenv) is64bit; - - meta = { - homepage = http://gcc.gnu.org/; - license = stdenv.lib.licenses.gpl3Plus; # runtime support libraries are typically LGPLv3+ - description = "GNU Compiler Collection, version ${version}" - + (if stripped then "" else " (with debugging info)"); - - longDescription = '' - The GNU Compiler Collection includes compiler front ends for C, C++, - Objective-C, Fortran, OpenMP for C/C++/Fortran, Java, and Ada, as well - as libraries for these languages (libstdc++, libgcj, libgomp,...). - - GCC development is a part of the GNU Project, aiming to improve the - compiler used in the GNU system including the GNU/Linux variant. - ''; - - maintainers = [ - stdenv.lib.maintainers.viric - ]; - - # Volunteers needed for the {Cyg,Dar}win ports of *PPL. - # gnatboot is not available out of linux platforms, so we disable the darwin build - # for the gnat (ada compiler). - platforms = - stdenv.lib.platforms.linux ++ - stdenv.lib.platforms.freebsd ++ - optionals (langAda == false) stdenv.lib.platforms.darwin; - }; -} - -// optionalAttrs (cross != null && cross.libc == "msvcrt" && crossStageStatic) { - makeFlags = [ "all-gcc" "all-target-libgcc" ]; - installTargets = "install-gcc install-target-libgcc"; -} - -# Strip kills static libs of other archs (hence cross != null) -// optionalAttrs (!stripped || cross != null) { dontStrip = true; NIX_STRIP_DEBUG = 0; } - -// optionalAttrs (enableMultilib) { dontMoveLib64 = true; } - -// optionalAttrs langVhdl rec { - name = "ghdl-0.29"; - - ghdlSrc = fetchurl { - url = "http://ghdl.free.fr/ghdl-0.29.tar.bz2"; - sha256 = "15mlinr1lwljwll9ampzcfcrk9bk0qpdks1kxlvb70xf9zhh2jva"; - }; - - # Ghdl has some timestamps checks, storing file timestamps in '.cf' files. - # As we will change the timestamps to 1970-01-01 00:00:01, we also set the - # content of that .cf to that value. This way ghdl does not complain on - # the installed object files from the basic libraries (ieee, ...) - postInstallGhdl = '' - pushd $out - find . -name "*.cf" -exec \ - sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \; - popd - ''; - - postUnpack = '' - tar xvf ${ghdlSrc} - mv ghdl-*/vhdl gcc*/gcc - rm -Rf ghdl-* - ''; - - meta = { - homepage = "http://ghdl.free.fr/"; - license = stdenv.lib.licenses.gpl2Plus; - description = "Complete VHDL simulator, using the GCC technology (gcc ${version})"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; - }; - -}) diff --git a/pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch b/pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch deleted file mode 100644 index 901534591c8..00000000000 --- a/pkgs/development/compilers/gcc/4.6/ghdl-ortho-cflags.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in -index 8f481df..681ac59 100644 ---- a/gcc/vhdl/Make-lang.in -+++ b/gcc/vhdl/Make-lang.in -@@ -96,7 +96,7 @@ AGCC_GCCOBJ_DIR=../ - AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ - -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ - -I$(AGCC_GCCSRC_DIR)/libcpp/include --AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) -+AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) $(CFLAGS) $(INCLUDES) - - AGCC_LOCAL_OBJS=ortho-lang.o - -@@ -140,7 +140,7 @@ ghdl$(exeext): force - - # Ghdl libraries. - ghdllib: ghdl$(exeext) $(GCC_PASSES) force -- $(MAKE_IN_VHDL) GRT_FLAGS="-O -g" ghdllib -+ $(MAKE_IN_VHDL) GRT_FLAGS="-O -g $(CFLAGS)" ghdllib - - # Build hooks: - -diff --git a/gcc/vhdl/Makefile.in b/gcc/vhdl/Makefile.in -index d754c6c..07abc4a 100644 ---- a/gcc/vhdl/Makefile.in -+++ b/gcc/vhdl/Makefile.in -@@ -80,7 +80,8 @@ T_CPPFLAGS = - X_ADAFLAGS = - T_ADAFLAGS = - --ADAC = $(CC) -+# Never use the bootstrapped compiler, as it may not be built for ada -+ADAC = gcc - - ECHO = echo - CHMOD = chmod -diff --git a/gcc/vhdl/ortho-lang.c b/gcc/vhdl/ortho-lang.c -index 84aeb92..8eddd42 100644 ---- a/gcc/vhdl/ortho-lang.c -+++ b/gcc/vhdl/ortho-lang.c -@@ -16,6 +16,7 @@ - #include "options.h" - #include "real.h" --#include "tree-gimple.h" -+#include "gimple.h" -+#include "tree.h" - #include "function.h" - #include "cgraph.h" - #include "target.h" -@@ -680,38 +681,10 @@ type_for_mode (enum machine_mode mode, int unsignedp) - - const struct lang_hooks lang_hooks = LANG_HOOKS_INITIALIZER; - --/* Tree code classes. */ -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) TYPE, -- --const enum tree_code_class tree_code_type[] = { --#include "tree.def" -- 'x' --}; --#undef DEFTREECODE -- --/* Table indexed by tree code giving number of expression -- operands beyond the fixed part of the node structure. -- Not used for types or decls. */ -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) LENGTH, -- --const unsigned char tree_code_length[] = { --#include "tree.def" -- 0 --}; --#undef DEFTREECODE -- --#define DEFTREECODE(SYM, NAME, TYPE, LENGTH) NAME, --const char * const tree_code_name[] = { --#include "tree.def" -- "@@dummy" --}; --#undef DEFTREECODE - - union lang_tree_node - GTY((desc ("0"), -- chain_next ("(union lang_tree_node *) GENERIC_NEXT (&%h.generic)"))) -+ chain_next ("(union lang_tree_node *) TREE_CHAIN (&%h.generic)"))) - { - union tree_node GTY ((tag ("0"))) generic; - }; -@@ -1162,7 +1135,7 @@ new_access_type (tree dtype) - res = make_node (POINTER_TYPE); - TREE_TYPE (res) = NULL_TREE; - /* Seems necessary. */ -- TYPE_MODE (res) = Pmode; -+ SET_TYPE_MODE (res, Pmode); - layout_type (res); - return res; - } -diff --git a/gcc/vhdl/Make-lang.in b/gcc/vhdl/Make-lang.in -index e201f64..f36fb97 100644 ---- a/gcc/vhdl/Make-lang.in -+++ b/gcc/vhdl/Make-lang.in -@@ -132,7 +132,7 @@ ghdl1$(exeext): $(AGCC_OBJS) $(AGCC_DEPS) force - -cargs $(CFLAGS) $(GHDL_ADAFLAGS) - $(GNATMAKE) -o $@ -aI$(srcdir)/vhdl -aOvhdl ortho_gcc-main \ - -bargs -E -cargs $(CFLAGS) $(GHDL_ADAFLAGS) \ -- -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) -+ -largs $(AGCC_OBJS) $(LIBS) $(GMPLIBS) $(CLOOGLIBS) $(PPLLIBS) - - # The driver for ghdl. - ghdl$(exeext): force diff --git a/pkgs/development/compilers/gcc/4.6/hurd-sigrtmin.patch b/pkgs/development/compilers/gcc/4.6/hurd-sigrtmin.patch deleted file mode 100644 index dc8236d2b99..00000000000 --- a/pkgs/development/compilers/gcc/4.6/hurd-sigrtmin.patch +++ /dev/null @@ -1,14 +0,0 @@ -GNU libc on GNU/Hurd doesn't define `__SIGRTMIN'. -From . - ---- a/libgcc/generic-morestack.c 2011-12-19 21:14:52.000000000 +0100 -+++ b/libgcc/generic-morestack.c 2011-12-19 21:15:35.000000000 +0100 -@@ -507,7 +507,7 @@ - sigemptyset (&__morestack_initial_sp.mask); - - sigfillset (&__morestack_fullmask); --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && defined(__SIGRTMIN) - /* In glibc, the first two real time signals are used by the NPTL - threading library. By taking them out of the set of signals, we - avoiding copying the signal mask in pthread_sigmask. More diff --git a/pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch b/pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch deleted file mode 100644 index 8128fa87da5..00000000000 --- a/pkgs/development/compilers/gcc/4.6/no-sys-dirs.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ru gcc-4.3.1-orig/gcc/cppdefault.c gcc-4.3.1/gcc/cppdefault.c ---- gcc-4.3.1-orig/gcc/cppdefault.c 2007-07-26 10:37:01.000000000 +0200 -+++ gcc-4.3.1/gcc/cppdefault.c 2008-06-25 17:48:23.000000000 +0200 -@@ -41,6 +41,10 @@ - # undef CROSS_INCLUDE_DIR - #endif - -+#undef LOCAL_INCLUDE_DIR -+#undef SYSTEM_INCLUDE_DIR -+#undef STANDARD_INCLUDE_DIR -+ - const struct default_include cpp_include_defaults[] - #ifdef INCLUDE_DEFAULTS - = INCLUDE_DEFAULTS; -diff -ru gcc-4.3.1-orig/gcc/gcc.c gcc-4.3.1/gcc/gcc.c ---- gcc-4.3.1-orig/gcc/gcc.c 2008-03-02 23:55:19.000000000 +0100 -+++ gcc-4.3.1/gcc/gcc.c 2008-06-25 17:52:53.000000000 +0200 -@@ -1478,10 +1478,10 @@ - /* Default prefixes to attach to command names. */ - - #ifndef STANDARD_STARTFILE_PREFIX_1 --#define STANDARD_STARTFILE_PREFIX_1 "/lib/" -+#define STANDARD_STARTFILE_PREFIX_1 "" - #endif - #ifndef STANDARD_STARTFILE_PREFIX_2 --#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "" - #endif - - #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ ---- gcc-4.3.1-orig/gcc/Makefile.in 2008-05-11 20:54:15.000000000 +0200 -+++ gcc-4.3.1/gcc/Makefile.in 2008-06-25 17:48:23.000000000 +0200 -@@ -378,7 +378,11 @@ - MD5_H = $(srcdir)/../include/md5.h - - # Default native SYSTEM_HEADER_DIR, to be overridden by targets. --NATIVE_SYSTEM_HEADER_DIR = /usr/include -+# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent -+# `fixinc' from fixing header files in /usr/include. However, -+# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set -+# it to some dummy directory. -+NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) - # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. - CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ - -@@ -3277,7 +3281,7 @@ - -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ - -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \ - -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ -- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ -+ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ - -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ - -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ - -DPREFIX=\"$(prefix)/\" \ diff --git a/pkgs/development/compilers/gcc/4.6/sources.nix b/pkgs/development/compilers/gcc/4.6/sources.nix deleted file mode 100644 index ca50160def4..00000000000 --- a/pkgs/development/compilers/gcc/4.6/sources.nix +++ /dev/null @@ -1,27 +0,0 @@ -/* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.6.4. */ -{ fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda, - langGo }: - -assert version == "4.6.4"; -optional /* langC */ true (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "48b566f1288f099dff8fba868499a320f83586245ec69b8c82a9042566a5bf62"; -}) ++ -optional langCC (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "4eaa347f9cd3ab7d5e14efbb9c5c03009229cd714b558fc55fa56e8996b74d42"; -}) ++ -optional langFortran (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "4f402e0d27995a02354570f0a63047f27463c72c62f1ba3c08ef5a7c6c9c3d1c"; -}) ++ -optional langJava (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "4441d0c3cc04f2162f981c6b4bf29cdd9f6c16d294ce24c6bc4a05d8277abf28"; -}) ++ -optional langAda (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "2a09bbf942b2557839722d4807e67559123037356f5cb1a3b12f44539968d0ad"; -}) ++ -[] diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index d15a9a90b79..a0def65d531 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -16,7 +16,7 @@ , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -33,6 +33,7 @@ , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null +, darwin ? null }: assert langJava -> zip != null && unzip != null @@ -198,12 +199,12 @@ let version = "4.8.5"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips && !stdenv.isDarwin; + bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -291,7 +292,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) @@ -332,8 +333,10 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp.dev} - --with-mpfr=${mpfr.dev} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -355,8 +358,10 @@ stdenv.mkDerivation ({ ) ) } - ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" + ${if cross == null + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} @@ -454,27 +459,25 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 7bf3e3bb605..4b53bc35599 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -16,7 +16,7 @@ , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -33,6 +33,7 @@ , libpthread ? null, libpthreadCross ? null # required for GNU/Hurd , stripped ? true , gnused ? null +, darwin ? null }: assert langJava -> zip != null && unzip != null @@ -202,12 +203,12 @@ let version = "4.9.4"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -296,7 +297,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) @@ -364,8 +365,10 @@ stdenv.mkDerivation ({ ) ) } - ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" + ${if cross == null + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} @@ -463,27 +466,25 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index 74f7f37e7f3..3d75c0e76da 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -16,7 +16,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -35,6 +35,7 @@ , gnused ? null , binutils ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places +, darwin ? null }: assert langJava -> zip != null && unzip != null @@ -202,12 +203,12 @@ let version = "5.4.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -295,7 +296,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) @@ -337,8 +338,10 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp.dev} - --with-mpfr=${mpfr.dev} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -360,8 +363,10 @@ stdenv.mkDerivation ({ ) ) } - ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" + ${if cross == null + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} @@ -458,27 +463,25 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optionals langJava [ boehmgc ] + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 8064f42d498..acddc9081be 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -16,7 +16,7 @@ , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null , zip ? null, unzip ? null, pkgconfig ? null -, gtk ? null, libart_lgpl ? null +, gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null , libXrender ? null, xproto ? null, renderproto ? null, xextproto ? null , libXrandr ? null, libXi ? null, inputproto ? null, randrproto ? null @@ -35,6 +35,7 @@ , gnused ? null , binutils ? null , cloog # unused; just for compat with gcc4, as we override the parameter on some places +, darwin ? null }: assert langJava -> zip != null && unzip != null @@ -201,12 +202,12 @@ let version = "6.2.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in # We need all these X libraries when building AWT with GTK+. -assert x11Support -> (filter (x: x == null) ([ gtk libart_lgpl ] ++ xlibs)) == []; +assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == []; stdenv.mkDerivation ({ name = "${name}${if stripped then "" else "-debug"}-${version}" + crossNameAddon; @@ -293,7 +294,7 @@ stdenv.mkDerivation ({ ++ (optional (isl != null) isl) ++ (optional (zlib != null) zlib) ++ (optionals langJava [ boehmgc zip unzip ]) - ++ (optionals javaAwtGtk ([ gtk libart_lgpl ] ++ xlibs)) + ++ (optionals javaAwtGtk ([ gtk2 libart_lgpl ] ++ xlibs)) ++ (optionals (cross != null) [binutilsCross]) ++ (optionals langAda [gnatboot]) ++ (optionals langVhdl [gnat]) @@ -335,8 +336,10 @@ stdenv.mkDerivation ({ else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} - --with-gmp=${gmp.dev} - --with-mpfr=${mpfr.dev} + --with-gmp-include=${gmp.dev}/include + --with-gmp-lib=${gmp.out}/lib + --with-mpfr-include=${mpfr.dev}/include + --with-mpfr-lib=${mpfr.out}/lib --with-mpc=${libmpc} ${if libelf != null then "--with-libelf=${libelf}" else ""} --disable-libstdcxx-pch @@ -358,8 +361,10 @@ stdenv.mkDerivation ({ ) ) } - ${if (stdenv ? glibc && cross == null) - then " --with-native-system-header-dir=${stdenv.glibc.dev}/include" + ${if cross == null + then if stdenv.isDarwin + then " --with-native-system-header-dir=${darwin.usr-include}" + else " --with-native-system-header-dir=${getDev stdenv.cc.libc}/include" else ""} ${if langAda then " --enable-libada" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} @@ -456,27 +461,25 @@ stdenv.mkDerivation ({ # # Likewise, the LTO code doesn't find zlib. - CPATH = concatStrings - (intersperse ":" (map (x: "${x.dev or x}/include") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread - ++ optional (libpthreadCross != null) libpthreadCross + CPATH = makeSearchPathOutput "dev" "include" ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread + ++ optional (libpthreadCross != null) libpthreadCross - # On GNU/Hurd glibc refers to Mach & Hurd - # headers. - ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs" ) - libcCross.propagatedBuildInputs))); + # On GNU/Hurd glibc refers to Mach & Hurd + # headers. + ++ optionals (libcCross != null && libcCross ? "propagatedBuildInputs") + libcCross.propagatedBuildInputs); - LIBRARY_PATH = concatStrings - (intersperse ":" (map (x: x + "/lib") - (optionals (zlib != null) [ zlib ] - ++ optionals langJava [ boehmgc ] - ++ optionals javaAwtGtk xlibs - ++ optionals javaAwtGtk [ gmp mpfr ] - ++ optional (libpthread != null) libpthread))); + LIBRARY_PATH = makeLibraryPath ([] + ++ optional (zlib != null) zlib + ++ optional langJava boehmgc + ++ optionals javaAwtGtk xlibs + ++ optionals javaAwtGtk [ gmp mpfr ] + ++ optional (libpthread != null) libpthread); EXTRA_TARGET_CFLAGS = if cross != null && libcCross != null then [ diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 0371630f3f6..de3e9ba3ef5 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -218,6 +218,15 @@ postInstall() { substituteInPlace "$i" --replace "$out" "$lib" done + if [ -n "$enableMultilib" ]; then + moveToOutput "lib64/lib*.so*" "$lib" + moveToOutput "lib64/lib*.la" "$lib" + + for i in "$lib"/lib64/*.{la,py}; do + substituteInPlace "$i" --replace "$out" "$lib" + done + fi + # Remove `fixincl' to prevent a retained dependency on the # previous gcc. rm -rf $out/libexec/gcc/*/*/install-tools @@ -227,19 +236,19 @@ postInstall() { rm -rf $out/bin/gccbug if type "patchelf"; then - # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out - for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do + # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out + for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do PREV_RPATH=`patchelf --print-rpath "$i"` NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'` patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done + done - # For some reason the libs retain RPATH to $out - for i in "$lib"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do + # For some reason the libs retain RPATH to $out + for i in "$lib"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do PREV_RPATH=`patchelf --print-rpath "$i"` NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK - done + done fi # Get rid of some "fixed" header files diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix index e607ef7e270..5e903822d4b 100644 --- a/pkgs/development/compilers/ghc/8.0.1.nix +++ b/pkgs/development/compilers/ghc/8.0.1.nix @@ -8,7 +8,7 @@ let fetchFilteredPatch = args: fetchurl (args // { downloadToTemp = true; postFetch = '' - ${patchutils}/bin/filterdiff --clean --strip-match=1 -x '"testsuite/"*' "$downloadedFile" > "$out" + ${patchutils}/bin/filterdiff --clean --strip-match=1 -x 'testsuite/*' "$downloadedFile" > "$out" ''; }); in diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index eebdaca5f83..aad8a9f6bcb 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -6,14 +6,14 @@ let inherit (bootPkgs) ghc; in stdenv.mkDerivation rec { - version = "8.1.20160826"; + version = "8.1.20160930"; name = "ghc-${version}"; - rev = "0050aff22ba04baca732bf5124002417ab667f8a"; + rev = "9e862765ffe161da8a4fd9cd67b0a600874feaa9"; src = fetchgit { url = "git://git.haskell.org/ghc.git"; inherit rev; - sha256 = "1iirb11fr8914pb6i988cfji56gs698ll819bgb0hpcdkrmffwqc"; + sha256 = "01fmp5yrh3is8vzv2vabkzlvm1ry1zcq99m078plx9wgy20giq59"; }; patches = [ diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix index d8b0598e278..ff772864e62 100644 --- a/pkgs/development/compilers/ghdl/default.nix +++ b/pkgs/development/compilers/ghdl/default.nix @@ -1,16 +1,28 @@ -{ stdenv, fetchurl, gnat, zlib }: +{ stdenv, fetchFromGitHub, gnat, zlib, llvm_35, ncurses, clang, flavour ? "mcode" }: + +# mcode only works on x86, while the llvm flavour works on both x86 and x86_64. + + +assert flavour == "llvm" || flavour == "mcode"; + let + inherit (stdenv.lib) optional; + inherit (stdenv.lib) optionals; version = "0.33"; in stdenv.mkDerivation rec { - name = "ghdl-mcode-${version}"; + name = "ghdl-${flavour}-${version}"; - src = fetchurl { - url = "https://github.com/tgingold/ghdl/archive/v${version}.tar.gz"; - sha256 = "09yvgqyglbakd74v2dgr470clzm744i232nixyffcds55vkij5da"; + src = fetchFromGitHub { + owner = "tgingold"; + repo = "ghdl"; + rev = "v${version}"; + sha256 = "0g72rk2yzr0lrpncq2c1qcv71w3mi2hjq84r1yzgjr6d0qm87r2a"; }; - buildInputs = [ gnat zlib ]; + buildInputs = [ gnat zlib ] ++ optionals (flavour == "llvm") [ clang ncurses ]; + + configureFlags = optional (flavour == "llvm") "--with-llvm=${llvm_35}"; patchPhase = '' # Disable warnings-as-errors, because there are warnings (unused things) @@ -23,11 +35,10 @@ stdenv.mkDerivation rec { meta = { homepage = "http://sourceforge.net/p/ghdl-updates/wiki/Home/"; - description = "Free VHDL simulator, mcode flavour"; + description = "Free VHDL simulator"; maintainers = with stdenv.lib.maintainers; [viric]; - # I think that mcode can only generate x86 code, - # so it fails to link pieces on x86_64. - platforms = with stdenv.lib.platforms; [ "i686-linux" ]; + platforms = with stdenv.lib.platforms; (if flavour == "llvm" then [ "i686-linux" "x86_64-linux" ] + else [ "i686-linux" ]); license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/compilers/gnu-smalltalk/default.nix b/pkgs/development/compilers/gnu-smalltalk/default.nix index 5d9ca621648..b75b57d0f47 100644 --- a/pkgs/development/compilers/gnu-smalltalk/default.nix +++ b/pkgs/development/compilers/gnu-smalltalk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, zip, libffi, libsigsegv, readline, gmp, -gnutls, gnome, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: +gnutls, gnome2, cairo, SDL, sqlite, emacsSupport ? false, emacs ? null }: assert emacsSupport -> (emacs != null); @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { # The dependencies and their justification are explained at # http://smalltalk.gnu.org/download buildInputs = [ - pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome.gtk + pkgconfig libtool zip libffi libsigsegv-shared readline gmp gnutls gnome2.gtk cairo SDL sqlite ] ++ stdenv.lib.optional emacsSupport emacs; diff --git a/pkgs/development/compilers/go/1.7.nix b/pkgs/development/compilers/go/1.7.nix index bc298924eb8..0f78646e1aa 100644 --- a/pkgs/development/compilers/go/1.7.nix +++ b/pkgs/development/compilers/go/1.7.nix @@ -1,9 +1,17 @@ -{ stdenv, lib, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand +{ stdenv, fetchFromGitHub, tzdata, iana_etc, go_bootstrap, runCommand, writeScriptBin , perl, which, pkgconfig, patch, fetchpatch -, pcre +, pcre, cacert , Security, Foundation, bash }: let + + inherit (stdenv.lib) optional optionals optionalString; + + clangHack = writeScriptBin "clang" '' + #!${stdenv.shell} + exec ${stdenv.cc}/bin/clang "$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) + ''; + goBootstrap = runCommand "go-bootstrap" {} '' mkdir $out cp -rf ${go_bootstrap}/* $out/ @@ -11,44 +19,28 @@ let find $out -name "*.c" -delete cp -rf $out/bin/* $out/share/go/bin/ ''; + in stdenv.mkDerivation rec { name = "go-${version}"; - version = "1.7"; + version = "1.7.1"; src = fetchFromGitHub { owner = "golang"; repo = "go"; rev = "go${version}"; - sha256 = "03wc4r5pgxrlh3lp8l0hb1bhsrwv4hfq1fcj8n82bfk3hvj43am2"; + sha256 = "121cvpjpbyl3lyd6j5lnnq6pr8vl7ar5zvap1132c522lxgxw356"; }; # perl is used for testing go vet nativeBuildInputs = [ perl which pkgconfig patch ]; buildInputs = [ pcre ]; - propagatedBuildInputs = lib.optionals stdenv.isDarwin [ - Security Foundation - ]; + propagatedBuildInputs = optionals stdenv.isDarwin [ Security Foundation ]; hardeningDisable = [ "all" ]; - # I'm not sure what go wants from its 'src', but the go installation manual - # describes an installation keeping the src. - preUnpack = '' - topdir=$PWD - mkdir -p $out/share - cd $out/share - ''; - prePatch = '' - # Ensure that the source directory is named go - cd .. - if [ ! -d go ]; then - mv * go - fi - - cd go patchShebangs ./ # replace /bin/bash # This source produces shell script at run time, @@ -81,9 +73,9 @@ stdenv.mkDerivation rec { # Disable cgo lookup tests not works, they depend on resolver rm src/net/cgo_unix_test.go - '' + lib.optionalString stdenv.isLinux '' + '' + optionalString stdenv.isLinux '' sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + lib.optionalString stdenv.isDarwin '' + '' + optionalString stdenv.isDarwin '' substituteInPlace src/race.bash --replace \ "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go @@ -93,6 +85,7 @@ stdenv.mkDerivation rec { sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go sed -i '/TestRead0/areturn' src/os/os_test.go sed -i '/TestNohup/areturn' src/os/signal/signal_test.go + sed -i '/TestCurrent/areturn' src/os/user/user_test.go sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go @@ -106,20 +99,11 @@ stdenv.mkDerivation rec { touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd sed -i '1 a\exit 0' misc/cgo/errors/test.bash - - mkdir $topdir/dirtyhacks - cat < $topdir/dirtyhacks/clang - #!${bash}/bin/bash - $(type -P clang) "\$@" 2> >(sed '/ld: warning:.*ignoring unexpected dylib file/ d' 1>&2) - exit $? - EOF - chmod +x $topdir/dirtyhacks/clang - PATH=$topdir/dirtyhacks:$PATH ''; - patches = [ - ./remove-tools-1.7.patch - ]; + patches = [ ./remove-tools-1.7.patch ./cacert-1.7.patch ]; + + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; GOOS = if stdenv.isDarwin then "darwin" else "linux"; GOARCH = if stdenv.isDarwin then "amd64" @@ -127,7 +111,7 @@ stdenv.mkDerivation rec { else if stdenv.system == "x86_64-linux" then "amd64" else if stdenv.isArm then "arm" else throw "Unsupported system"; - GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + GOARM = optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 CGO_ENABLED = 1; GOROOT_BOOTSTRAP = "${goBootstrap}/share/go"; @@ -136,19 +120,25 @@ stdenv.mkDerivation rec { # just want the generic `cc` here. CC = if stdenv.isDarwin then "clang" else "cc"; + configurePhase = '' + mkdir -p $out/share/go/bin + export GOROOT=$out/share/go + export GOBIN=$GOROOT/bin + export PATH=$GOBIN:$PATH + ''; + + postConfigure = optionalString stdenv.isDarwin '' + export PATH=${clangHack}/bin:$PATH + ''; + installPhase = '' - mkdir -p "$out/bin" - export GOROOT="$(pwd)/" - export GOBIN="$out/bin" - export PATH="$GOBIN:$PATH" - cd ./src - echo Building - ./all.bash + cp -r . $GOROOT + ( cd $GOROOT/src && ./all.bash ) ''; preFixup = '' rm -r $out/share/go/pkg/bootstrap - rmdir $out/bin && mv $out/share/go/bin $out/bin + mv $out/share/go/bin $out/bin ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/compilers/go/cacert-1.7.patch b/pkgs/development/compilers/go/cacert-1.7.patch new file mode 100644 index 00000000000..0fe9ff8cc23 --- /dev/null +++ b/pkgs/development/compilers/go/cacert-1.7.patch @@ -0,0 +1,82 @@ +diff --git a/src/crypto/x509/root_cgo_darwin.go b/src/crypto/x509/root_cgo_darwin.go +index a4b33c7..9700b75 100644 +--- a/src/crypto/x509/root_cgo_darwin.go ++++ b/src/crypto/x509/root_cgo_darwin.go +@@ -151,11 +151,20 @@ int FetchPEMRoots(CFDataRef *pemRoots) { + import "C" + import ( + "errors" ++ "io/ioutil" ++ "os" + "unsafe" + ) + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + + var data C.CFDataRef = nil + err := C.FetchPEMRoots(&data) +diff --git a/src/crypto/x509/root_darwin.go b/src/crypto/x509/root_darwin.go +index 78de56c..05eada4 100644 +--- a/src/crypto/x509/root_darwin.go ++++ b/src/crypto/x509/root_darwin.go +@@ -6,20 +6,31 @@ + + package x509 + +-import "os/exec" ++import ( ++ "io/ioutil" ++ "os" ++ "os/exec" ++) + + func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate, err error) { + return nil, nil + } + + func execSecurityRoots() (*CertPool, error) { ++ roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } + cmd := exec.Command("/usr/bin/security", "find-certificate", "-a", "-p", "/System/Library/Keychains/SystemRootCertificates.keychain") + data, err := cmd.Output() + if err != nil { + return nil, err + } + +- roots := NewCertPool() + roots.AppendCertsFromPEM(data) + return roots, nil + } +diff --git a/src/crypto/x509/root_unix.go b/src/crypto/x509/root_unix.go +index 7bcb3d6..3986e1a 100644 +--- a/src/crypto/x509/root_unix.go ++++ b/src/crypto/x509/root_unix.go +@@ -24,6 +24,14 @@ func (c *Certificate) systemVerify(opts *VerifyOptions) (chains [][]*Certificate + + func loadSystemRoots() (*CertPool, error) { + roots := NewCertPool() ++ if file := os.Getenv("SSL_CERT_FILE"); file != "" { ++ data, err := ioutil.ReadFile(file) ++ if err == nil { ++ roots.AppendCertsFromPEM(data) ++ return roots, nil ++ } ++ } ++ + var firstErr error + for _, file := range certFiles { + data, err := ioutil.ReadFile(file) diff --git a/pkgs/development/compilers/go/remove-tools-1.7.patch b/pkgs/development/compilers/go/remove-tools-1.7.patch index b2e380f34fc..b53e48e1a51 100644 --- a/pkgs/development/compilers/go/remove-tools-1.7.patch +++ b/pkgs/development/compilers/go/remove-tools-1.7.patch @@ -1,8 +1,8 @@ diff --git a/src/go/build/build.go b/src/go/build/build.go -index 496fe11..8c81dbd 100644 +index 9706b8b..f250751 100644 --- a/src/go/build/build.go +++ b/src/go/build/build.go -@@ -1388,7 +1388,7 @@ func init() { +@@ -1513,7 +1513,7 @@ func init() { } // ToolDir is the directory containing build tools. @@ -12,11 +12,11 @@ index 496fe11..8c81dbd 100644 // IsLocalImport reports whether the import path is // a local import path, like ".", "..", "./foo", or "../foo". diff --git a/src/runtime/extern.go b/src/runtime/extern.go -index d346362..fb22b6e 100644 +index 441dcd9..a50277e 100644 --- a/src/runtime/extern.go +++ b/src/runtime/extern.go -@@ -194,6 +194,17 @@ func GOROOT() string { - return defaultGoroot +@@ -230,6 +230,17 @@ func GOROOT() string { + return sys.DefaultGoroot } +// GOTOOLDIR returns the root of the Go tree. diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index f8524e777a0..e6f98a12194 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.14.5"; + version = "3.15.0"; # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "f516f1bb9046218f89885a220354c19dda6d8f4d"; - sha256 = "0sv856ran15rvnrj4dk0a5jirip5w4336a0aycv9wh77wm4s8xdb"; + rev = "92a682ebaa3c85b84857852d8621f528607fe27d"; + sha256 = "0mn3bfvhdf6b4lflyjfjyr7nppkq505xkaaagk111fqy91rdzd3b"; fetchSubmodules = true; }; @@ -46,8 +46,6 @@ stdenv.mkDerivation rec { patchShebangs . ''; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ]; - meta = { description = "High-performance JIT compiler for PHP/Hack"; homepage = "http://hhvm.com"; diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 08958a42b44..6bc7f66ca29 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchFromGitHub, bash, which, m4, python, bison, flex, llvmPackages, clangWrapSelf, -testedTargets ? ["sse4" "host"] +testedTargets ? ["sse2" "host"] # the default test target is sse4, but that is not supported by all Hydra agents }: # TODO: patch LLVM so Skylake-EX works better (patch included in ispc github) - needed for LLVM 3.9? @@ -19,7 +19,8 @@ stdenv.mkDerivation rec { sha256 = "1wwsyvn44hd5iyi5779l5378x096307slpyl29wrsmfp66796693"; }; - enableParallelBuilding = true; + # there are missing dependencies in the Makefile, causing sporadic build failures + enableParallelBuilding = false; doCheck = true; diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix index 9d0b506efee..335de9b50cd 100644 --- a/pkgs/development/compilers/julia/default.nix +++ b/pkgs/development/compilers/julia/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind llvmShared mpfr - pcre2 openblas openlibm openspecfun readline suitesparse utf8proc + pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] ; @@ -121,6 +121,8 @@ stdenv.mkDerivation rec { "USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" "USE_SYSTEM_READLINE=1" "USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_ZLIB=1" diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix index 09b79c59e7d..ed23bcb73cc 100644 --- a/pkgs/development/compilers/julia/git.nix +++ b/pkgs/development/compilers/julia/git.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2 openblas openlibm openspecfun readline suitesparse utf8proc + pcre2.dev openblas openlibm openspecfun readline suitesparse utf8proc zlib ]; @@ -131,6 +131,8 @@ stdenv.mkDerivation rec { "USE_SYSTEM_OPENSPECFUN=1" "USE_SYSTEM_PATCHELF=1" "USE_SYSTEM_PCRE=1" + "PCRE_CONFIG=${pcre2.dev}/bin/pcre2-config" + "PCRE_INCL_PATH=${pcre2.dev}/include/pcre2.h" "USE_SYSTEM_READLINE=1" "USE_SYSTEM_UTF8PROC=1" "USE_SYSTEM_ZLIB=1" diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index ba546f6f51f..f0f8fa3b7ff 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.0.3"; + version = "1.0.4"; name = "kotlin-${version}"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "15ywjv46i2d7zgg2b3vdklc6agr62nvn0gkz7k9hql78ccfmyq9p"; + sha512 = "39mcyw3rdgrhfkxl0xygh74idl2pvw3dy0n9d3z4aj6hq4pxkn1dclmpfbrfa333vjpzfhlqwl578vmly9vah7m6z6g4j12gkdijiyf"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index 2dd3a23d766..b05496eabf2 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation { buildInputs = [ cmake libedit libxml2 zlib ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" ] ++ diff --git a/pkgs/development/compilers/llvm/3.4/lld.nix b/pkgs/development/compilers/llvm/3.4/lld.nix index 4360ec9ad1b..c502b0e215e 100644 --- a/pkgs/development/compilers/llvm/3.4/lld.nix +++ b/pkgs/development/compilers/llvm/3.4/lld.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation { buildInputs = [ cmake ncurses zlib python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLD_PATH_TO_LLVM_BUILD=${llvm}" ]; diff --git a/pkgs/development/compilers/llvm/3.4/lldb.nix b/pkgs/development/compilers/llvm/3.4/lldb.nix index 540faf01e07..cd498b5cf51 100644 --- a/pkgs/development/compilers/llvm/3.4/lldb.nix +++ b/pkgs/development/compilers/llvm/3.4/lldb.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { buildInputs = [ cmake python which swig ncurses zlib libedit ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" diff --git a/pkgs/development/compilers/llvm/3.4/polly.nix b/pkgs/development/compilers/llvm/3.4/polly.nix index 2e0018c34c2..2fed0fc8abe 100644 --- a/pkgs/development/compilers/llvm/3.4/polly.nix +++ b/pkgs/development/compilers/llvm/3.4/polly.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { buildInputs = [ cmake isl python gmp ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_INSTALL_ROOT=${llvm}" ]; diff --git a/pkgs/development/compilers/llvm/3.5/clang.nix b/pkgs/development/compilers/llvm/3.5/clang.nix index 42ca4ba70e4..d11259c82f0 100644 --- a/pkgs/development/compilers/llvm/3.5/clang.nix +++ b/pkgs/development/compilers/llvm/3.5/clang.nix @@ -15,7 +15,6 @@ in stdenv.mkDerivation { buildInputs = [ cmake libedit libxml2 llvm ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ # Maybe with compiler-rt this won't be needed? diff --git a/pkgs/development/compilers/llvm/3.5/libc++/default.nix b/pkgs/development/compilers/llvm/3.5/libc++/default.nix index e7018eea3bc..476fc7bcd43 100644 --- a/pkgs/development/compilers/llvm/3.5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.5/libc++/default.nix @@ -24,13 +24,12 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.5/lld.nix b/pkgs/development/compilers/llvm/3.5/lld.nix index b1047f8679e..7ee90818ac9 100644 --- a/pkgs/development/compilers/llvm/3.5/lld.nix +++ b/pkgs/development/compilers/llvm/3.5/lld.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation { buildInputs = [ cmake ncurses zlib python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLD_PATH_TO_LLVM_BUILD=${llvm}" ]; diff --git a/pkgs/development/compilers/llvm/3.5/lldb.nix b/pkgs/development/compilers/llvm/3.5/lldb.nix index 1dad5227d64..8e7c8151df1 100644 --- a/pkgs/development/compilers/llvm/3.5/lldb.nix +++ b/pkgs/development/compilers/llvm/3.5/lldb.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { buildInputs = [ cmake python which swig ncurses zlib libedit ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang}" diff --git a/pkgs/development/compilers/llvm/3.5/polly.nix b/pkgs/development/compilers/llvm/3.5/polly.nix index c943c790ea2..42b3fd74e6c 100644 --- a/pkgs/development/compilers/llvm/3.5/polly.nix +++ b/pkgs/development/compilers/llvm/3.5/polly.nix @@ -10,7 +10,6 @@ stdenv.mkDerivation { buildInputs = [ cmake isl python gmp ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLVM_INSTALL_ROOT=${llvm}" ]; diff --git a/pkgs/development/compilers/llvm/3.6/clang/default.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix index ff0f34391af..c1d0cf8062c 100644 --- a/pkgs/development/compilers/llvm/3.6/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix @@ -16,7 +16,6 @@ let buildInputs = [ cmake libedit libxml2 llvm ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ # Maybe with compiler-rt this won't be needed? diff --git a/pkgs/development/compilers/llvm/3.6/libc++/default.nix b/pkgs/development/compilers/llvm/3.6/libc++/default.nix index c02c75ac02d..b07b8eb35fa 100644 --- a/pkgs/development/compilers/llvm/3.6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.6/libc++/default.nix @@ -19,13 +19,12 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_INCLUDE_PATHS=${libcxxabi}/include" + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.6/lldb.nix b/pkgs/development/compilers/llvm/3.6/lldb.nix index cee99bbbdea..207971b8172 100644 --- a/pkgs/development/compilers/llvm/3.6/lldb.nix +++ b/pkgs/development/compilers/llvm/3.6/lldb.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation { buildInputs = [ cmake python which swig ncurses zlib libedit ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" diff --git a/pkgs/development/compilers/llvm/3.7/clang/default.nix b/pkgs/development/compilers/llvm/3.7/clang/default.nix index aa71bb68553..6c1a89cf60a 100644 --- a/pkgs/development/compilers/llvm/3.7/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.7/clang/default.nix @@ -16,7 +16,6 @@ let buildInputs = [ cmake libedit libxml2 llvm ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ # Maybe with compiler-rt this won't be needed? diff --git a/pkgs/development/compilers/llvm/3.7/libc++/default.nix b/pkgs/development/compilers/llvm/3.7/libc++/default.nix index 00bfb3518b1..62402142a12 100644 --- a/pkgs/development/compilers/llvm/3.7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.7/libc++/default.nix @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.7/lldb.nix b/pkgs/development/compilers/llvm/3.7/lldb.nix index fe69130e71a..acd4892201a 100644 --- a/pkgs/development/compilers/llvm/3.7/lldb.nix +++ b/pkgs/development/compilers/llvm/3.7/lldb.nix @@ -31,7 +31,6 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" "-DPYTHON_VERSION_MAJOR=2" diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix index cc65c69927c..ae9ba62a04c 100644 --- a/pkgs/development/compilers/llvm/3.7/llvm.nix +++ b/pkgs/development/compilers/llvm/3.7/llvm.nix @@ -35,6 +35,18 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ ncurses zlib ]; + # The goal here is to disable LLVM bindings (currently go and ocaml) regardless + # of whether the impure CMake search sheananigans find the compilers in global + # paths. This mostly exists because sandbox builds don't work very well on Darwin + # and sometimes you get weird behavior if CMake finds go in your system path. + # This would be far prettier if there were a CMake option to just disable bindings + # but from what I can tell, there isn't such a thing. The file in question only + # contains `if(WIN32)` conditions to check whether to disable bindings, so making + # those always succeed has the net effect of disabling all bindings. + prePatch = '' + substituteInPlace cmake/config-ix.cmake --replace "if(WIN32)" "if(1)" + ''; + # hacky fix: created binaries need to be run before installation preBuild = '' mkdir -p $out/ diff --git a/pkgs/development/compilers/llvm/3.8/clang/default.nix b/pkgs/development/compilers/llvm/3.8/clang/default.nix index 71420d4cdcc..6052246dad0 100644 --- a/pkgs/development/compilers/llvm/3.8/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.8/clang/default.nix @@ -6,7 +6,7 @@ let name = "clang-${version}"; unpackPhase = '' - unpackFile ${fetch "cfe" "1ybcac8hlr9vl3wg8s4v6cp0c0qgqnwprsv85lihbkq3vqv94504"} + unpackFile ${fetch "cfe" "1prc72xmkgx8wrzmrr337776676nhsp1qd3mw2bvb22bzdnq7lsc"} mv cfe-${version}.src clang sourceRoot=$PWD/clang unpackFile ${clang-tools-extra_src} @@ -16,7 +16,6 @@ let buildInputs = [ cmake libedit libxml2 llvm python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ # Maybe with compiler-rt this won't be needed? @@ -30,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; diff --git a/pkgs/development/compilers/llvm/3.8/default.nix b/pkgs/development/compilers/llvm/3.8/default.nix index a2a702a617e..df1a775ef96 100644 --- a/pkgs/development/compilers/llvm/3.8/default.nix +++ b/pkgs/development/compilers/llvm/3.8/default.nix @@ -2,7 +2,7 @@ let callPackage = newScope (self // { inherit stdenv isl version fetch; }); - version = "3.8.0"; + version = "3.8.1"; fetch = fetch_v version; fetch_v = ver: name: sha256: fetchurl { @@ -10,8 +10,8 @@ let inherit sha256; }; - compiler-rt_src = fetch "compiler-rt" "1c2nkp9563873ffz22qmhc0wakgj428pch8rmhym8agjamz3ily8"; - clang-tools-extra_src = fetch "clang-tools-extra" "1i0yrgj8qrzjjswraz0i55lg92ljpqhvjr619d268vka208aigdg"; + compiler-rt_src = fetch "compiler-rt" "0p0y85c7izndbpg2l816z7z7558axq11d5pwkm4h11sdw7d13w0d"; + clang-tools-extra_src = fetch "clang-tools-extra" "15n39r4ssphpaq4a0wzyjm7ilwxb0bch6nrapy8c5s8d49h5qjk6"; self = { llvm = callPackage ./llvm.nix { diff --git a/pkgs/development/compilers/llvm/3.8/libc++/default.nix b/pkgs/development/compilers/llvm/3.8/libc++/default.nix index f10dcb6784c..15f7ee1e3e4 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "libc++-${version}"; - src = fetch "libcxx" "0yr3fh8vj38289b9cwk37zsy7x98dcd3kjy7xxy8mg20p48lb01n"; + src = fetch "libcxx" "1k7f9qk5bgwa02ksh6yr9hccwcbhmcdzl1fpbdw6s2c89iwg7mvp"; postUnpack = '' unpackFile ${libcxxabi.src} @@ -18,12 +18,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" - "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" - "-DLIBCXX_LIBCPPABI_VERSION=2" - "-DLIBCXX_CXX_ABI=libcxxabi" - ]; + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ]; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/llvm/3.8/libc++abi.nix b/pkgs/development/compilers/llvm/3.8/libc++abi.nix index fdbc002688e..61ff6341c30 100644 --- a/pkgs/development/compilers/llvm/3.8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/3.8/libc++abi.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "libc++abi-${version}"; - src = fetch "libcxxabi" "0175rv2ynkklbg96kpw13iwhnzyrlw3r12f4h09p9v7nmxqhivn5"; + src = fetch "libcxxabi" "1qfs2iis1i0ppv11jndc98cvd7s25pj46pq2sfyldmzswdxmzdg1"; buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD) libunwind; diff --git a/pkgs/development/compilers/llvm/3.8/lldb.nix b/pkgs/development/compilers/llvm/3.8/lldb.nix index ca8a74c28bb..568476e44ac 100644 --- a/pkgs/development/compilers/llvm/3.8/lldb.nix +++ b/pkgs/development/compilers/llvm/3.8/lldb.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { name = "lldb-${version}"; - src = fetch "lldb" "0dasg12gf5crrd9pbi5rd1y8vwlgqp8nxgw9g4z47w3x2i28zxp3"; + src = fetch "lldb" "18z8vhfgh4m57hl66i83cp4d4mv3i86z2hjhbp5rvqs7d88li49l"; postUnpack = '' # Hack around broken standalone builf as of 3.8 @@ -25,15 +25,11 @@ stdenv.mkDerivation { cp "$(ls -d llvm-*.src)/lib/Support/regex_impl.h" "$srcDir/tools/lib/Support/" ''; - buildInputs = [ cmake python which swig ncurses zlib libedit ]; + buildInputs = [ cmake python which swig ncurses zlib libedit llvm ]; - preConfigure = '' - export CXXFLAGS="-pthread" - export LDFLAGS="-ldl" - ''; + hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLLDB_PATH_TO_LLVM_BUILD=${llvm}" "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" "-DLLDB_PATH_TO_CLANG_BUILD=${clang-unwrapped}" diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix index fc29d00a524..6112228bf4f 100644 --- a/pkgs/development/compilers/llvm/3.8/llvm.nix +++ b/pkgs/development/compilers/llvm/3.8/llvm.nix @@ -18,7 +18,7 @@ }: let - src = fetch "llvm" "0ikfq0gxac8xpvxj23l4hk8f12ydx48fljgrz1gl9xp0ks704nsm"; + src = fetch "llvm" "1ybmnid4pw2hxn12ax5qa5kl1ldfns0njg8533y3mzslvd5cx0kf"; in stdenv.mkDerivation rec { name = "llvm-${version}"; diff --git a/pkgs/development/compilers/llvm/3.9/clang/default.nix b/pkgs/development/compilers/llvm/3.9/clang/default.nix index c6605dd656f..6eadb91141d 100644 --- a/pkgs/development/compilers/llvm/3.9/clang/default.nix +++ b/pkgs/development/compilers/llvm/3.9/clang/default.nix @@ -16,7 +16,6 @@ let buildInputs = [ cmake libedit libxml2 llvm python ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_CXX_FLAGS=-std=c++11" ] ++ # Maybe with compiler-rt this won't be needed? @@ -34,7 +33,7 @@ let # Clang expects to find sanitizer libraries in its own prefix postInstall = '' ln -sv ${llvm}/lib/LLVMgold.so $out/lib - ln -sv ${llvm}/lib/clang/3.9.0/lib $out/lib/clang/3.9.0/ + ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ln -sv $out/bin/clang $out/bin/cpp ''; diff --git a/pkgs/development/compilers/llvm/3.9/default.nix b/pkgs/development/compilers/llvm/3.9/default.nix index 7b9dbd93b2b..a39f013d1a9 100644 --- a/pkgs/development/compilers/llvm/3.9/default.nix +++ b/pkgs/development/compilers/llvm/3.9/default.nix @@ -6,7 +6,7 @@ let fetch = fetch_v version; fetch_v = ver: name: sha256: fetchurl { - url = "http://llvm.org/releases/3.9.0/${name}-${ver}.src.tar.xz"; + url = "http://llvm.org/releases/${version}/${name}-${ver}.src.tar.xz"; inherit sha256; }; diff --git a/pkgs/development/compilers/llvm/3.9/libc++/default.nix b/pkgs/development/compilers/llvm/3.9/libc++/default.nix index 97cf65ad209..3b7caaa24bf 100644 --- a/pkgs/development/compilers/llvm/3.9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/3.9/libc++/default.nix @@ -18,8 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; - cmakeFlags = - [ "-DCMAKE_BUILD_TYPE=Release" + cmakeFlags = [ "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" "-DLIBCXX_LIBCPPABI_VERSION=2" "-DLIBCXX_CXX_ABI=libcxxabi" diff --git a/pkgs/development/compilers/llvm/3.9/lldb.nix b/pkgs/development/compilers/llvm/3.9/lldb.nix index bb92a6eed6c..0acef48f57b 100644 --- a/pkgs/development/compilers/llvm/3.9/lldb.nix +++ b/pkgs/development/compilers/llvm/3.9/lldb.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_MAIN_INCLUDE_DIR=${llvm}/include" ]; diff --git a/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch b/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch new file mode 100644 index 00000000000..40096fa3497 --- /dev/null +++ b/pkgs/development/compilers/llvm/3.9/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix index 41d655015e4..22dea611c79 100644 --- a/pkgs/development/compilers/llvm/3.9/llvm.nix +++ b/pkgs/development/compilers/llvm/3.9/llvm.nix @@ -30,16 +30,24 @@ in stdenv.mkDerivation rec { mv compiler-rt-* $sourceRoot/projects/compiler-rt ''; + outputs = [ "out" ] ++ stdenv.lib.optional enableSharedLibraries "lib"; + buildInputs = [ perl groff cmake libxml2 python libffi ] ++ stdenv.lib.optional stdenv.isDarwin libcxxabi; propagatedBuildInputs = [ ncurses zlib ]; + postPatch = "" # 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. - patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + + stdenv.lib.optionalString stdenv.isDarwin '' sed -i 's/os_trace(\(.*\)");$/printf(\1\\n");/g' ./projects/compiler-rt/lib/sanitizer_common/sanitizer_mac.cc + '' + # Patch llvm-config to return correct library path based on --link-{shared,static}. + + stdenv.lib.optionalString (enableSharedLibraries) '' + substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib + patch -p1 < ./llvm-outputs.patch ''; # hacky fix: created binaries need to be run before installation @@ -59,7 +67,7 @@ in stdenv.mkDerivation rec { "-DLLVM_LINK_LLVM_DYLIB=ON" ] ++ stdenv.lib.optional (!isDarwin) "-DLLVM_BINUTILS_INCDIR=${binutils.dev}/include" - ++ stdenv.lib.optionals ( isDarwin) [ + ++ stdenv.lib.optionals (isDarwin) [ "-DLLVM_ENABLE_LIBCXX=ON" "-DCAN_TARGET_i386=false" ]; @@ -70,7 +78,14 @@ in stdenv.mkDerivation rec { paxmark m bin/{lli,llvm-rtdyld} ''; - postInstall = stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' + postInstall = "" + + stdenv.lib.optionalString (enableSharedLibraries) '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM.so" "$lib" + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + '' + + stdenv.lib.optionalString (stdenv.isDarwin && enableSharedLibraries) '' install_name_tool -id $out/lib/libLLVM.dylib $out/lib/libLLVM.dylib ln -s $out/lib/libLLVM.dylib $out/lib/libLLVM-${version}.dylib ''; diff --git a/pkgs/development/compilers/manticore/builder.sh b/pkgs/development/compilers/manticore/builder.sh index 8fb4ab850eb..ad72f50a1b3 100755 --- a/pkgs/development/compilers/manticore/builder.sh +++ b/pkgs/development/compilers/manticore/builder.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!@shell@ source $stdenv/setup echo "Building Manticore research compiler." diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix index 67e7c932e55..79dc479fae8 100644 --- a/pkgs/development/compilers/mezzo/default.nix +++ b/pkgs/development/compilers/mezzo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, menhir, yojson, ulex, pprint, fix, functory }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, menhir, yojson, ulex, pprint, fix, functory }: let check-ocaml-version = with stdenv.lib; versionAtLeast (getVersion ocaml); @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6"; }; - buildInputs = [ ocaml findlib yojson menhir ulex pprint fix functory ]; + buildInputs = [ ocaml findlib ocamlbuild yojson menhir ulex pprint fix functory ]; # Sets warning 3 as non-fatal prePatch = stdenv.lib.optionalString (check-ocaml-version "4.02") '' diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index 2a72387028d..583f6f80137 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -61,6 +61,10 @@ stdenv.mkDerivation rec { done substituteInPlace $(pwd)/../${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $(pwd)/../${usr_prefix}/lib/mlton + '' + stdenv.lib.optionalString stdenv.cc.isClang '' + sed -i "s_ patch -s -p0 !stdenv.isArm && !stdenv.isMips; - -let - useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; -in - -stdenv.mkDerivation rec { - - x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; }; - x11lib = x11env + "/lib"; - x11inc = x11env + "/include"; - - name = "ocaml-4.02.3"; - - src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz"; - sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3"; - }; - +import ./generic.nix rec { + major_version = "4"; + minor_version = "02"; + patch_version = "3"; patches = [ ./ocamlbuild.patch ]; - - prefixKey = "-prefix "; - configureFlags = optionals useX11 [ "-x11lib" x11lib - "-x11include" x11inc ]; - - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; - installTargets = "install" + optionalString useNativeCompilers " installopt"; - preConfigure = '' - CAT=$(type -tp cat) - sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - ''; - postBuild = '' - mkdir -p $out/include - ln -sv $out/lib/ocaml/caml $out/include/caml - ''; - - passthru = { - nativeCompilers = useNativeCompilers; - }; - - meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; - branch = "4.02"; - license = with licenses; [ - qpl /* compiler */ - lgpl2 /* library */ - ]; - description = "Most popular variant of the Caml language"; - - longDescription = - '' - OCaml is the most popular variant of the Caml language. From a - language standpoint, it extends the core Caml language with a - fully-fledged object-oriented layer, as well as a powerful module - system, all connected by a sound, polymorphic type system featuring - type inference. - - The OCaml system is an industrial-strength implementation of this - language, featuring a high-performance native-code compiler (ocamlopt) - for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc, - Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc) - and an interactive read-eval-print loop (ocaml) for quick development - and portability. The OCaml distribution includes a comprehensive - standard library, a replay debugger (ocamldebug), lexer (ocamllex) and - parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4) - and a documentation generator (ocamldoc). - ''; - - platforms = with platforms; linux ++ darwin; - }; - + sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3"; } diff --git a/pkgs/development/compilers/ocaml/4.03.nix b/pkgs/development/compilers/ocaml/4.03.nix new file mode 100644 index 00000000000..c9536c487d0 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.03.nix @@ -0,0 +1,6 @@ +import ./generic.nix rec { + major_version = "4"; + minor_version = "03"; + patch_version = "0"; + sha256 = "09p3iwwi55r6rbrpyp8f0wmkb0ppcgw67yxw6yfky60524wayp39"; +} diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 6c2bc8cb9ca..c95d29326a4 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -8,7 +8,8 @@ in stdenv.mkDerivation rec { - name = "ber-metaocaml-003"; + name = "ber-metaocaml-${version}"; + version = "003"; src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-3.11/ocaml-3.11.2.tar.bz2"; @@ -66,5 +67,6 @@ stdenv.mkDerivation rec { A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run ''; + broken = true; }; } diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix new file mode 100644 index 00000000000..abded4b6690 --- /dev/null +++ b/pkgs/development/compilers/ocaml/generic.nix @@ -0,0 +1,90 @@ +{ minor_version, major_version, patch_version +, url ? null +, sha256, ...}@args: +let + versionNoPatch = "${toString major_version}.${toString minor_version}"; + version = "${versionNoPatch}.${toString patch_version}"; + real_url = if url == null then + "http://caml.inria.fr/pub/distrib/ocaml-${versionNoPatch}/ocaml-${version}.tar.xz" + else url; + safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); +in + +{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }: + +assert useX11 -> !stdenv.isArm && !stdenv.isMips; + +let + useNativeCompilers = !stdenv.isMips; + inherit (stdenv.lib) optionals optionalString; + name = "ocaml-${version}"; +in + +stdenv.mkDerivation (args // rec { + + x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; }; + x11lib = x11env + "/lib"; + x11inc = x11env + "/include"; + + inherit name; + inherit version; + + src = fetchurl { + url = real_url; + inherit sha256; + }; + + prefixKey = "-prefix "; + configureFlags = optionals useX11 [ "-x11lib" x11lib + "-x11include" x11inc ]; + + buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; + installTargets = "install" + optionalString useNativeCompilers " installopt"; + preConfigure = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + mkdir -p $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + passthru = { + nativeCompilers = useNativeCompilers; + }; + + meta = with stdenv.lib; { + homepage = http://caml.inria.fr/ocaml; + branch = "4.03"; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; + description = "Most popular variant of the Caml language"; + + longDescription = + '' + OCaml is the most popular variant of the Caml language. From a + language standpoint, it extends the core Caml language with a + fully-fledged object-oriented layer, as well as a powerful module + system, all connected by a sound, polymorphic type system featuring + type inference. + + The OCaml system is an industrial-strength implementation of this + language, featuring a high-performance native-code compiler (ocamlopt) + for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc, + Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc) + and an interactive read-eval-print loop (ocaml) for quick development + and portability. The OCaml distribution includes a comprehensive + standard library, a replay debugger (ocamldebug), lexer (ocamllex) and + parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4) + and a documentation generator (ocamldoc). + ''; + + platforms = with platforms; linux ++ darwin; + }; + +}) + + diff --git a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix index 6eca566dd2c..e9adbeff490 100644 --- a/pkgs/development/compilers/ocaml/metaocaml-3.09.nix +++ b/pkgs/development/compilers/ocaml/metaocaml-3.09.nix @@ -2,7 +2,8 @@ stdenv.mkDerivation (rec { - name = "metaocaml-3.09-alpha-30"; + name = "metaocaml-${version}"; + version = "3.09-alpha-30"; src = fetchurl { url = "http://www.metaocaml.org/dist/old/MetaOCaml_309_alpha_030.tar.gz"; @@ -26,7 +27,8 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.metaocaml.org/; license = with stdenv.lib.licenses; [ qpl lgpl2 ]; - desctiption = "A compiled, type-safe, multi-stage programming language"; + description = "A compiled, type-safe, multi-stage programming language"; + broken = true; }; }) diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix index e6186bc8f13..6dcbb0a330f 100644 --- a/pkgs/development/compilers/openjdk/7.nix +++ b/pkgs/development/compilers/openjdk/7.nix @@ -17,7 +17,7 @@ let else throw "openjdk requires i686-linux or x86_64 linux"; - update = "91"; + update = "111"; build = "01"; @@ -28,31 +28,31 @@ let repover = "jdk7u${update}-b${build}"; jdk7 = fetchurl { url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = "08f7cbayyrryim3xbrs12cr12i1mczcikyc9rdlsyih0r4xvll28"; + sha256 = "0wgb7hr2gipx1jg28fnsjh7xa744sh1mgr6z3xivmnsfy3dm91gi"; }; langtools = fetchurl { url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = "0rmlzrgsacn60blpg1sp30k6p0sgzsml8wb41yc998km1bsnjxnh"; + sha256 = "0x1xs923h6sma02cbp1whg735x8vcndh5k01b7rkf714g6rxwa0y"; }; hotspot = fetchurl { url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = "1w1n81y9jcvjzssl4049yzfc0gdfnh73ki6wg1d8pg22zlyhrrwv"; + sha256 = "187apnsvnd4cfa7ss5g59dbh7x5ah8f1lwa2wvjfv055h2cmphpn"; }; corba = fetchurl { url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = "086yr927bxnlgljx7mw2cg6f6aip57hi4qpn1h35n6fsyvb4n67h"; + sha256 = "0vmxf5sgjcmkm7i1scanaa2x75a1byj8b36vcajlr6j7qmdx6r8c"; }; jdk = fetchurl { url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = "14r39ylj3qa63arpqxl0h84baah1kjgnyp3v9d7d4vd0yagpn66b"; + sha256 = "1f8f2dgrjhx8aw1gzawrf8qggf5j0dygsla08bbsxhx5mc5a6cka"; }; jaxws = fetchurl { url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = "1p1739gb5gx9m4sm3i4javfk9lk41wnz92k6gis6sq99dd1bj1l5"; + sha256 = "03982ajxm0hzany1jg009ym84vryx7a8qfi6wcgjxyxvk8vnz37c"; }; jaxp = fetchurl { url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = "1nl3kmbwqhhymcp25rnmf5mr3dn87lgdxvz9wgng7if6yqxlyakq"; + sha256 = "0578h04y1ha60yjplsa8lqdjds9s2lxzgs9ybm9rs1rqzxmm0xmy"; }; openjdk = stdenv.mkDerivation rec { name = "openjdk-7u${update}b${build}"; diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 50199852ae2..2969dab9226 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl, cpio, pkgconfig, file, which, unzip, zip, xorg, cups, freetype -, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib +{ stdenv, lib, fetchurl, cpio, pkgconfig, file, which, unzip, zip, cups, freetype +, alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib, lndir +, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama, libXcursor +, libjpeg, giflib , setJavaClassPath , minimal ? false , enableInfinality ? true # font rendering patch +, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf }: let @@ -65,10 +68,11 @@ let nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cpio file which unzip zip - xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst - xorg.libXi xorg.libXinerama xorg.libXcursor xorg.lndir - cups freetype alsaLib perl liberation_ttf fontconfig bootjdk zlib + cpio file which unzip zip perl bootjdk zlib cups freetype alsaLib + libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst + libXi libXinerama libXcursor lndir fontconfig + ] ++ lib.optionals (!minimal && enableGnome2) [ + gtk2 gnome_vfs GConf glib ]; prePatch = '' @@ -82,10 +86,12 @@ let ./fix-java-home-jdk8.patch ./read-truststore-from-env-jdk8.patch ./currency-date-range-jdk8.patch - ] ++ (if enableInfinality then [ + ] ++ lib.optionals (!minimal && enableInfinality) [ ./004_add-fontconfig.patch ./005_enable-infinality.patch - ] else []); + ] ++ lib.optionals (!minimal && enableGnome2) [ + ./swing-use-gtk.patch + ]; preConfigure = '' chmod +x configure @@ -101,21 +107,22 @@ let "--enable-unlimited-crypto" "--disable-debug-symbols" "--disable-freetype-bundling" + "--with-zlib=system" + "--with-giflib=system" + "--with-stdc++lib=dynamic" # glibc 2.24 deprecated readdir_r so we need this # See https://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg49006.html "--with-extra-cflags=\"-Wno-error=deprecated-declarations\"" - ] ++ (if minimal then [ - "--disable-headful" - "--with-zlib=bundled" - "--with-giflib=bundled" - ] else [ - "--with-zlib=system" - ]); + ] ++ lib.optional minimal "--disable-headful"; - NIX_LDFLAGS= if minimal then null else "-lfontconfig"; + NIX_LDFLAGS= lib.optionals (!minimal) [ + "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic" + ] ++ lib.optionals (!minimal && enableGnome2) [ + "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2" + ]; - buildFlags = "all"; + buildFlags = [ "all" ]; installPhase = '' mkdir -p $out/lib/openjdk $out/share $jre/lib/openjdk @@ -135,12 +142,19 @@ let # Remove crap from the installation. rm -rf $out/lib/openjdk/demo $out/lib/openjdk/sample + ${lib.optionalString minimal '' + rm $out/lib/openjdk/jre/lib/${architecture}/{libjsound,libjsoundalsa,libsplashscreen,libawt*,libfontmanager}.so + rm $out/lib/openjdk/jre/bin/policytool + rm $out/lib/openjdk/bin/{policytool,appletviewer} + ''} # Move the JRE to a separate output and setup fallback fonts mv $out/lib/openjdk/jre $jre/lib/openjdk/ mkdir $out/lib/openjdk/jre - mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback - lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ${lib.optionalString (!minimal) '' + mkdir -p $jre/lib/openjdk/jre/lib/fonts/fallback + lndir ${liberation_ttf}/share/fonts/truetype $jre/lib/openjdk/jre/lib/fonts/fallback + ''} lndir $jre/lib/openjdk/jre $out/lib/openjdk/jre rm -rf $out/lib/openjdk/jre/bina diff --git a/pkgs/development/compilers/openjdk/swing-use-gtk.patch b/pkgs/development/compilers/openjdk/swing-use-gtk.patch new file mode 100644 index 00000000000..9538aade672 --- /dev/null +++ b/pkgs/development/compilers/openjdk/swing-use-gtk.patch @@ -0,0 +1,26 @@ +diff -ru3 a/jdk/src/share/classes/javax/swing/UIManager.java b/jdk/src/share/classes/javax/swing/UIManager.java +--- a/jdk/src/share/classes/javax/swing/UIManager.java 2016-07-26 00:41:37.000000000 +0300 ++++ b/jdk/src/share/classes/javax/swing/UIManager.java 2016-10-02 22:46:01.890071761 +0300 +@@ -607,11 +607,9 @@ + if (osType == OSInfo.OSType.WINDOWS) { + return "com.sun.java.swing.plaf.windows.WindowsLookAndFeel"; + } else { +- String desktop = AccessController.doPrivileged(new GetPropertyAction("sun.desktop")); + Toolkit toolkit = Toolkit.getDefaultToolkit(); +- if ("gnome".equals(desktop) && +- toolkit instanceof SunToolkit && +- ((SunToolkit) toolkit).isNativeGTKAvailable()) { ++ if (toolkit instanceof SunToolkit && ++ ((SunToolkit) toolkit).isNativeGTKAvailable()) { + // May be set on Linux and Solaris boxs. + return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel"; + } +@@ -1341,7 +1339,7 @@ + lafName = (String) lafData.remove("defaultlaf"); + } + if (lafName == null) { +- lafName = getCrossPlatformLookAndFeelClassName(); ++ lafName = getSystemLookAndFeelClassName(); + } + lafName = swingProps.getProperty(defaultLAFKey, lafName); + diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 775971821aa..8fe775de146 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -26,7 +26,7 @@ , mesa_noglu , freetype , fontconfig -, gnome +, gnome2 , cairo , alsaLib , atk @@ -177,7 +177,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/oraclejdk/jdk6-construct.sh b/pkgs/development/compilers/oraclejdk/jdk6-construct.sh deleted file mode 100644 index 16ee0f5a2f0..00000000000 --- a/pkgs/development/compilers/oraclejdk/jdk6-construct.sh +++ /dev/null @@ -1,273 +0,0 @@ -#!/bin/bash -# construct.sh -# example construction of JRE and JDK directories from the DLJ bundles -# -# Copyright 2006 Sun Microsystems, Inc. -# -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this software and associated documentation files (the -# "Software"), to deal in the Software without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the Software, and to -# permit persons to whom the Software is furnished to do so, subject to -# the following conditions: -# -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Sun, Sun Microsystems, the Sun logo and Java, Java HotSpot, -# and JVM trademarks or registered trademarks of Sun Microsystems, -# Inc. in the U.S. and other countries. - - -program=`basename $0` - -usage () { - echo "usage: ${program} path/to/unbundle-jdk path/to/linux-jdk path/to/linux-jre" -} - -getargs() { - undir=$1 - jdkdir=$2 - jredir=$3 - if [ ! -d $undir ]; then - echo "${program}: unbundle directory not found: $undir" - exit 2 - fi - # make sure javahome is the JDK - javahome=`echo $undir/*/db/demo` - if [ ! -d $javahome ]; then - echo "${program}: unbundle directory incorrect: $undir" - echo " expecting $undir/jdk1.5.0_xx" - exit 2 - else - javahome=$(dirname $(dirname $javahome)) - fi - # verify JDK dir - jdkdirp=`dirname $jdkdir` - jdkbase=`basename $jdkdir` - if [ ! -d $jdkdirp ]; then - echo "${program}: parent directory for JDK does not exist: $jdkdirp" - exit 2 - fi - savedir=`pwd` - cd $jdkdirp - jdkdirp=`pwd` - cd $savedir - jdkdir=$jdkdirp/$jdkbase - # verify JRE dir - jredirp=`dirname $jredir` - jrebase=`basename $jredir` - if [ ! -d $jredirp ]; then - echo "${program}: parent directory for JRE does not exist: $jredirp" - exit 2 - fi - savedir=`pwd` - cd $jredirp - jredirp=`pwd` - cd $savedir - jredir=$jredirp/$jrebase -} - -checkfiles() { - if [ -r $jdkdir ]; then - echo "${program}: directory for JDK already exists: $jdkdir" - exit 2 - fi - if [ -r $jredir ]; then - echo "${program}: directory for JRE already exists: $jredir" - exit 2 - fi -} - -copytree() { - echo "copying over the JDK tree..." - cp -a $javahome $jdkdir -} - -linkrel() { - target=$1 - link=$2 - # make a softlink from the $link to the $target - # make this a relative link - targetb=(`echo $target | tr '/' ' '`) - linkb=(`echo $link | tr '/' ' '`) - (( n = ${#targetb[*]} )) - (( m = ${#linkb[*]} )) - c=$n # common length - if [ $m -lt $c ]; then - (( c = m )) - fi - for (( i = 0 ; i < c ; i++ )); do - if [ ${targetb[$i]} != ${linkb[$i]} ]; then - # echo components differ, stopping - break - fi - done - rel="" - for (( j = i + 1; j < m ; j++ )); do - if [ -z $rel ]; then - rel=".." - else - rel="$rel/.." - fi - done - for (( j = i; j < n ; j++ )); do - if [ -z $rel ]; then - rel=${targetb[$j]} - else - rel="$rel/${targetb[$j]}" - fi - done - ln -s $rel $link -} - -createjre() { - echo "creating JRE directory..." - # absolute link - # ln -s $jdkdir/jre $jredir - # relative link - linkrel $jdkdir/jre $jredir -} - -unpackjars() { - echo "unpacking jars..." - unpack200=$jdkdir/bin/unpack200 - if [ ! -x $unpack200 ]; then - echo "${program}: file missing $unpack200" - exit 1 - fi - cd $jdkdir - PACKED_JARS=`find . -name '*.pack'` - for i in $PACKED_JARS; do - # echo $i - jdir=`dirname $i` - jbase=`basename $i .pack` - if ! $unpack200 $jdkdir/$jdir/$jbase.pack $jdkdir/$jdir/$jbase.jar; then - echo "${program}: error unpacking $jdkdir/$jdir/$jbase.jar" - fi - if [ ! -r $jdkdir/$jdir/$jbase.jar ]; then - echo "${program}: missing $jdkdir/$jdir/$jbase.jar" - else - echo " $jdir/$jbase.jar" - # remove pack file - rm $jdkdir/$jdir/$jbase.pack - fi - done -} - -preparecds() { - # if this is a client installation... - compiler="`$jdkdir/bin/java -client -version 2>&1 | tail -n +3 | cut -d' ' -f1-4`" - if [ "X$compiler" = "XJava HotSpot(TM) Client VM" ]; then - # create the CDS archive - echo "creating the class data sharing archive..." - if ! $jdkdir/bin/java -client -Xshare:dump > /dev/null 2>&1; then - echo "returned error code $?" - fi - fi -} - -jreman () { - echo "setting up the JRE man pages..." - # note this list is slightly different for OpenSolaris bundles - jreman=/tmp/jre.man.txt -cat < $jreman -man/ja_JP.eucJP/man1/java.1 -man/ja_JP.eucJP/man1/javaws.1 -man/ja_JP.eucJP/man1/keytool.1 -man/ja_JP.eucJP/man1/orbd.1 -man/ja_JP.eucJP/man1/pack200.1 -man/ja_JP.eucJP/man1/policytool.1 -man/ja_JP.eucJP/man1/rmid.1 -man/ja_JP.eucJP/man1/rmiregistry.1 -man/ja_JP.eucJP/man1/servertool.1 -man/ja_JP.eucJP/man1/tnameserv.1 -man/ja_JP.eucJP/man1/unpack200.1 -man/man1/java.1 -man/man1/javaws.1 -man/man1/keytool.1 -man/man1/orbd.1 -man/man1/pack200.1 -man/man1/policytool.1 -man/man1/rmid.1 -man/man1/rmiregistry.1 -man/man1/servertool.1 -man/man1/tnameserv.1 -man/man1/unpack200.1 -EOF - # create jre/man directory - # mkdir $jdkdir/jre/man - # move the real JRE man pages to jre/man - # link the JDK JRE man pages to jre/man - # real JDK man pages stay where they are - for m in `cat $jreman`; do - manpath=`dirname $jdkdir/jre/$m` - mkdir -p $manpath - mv $jdkdir/$m $jdkdir/jre/$m - linkrel $jdkdir/jre/$m $jdkdir/$m - done - # link in Japanese man pages - ln -s ja_JP.eucJP $jdkdir/jre/man/ja - rm $jreman -} - -elimdups() { - echo "eliminating duplication between the JDK and JDK/jre..." - jdkcomm=/tmp/jdk.bin.comm.txt -cat < $jdkcomm -bin/ControlPanel -bin/java -bin/javaws -bin/keytool -bin/orbd -bin/pack200 -bin/policytool -bin/rmid -bin/rmiregistry -bin/servertool -bin/tnameserv -bin/unpack200 -EOF - # note there is little point in linking these common files - # COPYRIGHT - # LICENSE - # THIRDPARTYLICENSEREADME.txt - # And this file is unique to the JDK - # README.html - # And these files are unique to the JDK/jre/ - # CHANGES - # README - # Welcome.html - for p in `cat $jdkcomm`; do - rm $jdkdir/$p - # this is a relative link - ln -s ../jre/$p $jdkdir/$p - done - rm $jdkcomm -} - -if [ $# -eq 3 ] ; then - getargs $1 $2 $3 - checkfiles - copytree - createjre - unpackjars - preparecds - jreman - elimdups -else - usage - exit 1 -fi - -exit 0 - diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix deleted file mode 100644 index 1b33a40635a..00000000000 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ swingSupport ? true -, stdenv -, requireFile -, unzip -, makeWrapper -, xorg ? null -, installjdk ? true -, pluginSupport ? true -, installjce ? false -}: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; -assert swingSupport -> xorg != null; - -let - - /** - * The JRE libraries are in directories that depend on the CPU. - */ - architecture = - if stdenv.system == "i686-linux" then - "i386" - else if stdenv.system == "x86_64-linux" then - "amd64" - else - abort "jdk requires i686-linux or x86_64 linux"; - - jce = - if installjce then - requireFile { - name = "jce_policy-6.zip"; - url = http://www.oracle.com/technetwork/java/javase/downloads/jce-6-download-429243.html; - sha256 = "0qljzfxbikm8br5k7rkamibp1vkyjrf6blbxpx6hn4k46f62bhnh"; - } - else - null; -in - -stdenv.mkDerivation { - name = - if installjdk then "jdk-1.6.0_45b06" else "jre-1.6.0_45b06"; - - src = - if stdenv.system == "i686-linux" then - requireFile { - name = "jdk-6u45-linux-i586.bin"; - url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html; - sha256 = "0mx3d2qlal5zyz1a7ld1yk2rs8pf9sjxs2jzasais3nq30jmlfym"; - } - else if stdenv.system == "x86_64-linux" then - requireFile { - name = "jdk-6u45-linux-x64.bin"; - url = http://www.oracle.com/technetwork/java/javase/downloads/jdk6downloads-1902814.html; - sha256 = "1s0j1pdr6y8c816d9i86rx4zp12nbhmas1rxksp0r53cn7m3ljbb"; - } - else - abort "jdk requires i686-linux or x86_64 linux"; - - builder = ./dlj-bundle-builder.sh; - - /** - * If jdk5 is added, make sure to use the original construct script. - * This copy removes references to kinit, klist, ktab, which seem to be - * gone in jdk6. - */ - construct = ./jdk6-construct.sh; - inherit installjdk; - - buildInputs = [unzip makeWrapper]; - - /** - * libXt is only needed on amd64 - */ - libraries = - [stdenv.cc.libc] ++ - (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt] else []); - - inherit swingSupport pluginSupport architecture jce; - inherit (xorg) libX11; - - mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; - - meta.license = stdenv.lib.licenses.unfree; -} diff --git a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7-linux.nix deleted file mode 100644 index 730b3b569c6..00000000000 --- a/pkgs/development/compilers/oraclejdk/jdk7-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./jdk-linux-base.nix { - productVersion = "7"; - patchVersion = "79"; - downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "1hv9bmj08y8gavhhkip5w5dg96b1dy4sc2cidpjcbwpb2mzh5lhs"; - sha256_x86_64 = "140xl5kfdrlmh8wh2x3j23x53dbil8qxsvc7gf3138mz4805vmr9"; - jceName = "UnlimitedJCEPolicyJDK7.zip"; - jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; - sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; -} diff --git a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix deleted file mode 100644 index 311f07e8e45..00000000000 --- a/pkgs/development/compilers/oraclejdk/jdk7psu-linux.nix +++ /dev/null @@ -1,10 +0,0 @@ -import ./jdk-linux-base.nix { - productVersion = "7"; - patchVersion = "80"; - downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html; - sha256_i686 = "1fjpm8pa74c4vgv93lnky6pd3igln56yxdn4kbhgcg12lwc17vcx"; - sha256_x86_64 = "08wn62sammvsvlqac0n8grrikl0ykh9ikqdy823i2mcnccqsgnds"; - jceName = "UnlimitedJCEPolicyJDK7.zip"; - jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce-7-download-432124.html; - sha256JCE = "7a8d790e7bd9c2f82a83baddfae765797a4a56ea603c9150c87b7cdb7800194d"; -} diff --git a/pkgs/development/compilers/pakcs/adjust-buildsystem.patch b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch new file mode 100644 index 00000000000..2d1f92af81d --- /dev/null +++ b/pkgs/development/compilers/pakcs/adjust-buildsystem.patch @@ -0,0 +1,21 @@ +diff -Naur pakcs-1.11.4-upstream/scripts/pakcs.sh pakcs-1.11.4/scripts/pakcs.sh +--- pakcs-1.11.4-upstream/scripts/pakcs.sh 2014-10-24 05:06:07.000000000 -0430 ++++ pakcs-1.11.4/scripts/pakcs.sh 2015-01-05 16:26:15.697982791 -0430 +@@ -16,7 +16,7 @@ + # use readline wrapper rlwrap if it is installed and we have tty as stdin: + USERLWRAP=no + if tty -s ; then +- RLWRAP=`which rlwrap` ++ RLWRAP=`type -P rlwrap` + if [ -x "$RLWRAP" ] ; then + USERLWRAP=yes + fi +@@ -29,7 +29,7 @@ + done + + if [ $USERLWRAP = yes ] ; then +- exec rlwrap -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"} ++ exec rlwrap -a -c -f "$PAKCSHOME/tools/rlwrap" "$REPL" ${1+"$@"} + else + exec "$REPL" ${1+"$@"} + fi diff --git a/pkgs/development/compilers/pakcs/case-insensitive.patch b/pkgs/development/compilers/pakcs/case-insensitive.patch new file mode 100644 index 00000000000..e46558c2520 --- /dev/null +++ b/pkgs/development/compilers/pakcs/case-insensitive.patch @@ -0,0 +1,19 @@ +--- www/Makefile.orig 2016-10-10 21:04:36.000000000 +0300 ++++ pakcs-1.14.0/www/Makefile 2016-10-10 21:07:56.000000000 +0300 +@@ -6,7 +6,7 @@ all: submitform Registry + submitform: SubmitForm.curry $(LIBDIR)/HtmlCgi.curry \ + $(LIBDIR)/NamedSocket.curry $(LIBDIR)/CPNS.curry + $(REPL) $(REPL_OPTS) :load SubmitForm :save :q +- mv SubmitForm submitform ++ mv SubmitForm submitform.orig && mv submitform.orig submitform + + Registry: Registry.curry $(LIBDIR)/HtmlCgi.curry + $(REPL) $(REPL_OPTS) :load Registry :save :q +--- currytools/erd2curry/Makefile.orig 2016-10-10 21:13:49.000000000 +0300 ++++ pakcs-1.14.0/currytools/erd2curry/Makefile 2016-10-10 21:21:14.000000000 +0300 +@@ -32,4 +32,4 @@ uninstall: clean + erd2curry: $(DEPS) + # create saved state for top-level function "main": + $(REPL) $(REPL_OPTS) :load ERD2Curry :save "main \"$(CURDIR)\"" :q +- mv ERD2Curry $@ ++ mv ERD2Curry $@.orig && mv $@.orig $@ diff --git a/pkgs/development/compilers/pakcs/default.nix b/pkgs/development/compilers/pakcs/default.nix new file mode 100644 index 00000000000..ca790d027e0 --- /dev/null +++ b/pkgs/development/compilers/pakcs/default.nix @@ -0,0 +1,159 @@ +{ stdenv, fetchurl, swiProlog, haskellPackages +, glibcLocales, makeWrapper, rlwrap, tk, which }: + +let + fname = "pakcs-1.14.0"; + + fsrc = fetchurl { + url = "http://www.informatik.uni-kiel.de/~pakcs/download/${fname}-src.tar.gz"; + sha256 = "1651ssh4ql79x8asd7kp4yis2n5rhn3lml4s26y03b0cgbfhs78s"; + }; + + swiPrologLocked = stdenv.lib.overrideDerivation swiProlog (oldAttrs: rec { + version = "6.6.6"; + name = "swi-prolog-${version}"; + src = fetchurl { + url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; + sha256 = "0vcrfskm2hyhv30lxr6v261myb815jc3bgmcn1lgsc9g9qkvp04z"; + }; + }); + +in +stdenv.mkDerivation rec { + + name = fname; + + curryBase = haskellPackages.callPackage ( + { mkDerivation, base, Cabal, containers, directory, either + , filepath, mtl, pretty, stdenv, syb, time + }: + mkDerivation { + pname = "curry-base"; + version = "0.4.1"; + src = fsrc; + libraryHaskellDepends = [ + base containers directory either filepath mtl pretty syb time + ]; + testHaskellDepends = [ base Cabal filepath mtl ]; + homepage = "http://curry-language.org"; + description = "Functions for manipulating Curry programs"; + license = "unknown"; + + postUnpack = '' + mv ${name} ${name}.orig + ln -s ${name}.orig/frontend/curry-base ${name} + ''; + doCheck = false; + } + ) {}; + + curryFront = haskellPackages.callPackage ( + { mkDerivation, base, Cabal, containers, directory + , filepath, mtl, network-uri, process, stdenv, syb, transformers + }: + mkDerivation { + pname = "curry-frontend"; + version = "0.4.1"; + src = fsrc; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers curryBase directory filepath mtl network-uri + process syb transformers + ]; + executableHaskellDepends = [ + base containers curryBase directory filepath mtl network-uri + process syb transformers + ]; + testHaskellDepends = [ base Cabal curryBase filepath ]; + homepage = "http://curry-language.org"; + description = "Compile the functional logic language Curry to several intermediate formats"; + license = "unknown"; + + postUnpack = '' + mv ${name} ${name}.orig + ln -s ${name}.orig/frontend/curry-frontend ${name} + ''; + doCheck = false; + } + ) {}; + + src = fsrc; + + buildInputs = [ swiPrologLocked makeWrapper glibcLocales rlwrap tk which ]; + + patches = [ + ./adjust-buildsystem.patch + ./case-insensitive.patch + ]; + + configurePhase = '' + # Phony HOME. + mkdir phony-home + export HOME=$(pwd)/phony-home + + # SWI Prolog + sed -i 's@SWIPROLOG=@SWIPROLOG='${swiPrologLocked}/bin/swipl'@' scripts/pakcsinitrc.sh + ''; + + buildPhase = '' + # Some comments in files are in UTF-8, so include the locale needed by GHC runtime. + export LC_ALL=en_US.UTF-8 + + # PAKCS must be build in place due to embedded filesystem references placed by swi. + + # Prepare PAKCSHOME directory. + mkdir -p $out/pakcs/bin + + # Set up link to cymake, which has been built already. + ln -s ${curryFront}/bin/cymake $out/pakcs/bin/ + rm -r frontend + + # Prevent embedding the derivation build directory as temp. + export TEMP=/tmp + + # Copy to in place build location and run the build. + cp -r * $out/pakcs + (cd $out/pakcs ; make) + ''; + + installPhase = '' + # Install bin. + mkdir -p $out/bin + for b in $(ls $out/pakcs/bin) ; do + ln -s $out/pakcs/bin/$b $out/bin/ ; + done + + # Place emacs lisp files in expected locations. + mkdir -p $out/share/emacs/site-lisp/curry-pakcs + for e in "$out/pakcs/tools/emacs/"*.el ; do + cp $e $out/share/emacs/site-lisp/curry-pakcs/ ; + done + + # Wrap for rlwrap and tk support. + wrapProgram $out/pakcs/bin/pakcs \ + --prefix PATH ":" "${rlwrap}/bin" \ + --prefix PATH ":" "${tk}/bin" \ + ''; + + meta = { + homepage = "http://www.informatik.uni-kiel.de/~pakcs/"; + description = "An implementation of the multi-paradigm declarative language Curry"; + license = stdenv.lib.licenses.bsd3; + + longDescription = '' + PAKCS is an implementation of the multi-paradigm declarative language + Curry jointly developed by the Portland State University, the Aachen + University of Technology, and the University of Kiel. Although this is + not a highly optimized implementation but based on a high-level + compilation of Curry programs into Prolog programs, it is not a toy + implementation but has been used for a variety of applications (e.g., + graphical programming environments, an object-oriented front-end for + Curry, partial evaluators, database applications, HTML programming + with dynamic web pages, prototyping embedded systems). + ''; + + maintainers = [ stdenv.lib.maintainers.gnidorah ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/ponyc/pony-stable.nix b/pkgs/development/compilers/ponyc/pony-stable.nix new file mode 100644 index 00000000000..cd4859acec2 --- /dev/null +++ b/pkgs/development/compilers/ponyc/pony-stable.nix @@ -0,0 +1,26 @@ +{stdenv, fetchFromGitHub, ponyc }: + +stdenv.mkDerivation { + name = "pony-stable-2016-10-10"; + + src = fetchFromGitHub { + owner = "jemc"; + repo = "pony-stable"; + rev = "fdefa26fed93f4ff81c323f29abd47813c515703"; + sha256 = "16inavy697icgryyvn9gcylgh639xxs7lnbrqdzcryvh0ck15qxk"; + }; + + buildInputs = [ ponyc ]; + + installPhase = '' + make prefix=$out install + ''; + + meta = { + description = "A simple dependency manager for the Pony language."; + homepage = http://www.ponylang.org; + license = stdenv.lib.licenses.bsd2; + maintainers = [ stdenv.lib.maintainers.dipinhora ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/compilers/rust/bootstrap.nix b/pkgs/development/compilers/rust/bootstrap.nix index e7cc7b15627..454b67b8151 100644 --- a/pkgs/development/compilers/rust/bootstrap.nix +++ b/pkgs/development/compilers/rust/bootstrap.nix @@ -17,13 +17,13 @@ let # fetch hashes by running `print-hashes.sh 1.9.0` bootstrapHash = if stdenv.system == "i686-linux" - then "be93dd2b80a97f2877679950d56990628c6547b953294f16bf6d69c18a39edc0" + then "f5a3f5d53defe827a71447b1a0e7a656394b87ee23e009d7bf73a0277c1b5ac2" else if stdenv.system == "x86_64-linux" - then "f189303d52b37c8bb694b9d9739ae73ffa926cbdeffde1d5d6a5c6e811940293" + then "f4ebbd6d9494cb8fa6c410cb58954e1913546c2bca8963faebc424591547d83f" else if stdenv.system == "i686-darwin" - then "40d4782a58dd5bef22dbbaa7a363f3b42f844628db07205f6435ac934f350061" + then "bf07182bc362985fcdd48af905cdb559e20c68518cd71dabec3c30b78ca8a94a" else if stdenv.system == "x86_64-darwin" - then "4bb71249f4afd7cee07f63d681f9fcb1b525ee3dfd49722adab7a40024e45af7" + then "2cdbc47438dc86ecaf35298317b77d735956eb160862e3f6d0fda0da656ecc35" else throw "missing boostrap hash for platform ${stdenv.system}"; needsPatchelf = stdenv.isLinux; @@ -33,7 +33,7 @@ let sha256 = bootstrapHash; }; - version = "1.10.0"; + version = "1.11.0"; in rec { diff --git a/pkgs/development/compilers/rust/default.nix b/pkgs/development/compilers/rust/default.nix index b7e992c916d..1dbc6c13e0b 100644 --- a/pkgs/development/compilers/rust/default.nix +++ b/pkgs/development/compilers/rust/default.nix @@ -7,12 +7,12 @@ in rec { rustc = callPackage ./rustc.nix { - shortVersion = "1.11.0"; + shortVersion = "1.12.0"; isRelease = true; forceBundledLLVM = false; configureFlags = [ "--release-channel=stable" ]; - srcRev = "9b21dcd6a89f38e8ceccb2ede8c9027cb409f6e3"; - srcSha = "12djpxhwqvq3262ai9vd096bvriynci2mrwn0dfjrd0w6s0i8viy"; + srcRev = "3191fbae9da539442351f883bdabcad0d72efcb6"; + srcSha = "1mpw6c5jfxy60g786wl8g0ncwikqfbcj67jrdpj3jacywxsxzlby"; patches = [ ./patches/disable-lockfile-check.patch @@ -25,10 +25,10 @@ rec { }; cargo = callPackage ./cargo.nix rec { - version = "0.12.0"; - srcRev = "6b98d1f8abf5b33c1ca2771d3f5f3bafc3407b93"; - srcSha = "0pq6l3yzmh2il6320f6501hvp9iikdxzl34i5b52v93ncpim36bk"; - depsSha256 = "1jrwzm9fd15kf2d5zb17q901hx32h711ivcwdpxpmzwq08sjlcvl"; + version = "0.13.0"; + srcRev = "109cb7c33d426044d141457049bd0fffaca1327c"; + srcSha = "0p79m7hpzjh36l4fc6a59h6r8yz6qafjcdg5v1yb7bac9m2wi7vs"; + depsSha256 = "1cwp4p8b985fj8j2qmgsi2mpp51rdpwzm9qa60760nrry1fy624z"; inherit rustc; # the rustc that will be wrapped by cargo inherit rustPlatform; # used to build cargo diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix index f8f0e6df0d8..e1bff12f398 100644 --- a/pkgs/development/compilers/rust/rustc.nix +++ b/pkgs/development/compilers/rust/rustc.nix @@ -90,8 +90,18 @@ stdenv.mkDerivation { # Disable fragile linker-output-non-utf8 test rm -vr src/test/run-make/linker-output-non-utf8/ + # Remove test targeted at LLVM 3.9 - https://github.com/rust-lang/rust/issues/36835 + rm -vr src/test/run-pass/issue-36023.rs + # Useful debugging parameter # export VERBOSE=1 + '' + + # In src/compiler-rt/cmake/config-ix.cmake, the cmake build falls + # back to darwin 10.4. This causes the OS name to be recorded as + # "10.4" rather than the expected "osx". But mk/rt.mk expects the + # built library name to have an "_osx" suffix on darwin. + optionalString stdenv.isDarwin '' + substituteInPlace mk/rt.mk --replace "_osx" "_10.4" ''; preConfigure = '' @@ -118,7 +128,13 @@ stdenv.mkDerivation { preCheck = '' export TZDIR=${tzdata}/share/zoneinfo - ${optionalString stdenv.isDarwin "export TMPDIR=/tmp"} + '' + + # Ensure TMPDIR is set, and disable a test that removing the HOME + # variable from the environment falls back to another home + # directory. + optionalString stdenv.isDarwin '' + export TMPDIR=/tmp + sed -i '28s/home_dir().is_some()/true/' ./src/test/run-pass/env-home-dir.rs ''; # Disable doCheck on Darwin to work around upstream issue diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 35467080e83..788160b5888 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.3.8"; + version = "1.3.10"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "0jfhrzsydgxzx0g90bl3fjys0i5biah76lkxjgh16l7h7577y8rh"; + sha256 = "0xspp04y0l0yxfi1zyv0qsj9b6px5i88xpannwpc45mkj6nplmja"; }; patchPhase = '' diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix index c3e77152b3e..79f7e5256b2 100644 --- a/pkgs/development/compilers/swi-prolog/default.nix +++ b/pkgs/development/compilers/swi-prolog/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, gmp, readline, openssl, libjpeg, unixODBC, zlib , libXinerama, libXft, libXpm, libSM, libXt, freetype, pkgconfig -, fontconfig +, fontconfig, makeWrapper ? stdenv.isDarwin }: let - version = "6.6.6"; + version = "7.2.3"; in stdenv.mkDerivation { name = "swi-prolog-${version}"; src = fetchurl { - url = "http://www.swi-prolog.org/download/stable/src/pl-${version}.tar.gz"; - sha256 = "0vcrfskm2hyhv30lxr6v261myb815jc3bgmcn1lgsc9g9qkvp04z"; + url = "http://www.swi-prolog.org/download/stable/src/swipl-${version}.tar.gz"; + sha256 = "1da6sr8pz1zffs79nfa1d25a11ibhalm1vdwsb17p265nx8psra3"; }; buildInputs = [ gmp readline openssl libjpeg unixODBC libXinerama - libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ]; + libXft libXpm libSM libXt zlib freetype pkgconfig fontconfig ] + ++ stdenv.lib.optional stdenv.isDarwin makeWrapper; hardeningDisable = [ "format" ]; @@ -23,12 +24,24 @@ stdenv.mkDerivation { buildFlags = "world"; + # For macOS: still not fixed in upstream: "abort trap 6" when called + # through symlink, so wrap binary. + # We reinvent wrapProgram here but omit argv0 pass in order to not + # break PAKCS package build. This is also safe for SWI-Prolog, since + # there is no wrapping environment and hence no need to spoof $0 + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + local prog="$out/bin/swipl" + local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped + mv $prog $hidden + makeWrapper $hidden $prog + ''; + meta = { homepage = http://www.swi-prolog.org/; description = "A Prolog compiler and interpreter"; license = "LGPL"; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.peti ]; }; } diff --git a/pkgs/development/compilers/vala/0.23.nix b/pkgs/development/compilers/vala/0.23.nix deleted file mode 100644 index 13b9c5f3983..00000000000 --- a/pkgs/development/compilers/vala/0.23.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty -}: - -let - major = "0.23"; - minor = "2"; - sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl"; -in -stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; - - meta = { - description = "Compiler for GObject type system"; - homepage = "http://live.gnome.org/Vala"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ antono ]; - }; - - src = fetchurl { - url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - - buildInputs = [ glib libiconv ] - ++ libintlOrEmpty; -} diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix deleted file mode 100644 index 78cb850c356..00000000000 --- a/pkgs/development/compilers/vala/0.26.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty -}: - -let - major = "0.26"; - minor = "2"; - sha256 = "37f13f430c56a93b6dac85239084681fd8f31c407d386809c43bc2f2836e03c4"; -in -stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; - - meta = { - description = "Compiler for GObject type system"; - homepage = "http://live.gnome.org/Vala"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ antono lethalman ]; - }; - - src = fetchurl { - url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - - buildInputs = [ glib libiconv ] - ++ libintlOrEmpty; -} diff --git a/pkgs/development/compilers/vala/0.28.nix b/pkgs/development/compilers/vala/0.28.nix deleted file mode 100644 index caec4fda887..00000000000 --- a/pkgs/development/compilers/vala/0.28.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty -}: - -let - major = "0.28"; - minor = "0"; - sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; -in -stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; - - meta = { - description = "Compiler for GObject type system"; - homepage = "http://live.gnome.org/Vala"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ antono lethalman ]; - }; - - src = fetchurl { - url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - - buildInputs = [ glib libiconv ] - ++ libintlOrEmpty; -} diff --git a/pkgs/development/compilers/vala/0.32.nix b/pkgs/development/compilers/vala/0.32.nix deleted file mode 100644 index 202b9fff6c8..00000000000 --- a/pkgs/development/compilers/vala/0.32.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt -, glib, libiconv, libintlOrEmpty -}: - -let - major = "0.32"; - minor = "1"; - sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"; -in -stdenv.mkDerivation rec { - name = "vala-${major}.${minor}"; - - meta = { - description = "Compiler for GObject type system"; - homepage = "http://live.gnome.org/Vala"; - license = stdenv.lib.licenses.lgpl21Plus; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ antono lethalman ]; - }; - - src = fetchurl { - url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; - inherit sha256; - }; - - nativeBuildInputs = [ pkgconfig flex bison libxslt ]; - - buildInputs = [ glib libiconv ] - ++ libintlOrEmpty; - -} diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix new file mode 100644 index 00000000000..b0153a75403 --- /dev/null +++ b/pkgs/development/compilers/vala/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt +, glib, libiconv, libintlOrEmpty +}: + +let + generic = { major, minor, sha256 }: + stdenv.mkDerivation rec { + name = "vala-${major}.${minor}"; + + src = fetchurl { + url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig flex bison libxslt ]; + + buildInputs = [ glib libiconv ] ++ libintlOrEmpty; + + meta = with stdenv.lib; { + description = "Compiler for GObject type system"; + homepage = "http://live.gnome.org/Vala"; + license = licenses.lgpl21Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ antono lethalman peterhoeg ]; + }; + }; + +in rec { + + vala_0_23 = generic { + major = "0.23"; + minor = "2"; + sha256 = "0g22ss9qbm3fqhx4fxhsyfmdc5g1hgdw4dz9d37f4489kl0qf8pl"; + }; + + vala_0_26 = generic { + major = "0.26"; + minor = "2"; + sha256 = "1i03ds1z5hivqh4nhf3x80fg7n0zd22908w5minkpaan1i1kzw9p"; + }; + + vala_0_28 = generic { + major = "0.28"; + minor = "0"; + sha256 = "0zwpzhkhfk3piya14m7p2hl2vaabahprphppfm46ci91z39kp7hd"; + }; + + vala_0_32 = generic { + major = "0.32"; + minor = "1"; + sha256 = "1ab1l44abf9fj1wznzq5956431ia136rl5049cggnk5393jlf3fx"; + }; + + vala_0_34 = generic { + major = "0.34"; + minor = "1"; + sha256 = "16cjybjw100qps6jg0jdyjh8hndz8a876zmxpybnf30a8vygrk7m"; + }; + + vala = vala_0_34; +} diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 18bbdef8758..d4d2790b2a3 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -56,7 +56,7 @@ let }; importGodeps = { depsFile }: - map dep2src (lib.importJSON depsFile); + map dep2src (import depsFile); goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs else extraSrcs; @@ -180,6 +180,16 @@ go.stdenv.mkDerivation ( done < <(find $bin/bin -type f 2>/dev/null) ''; + shellHook = '' + d=$(mktemp -d "--suffix=-$name") + '' + toString (map (dep: '' + mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" + ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" + '' + ) goPath) + '' + export GOPATH="$d:$GOPATH" + ''; + disallowedReferences = lib.optional (!allowGoReference) go ++ lib.optional (!dontRenameImports) govers; diff --git a/pkgs/development/guile-modules/guile-gnome/default.nix b/pkgs/development/guile-modules/guile-gnome/default.nix index 3e9736fff52..ec7723f5b7e 100644 --- a/pkgs/development/guile-modules/guile-gnome/default.nix +++ b/pkgs/development/guile-modules/guile-gnome/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, guile, guile_lib, gwrap -, pkgconfig, gconf, glib, gnome_vfs, gtk +, pkgconfig, gconf, glib, gnome_vfs, gtk2 , libglade, libgnome, libgnomecanvas, libgnomeui , pango, guileCairo, autoconf, automake, texinfo }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { gconf glib gnome_vfs - gtk + gtk2 libglade libgnome libgnomecanvas diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 1b02e464c3b..fa84e5ce508 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -26,9 +26,7 @@ self: super: { c2hs = dontCheck super.c2hs; # fix errors caused by hardening flags - epanet-haskell = super.epanet-haskell.overrideDerivation (drv: { - hardeningDisable = [ "format" ]; - }); + epanet-haskell = disableHardening super.epanet-haskell ["format"]; # This test keeps being aborted because it runs too quietly for too long Lazy-Pbkdf2 = if pkgs.stdenv.isi686 then dontCheck super.Lazy-Pbkdf2 else super.Lazy-Pbkdf2; @@ -45,9 +43,10 @@ self: super: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; - sha256 = "0an1rafbv48m04g7crfj2qrk64d98yrjn2z4hfv2pybwmqdmx78z"; + sha256 = "1j29ydbw86j3qd4qb4l348pcnjd24irgdra9ss2afi6w2pn60yjn"; rev = drv.version; }; + doCheck = false; # version 6.20160907 has a test suite failure; reported upstream })).overrideScope (self: super: { # https://github.com/prowdsponsor/esqueleto/issues/137 persistent = self.persistent_2_2_4_1; @@ -161,8 +160,10 @@ self: super: { ABList = dontCheck super.ABList; # https://github.com/haskell/vector/issues/47 - vector = if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector; + # https://github.com/haskell/vector/issues/138 + vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector); + # Fix Darwin build. halive = if pkgs.stdenv.isDarwin then addBuildDepend super.halive pkgs.darwin.apple_sdk.frameworks.AppKit else super.halive; @@ -214,24 +215,10 @@ self: super: { jwt = dontCheck super.jwt; # https://github.com/NixOS/cabal2nix/issues/136 and https://github.com/NixOS/cabal2nix/issues/216 - gio = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.gio self.gtk2hs-buildtools - ) pkgs.glib) (drv: { - hardeningDisable = [ "fortify" ]; - }); - glib = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.glib self.gtk2hs-buildtools - ) pkgs.glib) (drv: { - hardeningDisable = [ "fortify" ]; - }); - gtk3 = pkgs.lib.overrideDerivation (super.gtk3.override { inherit (pkgs) gtk3; }) (drv: { - hardeningDisable = [ "fortify" ]; - }); - gtk = pkgs.lib.overrideDerivation (addPkgconfigDepend ( - addBuildTool super.gtk self.gtk2hs-buildtools - ) pkgs.gtk) (drv: { - hardeningDisable = [ "fortify" ]; - }); + gio = disableHardening (addPkgconfigDepend (addBuildTool super.gio self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; + glib = disableHardening (addPkgconfigDepend (addBuildTool super.glib self.gtk2hs-buildtools) pkgs.glib) ["fortify"]; + gtk3 = disableHardening (super.gtk3.override { inherit (pkgs) gtk3; }) ["fortify"]; + gtk = disableHardening (addPkgconfigDepend (addBuildTool super.gtk self.gtk2hs-buildtools) pkgs.gtk2) ["fortify"]; gtksourceview2 = (addPkgconfigDepend super.gtksourceview2 pkgs.gtk2).override { inherit (pkgs.gnome2) gtksourceview; }; gtksourceview3 = super.gtksourceview3.override { inherit (pkgs.gnome3) gtksourceview; }; @@ -282,16 +269,18 @@ self: super: { snowball = dontCheck super.snowball; sophia = dontCheck super.sophia; test-sandbox = dontCheck super.test-sandbox; + texrunner = dontCheck super.texrunner; users-postgresql-simple = dontCheck super.users-postgresql-simple; wai-middleware-hmac = dontCheck super.wai-middleware-hmac; xkbcommon = dontCheck super.xkbcommon; xmlgen = dontCheck super.xmlgen; hapistrano = dontCheck super.hapistrano; HerbiePlugin = dontCheck super.HerbiePlugin; + wai-cors = dontCheck super.wai-cors; # These packages try to access the network. - amqp-conduit = dontCheck super.amqp-conduit; amqp = dontCheck super.amqp; + amqp-conduit = dontCheck super.amqp-conduit; bitcoin-api = dontCheck super.bitcoin-api; bitcoin-api-extra = dontCheck super.bitcoin-api-extra; bitx-bitcoin = dontCheck super.bitx-bitcoin; # http://hydra.cryp.to/build/926187/log/raw @@ -301,9 +290,11 @@ self: super: { github-types = dontCheck super.github-types; # http://hydra.cryp.to/build/1114046/nixlog/1/raw hadoop-rpc = dontCheck super.hadoop-rpc; # http://hydra.cryp.to/build/527461/nixlog/2/raw hasql = dontCheck super.hasql; # http://hydra.cryp.to/build/502489/nixlog/4/raw + hasql-transaction = dontCheck super.hasql-transaction; # wants to connect to postgresql hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; }); - hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; }); + hoogle_5_0_4 = super.hoogle_5_0_4.override { haskell-src-exts = self.haskell-src-exts_1_18_2; }; marmalade-upload = dontCheck super.marmalade-upload; # http://hydra.cryp.to/build/501904/nixlog/1/raw + mongoDB = dontCheck super.mongoDB; network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw @@ -337,49 +328,57 @@ self: super: { acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9 + angel = dontCheck super.angel; apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw aws = dontCheck super.aws; # needs aws credentials aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw + binary-search = dontCheck super.binary-search; bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw bloodhound = dontCheck super.bloodhound; buildwrapper = dontCheck super.buildwrapper; burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw cabal-bounds = dontCheck super.cabal-bounds; # http://hydra.cryp.to/build/496935/nixlog/1/raw cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw + camfort = dontCheck super.camfort; cautious-file = dontCheck super.cautious-file; # http://hydra.cryp.to/build/499730/log/raw - CLI = dontCheck super.CLI; # Upstream has no issue tracker. cjk = dontCheck super.cjk; + CLI = dontCheck super.CLI; # Upstream has no issue tracker. command-qq = dontCheck super.command-qq; # http://hydra.cryp.to/build/499042/log/raw conduit-connection = dontCheck super.conduit-connection; craftwerk = dontCheck super.craftwerk; + css-text = dontCheck super.css-text; damnpacket = dontCheck super.damnpacket; # http://hydra.cryp.to/build/496923/log data-hash = dontCheck super.data-hash; Deadpan-DDP = dontCheck super.Deadpan-DDP; # http://hydra.cryp.to/build/496418/log/raw DigitalOcean = dontCheck super.DigitalOcean; + direct-sqlite = dontCheck super.direct-sqlite; directory-layout = dontCheck super.directory-layout; + dlist = dontCheck super.dlist; docopt = dontCheck super.docopt; # http://hydra.cryp.to/build/499172/log/raw dom-selector = dontCheck super.dom-selector; # http://hydra.cryp.to/build/497670/log/raw dotfs = dontCheck super.dotfs; # http://hydra.cryp.to/build/498599/log/raw DRBG = dontCheck super.DRBG; # http://hydra.cryp.to/build/498245/nixlog/1/raw + ed25519 = dontCheck super.ed25519; either-unwrap = dontCheck super.either-unwrap; # http://hydra.cryp.to/build/498782/log/raw etcd = dontCheck super.etcd; fb = dontCheck super.fb; # needs credentials for Facebook fptest = dontCheck super.fptest; # http://hydra.cryp.to/build/499124/log/raw 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 - ghcid = dontCheck super.ghcid; ghc-imported-from = dontCheck super.ghc-imported-from; ghc-parmake = dontCheck super.ghc-parmake; - gitlib-cmdline = dontCheck super.gitlib-cmdline; + ghcid = dontCheck super.ghcid; git-vogue = dontCheck super.git-vogue; + gitlib-cmdline = dontCheck super.gitlib-cmdline; GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50 hackport = dontCheck super.hackport; hadoop-formats = dontCheck super.hadoop-formats; haeredes = dontCheck super.haeredes; hashed-storage = dontCheck super.hashed-storage; hashring = dontCheck super.hashring; + hastache = dontCheck super.hastache; hath = dontCheck super.hath; haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing hdbi-postgresql = dontCheck super.hdbi-postgresql; @@ -411,13 +410,14 @@ self: super: { lensref = dontCheck super.lensref; liquidhaskell = dontCheck super.liquidhaskell; lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25 - lvmrun = pkgs.lib.overrideDerivation (dontCheck super.lvmrun) (drv: { - hardeningDisable = [ "format" ]; - }); + lvmrun = disableHardening (dontCheck super.lvmrun) ["format"]; memcache = dontCheck super.memcache; + MemoTrie = dontHaddock (dontCheck super.MemoTrie); + metrics = dontCheck super.metrics; milena = dontCheck super.milena; nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; + network = dontCheck super.network; network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; @@ -438,6 +438,7 @@ self: super: { redis-io = dontCheck super.redis-io; rethinkdb = dontCheck super.rethinkdb; Rlang-QQ = dontCheck super.Rlang-QQ; + safecopy = dontCheck super.safecopy; sai-shape-syb = dontCheck super.sai-shape-syb; scp-streams = dontCheck super.scp-streams; sdl2-ttf = dontCheck super.sdl2-ttf; # as of version 0.2.1, the test suite requires user intervention @@ -447,7 +448,9 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; + symengine = dontCheck super.symengine; tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) + th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; @@ -457,11 +460,13 @@ self: super: { wai-app-file-cgi = dontCheck super.wai-app-file-cgi; wai-logger = dontCheck super.wai-logger; WebBits = dontCheck super.WebBits; # http://hydra.cryp.to/build/499604/log/raw - webdriver-angular = dontCheck super.webdriver-angular; webdriver = dontCheck super.webdriver; + webdriver-angular = dontCheck super.webdriver-angular; xsd = dontCheck super.xsd; + snap-core = dontCheck super.snap-core; + sourcemap = dontCheck super.sourcemap; - # Needs access to locale data, but looks for it in the wrong place. + # Needs access to locale data, but looks for it in the wrong place. scholdoc-citeproc = dontCheck super.scholdoc-citeproc; # These test suites run for ages, even on a fast machine. This is nuts. @@ -502,7 +507,7 @@ self: super: { duplo = dontCheck super.duplo; # Nix-specific workaround - xmonad = appendPatch super.xmonad ./patches/xmonad-nix.patch; + xmonad = appendPatch (dontCheck super.xmonad) ./patches/xmonad-nix.patch; # https://github.com/evanrinehart/mikmod/issues/1 mikmod = addExtraLibrary super.mikmod pkgs.libmikmod; @@ -638,6 +643,11 @@ self: super: { ''; })); + # Requires optparse-applicative 0.13.0.0 + diagrams-pgf = super.diagrams-pgf.overrideScope (self: super: { + optparse-applicative = self.optparse-applicative_0_13_0_0; + }); + # Patch to consider NIX_GHC just like xmonad does dyre = appendPatch super.dyre ./patches/dyre-nix.patch; @@ -764,38 +774,51 @@ self: super: { ''; }); - # Byte-compile elisp code for Emacs. - structured-haskell-mode = overrideCabal super.structured-haskell-mode (drv: { - executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; + # Fine-tune the build. + structured-haskell-mode = (overrideCabal super.structured-haskell-mode (drv: { + # Bump version to latest git-version to get support for Emacs 25.x. + version = "1.0.20-28-g1ffb4db"; + src = pkgs.fetchFromGitHub { + owner = "chrisdone"; + repo = "structured-haskell-mode"; + sha256 = "1vrycvqp4n2pp6sq7z2v0zkqz6662nvacm7cla5hrrzl157cg0j5"; + rev = "1ffb4db1e7049d4089fea430d4f20bce2eff263d"; + }; + patches = [ (pkgs.fetchpatch { + url = "https://github.com/chrisdone/structured-haskell-mode/pull/140.patch"; + sha256 = "1zwyxfmkl04dy34mbifk24qj9g0sfpz0j8rm688qdah8lavp44df"; + }) + (pkgs.fetchpatch { + url = "https://github.com/chrisdone/structured-haskell-mode/pull/141.patch"; + sha256 = "1bqgzw8cvxs0yg3yipsayksf7djccslamksm0nkw0kfp22axzmng"; + }) + ]; + jailbreak = false; + # Statically linked Haskell libraries make the tool start-up much faster, + # which is important for use in Emacs. + enableSharedExecutables = false; + # Make elisp files available at a location where people expect it. We + # cannot easily byte-compile these files, unfortunately, because they + # depend on a new version of haskell-mode that we don't have yet. postInstall = '' - local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) - pushd >/dev/null $lispdir - for i in *.el; do - emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \ - --batch --eval "(byte-compile-disable-warning 'cl-functions)" \ - -f batch-byte-compile $i - done - popd >/dev/null + local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-"*"/elisp" ) mkdir -p $out/share/emacs ln -s $lispdir $out/share/emacs/site-lisp ''; - }); + })).override { + haskell-src-exts = self.haskell-src-exts_1_18_2; + }; - # Byte-compile elisp code for Emacs. + # # Make elisp files available at a location where people expect it. hindent = overrideCabal super.hindent (drv: { - executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; + # We cannot easily byte-compile these files, unfortunately, because they + # depend on a new version of haskell-mode that we don't have yet. postInstall = '' local lispdir=( "$out/share/"*"-${self.ghc.name}/${drv.pname}-${drv.version}/elisp" ) - pushd >/dev/null $lispdir - for i in *.el; do - emacs -Q -L . -L ${pkgs.emacs24Packages.haskellMode}/share/emacs/site-lisp \ - --batch --eval "(byte-compile-disable-warning 'cl-functions)" \ - -f batch-byte-compile $i - done - popd >/dev/null mkdir -p $out/share/emacs ln -s $lispdir $out/share/emacs/site-lisp ''; + doCheck = false; # https://github.com/chrisdone/hindent/issues/299 }); # https://github.com/yesodweb/Shelly.hs/issues/106 @@ -947,9 +970,7 @@ self: super: { # Tools that use gtk2hs-buildtools now depend on them in a custom-setup stanza cairo = addBuildTool super.cairo self.gtk2hs-buildtools; - pango = (addBuildTool super.pango self.gtk2hs-buildtools).overrideDerivation (drv: { - hardeningDisable = [ "fortify" ]; - }); + pango = disableHardening (addBuildTool super.pango self.gtk2hs-buildtools) ["fortify"]; # Fix tests which would otherwise fail with "Couldn't launch intero process." intero = overrideCabal super.intero (drv: { @@ -959,11 +980,17 @@ self: super: { }); # https://github.com/commercialhaskell/stack/issues/2263 - stack = appendPatch super.stack (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/stack/commit/7f7f1a5f67f4ecdd1f3009495f1ff101dd38047e.patch"; - sha256 = "1yh2g45mkfpwxq0vyzcbc4nbxh6wmb2xpp0k7r5byd8jicgvli29"; + stack = (dontJailbreak super.stack).overrideScope (self: super: { + http-client = self.http-client_0_5_3_2; + http-client-tls = self.http-client-tls_0_3_3; + http-conduit = self.http-conduit_2_2_2_1; + optparse-applicative = dontCheck self.optparse-applicative_0_13_0_0; + criterion = super.criterion.override { inherit (super) optparse-applicative; }; }); + # Test suite fails a QuickCheck property. + optparse-applicative_0_13_0_0 = dontCheck super.optparse-applicative_0_13_0_0; + # GLUT uses `dlopen` to link to freeglut, so we need to set the RUNPATH correctly for # it to find `libglut.so` from the nix store. We do this by patching GLUT.cabal to pkg-config # depend on freeglut, which provides GHC to necessary information to generate a correct RPATH. @@ -981,9 +1008,6 @@ self: super: { ''; }); - # https://bitbucket.org/ssaasen/spy/pull-requests/3/fsnotify-dropped-system-filepath - spy = appendPatch super.spy ./patches/spy.patch; - idris = overrideCabal super.idris (drv: { # "idris" binary cannot find Idris library otherwise while building. After # installing it's completely fine though. This seems like a bug in Idris @@ -992,11 +1016,20 @@ self: super: { preBuild = "export LD_LIBRARY_PATH=$PWD/dist/build:$LD_LIBRARY_PATH"; # https://github.com/idris-lang/Idris-dev/issues/2499 librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.gmp]; + # test suite cannot find its own "idris" binary + doCheck = false; }); - # https://github.com/MarcWeber/hasktags/issues/32 - hasktags = overrideCabal super.hasktags (drv: { - postInstall = "rm $out/bin/test"; - }); + # https://github.com/pontarius/pontarius-xmpp/issues/105 + pontarius-xmpp = dontCheck super.pontarius-xmpp; + + # https://github.com/fpco/store/issues/77 + store = dontCheck super.store; + + # https://github.com/bmillwood/applicative-quoters/issues/6 + applicative-quoters = doJailbreak super.applicative-quoters; + + # https://github.com/vshabanov/HsOpenSSL/issues/11 + HsOpenSSL = doJailbreak super.HsOpenSSL; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 3ffce7a52ec..c06e0f7d11b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -123,7 +123,6 @@ self: super: { prePatch = "sed -i 's|4\.8|4.9|' diagrams-core.cabal"; }); - timezone-series = doJailbreak super.timezone-series; timezone-olson = doJailbreak super.timezone-olson; xmonad-extras = overrideCabal super.xmonad-extras (drv: { postPatch = '' @@ -169,6 +168,7 @@ self: super: { # haddock-api >= 2.17 is GHC 8.0 only haddock-api = self.haddock-api_2_16_1; + haddock-library = self.haddock-library_1_2_1; # lens-family-th >= 0.5.0.0 is GHC 8.0 only lens-family-th = self.lens-family-th_0_4_1_0; @@ -180,9 +180,6 @@ self: super: { vector-algorithms = addBuildDepends (dontCheck super.vector-algorithms) [ self.mtl self.mwc-random ]; - # Trigger rebuild to mitigate broken packaes on Hydra. - amazonka-core = triggerRebuild super.amazonka-core 1; - # https://github.com/thoughtpolice/hs-ed25519/issues/13 ed25519 = dontCheck super.ed25519; @@ -191,6 +188,7 @@ self: super: { hackage-security = dontHaddock (dontCheck super.hackage-security); # GHC versions prior to 8.x require additional build inputs. + attoparsec = addBuildDepends super.attoparsec (with self; [semigroups fail]); Glob = addBuildDepends super.Glob (with self; [semigroups]); Glob_0_7_10 = addBuildDepends super.Glob_0_7_10 (with self; [semigroups]); aeson = disableCabalFlag (addBuildDepend super.aeson self.semigroups) "old-locale"; @@ -213,6 +211,6 @@ self: super: { # Moved out from common as no longer the case for GHC8 ghc-mod = super.ghc-mod.override { cabal-helper = self.cabal-helper_0_6_3_1; }; - generic-deriving = self.generic-deriving_1_10_5; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix index b09680574b0..5c7348678b7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix @@ -54,12 +54,6 @@ self: super: { broken = true; # needs template-haskell >=2.9 && <2.11 }) {}; - # https://github.com/ygale/timezone-series/issues/2 - timezone-series = appendPatch super.timezone-series (pkgs.fetchpatch { - url = "https://github.com/ryantrinkle/timezone-series/commit/f8dece8c016db6476e2bb0d4f972769a76f6ff40.patch"; - sha256 = "01wxhknsnn7lyl9v8viz7m5zhmyi3bqpbva7d3dx1dxn0nmkfh6a"; - }); - # https://github.com/bmillwood/applicative-quoters/issues/6 applicative-quoters = appendPatch super.applicative-quoters (pkgs.fetchpatch { url = "https://patch-diff.githubusercontent.com/raw/bmillwood/applicative-quoters/pull/7.patch"; diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix index 1feaa2a977b..5c7e42a59a7 100644 --- a/pkgs/development/haskell-modules/configuration-ghcjs.nix +++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix @@ -122,4 +122,11 @@ self: super: ] drv.libraryHaskellDepends; }); + http2 = addBuildDepends super.http2 [ self.aeson self.aeson-pretty self.hex self.unordered-containers self.vector self.word8 ]; + # ghcjsBoot uses async 2.0.1.6, protolude wants 2.1.* + protolude = doJailbreak super.protolude; + semigroups = addBuildDepends super.semigroups [ self.hashable self.unordered-containers self.text self.tagged ]; + # triggers an internal pattern match failure in haddock + # https://github.com/haskell/haddock/issues/553 + wai = dontHaddock super.wai; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index fbbc8d47d24..4daacce6376 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -32,11 +32,1974 @@ core-packages: - xhtml-3000.2.1 default-package-overrides: - # Add overrides in this section only for packages that are *not* part of - # Stackage to make sure we're conforming to their preferred version list. + # LTS Haskell 7.3 + - abstract-deque ==0.3 + - abstract-par ==0.3.3 + - AC-Vector ==2.3.2 + - accelerate ==0.15.1.0 + - accuerr ==0.2.0.2 + - ace ==0.6 + - acid-state ==0.14.2 + - action-permutations ==0.0.0.1 + - active ==0.2.0.10 + - ad ==4.3.2.1 + - adjunctions ==4.3 + - adler32 ==0.1.1.0 + - aeson ==0.11.2.1 + - aeson-better-errors ==0.9.0.1 + - aeson-casing ==0.1.0.5 + - aeson-compat ==0.3.6 + - aeson-generic-compat ==0.0.1.0 + - aeson-injector ==1.0.6.0 + - aeson-pretty ==0.8.2 + - aeson-qq ==0.8.1 + - aeson-utils ==0.3.0.2 + - Agda ==2.5.1.1 + - airship ==0.6.0 + - alarmclock ==0.4.0.2 + - alex ==3.1.7 + - amazonka ==1.4.3 + - amazonka-apigateway ==1.4.3 + - amazonka-application-autoscaling ==1.4.3 + - amazonka-autoscaling ==1.4.3 + - amazonka-certificatemanager ==1.4.3 + - amazonka-cloudformation ==1.4.3 + - amazonka-cloudfront ==1.4.3 + - amazonka-cloudhsm ==1.4.3 + - amazonka-cloudsearch ==1.4.3 + - amazonka-cloudsearch-domains ==1.4.3 + - amazonka-cloudtrail ==1.4.3 + - amazonka-cloudwatch ==1.4.3 + - amazonka-cloudwatch-events ==1.4.3 + - amazonka-cloudwatch-logs ==1.4.3 + - amazonka-codecommit ==1.4.3 + - amazonka-codedeploy ==1.4.3 + - amazonka-codepipeline ==1.4.3 + - amazonka-cognito-identity ==1.4.3 + - amazonka-cognito-idp ==1.4.3 + - amazonka-cognito-sync ==1.4.3 + - amazonka-config ==1.4.3 + - amazonka-core ==1.4.3 + - amazonka-datapipeline ==1.4.3 + - amazonka-devicefarm ==1.4.3 + - amazonka-directconnect ==1.4.3 + - amazonka-discovery ==1.4.3 + - amazonka-dms ==1.4.3 + - amazonka-ds ==1.4.3 + - amazonka-dynamodb ==1.4.3 + - amazonka-dynamodb-streams ==1.4.3 + - amazonka-ec2 ==1.4.3 + - amazonka-ecr ==1.4.3 + - amazonka-ecs ==1.4.3 + - amazonka-efs ==1.4.3 + - amazonka-elasticache ==1.4.3 + - amazonka-elasticbeanstalk ==1.4.3 + - amazonka-elasticsearch ==1.4.3 + - amazonka-elastictranscoder ==1.4.3 + - amazonka-elb ==1.4.3 + - amazonka-emr ==1.4.3 + - amazonka-gamelift ==1.4.3 + - amazonka-glacier ==1.4.3 + - amazonka-iam ==1.4.3 + - amazonka-importexport ==1.4.3 + - amazonka-inspector ==1.4.3 + - amazonka-iot ==1.4.3 + - amazonka-iot-dataplane ==1.4.3 + - amazonka-kinesis ==1.4.3 + - amazonka-kinesis-firehose ==1.4.3 + - amazonka-kms ==1.4.3 + - amazonka-lambda ==1.4.3 + - amazonka-marketplace-analytics ==1.4.3 + - amazonka-marketplace-metering ==1.4.3 + - amazonka-ml ==1.4.3 + - amazonka-opsworks ==1.4.3 + - amazonka-rds ==1.4.3 + - amazonka-redshift ==1.4.3 + - amazonka-route53 ==1.4.3 + - amazonka-route53-domains ==1.4.3 + - amazonka-s3 ==1.4.3 + - amazonka-sdb ==1.4.3 + - amazonka-ses ==1.4.3 + - amazonka-sns ==1.4.3 + - amazonka-sqs ==1.4.3 + - amazonka-ssm ==1.4.3 + - amazonka-storagegateway ==1.4.3 + - amazonka-sts ==1.4.3 + - amazonka-support ==1.4.3 + - amazonka-swf ==1.4.3 + - amazonka-test ==1.4.3 + - amazonka-waf ==1.4.3 + - amazonka-workspaces ==1.4.3 + - amqp ==0.14.0 + - angel ==0.6.2 + - annotated-wl-pprint ==0.7.0 + - anonymous-sums ==0.4.0.0 + - ansi-terminal ==0.6.2.3 + - ansi-wl-pprint ==0.6.7.3 + - ansigraph ==0.2.0.0 + - api-field-json-th ==0.1.0.1 + - app-settings ==0.2.0.8 + - appar ==0.1.4 + - apply-refact ==0.3.0.0 + - arbtt ==0.9.0.10 + - arithmoi ==0.4.3.0 + - array-memoize ==0.6.0 + - arrow-list ==0.7 + - ascii-progress ==0.3.3.0 + - asciidiagram ==1.3.1.2 + - asn1-encoding ==0.9.4 + - asn1-parse ==0.9.4 + - asn1-types ==0.3.2 + - async ==2.1.0 + - async-dejafu ==0.1.3.0 + - atndapi ==0.1.1.0 + - atom-conduit ==0.3.1.2 + - atomic-primops ==0.8.0.4 + - atomic-write ==0.2.0.5 + - attoparsec ==0.13.1.0 + - attoparsec-binary ==0.2 + - attoparsec-expr ==0.1.1.2 + - authenticate ==1.3.3.2 + - authenticate-oauth ==1.5.1.2 + - auto ==0.4.3.0 + - auto-update ==0.1.4 + - autoexporter ==0.2.2 + - aws ==0.14.1 + - b9 ==0.5.21 + - bake ==0.4 + - bank-holidays-england ==0.1.0.5 + - base-compat ==0.9.1 + - base-noprelude ==4.9.0.0 + - base-orphans ==0.5.4 + - base-prelude ==1.0.1.1 + - base-unicode-symbols ==0.2.2.4 + - base16-bytestring ==0.1.1.6 + - base32string ==0.9.1 + - base58string ==0.10.0 + - base64-bytestring ==1.0.0.1 + - base64-string ==0.2 + - basic-prelude ==0.6.1 + - bcrypt ==0.0.9 + - benchpress ==0.2.2.8 + - bencode ==0.6.0.0 + - bento ==0.1.0 + - bifunctors ==5.4.1 + - bimap ==0.3.2 + - bimap-server ==0.1.0.1 + - binary-bits ==0.5 + - binary-conduit ==1.2.4.1 + - binary-list ==1.1.1.2 + - binary-orphans ==0.1.5.1 + - binary-parser ==0.5.2 + - binary-search ==1.0.0.3 + - binary-tagged ==0.1.4.0 + - binary-typed ==1.0 + - bindings-DSL ==1.0.23 + - bindings-GLFW ==3.1.2.2 + - bindings-libzip ==1.0.1 + - bioace ==0.0.1 + - bioalign ==0.0.5 + - biocore ==0.3.1 + - biofasta ==0.0.3 + - biofastq ==0.1 + - biopsl ==0.4 + - bitcoin-api ==0.12.1 + - bitcoin-api-extra ==0.9.1 + - bitcoin-block ==0.13.1 + - bitcoin-payment-channel ==0.3.0.1 + - bitcoin-script ==0.11.1 + - bitcoin-tx ==0.13.1 + - bitcoin-types ==0.9.2 + - bits ==0.5 + - bitx-bitcoin ==0.10.0.0 + - blake2 ==0.2.0 + - blank-canvas ==0.6 + - BlastHTTP ==1.2.0 + - blastxml ==0.3.2 + - blaze-bootstrap ==0.1.0.1 + - blaze-builder ==0.4.0.2 + - blaze-html ==0.8.1.2 + - blaze-markup ==0.7.1.0 + - blaze-svg ==0.3.6 + - blaze-textual ==0.2.1.0 + - bloodhound ==0.11.0.0 + - blosum ==0.1.1.2 + - bmp ==1.2.6.3 + - Boolean ==0.2.3 + - boolsimplifier ==0.1.8 + - boomerang ==1.4.5.2 + - both ==0.1.1.0 + - BoundedChan ==1.0.3.0 + - boundingboxes ==0.2.3 + - bower-json ==0.8.0 + - boxes ==0.1.4 + - broadcast-chan ==0.1.1 + - bson ==0.3.2.3 + - bson-lens ==0.1.1 + - btrfs ==0.1.2.0 + - bumper ==0.6.0.3 + - bustle ==0.5.4 + - byteable ==0.1.1 + - bytedump ==1.0 + - byteorder ==1.0.4 + - bytes ==0.15.2 + - byteset ==0.1.1.0 + - bytestring-builder ==0.10.8.1.0 + - bytestring-conversion ==0.3.1 + - bytestring-handle ==0.1.0.4 + - bytestring-lexing ==0.5.0.2 + - bytestring-progress ==1.0.7 + - bytestring-tree-builder ==0.2.7.1 + - bytestring-trie ==0.2.4.1 + - bzlib ==0.5.0.5 + - bzlib-conduit ==0.2.1.4 + - c2hs ==0.28.1 + - Cabal ==1.24.0.0 + - cabal-dependency-licenses ==0.1.2.0 + - cabal-file-th ==0.2.3 + - cabal-helper ==0.7.2.0 + - cabal-install ==1.24.0.0 + - cabal-rpm ==0.10.0 + - cabal-sort ==0.0.5.3 + - cabal-src ==0.3.0.2 + - cache ==0.1.0.0 + - cacophony ==0.8.0 + - cairo ==0.13.3.0 + - call-stack ==0.1.0 + - camfort ==0.900 + - carray ==0.1.6.5 + - cartel ==0.18.0.2 + - case-insensitive ==1.2.0.7 + - cased ==0.1.0.0 + - cases ==0.1.3.1 + - cassava ==0.4.5.0 + - cassava-conduit ==0.3.2 + - cassava-megaparsec ==0.1.0 + - cassette ==0.1.0 + - cayley-client ==0.2.0.0 + - cereal ==0.5.3.0 + - cereal-conduit ==0.7.3 + - cereal-vector ==0.2.0.1 + - cgi ==3001.3.0.1 + - ChannelT ==0.0.0.2 + - charset ==0.3.7.1 + - charsetdetect-ae ==1.1.0.1 + - Chart ==1.8 + - Chart-cairo ==1.8 + - Chart-diagrams ==1.8 + - ChasingBottoms ==1.3.1.2 + - cheapskate ==0.1.0.5 + - cheapskate-highlight ==0.1.0.0 + - cheapskate-lucid ==0.1.0.0 + - check-email ==1.0 + - checkers ==0.4.6 + - chell ==0.4.0.1 + - chell-quickcheck ==0.2.5 + - chunked-data ==0.3.0 + - cipher-aes ==0.2.11 + - cipher-aes128 ==0.7.0.3 + - cipher-blowfish ==0.0.3 + - cipher-camellia ==0.0.2 + - cipher-des ==0.0.6 + - cipher-rc4 ==0.1.4 + - circle-packing ==0.1.0.5 + - clash-lib ==0.6.21 + - clash-prelude ==0.10.14 + - clash-systemverilog ==0.6.9 + - clash-verilog ==0.6.9 + - clash-vhdl ==0.6.16 + - classy-prelude ==1.0.0.2 + - classy-prelude-conduit ==1.0.0 + - classy-prelude-yesod ==1.0.0 + - clay ==0.11 + - clckwrks ==0.23.19.2 + - clckwrks-cli ==0.2.16 + - clckwrks-plugin-media ==0.6.16 + - clckwrks-plugin-page ==0.4.3.5 + - clckwrks-theme-bootstrap ==0.4.2 + - cli ==0.1.2 + - clientsession ==0.9.1.2 + - Clipboard ==2.3.0.1 + - clock ==0.7.2 + - clumpiness ==0.17.0.0 + - ClustalParser ==1.1.4 + - clustering ==0.2.1 + - cmark ==0.5.3.1 + - cmark-highlight ==0.2.0.0 + - cmark-lucid ==0.1.0.0 + - cmdargs ==0.10.14 + - code-builder ==0.1.3 + - codo-notation ==0.5.2 + - colour ==2.3.3 + - commutative ==0.0.1.4 + - comonad ==5 + - comonad-transformers ==4.0 + - comonads-fd ==4.0 + - compactmap ==0.1.4.1 + - compdata ==0.10.1 + - composition ==1.0.2.1 + - composition-extra ==2.0.0 + - concatenative ==1.0.1 + - concurrency ==1.0.0.0 + - concurrent-extra ==0.7.0.10 + - concurrent-output ==1.7.7 + - concurrent-supply ==0.1.8 + - conduit ==1.2.8 + - conduit-combinators ==1.0.8.1 + - conduit-extra ==1.1.13.3 + - conduit-iconv ==0.1.1.1 + - conduit-parse ==0.1.2.0 + - ConfigFile ==1.1.4 + - configuration-tools ==0.2.15 + - configurator ==0.3.0.0 + - configurator-export ==0.1.0.1 + - connection ==0.2.6 + - constraints ==0.8 + - consul-haskell ==0.3 + - containers-unicode-symbols ==0.3.1.1 + - continued-fractions ==0.9.1.1 + - contravariant ==1.4 + - contravariant-extras ==0.3.3.1 + - control-bool ==0.2.1 + - control-monad-free ==0.6.1 + - control-monad-loop ==0.1 + - control-monad-omega ==0.3.1 + - converge ==0.1.0.1 + - convertible ==1.1.1.0 + - cookie ==0.4.2.1 + - countable ==1.0 + - courier ==0.1.1.4 + - cpphs ==1.20.2 + - cprng-aes ==0.6.1 + - cpu ==0.1.2 + - crackNum ==1.5 + - criterion ==1.1.1.0 + - cron ==0.4.1.2 + - crypto-api ==0.13.2 + - crypto-api-tests ==0.3 + - crypto-cipher-tests ==0.0.11 + - crypto-cipher-types ==0.0.9 + - crypto-numbers ==0.2.7 + - crypto-pubkey ==0.2.8 + - crypto-pubkey-types ==0.4.3 + - crypto-random ==0.0.9 + - crypto-random-api ==0.2.0 + - cryptocipher ==0.6.2 + - cryptohash ==0.11.9 + - cryptohash-conduit ==0.1.1 + - cryptohash-cryptoapi ==0.1.4 + - cryptohash-sha256 ==0.11.100.1 + - cryptol ==2.4.0 + - cryptonite ==0.19 + - cryptonite-conduit ==0.1 + - css-syntax ==0.0.5 + - css-text ==0.1.2.2 + - csv ==0.1.2 + - ctrie ==0.1.1.0 + - cubicspline ==0.1.2 + - curl ==1.3.8 + - darcs ==2.12.4 + - data-accessor ==0.2.2.7 + - data-accessor-mtl ==0.2.0.4 + - data-binary-ieee754 ==0.4.4 + - data-check ==0.1.0 + - data-default ==0.7.1.1 + - data-default-class ==0.1.2.0 + - data-default-instances-containers ==0.0.1 + - data-default-instances-dlist ==0.0.1 + - data-default-instances-old-locale ==0.0.1 + - data-hash ==0.2.0.1 + - data-inttrie ==0.1.2 + - data-lens-light ==0.1.2.2 + - data-memocombinators ==0.5.1 + - data-or ==1.0.0.5 + - data-ordlist ==0.4.7.0 + - data-reify ==0.6.1 + - dataurl ==0.1.0.0 + - DAV ==1.3.1 + - dawg-ord ==0.5.0.2 + - dbus ==0.10.12 + - debian-build ==0.10.1.0 + - Decimal ==0.4.2 + - declarative ==0.2.2 + - deepseq-generics ==0.2.0.0 + - dejafu ==0.4.0.0 + - dependent-map ==0.2.3.0 + - dependent-sum ==0.3.2.2 + - dependent-sum-template ==0.0.0.5 + - derive ==2.5.26 + - deriving-compat ==0.3.3 + - descriptive ==0.9.4 + - diagrams ==1.3.0.1 + - diagrams-cairo ==1.3.1.1 + - diagrams-canvas ==1.3.0.6 + - diagrams-contrib ==1.3.0.12 + - diagrams-core ==1.3.0.8 + - diagrams-gtk ==1.3.0.2 + - diagrams-html5 ==1.3.0.7 + - diagrams-lib ==1.3.1.4 + - diagrams-postscript ==1.3.0.7 + - diagrams-rasterific ==1.3.1.8 + - diagrams-solve ==0.1.0.1 + - diagrams-svg ==1.4.0.3 + - dice ==0.1 + - Diff ==0.3.4 + - diff3 ==0.2.0.3 + - digest ==0.0.1.2 + - digits ==0.3.1 + - dimensional ==1.0.1.3 + - direct-sqlite ==2.3.17 + - directory-tree ==0.12.1 + - discount ==0.1.1 + - disk-free-space ==0.1.0.1 + - distributed-closure ==0.3.3.0 + - distributed-static ==0.3.5.0 + - distribution-nixpkgs ==1.0.0.1 + - distributive ==0.5.0.2 + - diversity ==0.8.0.1 + - djinn-ghc ==0.0.2.3 + - djinn-lib ==0.0.1.2 + - dlist ==0.8.0.2 + - dlist-instances ==0.1.1.1 + - dns ==2.0.6 + - do-list ==1.0.1 + - dockerfile ==0.1.0.1 + - docopt ==0.7.0.4 + - doctest ==0.11.0 + - doctest-discover ==0.1.0.7 + - doctest-prop ==0.2.0.1 + - docvim ==0.3.2.1 + - dotenv ==0.3.0.3 + - dotnet-timespan ==0.0.1.0 + - double-conversion ==2.0.1.0 + - download ==0.3.2.4 + - dpor ==0.2.0.0 + - drawille ==0.1.0.6 + - DRBG ==0.5.5 + - drifter ==0.2.2 + - drifter-postgresql ==0.0.2 + - dual-tree ==0.2.0.9 + - dynamic-state ==0.2.2.0 + - dyre ==0.8.12 + - Earley ==0.11.0.1 + - easy-file ==0.2.1 + - Ebnf2ps ==1.0.15 + - ed25519 ==0.0.5.0 + - ede ==0.2.8.5 + - EdisonAPI ==1.3.1 + - EdisonCore ==1.3.1.1 + - edit-distance ==0.2.2.1 + - editor-open ==0.6.0.0 + - effect-handlers ==0.1.0.8 + - either ==4.4.1.1 + - either-unwrap ==1.1 + - ekg ==0.4.0.11 + - ekg-core ==0.1.1.1 + - ekg-json ==0.1.0.3 + - elerea ==2.9.0 + - elm-bridge ==0.3.0.2 + - elm-core-sources ==1.0.0 + - email-validate ==2.2.0 + - emailaddress ==0.1.6.0 + - enclosed-exceptions ==1.0.2 + - encoding-io ==0.0.1 + - entropy ==0.3.7 + - enummapset-th ==0.6.1.1 + - envelope ==0.1.0.0 + - eq ==4.0.4 + - equivalence ==0.3.1 + - erf ==2.0.0.0 + - errors ==2.1.2 + - ersatz ==0.3.1 + - etcd ==1.0.5 + - ether ==0.4.0.2 + - euphoria ==0.8.0.0 + - event ==0.1.4 + - eventstore ==0.13.1.2 + - exact-combinatorics ==0.2.0.8 + - exact-pi ==0.4.1.2 + - exception-mtl ==0.4.0.1 + - exception-transformers ==0.4.0.4 + - exceptional ==0.3.0.0 + - exceptions ==0.8.3 + - executable-hash ==0.2.0.2 + - executable-path ==0.0.3 + - exp-pairs ==0.1.5.1 + - expiring-cache-map ==0.0.6.1 + - explicit-exception ==0.1.8 + - extensible ==0.3.7 + - extensible-effects ==1.11.0.4 + - extensible-exceptions ==0.1.1.4 + - extra ==1.4.10 + - extract-dependencies ==0.2.0.1 + - fail ==4.9.0.0 + - farmhash ==0.1.0.5 + - fast-builder ==0.0.0.6 + - fast-digits ==0.2.1.0 + - fast-logger ==2.4.7 + - fasta ==0.10.4.0 + - fay ==0.23.1.12 + - fay-base ==0.20.0.1 + - fay-builder ==0.2.0.5 + - fay-dom ==0.5.0.1 + - fay-jquery ==0.6.1.0 + - fay-text ==0.3.2.2 + - fay-uri ==0.2.0.0 + - fb ==1.0.13 + - fclabels ==2.0.3.1 + - feature-flags ==0.1.0.1 + - feed ==0.3.11.1 + - FenwickTree ==0.1.2.1 + - fft ==0.1.8.4 + - fgl ==5.5.3.0 + - fgl-arbitrary ==0.2.0.2 + - file-embed ==0.0.10 + - file-modules ==0.1.2.4 + - filecache ==0.2.9 + - filelock ==0.1.0.1 + - filemanip ==0.3.6.3 + - find-clumpiness ==0.2.0.1 + - FindBin ==0.0.5 + - fingertree ==0.1.1.0 + - fingertree-psqueue ==0.3 + - fixed ==0.2.1.1 + - fixed-vector ==0.8.1.0 + - fixed-vector-hetero ==0.3.1.1 + - flat-mcmc ==1.0.1 + - flexible-defaults ==0.0.1.2 + - flock ==0.3.1.8 + - flow ==1.0.7 + - fmlist ==0.9 + - fn ==0.3.0.1 + - focus ==0.1.5 + - fold-debounce ==0.2.0.3 + - fold-debounce-conduit ==0.1.0.4 + - foldl ==1.2.1 + - FontyFruity ==0.5.3.2 + - force-layout ==0.4.0.5 + - forecast-io ==0.2.0.0 + - foreign-store ==0.2 + - formatting ==6.2.2 + - fortran-src ==0.1.0.4 + - Frames ==0.1.6 + - free ==4.12.4 + - free-vl ==0.1.4 + - freenect ==1.2.1 + - freer ==0.2.3.0 + - friendly-time ==0.4 + - frisby ==0.2 + - frontmatter ==0.1.0.2 + - fsnotify ==0.2.1 + - fsnotify-conduit ==0.1.0.0 + - funcmp ==1.8 + - fuzzcheck ==0.1.1 + - gamma ==0.9.0.2 + - gd ==3000.7.3 + - Genbank ==1.0.3 + - generic-aeson ==0.2.0.8 + - generic-deriving ==1.11.1 + - generic-xmlpickler ==0.1.0.5 + - GenericPretty ==1.2.1 + - generics-eot ==0.2.1.1 + - generics-sop ==0.2.2.0 + - generics-sop-lens ==0.1.2.0 + - geniplate-mirror ==0.7.4 + - getopt-generics ==0.13 + - ghc-events ==0.4.4.0 + - ghc-exactprint ==0.5.2.1 + - ghc-heap-view ==0.5.7 + - ghc-mod ==5.6.0.0 + - ghc-paths ==0.1.0.9 + - ghc-syb-utils ==0.2.3 + - ghc-tcplugins-extra ==0.2 + - ghc-typelits-extra ==0.2.1 + - ghc-typelits-knownnat ==0.2.2 + - ghc-typelits-natnormalise ==0.5.1 + - ghcid ==0.6.5 + - ghcjs-codemirror ==0.0.0.1 + - ghcjs-hplay ==0.3.4.2 + - ghcjs-perch ==0.3.3 + - gi-atk ==2.0.3 + - gi-cairo ==1.0.3 + - gi-gdk ==3.0.3 + - gi-gdkpixbuf ==2.0.3 + - gi-gio ==2.0.3 + - gi-glib ==2.0.3 + - gi-gobject ==2.0.3 + - gi-gtk ==3.0.3 + - gi-javascriptcore ==3.0.3 + - gi-pango ==1.0.3 + - gi-soup ==2.4.3 + - gi-webkit ==3.0.3 + - gio ==0.13.3.0 + - gipeda ==0.3.2.2 + - giphy-api ==0.4.0.0 + - git-fmt ==0.4.1.0 + - github-types ==0.2.1 + - github-webhook-handler ==0.0.8 + - gitlib ==3.1.1 + - gitlib-libgit2 ==3.1.1 + - gitlib-test ==3.1.0.3 + - gitrev ==1.2.0 + - gitson ==0.5.2 + - gl ==0.7.8.1 + - glabrous ==0.1.2.0 + - GLFW-b ==1.4.8.1 + - glib ==0.13.4.0 + - Glob ==0.7.12 + - gloss ==1.10.2.3 + - gloss-rendering ==1.10.3.3 + - GLURaw ==2.0.0.2 + - GLUT ==2.7.0.10 + - gogol ==0.1.0 + - gogol-adexchange-buyer ==0.1.0 + - gogol-adexchange-seller ==0.1.0 + - gogol-admin-datatransfer ==0.1.0 + - gogol-admin-directory ==0.1.0 + - gogol-admin-emailmigration ==0.1.0 + - gogol-admin-reports ==0.1.0 + - gogol-adsense ==0.1.0 + - gogol-adsense-host ==0.1.0 + - gogol-affiliates ==0.1.0 + - gogol-analytics ==0.1.0 + - gogol-android-enterprise ==0.1.0 + - gogol-android-publisher ==0.1.0 + - gogol-appengine ==0.1.0 + - gogol-apps-activity ==0.1.0 + - gogol-apps-calendar ==0.1.0 + - gogol-apps-licensing ==0.1.0 + - gogol-apps-reseller ==0.1.0 + - gogol-apps-tasks ==0.1.0 + - gogol-appstate ==0.1.0 + - gogol-autoscaler ==0.1.0 + - gogol-bigquery ==0.1.0 + - gogol-billing ==0.1.0 + - gogol-blogger ==0.1.0 + - gogol-books ==0.1.0 + - gogol-civicinfo ==0.1.0 + - gogol-classroom ==0.1.0 + - gogol-cloudmonitoring ==0.1.0 + - gogol-cloudtrace ==0.1.0 + - gogol-compute ==0.1.0 + - gogol-container ==0.1.0 + - gogol-core ==0.1.0 + - gogol-customsearch ==0.1.0 + - gogol-dataflow ==0.1.0 + - gogol-dataproc ==0.1.0 + - gogol-datastore ==0.1.0 + - gogol-debugger ==0.1.0 + - gogol-deploymentmanager ==0.1.0 + - gogol-dfareporting ==0.1.0 + - gogol-discovery ==0.1.0 + - gogol-dns ==0.1.0 + - gogol-doubleclick-bids ==0.1.0 + - gogol-doubleclick-search ==0.1.0 + - gogol-drive ==0.1.0 + - gogol-firebase-rules ==0.1.0 + - gogol-fitness ==0.1.0 + - gogol-fonts ==0.1.0 + - gogol-freebasesearch ==0.1.0 + - gogol-fusiontables ==0.1.0 + - gogol-games ==0.1.0 + - gogol-games-configuration ==0.1.0 + - gogol-games-management ==0.1.0 + - gogol-genomics ==0.1.0 + - gogol-gmail ==0.1.0 + - gogol-groups-migration ==0.1.0 + - gogol-groups-settings ==0.1.0 + - gogol-identity-toolkit ==0.1.0 + - gogol-kgsearch ==0.1.0 + - gogol-latencytest ==0.1.0 + - gogol-logging ==0.1.0 + - gogol-maps-coordinate ==0.1.0 + - gogol-maps-engine ==0.1.0 + - gogol-mirror ==0.1.0 + - gogol-monitoring ==0.1.0 + - gogol-oauth2 ==0.1.0 + - gogol-pagespeed ==0.1.0 + - gogol-partners ==0.1.0 + - gogol-people ==0.1.0 + - gogol-play-moviespartner ==0.1.0 + - gogol-plus ==0.1.0 + - gogol-plus-domains ==0.1.0 + - gogol-prediction ==0.1.0 + - gogol-proximitybeacon ==0.1.0 + - gogol-pubsub ==0.1.0 + - gogol-qpxexpress ==0.1.0 + - gogol-replicapool ==0.1.0 + - gogol-replicapool-updater ==0.1.0 + - gogol-resourcemanager ==0.1.0 + - gogol-resourceviews ==0.1.0 + - gogol-script ==0.1.0 + - gogol-sheets ==0.1.0 + - gogol-shopping-content ==0.1.0 + - gogol-siteverification ==0.1.0 + - gogol-spectrum ==0.1.0 + - gogol-sqladmin ==0.1.0 + - gogol-storage ==0.1.0 + - gogol-storage-transfer ==0.1.0 + - gogol-tagmanager ==0.1.0 + - gogol-taskqueue ==0.1.0 + - gogol-translate ==0.1.0 + - gogol-urlshortener ==0.1.0 + - gogol-useraccounts ==0.1.0 + - gogol-vision ==0.1.0 + - gogol-webmaster-tools ==0.1.0 + - gogol-youtube ==0.1.0 + - gogol-youtube-analytics ==0.1.0 + - gogol-youtube-reporting ==0.1.0 + - google-cloud ==0.0.4 + - google-oauth2-jwt ==0.1.2.0 + - gpolyline ==0.1.0.1 + - graph-core ==0.3.0.0 + - graph-wrapper ==0.2.5.1 + - graphs ==0.7 + - GraphSCC ==1.0.4 + - graphviz ==2999.18.1.2 + - gravatar ==0.8.0 + - graylog ==0.1.0.1 + - groom ==0.1.2 + - grouped-list ==0.2.1.2 + - groupoids ==4.0 + - groups ==0.4.0.0 + - gtk ==0.14.5 + - gtk2hs-buildtools ==0.13.2.1 + - gtk3 ==0.14.5 + - gtksourceview3 ==0.13.3.0 + - H ==0.9.0.1 + - hackage-db ==1.22 + - hackage-mirror ==0.1.1.1 + - hackage-security ==0.5.2.2 + - hackage-whatsnew ==0.1.0.1 + - hackmanager ==0.1.0.0 + - haddock-api ==2.17.3 + - haddock-library ==1.4.2 + - hailgun ==0.4.1.1 + - half ==0.2.2.3 + - hamlet ==1.2.0 + - HandsomeSoup ==0.4.2 + - handwriting ==0.1.0.3 + - hapistrano ==0.2.1.2 + - happstack-authenticate ==2.3.4.5 + - happstack-clientsession ==7.3.1 + - happstack-hsp ==7.3.7.1 + - happstack-jmacro ==7.0.11 + - happstack-server ==7.4.6.2 + - happstack-server-tls ==7.1.6.2 + - happy ==1.19.5 + - HaRe ==0.8.3.0 + - harp ==0.4.2 + - hashable ==1.2.4.0 + - hashable-extras ==0.2.3 + - hashable-time ==0.2 + - hashmap ==1.3.1.1 + - hashtables ==1.2.1.0 + - haskeline ==0.7.2.3 + - haskell-gi ==0.18 + - haskell-gi-base ==0.18.4 + - haskell-lexer ==1.0.1 + - haskell-names ==0.7.0 + - haskell-neo4j-client ==0.3.2.4 + - haskell-packages ==0.4 + - haskell-spacegoo ==0.2.0.1 + - haskell-src ==1.0.2.0 + - haskell-src-exts ==1.17.1 + - haskell-src-meta ==0.6.0.14 + - HaskellNet ==0.5.1 + - HaskellNet-SSL ==0.3.3.0 + - haskintex ==0.6.0.1 + - haskoin-core ==0.4.0 + - hasql ==0.19.15.2 + - hastache ==0.6.1 + - hasty-hamiltonian ==1.1.3 + - HaTeX ==3.17.0.2 + - hatex-guide ==1.3.1.5 + - hbayes ==0.5.2 + - hbeanstalk ==0.2.4 + - Hclip ==3.0.0.4 + - HCodecs ==0.5 + - hdaemonize ==0.5.2 + - HDBC ==2.4.0.1 + - HDBC-session ==0.1.1.0 + - hdevtools ==0.1.4.1 + - heap ==1.0.3 + - heaps ==0.3.3 + - hebrew-time ==0.1.1 + - hedis ==0.9.4 + - here ==1.2.8 + - heredoc ==0.2.0.0 + - hex ==0.1.2 + - hexstring ==0.11.1 + - hflags ==0.4.2 + - hformat ==0.1.0.1 + - hfsevents ==0.1.6 + - hgettext ==0.1.30 + - hid ==0.2.2 + - hidapi ==0.1.4 + - hierarchical-clustering ==0.4.6 + - highlighting-kate ==0.6.3 + - hindent ==4.6.4 + - hinotify ==0.3.8.1 + - hint ==0.6.0 + - histogram-fill ==0.8.4.1 + - hit ==0.6.3 + - hjsmin ==0.2.0.2 + - hjsonpointer ==1.0.0.1 + - hjsonschema ==1.1.0.1 + - hledger ==0.27.1 + - hledger-interest ==1.4.4 + - hledger-lib ==0.27.1 + - hlibgit2 ==0.18.0.15 + - hlibsass ==0.1.5.0 + - hlint ==1.9.35 + - hmatrix ==0.17.0.2 + - hmatrix-gsl ==0.17.0.0 + - hmatrix-gsl-stats ==0.4.1.3 + - hmatrix-special ==0.4.0.0 + - hmpfr ==0.4.2 + - hmt ==0.15 + - hoauth2 ==0.5.4.0 + - hocilib ==0.1.0 + - holy-project ==0.2.0.1 + - homplexity ==0.4.3.3 + - hoogle ==5.0.1 + - hOpenPGP ==2.5.5 + - hopenpgp-tools ==0.19.4 + - hopenssl ==1.7 + - hosc ==0.15 + - hostname ==1.0 + - hostname-validate ==1.0.0 + - hourglass ==0.2.10 + - hpack ==0.14.1 + - hpack-convert ==0.14.6 + - hpc-coveralls ==1.0.6 + - hPDB ==1.2.0.9 + - hPDB-examples ==1.2.0.7 + - HPDF ==1.4.10 + - hpio ==0.8.0.3 + - hprotoc ==2.4.0 + - hquantlib ==0.0.3.2 + - hreader ==1.0.2 + - hruby ==0.3.4.2 + - hs-bibutils ==5.5 + - hs-GeoIP ==0.3 + - hsass ==0.4.0 + - hsb2hs ==0.3.1 + - hscolour ==1.24.1 + - hsdns ==1.6.1 + - hse-cpp ==0.1 + - hsebaysdk ==0.4.0.0 + - hsemail ==1.7.7 + - HSet ==0.0.0 + - hset ==2.2.0 + - hsexif ==0.6.0.9 + - hsignal ==0.2.7.4 + - hslogger ==1.2.10 + - hslua ==0.4.1 + - hsndfile ==0.8.0 + - hsndfile-vector ==0.5.2 + - HsOpenSSL ==0.11.2.4 + - HsOpenSSL-x509-system ==0.1.0.3 + - hsp ==0.10.0 + - hspec ==2.2.3 + - hspec-attoparsec ==0.1.0.2 + - hspec-contrib ==0.3.0 + - hspec-core ==2.2.3 + - hspec-discover ==2.2.3 + - hspec-expectations ==0.7.2 + - hspec-expectations-pretty-diff ==0.7.2.4 + - hspec-golden-aeson ==0.2.0.3 + - hspec-jenkins ==0.1.1 + - hspec-megaparsec ==0.2.1 + - hspec-meta ==2.2.1 + - hspec-setup ==0.1.1.1 + - hspec-smallcheck ==0.4.1 + - hspec-wai ==0.6.6 + - hspec-wai-json ==0.6.1 + - hspec-webdriver ==1.2.0 + - hstatistics ==0.2.5.3 + - hstatsd ==0.1 + - HStringTemplate ==0.8.5 + - hsx-jmacro ==7.3.8 + - hsx2hs ==0.13.5 + - hsyslog ==4 + - htaglib ==1.0.4 + - HTF ==0.13.1.0 + - html ==1.0.1.2 + - html-conduit ==1.2.1.1 + - htoml ==1.0.0.1 + - HTTP ==4000.3.3 + - http-api-data ==0.2.4 + - http-client ==0.4.31.1 + - http-client-openssl ==0.2.0.4 + - http-client-tls ==0.2.4.1 + - http-common ==0.8.2.0 + - http-conduit ==2.1.11 + - http-date ==0.0.6.1 + - http-link-header ==1.0.2 + - http-media ==0.6.4 + - http-reverse-proxy ==0.4.3.1 + - http-streams ==0.8.4.0 + - http-types ==0.9.1 + - http2 ==1.6.2 + - httpd-shed ==0.4.0.3 + - human-readable-duration ==0.2.0.3 + - HUnit ==1.3.1.2 + - HUnit-approx ==1.0 + - hunit-dejafu ==0.3.0.2 + - hvect ==0.3.1.0 + - hw-bits ==0.1.0.1 + - hw-conduit ==0.0.0.11 + - hw-diagnostics ==0.0.0.4 + - hw-parser ==0.0.0.1 + - hw-prim ==0.1.0.3 + - hw-rankselect ==0.3.0.0 + - hw-succinct ==0.0.0.14 + - hweblib ==0.6.3 + - hworker ==0.1.0.1 + - hworker-ses ==0.1.1.0 + - hxt ==9.3.1.15 + - hxt-charproperties ==9.2.0.1 + - hxt-css ==0.1.0.3 + - hxt-http ==9.1.5.2 + - hxt-pickle-utils ==0.1.0.3 + - hxt-regex-xmlschema ==9.2.0.2 + - hxt-unicode ==9.0.2.4 + - hybrid-vectors ==0.2.1 + - hyphenation ==0.6 + - ical ==0.0.1 + - iconv ==0.4.1.3 + - identicon ==0.1.0 + - idris ==0.12.3 + - ieee754 ==0.7.8 + - IfElse ==0.85 + - ignore ==0.1.1.0 + - ilist ==0.2.0.0 + - imagesize-conduit ==1.1 + - imm ==1.0.1.0 + - immortal ==0.2.2 + - include-file ==0.1.0.3 + - incremental-parser ==0.2.5 + - indentation-core ==0.0 + - indentation-parsec ==0.0 + - indents ==0.3.3 + - inflections ==0.2.0.1 + - ini ==0.3.5 + - inline-c ==0.5.5.9 + - inline-c-cpp ==0.1.0.0 + - inline-r ==0.9.0.0 + - insert-ordered-containers ==0.1.0.1 + - integration ==0.2.1 + - intero ==0.1.18 + - interpolate ==0.1.0 + - interpolatedstring-perl6 ==1.0.0 + - IntervalMap ==0.5.1.1 + - intervals ==0.7.2 + - invariant ==0.4 + - io-choice ==0.0.6 + - io-machine ==0.2.0.0 + - io-manager ==0.1.0.2 + - io-memoize ==1.1.1.0 + - io-region ==0.1.1 + - io-storage ==0.3 + - io-streams ==1.3.5.0 + - io-streams-haproxy ==1.0.0.1 + - ip6addr ==0.5.1.3 + - iproute ==1.7.0 + - IPv6Addr ==0.6.1.0 + - irc ==0.6.1.0 + - irc-client ==0.4.4.0 + - irc-conduit ==0.2.1.0 + - irc-ctcp ==0.1.3.0 + - irc-dcc ==2.0.0 + - islink ==0.1.0.0 + - iso3166-country-codes ==0.20140203.7 + - iso639 ==0.1.0.3 + - iso8601-time ==0.1.4 + - iterable ==3.0 + - ix-shapable ==0.1.0 + - ixset ==1.0.7 + - ixset-typed ==0.3.1 + - jailbreak-cabal ==1.3.1 + - jmacro ==0.6.14 + - jmacro-rpc ==0.3.2 + - jmacro-rpc-happstack ==0.3.2 + - jose ==0.4.0.3 + - jose-jwt ==0.7.3 + - js-flot ==0.8.3 + - js-jquery ==3.1.1 + - json ==0.9.1 + - json-autotype ==1.0.14 + - json-rpc-generic ==0.2.1.2 + - json-schema ==0.7.4.1 + - JuicyPixels ==3.2.8 + - JuicyPixels-extra ==0.1.0 + - JuicyPixels-scale-dct ==0.1.1.2 + - jwt ==0.7.2 + - kan-extensions ==5.0.1 + - kansas-comet ==0.4 + - kawhi ==0.0.1 + - kdt ==0.2.4 + - keter ==1.4.3.2 + - keycode ==0.2.2 + - keys ==3.11 + - kmeans ==0.1.3 + - knob ==0.1.1 + - koofr-client ==1.0.0.3 + - kraken ==0.0.3 + - lackey ==0.4.1 + - language-c ==0.5.0 + - language-c-quote ==0.11.7 + - language-dockerfile ==0.3.4.0 + - language-ecmascript ==0.17.1.0 + - language-fortran ==0.5.1 + - language-glsl ==0.2.0 + - language-haskell-extract ==0.2.4 + - language-java ==0.2.8 + - language-javascript ==0.6.0.8 + - language-lua2 ==0.1.0.5 + - language-nix ==2.1.0.1 + - language-puppet ==1.3.1.1 + - language-thrift ==0.9.0.2 + - largeword ==1.2.5 + - lattices ==1.5.0 + - lazy-csv ==0.5.1 + - lca ==0.3 + - leapseconds-announced ==2017 + - lens ==4.14 + - lens-action ==0.2.0.2 + - lens-aeson ==1.0.0.5 + - lens-datetime ==0.3 + - lens-family ==1.2.1 + - lens-family-core ==1.2.1 + - lens-family-th ==0.5.0.0 + - lens-regex ==0.1.0 + - lens-simple ==0.1.0.9 + - leveldb-haskell ==0.6.4 + - lexer-applicative ==2.1.0.1 + - lhs2tex ==1.19 + - libgit ==0.3.1 + - libinfluxdb ==0.0.4 + - libmpd ==0.9.0.6 + - libnotify ==0.2 + - libxml-sax ==0.7.5 + - LibZip ==1.0.1 + - lift-generics ==0.1.1 + - lifted-async ==0.9.0 + - lifted-base ==0.2.3.8 + - linear ==1.20.5 + - linear-accelerate ==0.2 + - linux-file-extents ==0.2.0.0 + - linux-namespaces ==0.1.2.0 + - list-fusion-probe ==0.1.0.6 + - list-prompt ==0.1.1.0 + - list-t ==1 + - ListLike ==4.5 + - load-env ==0.1.1 + - loch-th ==0.2.1 + - log-domain ==0.10.3.1 + - logfloat ==0.13.3.3 + - logging-facade ==0.1.1 + - logict ==0.6.0.2 + - loop ==0.3.0 + - lrucache ==1.2.0.0 + - lrucaching ==0.3.0 + - ltext ==0.1.2.1 + - lucid ==2.9.6 + - lucid-svg ==0.7.0.0 + - machines ==0.6.1 + - magic ==1.1 + - mainland-pretty ==0.4.1.4 + - makefile ==0.1.0.5 + - managed ==1.0.5 + - mandrill ==0.5.2.3 + - markdown ==0.1.14 + - markdown-unlit ==0.4.0 + - markup ==3.1.0 + - math-functions ==0.2.0.2 + - matrices ==0.4.3 + - matrix ==0.3.5.0 + - maximal-cliques ==0.1.1 + - mbox ==0.3.3 + - mcmc-types ==1.0.1 + - megaparsec ==5.0.1 + - memory ==0.13 + - MemoTrie ==0.6.4 + - mersenne-random ==1.0.0.1 + - mersenne-random-pure64 ==0.2.0.5 + - messagepack ==0.5.3 + - messagepack-rpc ==0.5.1 + - metrics ==0.3.0.2 + - MFlow ==0.4.6.0 + - microformats2-parser ==1.0.1.6 + - microlens ==0.4.7.0 + - microlens-aeson ==2.1.1.1 + - microlens-contra ==0.1.0.1 + - microlens-ghc ==0.4.7.0 + - microlens-mtl ==0.1.10.0 + - microlens-platform ==0.3.7.0 + - microlens-th ==0.4.1.0 + - mighty-metropolis ==1.0.2 + - mime-mail ==0.4.11 + - mime-mail-ses ==0.3.2.3 + - mime-types ==0.1.0.7 + - misfortune ==0.1.1.2 + - missing-foreign ==0.1.1 + - MissingH ==1.4.0.1 + - mmap ==0.5.9 + - mmorph ==1.0.6 + - mockery ==0.3.3 + - modify-fasta ==0.8.2.1 + - moesocks ==1.0.0.41 + - monad-control ==1.0.1.0 + - monad-coroutine ==0.9.0.3 + - monad-extras ==0.5.11 + - monad-http ==0.1.0.0 + - monad-journal ==0.7.2 + - monad-logger ==0.3.20 + - monad-logger-json ==0.1.0.0 + - monad-logger-prefix ==0.1.6 + - monad-logger-syslog ==0.1.2.0 + - monad-loops ==0.4.3 + - monad-par ==0.3.4.8 + - monad-par-extras ==0.3.3 + - monad-parallel ==0.7.2.2 + - monad-peel ==0.2.1.1 + - monad-primitive ==0.1 + - monad-products ==4.0.1 + - monad-skeleton ==0.1.2.2 + - monad-time ==0.2 + - monad-unlift ==0.2.0 + - monad-unlift-ref ==0.2.0 + - monadcryptorandom ==0.7.0 + - monadic-arrays ==0.2.2 + - monadLib ==3.7.3 + - monadloc ==0.7.1 + - monadplus ==1.4.2 + - MonadPrompt ==1.0.0.5 + - MonadRandom ==0.4.2.3 + - monads-tf ==0.1.0.3 + - mongoDB ==2.1.1.1 + - mono-traversable ==1.0.1 + - mono-traversable-instances ==0.1.0.0 + - monoid-extras ==0.4.2 + - monoid-subclasses ==0.4.2.1 + - monoidal-containers ==0.3.0.1 + - morte ==1.6.2 + - mountpoints ==1.0.2 + - mtl ==2.2.1 + - mtl-compat ==0.2.1.3 + - mtl-prelude ==2.0.3.1 + - multiarg ==0.30.0.10 + - multimap ==1.2.1 + - multipart ==0.1.2 + - multiset ==0.3.3 + - multiset-comb ==0.2.4.1 + - murmur-hash ==0.1.0.9 + - murmur3 ==1.0.3 + - MusicBrainz ==0.2.4 + - mustache ==2.1 + - mutable-containers ==0.3.3 + - mwc-probability ==1.2.1 + - mwc-random ==0.13.4.0 + - mwc-random-monad ==0.7.3.1 + - nagios-check ==0.3.2 + - names-th ==0.2.0.2 + - nano-erl ==0.1.0.1 + - nanospec ==0.2.1 + - nationstates ==0.5.0.0 + - nats ==1.1.1 + - natural-sort ==0.1.2 + - natural-transformation ==0.3.1 + - ndjson-conduit ==0.1.0.5 + - neat-interpolation ==0.3.2.1 + - netpbm ==1.0.2 + - nettle ==0.2.0 + - network ==2.6.3.1 + - network-anonymous-i2p ==0.10.0 + - network-anonymous-tor ==0.11.0 + - network-attoparsec ==0.12.2 + - network-conduit-tls ==1.2.2 + - network-house ==0.1.0.2 + - network-info ==0.2.0.8 + - network-simple ==0.4.0.5 + - network-transport ==0.4.4.0 + - network-transport-composed ==0.2.0.1 + - network-transport-inmemory ==0.5.1 + - network-transport-tcp ==0.5.1 + - network-transport-tests ==0.2.3.0 + - network-uri ==2.6.1.0 + - network-uri-flag ==0.1 + - newtype ==0.2 + - nicify-lib ==1.0.1 + - nix-paths ==1.0.0.1 + - non-empty-sequence ==0.2.0.2 + - nonce ==1.0.2 + - NoTrace ==0.3.0.1 + - nsis ==0.3 + - numbers ==3000.2.0.1 + - numeric-extras ==0.1 + - NumInstances ==1.4 + - numtype-dk ==0.5.0.1 + - objective ==1.1.1 + - ObjectName ==1.1.0.1 + - octane ==0.16.3 + - Octree ==0.5.4.3 + - oeis ==0.3.7 + - ofx ==0.4.2.0 + - old-locale ==1.0.0.7 + - old-time ==1.1.0.3 + - omnifmt ==0.2.1.1 + - once ==0.2 + - OneTuple ==0.2.1 + - oo-prototypes ==0.1.0.0 + - opaleye ==0.5.1.1 + - opaleye-trans ==0.3.3 + - open-browser ==0.2.1.0 + - OpenGL ==3.0.1.0 + - OpenGLRaw ==3.2.3.0 + - openpgp-asciiarmor ==0.1 + - opensource ==0.1.0.0 + - openssl-streams ==1.2.1.0 + - operational ==0.2.3.3 + - operational-class ==0.3.0.0 + - opml-conduit ==0.5.0.1 + - optional-args ==1.0.1 + - options ==1.2.1.1 + - optparse-applicative ==0.12.1.0 + - optparse-generic ==1.1.1 + - 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.2.1 + - pager ==0.1.1.0 + - pagerduty ==0.0.7 + - pagination ==0.1.1 + - palette ==0.1.0.4 + - pandoc ==1.17.1 + - pandoc-citeproc ==0.10.1.1 + - pandoc-types ==1.16.1.1 + - pango ==0.13.3.0 + - parallel ==3.2.1.0 + - parallel-io ==0.3.3 + - parseargs ==0.2.0.7 + - parsec ==3.1.11 + - parsers ==0.12.4 + - partial-handler ==1.0.1 + - path ==0.5.9 + - path-extra ==0.0.3 + - path-io ==1.2.0 + - path-pieces ==0.2.1 + - pathwalk ==0.3.1.2 + - patience ==0.1.1 + - pattern-arrows ==0.0.2 + - pbkdf ==1.1.1.1 + - pcap ==0.4.5.2 + - pcre-heavy ==1.0.0.2 + - pcre-light ==0.4.0.4 + - pcre-utils ==0.1.8.1 + - pdf-toolbox-content ==0.0.5.1 + - pdf-toolbox-core ==0.0.4.1 + - pdf-toolbox-document ==0.0.7.1 + - pdfinfo ==1.5.4 + - pem ==0.2.2 + - permutation ==0.5.0.5 + - persistable-record ==0.4.0.3 + - persistable-types-HDBC-pg ==0.0.1.4 + - persistent ==2.6 + - persistent-postgresql ==2.6 + - persistent-redis ==2.5.2 + - persistent-refs ==0.4 + - persistent-sqlite ==2.6 + - persistent-template ==2.5.1.6 + - pgp-wordlist ==0.1.0.1 + - phantom-state ==0.2.1.2 + - picoparsec ==0.1.2.3 + - pinboard ==0.9.6 + - pinch ==0.3.0.1 + - pinchot ==0.22.0.0 + - pipes ==4.1.9 + - pipes-aeson ==0.4.1.7 + - pipes-attoparsec ==0.5.1.4 + - pipes-bgzf ==0.2.0.1 + - pipes-bytestring ==2.1.3 + - pipes-cacophony ==0.4.0 + - pipes-cliff ==0.12.0.0 + - pipes-concurrency ==2.0.6 + - pipes-csv ==1.4.3 + - pipes-extras ==1.0.5 + - pipes-fastx ==0.3.0.0 + - pipes-group ==1.0.5 + - pipes-http ==1.0.4 + - pipes-illumina ==0.1.0.0 + - pipes-mongodb ==0.1.0.0 + - pipes-network ==0.6.4.1 + - pipes-parse ==3.0.7 + - pipes-random ==1.0.0.1 + - pipes-safe ==2.2.4 + - pipes-text ==0.0.2.4 + - pipes-wai ==3.2.0 + - pixelated-avatar-generator ==0.1.3 + - pkcs10 ==0.1.1.0 + - placeholders ==0.1 + - plan-b ==0.2.0 + - point-octree ==0.5.5.3 + - pointed ==5 + - pointedlist ==0.6.1 + - pointful ==1.0.8 + - pointless-fun ==1.1.0.6 + - polynomials-bernstein ==1.1.2 + - polyparse ==1.12 + - posix-realtime ==0.0.0.4 + - post-mess-age ==0.2.1.0 + - postgresql-binary ==0.9.1.1 + - postgresql-libpq ==0.9.2.0 + - postgresql-query ==3.0.1 + - postgresql-schema ==0.1.10 + - postgresql-simple ==0.5.2.1 + - postgresql-simple-url ==0.1.0.1 + - postgresql-transactional ==1.1.1 + - pred-set ==0.0.1 + - prednote ==0.36.0.4 + - prefix-units ==0.2.0 + - prelude-extras ==0.4.0.3 + - prelude-safeenum ==0.1.1.2 + - preprocessor-tools ==1.0.1 + - presburger ==1.3.1 + - pretty-class ==1.0.1.1 + - pretty-hex ==1.0 + - pretty-show ==1.6.12 + - pretty-types ==0.2.3.1 + - prettyclass ==1.0.0.0 + - primes ==0.2.1.0 + - primitive ==0.6.1.0 + - process-extras ==0.4.1.4 + - product-profunctors ==0.7.1.0 + - profiteur ==0.3.0.2 + - profunctor-extras ==4.0 + - profunctors ==5.2 + - project-template ==0.2.0 + - projectroot ==0.2.0.1 + - prometheus-client ==0.1.0.1 + - prometheus-metrics-ghc ==0.1.0.1 + - prompt ==0.1.1.2 + - protobuf ==0.2.1.1 + - protobuf-simple ==0.1.0.2 + - protocol-buffers ==2.4.0 + - protocol-buffers-descriptor ==2.4.0 + - protolude ==0.1.7 + - proxied ==0.2 + - psql-helpers ==0.1.0.0 + - PSQueue ==1.1 + - psqueues ==0.2.2.2 + - publicsuffix ==0.20160716 + - pure-cdb ==0.1.2 + - pure-io ==0.2.1 + - pureMD5 ==2.1.3 + - purescript ==0.9.3 + - purescript-bridge ==0.8.0.0 + - pwstore-fast ==2.4.4 + - pwstore-purehaskell ==2.1.4 + - quantum-random ==0.6.3 + - QuasiText ==0.1.2.6 + - questioner ==0.1.1.0 + - QuickCheck ==2.8.2 + - quickcheck-arbitrary-adt ==0.2.0.0 + - quickcheck-assertions ==0.2.0 + - quickcheck-combinators ==0.0.1 + - quickcheck-instances ==0.3.12 + - quickcheck-io ==0.1.3 + - quickcheck-properties ==0.1 + - quickcheck-simple ==0.1.0.1 + - quickcheck-text ==0.1.2.1 + - quickcheck-unicode ==1.0.0.1 + - rainbow ==0.28.0.4 + - rainbox ==0.18.0.10 + - random ==1.1 + - random-fu ==0.2.7.0 + - random-shuffle ==0.0.4 + - random-source ==0.3.0.6 + - random-tree ==0.6.0.5 + - range ==0.1.2.0 + - range-set-list ==0.1.2.0 + - rank1dynamic ==0.3.3.0 + - Rasterific ==0.6.1.1 + - rasterific-svg ==0.3.1.2 + - ratel ==0.3.1 + - ratel-wai ==0.2.0 + - raw-strings-qq ==1.1 + - read-editor ==0.1.0.2 + - read-env-var ==0.1.0.1 + - readable ==0.3.1 + - ReadArgs ==1.2.2 + - readline ==1.0.3.0 + - rebase ==1 + - redis-io ==0.7.0 + - redis-resp ==0.4.0 + - reducers ==3.12.1 + - ref-fd ==0.4.0.1 + - refact ==0.3.0.2 + - reflection ==2.1.2 + - reform ==0.2.7.1 + - reform-blaze ==0.2.4.1 + - reform-hamlet ==0.0.5.1 + - reform-happstack ==0.2.5.1 + - reform-hsp ==0.2.7.1 + - RefSerialize ==0.3.1.4 + - regex-applicative ==0.3.3 + - regex-applicative-text ==0.1.0.1 + - regex-base ==0.93.2 + - regex-compat ==0.95.1 + - regex-compat-tdfa ==0.95.1.4 + - regex-pcre ==0.94.4 + - regex-pcre-builtin ==0.94.4.8.8.35 + - regex-posix ==0.95.2 + - regex-tdfa ==1.2.2 + - regex-tdfa-text ==1.0.0.3 + - reinterpret-cast ==0.1.0 + - relational-query ==0.8.3.1 + - relational-query-HDBC ==0.6.0.2 + - relational-record ==0.1.5.1 + - relational-schemas ==0.1.3.1 + - renderable ==0.2.0.1 + - repa ==3.4.1.1 + - repa-algorithms ==3.4.1.1 + - repa-io ==3.4.1.1 + - RepLib ==0.5.4 + - reroute ==0.4.0.1 + - resolve-trivial-conflicts ==0.3.2.2 + - resource-pool ==0.2.3.2 + - resourcet ==1.1.7.5 + - rest-client ==0.5.1.1 + - rest-core ==0.39 + - rest-gen ==0.19.0.3 + - rest-happstack ==0.3.1.1 + - rest-stringmap ==0.2.0.6 + - rest-types ==1.14.1.1 + - rest-wai ==0.2.0.1 + - result ==0.2.6.0 + - rethinkdb ==2.2.0.7 + - rethinkdb-client-driver ==0.0.23 + - retry ==0.7.4.1 + - rev-state ==0.1.2 + - rfc5051 ==0.1.0.3 + - rng-utils ==0.2.1 + - rose-trees ==0.0.4.3 + - rosezipper ==0.2 + - rotating-log ==0.4 + - RSA ==2.2.0 + - rss-conduit ==0.2.0.2 + - runmemo ==1.0.0.1 + - rvar ==0.2.0.3 + - s3-signer ==0.3.0.0 + - safe ==0.3.9 + - safe-exceptions ==0.1.4.0 + - safecopy ==0.9.1 + - SafeSemaphore ==0.10.1 + - sampling ==0.2.0 + - sandi ==0.4.0 + - sandman ==0.2.0.1 + - sbv ==5.12 + - scalpel ==0.3.1 + - scanner ==0.2 + - scientific ==0.3.4.9 + - scotty ==0.11.0 + - scrape-changes ==0.1.0.4 + - scrypt ==0.5.0 + - sdl2 ==2.1.3 + - secp256k1 ==0.4.6 + - securemem ==0.1.9 + - SegmentTree ==0.3 + - semigroupoid-extras ==5 + - semigroupoids ==5.1 + - semigroups ==0.18.2 + - semiring-simple ==1.0.0.1 + - semver ==0.3.3.1 + - sendfile ==0.7.9 + - seqalign ==0.2.0.4 + - seqloc ==0.6.1.1 + - serf ==0.1.1.0 + - servant ==0.8.1 + - servant-aeson-specs ==0.5.2.0 + - servant-auth-cookie ==0.3.2 + - servant-blaze ==0.7.1 + - servant-cassava ==0.8 + - servant-client ==0.8.1 + - servant-docs ==0.8.1 + - servant-foreign ==0.8.1 + - servant-js ==0.8.1 + - servant-JuicyPixels ==0.3.0.2 + - servant-lucid ==0.7.1 + - servant-mock ==0.8.1.1 + - servant-purescript ==0.3.1.5 + - servant-server ==0.8.1 + - servant-subscriber ==0.5.0.2 + - servant-swagger ==1.1.2 + - servant-swagger-ui ==0.2.0.2.1.5 + - servant-yaml ==0.1.0.0 + - serversession ==1.0.1 + - serversession-backend-acid-state ==1.0.3 + - serversession-frontend-wai ==1.0 + - serversession-frontend-yesod ==1.0 + - servius ==1.2.0.2 + - set-monad ==0.2.0.0 + - setenv ==0.1.1.3 + - setlocale ==1.0.0.4 + - sets ==0.0.5.2 + - SHA ==1.6.4.2 + - shake ==0.15.10 + - shake-language-c ==0.10.0 + - shakespeare ==2.0.11.1 + - shell-conduit ==4.5.2 + - ShellCheck ==0.4.4 + - shelly ==1.6.8.1 + - shortcut-links ==0.4.2.0 + - should-not-typecheck ==2.1.0 + - show-type ==0.1.1 + - signal ==0.1.0.3 + - silently ==1.2.5 + - simple ==0.11.1 + - simple-download ==0.0.2 + - simple-log ==0.4.0 + - simple-reflect ==0.3.2 + - simple-sendfile ==0.2.25 + - simple-session ==0.10.1.1 + - simple-smt ==0.6.0 + - simple-templates ==0.8.0.1 + - singleton-bool ==0.1.1.0 + - singletons ==2.2 + - siphash ==1.0.3 + - skein ==1.0.9.4 + - skeletons ==0.4.0 + - slave-thread ==1.0.2 + - slug ==0.1.5 + - smallcaps ==0.6.0.3 + - smallcheck ==1.1.1 + - smoothie ==0.4.2.3 + - smsaero ==0.6.1 + - smtLib ==1.0.8 + - smtp-mail ==0.1.4.5 + - snap-core ==1.0.0.0 + - snap-server ==1.0.1.0 + - snowflake ==0.1.1.1 + - soap ==0.2.3.1 + - soap-openssl ==0.1.0.2 + - soap-tls ==0.1.1.2 + - socket ==0.6.1.0 + - socks ==0.5.5 + - solga ==0.1.0.1 + - solga-swagger ==0.1.0.1 + - sorted-list ==0.2.0.0 + - sourcemap ==0.1.6 + - spdx ==0.2.1.0 + - speculation ==1.5.0.3 + - speedy-slice ==0.1.3 + - sphinx ==0.6.0.1 + - Spintax ==0.1.0.0 + - splice ==0.6.1.1 + - split ==0.2.3.1 + - Spock ==0.11.0.0 + - Spock-api ==0.11.0.0 + - Spock-api-server ==0.11.0.0 + - Spock-core ==0.11.0.0 + - Spock-lucid ==0.3.0.0 + - Spock-worker ==0.3.1.0 + - spool ==0.1 + - spoon ==0.3.1 + - sql-words ==0.1.4.1 + - sqlite-simple ==0.4.9.0 + - srcloc ==0.5.1.0 + - stache ==0.1.7 + - stack-run-auto ==0.1.1.4 + - stackage-curator ==0.14.1.1 + - stackage-types ==1.2.0 + - state-plus ==0.1.2 + - stateref ==0.3 + - statestack ==0.2.0.5 + - StateVar ==1.1.0.4 + - stateWriter ==0.2.8 + - static-canvas ==0.2.0.3 + - statistics ==0.13.3.0 + - stm ==2.4.4.1 + - stm-chans ==3.0.0.4 + - stm-conduit ==3.0.0 + - stm-containers ==0.2.15 + - stm-delay ==0.1.1.1 + - stm-stats ==0.2.0.0 + - STMonadTrans ==0.3.3 + - stopwatch ==0.1.0.3 + - storable-complex ==0.2.2 + - storable-endian ==0.2.5 + - storable-record ==0.0.3.1 + - store ==0.2.1.2 + - store-core ==0.2.0.2 + - Strafunski-StrategyLib ==5.0.0.9 + - stratosphere ==0.1.6 + - streaming ==0.1.4.3 + - streaming-bytestring ==0.1.4.4 + - streaming-commons ==0.1.16 + - streamproc ==1.6.2 + - streams ==3.3 + - strict ==0.3.2 + - strict-base-types ==0.5.0 + - string-class ==0.1.6.5 + - string-combinators ==0.6.0.5 + - string-conv ==0.1.2 + - string-conversions ==0.4 + - string-qq ==0.0.2 + - stringable ==0.1.3 + - stringbuilder ==0.5.0 + - stringsearch ==0.3.6.6 + - stripe-core ==2.1.0 + - strive ==3.0.1 + - stylish-haskell ==0.6.1.0 + - success ==0.2.6 + - sundown ==0.6 + - svg-builder ==0.1.0.1 + - svg-tree ==0.5.1.2 + - SVGFonts ==1.5.0.1 + - swagger ==0.2.2 + - swagger2 ==2.1.3 + - syb ==0.6 + - syb-with-class ==0.6.1.7 + - symbol ==0.2.4 + - symengine ==0.1.2.0 + - system-argv0 ==0.1.1 + - system-fileio ==0.3.16.3 + - system-filepath ==0.4.13.4 + - system-posix-redirect ==1.1.0.1 + - syz ==0.2.0.0 + - tabular ==0.2.2.7 + - tagged ==0.8.5 + - tagged-binary ==0.2.0.0 + - taggy ==0.2.0 + - taggy-lens ==0.1.2 + - tagshare ==0.0 + - tagsoup ==0.14 + - tagstream-conduit ==0.5.5.3 + - tar ==0.5.0.3 + - tardis ==0.4.1.0 + - tasty ==0.11.0.4 + - tasty-ant-xml ==1.0.2 + - tasty-dejafu ==0.3.0.2 + - tasty-expected-failure ==0.11.0.4 + - tasty-golden ==2.3.1.1 + - tasty-hspec ==1.1.3 + - tasty-html ==0.4.1.1 + - tasty-hunit ==0.9.2 + - tasty-kat ==0.0.3 + - tasty-program ==1.0.5 + - tasty-quickcheck ==0.8.4 + - tasty-rerun ==1.1.6 + - tasty-silver ==3.1.9 + - tasty-smallcheck ==0.8.1 + - tasty-th ==0.1.4 + - TCache ==0.12.0 + - tcp-streams ==0.4.0.0 + - template ==0.2.0.10 + - temporary ==1.2.0.4 + - temporary-rc ==1.2.0.3 + - terminal-progress-bar ==0.0.1.4 + - terminal-size ==0.3.2.1 + - terminfo ==0.4.0.2 + - test-fixture ==0.4.1.0 + - test-framework ==0.8.1.1 + - test-framework-hunit ==0.3.0.2 + - test-framework-quickcheck2 ==0.3.0.3 + - test-framework-smallcheck ==0.2 + - test-framework-th ==0.2.4 + - test-simple ==0.1.8 + - testing-feat ==0.4.0.3 + - texmath ==0.8.6.5 + - text ==1.2.2.1 + - text-all ==0.3.0.2 + - text-binary ==0.2.1.1 + - text-conversions ==0.3.0 + - text-format ==0.3.1.1 + - text-icu ==0.7.0.1 + - text-ldap ==0.1.1.8 + - text-manipulate ==0.2.0.1 + - text-metrics ==0.1.0 + - text-postgresql ==0.0.2.1 + - text-region ==0.1.0.1 + - text-show ==3.4 + - text-show-instances ==3.4 + - tf-random ==0.5 + - th-data-compat ==0.0.2.2 + - th-desugar ==1.6 + - th-expand-syns ==0.4.0.0 + - th-extras ==0.0.0.4 + - th-lift ==0.7.6 + - th-lift-instances ==0.1.10 + - th-orphans ==0.13.2 + - th-printf ==0.3.1 + - th-reify-compat ==0.0.1.1 + - th-reify-many ==0.1.6 + - th-utilities ==0.2.0.1 + - these ==0.7.2 + - threads ==0.5.1.4 + - through-text ==0.1.0.0 + - thumbnail-plus ==1.0.5 + - thyme ==0.3.5.5 + - tidal ==0.8.2 + - time-compat ==0.1.0.3 + - time-lens ==0.4.0.1 + - time-locale-compat ==0.1.1.3 + - time-parsers ==0.1.1.0 + - timeit ==1.0.0.0 + - timelens ==0.2.0.2 + - timemap ==0.0.4 + - timerep ==2.0.0.2 + - timezone-olson ==0.1.7 + - timezone-series ==0.1.6.1 + - tinylog ==0.14.0 + - tinytemplate ==0.1.2.0 + - tls ==1.3.8 + - tls-debug ==0.4.4 + - token-bucket ==0.1.0.1 + - tostring ==0.2.1.1 + - transformers-base ==0.4.4 + - transformers-compat ==0.5.1.4 + - transformers-lift ==0.1.0.1 + - transient ==0.4.4 + - transient-universe ==0.3.5 + - traverse-with-class ==0.2.0.4 + - tree-fun ==0.8.1.0 + - tree-view ==0.4 + - tries ==0.0.4 + - trifecta ==1.6 + - true-name ==0.1.0.2 + - ttrie ==0.1.2.1 + - tttool ==1.6.1.2 + - tuple ==0.3.0.2 + - tuple-th ==0.2.5 + - tuples-homogenous-h98 ==0.1.1.0 + - turtle ==1.2.8 + - turtle-options ==0.1.0.4 + - twitter-conduit ==0.2.1 + - twitter-feed ==0.2.0.9 + - twitter-types ==0.7.2.2 + - twitter-types-lens ==0.7.2 + - type-aligned ==0.9.6 + - type-eq ==0.5 + - type-fun ==0.1.1 + - type-level-numbers ==0.1.1.1 + - type-list ==0.5.0.0 + - type-spec ==0.2.0.0 + - typelits-witnesses ==0.2.3.0 + - typography-geometry ==1.0.0.1 + - tzdata ==0.1.20160614.0 + - ua-parser ==0.7.1 + - uglymemo ==0.1.0.1 + - unbound ==0.5.1 + - unbound-generics ==0.3.1 + - unbounded-delays ==0.1.0.9 + - uncertain ==0.3.1.0 + - unexceptionalio ==0.3.0 + - unfoldable ==0.8.4 + - unfoldable-restricted ==0.0.2 + - unicode-show ==0.1.0.2 + - unicode-transforms ==0.1.0.1 + - unification-fd ==0.10.0.1 + - union ==0.1.1.1 + - union-find ==0.2 + - uniplate ==1.6.12 + - unit-constraint ==0.0.0 + - units ==2.4 + - units-defs ==2.0.1.1 + - units-parser ==0.1.0.0 + - universe ==1.0 + - universe-base ==1.0.2.1 + - universe-instances-base ==1.0 + - universe-instances-extended ==1.0.0.1 + - universe-instances-trans ==1.0.0.1 + - universe-reverse-instances ==1.0 + - unix-bytestring ==0.3.7.3 + - unix-compat ==0.4.2.0 + - unix-time ==0.3.7 + - Unixutils ==1.54.1 + - unordered-containers ==0.2.7.1 + - uri-bytestring ==0.2.2.0 + - uri-encode ==1.5.0.5 + - url ==2.1.3 + - urlpath ==5.0.0.1 + - userid ==0.1.2.7 + - users ==0.5.0.0 + - users-postgresql-simple ==0.5.0.2 + - users-test ==0.5.0.1 + - utf8-light ==0.4.2 + - utf8-string ==1.0.1.1 + - utility-ht ==0.0.12 + - uu-interleaved ==0.2.0.0 + - uu-parsinglib ==2.9.1.1 + - uuid ==1.3.12 + - uuid-orphans ==1.4.1 + - uuid-types ==1.0.3 + - vado ==0.0.7 + - validate-input ==0.4.0.0 + - validation ==0.5.3 + - varying ==0.5.0.3 + - vault ==0.3.0.6 + - vcswrapper ==0.1.3 + - vector ==0.11.0.0 + - vector-algorithms ==0.7.0.1 + - vector-binary-instances ==0.2.3.2 + - vector-buffer ==0.4.1 + - vector-fftw ==0.1.3.7 + - vector-instances ==3.3.1 + - vector-space ==0.10.4 + - vector-th-unbox ==0.2.1.6 + - vectortiles ==1.2.0 + - versions ==3.0.0 + - vhd ==0.2.2 + - ViennaRNAParser ==1.2.9 + - vinyl ==0.5.2 + - vinyl-utils ==0.3.0.0 + - void ==0.7.1 + - vty ==5.11 + - wai ==3.2.1.1 + - wai-app-static ==3.1.6.1 + - wai-conduit ==3.0.0.3 + - wai-cors ==0.2.5 + - wai-eventsource ==3.0.0 + - wai-extra ==3.0.18 + - wai-logger ==2.3.0 + - 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.4.1 + - wai-middleware-crowd ==0.1.4.2 + - wai-middleware-metrics ==0.2.3 + - wai-middleware-prometheus ==0.1.0.1 + - wai-middleware-static ==0.8.0 + - wai-middleware-throttle ==0.2.1.0 + - wai-middleware-verbs ==0.3.2 + - wai-predicates ==0.9.0 + - wai-request-spec ==0.10.2.1 + - wai-session ==0.3.2 + - wai-session-postgresql ==0.2.1.0 + - wai-transformers ==0.0.7 + - wai-websockets ==3.0.1.1 + - waitra ==0.0.4.0 + - warp ==3.2.8 + - warp-tls ==3.2.2 + - web-plugins ==0.2.9 + - web-routes ==0.27.11 + - web-routes-boomerang ==0.28.4.2 + - web-routes-happstack ==0.23.10 + - web-routes-hsp ==0.24.6.1 + - web-routes-th ==0.22.5 + - web-routes-wai ==0.24.3 + - webdriver ==0.8.4 + - webdriver-angular ==0.1.11 + - webkitgtk3 ==0.14.2.0 + - webkitgtk3-javascriptcore ==0.14.2.0 + - webpage ==0.0.4 + - webrtc-vad ==0.1.0.3 + - websockets ==0.9.7.0 + - weigh ==0.0.3 + - werewolf ==1.5.1.1 + - werewolf-slack ==1.0.2.0 + - wikicfp-scraper ==0.1.0.4 + - Win32 ==2.3.1.1 + - Win32-extras ==0.2.0.1 + - Win32-notify ==0.3.0.1 + - with-location ==0.1.0 + - withdependencies ==0.2.3 + - witherable ==0.1.3.3 + - wizards ==1.0.2 + - wl-pprint ==1.2 + - wl-pprint-extras ==3.5.0.5 + - wl-pprint-terminfo ==3.7.1.4 + - wl-pprint-text ==1.1.0.4 + - word-trie ==0.3.0 + - word8 ==0.1.2 + - wordpass ==1.0.0.6 + - Workflow ==0.8.3 + - wrap ==0.0.0 + - wreq ==0.4.1.0 + - writer-cps-mtl ==0.1.0.2 + - writer-cps-transformers ==0.1.0.2 + - wuss ==1.1.1 + - X11 ==1.6.1.2 + - x509 ==1.6.4 + - x509-store ==1.6.2 + - x509-system ==1.6.4 + - x509-validation ==1.6.5 + - Xauth ==0.1 + - xdcc ==1.1.3 + - xdg-basedir ==0.2.2 + - xenstore ==0.1.1 + - xhtml ==3000.2.1 + - xlsior ==0.1.0.1 + - xlsx ==0.2.4 + - xlsx-tabular ==0.1.0.1 + - xml ==1.3.14 + - xml-conduit ==1.3.5 + - xml-conduit-parse ==0.3.1.0 + - xml-conduit-writer ==0.1.1.1 + - xml-hamlet ==0.4.0.12 + - xml-lens ==0.1.6.3 + - xml-to-json-fast ==2.0.0 + - xml-types ==0.3.6 + - xmlgen ==0.6.2.1 + - xmlhtml ==0.2.3.5 + - xmonad ==0.12 + - xss-sanitize ==0.3.5.7 + - yackage ==0.8.0 + - yahoo-finance-api ==0.1.0.0 + - yaml ==0.8.18.7 + - Yampa ==0.10.5 + - YampaSynth ==0.2 + - yarr ==1.4.0.2 + - yes-precure5-command ==5.5.2 + - yesod ==1.4.3 + - yesod-auth ==1.4.13.5 + - yesod-auth-account ==1.4.3 + - yesod-auth-basic ==0.1.0.2 + - yesod-auth-hashdb ==1.5.1.3 + - yesod-auth-oauth2 ==0.2.2 + - yesod-bin ==1.4.18.7 + - yesod-core ==1.4.25 + - yesod-eventsource ==1.4.0.1 + - yesod-fay ==0.8.0 + - yesod-fb ==0.3.4 + - yesod-form ==1.4.7.1 + - yesod-form-richtext ==0.1.0.0 + - yesod-gitrepo ==0.2.1.0 + - yesod-gitrev ==0.1.0.0 + - yesod-job-queue ==0.3.0.1 + - yesod-newsfeed ==1.6 + - yesod-persistent ==1.4.0.6 + - yesod-sitemap ==1.4.0.1 + - yesod-static ==1.5.0.4 + - yesod-static-angular ==0.1.8 + - yesod-table ==2.0.3 + - yesod-test ==1.5.3 + - yesod-websockets ==0.2.4 + - yi ==0.12.6 + - yi-fuzzy-open ==0.1.0.1 + - yi-language ==0.2.1 + - yi-rope ==0.7.0.2 + - yjtools ==0.9.18 + - zero ==0.1.4 + - zeromq4-haskell ==0.6.5 + - zip ==0.1.3 + - zip-archive ==0.3.0.5 + - zippers ==0.2.2 + - zlib ==0.6.1.1 + - zlib-bindings ==0.1.1.5 + - zlib-lens ==0.1.2.1 + - zoom-refs ==0.0.0.1 + - zot ==0.0.3 extra-packages: - aeson < 0.8 # newer versions don't work with GHC 6.12.3 + - 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 - 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 @@ -48,9 +2011,14 @@ extra-packages: - haddock < 2.17 # required on GHC 7.10.x - haddock-api == 2.15.* # required on GHC 7.8.x - haddock-api == 2.16.* # required on GHC 7.10.x + - haddock-library == 1.2.* # required for haddock-api-2.16.x + - hoogle < 5 # required by current implementation of ghcWithHoogle - mtl < 2.2 # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x - mtl-prelude < 2 # required for to build postgrest on mtl 2.1.x platforms - parallel == 3.2.0.3 # newer versions don't work with GHC 6.12.3 + - persistent == 2.2.* # needed for git-annex + - persistent-sqlite == 2.2.* # needed for git-annex + - persistent-template == 2.1.* # needed for git-annex - primitive == 0.5.1.* # required to build alex with GHC 6.12.3 - QuickCheck < 2 # required by test-framework-quickcheck and its users - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x @@ -116,6 +2084,7 @@ dont-distribute-packages: hfsevents: [ i686-linux, x86_64-linux ] hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin ] reactivity: [ i686-linux, x86_64-linux, x86_64-darwin ] + Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -143,6 +2112,7 @@ dont-distribute-packages: cufft: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-raster-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] libnvvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + nvvm: [ i686-linux, x86_64-linux, x86_64-darwin ] Obsidian: [ i686-linux, x86_64-linux, x86_64-darwin ] patch-image: [ i686-linux, x86_64-linux, x86_64-darwin ] yices-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -151,34 +2121,61 @@ dont-distribute-packages: # soft restrictions because of build errors 3dmodels: [ i686-linux, x86_64-linux, x86_64-darwin ] 4Blocks: [ i686-linux, x86_64-linux, x86_64-darwin ] + AAI: [ i686-linux, x86_64-linux, x86_64-darwin ] + abacate: [ i686-linux, x86_64-linux, x86_64-darwin ] abcBridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + abcnotation: [ i686-linux, x86_64-linux, x86_64-darwin ] + abeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + AbortT-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] + AbortT-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] + AbortT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] abstract-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] + abt: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-BuildPlatform: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-EasyRaster-GTK: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-HalfInteger: [ i686-linux, x86_64-linux, x86_64-darwin ] + ac-machine-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + ac-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-MiniTest: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-Terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] AC-VanillaArray: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-fourier: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + accelerate-random: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] accelerate-utility: [ i686-linux, x86_64-linux, x86_64-darwin ] accentuateus: [ i686-linux, x86_64-linux, x86_64-darwin ] access-time: [ i686-linux, x86_64-linux, x86_64-darwin ] acid-state-dist: [ i686-linux, x86_64-linux, x86_64-darwin ] + acid-state-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-all-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-comonad: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-flipping-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-hq9plus: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-inator: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-left-pad: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-miscorder: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-now: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-numbersystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-operators: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-php: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-schoenfinkel: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-strfry: [ i686-linux, x86_64-linux, x86_64-darwin ] + acme-stringly-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] acme-zero: [ i686-linux, x86_64-linux, x86_64-darwin ] ACME: [ i686-linux, x86_64-linux, x86_64-darwin ] ActionKid: [ i686-linux, x86_64-linux, x86_64-darwin ] activehs: [ i686-linux, x86_64-linux, x86_64-darwin ] + activitystreams-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] actor: [ i686-linux, x86_64-linux, x86_64-darwin ] Adaptive-Blaisorblade: [ i686-linux, x86_64-linux, x86_64-darwin ] adaptive-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] adaptive-tuple: [ i686-linux, x86_64-linux, x86_64-darwin ] Adaptive: [ i686-linux, x86_64-linux, x86_64-darwin ] + adb: [ i686-linux, x86_64-linux, x86_64-darwin ] adhoc-network: [ i686-linux, x86_64-linux, x86_64-darwin ] adict: [ i686-linux, x86_64-linux, x86_64-darwin ] adobe-swatch-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -196,28 +2193,43 @@ dont-distribute-packages: aeson-bson: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-filthy: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-injector: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-native: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-smart: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + aeson-t: [ i686-linux, x86_64-linux, x86_64-darwin ] aeson-yak: [ i686-linux, x86_64-linux, x86_64-darwin ] AesonBson: [ i686-linux, x86_64-linux, x86_64-darwin ] + affine-invariant-ensemble-mcmc: [ i686-linux, x86_64-linux, x86_64-darwin ] afv: [ i686-linux, x86_64-linux, x86_64-darwin ] Agata: [ i686-linux, x86_64-linux, x86_64-darwin ] + Agda-executable: [ i686-linux, x86_64-linux, x86_64-darwin ] agda-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + agda-snippets-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] + agda-snippets: [ i686-linux, x86_64-linux, x86_64-darwin ] + agentx: [ i686-linux, x86_64-linux, x86_64-darwin ] AGI: [ i686-linux, x86_64-linux, x86_64-darwin ] AhoCorasick: [ i686-linux, x86_64-linux, x86_64-darwin ] air-th: [ i686-linux, x86_64-linux, x86_64-darwin ] airbrake: [ i686-linux, x86_64-linux, x86_64-darwin ] ajhc: [ i686-linux, x86_64-linux, x86_64-darwin ] al: [ i686-linux, x86_64-linux, x86_64-darwin ] + AlanDeniseEricLauren: [ i686-linux, x86_64-linux, x86_64-darwin ] + alex-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] algebra-sql: [ i686-linux, x86_64-linux, x86_64-darwin ] algebraic: [ i686-linux, x86_64-linux, x86_64-darwin ] + algo-s: [ i686-linux, x86_64-linux, x86_64-darwin ] + AlgorithmW: [ i686-linux, x86_64-linux, x86_64-darwin ] + align-text: [ i686-linux, x86_64-linux, x86_64-darwin ] AlignmentAlgorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] Allure: [ i686-linux, x86_64-linux, x86_64-darwin ] alms: [ i686-linux, x86_64-linux, x86_64-darwin ] alpha: [ i686-linux, x86_64-linux, x86_64-darwin ] + alphachar: [ i686-linux, x86_64-linux, x86_64-darwin ] alpino-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + alsa-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-pcm-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] alsa-seq-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -238,9 +2250,11 @@ dont-distribute-packages: anansi-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] anatomy: [ i686-linux, x86_64-linux, x86_64-darwin ] android-lint-summary: [ i686-linux, x86_64-linux, x86_64-darwin ] + android: [ i686-linux, x86_64-linux, x86_64-darwin ] AndroidViewHierarchyImporter: [ i686-linux, x86_64-linux, x86_64-darwin ] angle: [ i686-linux, x86_64-linux, x86_64-darwin ] Animas: [ i686-linux, x86_64-linux, x86_64-darwin ] + annah: [ i686-linux, x86_64-linux, x86_64-darwin ] Annotations: [ i686-linux, x86_64-linux, x86_64-darwin ] antagonist: [ i686-linux, x86_64-linux, x86_64-darwin ] antfarm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -275,13 +2289,19 @@ dont-distribute-packages: AppleScript: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-fail: [ i686-linux, x86_64-linux, x86_64-darwin ] applicative-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + applicative-quoters: [ i686-linux, x86_64-linux, x86_64-darwin ] approx-rand-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + ApproxFun-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + approximate: [ i686-linux, x86_64-linux, x86_64-darwin ] arb-fft: [ i686-linux, x86_64-linux, x86_64-darwin ] arbb-vm: [ i686-linux, x86_64-linux, x86_64-darwin ] + arbtt: [ i686-linux, x86_64-linux, x86_64-darwin ] archiver: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux-web: [ i686-linux, x86_64-linux, x86_64-darwin ] archlinux: [ i686-linux, x86_64-linux, x86_64-darwin ] + archnews: [ i686-linux, x86_64-linux, x86_64-darwin ] arff: [ i686-linux, x86_64-linux, x86_64-darwin ] + arghwxhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] argon2: [ i686-linux, x86_64-linux, x86_64-darwin ] argon: [ i686-linux, x86_64-linux, x86_64-darwin ] argparser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -292,6 +2312,8 @@ dont-distribute-packages: arithmetic: [ i686-linux, x86_64-linux, x86_64-darwin ] arithmoi: [ i686-linux, x86_64-linux, x86_64-darwin ] armada: [ i686-linux, x86_64-linux, x86_64-darwin ] + arpa: [ i686-linux, x86_64-linux, x86_64-darwin ] + arpack: [ i686-linux, x86_64-linux, x86_64-darwin ] array-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] array-primops: [ i686-linux, x86_64-linux, x86_64-darwin ] ArrayRef: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -299,7 +2321,11 @@ dont-distribute-packages: arrowapply-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] arrowp: [ i686-linux, x86_64-linux, x86_64-darwin ] ArrowVHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] + artery: [ i686-linux, x86_64-linux, x86_64-darwin ] + ascii-flatten: [ i686-linux, x86_64-linux, x86_64-darwin ] + ascii-vector-avc: [ i686-linux, x86_64-linux, x86_64-darwin ] ascii85-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + ascii: [ i686-linux, x86_64-linux, x86_64-darwin ] asic: [ i686-linux, x86_64-linux, x86_64-darwin ] asil: [ i686-linux, x86_64-linux, x86_64-darwin ] AspectAG: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -307,6 +2333,8 @@ dont-distribute-packages: astrds: [ i686-linux, x86_64-linux, x86_64-darwin ] astview: [ i686-linux, x86_64-linux, x86_64-darwin ] async-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + async-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] + asynchronous-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] aterm-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-core: [ i686-linux, x86_64-linux, x86_64-darwin ] atlassian-connect-descriptor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -319,23 +2347,33 @@ dont-distribute-packages: attoparsec-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] attoparsec-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + attoparsec-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + attosplit: [ i686-linux, x86_64-linux, x86_64-darwin ] Attrac: [ i686-linux, x86_64-linux, x86_64-darwin ] atuin: [ i686-linux, x86_64-linux, x86_64-darwin ] + audacity: [ i686-linux, x86_64-linux, x86_64-darwin ] audiovisual: [ i686-linux, x86_64-linux, x86_64-darwin ] augeas: [ i686-linux, x86_64-linux, x86_64-darwin ] augur: [ i686-linux, x86_64-linux, x86_64-darwin ] + aur: [ i686-linux, x86_64-linux, x86_64-darwin ] Aurochs: [ i686-linux, x86_64-linux, x86_64-darwin ] + authenticate-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] authoring: [ i686-linux, x86_64-linux, x86_64-darwin ] AutoForms: [ i686-linux, x86_64-linux, x86_64-darwin ] avahi: [ i686-linux, x86_64-linux, x86_64-darwin ] + avatar-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-api: [ i686-linux, x86_64-linux, x86_64-darwin ] avers-server: [ i686-linux, x86_64-linux, x86_64-darwin ] avers: [ i686-linux, x86_64-linux, x86_64-darwin ] + avl-static: [ i686-linux, x86_64-linux, x86_64-darwin ] AvlTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + avr-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] + awesome-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] awesomium: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-configuration-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + aws-dynamodb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-dynamodb-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-ec2: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-elastic-transcoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -351,9 +2389,13 @@ dont-distribute-packages: aws-sign4: [ i686-linux, x86_64-linux, x86_64-darwin ] aws-sns: [ 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 ] azurify: [ i686-linux, x86_64-linux, x86_64-darwin ] b-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + babylon: [ i686-linux, x86_64-linux, x86_64-darwin ] backdropper: [ i686-linux, x86_64-linux, x86_64-darwin ] + backtracking-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + backward-state: [ i686-linux, x86_64-linux, x86_64-darwin ] bag: [ i686-linux, x86_64-linux, x86_64-darwin ] Baggins: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo-launcher: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -363,48 +2405,67 @@ dont-distribute-packages: bamboo-theme-mini-html5: [ i686-linux, x86_64-linux, x86_64-darwin ] bamboo: [ i686-linux, x86_64-linux, x86_64-darwin ] bamse: [ i686-linux, x86_64-linux, x86_64-darwin ] + Bang: [ i686-linux, x86_64-linux, x86_64-darwin ] + banwords: [ i686-linux, x86_64-linux, x86_64-darwin ] barchart: [ i686-linux, x86_64-linux, x86_64-darwin ] barcodes-code128: [ i686-linux, x86_64-linux, x86_64-darwin ] + barecheck: [ i686-linux, x86_64-linux, x86_64-darwin ] barley: [ i686-linux, x86_64-linux, x86_64-darwin ] Barracuda: [ i686-linux, x86_64-linux, x86_64-darwin ] barrie: [ i686-linux, x86_64-linux, x86_64-darwin ] barrier-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + barrier: [ i686-linux, x86_64-linux, x86_64-darwin ] base-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] + base-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + base64-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + basic-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] basic-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] BASIC: [ i686-linux, x86_64-linux, x86_64-darwin ] baskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + battlenet-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] + battlenet: [ i686-linux, x86_64-linux, x86_64-darwin ] battleships: [ i686-linux, x86_64-linux, x86_64-darwin ] bayes-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] BCMtools: [ i686-linux, x86_64-linux, x86_64-darwin ] beam-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + beam: [ i686-linux, x86_64-linux, x86_64-darwin ] beamable: [ i686-linux, x86_64-linux, x86_64-darwin ] beautifHOL: [ i686-linux, x86_64-linux, x86_64-darwin ] bed-and-breakfast: [ i686-linux, x86_64-linux, x86_64-darwin ] Befunge93: [ i686-linux, x86_64-linux, x86_64-darwin ] bein: [ i686-linux, x86_64-linux, x86_64-darwin ] + BenchmarkHistory: [ i686-linux, x86_64-linux, x86_64-darwin ] bencoding: [ i686-linux, x86_64-linux, x86_64-darwin ] berkeleydb: [ i686-linux, x86_64-linux, x86_64-darwin ] BerkeleyDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] + BerlekampAlgorithm: [ i686-linux, x86_64-linux, x86_64-darwin ] berp: [ i686-linux, x86_64-linux, x86_64-darwin ] + besout: [ i686-linux, x86_64-linux, x86_64-darwin ] bet: [ i686-linux, x86_64-linux, x86_64-darwin ] + betacode: [ i686-linux, x86_64-linux, x86_64-darwin ] bff-mono: [ i686-linux, x86_64-linux, x86_64-darwin ] bff: [ i686-linux, x86_64-linux, x86_64-darwin ] + bgmax: [ i686-linux, x86_64-linux, x86_64-darwin ] bgzf: [ i686-linux, x86_64-linux, x86_64-darwin ] bibdb: [ i686-linux, x86_64-linux, x86_64-darwin ] bidirectionalization-combined: [ i686-linux, x86_64-linux, x86_64-darwin ] + bidispec-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] bidispec: [ i686-linux, x86_64-linux, x86_64-darwin ] billboard-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-main: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-pane: [ i686-linux, x86_64-linux, x86_64-darwin ] billeksah-services: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-communicator: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-file: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-indexed-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-protocol-zmq: [ i686-linux, x86_64-linux, x86_64-darwin ] + binary-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] binary-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] bind-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] binding-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] + binding-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr-util: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-apr: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-bfd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -420,6 +2481,7 @@ dont-distribute-packages: bindings-gts: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-hdf5: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-K8055: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindings-levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-librrd: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-libstemmer: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -430,6 +2492,9 @@ dont-distribute-packages: bindings-sc3: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-sipc: [ i686-linux, x86_64-linux, x86_64-darwin ] bindings-wlc: [ i686-linux, x86_64-linux, x86_64-darwin ] + bindynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] + binembed-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + binembed: [ i686-linux, x86_64-linux, x86_64-darwin ] bio: [ i686-linux, x86_64-linux, x86_64-darwin ] Biobase: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseBlast: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -438,9 +2503,12 @@ dont-distribute-packages: BiobaseFR3D: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseInfernal: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseMAF: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseNewick: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTrainingData: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseTurner: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] BiobaseVienna: [ i686-linux, x86_64-linux, x86_64-darwin ] + BiobaseXNA: [ i686-linux, x86_64-linux, x86_64-darwin ] biohazard: [ i686-linux, x86_64-linux, x86_64-darwin ] bioinformatics-toolkit: [ i686-linux, x86_64-linux, x86_64-darwin ] biophd: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -469,23 +2537,35 @@ dont-distribute-packages: blank-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] blas-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] blas: [ i686-linux, x86_64-linux, x86_64-darwin ] + blatex: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze-builder-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-html-hexpat: [ i686-linux, x86_64-linux, x86_64-darwin ] + blaze-json: [ i686-linux, x86_64-linux, x86_64-darwin ] blaze-textual-native: [ i686-linux, x86_64-linux, x86_64-darwin ] blip: [ i686-linux, x86_64-linux, x86_64-darwin ] + bliplib: [ i686-linux, x86_64-linux, x86_64-darwin ] Blobs: [ i686-linux, x86_64-linux, x86_64-darwin ] blogination: [ i686-linux, x86_64-linux, x86_64-darwin ] + BlogLiterately-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] + BlogLiterately: [ i686-linux, x86_64-linux, x86_64-darwin ] bloomfilter-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] blosum: [ i686-linux, x86_64-linux, x86_64-darwin ] + blubber-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + blubber: [ i686-linux, x86_64-linux, x86_64-darwin ] Blueprint: [ i686-linux, x86_64-linux, x86_64-darwin ] bluetile: [ i686-linux, x86_64-linux, x86_64-darwin ] + bluetileutils: [ i686-linux, x86_64-linux, x86_64-darwin ] + blunt: [ i686-linux, x86_64-linux, x86_64-darwin ] BNFC-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] board-games: [ i686-linux, x86_64-linux, x86_64-darwin ] bogre-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] bond-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bond: [ i686-linux, x86_64-linux, x86_64-darwin ] + bookkeeper-permissions: [ i686-linux, x86_64-linux, x86_64-darwin ] bookkeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] + boolean-list: [ i686-linux, x86_64-linux, x86_64-darwin ] boolean-normal-forms: [ i686-linux, x86_64-linux, x86_64-darwin ] boomslang: [ i686-linux, x86_64-linux, x86_64-darwin ] borel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -493,42 +2573,59 @@ dont-distribute-packages: bound-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] bound: [ i686-linux, x86_64-linux, x86_64-darwin ] Bravo: [ i686-linux, x86_64-linux, x86_64-darwin ] + break: [ i686-linux, x86_64-linux, x86_64-darwin ] breakout: [ i686-linux, x86_64-linux, x86_64-darwin ] breve: [ i686-linux, x86_64-linux, x86_64-darwin ] brians-brain: [ i686-linux, x86_64-linux, x86_64-darwin ] brillig: [ i686-linux, x86_64-linux, x86_64-darwin ] + broccoli: [ i686-linux, x86_64-linux, x86_64-darwin ] broker-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] bsd-sysctl: [ i686-linux, x86_64-linux, x86_64-darwin ] + bson-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] bson-mapping: [ i686-linux, x86_64-linux, x86_64-darwin ] btree-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] buffer-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] buffon: [ i686-linux, x86_64-linux, x86_64-darwin ] + bugzilla: [ i686-linux, x86_64-linux, x86_64-darwin ] + buildable: [ i686-linux, x86_64-linux, x86_64-darwin ] buildbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] buildwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] + burst-detection: [ i686-linux, x86_64-linux, x86_64-darwin ] buster-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] buster-network: [ i686-linux, x86_64-linux, x86_64-darwin ] Buster: [ i686-linux, x86_64-linux, x86_64-darwin ] buster: [ i686-linux, x86_64-linux, x86_64-darwin ] butterflies: [ i686-linux, x86_64-linux, x86_64-darwin ] + byline: [ i686-linux, x86_64-linux, x86_64-darwin ] bytable: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-class: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-progress: [ i686-linux, x86_64-linux, x86_64-darwin ] + bytestring-read: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestring-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringparser: [ i686-linux, x86_64-linux, x86_64-darwin ] bytestringreadp: [ i686-linux, x86_64-linux, x86_64-darwin ] + c-dsl: [ i686-linux, x86_64-linux, x86_64-darwin ] c-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-constraints: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-debian: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-dev: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghc-dynflags: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-ghci: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-graphdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] Cabal-ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-info: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-bundle: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc72: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-install-ghc74: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-macosx: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-nirvana: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabal-progdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-query: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] cabal-test: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -539,9 +2636,12 @@ dont-distribute-packages: cabal2spec: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalmdvrpm: [ i686-linux, x86_64-linux, x86_64-darwin ] + cabalQuery: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalrpmdeps: [ i686-linux, x86_64-linux, x86_64-darwin ] + CabalSearch: [ i686-linux, x86_64-linux, x86_64-darwin ] cabalvchk: [ i686-linux, x86_64-linux, x86_64-darwin ] cabocha: [ i686-linux, x86_64-linux, x86_64-darwin ] + cached-io: [ i686-linux, x86_64-linux, x86_64-darwin ] caffegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] cake3: [ i686-linux, x86_64-linux, x86_64-darwin ] cakyrespa: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -549,10 +2649,13 @@ dont-distribute-packages: cal3d-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] cal3d: [ i686-linux, x86_64-linux, x86_64-darwin ] calc: [ i686-linux, x86_64-linux, x86_64-darwin ] + calculator: [ i686-linux, x86_64-linux, x86_64-darwin ] caldims: [ i686-linux, x86_64-linux, x86_64-darwin ] call-haskell-from-anything: [ i686-linux, x86_64-linux, x86_64-darwin ] call: [ i686-linux, x86_64-linux, x86_64-darwin ] campfire: [ i686-linux, x86_64-linux, x86_64-darwin ] + canonical-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] + canteven-listen-http: [ i686-linux, x86_64-linux, x86_64-darwin ] canteven-parsedate: [ i686-linux, x86_64-linux, x86_64-darwin ] cantor: [ i686-linux, x86_64-linux, x86_64-darwin ] cao: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -562,6 +2665,7 @@ dont-distribute-packages: car-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] carboncopy: [ i686-linux, x86_64-linux, x86_64-darwin ] carettah: [ i686-linux, x86_64-linux, x86_64-darwin ] + Cartesian: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-control: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-core: [ i686-linux, x86_64-linux, x86_64-darwin ] casadi-bindings-internal: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -570,14 +2674,26 @@ dont-distribute-packages: casadi-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] Cascade: [ i686-linux, x86_64-linux, x86_64-darwin ] cascading: [ i686-linux, x86_64-linux, x86_64-darwin ] + cases: [ i686-linux, x86_64-linux, x86_64-darwin ] cash: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook-reports-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook-reports-meta-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + casr-logbook: [ i686-linux, x86_64-linux, x86_64-darwin ] + cassandra-cql: [ i686-linux, x86_64-linux, x86_64-darwin ] cassandra-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] cassy: [ i686-linux, x86_64-linux, x86_64-darwin ] + castle: [ i686-linux, x86_64-linux, x86_64-darwin ] casui: [ i686-linux, x86_64-linux, x86_64-darwin ] catamorphism: [ i686-linux, x86_64-linux, x86_64-darwin ] Catana: [ i686-linux, x86_64-linux, x86_64-darwin ] + catch-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] categorical-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] category-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + category-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] + cayley-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + cblrepo: [ i686-linux, x86_64-linux, x86_64-darwin ] CBOR: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-alt: [ i686-linux, x86_64-linux, x86_64-darwin ] CC-delcont-cxe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -586,10 +2702,13 @@ dont-distribute-packages: CC-delcont-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] CCA: [ i686-linux, x86_64-linux, x86_64-darwin ] cci: [ i686-linux, x86_64-linux, x86_64-darwin ] + ccnx: [ i686-linux, x86_64-linux, x86_64-darwin ] cctools-workqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] cedict: [ i686-linux, x86_64-linux, x86_64-darwin ] ceilometer-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + cellrenderer-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] cerberus: [ i686-linux, x86_64-linux, x86_64-darwin ] + cereal-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-ieee754: [ i686-linux, x86_64-linux, x86_64-darwin ] cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -598,15 +2717,22 @@ dont-distribute-packages: cfipu: [ i686-linux, x86_64-linux, x86_64-darwin ] cflp: [ i686-linux, x86_64-linux, x86_64-darwin ] cfopu: [ i686-linux, x86_64-linux, x86_64-darwin ] + cg: [ i686-linux, x86_64-linux, x86_64-darwin ] cgen: [ i686-linux, x86_64-linux, x86_64-darwin ] cgi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard-viewer: [ i686-linux, x86_64-linux, x86_64-darwin ] chalkboard: [ i686-linux, x86_64-linux, x86_64-darwin ] charade: [ i686-linux, x86_64-linux, x86_64-darwin ] + charsetdetect: [ i686-linux, x86_64-linux, x86_64-darwin ] + chart-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] + Chart-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] chatter: [ i686-linux, x86_64-linux, x86_64-darwin ] chatty-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + chatty-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] chatty: [ i686-linux, x86_64-linux, x86_64-darwin ] + cheapskate-terminal: [ i686-linux, x86_64-linux, x86_64-darwin ] check-pvp: [ i686-linux, x86_64-linux, x86_64-darwin ] + Checked: [ i686-linux, x86_64-linux, x86_64-darwin ] checked: [ i686-linux, x86_64-linux, x86_64-darwin ] chell-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] chevalier-common: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -619,10 +2745,12 @@ dont-distribute-packages: chp-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] chp: [ i686-linux, x86_64-linux, x86_64-darwin ] ChristmasTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + chronograph: [ i686-linux, x86_64-linux, x86_64-darwin ] chronos: [ i686-linux, x86_64-linux, x86_64-darwin ] chu2: [ i686-linux, x86_64-linux, x86_64-darwin ] chuchu: [ i686-linux, x86_64-linux, x86_64-darwin ] chunks: [ i686-linux, x86_64-linux, x86_64-darwin ] + chunky: [ i686-linux, x86_64-linux, x86_64-darwin ] cil: [ i686-linux, x86_64-linux, x86_64-darwin ] cinvoke: [ i686-linux, x86_64-linux, x86_64-darwin ] cio: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -630,38 +2758,66 @@ dont-distribute-packages: citeproc-hs-pandoc-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] citeproc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] cjk: [ i686-linux, x86_64-linux, x86_64-darwin ] + clac: [ i686-linux, x86_64-linux, x86_64-darwin ] clafer: [ i686-linux, x86_64-linux, x86_64-darwin ] claferIG: [ i686-linux, x86_64-linux, x86_64-darwin ] claferwiki: [ i686-linux, x86_64-linux, x86_64-darwin ] + clang-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] + clanki: [ i686-linux, x86_64-linux, x86_64-darwin ] + clarifai: [ i686-linux, x86_64-linux, x86_64-darwin ] CLASE: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-ghc: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] clash-prelude-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-systemverilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + clash-vhdl: [ i686-linux, x86_64-linux, x86_64-darwin ] clash: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassLaws: [ i686-linux, x86_64-linux, x86_64-darwin ] + classy-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] + classy-prelude-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + classy-prelude-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] + classy-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] ClassyPrelude: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-dot-com: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-plugin-bugs: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-ircbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-media: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-plugin-page: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-theme-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks-theme-clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clckwrks-theme-geo-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] + clckwrks: [ i686-linux, x86_64-linux, x86_64-darwin ] clean-home: [ i686-linux, x86_64-linux, x86_64-darwin ] clean-unions: [ i686-linux, x86_64-linux, x86_64-darwin ] Clean: [ i686-linux, x86_64-linux, x86_64-darwin ] + cless: [ i686-linux, x86_64-linux, x86_64-darwin ] clevercss: [ i686-linux, x86_64-linux, x86_64-darwin ] + CLI: [ i686-linux, x86_64-linux, x86_64-darwin ] click-clack: [ i686-linux, x86_64-linux, x86_64-darwin ] clifford: [ i686-linux, x86_64-linux, x86_64-darwin ] + clippard: [ i686-linux, x86_64-linux, x86_64-darwin ] clipper: [ i686-linux, x86_64-linux, x86_64-darwin ] clippings: [ i686-linux, x86_64-linux, x86_64-darwin ] + clist: [ i686-linux, x86_64-linux, x86_64-darwin ] clocked: [ i686-linux, x86_64-linux, x86_64-darwin ] clogparse: [ i686-linux, x86_64-linux, x86_64-darwin ] clone-all: [ i686-linux, x86_64-linux, x86_64-darwin ] + closure: [ i686-linux, x86_64-linux, x86_64-darwin ] cloud-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudfront-signer: [ i686-linux, x86_64-linux, x86_64-darwin ] cloudyfs: [ i686-linux, x86_64-linux, x86_64-darwin ] clua: [ i686-linux, x86_64-linux, x86_64-darwin ] cluss: [ i686-linux, x86_64-linux, x86_64-darwin ] + clustering: [ i686-linux, x86_64-linux, x86_64-darwin ] clustertools: [ i686-linux, x86_64-linux, x86_64-darwin ] clutterhs: [ i686-linux, x86_64-linux, x86_64-darwin ] cmath: [ i686-linux, x86_64-linux, x86_64-darwin ] cmathml3: [ i686-linux, x86_64-linux, x86_64-darwin ] CMCompare: [ i686-linux, x86_64-linux, x86_64-darwin ] + cmd-item: [ i686-linux, x86_64-linux, x86_64-darwin ] cmdargs-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] cmdtheline: [ i686-linux, x86_64-linux, x86_64-darwin ] cmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -680,12 +2836,16 @@ dont-distribute-packages: coin: [ i686-linux, x86_64-linux, x86_64-darwin ] coinbase-exchange: [ i686-linux, x86_64-linux, x86_64-darwin ] colada: [ i686-linux, x86_64-linux, x86_64-darwin ] + colchis: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-output: [ i686-linux, x86_64-linux, x86_64-darwin ] collada-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + collapse-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + collection-json: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-api: [ i686-linux, x86_64-linux, x86_64-darwin ] collections-base-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] collections: [ i686-linux, x86_64-linux, x86_64-darwin ] color-counter: [ i686-linux, x86_64-linux, x86_64-darwin ] + colour-space: [ i686-linux, x86_64-linux, x86_64-darwin ] coltrane: [ i686-linux, x86_64-linux, x86_64-darwin ] com: [ i686-linux, x86_64-linux, x86_64-darwin ] combinat-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -695,20 +2855,27 @@ dont-distribute-packages: Combinatorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] combobuffer: [ i686-linux, x86_64-linux, x86_64-darwin ] comfort-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + commander: [ i686-linux, x86_64-linux, x86_64-darwin ] Commando: [ i686-linux, x86_64-linux, x86_64-darwin ] commodities: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec-keyexchange: [ i686-linux, x86_64-linux, x86_64-darwin ] commsec: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] compact-map: [ i686-linux, x86_64-linux, x86_64-darwin ] compact-string: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-automata: [ i686-linux, x86_64-linux, x86_64-darwin ] compdata-dags: [ i686-linux, x86_64-linux, x86_64-darwin ] + compensated: [ i686-linux, x86_64-linux, x86_64-darwin ] + competition: [ i686-linux, x86_64-linux, x86_64-darwin ] compilation: [ i686-linux, x86_64-linux, x86_64-darwin ] complex-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] complexity: [ i686-linux, x86_64-linux, x86_64-darwin ] + compose-ltr: [ i686-linux, x86_64-linux, x86_64-darwin ] compose-trans: [ i686-linux, x86_64-linux, x86_64-darwin ] + composition-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + compressed: [ i686-linux, x86_64-linux, x86_64-darwin ] compression: [ i686-linux, x86_64-linux, x86_64-darwin ] compstrat: [ i686-linux, x86_64-linux, x86_64-darwin ] comptrans: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -718,6 +2885,7 @@ dont-distribute-packages: concraft: [ i686-linux, x86_64-linux, x86_64-darwin ] concrete-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] concurrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + Concurrential: [ i686-linux, x86_64-linux, x86_64-darwin ] ConcurrentUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] Condor: [ i686-linux, x86_64-linux, x86_64-darwin ] condor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -728,26 +2896,39 @@ dont-distribute-packages: conduit-find: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] conduit-resumablesink: [ i686-linux, x86_64-linux, x86_64-darwin ] + conf: [ i686-linux, x86_64-linux, x86_64-darwin ] conffmt: [ i686-linux, x86_64-linux, x86_64-darwin ] config-select: [ i686-linux, x86_64-linux, x86_64-darwin ] ConfigFileTH: [ i686-linux, x86_64-linux, x86_64-darwin ] Configger: [ i686-linux, x86_64-linux, x86_64-darwin ] + configifier: [ i686-linux, x86_64-linux, x86_64-darwin ] + Configurable: [ i686-linux, x86_64-linux, x86_64-darwin ] + congruence-relation: [ i686-linux, x86_64-linux, x86_64-darwin ] conjure: [ i686-linux, x86_64-linux, x86_64-darwin ] + conlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] + Conscript: [ i686-linux, x86_64-linux, x86_64-darwin ] consistent: [ i686-linux, x86_64-linux, x86_64-darwin ] + console-program: [ i686-linux, x86_64-linux, x86_64-darwin ] const-math-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] constrained-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] ConstraintKinds: [ i686-linux, x86_64-linux, x86_64-darwin ] constructible: [ i686-linux, x86_64-linux, x86_64-darwin ] constructive-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] + consul-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] Consumer: [ i686-linux, x86_64-linux, x86_64-darwin ] consumers: [ i686-linux, x86_64-linux, x86_64-darwin ] container: [ i686-linux, x86_64-linux, x86_64-darwin ] + containers-benchmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + ContArrow: [ i686-linux, x86_64-linux, x86_64-darwin ] context-stack: [ i686-linux, x86_64-linux, x86_64-darwin ] ContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] continue: [ i686-linux, x86_64-linux, x86_64-darwin ] + continuum-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + continuum: [ i686-linux, x86_64-linux, x86_64-darwin ] Contract: [ i686-linux, x86_64-linux, x86_64-darwin ] control-event: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-attempt: [ i686-linux, x86_64-linux, x86_64-darwin ] + control-monad-exception-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-failure-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] control-monad-failure: [ i686-linux, x86_64-linux, x86_64-darwin ] Control-Monad-MultiPass: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -759,13 +2940,16 @@ dont-distribute-packages: convertible-text: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot-cbmc: [ i686-linux, x86_64-linux, x86_64-darwin ] copilot: [ i686-linux, x86_64-linux, x86_64-darwin ] + copr: [ i686-linux, x86_64-linux, x86_64-darwin ] COrdering: [ i686-linux, x86_64-linux, x86_64-darwin ] core-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] core-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] core: [ i686-linux, x86_64-linux, x86_64-darwin ] corebot-bliki: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreDump: [ i686-linux, x86_64-linux, x86_64-darwin ] + CoreErlang: [ i686-linux, x86_64-linux, x86_64-darwin ] CoreFoundation: [ i686-linux, x86_64-linux, x86_64-darwin ] + coroutine-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] coroutine-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] Coroutine: [ i686-linux, x86_64-linux, x86_64-darwin ] couch-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -773,23 +2957,32 @@ dont-distribute-packages: couchdb-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] couchdb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] CouchDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + counter: [ i686-linux, x86_64-linux, x86_64-darwin ] court: [ i686-linux, x86_64-linux, x86_64-darwin ] + coverage: [ i686-linux, x86_64-linux, x86_64-darwin ] CPBrainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] cpio-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] cplex-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] cplusplus-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + cprng-aes-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] cpuperf: [ i686-linux, x86_64-linux, x86_64-darwin ] cql-io: [ i686-linux, x86_64-linux, x86_64-darwin ] cql: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-memory: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-sqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] cqrs-test: [ i686-linux, x86_64-linux, x86_64-darwin ] + cqrs-testkit: [ i686-linux, x86_64-linux, x86_64-darwin ] cr: [ i686-linux, x86_64-linux, x86_64-darwin ] crack: [ i686-linux, x86_64-linux, x86_64-darwin ] Craft3e: [ i686-linux, x86_64-linux, x86_64-darwin ] + craft: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] + crawlchain: [ i686-linux, x86_64-linux, x86_64-darwin ] craze: [ i686-linux, x86_64-linux, x86_64-darwin ] crc16: [ i686-linux, x86_64-linux, x86_64-darwin ] crc: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -799,14 +2992,17 @@ dont-distribute-packages: crf-chain2-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] crf-chain2-tiers: [ i686-linux, x86_64-linux, x86_64-darwin ] criterion-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + criterion-to-html: [ i686-linux, x86_64-linux, x86_64-darwin ] crocodile: [ i686-linux, x86_64-linux, x86_64-darwin ] cron-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] cruncher-types: [ i686-linux, x86_64-linux, x86_64-darwin ] crunghc: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-cipher-benchmarks: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-classical: [ i686-linux, x86_64-linux, x86_64-darwin ] + crypto-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-enigma: [ i686-linux, x86_64-linux, x86_64-darwin ] crypto-multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] + crypto-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptonite-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] cryptsy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] crystalfontz: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -814,6 +3010,7 @@ dont-distribute-packages: csound-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] csp: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-cspm: [ i686-linux, x86_64-linux, x86_64-darwin ] + CSPM-FiringRules: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-Interpreter: [ i686-linux, x86_64-linux, x86_64-darwin ] CSPM-ToProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -826,15 +3023,18 @@ dont-distribute-packages: cubicbezier: [ i686-linux, x86_64-linux, x86_64-darwin ] cuboid: [ i686-linux, x86_64-linux, x86_64-darwin ] cudd: [ i686-linux, x86_64-linux, x86_64-darwin ] + currency-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-base: [ i686-linux, x86_64-linux, x86_64-darwin ] curry-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] CurryDB: [ i686-linux, x86_64-linux, x86_64-darwin ] + curve25519: [ i686-linux, x86_64-linux, x86_64-darwin ] curves: [ i686-linux, x86_64-linux, x86_64-darwin ] custom-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] CV: [ i686-linux, x86_64-linux, x86_64-darwin ] cyclotomic: [ i686-linux, x86_64-linux, x86_64-darwin ] cypher: [ i686-linux, x86_64-linux, x86_64-darwin ] d-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] + d3js: [ i686-linux, x86_64-linux, x86_64-darwin ] DAG-Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] dag: [ i686-linux, x86_64-linux, x86_64-darwin ] Dangerous: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -853,38 +3053,75 @@ dont-distribute-packages: DarcsHelpers: [ i686-linux, x86_64-linux, x86_64-darwin ] darcswatch: [ i686-linux, x86_64-linux, x86_64-darwin ] darkplaces-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] + darkplaces-rcon-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + darkplaces-rcon: [ i686-linux, x86_64-linux, x86_64-darwin ] dash-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-accessor-monadLib: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-accessor-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-accessor-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-concurrent-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-construction: [ i686-linux, x86_64-linux, x86_64-darwin ] data-cycle: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-default-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-default-instances-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-default-instances-case-insensitive: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-default-instances-new-base: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-default-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-default-instances-unordered-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-default-instances-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] data-dispersal: [ i686-linux, x86_64-linux, x86_64-darwin ] data-easy: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-filepath: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-fin-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] data-fin: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-flagset: [ i686-linux, x86_64-linux, x86_64-darwin ] data-ivar: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-kiln: [ i686-linux, x86_64-linux, x86_64-darwin ] data-layer: [ i686-linux, x86_64-linux, x86_64-darwin ] data-lens-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-map-multikey: [ i686-linux, x86_64-linux, x86_64-darwin ] data-msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] data-nat: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-json: [ i686-linux, x86_64-linux, x86_64-darwin ] data-object-yaml: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-object: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-pprint: [ i686-linux, x86_64-linux, x86_64-darwin ] data-quotientref: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-repr: [ i686-linux, x86_64-linux, x86_64-darwin ] data-result: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-rev: [ i686-linux, x86_64-linux, x86_64-darwin ] Data-Rope: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rope: [ i686-linux, x86_64-linux, x86_64-darwin ] data-rtuple: [ i686-linux, x86_64-linux, x86_64-darwin ] + data-spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] data-store: [ i686-linux, x86_64-linux, x86_64-darwin ] data-type: [ i686-linux, x86_64-linux, x86_64-darwin ] + database-study: [ i686-linux, x86_64-linux, x86_64-darwin ] datadog: [ i686-linux, x86_64-linux, x86_64-darwin ] + dataenc: [ i686-linux, x86_64-linux, x86_64-darwin ] datalog: [ i686-linux, x86_64-linux, x86_64-darwin ] DataTreeView: [ i686-linux, x86_64-linux, x86_64-darwin ] + datetime-sb: [ i686-linux, x86_64-linux, x86_64-darwin ] + datetime: [ i686-linux, x86_64-linux, x86_64-darwin ] + dawdle: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbcleaner: [ i686-linux, x86_64-linux, x86_64-darwin ] dbjava: [ i686-linux, x86_64-linux, x86_64-darwin ] + DBlimited: [ i686-linux, x86_64-linux, x86_64-darwin ] dbmigrations: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-client: [ i686-linux, x86_64-linux, x86_64-darwin ] dbus-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbus-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + dbus-th-introspection: [ i686-linux, x86_64-linux, x86_64-darwin ] DBus: [ i686-linux, x86_64-linux, x86_64-darwin ] dclabel: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-base: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-build: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-core-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] + ddc-interface: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] ddc-war: [ i686-linux, x86_64-linux, x86_64-darwin ] ddci-core: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -908,6 +3145,7 @@ dont-distribute-packages: definitive-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] definitive-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] definitive-sound: [ i686-linux, x86_64-linux, x86_64-darwin ] + deiko-config: [ i686-linux, x86_64-linux, x86_64-darwin ] deka-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] deka: [ i686-linux, x86_64-linux, x86_64-darwin ] delicious: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -921,42 +3159,65 @@ dont-distribute-packages: dequeue: [ i686-linux, x86_64-linux, x86_64-darwin ] derangement: [ i686-linux, x86_64-linux, x86_64-darwin ] derivation-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-enumerable: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-gadt: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-IG: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-monoid: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-storable-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + derive-storable: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] derive-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] derp-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + deterministic-game-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] + deunicode: [ i686-linux, x86_64-linux, x86_64-darwin ] dewdrop: [ i686-linux, x86_64-linux, x86_64-darwin ] Dflow: [ i686-linux, x86_64-linux, x86_64-darwin ] dfsbuild: [ i686-linux, x86_64-linux, x86_64-darwin ] dgim: [ i686-linux, x86_64-linux, x86_64-darwin ] dgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + dia-functions: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-hsqml: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-pgf: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-qrcode: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-rubiks-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] diagrams-tikz: [ i686-linux, x86_64-linux, x86_64-darwin ] + diagrams-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] dice-entropy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + dicom: [ i686-linux, x86_64-linux, x86_64-darwin ] + dictionaries: [ i686-linux, x86_64-linux, x86_64-darwin ] dictparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + diff-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] diffcabal: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferenceLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] DifferentialEvolution: [ i686-linux, x86_64-linux, x86_64-darwin ] + difftodo: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-foundation-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] digestive-functors-lucid: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + digestive-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] + digitalocean-kzs: [ i686-linux, x86_64-linux, x86_64-darwin ] DigitalOcean: [ i686-linux, x86_64-linux, x86_64-darwin ] + dimensional-codata: [ i686-linux, x86_64-linux, x86_64-darwin ] DimensionalHash: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-core: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-example: [ i686-linux, x86_64-linux, x86_64-darwin ] dingo-widgets: [ i686-linux, x86_64-linux, x86_64-darwin ] diophantine: [ i686-linux, x86_64-linux, x86_64-darwin ] diplomacy-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + diplomacy: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-binary-files: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] direct-http: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -964,19 +3225,33 @@ dont-distribute-packages: directed-cubical: [ i686-linux, x86_64-linux, x86_64-darwin ] dirfiles: [ i686-linux, x86_64-linux, x86_64-darwin ] discogs-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + discordian-calendar: [ i686-linux, x86_64-linux, x86_64-darwin ] discount: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] + Dist: [ i686-linux, x86_64-linux, x86_64-darwin ] DisTract: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-async: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-azure: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-client-server: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-execution: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-platform: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-registry: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-simplelocalnet: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] + distributed-process-task: [ i686-linux, x86_64-linux, x86_64-darwin ] distributed-process-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] distribution-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dixi: [ i686-linux, x86_64-linux, x86_64-darwin ] + djembe: [ i686-linux, x86_64-linux, x86_64-darwin ] djinn-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + DMuCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] DnaProteinAlignment: [ i686-linux, x86_64-linux, x86_64-darwin ] dnscache: [ i686-linux, x86_64-linux, x86_64-darwin ] + dnssd: [ i686-linux, x86_64-linux, x86_64-darwin ] doc-review: [ i686-linux, x86_64-linux, x86_64-darwin ] doccheck: [ i686-linux, x86_64-linux, x86_64-darwin ] docidx: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -986,10 +3261,15 @@ dont-distribute-packages: DocTest: [ i686-linux, x86_64-linux, x86_64-darwin ] docvim: [ i686-linux, x86_64-linux, x86_64-darwin ] DOM: [ i686-linux, x86_64-linux, x86_64-darwin ] + dominion: [ i686-linux, x86_64-linux, x86_64-darwin ] + domplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + dot-linker: [ i686-linux, x86_64-linux, x86_64-darwin ] dotfs: [ i686-linux, x86_64-linux, x86_64-darwin ] + download-curl: [ i686-linux, x86_64-linux, x86_64-darwin ] download-media-content: [ i686-linux, x86_64-linux, x86_64-darwin ] download: [ i686-linux, x86_64-linux, x86_64-darwin ] dozenal: [ i686-linux, x86_64-linux, x86_64-darwin ] + dozens: [ i686-linux, x86_64-linux, x86_64-darwin ] DP: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-base: [ i686-linux, x86_64-linux, x86_64-darwin ] dph-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1006,6 +3286,7 @@ dont-distribute-packages: DrHylo: [ i686-linux, x86_64-linux, x86_64-darwin ] DrIFT-cabalized: [ i686-linux, x86_64-linux, x86_64-darwin ] DrIFT: [ i686-linux, x86_64-linux, x86_64-darwin ] + drifter-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] drmaa: [ i686-linux, x86_64-linux, x86_64-darwin ] dropbox-sdk: [ i686-linux, x86_64-linux, x86_64-darwin ] dropsolve: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1014,8 +3295,11 @@ dont-distribute-packages: DSH: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] dsmc: [ i686-linux, x86_64-linux, x86_64-darwin ] + dson-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + dson: [ i686-linux, x86_64-linux, x86_64-darwin ] DSTM: [ i686-linux, x86_64-linux, x86_64-darwin ] dstring: [ i686-linux, x86_64-linux, x86_64-darwin ] + dtab: [ i686-linux, x86_64-linux, x86_64-darwin ] DTC: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-text: [ i686-linux, x86_64-linux, x86_64-darwin ] dtd-types: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1027,8 +3311,11 @@ dont-distribute-packages: Dust: [ i686-linux, x86_64-linux, x86_64-darwin ] dvda: [ i686-linux, x86_64-linux, x86_64-darwin ] dvdread: [ i686-linux, x86_64-linux, x86_64-darwin ] + dvi-processing: [ i686-linux, x86_64-linux, x86_64-darwin ] + dwarfadt: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-linker-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + dynamic-mvector: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-object: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] dynamic-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1036,10 +3323,13 @@ dont-distribute-packages: dynobud: [ i686-linux, x86_64-linux, x86_64-darwin ] DysFRP-Cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] DysFRP-Craftwerk: [ i686-linux, x86_64-linux, x86_64-darwin ] + dywapitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] + eager-sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] easy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] easyjson: [ i686-linux, x86_64-linux, x86_64-darwin ] easyplot: [ i686-linux, x86_64-linux, x86_64-darwin ] easyrender: [ i686-linux, x86_64-linux, x86_64-darwin ] + ebeats: [ i686-linux, x86_64-linux, x86_64-darwin ] ebnf-bff: [ i686-linux, x86_64-linux, x86_64-darwin ] ecdsa: [ i686-linux, x86_64-linux, x86_64-darwin ] ecma262: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1057,18 +3347,25 @@ dont-distribute-packages: effect-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects-mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] effective-aspects: [ i686-linux, x86_64-linux, x86_64-darwin ] + effin: [ i686-linux, x86_64-linux, x86_64-darwin ] egison-quote: [ i686-linux, x86_64-linux, x86_64-darwin ] ehaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] ehs: [ i686-linux, x86_64-linux, x86_64-darwin ] eibd-client-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] EitherT: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-carbon: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-log: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg-push: [ i686-linux, x86_64-linux, x86_64-darwin ] ekg-rrd: [ i686-linux, x86_64-linux, x86_64-darwin ] + ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] electrum-mnemonic: [ i686-linux, x86_64-linux, x86_64-darwin ] elevator: [ i686-linux, x86_64-linux, x86_64-darwin ] elision: [ i686-linux, x86_64-linux, x86_64-darwin ] elm-export: [ i686-linux, x86_64-linux, x86_64-darwin ] + elocrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] emacs-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] email-postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] + email-validator: [ 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 ] embeddock-example: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1077,28 +3374,46 @@ dont-distribute-packages: emgm: [ i686-linux, x86_64-linux, x86_64-darwin ] Emping: [ i686-linux, x86_64-linux, x86_64-darwin ] enchant: [ i686-linux, x86_64-linux, x86_64-darwin ] + encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-growler: [ i686-linux, x86_64-linux, x86_64-darwin ] engine-io-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + engine-io-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + engine-io-yesod: [ i686-linux, x86_64-linux, x86_64-darwin ] + engine-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + EntrezHTTP: [ i686-linux, x86_64-linux, x86_64-darwin ] + EnumContainers: [ i686-linux, x86_64-linux, x86_64-darwin ] enumerate: [ i686-linux, x86_64-linux, x86_64-darwin ] enumeration: [ i686-linux, x86_64-linux, x86_64-darwin ] enumfun: [ i686-linux, x86_64-linux, x86_64-darwin ] EnumMap: [ i686-linux, x86_64-linux, x86_64-darwin ] enummapmap: [ i686-linux, x86_64-linux, x86_64-darwin ] env-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + envy: [ i686-linux, x86_64-linux, x86_64-darwin ] + epanet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + epass: [ i686-linux, x86_64-linux, x86_64-darwin ] epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] epub-metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] epub-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] epubname: [ i686-linux, x86_64-linux, x86_64-darwin ] Eq: [ i686-linux, x86_64-linux, x86_64-darwin ] + equal-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + EqualitySolver: [ i686-linux, x86_64-linux, x86_64-darwin ] + erd: [ i686-linux, x86_64-linux, x86_64-darwin ] erf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] eros-client: [ i686-linux, x86_64-linux, x86_64-darwin ] eros-http: [ i686-linux, x86_64-linux, x86_64-darwin ] eros: [ i686-linux, x86_64-linux, x86_64-darwin ] + error-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] + error-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + error-loc: [ i686-linux, x86_64-linux, x86_64-darwin ] error-message: [ i686-linux, x86_64-linux, x86_64-darwin ] + error-util: [ i686-linux, x86_64-linux, x86_64-darwin ] ersatz-toysat: [ i686-linux, x86_64-linux, x86_64-darwin ] + ert: [ i686-linux, x86_64-linux, x86_64-darwin ] esotericbot: [ i686-linux, x86_64-linux, x86_64-darwin ] EsounD: [ i686-linux, x86_64-linux, x86_64-darwin ] esqueleto: [ i686-linux, x86_64-linux, x86_64-darwin ] + ess: [ i686-linux, x86_64-linux, x86_64-darwin ] estimators: [ i686-linux, x86_64-linux, x86_64-darwin ] estreps: [ i686-linux, x86_64-linux, x86_64-darwin ] Etage-Graph: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1113,11 +3428,17 @@ dont-distribute-packages: event-driven: [ i686-linux, x86_64-linux, x86_64-darwin ] event-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] EventSocket: [ i686-linux, x86_64-linux, x86_64-darwin ] + eventstore: [ i686-linux, x86_64-linux, x86_64-darwin ] every-bit-counts: [ i686-linux, x86_64-linux, x86_64-darwin ] ewe: [ i686-linux, x86_64-linux, x86_64-darwin ] + ex-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] exact-real: [ i686-linux, x86_64-linux, x86_64-darwin ] exception-hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + exception-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + execs: [ i686-linux, x86_64-linux, x86_64-darwin ] exhaustive: [ i686-linux, x86_64-linux, x86_64-darwin ] + exherbo-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] exif: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] exinst-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1126,9 +3447,14 @@ dont-distribute-packages: exinst: [ i686-linux, x86_64-linux, x86_64-darwin ] existential: [ i686-linux, x86_64-linux, x86_64-darwin ] exists: [ i686-linux, x86_64-linux, x86_64-darwin ] + exp-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] expand: [ i686-linux, x86_64-linux, x86_64-darwin ] expat-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] explain: [ i686-linux, x86_64-linux, x86_64-darwin ] + explicit-determinant: [ i686-linux, x86_64-linux, x86_64-darwin ] + explicit-iomodes-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + explicit-iomodes-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + explicit-iomodes: [ i686-linux, x86_64-linux, x86_64-darwin ] explicit-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] explore: [ i686-linux, x86_64-linux, x86_64-darwin ] exposed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1137,24 +3463,37 @@ dont-distribute-packages: extended-categories: [ i686-linux, x86_64-linux, x86_64-darwin ] extensible-data: [ i686-linux, x86_64-linux, x86_64-darwin ] Extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + extractelf: [ i686-linux, x86_64-linux, x86_64-darwin ] ez-couch: [ i686-linux, x86_64-linux, x86_64-darwin ] faceted: [ i686-linux, x86_64-linux, x86_64-darwin ] factory: [ i686-linux, x86_64-linux, x86_64-darwin ] + Facts: [ i686-linux, x86_64-linux, x86_64-darwin ] factual-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + fadno-braids: [ i686-linux, x86_64-linux, x86_64-darwin ] FailureT: [ i686-linux, x86_64-linux, x86_64-darwin ] + fake-type: [ i686-linux, x86_64-linux, x86_64-darwin ] falling-turnip: [ i686-linux, x86_64-linux, x86_64-darwin ] fallingblocks: [ i686-linux, x86_64-linux, x86_64-darwin ] family-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] fast-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] fastbayes: [ i686-linux, x86_64-linux, x86_64-darwin ] + fastedit: [ i686-linux, x86_64-linux, x86_64-darwin ] fastirc: [ i686-linux, x86_64-linux, x86_64-darwin ] + FastxPipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + fathead-util: [ i686-linux, x86_64-linux, x86_64-darwin ] fault-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] fay-hsx: [ i686-linux, x86_64-linux, x86_64-darwin ] + fb-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] + fbmessenger-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + fca: [ i686-linux, x86_64-linux, x86_64-darwin ] fcd: [ i686-linux, x86_64-linux, x86_64-darwin ] fckeditor: [ i686-linux, x86_64-linux, x86_64-darwin ] + fclabels-monadlib: [ i686-linux, x86_64-linux, x86_64-darwin ] FComp: [ i686-linux, x86_64-linux, x86_64-darwin ] fdo-trash: [ i686-linux, x86_64-linux, x86_64-darwin ] + fedora-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + feed-crawl: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-gipeda: [ i686-linux, x86_64-linux, x86_64-darwin ] feed-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] feed2lj: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1164,28 +3503,37 @@ dont-distribute-packages: fenfire: [ i686-linux, x86_64-linux, x86_64-darwin ] FermatsLastMargin: [ 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 ] + fficxx: [ i686-linux, x86_64-linux, x86_64-darwin ] ffmpeg-tutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] fibon: [ i686-linux, x86_64-linux, x86_64-darwin ] fields: [ i686-linux, x86_64-linux, x86_64-darwin ] FieldTrip: [ i686-linux, x86_64-linux, x86_64-darwin ] fieldwise: [ i686-linux, x86_64-linux, x86_64-darwin ] + file-collection: [ i686-linux, x86_64-linux, x86_64-darwin ] + file-command-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] file-location: [ i686-linux, x86_64-linux, x86_64-darwin ] + filediff: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManip: [ i686-linux, x86_64-linux, x86_64-darwin ] FileManipCompat: [ i686-linux, x86_64-linux, x86_64-darwin ] + filepath-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] filesystem-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] FileSystem: [ i686-linux, x86_64-linux, x86_64-darwin ] + filtrable: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Quote-Yahoo: [ i686-linux, x86_64-linux, x86_64-darwin ] Finance-Treasury: [ i686-linux, x86_64-linux, x86_64-darwin ] find-clumpiness: [ i686-linux, x86_64-linux, x86_64-darwin ] find-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] FiniteMap: [ i686-linux, x86_64-linux, x86_64-darwin ] + first-and-last: [ i686-linux, x86_64-linux, x86_64-darwin ] firstify: [ i686-linux, x86_64-linux, x86_64-darwin ] FirstOrderTheory: [ i686-linux, x86_64-linux, x86_64-darwin ] fishfood: [ i686-linux, x86_64-linux, x86_64-darwin ] fit: [ i686-linux, x86_64-linux, x86_64-darwin ] fitsio: [ i686-linux, x86_64-linux, x86_64-darwin ] + fix-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-parser-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] fix-symbols-gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-point-vector-space: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1194,6 +3542,10 @@ dont-distribute-packages: fixed-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] fixed-storable-array: [ i686-linux, x86_64-linux, x86_64-darwin ] fixfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + fizz-buzz: [ i686-linux, x86_64-linux, x86_64-darwin ] + flamethrower: [ i686-linux, x86_64-linux, x86_64-darwin ] + flat-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] + flexible-time: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap-smallcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] flexiwrap: [ i686-linux, x86_64-linux, x86_64-darwin ] flickr: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1203,13 +3555,16 @@ dont-distribute-packages: flow2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-api: [ i686-linux, x86_64-linux, x86_64-darwin ] flowdock-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] + flowdock: [ i686-linux, x86_64-linux, x86_64-darwin ] flower: [ i686-linux, x86_64-linux, x86_64-darwin ] flowlocks-framework: [ i686-linux, x86_64-linux, x86_64-darwin ] flowsim: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs-fluid-demos: [ i686-linux, x86_64-linux, x86_64-darwin ] fltkhs-hello-world: [ i686-linux, x86_64-linux, x86_64-darwin ] + fluidsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] FM-SBLEX: [ i686-linux, x86_64-linux, x86_64-darwin ] + fmark: [ i686-linux, x86_64-linux, x86_64-darwin ] FModExRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] fn-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] foldl-incremental: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1221,44 +3576,62 @@ dont-distribute-packages: for-free: [ i686-linux, x86_64-linux, x86_64-darwin ] forbidden-fruit: [ i686-linux, x86_64-linux, x86_64-darwin ] fordo: [ i686-linux, x86_64-linux, x86_64-darwin ] + foreign-var: [ i686-linux, x86_64-linux, x86_64-darwin ] + ForestStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] + forger: [ i686-linux, x86_64-linux, x86_64-darwin ] + forkable-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] formal: [ i686-linux, x86_64-linux, x86_64-darwin ] + FormalGrammars: [ i686-linux, x86_64-linux, x86_64-darwin ] format-status: [ i686-linux, x86_64-linux, x86_64-darwin ] format: [ i686-linux, x86_64-linux, x86_64-darwin ] + formattable: [ i686-linux, x86_64-linux, x86_64-darwin ] forml: [ i686-linux, x86_64-linux, x86_64-darwin ] formlets-hsp: [ i686-linux, x86_64-linux, x86_64-darwin ] formlets: [ i686-linux, x86_64-linux, x86_64-darwin ] formura: [ i686-linux, x86_64-linux, x86_64-darwin ] ForSyDe: [ i686-linux, x86_64-linux, x86_64-darwin ] forth-hll: [ i686-linux, x86_64-linux, x86_64-darwin ] + foscam-directory: [ i686-linux, x86_64-linux, x86_64-darwin ] + foscam-filename: [ i686-linux, x86_64-linux, x86_64-darwin ] foscam-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] Foster: [ i686-linux, x86_64-linux, x86_64-darwin ] foundation-edge: [ i686-linux, x86_64-linux, x86_64-darwin ] foundation: [ i686-linux, x86_64-linux, x86_64-darwin ] fpco-api: [ i686-linux, x86_64-linux, x86_64-darwin ] fpnla-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + fptest: [ i686-linux, x86_64-linux, x86_64-darwin ] Fractaler: [ i686-linux, x86_64-linux, x86_64-darwin ] + fractals: [ i686-linux, x86_64-linux, x86_64-darwin ] frag: [ i686-linux, x86_64-linux, x86_64-darwin ] franchise: [ i686-linux, x86_64-linux, x86_64-darwin ] Frank: [ i686-linux, x86_64-linux, x86_64-darwin ] fraxl: [ i686-linux, x86_64-linux, x86_64-darwin ] freddy: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-concurrent: [ i686-linux, x86_64-linux, x86_64-darwin ] free-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] free-game: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-http: [ i686-linux, x86_64-linux, x86_64-darwin ] free-operational: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-counterexamples: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-seq-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-seq: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems-webui: [ i686-linux, x86_64-linux, x86_64-darwin ] free-theorems: [ i686-linux, x86_64-linux, x86_64-darwin ] + free-vector-spaces: [ i686-linux, x86_64-linux, x86_64-darwin ] freekick2: [ i686-linux, x86_64-linux, x86_64-darwin ] freer: [ i686-linux, x86_64-linux, x86_64-darwin ] freesect: [ i686-linux, x86_64-linux, x86_64-darwin ] freesound: [ i686-linux, x86_64-linux, x86_64-darwin ] + freetype-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] FreeTypeGL: [ i686-linux, x86_64-linux, x86_64-darwin ] + friday-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] friday-juicypixels: [ i686-linux, x86_64-linux, x86_64-darwin ] + friday-scale-dct: [ i686-linux, x86_64-linux, x86_64-darwin ] + friday: [ i686-linux, x86_64-linux, x86_64-darwin ] frp-arduino: [ i686-linux, x86_64-linux, x86_64-darwin ] fs-events: [ i686-linux, x86_64-linux, x86_64-darwin ] fsmActions: [ i686-linux, x86_64-linux, x86_64-darwin ] + fsutils: [ i686-linux, x86_64-linux, x86_64-darwin ] ftdi: [ i686-linux, x86_64-linux, x86_64-darwin ] FTGL-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] ftp-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1270,25 +3643,35 @@ dont-distribute-packages: funbot-client: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot-git-hook: [ i686-linux, x86_64-linux, x86_64-darwin ] funbot: [ i686-linux, x86_64-linux, x86_64-darwin ] + funcons-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] function-combine: [ i686-linux, x86_64-linux, x86_64-darwin ] + function-instances-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] functional-arrow: [ i686-linux, x86_64-linux, x86_64-darwin ] functor-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] functorm: [ i686-linux, x86_64-linux, x86_64-darwin ] + Fungi: [ i686-linux, x86_64-linux, x86_64-darwin ] funion: [ i686-linux, x86_64-linux, x86_64-darwin ] + funpat: [ i686-linux, x86_64-linux, x86_64-darwin ] funsat: [ i686-linux, x86_64-linux, x86_64-darwin ] fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + futun: [ i686-linux, x86_64-linux, x86_64-darwin ] future: [ i686-linux, x86_64-linux, x86_64-darwin ] + fuzzy-timings: [ i686-linux, x86_64-linux, x86_64-darwin ] fuzzytime: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] fwgl: [ i686-linux, x86_64-linux, x86_64-darwin ] g-npm: [ i686-linux, x86_64-linux, x86_64-darwin ] gact: [ i686-linux, x86_64-linux, x86_64-darwin ] + game-of-life: [ i686-linux, x86_64-linux, x86_64-darwin ] + game-probability: [ i686-linux, x86_64-linux, x86_64-darwin ] gameclock: [ i686-linux, x86_64-linux, x86_64-darwin ] Ganymede: [ i686-linux, x86_64-linux, x86_64-darwin ] + garepinoh: [ i686-linux, x86_64-linux, x86_64-darwin ] gbu: [ i686-linux, x86_64-linux, x86_64-darwin ] gc-monitoring-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-ig: [ i686-linux, x86_64-linux, x86_64-darwin ] gdiff-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + GeBoP: [ i686-linux, x86_64-linux, x86_64-darwin ] geek-server: [ i686-linux, x86_64-linux, x86_64-darwin ] geek: [ i686-linux, x86_64-linux, x86_64-darwin ] gelatin: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1299,6 +3682,7 @@ dont-distribute-packages: general-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] GeneralTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] generators: [ i686-linux, x86_64-linux, x86_64-darwin ] + generic-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-church: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-maybe: [ i686-linux, x86_64-linux, x86_64-darwin ] generic-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1313,7 +3697,9 @@ dont-distribute-packages: genifunctors: [ i686-linux, x86_64-linux, x86_64-darwin ] geniplate: [ i686-linux, x86_64-linux, x86_64-darwin ] geniserver: [ i686-linux, x86_64-linux, x86_64-darwin ] + genprog: [ i686-linux, x86_64-linux, x86_64-darwin ] GenSmsPdu: [ i686-linux, x86_64-linux, x86_64-darwin ] + gentlemark: [ i686-linux, x86_64-linux, x86_64-darwin ] GenussFold: [ i686-linux, x86_64-linux, x86_64-darwin ] genvalidity-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] geo-resolver: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1322,16 +3708,21 @@ dont-distribute-packages: geodetics: [ i686-linux, x86_64-linux, x86_64-darwin ] geoip2: [ i686-linux, x86_64-linux, x86_64-darwin ] GeoIp: [ i686-linux, x86_64-linux, x86_64-darwin ] + geojson-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + geojson: [ i686-linux, x86_64-linux, x86_64-darwin ] geolite-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] geom2d: [ i686-linux, x86_64-linux, x86_64-darwin ] GeomPredicates-SSE: [ i686-linux, x86_64-linux, x86_64-darwin ] getemx: [ i686-linux, x86_64-linux, x86_64-darwin ] getflag: [ i686-linux, x86_64-linux, x86_64-darwin ] + GGg: [ i686-linux, x86_64-linux, x86_64-darwin ] ggtsTC: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-dup: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-events-analyze: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-events-parallel: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-generic-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-imported-from: [ i686-linux, x86_64-linux, x86_64-darwin ] + ghc-man-completion: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-autofix: [ i686-linux, x86_64-linux, x86_64-darwin ] ghc-pkg-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1369,24 +3760,41 @@ dont-distribute-packages: gi-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] giak: [ i686-linux, x86_64-linux, x86_64-darwin ] ginger: [ i686-linux, x86_64-linux, x86_64-darwin ] + giphy-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + GiST: [ i686-linux, x86_64-linux, x86_64-darwin ] gist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-all: [ i686-linux, x86_64-linux, x86_64-darwin ] git-checklist: [ i686-linux, x86_64-linux, x86_64-darwin ] git-date: [ i686-linux, x86_64-linux, x86_64-darwin ] git-gpush: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-jump: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-object: [ i686-linux, x86_64-linux, x86_64-darwin ] git-repair: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-sanity: [ i686-linux, x86_64-linux, x86_64-darwin ] + git-vogue: [ i686-linux, x86_64-linux, x86_64-darwin ] gitdo: [ i686-linux, x86_64-linux, x86_64-darwin ] github-backup: [ i686-linux, x86_64-linux, x86_64-darwin ] github-release: [ i686-linux, x86_64-linux, x86_64-darwin ] github-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + github-webhook-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] + github: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitit: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-cross: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] gitlib-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitson: [ i686-linux, x86_64-linux, x86_64-darwin ] + gitter: [ i686-linux, x86_64-linux, x86_64-darwin ] + givegif: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + 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 ] glicko: [ i686-linux, x86_64-linux, x86_64-darwin ] glider-nlp: [ i686-linux, x86_64-linux, x86_64-darwin ] + glirc: [ i686-linux, x86_64-linux, x86_64-darwin ] + gll: [ i686-linux, x86_64-linux, x86_64-darwin ] GLMatrix: [ i686-linux, x86_64-linux, x86_64-darwin ] global-config: [ i686-linux, x86_64-linux, x86_64-darwin ] global-variables: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1399,6 +3807,12 @@ dont-distribute-packages: gloss-banana: [ i686-linux, x86_64-linux, x86_64-darwin ] gloss-devil: [ 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 ] + glue-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] + glue-example: [ i686-linux, x86_64-linux, x86_64-darwin ] + glue: [ i686-linux, x86_64-linux, x86_64-darwin ] + gluturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] gmap: [ i686-linux, x86_64-linux, x86_64-darwin ] gmndl: [ i686-linux, x86_64-linux, x86_64-darwin ] gnome-desktop: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1412,42 +3826,65 @@ dont-distribute-packages: goal-simulation: [ i686-linux, x86_64-linux, x86_64-darwin ] gofer-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] gooey: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-drive: [ i686-linux, x86_64-linux, x86_64-darwin ] google-html5-slide: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-oauth2-jwt: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-oauth2: [ i686-linux, x86_64-linux, x86_64-darwin ] + google-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleDirections: [ i686-linux, x86_64-linux, x86_64-darwin ] googleplus: [ i686-linux, x86_64-linux, x86_64-darwin ] + googlepolyline: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleSB: [ i686-linux, x86_64-linux, x86_64-darwin ] + GoogleSuggest: [ i686-linux, x86_64-linux, x86_64-darwin ] GoogleTranslate: [ i686-linux, x86_64-linux, x86_64-darwin ] gopherbot: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-network: [ i686-linux, x86_64-linux, x86_64-darwin ] gore-and-ash-sync: [ i686-linux, x86_64-linux, x86_64-darwin ] + GotoT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] gpah: [ i686-linux, x86_64-linux, x86_64-darwin ] + gpio: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Collada: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + GPipe-GLFW: [ i686-linux, x86_64-linux, x86_64-darwin ] GPipe-TextureLoad: [ i686-linux, x86_64-linux, x86_64-darwin ] gps2htmlReport: [ i686-linux, x86_64-linux, x86_64-darwin ] gps: [ i686-linux, x86_64-linux, x86_64-darwin ] gpx-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] GPX: [ i686-linux, x86_64-linux, x86_64-darwin ] + graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] grammar-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] + GrammarProducts: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-records: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-ui-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] grapefruit-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-rewriting-cl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-lambdascope: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ski: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-trs: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting-ww: [ i686-linux, x86_64-linux, x86_64-darwin ] + graph-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] graph-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] Graph500: [ i686-linux, x86_64-linux, x86_64-darwin ] Graphalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] graphbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphene: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] GraphHammer: [ i686-linux, x86_64-linux, x86_64-darwin ] + graphics-drawingcombinators: [ i686-linux, x86_64-linux, x86_64-darwin ] graphics-formats-collada: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicsFormats: [ i686-linux, x86_64-linux, x86_64-darwin ] graphicstools: [ i686-linux, x86_64-linux, x86_64-darwin ] graphtype: [ i686-linux, x86_64-linux, x86_64-darwin ] grasp: [ i686-linux, x86_64-linux, x86_64-darwin ] + gray-extended: [ i686-linux, x86_64-linux, x86_64-darwin ] + graylog: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] greencard: [ i686-linux, x86_64-linux, x86_64-darwin ] greg-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1457,6 +3894,7 @@ dont-distribute-packages: gridfs: [ i686-linux, x86_64-linux, x86_64-darwin ] gridland: [ i686-linux, x86_64-linux, x86_64-darwin ] grm: [ i686-linux, x86_64-linux, x86_64-darwin ] + GroteTrap: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-inspector: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1464,6 +3902,7 @@ dont-distribute-packages: groundhog-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog-th: [ i686-linux, x86_64-linux, x86_64-darwin ] groundhog: [ i686-linux, x86_64-linux, x86_64-darwin ] + group-with: [ i686-linux, x86_64-linux, x86_64-darwin ] Grow: [ i686-linux, x86_64-linux, x86_64-darwin ] growler: [ i686-linux, x86_64-linux, x86_64-darwin ] GrowlNotify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1483,6 +3922,7 @@ dont-distribute-packages: gtk2hs-cast-gtkglext: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-gtksourceview2: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-cast-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + gtk2hs-hello: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk2hs-rpn: [ i686-linux, x86_64-linux, x86_64-darwin ] Gtk2hsGenerics: [ i686-linux, x86_64-linux, x86_64-darwin ] gtk3-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1495,6 +3935,8 @@ dont-distribute-packages: guid: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] GuiTV: [ i686-linux, x86_64-linux, x86_64-darwin ] + gulcii: [ i686-linux, x86_64-linux, x86_64-darwin ] + gyah-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] h-booru: [ i686-linux, x86_64-linux, x86_64-darwin ] h-gpgme: [ i686-linux, x86_64-linux, x86_64-darwin ] h2048: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1503,6 +3945,7 @@ dont-distribute-packages: hack-contrib-press: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-frontend-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + hack-handler-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-epoll: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-evhttp: [ i686-linux, x86_64-linux, x86_64-darwin ] hack-handler-fastcgi: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1518,7 +3961,9 @@ dont-distribute-packages: hack2-handler-snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-handler-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] hack2-interface-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hackage-repo-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage-sparks: [ i686-linux, x86_64-linux, x86_64-darwin ] hackage2hwn: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1526,28 +3971,46 @@ dont-distribute-packages: hackernews: [ i686-linux, x86_64-linux, x86_64-darwin ] HackMail: [ i686-linux, x86_64-linux, x86_64-darwin ] hactor: [ i686-linux, x86_64-linux, x86_64-darwin ] + hactors: [ i686-linux, x86_64-linux, x86_64-darwin ] haddock-leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + hadoop-formats: [ i686-linux, x86_64-linux, x86_64-darwin ] + hadoop-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] haggis: [ i686-linux, x86_64-linux, x86_64-darwin ] Haggressive: [ i686-linux, x86_64-linux, x86_64-darwin ] haiji: [ i686-linux, x86_64-linux, x86_64-darwin ] + hailgun-send: [ i686-linux, x86_64-linux, x86_64-darwin ] hairy: [ i686-linux, x86_64-linux, x86_64-darwin ] hakaru: [ i686-linux, x86_64-linux, x86_64-darwin ] hakismet: [ i686-linux, x86_64-linux, x86_64-darwin ] + hako: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-agda: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-blaze-templates: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-contrib-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-contrib-hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib-links: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-filestore: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-ogmarkup: [ i686-linux, x86_64-linux, x86_64-darwin ] hakyll-R: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll-shakespeare: [ i686-linux, x86_64-linux, x86_64-darwin ] + hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] halberd: [ i686-linux, x86_64-linux, x86_64-darwin ] halfs: [ i686-linux, x86_64-linux, x86_64-darwin ] halipeto: [ i686-linux, x86_64-linux, x86_64-darwin ] halma: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaMinitel: [ i686-linux, x86_64-linux, x86_64-darwin ] hampp: [ i686-linux, x86_64-linux, x86_64-darwin ] + hamsql: [ i686-linux, x86_64-linux, x86_64-darwin ] hamtmap: [ i686-linux, x86_64-linux, x86_64-darwin ] hamusic: [ i686-linux, x86_64-linux, x86_64-darwin ] handsy: [ i686-linux, x86_64-linux, x86_64-darwin ] + Hangman: [ i686-linux, x86_64-linux, x86_64-darwin ] hannahci: [ i686-linux, x86_64-linux, x86_64-darwin ] hans-pcap: [ i686-linux, x86_64-linux, x86_64-darwin ] + hans: [ i686-linux, x86_64-linux, x86_64-darwin ] haphviz: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator3: [ i686-linux, x86_64-linux, x86_64-darwin ] happindicator: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1565,29 +4028,39 @@ dont-distribute-packages: happstack-data: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-dlg: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-facebook: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-fay-ajax: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-hamlet: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-heist: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-hstringtemplate: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-ixset: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-monad-peel: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-server-tls-cryptonite: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack-server-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-state: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-static-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-util: [ i686-linux, x86_64-linux, x86_64-darwin ] happstack-yui: [ i686-linux, x86_64-linux, x86_64-darwin ] + happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] + happy-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit-server: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] happybara: [ i686-linux, x86_64-linux, x86_64-darwin ] hapstone: [ i686-linux, x86_64-linux, x86_64-darwin ] HaPy: [ i686-linux, x86_64-linux, x86_64-darwin ] + har: [ i686-linux, x86_64-linux, x86_64-darwin ] harchive: [ i686-linux, x86_64-linux, x86_64-darwin ] hardware-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaRe: [ i686-linux, x86_64-linux, x86_64-darwin ] hark: [ i686-linux, x86_64-linux, x86_64-darwin ] HARM: [ i686-linux, x86_64-linux, x86_64-darwin ] harmony: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace-Base: [ i686-linux, x86_64-linux, x86_64-darwin ] HarmTrace: [ i686-linux, x86_64-linux, x86_64-darwin ] haroonga-httpd: [ i686-linux, x86_64-linux, x86_64-darwin ] + haroonga: [ i686-linux, x86_64-linux, x86_64-darwin ] harvest-api: [ i686-linux, x86_64-linux, x86_64-darwin ] has-th: [ i686-linux, x86_64-linux, x86_64-darwin ] has: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1604,28 +4077,39 @@ dont-distribute-packages: hashed-storage: [ i686-linux, x86_64-linux, x86_64-darwin ] Hashell: [ i686-linux, x86_64-linux, x86_64-darwin ] hashids: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashring: [ i686-linux, x86_64-linux, x86_64-darwin ] + hashtables-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] hasim: [ i686-linux, x86_64-linux, x86_64-darwin ] hask-home: [ i686-linux, x86_64-linux, x86_64-darwin ] hask: [ i686-linux, x86_64-linux, x86_64-darwin ] haskanoid: [ i686-linux, x86_64-linux, x86_64-darwin ] haskarrow: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskbot-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskdeep: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeem: [ i686-linux, x86_64-linux, x86_64-darwin ] haskeline-class: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-aliyun: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-awk: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-brainfuck: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-cnc: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-coffee: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-compression: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-course-preludes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-formatter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-ftp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-generate: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-import-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-kubernetes: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-mpfr: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-names: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-neo4j-client: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-pdf-presenter: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-platform-test: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-player: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-read-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-reflect: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-src-exts-prisms: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1640,10 +4124,12 @@ dont-distribute-packages: haskell-tools-refactor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tor: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-type-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-tyrant: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell2010: [ i686-linux, x86_64-linux, x86_64-darwin ] haskell98: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskell98libraries: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-connect-hdbc-catchio-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-connect-hdbc-catchio-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] haskelldb-connect-hdbc-catchio-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1668,10 +4154,13 @@ dont-distribute-packages: HaskellNN: [ i686-linux, x86_64-linux, x86_64-darwin ] Haskelloids: [ i686-linux, x86_64-linux, x86_64-darwin ] haskellscrabble: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskellscript: [ i686-linux, x86_64-linux, x86_64-darwin ] HaskellTorrent: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaskellTutorials: [ i686-linux, x86_64-linux, x86_64-darwin ] haskgame: [ i686-linux, x86_64-linux, x86_64-darwin ] haskheap: [ i686-linux, x86_64-linux, x86_64-darwin ] haskhol-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + haskmon: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-core: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-crypto: [ i686-linux, x86_64-linux, x86_64-darwin ] haskoin-node: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1702,10 +4191,12 @@ dont-distribute-packages: haste-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-gapi: [ i686-linux, x86_64-linux, x86_64-darwin ] haste-perch: [ i686-linux, x86_64-linux, x86_64-darwin ] + haste: [ i686-linux, x86_64-linux, x86_64-darwin ] hat: [ i686-linux, x86_64-linux, x86_64-darwin ] Hate: [ i686-linux, x86_64-linux, x86_64-darwin ] hatex-guide: [ i686-linux, x86_64-linux, x86_64-darwin ] HaTeX-meta: [ i686-linux, x86_64-linux, x86_64-darwin ] + HaTeX-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] hats: [ i686-linux, x86_64-linux, x86_64-darwin ] haverer: [ i686-linux, x86_64-linux, x86_64-darwin ] HaVSA: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1716,6 +4207,8 @@ dont-distribute-packages: haxl: [ i686-linux, x86_64-linux, x86_64-darwin ] haxparse: [ i686-linux, x86_64-linux, x86_64-darwin ] haxr-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + haxr: [ i686-linux, x86_64-linux, x86_64-darwin ] + haxy: [ i686-linux, x86_64-linux, x86_64-darwin ] hayland: [ i686-linux, x86_64-linux, x86_64-darwin ] hayoo-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] Hayoo: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1729,14 +4222,20 @@ dont-distribute-packages: hbro: [ i686-linux, x86_64-linux, x86_64-darwin ] hburg: [ i686-linux, x86_64-linux, x86_64-darwin ] HCard: [ i686-linux, x86_64-linux, x86_64-darwin ] + hcc: [ i686-linux, x86_64-linux, x86_64-darwin ] hcheat: [ i686-linux, x86_64-linux, x86_64-darwin ] hchesslib: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] 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 ] hdaemonize-buildfix: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbc-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] HDBC-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + HDBC-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] + hdbc-postgresql-hstore: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] hdbi-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1753,8 +4252,15 @@ dont-distribute-packages: hdph: [ i686-linux, x86_64-linux, x86_64-darwin ] hdr-histogram: [ i686-linux, x86_64-linux, x86_64-darwin ] HDRUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] + headergen: [ i686-linux, x86_64-linux, x86_64-darwin ] + heaps: [ i686-linux, x86_64-linux, x86_64-darwin ] hecc: [ i686-linux, x86_64-linux, x86_64-darwin ] + heckle: [ i686-linux, x86_64-linux, x86_64-darwin ] Hedi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedis-pile: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedis-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + hedis-tags: [ i686-linux, x86_64-linux, x86_64-darwin ] + hein: [ i686-linux, x86_64-linux, x86_64-darwin ] heist-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] heist-async: [ i686-linux, x86_64-linux, x86_64-darwin ] heist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1790,8 +4296,11 @@ dont-distribute-packages: heukarya: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa-dph: [ i686-linux, x86_64-linux, x86_64-darwin ] hevolisa: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexif: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpat-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] hexpat-pickle-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hexpr: [ i686-linux, x86_64-linux, x86_64-darwin ] hexquote: [ i686-linux, x86_64-linux, x86_64-darwin ] hF2: [ i686-linux, x86_64-linux, x86_64-darwin ] hfann: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1799,6 +4308,7 @@ dont-distribute-packages: hfiar: [ i686-linux, x86_64-linux, x86_64-darwin ] hfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] hfoil: [ i686-linux, x86_64-linux, x86_64-darwin ] + hfov: [ i686-linux, x86_64-linux, x86_64-darwin ] hfractal: [ i686-linux, x86_64-linux, x86_64-darwin ] HFrequencyQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] hfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1822,20 +4332,29 @@ dont-distribute-packages: HGamer3D-SFML-Binding: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-WinEvent: [ i686-linux, x86_64-linux, x86_64-darwin ] HGamer3D-Wire: [ i686-linux, x86_64-linux, x86_64-darwin ] + HGamer3D: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgdbmi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgearman: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgen: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeometry: [ i686-linux, x86_64-linux, x86_64-darwin ] hgeos: [ i686-linux, x86_64-linux, x86_64-darwin ] hgithub: [ i686-linux, x86_64-linux, x86_64-darwin ] hgom: [ i686-linux, x86_64-linux, x86_64-darwin ] + hgopher: [ i686-linux, x86_64-linux, x86_64-darwin ] HGraphStorage: [ i686-linux, x86_64-linux, x86_64-darwin ] hgrib: [ i686-linux, x86_64-linux, x86_64-darwin ] hharp: [ i686-linux, x86_64-linux, x86_64-darwin ] HHDL: [ i686-linux, x86_64-linux, x86_64-darwin ] + hi3status: [ i686-linux, x86_64-linux, x86_64-darwin ] + hi: [ i686-linux, x86_64-linux, x86_64-darwin ] hiccup: [ i686-linux, x86_64-linux, x86_64-darwin ] hichi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hidapi: [ i686-linux, x86_64-linux, x86_64-darwin ] hieraclus: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-clustering-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] hierarchical-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] hiernotify: [ i686-linux, x86_64-linux, x86_64-darwin ] Hieroglyph: [ i686-linux, x86_64-linux, x86_64-darwin ] HiggsSet: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1845,26 +4364,34 @@ dont-distribute-packages: highWaterMark: [ i686-linux, x86_64-linux, x86_64-darwin ] himg: [ i686-linux, x86_64-linux, x86_64-darwin ] himpy: [ i686-linux, x86_64-linux, x86_64-darwin ] + hindley-milner: [ i686-linux, x86_64-linux, x86_64-darwin ] + hinquire: [ i686-linux, x86_64-linux, x86_64-darwin ] hinstaller: [ i686-linux, x86_64-linux, x86_64-darwin ] + hint-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hinvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] hinze-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] hip: [ i686-linux, x86_64-linux, x86_64-darwin ] hipbot: [ i686-linux, x86_64-linux, x86_64-darwin ] hipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + HipmunkPlayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hircules: [ i686-linux, x86_64-linux, x86_64-darwin ] hirt: [ i686-linux, x86_64-linux, x86_64-darwin ] Hish: [ i686-linux, x86_64-linux, x86_64-darwin ] hissmetrics: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + hist-pl-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl-lmf: [ i686-linux, x86_64-linux, x86_64-darwin ] + hist-pl-types: [ i686-linux, x86_64-linux, x86_64-darwin ] hist-pl: [ i686-linux, x86_64-linux, x86_64-darwin ] historian: [ i686-linux, x86_64-linux, x86_64-darwin ] HJavaScript: [ i686-linux, x86_64-linux, x86_64-darwin ] + hjcase: [ i686-linux, x86_64-linux, x86_64-darwin ] hjs: [ i686-linux, x86_64-linux, x86_64-darwin ] HJScript: [ i686-linux, x86_64-linux, x86_64-darwin ] HJVM: [ i686-linux, x86_64-linux, x86_64-darwin ] hlbfgsb: [ i686-linux, x86_64-linux, x86_64-darwin ] hlcm: [ i686-linux, x86_64-linux, x86_64-darwin ] + hleap: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-approximation: [ i686-linux, x86_64-linux, x86_64-darwin ] HLearn-classification: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1873,9 +4400,12 @@ dont-distribute-packages: hledger-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] hledger-vty: [ i686-linux, x86_64-linux, x86_64-darwin ] + hledger-web: [ i686-linux, x86_64-linux, x86_64-darwin ] + hlibBladeRF: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibev: [ i686-linux, x86_64-linux, x86_64-darwin ] hlibfam: [ i686-linux, x86_64-linux, x86_64-darwin ] HList: [ i686-linux, x86_64-linux, x86_64-darwin ] + HListPP: [ i686-linux, x86_64-linux, x86_64-darwin ] HLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] hlogger: [ i686-linux, x86_64-linux, x86_64-darwin ] hly: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1916,6 +4446,7 @@ dont-distribute-packages: hogre-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hogre: [ i686-linux, x86_64-linux, x86_64-darwin ] hois: [ i686-linux, x86_64-linux, x86_64-darwin ] + hold-em: [ i686-linux, x86_64-linux, x86_64-darwin ] hole: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-Distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] Holumbus-MapReduce: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1934,12 +4465,15 @@ dont-distribute-packages: hoodle-render: [ i686-linux, x86_64-linux, x86_64-darwin ] hoodle: [ i686-linux, x86_64-linux, x86_64-darwin ] hoogle-index: [ i686-linux, x86_64-linux, x86_64-darwin ] + hooks-dir: [ i686-linux, x86_64-linux, x86_64-darwin ] hoovie: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencc: [ i686-linux, x86_64-linux, x86_64-darwin ] hopencl: [ i686-linux, x86_64-linux, x86_64-darwin ] hopfield: [ i686-linux, x86_64-linux, x86_64-darwin ] + hopfli: [ i686-linux, x86_64-linux, x86_64-darwin ] hops: [ i686-linux, x86_64-linux, x86_64-darwin ] hoq: [ i686-linux, x86_64-linux, x86_64-darwin ] + horizon: [ i686-linux, x86_64-linux, x86_64-darwin ] hosts-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hotswap: [ i686-linux, x86_64-linux, x86_64-darwin ] hourglass-fuzzy-parsing: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1957,6 +4491,7 @@ dont-distribute-packages: HPath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpath: [ i686-linux, x86_64-linux, x86_64-darwin ] hpc-tracer: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpdft: [ i686-linux, x86_64-linux, x86_64-darwin ] HPi: [ i686-linux, x86_64-linux, x86_64-darwin ] hplayground: [ i686-linux, x86_64-linux, x86_64-darwin ] hplaylist: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -1967,12 +4502,16 @@ dont-distribute-packages: hpqtypes: [ i686-linux, x86_64-linux, x86_64-darwin ] hprotoc-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] hps-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] + hps-kmeans: [ i686-linux, x86_64-linux, x86_64-darwin ] + hPushover: [ i686-linux, x86_64-linux, x86_64-darwin ] + hpygments: [ i686-linux, x86_64-linux, x86_64-darwin ] hpylos: [ i686-linux, x86_64-linux, x86_64-darwin ] hquantlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hR: [ i686-linux, x86_64-linux, x86_64-darwin ] hranker: [ i686-linux, x86_64-linux, x86_64-darwin ] HRay: [ 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 ] 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 ] @@ -1980,22 +4519,29 @@ dont-distribute-packages: HROOT-math: [ i686-linux, x86_64-linux, x86_64-darwin ] HROOT: [ i686-linux, x86_64-linux, x86_64-darwin ] hruby: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-blake2: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-carbon-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-cdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-di: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-dotnet: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-duktape: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-excelx: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-ffmpeg: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-fltk: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-gchart: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-gen-iface: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-GeoIP: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-gizapp: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-java: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-json-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-logo: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-mesos: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-nombre-generator: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pgms: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-pkg-config: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-pkpass: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-re: [ i686-linux, x86_64-linux, x86_64-darwin ] + hs-scrape: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-twitterarchiver: [ i686-linux, x86_64-linux, x86_64-darwin ] hs-vcard: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2003,8 +4549,12 @@ dont-distribute-packages: hs2bf: [ i686-linux, x86_64-linux, x86_64-darwin ] hs2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] Hs2lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + hS3: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsay: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbackup: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsbencher-codespeed: [ i686-linux, x86_64-linux, x86_64-darwin ] hsbencher-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsbencher: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-data: [ i686-linux, x86_64-linux, x86_64-darwin ] hsc3-forth: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2018,12 +4568,20 @@ dont-distribute-packages: hscaffold: [ i686-linux, x86_64-linux, x86_64-darwin ] hscamwire: [ i686-linux, x86_64-linux, x86_64-darwin ] hscassandra: [ i686-linux, x86_64-linux, x86_64-darwin ] + hscd: [ i686-linux, x86_64-linux, x86_64-darwin ] hsclock: [ i686-linux, x86_64-linux, x86_64-darwin ] + hScraper: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsdev: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsdif: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdip: [ i686-linux, x86_64-linux, x86_64-darwin ] hsdns-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsed: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsemail-ns: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsenv: [ i686-linux, x86_64-linux, x86_64-darwin ] hsfacter: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsfcsh: [ i686-linux, x86_64-linux, x86_64-darwin ] HSFFIG: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsfilt: [ i686-linux, x86_64-linux, x86_64-darwin ] HSGEP: [ i686-linux, x86_64-linux, x86_64-darwin ] hsgnutls-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] hsgnutls: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2038,37 +4596,49 @@ dont-distribute-packages: hskeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] hslackbuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] hslibsvm: [ i686-linux, x86_64-linux, x86_64-darwin ] + HSlippyMap: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-reader: [ i686-linux, x86_64-linux, x86_64-darwin ] hslogger-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + hslogstash: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmagick: [ i686-linux, x86_64-linux, x86_64-darwin ] HSmarty: [ i686-linux, x86_64-linux, x86_64-darwin ] Hsmtlib: [ i686-linux, x86_64-linux, x86_64-darwin ] hsmtpclient: [ i686-linux, x86_64-linux, x86_64-darwin ] hsnock: [ i686-linux, x86_64-linux, x86_64-darwin ] hsns: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsnsq: [ i686-linux, x86_64-linux, x86_64-darwin ] hsntp: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsOpenSSL-x509-system: [ i686-linux, x86_64-linux, x86_64-darwin ] + HsOpenSSL: [ i686-linux, x86_64-linux, x86_64-darwin ] hsoptions: [ i686-linux, x86_64-linux, x86_64-darwin ] HSoundFile: [ i686-linux, x86_64-linux, x86_64-darwin ] hsp-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsparklines: [ i686-linux, x86_64-linux, x86_64-darwin ] hsparql: [ i686-linux, x86_64-linux, x86_64-darwin ] hspear: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-expectations-pretty-diff: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-expectations-pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-experimental: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-golden-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + hspec-monad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] hspec-test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] HsPerl5: [ i686-linux, x86_64-linux, x86_64-darwin ] hspread: [ i686-linux, x86_64-linux, x86_64-darwin ] hspresent: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsprocess: [ i686-linux, x86_64-linux, x86_64-darwin ] hsql-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel-vinyl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-datamodel: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-demo-notes: [ i686-linux, x86_64-linux, x86_64-darwin ] hsqml-morris: [ i686-linux, x86_64-linux, x86_64-darwin ] + hsreadability: [ i686-linux, x86_64-linux, x86_64-darwin ] hsseccomp: [ i686-linux, x86_64-linux, x86_64-darwin ] hsSqlite3: [ i686-linux, x86_64-linux, x86_64-darwin ] HsSVN: [ i686-linux, x86_64-linux, x86_64-darwin ] + hstats: [ i686-linux, x86_64-linux, x86_64-darwin ] hstest: [ i686-linux, x86_64-linux, x86_64-darwin ] hstidy: [ i686-linux, x86_64-linux, x86_64-darwin ] hstorchat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2084,25 +4654,37 @@ dont-distribute-packages: hsXenCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] hsyscall: [ i686-linux, x86_64-linux, x86_64-darwin ] hszephyr: [ i686-linux, x86_64-linux, x86_64-darwin ] + HTab: [ i686-linux, x86_64-linux, x86_64-darwin ] hTalos: [ i686-linux, x86_64-linux, x86_64-darwin ] + htar: [ i686-linux, x86_64-linux, x86_64-darwin ] HTicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] html-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] html-tokenizer: [ i686-linux, x86_64-linux, x86_64-darwin ] hts: [ i686-linux, x86_64-linux, x86_64-darwin ] htsn-import: [ i686-linux, x86_64-linux, x86_64-darwin ] http-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-client-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-client-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-client-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] http-client-request-modifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-client-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-conduit-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] http-conduit-downloader: [ i686-linux, x86_64-linux, x86_64-darwin ] http-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] http-kinder: [ i686-linux, x86_64-linux, x86_64-darwin ] http-proxy: [ i686-linux, x86_64-linux, x86_64-darwin ] http-shed: [ i686-linux, x86_64-linux, x86_64-darwin ] + http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] http-wget: [ i686-linux, x86_64-linux, x86_64-darwin ] + https-everywhere-rules-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] https-everywhere-rules: [ i686-linux, x86_64-linux, x86_64-darwin ] httpspec: [ i686-linux, x86_64-linux, x86_64-darwin ] htune: [ i686-linux, x86_64-linux, x86_64-darwin ] + htzaar: [ i686-linux, x86_64-linux, x86_64-darwin ] + hubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] hubris: [ i686-linux, x86_64-linux, x86_64-darwin ] + HueAPI: [ i686-linux, x86_64-linux, x86_64-darwin ] + huff: [ i686-linux, x86_64-linux, x86_64-darwin ] hugs2yc: [ i686-linux, x86_64-linux, x86_64-darwin ] hulk: [ i686-linux, x86_64-linux, x86_64-darwin ] HulkImport: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2111,11 +4693,13 @@ dont-distribute-packages: hunit-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] HUnit-Plus: [ i686-linux, x86_64-linux, x86_64-darwin ] hunit-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + hunp: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-searchengine: [ i686-linux, x86_64-linux, x86_64-darwin ] hunt-server: [ i686-linux, x86_64-linux, x86_64-darwin ] hurdle: [ i686-linux, x86_64-linux, x86_64-darwin ] husky: [ i686-linux, x86_64-linux, x86_64-darwin ] hutton: [ i686-linux, x86_64-linux, x86_64-darwin ] + huttons-razor: [ i686-linux, x86_64-linux, x86_64-darwin ] huzzy: [ i686-linux, x86_64-linux, x86_64-darwin ] hVOIDP: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2123,6 +4707,9 @@ dont-distribute-packages: hw-json: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-rankselect: [ i686-linux, x86_64-linux, x86_64-darwin ] hw-succinct: [ i686-linux, x86_64-linux, x86_64-darwin ] + hwall-auth-iitk: [ i686-linux, x86_64-linux, x86_64-darwin ] + hworker-ses: [ i686-linux, x86_64-linux, x86_64-darwin ] + hworker: [ i686-linux, x86_64-linux, x86_64-darwin ] hws: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-bytevector: [ i686-linux, x86_64-linux, x86_64-darwin ] hwsl2-reducers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2135,8 +4722,10 @@ dont-distribute-packages: hxt-filter: [ i686-linux, x86_64-linux, x86_64-darwin ] hxthelper: [ i686-linux, x86_64-linux, x86_64-darwin ] hxweb: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyakko: [ i686-linux, x86_64-linux, x86_64-darwin ] hybrid: [ i686-linux, x86_64-linux, x86_64-darwin ] hydra-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydra-print: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-cli-args: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-data: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2146,25 +4735,37 @@ dont-distribute-packages: hydrogen-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] hydrogen-util: [ i686-linux, x86_64-linux, x86_64-darwin ] + hydrogen: [ i686-linux, x86_64-linux, x86_64-darwin ] hyena: [ i686-linux, x86_64-linux, x86_64-darwin ] + hylotab: [ i686-linux, x86_64-linux, x86_64-darwin ] hyloutils: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperdrive: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyperfunctions: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyperloglog: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperloglogplus: [ i686-linux, x86_64-linux, x86_64-darwin ] hyperpublic: [ i686-linux, x86_64-linux, x86_64-darwin ] + hyphenation: [ i686-linux, x86_64-linux, x86_64-darwin ] hypher: [ i686-linux, x86_64-linux, x86_64-darwin ] + hzulip: [ i686-linux, x86_64-linux, x86_64-darwin ] i18n: [ i686-linux, x86_64-linux, x86_64-darwin ] + iap-verifier: [ i686-linux, x86_64-linux, x86_64-darwin ] + ib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] IcoGrid: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-common: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend-server: [ i686-linux, x86_64-linux, x86_64-darwin ] ide-backend: [ i686-linux, x86_64-linux, x86_64-darwin ] ideas-math: [ i686-linux, x86_64-linux, x86_64-darwin ] + idempotent: [ i686-linux, x86_64-linux, x86_64-darwin ] + identifiers: [ i686-linux, x86_64-linux, x86_64-darwin ] idiii: [ i686-linux, x86_64-linux, x86_64-darwin ] idna2008: [ i686-linux, x86_64-linux, x86_64-darwin ] IDynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] ieee-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] iException: [ i686-linux, x86_64-linux, x86_64-darwin ] ifcxt: [ i686-linux, x86_64-linux, x86_64-darwin ] + iff: [ i686-linux, x86_64-linux, x86_64-darwin ] IFS: [ i686-linux, x86_64-linux, x86_64-darwin ] + ig: [ i686-linux, x86_64-linux, x86_64-darwin ] ige-mac-integration: [ i686-linux, x86_64-linux, x86_64-darwin ] igraph: [ i686-linux, x86_64-linux, x86_64-darwin ] igrf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2188,6 +4789,7 @@ dont-distribute-packages: imagemagick: [ i686-linux, x86_64-linux, x86_64-darwin ] imagepaste: [ i686-linux, x86_64-linux, x86_64-darwin ] imap: [ i686-linux, x86_64-linux, x86_64-darwin ] + imapget: [ i686-linux, x86_64-linux, x86_64-darwin ] imbib: [ i686-linux, x86_64-linux, x86_64-darwin ] imgurder: [ i686-linux, x86_64-linux, x86_64-darwin ] imparse: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2195,12 +4797,17 @@ dont-distribute-packages: imperative-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] ImperativeHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] implicit-logging: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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 ] 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 ] incremental-computing: [ i686-linux, x86_64-linux, x86_64-darwin ] incremental-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] increments: [ i686-linux, x86_64-linux, x86_64-darwin ] + indexed-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + IndexedList: [ i686-linux, x86_64-linux, x86_64-darwin ] indices: [ i686-linux, x86_64-linux, x86_64-darwin ] indieweb-algorithms: [ i686-linux, x86_64-linux, x86_64-darwin ] inf-interval: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2210,13 +4817,18 @@ dont-distribute-packages: infix: [ i686-linux, x86_64-linux, x86_64-darwin ] InfixApplicative: [ i686-linux, x86_64-linux, x86_64-darwin ] inflist: [ i686-linux, x86_64-linux, x86_64-darwin ] + informative: [ i686-linux, x86_64-linux, x86_64-darwin ] + inject-function: [ i686-linux, x86_64-linux, x86_64-darwin ] inline-java: [ i686-linux, x86_64-linux, x86_64-darwin ] + inserts: [ i686-linux, x86_64-linux, x86_64-darwin ] + inspector-wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-bytes: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-deepseq: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] instant-zipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + int-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] integer-pure: [ i686-linux, x86_64-linux, x86_64-darwin ] intel-aes: [ i686-linux, x86_64-linux, x86_64-darwin ] interleavableGen: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2224,14 +4836,17 @@ dont-distribute-packages: internetmarke: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq-mwotton: [ i686-linux, x86_64-linux, x86_64-darwin ] interpolatedstring-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + interpolation: [ i686-linux, x86_64-linux, x86_64-darwin ] interruptible: [ i686-linux, x86_64-linux, x86_64-darwin ] intset: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] invertible: [ i686-linux, x86_64-linux, x86_64-darwin ] io-capture: [ i686-linux, x86_64-linux, x86_64-darwin ] io-reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] + ion: [ i686-linux, x86_64-linux, x86_64-darwin ] IOR: [ i686-linux, x86_64-linux, x86_64-darwin ] IORefCAS: [ i686-linux, x86_64-linux, x86_64-darwin ] + iothread: [ i686-linux, x86_64-linux, x86_64-darwin ] iotransaction: [ i686-linux, x86_64-linux, x86_64-darwin ] ip: [ i686-linux, x86_64-linux, x86_64-darwin ] ipatch: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2239,17 +4854,25 @@ dont-distribute-packages: ipopt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] iptables-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] iptadmin: [ i686-linux, x86_64-linux, x86_64-darwin ] + ipython-kernel: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-dcc: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-client: [ i686-linux, x86_64-linux, x86_64-darwin ] irc-fun-color: [ i686-linux, x86_64-linux, x86_64-darwin ] + Irc: [ i686-linux, x86_64-linux, x86_64-darwin ] + iridium: [ i686-linux, x86_64-linux, x86_64-darwin ] + iron-mq: [ i686-linux, x86_64-linux, x86_64-darwin ] ironforge: [ i686-linux, x86_64-linux, x86_64-darwin ] is: [ i686-linux, x86_64-linux, x86_64-darwin ] isevaluated: [ i686-linux, x86_64-linux, x86_64-darwin ] ismtp: [ i686-linux, x86_64-linux, x86_64-darwin ] + IsNull: [ i686-linux, x86_64-linux, x86_64-darwin ] iso8583-bitmaps: [ i686-linux, x86_64-linux, x86_64-darwin ] + isohunt: [ i686-linux, x86_64-linux, x86_64-darwin ] + isotope: [ i686-linux, x86_64-linux, x86_64-darwin ] iter-stats: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-compress: [ i686-linux, x86_64-linux, x86_64-darwin ] + iteratee-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2275,6 +4898,8 @@ dont-distribute-packages: JackMiniMix: [ i686-linux, x86_64-linux, x86_64-darwin ] jackminimix: [ i686-linux, x86_64-linux, x86_64-darwin ] jacobi-roots: [ i686-linux, x86_64-linux, x86_64-darwin ] + jail: [ i686-linux, x86_64-linux, x86_64-darwin ] + jalaali: [ i686-linux, x86_64-linux, x86_64-darwin ] jalla: [ i686-linux, x86_64-linux, x86_64-darwin ] jarfind: [ i686-linux, x86_64-linux, x86_64-darwin ] java-bridge-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2285,6 +4910,8 @@ dont-distribute-packages: javasf: [ i686-linux, x86_64-linux, x86_64-darwin ] Javav: [ i686-linux, x86_64-linux, x86_64-darwin ] javav: [ i686-linux, x86_64-linux, x86_64-darwin ] + jcdecaux-vls: [ i686-linux, x86_64-linux, x86_64-darwin ] + jdi: [ i686-linux, x86_64-linux, x86_64-darwin ] jespresso: [ i686-linux, x86_64-linux, x86_64-darwin ] jobqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] join: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2299,33 +4926,47 @@ dont-distribute-packages: JsContracts: [ i686-linux, x86_64-linux, x86_64-darwin ] jsmw: [ i686-linux, x86_64-linux, x86_64-darwin ] json-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-assertions: [ i686-linux, x86_64-linux, x86_64-darwin ] json-ast-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] json-b: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator-Examples: [ i686-linux, x86_64-linux, x86_64-darwin ] JSON-Combinator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] json-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-incremental-decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-litobj: [ i686-linux, x86_64-linux, x86_64-darwin ] json-pointer-hasql: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-python: [ i686-linux, x86_64-linux, x86_64-darwin ] json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] json-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] json-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + json-togo: [ i686-linux, x86_64-linux, x86_64-darwin ] json-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] json2-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] json2: [ i686-linux, x86_64-linux, x86_64-darwin ] JSONb: [ i686-linux, x86_64-linux, x86_64-darwin ] JsonGrammar: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonresume: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsonrpc-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] jsonschema-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsonsql: [ i686-linux, x86_64-linux, x86_64-darwin ] + jsontsv: [ 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 ] + JuicyPixels-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] JuicyPixels-repa: [ i686-linux, x86_64-linux, x86_64-darwin ] JunkDB-driver-gdbm: [ i686-linux, x86_64-linux, x86_64-darwin ] + JunkDB-driver-hashtables: [ i686-linux, x86_64-linux, x86_64-darwin ] + JunkDB: [ i686-linux, x86_64-linux, x86_64-darwin ] jupyter: [ i686-linux, x86_64-linux, x86_64-darwin ] JYU-Utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + kafka-client: [ i686-linux, x86_64-linux, x86_64-darwin ] kaleidoscope: [ i686-linux, x86_64-linux, x86_64-darwin ] + Kalman: [ i686-linux, x86_64-linux, x86_64-darwin ] kangaroo: [ i686-linux, x86_64-linux, x86_64-darwin ] + kanji: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-cores: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-papilio: [ i686-linux, x86_64-linux, x86_64-darwin ] kansas-lava-shake: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2334,7 +4975,10 @@ dont-distribute-packages: katip-elasticsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] katip: [ i686-linux, x86_64-linux, x86_64-darwin ] katt: [ i686-linux, x86_64-linux, x86_64-darwin ] + kawaii: [ i686-linux, x86_64-linux, x86_64-darwin ] kazura-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + kd-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + kdesrc-build-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-environment-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-lightmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] keera-hails-mvc-model-protectedmodel: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2351,9 +4995,12 @@ dont-distribute-packages: keiretsu: [ i686-linux, x86_64-linux, x86_64-darwin ] Ketchup: [ i686-linux, x86_64-linux, x86_64-darwin ] kevin: [ i686-linux, x86_64-linux, x86_64-darwin ] + keyed: [ i686-linux, x86_64-linux, x86_64-darwin ] keyring: [ i686-linux, x86_64-linux, x86_64-darwin ] keysafe: [ i686-linux, x86_64-linux, x86_64-darwin ] keystore: [ i686-linux, x86_64-linux, x86_64-darwin ] + keyword-args: [ i686-linux, x86_64-linux, x86_64-darwin ] + khph: [ i686-linux, x86_64-linux, x86_64-darwin ] kicad-data: [ i686-linux, x86_64-linux, x86_64-darwin ] kickass-torrents-dump-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] KiCS-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2367,9 +5014,13 @@ dont-distribute-packages: knots: [ i686-linux, x86_64-linux, x86_64-darwin ] koellner-phonetic: [ i686-linux, x86_64-linux, x86_64-darwin ] Konf: [ i686-linux, x86_64-linux, x86_64-darwin ] + kontra-config: [ i686-linux, x86_64-linux, x86_64-darwin ] korfu: [ i686-linux, x86_64-linux, x86_64-darwin ] kqueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + Kriens: [ i686-linux, x86_64-linux, x86_64-darwin ] krpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + KSP: [ i686-linux, x86_64-linux, x86_64-darwin ] + ktx: [ i686-linux, x86_64-linux, x86_64-darwin ] kure-your-boilerplate: [ i686-linux, x86_64-linux, x86_64-darwin ] KyotoCabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] l-bfgs-b: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2381,8 +5032,11 @@ dont-distribute-packages: lagrangian: [ i686-linux, x86_64-linux, x86_64-darwin ] laika: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-devs: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda-options: [ i686-linux, x86_64-linux, x86_64-darwin ] lambda-toolbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambda2js: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaBase: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdabot-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2390,17 +5044,25 @@ dont-distribute-packages: lambdacms-media: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-bullet: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube-core: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube-edsl: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdacube-ir: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdacube: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaFeed: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaHack: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaINet: [ i686-linux, x86_64-linux, x86_64-darwin ] + Lambdajudge: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdaLit: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaNet: [ i686-linux, x86_64-linux, x86_64-darwin ] LambdaPrettyQuote: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdatex: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdatwit: [ i686-linux, x86_64-linux, x86_64-darwin ] + lambdaya-bus: [ i686-linux, x86_64-linux, x86_64-darwin ] + Lambdaya: [ i686-linux, x86_64-linux, x86_64-darwin ] lambdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] lame-tester: [ i686-linux, x86_64-linux, x86_64-darwin ] language-bash: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2409,48 +5071,69 @@ dont-distribute-packages: language-c-inline: [ i686-linux, x86_64-linux, x86_64-darwin ] language-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] language-eiffel: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-gcl: [ i686-linux, x86_64-linux, x86_64-darwin ] language-go: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-guess: [ i686-linux, x86_64-linux, x86_64-darwin ] language-java-classfile: [ i686-linux, x86_64-linux, x86_64-darwin ] + language-kort: [ i686-linux, x86_64-linux, x86_64-darwin ] language-lua-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] language-mixal: [ i686-linux, x86_64-linux, x86_64-darwin ] language-objc: [ i686-linux, x86_64-linux, x86_64-darwin ] - language-puppet: [ i686-linux, x86_64-linux, x86_64-darwin ] + 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-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 ] language-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] large-hashable: [ i686-linux, x86_64-linux, x86_64-darwin ] + LargeCardinalHierarchy: [ i686-linux, x86_64-linux, x86_64-darwin ] Lastik: [ i686-linux, x86_64-linux, x86_64-darwin ] lat: [ i686-linux, x86_64-linux, x86_64-darwin ] latest-npm-version: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-hakyll: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-image: [ i686-linux, x86_64-linux, x86_64-darwin ] latex-formulae-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + LATS: [ i686-linux, x86_64-linux, x86_64-darwin ] launchpad-control: [ i686-linux, x86_64-linux, x86_64-darwin ] layers: [ i686-linux, x86_64-linux, x86_64-darwin ] layout-bootstrap: [ i686-linux, x86_64-linux, x86_64-darwin ] lazyarray: [ i686-linux, x86_64-linux, x86_64-darwin ] lazysplines: [ i686-linux, x86_64-linux, x86_64-darwin ] + LazyVault: [ i686-linux, x86_64-linux, x86_64-darwin ] lcs: [ i686-linux, x86_64-linux, x86_64-darwin ] ldif: [ i686-linux, x86_64-linux, x86_64-darwin ] leaf: [ i686-linux, x86_64-linux, x86_64-darwin ] leaky: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] learn-physics: [ i686-linux, x86_64-linux, x86_64-darwin ] + leetify: [ i686-linux, x86_64-linux, x86_64-darwin ] + legion-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + legion: [ i686-linux, x86_64-linux, x86_64-darwin ] leksah: [ i686-linux, x86_64-linux, x86_64-darwin ] + lendingclub: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-properties: [ i686-linux, x86_64-linux, x86_64-darwin ] lens-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-text-encoding: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-time: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] + lens-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] lensref: [ i686-linux, x86_64-linux, x86_64-darwin ] lentil: [ i686-linux, x86_64-linux, x86_64-darwin ] lenz-template: [ i686-linux, x86_64-linux, x86_64-darwin ] + lenz: [ i686-linux, x86_64-linux, x86_64-darwin ] + Level0: [ i686-linux, x86_64-linux, x86_64-darwin ] leveldb-haskell-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] levmar-chart: [ i686-linux, x86_64-linux, x86_64-darwin ] + levmar: [ i686-linux, x86_64-linux, x86_64-darwin ] lgtk: [ i686-linux, x86_64-linux, x86_64-darwin ] lha: [ i686-linux, x86_64-linux, x86_64-darwin ] lhae: [ i686-linux, x86_64-linux, x86_64-darwin ] lhc: [ i686-linux, x86_64-linux, x86_64-darwin ] lhe: [ i686-linux, x86_64-linux, x86_64-darwin ] + lhs2TeX-hl: [ i686-linux, x86_64-linux, x86_64-darwin ] + lhslatex: [ i686-linux, x86_64-linux, x86_64-darwin ] LibClang: [ i686-linux, x86_64-linux, x86_64-darwin ] libconfig: [ i686-linux, x86_64-linux, x86_64-darwin ] libcspm: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2459,6 +5142,8 @@ dont-distribute-packages: libgraph: [ i686-linux, x86_64-linux, x86_64-darwin ] libhbb: [ i686-linux, x86_64-linux, x86_64-darwin ] libjenkins: [ i686-linux, x86_64-linux, x86_64-darwin ] + liblastfm: [ i686-linux, x86_64-linux, x86_64-darwin ] + liblinear-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] libltdl: [ i686-linux, x86_64-linux, x86_64-darwin ] liboleg: [ i686-linux, x86_64-linux, x86_64-darwin ] libpafe: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2468,46 +5153,66 @@ dont-distribute-packages: libroman: [ i686-linux, x86_64-linux, x86_64-darwin ] libssh2-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] libsystemd-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] + libsystemd-journal: [ i686-linux, x86_64-linux, x86_64-darwin ] + libtagc: [ i686-linux, x86_64-linux, x86_64-darwin ] libvirt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + libvorbis: [ i686-linux, x86_64-linux, x86_64-darwin ] libxls: [ i686-linux, x86_64-linux, x86_64-darwin ] + libxml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] lifter: [ i686-linux, x86_64-linux, x86_64-darwin ] + ligature: [ i686-linux, x86_64-linux, x86_64-darwin ] lighttpd-conf-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] lighttpd-conf: [ i686-linux, x86_64-linux, x86_64-darwin ] + lilypond: [ i686-linux, x86_64-linux, x86_64-darwin ] Limit: [ i686-linux, x86_64-linux, x86_64-darwin ] limp-cbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + limp: [ i686-linux, x86_64-linux, x86_64-darwin ] lin-alg: [ i686-linux, x86_64-linux, x86_64-darwin ] linda: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-algebra-cblas: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-circuit: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] linear-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] + linear-vect: [ i686-linux, x86_64-linux, x86_64-darwin ] + linearmap-category: [ i686-linux, x86_64-linux, x86_64-darwin ] linearscan-hoopl: [ i686-linux, x86_64-linux, x86_64-darwin ] LinearSplit: [ i686-linux, x86_64-linux, x86_64-darwin ] + linebreak: [ i686-linux, x86_64-linux, x86_64-darwin ] LinguisticsTypes: [ i686-linux, x86_64-linux, x86_64-darwin ] LinkChecker: [ i686-linux, x86_64-linux, x86_64-darwin ] linkchk: [ i686-linux, x86_64-linux, x86_64-darwin ] linkcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + linkedhashmap: [ i686-linux, x86_64-linux, x86_64-darwin ] + linklater: [ i686-linux, x86_64-linux, x86_64-darwin ] + linode-v4: [ i686-linux, x86_64-linux, x86_64-darwin ] linode: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-blkid: [ i686-linux, x86_64-linux, x86_64-darwin ] + linux-cgroup: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-kmod: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-perf: [ i686-linux, x86_64-linux, x86_64-darwin ] linux-ptrace: [ i686-linux, x86_64-linux, x86_64-darwin ] linx-gateway: [ i686-linux, x86_64-linux, x86_64-darwin ] lio-eci11: [ i686-linux, x86_64-linux, x86_64-darwin ] lio-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + lipsum-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] liquid-fixpoint: [ i686-linux, x86_64-linux, x86_64-darwin ] liquid: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] liquidhaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-mux: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-html-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-t-http-client: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-libcurl: [ i686-linux, x86_64-linux, x86_64-darwin ] list-t-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + list-zip-def: [ i686-linux, x86_64-linux, x86_64-darwin ] listlike-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] + lit: [ i686-linux, x86_64-linux, x86_64-darwin ] literals: [ i686-linux, x86_64-linux, x86_64-darwin ] live-sequencer: [ i686-linux, x86_64-linux, x86_64-darwin ] ll-picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2536,12 +5241,17 @@ dont-distribute-packages: log-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] log2json: [ i686-linux, x86_64-linux, x86_64-darwin ] log: [ i686-linux, x86_64-linux, x86_64-darwin ] + logentries: [ i686-linux, x86_64-linux, x86_64-darwin ] + logger: [ i686-linux, x86_64-linux, x86_64-darwin ] logging-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] + logging-facade-journald: [ i686-linux, x86_64-linux, x86_64-darwin ] logic-classes: [ i686-linux, x86_64-linux, x86_64-darwin ] + Logic: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-MPI: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-network: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees-processes: [ i686-linux, x86_64-linux, x86_64-darwin ] LogicGrowsOnTrees: [ i686-linux, x86_64-linux, x86_64-darwin ] + logplex-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] logsink: [ i686-linux, x86_64-linux, x86_64-darwin ] lojban: [ i686-linux, x86_64-linux, x86_64-darwin ] lojbanParser: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2552,11 +5262,16 @@ dont-distribute-packages: lol-typing: [ i686-linux, x86_64-linux, x86_64-darwin ] lol: [ i686-linux, x86_64-linux, x86_64-darwin ] loli: [ i686-linux, x86_64-linux, x86_64-darwin ] + lookup-tables: [ i686-linux, x86_64-linux, x86_64-darwin ] loop-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] + loop-while: [ i686-linux, x86_64-linux, x86_64-darwin ] loopy: [ i686-linux, x86_64-linux, x86_64-darwin ] lord: [ i686-linux, x86_64-linux, x86_64-darwin ] + lorem: [ i686-linux, x86_64-linux, x86_64-darwin ] loris: [ i686-linux, x86_64-linux, x86_64-darwin ] + loshadka: [ i686-linux, x86_64-linux, x86_64-darwin ] lostcities: [ i686-linux, x86_64-linux, x86_64-darwin ] + lowgl: [ i686-linux, x86_64-linux, x86_64-darwin ] lp-diagrams-svg: [ i686-linux, x86_64-linux, x86_64-darwin ] lp-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] ls-usb: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2564,11 +5279,14 @@ dont-distribute-packages: LslPlus: [ i686-linux, x86_64-linux, x86_64-darwin ] lsystem: [ i686-linux, x86_64-linux, x86_64-darwin ] ltiv1p1: [ i686-linux, x86_64-linux, x86_64-darwin ] + ltk: [ i686-linux, x86_64-linux, x86_64-darwin ] luachunk: [ i686-linux, x86_64-linux, x86_64-darwin ] lucienne: [ i686-linux, x86_64-linux, x86_64-darwin ] Lucu: [ i686-linux, x86_64-linux, x86_64-darwin ] lui: [ i686-linux, x86_64-linux, x86_64-darwin ] + luis-client: [ i686-linux, x86_64-linux, x86_64-darwin ] luka: [ i686-linux, x86_64-linux, x86_64-darwin ] + luminance-samples: [ i686-linux, x86_64-linux, x86_64-darwin ] lushtags: [ i686-linux, x86_64-linux, x86_64-darwin ] luthor: [ i686-linux, x86_64-linux, x86_64-darwin ] lvish: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2576,14 +5294,22 @@ dont-distribute-packages: lxc: [ i686-linux, x86_64-linux, x86_64-darwin ] lye: [ i686-linux, x86_64-linux, x86_64-darwin ] lzma-clib: [ i686-linux, x86_64-linux, x86_64-darwin ] + lzma-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + lzma-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] maam: [ i686-linux, x86_64-linux, x86_64-darwin ] macbeth-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + machines-zlib: [ i686-linux, x86_64-linux, x86_64-darwin ] macosx-make-standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] mage: [ i686-linux, x86_64-linux, x86_64-darwin ] MagicHaskeller: [ i686-linux, x86_64-linux, x86_64-darwin ] magico: [ i686-linux, x86_64-linux, x86_64-darwin ] + magma: [ i686-linux, x86_64-linux, x86_64-darwin ] mahoro: [ i686-linux, x86_64-linux, x86_64-darwin ] maid: [ i686-linux, x86_64-linux, x86_64-darwin ] + mailchimp-subscribe: [ i686-linux, x86_64-linux, x86_64-darwin ] + mailchimp: [ i686-linux, x86_64-linux, x86_64-darwin ] + MailchimpSimple: [ i686-linux, x86_64-linux, x86_64-darwin ] + mailgun: [ i686-linux, x86_64-linux, x86_64-darwin ] majordomo: [ i686-linux, x86_64-linux, x86_64-darwin ] majority: [ i686-linux, x86_64-linux, x86_64-darwin ] make-hard-links: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2622,6 +5348,7 @@ dont-distribute-packages: mars: [ i686-linux, x86_64-linux, x86_64-darwin ] marxup: [ i686-linux, x86_64-linux, x86_64-darwin ] masakazu-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + MASMGen: [ i686-linux, x86_64-linux, x86_64-darwin ] matchers: [ i686-linux, x86_64-linux, x86_64-darwin ] mathblog: [ i686-linux, x86_64-linux, x86_64-darwin ] mathlink: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2629,6 +5356,7 @@ dont-distribute-packages: 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 ] + maxsharing: [ i686-linux, x86_64-linux, x86_64-darwin ] maybench: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT-monads-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] MaybeT-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2636,53 +5364,88 @@ dont-distribute-packages: MazesOfMonad: [ i686-linux, x86_64-linux, x86_64-darwin ] mbox-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] MC-Fold-DP: [ i686-linux, x86_64-linux, x86_64-darwin ] + mcmaster-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] mcmc-samplers: [ i686-linux, x86_64-linux, x86_64-darwin ] + mcmc-synthesis: [ i686-linux, x86_64-linux, x86_64-darwin ] + mcpi: [ i686-linux, x86_64-linux, x86_64-darwin ] + mdapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mdcat: [ i686-linux, x86_64-linux, x86_64-darwin ] + mdp: [ i686-linux, x86_64-linux, x86_64-darwin ] + MeanShift: [ i686-linux, x86_64-linux, x86_64-darwin ] Measure: [ i686-linux, x86_64-linux, x86_64-darwin ] + mecab: [ i686-linux, x86_64-linux, x86_64-darwin ] + mech: [ i686-linux, x86_64-linux, x86_64-darwin ] + Mecha: [ 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 ] mediawiki2latex: [ i686-linux, x86_64-linux, x86_64-darwin ] mediawiki: [ i686-linux, x86_64-linux, x86_64-darwin ] medium-sdk-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mega-sdist: [ i686-linux, x86_64-linux, x86_64-darwin ] mellon-web: [ i686-linux, x86_64-linux, x86_64-darwin ] melody: [ i686-linux, x86_64-linux, x86_64-darwin ] + memcached-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] + memcached: [ i686-linux, x86_64-linux, x86_64-darwin ] + memo-ptr: [ i686-linux, x86_64-linux, x86_64-darwin ] memo-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + memoization-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + messente: [ i686-linux, x86_64-linux, x86_64-darwin ] meta-misc: [ i686-linux, x86_64-linux, x86_64-darwin ] meta-par-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] metadata: [ i686-linux, x86_64-linux, x86_64-darwin ] + MetaHDBC: [ i686-linux, x86_64-linux, x86_64-darwin ] metaplug: [ i686-linux, x86_64-linux, x86_64-darwin ] metric: [ i686-linux, x86_64-linux, x86_64-darwin ] Metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + metrics: [ i686-linux, x86_64-linux, x86_64-darwin ] + metricsd-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + mezzolens: [ i686-linux, x86_64-linux, x86_64-darwin ] mgeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] Mhailist: [ i686-linux, x86_64-linux, x86_64-darwin ] MHask: [ i686-linux, x86_64-linux, x86_64-darwin ] mi: [ i686-linux, x86_64-linux, x86_64-darwin ] Michelangelo: [ i686-linux, x86_64-linux, x86_64-darwin ] + microformats2-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] microformats2-types: [ i686-linux, x86_64-linux, x86_64-darwin ] microlens-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] + microlens-each: [ i686-linux, x86_64-linux, x86_64-darwin ] + micrologger: [ i686-linux, x86_64-linux, x86_64-darwin ] + MicrosoftTranslator: [ i686-linux, x86_64-linux, x86_64-darwin ] + midair: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-music-box: [ i686-linux, x86_64-linux, x86_64-darwin ] + midi-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] + midimory: [ i686-linux, x86_64-linux, x86_64-darwin ] midisurface: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd2: [ i686-linux, x86_64-linux, x86_64-darwin ] mighttpd: [ i686-linux, x86_64-linux, x86_64-darwin ] + mikmod: [ i686-linux, x86_64-linux, x86_64-darwin ] milena: [ i686-linux, x86_64-linux, x86_64-darwin ] mime-string: [ i686-linux, x86_64-linux, x86_64-darwin ] minecraft-data: [ i686-linux, x86_64-linux, x86_64-darwin ] minesweeper: [ i686-linux, x86_64-linux, x86_64-darwin ] MiniAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] miniforth: [ i686-linux, x86_64-linux, x86_64-darwin ] + minilens: [ i686-linux, x86_64-linux, x86_64-darwin ] minimung: [ i686-linux, x86_64-linux, x86_64-darwin ] + minions: [ i686-linux, x86_64-linux, x86_64-darwin ] minioperational: [ i686-linux, x86_64-linux, x86_64-darwin ] miniplex: [ i686-linux, x86_64-linux, x86_64-darwin ] minirotate: [ i686-linux, x86_64-linux, x86_64-darwin ] ministg: [ i686-linux, x86_64-linux, x86_64-darwin ] + minst-idx: [ i686-linux, x86_64-linux, x86_64-darwin ] mirror-tweet: [ i686-linux, x86_64-linux, x86_64-darwin ] missing-py2: [ i686-linux, x86_64-linux, x86_64-darwin ] MissingPy: [ i686-linux, x86_64-linux, x86_64-darwin ] mix-arrows: [ i686-linux, x86_64-linux, x86_64-darwin ] + mixed-strategies: [ i686-linux, x86_64-linux, x86_64-darwin ] mkbndl: [ i686-linux, x86_64-linux, x86_64-darwin ] ml-w: [ i686-linux, x86_64-linux, x86_64-darwin ] mlist: [ 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 ] moan: [ i686-linux, x86_64-linux, x86_64-darwin ] + modbus-tcp: [ i686-linux, x86_64-linux, x86_64-darwin ] modelicaparser: [ i686-linux, x86_64-linux, x86_64-darwin ] modify-fasta: [ i686-linux, x86_64-linux, x86_64-darwin ] modsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2691,11 +5454,16 @@ dont-distribute-packages: modular-prelude: [ i686-linux, x86_64-linux, x86_64-darwin ] module-management: [ i686-linux, x86_64-linux, x86_64-darwin ] modulespection: [ i686-linux, x86_64-linux, x86_64-darwin ] + modulo: [ i686-linux, x86_64-linux, x86_64-darwin ] MoeDict: [ i686-linux, x86_64-linux, x86_64-darwin ] + moesocks: [ i686-linux, x86_64-linux, x86_64-darwin ] mole: [ i686-linux, x86_64-linux, x86_64-darwin ] + mollie-api-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-classes: [ 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 ] monad-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-levels: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-lgbt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2704,26 +5472,39 @@ dont-distribute-packages: monad-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-mersenne-random: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-open: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-parallel-progressbar: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-ran: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-resumption: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-st: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-state: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-io: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-stlike-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + monad-task: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-tx: [ i686-linux, x86_64-linux, x86_64-darwin ] monad-unify: [ i686-linux, x86_64-linux, x86_64-darwin ] monadacme: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-mtl-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCatchIO-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadCatchIO-transformers-foreign: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCatchIO-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadCompose: [ i686-linux, x86_64-linux, x86_64-darwin ] monadiccp-gecode: [ i686-linux, x86_64-linux, x86_64-darwin ] monadiccp: [ i686-linux, x86_64-linux, x86_64-darwin ] Monadius: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadLab: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadLib-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] + monadloc-pp: [ i686-linux, x86_64-linux, x86_64-darwin ] MonadRandomLazy: [ i686-linux, x86_64-linux, x86_64-darwin ] + monads-fd: [ i686-linux, x86_64-linux, x86_64-darwin ] + MonadStack: [ i686-linux, x86_64-linux, x86_64-darwin ] monarch: [ i686-linux, x86_64-linux, x86_64-darwin ] Monaris: [ i686-linux, x86_64-linux, x86_64-darwin ] Monatron-IO: [ i686-linux, x86_64-linux, x86_64-darwin ] Monatron: [ i686-linux, x86_64-linux, x86_64-darwin ] mondo: [ i686-linux, x86_64-linux, x86_64-darwin ] mongodb-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] mongrel2-handler: [ i686-linux, x86_64-linux, x86_64-darwin ] mono-foldable: [ i686-linux, x86_64-linux, x86_64-darwin ] Monocle: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2736,6 +5517,7 @@ dont-distribute-packages: moonshine: [ i686-linux, x86_64-linux, x86_64-darwin ] morfette: [ i686-linux, x86_64-linux, x86_64-darwin ] morfeusz: [ i686-linux, x86_64-linux, x86_64-darwin ] + morph: [ i686-linux, x86_64-linux, x86_64-darwin ] mosaico-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] mount: [ i686-linux, x86_64-linux, x86_64-darwin ] mp3decoder: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2743,15 +5525,21 @@ dont-distribute-packages: mpdmate: [ i686-linux, x86_64-linux, x86_64-darwin ] mpppc: [ i686-linux, x86_64-linux, x86_64-darwin ] mpretty: [ i686-linux, x86_64-linux, x86_64-darwin ] + mpris: [ i686-linux, x86_64-linux, x86_64-darwin ] mprover: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] mrm: [ i686-linux, x86_64-linux, x86_64-darwin ] + ms: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-aeson: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-idl: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] msgpack: [ i686-linux, x86_64-linux, x86_64-darwin ] msh: [ i686-linux, x86_64-linux, x86_64-darwin ] + msi-kb-backlit: [ i686-linux, x86_64-linux, x86_64-darwin ] + MSQueue: [ i686-linux, x86_64-linux, x86_64-darwin ] + MTGBuilder: [ i686-linux, x86_64-linux, x86_64-darwin ] mtgoxapi: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-evil-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] mtl-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2759,13 +5547,18 @@ dont-distribute-packages: mtp: [ i686-linux, x86_64-linux, x86_64-darwin ] mudbath: [ i686-linux, x86_64-linux, x86_64-darwin ] mulang: [ i686-linux, x86_64-linux, x86_64-darwin ] + multext-east-msd: [ i686-linux, x86_64-linux, x86_64-darwin ] multi-cabal: [ i686-linux, x86_64-linux, x86_64-darwin ] multifocal: [ i686-linux, x86_64-linux, x86_64-darwin ] + multihash: [ i686-linux, x86_64-linux, x86_64-darwin ] multipass: [ i686-linux, x86_64-linux, x86_64-darwin ] multiplate-simplified: [ i686-linux, x86_64-linux, x86_64-darwin ] + multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-alt-deriver: [ i686-linux, x86_64-linux, x86_64-darwin ] multirec-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] multisetrewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + Munkres-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] + muon: [ i686-linux, x86_64-linux, x86_64-darwin ] murder: [ i686-linux, x86_64-linux, x86_64-darwin ] murmur: [ i686-linux, x86_64-linux, x86_64-darwin ] murmurhash3: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2777,6 +5570,7 @@ dont-distribute-packages: music-suite: [ i686-linux, x86_64-linux, x86_64-darwin ] musicbrainz-email: [ i686-linux, x86_64-linux, x86_64-darwin ] musicxml: [ i686-linux, x86_64-linux, x86_64-darwin ] + mustache-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] mustache2hs: [ 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 ] @@ -2784,6 +5578,7 @@ dont-distribute-packages: mvc-updates: [ i686-linux, x86_64-linux, x86_64-darwin ] mvclient: [ i686-linux, x86_64-linux, x86_64-darwin ] myo: [ i686-linux, x86_64-linux, x86_64-darwin ] + MyPrimes: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession-example: [ i686-linux, x86_64-linux, x86_64-darwin ] mysnapsession: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2792,74 +5587,109 @@ dont-distribute-packages: mysql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + mystem: [ i686-linux, x86_64-linux, x86_64-darwin ] myTestlll: [ i686-linux, x86_64-linux, x86_64-darwin ] mywatch: [ i686-linux, x86_64-linux, x86_64-darwin ] mzv: [ i686-linux, x86_64-linux, x86_64-darwin ] n-m: [ i686-linux, x86_64-linux, x86_64-darwin ] nagios-plugin-ekg: [ i686-linux, x86_64-linux, x86_64-darwin ] named-lock: [ i686-linux, x86_64-linux, x86_64-darwin ] + namelist: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-cryptr: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-hmac: [ i686-linux, x86_64-linux, x86_64-darwin ] nano-md5: [ i686-linux, x86_64-linux, x86_64-darwin ] nanoAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] nanocurses: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanomsg-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanomsg: [ i686-linux, x86_64-linux, x86_64-darwin ] + nanoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + NanoProlog: [ i686-linux, x86_64-linux, x86_64-darwin ] nanovg: [ i686-linux, x86_64-linux, x86_64-darwin ] nanq: [ i686-linux, x86_64-linux, x86_64-darwin ] narc: [ i686-linux, x86_64-linux, x86_64-darwin ] nats-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] natural-number: [ i686-linux, x86_64-linux, x86_64-darwin ] NaturalLanguageAlphabets: [ i686-linux, x86_64-linux, x86_64-darwin ] + naver-translate: [ i686-linux, x86_64-linux, x86_64-darwin ] NearContextAlgebra: [ i686-linux, x86_64-linux, x86_64-darwin ] neat: [ i686-linux, x86_64-linux, x86_64-darwin ] needle: [ i686-linux, x86_64-linux, x86_64-darwin ] + neet: [ i686-linux, x86_64-linux, x86_64-darwin ] nehe-tuts: [ i686-linux, x86_64-linux, x86_64-darwin ] + neither: [ i686-linux, x86_64-linux, x86_64-darwin ] + Neks: [ i686-linux, x86_64-linux, x86_64-darwin ] nemesis-titan: [ i686-linux, x86_64-linux, x86_64-darwin ] nerf: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] nero-warp: [ i686-linux, x86_64-linux, x86_64-darwin ] nero: [ i686-linux, x86_64-linux, x86_64-darwin ] nested-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] + NestedFunctor: [ i686-linux, x86_64-linux, x86_64-darwin ] + nestedmap: [ i686-linux, x86_64-linux, x86_64-darwin ] netcore: [ i686-linux, x86_64-linux, x86_64-darwin ] netlines: [ i686-linux, x86_64-linux, x86_64-darwin ] NetSNMP: [ i686-linux, x86_64-linux, x86_64-darwin ] netspec: [ i686-linux, x86_64-linux, x86_64-darwin ] + netstring-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-netkit: [ i686-linux, x86_64-linux, x86_64-darwin ] nettle-openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-input-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire-input: [ i686-linux, x86_64-linux, x86_64-darwin ] + netwire: [ i686-linux, x86_64-linux, x86_64-darwin ] network-address: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-anonymous-i2p: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-api-support: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-bitcoin: [ i686-linux, x86_64-linux, x86_64-darwin ] network-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] network-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-carbon: [ i686-linux, x86_64-linux, x86_64-darwin ] network-connection: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-dbus: [ i686-linux, x86_64-linux, x86_64-darwin ] network-dns: [ i686-linux, x86_64-linux, x86_64-darwin ] network-hans: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-interfacerequest: [ i686-linux, x86_64-linux, x86_64-darwin ] network-minihttp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-msgpack-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-netpacket: [ i686-linux, x86_64-linux, x86_64-darwin ] network-rpca: [ i686-linux, x86_64-linux, x86_64-darwin ] network-server: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-service: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-simple-sockaddr: [ i686-linux, x86_64-linux, x86_64-darwin ] network-simple-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] network-topic-models: [ i686-linux, x86_64-linux, x86_64-darwin ] network-transport-amqp: [ i686-linux, x86_64-linux, x86_64-darwin ] network-uri-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + network-wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] network-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] + networked-game: [ i686-linux, x86_64-linux, x86_64-darwin ] neural: [ i686-linux, x86_64-linux, x86_64-darwin ] newports: [ i686-linux, x86_64-linux, x86_64-darwin ] newsynth: [ i686-linux, x86_64-linux, x86_64-darwin ] newt: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-deriving: [ i686-linux, x86_64-linux, x86_64-darwin ] + newtype-generics: [ i686-linux, x86_64-linux, x86_64-darwin ] newtype-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + next-ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + ngrams-loader: [ i686-linux, x86_64-linux, x86_64-darwin ] NGrams: [ i686-linux, x86_64-linux, x86_64-darwin ] niagra: [ i686-linux, x86_64-linux, x86_64-darwin ] nibblestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + nicovideo-translator: [ i686-linux, x86_64-linux, x86_64-darwin ] nikepub: [ i686-linux, x86_64-linux, x86_64-darwin ] nimber: [ i686-linux, x86_64-linux, x86_64-darwin ] Ninjas: [ i686-linux, x86_64-linux, x86_64-darwin ] nitro: [ i686-linux, x86_64-linux, x86_64-darwin ] + nix-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] nixfromnpm: [ i686-linux, x86_64-linux, x86_64-darwin ] nkjp: [ i686-linux, x86_64-linux, x86_64-darwin ] + nlp-scores-scripts: [ i686-linux, x86_64-linux, x86_64-darwin ] nm: [ i686-linux, x86_64-linux, x86_64-darwin ] nme: [ i686-linux, x86_64-linux, x86_64-darwin ] nntp: [ i686-linux, x86_64-linux, x86_64-darwin ] no-role-annots: [ 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-Core: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx-Language: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2867,38 +5697,50 @@ dont-distribute-packages: Nomyx-Web: [ i686-linux, x86_64-linux, x86_64-darwin ] Nomyx: [ 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 ] noodle: [ i686-linux, x86_64-linux, x86_64-darwin ] NoSlow: [ i686-linux, x86_64-linux, x86_64-darwin ] + not-gloss-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] notcpp: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] notmuch-web: [ i686-linux, x86_64-linux, x86_64-darwin ] + notzero: [ i686-linux, x86_64-linux, x86_64-darwin ] np-linear: [ i686-linux, x86_64-linux, x86_64-darwin ] nptools: [ i686-linux, x86_64-linux, x86_64-darwin ] NTRU: [ i686-linux, x86_64-linux, x86_64-darwin ] null-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] + nullary: [ i686-linux, x86_64-linux, x86_64-darwin ] nullpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] NumberSieves: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals-base: [ i686-linux, x86_64-linux, x86_64-darwin ] numerals: [ i686-linux, x86_64-linux, x86_64-darwin ] + numeric-ranges: [ i686-linux, x86_64-linux, x86_64-darwin ] Nussinov78: [ i686-linux, x86_64-linux, x86_64-darwin ] + Nutri: [ i686-linux, x86_64-linux, x86_64-darwin ] nvim-hs-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] nvim-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] NXT: [ i686-linux, x86_64-linux, x86_64-darwin ] NXTDSL: [ i686-linux, x86_64-linux, x86_64-darwin ] + nylas: [ i686-linux, x86_64-linux, x86_64-darwin ] nymphaea: [ i686-linux, x86_64-linux, x86_64-darwin ] + oauthenticated: [ i686-linux, x86_64-linux, x86_64-darwin ] oberon0: [ i686-linux, x86_64-linux, x86_64-darwin ] obj: [ i686-linux, x86_64-linux, x86_64-darwin ] Object: [ i686-linux, x86_64-linux, x86_64-darwin ] + objectid: [ i686-linux, x86_64-linux, x86_64-darwin ] ObjectIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + octohat: [ i686-linux, x86_64-linux, x86_64-darwin ] octopus: [ i686-linux, x86_64-linux, x86_64-darwin ] oculus: [ i686-linux, x86_64-linux, x86_64-darwin ] OddWord: [ i686-linux, x86_64-linux, x86_64-darwin ] oden-go-packages: [ i686-linux, x86_64-linux, x86_64-darwin ] + off-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] OGL: [ i686-linux, x86_64-linux, x86_64-darwin ] ohloh-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] oi: [ i686-linux, x86_64-linux, x86_64-darwin ] oidc-client: [ i686-linux, x86_64-linux, x86_64-darwin ] ois-input-manager: [ i686-linux, x86_64-linux, x86_64-darwin ] + old-version: [ i686-linux, x86_64-linux, x86_64-darwin ] olwrapper: [ i686-linux, x86_64-linux, x86_64-darwin ] omaketex: [ i686-linux, x86_64-linux, x86_64-darwin ] Omega: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2908,7 +5750,9 @@ dont-distribute-packages: one-liner: [ i686-linux, x86_64-linux, x86_64-darwin ] oneormore: [ i686-linux, x86_64-linux, x86_64-darwin ] onu-course: [ i686-linux, x86_64-linux, x86_64-darwin ] + opaleye-classy: [ i686-linux, x86_64-linux, x86_64-darwin ] opaleye-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] + open-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] open-pandoc: [ i686-linux, x86_64-linux, x86_64-darwin ] open-typerep: [ i686-linux, x86_64-linux, x86_64-darwin ] open-union: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2916,8 +5760,10 @@ dont-distribute-packages: OpenAFP: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCL: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenCLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] + OpenCLWrappers: [ i686-linux, x86_64-linux, x86_64-darwin ] opencog-atomspace: [ i686-linux, x86_64-linux, x86_64-darwin ] opencv-raw: [ i686-linux, x86_64-linux, x86_64-darwin ] + opendatatable: [ i686-linux, x86_64-linux, x86_64-darwin ] openexchangerates: [ i686-linux, x86_64-linux, x86_64-darwin ] openflow: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenGLCheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2929,33 +5775,49 @@ dont-distribute-packages: OpenSCAD: [ i686-linux, x86_64-linux, x86_64-darwin ] opensoundcontrol-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] openssh-github-keys: [ i686-linux, x86_64-linux, x86_64-darwin ] + openssl-createkey: [ i686-linux, x86_64-linux, x86_64-darwin ] + openssl-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] opentheory-char: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVG: [ i686-linux, x86_64-linux, x86_64-darwin ] OpenVGRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Operads: [ i686-linux, x86_64-linux, x86_64-darwin ] operational-alacarte: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] orchestrate: [ i686-linux, x86_64-linux, x86_64-darwin ] OrchestrateDB: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] orchid: [ i686-linux, x86_64-linux, x86_64-darwin ] order-maintenance: [ i686-linux, x86_64-linux, x86_64-darwin ] + order-statistic-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] + order-statistics: [ i686-linux, x86_64-linux, x86_64-darwin ] + orders: [ i686-linux, x86_64-linux, x86_64-darwin ] ordrea: [ i686-linux, x86_64-linux, x86_64-darwin ] + organize-imports: [ i686-linux, x86_64-linux, x86_64-darwin ] orgmode-parse: [ i686-linux, x86_64-linux, x86_64-darwin ] + orgmode: [ i686-linux, x86_64-linux, x86_64-darwin ] origami: [ i686-linux, x86_64-linux, x86_64-darwin ] + OrPatterns: [ i686-linux, x86_64-linux, x86_64-darwin ] + osc: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] osm-download: [ i686-linux, x86_64-linux, x86_64-darwin ] OSM: [ i686-linux, x86_64-linux, x86_64-darwin ] ot: [ i686-linux, x86_64-linux, x86_64-darwin ] overture: [ i686-linux, x86_64-linux, x86_64-darwin ] + pack: [ i686-linux, x86_64-linux, x86_64-darwin ] package-vt: [ i686-linux, x86_64-linux, x86_64-darwin ] + packed-dawg: [ i686-linux, x86_64-linux, x86_64-darwin ] packedstring: [ i686-linux, x86_64-linux, x86_64-darwin ] packman: [ i686-linux, x86_64-linux, x86_64-darwin ] packunused: [ i686-linux, x86_64-linux, x86_64-darwin ] + pacman-memcache: [ i686-linux, x86_64-linux, x86_64-darwin ] padKONTROL: [ i686-linux, x86_64-linux, x86_64-darwin ] + pagarme: [ i686-linux, x86_64-linux, x86_64-darwin ] PageIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + Paillier: [ i686-linux, x86_64-linux, x86_64-darwin ] panda: [ i686-linux, x86_64-linux, x86_64-darwin ] + pandoc-csv2table: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-japanese-filters: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-plantuml-diagrams: [ i686-linux, x86_64-linux, x86_64-darwin ] pandoc-unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2969,35 +5831,51 @@ dont-distribute-packages: paragon: [ i686-linux, x86_64-linux, x86_64-darwin ] Paraiso: [ i686-linux, x86_64-linux, x86_64-darwin ] parallel-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] + paranoia: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] parco: [ i686-linux, x86_64-linux, x86_64-darwin ] + parconc-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] Parry: [ i686-linux, x86_64-linux, x86_64-darwin ] parse-help: [ i686-linux, x86_64-linux, x86_64-darwin ] + parsec-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + parsec-parsers: [ i686-linux, x86_64-linux, x86_64-darwin ] + parseerror-eq: [ i686-linux, x86_64-linux, x86_64-darwin ] parsely: [ i686-linux, x86_64-linux, x86_64-darwin ] parser-helper: [ i686-linux, x86_64-linux, x86_64-darwin ] parser241: [ i686-linux, x86_64-linux, x86_64-darwin ] parsergen: [ i686-linux, x86_64-linux, x86_64-darwin ] parsestar: [ i686-linux, x86_64-linux, x86_64-darwin ] + partage: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-isomorphisms: [ i686-linux, x86_64-linux, x86_64-darwin ] partial-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] partial: [ i686-linux, x86_64-linux, x86_64-darwin ] partly: [ i686-linux, x86_64-linux, x86_64-darwin ] passage: [ i686-linux, x86_64-linux, x86_64-darwin ] + PasswordGenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] pasta: [ i686-linux, x86_64-linux, x86_64-darwin ] pastis: [ i686-linux, x86_64-linux, x86_64-darwin ] pasty: [ i686-linux, x86_64-linux, x86_64-darwin ] + patches-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] Pathfinder: [ i686-linux, x86_64-linux, x86_64-darwin ] pathfindingcore: [ i686-linux, x86_64-linux, x86_64-darwin ] + PathTree: [ i686-linux, x86_64-linux, x86_64-darwin ] + patronscraper: [ i686-linux, x86_64-linux, x86_64-darwin ] patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] paypal-adaptive-hoops: [ i686-linux, x86_64-linux, x86_64-darwin ] paypal-api: [ i686-linux, x86_64-linux, x86_64-darwin ] pb: [ i686-linux, x86_64-linux, x86_64-darwin ] + pbc4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + PBKDF2: [ i686-linux, x86_64-linux, x86_64-darwin ] pcf: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT-DB: [ i686-linux, x86_64-linux, x86_64-darwin ] PCLT: [ i686-linux, x86_64-linux, x86_64-darwin ] + pcre-light-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + pdfsplit: [ i686-linux, x86_64-linux, x86_64-darwin ] pdynload: [ i686-linux, x86_64-linux, x86_64-darwin ] peakachu: [ i686-linux, x86_64-linux, x86_64-darwin ] + peano: [ i686-linux, x86_64-linux, x86_64-darwin ] + PeanoWitnesses: [ i686-linux, x86_64-linux, x86_64-darwin ] pec: [ i686-linux, x86_64-linux, x86_64-darwin ] peg: [ i686-linux, x86_64-linux, x86_64-darwin ] peggy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3006,17 +5884,25 @@ dont-distribute-packages: penny-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] penny: [ i686-linux, x86_64-linux, x86_64-darwin ] peparser: [ i686-linux, x86_64-linux, x86_64-darwin ] + perceptron: [ i686-linux, x86_64-linux, x86_64-darwin ] perdure: [ i686-linux, x86_64-linux, x86_64-darwin ] PerfectHash: [ i686-linux, x86_64-linux, x86_64-darwin ] perfecthash: [ i686-linux, x86_64-linux, x86_64-darwin ] period: [ i686-linux, x86_64-linux, x86_64-darwin ] periodic: [ i686-linux, x86_64-linux, x86_64-darwin ] + perm: [ i686-linux, x86_64-linux, x86_64-darwin ] permute: [ i686-linux, x86_64-linux, x86_64-darwin ] PermuteEffects: [ i686-linux, x86_64-linux, x86_64-darwin ] + persist2er: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-audit: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-database-url: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-equivalence: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-hssqlppp: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-mongoDB: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + persistent-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-protobuf: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-ratelimit: [ i686-linux, x86_64-linux, x86_64-darwin ] persistent-zookeeper: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3028,6 +5914,7 @@ dont-distribute-packages: pg-harness-server: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-harness: [ i686-linux, x86_64-linux, x86_64-darwin ] pg-store: [ i686-linux, x86_64-linux, x86_64-darwin ] + pgdl: [ i686-linux, x86_64-linux, x86_64-darwin ] pgsql-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] pgstream: [ i686-linux, x86_64-linux, x86_64-darwin ] phasechange: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3040,30 +5927,48 @@ dont-distribute-packages: phybin: [ i686-linux, x86_64-linux, x86_64-darwin ] pi-calculus: [ i686-linux, x86_64-linux, x86_64-darwin ] pi-forall: [ i686-linux, x86_64-linux, x86_64-darwin ] + pia-forward: [ i686-linux, x86_64-linux, x86_64-darwin ] pianola: [ i686-linux, x86_64-linux, x86_64-darwin ] + picologic: [ i686-linux, x86_64-linux, x86_64-darwin ] + picosat: [ i686-linux, x86_64-linux, x86_64-darwin ] piet: [ i686-linux, x86_64-linux, x86_64-darwin ] piki: [ i686-linux, x86_64-linux, x86_64-darwin ] Pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-async: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-attoparsec-streaming: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-binary: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-cereal-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-core: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-courier: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-files: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-key-value-csv: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-network-tls: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-p2p-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-p2p: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-protolude: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-rt: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] pipes-shell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pipes-zeromq4: [ i686-linux, x86_64-linux, x86_64-darwin ] pisigma: [ i686-linux, x86_64-linux, x86_64-darwin ] Piso: [ i686-linux, x86_64-linux, x86_64-darwin ] pit: [ i686-linux, x86_64-linux, x86_64-darwin ] + pitchtrack: [ i686-linux, x86_64-linux, x86_64-darwin ] pivotal-tracker: [ 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 ] plat: [ i686-linux, x86_64-linux, x86_64-darwin ] + PlayingCards: [ i686-linux, x86_64-linux, x86_64-darwin ] + playlists: [ i686-linux, x86_64-linux, x86_64-darwin ] plist-buddy: [ i686-linux, x86_64-linux, x86_64-darwin ] plivo: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-gtk-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] + plot-lab: [ i686-linux, x86_64-linux, x86_64-darwin ] PlslTools: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-auto: [ i686-linux, x86_64-linux, x86_64-darwin ] plugins-multistage: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3077,17 +5982,23 @@ dont-distribute-packages: point-octree: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] pointless-rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] + pokemon-go-protobuf-types: [ i686-linux, x86_64-linux, x86_64-darwin ] + pokitdok: [ i686-linux, x86_64-linux, x86_64-darwin ] polar-configfile: [ i686-linux, x86_64-linux, x86_64-darwin ] polar-shader: [ i686-linux, x86_64-linux, x86_64-darwin ] polh-lexicon: [ i686-linux, x86_64-linux, x86_64-darwin ] + polimorf: [ i686-linux, x86_64-linux, x86_64-darwin ] Pollutocracy: [ i686-linux, x86_64-linux, x86_64-darwin ] poly-arity: [ i686-linux, x86_64-linux, x86_64-darwin ] + poly-control: [ i686-linux, x86_64-linux, x86_64-darwin ] polynom: [ i686-linux, x86_64-linux, x86_64-darwin ] polynomial: [ i686-linux, x86_64-linux, x86_64-darwin ] polyseq: [ i686-linux, x86_64-linux, x86_64-darwin ] + polysoup: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] polytypeable: [ i686-linux, x86_64-linux, x86_64-darwin ] pomodoro: [ i686-linux, x86_64-linux, x86_64-darwin ] + ponder: [ i686-linux, x86_64-linux, x86_64-darwin ] pong-server: [ i686-linux, x86_64-linux, x86_64-darwin ] pontarius-mediaserver: [ i686-linux, x86_64-linux, x86_64-darwin ] pontarius-xmpp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3104,6 +6015,8 @@ dont-distribute-packages: posix-waitpid: [ i686-linux, x86_64-linux, x86_64-darwin ] postcodes: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-query: [ i686-linux, x86_64-linux, x86_64-darwin ] + postgresql-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-bind: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-sop: [ i686-linux, x86_64-linux, x86_64-darwin ] postgresql-simple-typed: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3112,9 +6025,13 @@ dont-distribute-packages: postgrest-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] postgrest: [ i686-linux, x86_64-linux, x86_64-darwin ] postie: [ i686-linux, x86_64-linux, x86_64-darwin ] + postmark: [ i686-linux, x86_64-linux, x86_64-darwin ] postmaster: [ i686-linux, x86_64-linux, x86_64-darwin ] + potato-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] powermate: [ i686-linux, x86_64-linux, x86_64-darwin ] powerpc: [ i686-linux, x86_64-linux, x86_64-darwin ] + PPrinter: [ i686-linux, x86_64-linux, x86_64-darwin ] + pptable: [ i686-linux, x86_64-linux, x86_64-darwin ] pqc: [ i686-linux, x86_64-linux, x86_64-darwin ] pqueue-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] practice-room: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3123,13 +6040,17 @@ dont-distribute-packages: prednote-test: [ i686-linux, x86_64-linux, x86_64-darwin ] prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] pregame: [ i686-linux, x86_64-linux, x86_64-darwin ] + preliminaries: [ i686-linux, x86_64-linux, x86_64-darwin ] prelude-generalize: [ i686-linux, x86_64-linux, x86_64-darwin ] prelude-plus: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocess-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] present: [ i686-linux, x86_64-linux, x86_64-darwin ] press: [ i686-linux, x86_64-linux, x86_64-darwin ] + presto-hdbc: [ i686-linux, x86_64-linux, x86_64-darwin ] + pretty-error: [ i686-linux, x86_64-linux, x86_64-darwin ] primitive-simd: [ i686-linux, x86_64-linux, x86_64-darwin ] + PrimitiveArray-Pretty: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-board: [ i686-linux, x86_64-linux, x86_64-darwin ] primula-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] pringletons: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3158,15 +6079,23 @@ dont-distribute-packages: prolog-graph: [ i686-linux, x86_64-linux, x86_64-darwin ] prolog: [ i686-linux, x86_64-linux, x86_64-darwin ] prologue: [ i686-linux, x86_64-linux, x86_64-darwin ] + promise: [ i686-linux, x86_64-linux, x86_64-darwin ] propane: [ i686-linux, x86_64-linux, x86_64-darwin ] Proper: [ i686-linux, x86_64-linux, x86_64-darwin ] + properties: [ i686-linux, x86_64-linux, x86_64-darwin ] property-list: [ i686-linux, x86_64-linux, x86_64-darwin ] proplang: [ i686-linux, x86_64-linux, x86_64-darwin ] + prosper: [ i686-linux, x86_64-linux, x86_64-darwin ] proteaaudio: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens-arbitrary: [ i686-linux, x86_64-linux, x86_64-darwin ] proto-lens-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens-optparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens-protoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + proto-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] protobuf-native: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-descriptor-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] protocol-buffers-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] + proton-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] prove-everywhere-server: [ i686-linux, x86_64-linux, x86_64-darwin ] proxy-kindness: [ i686-linux, x86_64-linux, x86_64-darwin ] psc-ide: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3183,14 +6112,22 @@ dont-distribute-packages: punkt: [ i686-linux, x86_64-linux, x86_64-darwin ] Pup-Events-Demo: [ i686-linux, x86_64-linux, x86_64-darwin ] puppetresources: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-priority-queue-tests: [ i686-linux, x86_64-linux, x86_64-darwin ] + pure-priority-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] + purescript-bridge: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-ccs: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify-general: [ i686-linux, x86_64-linux, x86_64-darwin ] push-notify: [ i686-linux, x86_64-linux, x86_64-darwin ] + pusher-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pusher-http-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + pusher-ws: [ i686-linux, x86_64-linux, x86_64-darwin ] pushme: [ i686-linux, x86_64-linux, x86_64-darwin ] putlenses: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw-cmdline: [ i686-linux, x86_64-linux, x86_64-darwin ] puzzle-draw: [ i686-linux, x86_64-linux, x86_64-darwin ] pvd: [ i686-linux, x86_64-linux, x86_64-darwin ] + pyffi: [ i686-linux, x86_64-linux, x86_64-darwin ] + pyfi: [ i686-linux, x86_64-linux, x86_64-darwin ] python-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] qc-oi-testgenerator: [ i686-linux, x86_64-linux, x86_64-darwin ] qd-vec: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3198,6 +6135,7 @@ dont-distribute-packages: qed: [ i686-linux, x86_64-linux, x86_64-darwin ] qhull-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] QIO: [ i686-linux, x86_64-linux, x86_64-darwin ] + QLearn: [ i686-linux, x86_64-linux, x86_64-darwin ] qt: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-cpp-qt5: [ i686-linux, x86_64-linux, x86_64-darwin ] qtah-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3213,18 +6151,26 @@ dont-distribute-packages: quenya-verb: [ i686-linux, x86_64-linux, x86_64-darwin ] querystring-pickle: [ i686-linux, x86_64-linux, x86_64-darwin ] queuelike: [ i686-linux, x86_64-linux, x86_64-darwin ] + quick-schema: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickAnnotate: [ i686-linux, x86_64-linux, x86_64-darwin ] quickbooks: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickCheck-GenT: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-poly: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-property-comb: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-property-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-relaxng: [ i686-linux, x86_64-linux, x86_64-darwin ] quickcheck-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickcheck-webdriver: [ i686-linux, x86_64-linux, x86_64-darwin ] QuickPlot: [ i686-linux, x86_64-linux, x86_64-darwin ] quickpull: [ i686-linux, x86_64-linux, x86_64-darwin ] quickset: [ i686-linux, x86_64-linux, x86_64-darwin ] Quickson: [ i686-linux, x86_64-linux, x86_64-darwin ] + quickterm: [ i686-linux, x86_64-linux, x86_64-darwin ] quicktest: [ i686-linux, x86_64-linux, x86_64-darwin ] quickwebapp: [ i686-linux, x86_64-linux, x86_64-darwin ] quipper: [ i686-linux, x86_64-linux, x86_64-darwin ] + quiver-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-interleave: [ i686-linux, x86_64-linux, x86_64-darwin ] quiver-sort: [ i686-linux, x86_64-linux, x86_64-darwin ] quoridor-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3233,6 +6179,8 @@ dont-distribute-packages: rabocsv2qif: [ i686-linux, x86_64-linux, x86_64-darwin ] rad: [ i686-linux, x86_64-linux, x86_64-darwin ] radium-formula-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] + radium: [ i686-linux, x86_64-linux, x86_64-darwin ] + radix: [ i686-linux, x86_64-linux, x86_64-darwin ] rados-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] raft: [ i686-linux, x86_64-linux, x86_64-darwin ] rail-compiler-editor: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3243,33 +6191,46 @@ dont-distribute-packages: rand-vars: [ i686-linux, x86_64-linux, x86_64-darwin ] randfile: [ i686-linux, x86_64-linux, x86_64-darwin ] random-access-list: [ i686-linux, x86_64-linux, x86_64-darwin ] + random-derive: [ i686-linux, x86_64-linux, x86_64-darwin ] random-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] random-effin: [ i686-linux, x86_64-linux, x86_64-darwin ] random-hypergeometric: [ i686-linux, x86_64-linux, x86_64-darwin ] random-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] random-variates: [ i686-linux, x86_64-linux, x86_64-darwin ] RandomDotOrg: [ i686-linux, x86_64-linux, x86_64-darwin ] + range-space: [ i686-linux, x86_64-linux, x86_64-darwin ] + Range: [ i686-linux, x86_64-linux, x86_64-darwin ] rangemin: [ i686-linux, x86_64-linux, x86_64-darwin ] Ranka: [ i686-linux, x86_64-linux, x86_64-darwin ] + rascal: [ i686-linux, x86_64-linux, x86_64-darwin ] Rasenschach: [ i686-linux, x86_64-linux, x86_64-darwin ] raven-haskell-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] raw-feldspar: [ i686-linux, x86_64-linux, x86_64-darwin ] rawr: [ i686-linux, x86_64-linux, x86_64-darwin ] + raz: [ i686-linux, x86_64-linux, x86_64-darwin ] + razom-text-util: [ i686-linux, x86_64-linux, x86_64-darwin ] rbr: [ i686-linux, x86_64-linux, x86_64-darwin ] rcu: [ i686-linux, x86_64-linux, x86_64-darwin ] rdf4h: [ i686-linux, x86_64-linux, x86_64-darwin ] rdioh: [ i686-linux, x86_64-linux, x86_64-darwin ] + react-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] react-tutorial-haskell-server: [ i686-linux, x86_64-linux, x86_64-darwin ] reaction-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-bacon: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-balsa: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-sdl: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-banana-threepenny: [ i686-linux, x86_64-linux, x86_64-darwin ] + reactive-banana-wx: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-fieldtrip: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive-thread: [ i686-linux, x86_64-linux, x86_64-darwin ] reactive: [ i686-linux, x86_64-linux, x86_64-darwin ] reactor: [ i686-linux, x86_64-linux, x86_64-darwin ] + read-bounded: [ i686-linux, x86_64-linux, x86_64-darwin ] + ReadArgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + readline-statevar: [ i686-linux, x86_64-linux, x86_64-darwin ] + readme-lhs: [ i686-linux, x86_64-linux, x86_64-darwin ] + readpyc: [ i686-linux, x86_64-linux, x86_64-darwin ] readshp: [ i686-linux, x86_64-linux, x86_64-darwin ] really-simple-xml-parser: [ i686-linux, x86_64-linux, x86_64-darwin ] reasonable-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3284,34 +6245,48 @@ dont-distribute-packages: redHandlers: [ i686-linux, x86_64-linux, x86_64-darwin ] Redmine: [ i686-linux, x86_64-linux, x86_64-darwin ] reedsolomon: [ i686-linux, x86_64-linux, x86_64-darwin ] + ref-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] Ref: [ i686-linux, x86_64-linux, x86_64-darwin ] ref: [ i686-linux, x86_64-linux, x86_64-darwin ] + refcount: [ i686-linux, x86_64-linux, x86_64-darwin ] Referees: [ i686-linux, x86_64-linux, x86_64-darwin ] references: [ i686-linux, x86_64-linux, x86_64-darwin ] refh: [ i686-linux, x86_64-linux, x86_64-darwin ] reflection-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-animation: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-colonnade: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom-helpers: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-dom: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-gloss-scene: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-gloss: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-jsx: [ i686-linux, x86_64-linux, x86_64-darwin ] reflex-orphans: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + reflex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-deriv: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-dfa: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-genex: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] regex-pderiv: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-tdfa-pipes: [ i686-linux, x86_64-linux, x86_64-darwin ] + regex-tdfa-quasiquoter: [ i686-linux, x86_64-linux, x86_64-darwin ] 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-xmlschema: [ i686-linux, x86_64-linux, x86_64-darwin ] regexchar: [ i686-linux, x86_64-linux, x86_64-darwin ] regexdot: [ i686-linux, x86_64-linux, x86_64-darwin ] regexp-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + regexpr-symbolic: [ i686-linux, x86_64-linux, x86_64-darwin ] regexqq: [ i686-linux, x86_64-linux, x86_64-darwin ] regional-pointers: [ i686-linux, x86_64-linux, x86_64-darwin ] regions-monadsfd: [ i686-linux, x86_64-linux, x86_64-darwin ] regions-monadstf: [ i686-linux, x86_64-linux, x86_64-darwin ] regions-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] regions: [ i686-linux, x86_64-linux, x86_64-darwin ] + register-machine-typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] + regress: [ i686-linux, x86_64-linux, x86_64-darwin ] regular-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] regular-web: [ i686-linux, x86_64-linux, x86_64-darwin ] regular-xmlpickler: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3321,6 +6296,8 @@ dont-distribute-packages: reified-records: [ i686-linux, x86_64-linux, x86_64-darwin ] reify: [ i686-linux, x86_64-linux, x86_64-darwin ] reinterpret-cast: [ i686-linux, x86_64-linux, x86_64-darwin ] + relation: [ i686-linux, x86_64-linux, x86_64-darwin ] + relative-date: [ i686-linux, x86_64-linux, x86_64-darwin ] reload: [ i686-linux, x86_64-linux, x86_64-darwin ] remote-debugger: [ i686-linux, x86_64-linux, x86_64-darwin ] remote-json-client: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3330,10 +6307,14 @@ dont-distribute-packages: remotion: [ i686-linux, x86_64-linux, x86_64-darwin ] reorderable: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-array: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-devil: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-fftw: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-linear-algebra: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + repa-scalar: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-series: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-sndfile: [ i686-linux, x86_64-linux, x86_64-darwin ] repa-stream: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3344,8 +6325,12 @@ dont-distribute-packages: repr: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] representable-tries: [ i686-linux, x86_64-linux, x86_64-darwin ] + reqcatcher: [ i686-linux, x86_64-linux, x86_64-darwin ] + request-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] resistor-cube: [ i686-linux, x86_64-linux, x86_64-darwin ] + resource-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-embed: [ i686-linux, x86_64-linux, x86_64-darwin ] + resource-pool-catchio: [ i686-linux, x86_64-linux, x86_64-darwin ] resource-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] respond: [ i686-linux, x86_64-linux, x86_64-darwin ] rest-example: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3354,21 +6339,30 @@ dont-distribute-packages: restricted-workers: [ i686-linux, x86_64-linux, x86_64-darwin ] restyle: [ i686-linux, x86_64-linux, x86_64-darwin ] resumable-exceptions: [ i686-linux, x86_64-linux, x86_64-darwin ] + rethinkdb-client-driver: [ i686-linux, x86_64-linux, x86_64-darwin ] rethinkdb-model: [ i686-linux, x86_64-linux, x86_64-darwin ] + retryer: [ i686-linux, x86_64-linux, x86_64-darwin ] + reversi: [ i686-linux, x86_64-linux, x86_64-darwin ] ReviewBoard: [ i686-linux, x86_64-linux, x86_64-darwin ] rewrite: [ i686-linux, x86_64-linux, x86_64-darwin ] rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] rezoom: [ i686-linux, x86_64-linux, x86_64-darwin ] rhythm-game-tutorial: [ i686-linux, x86_64-linux, x86_64-darwin ] + riak: [ i686-linux, x86_64-linux, x86_64-darwin ] + RichConditional: [ i686-linux, x86_64-linux, x86_64-darwin ] + riff: [ i686-linux, x86_64-linux, x86_64-darwin ] riot: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple-federation: [ i686-linux, x86_64-linux, x86_64-darwin ] ripple: [ i686-linux, x86_64-linux, x86_64-darwin ] risc386: [ i686-linux, x86_64-linux, x86_64-darwin ] rivers: [ i686-linux, x86_64-linux, x86_64-darwin ] + rivet-migration: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet-simple-deploy: [ i686-linux, x86_64-linux, x86_64-darwin ] rivet: [ i686-linux, x86_64-linux, x86_64-darwin ] RJson: [ i686-linux, x86_64-linux, x86_64-darwin ] + rl-satton: [ i686-linux, x86_64-linux, x86_64-darwin ] Rlang-QQ: [ i686-linux, x86_64-linux, x86_64-darwin ] + rlglue: [ i686-linux, x86_64-linux, x86_64-darwin ] rlwe-challenges: [ i686-linux, x86_64-linux, x86_64-darwin ] rmonad: [ i686-linux, x86_64-linux, x86_64-darwin ] RMP: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3376,11 +6370,15 @@ dont-distribute-packages: RNAdraw: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAFold: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAFoldProgs: [ i686-linux, x86_64-linux, x86_64-darwin ] + RNAlien: [ i686-linux, x86_64-linux, x86_64-darwin ] RNAwolf: [ i686-linux, x86_64-linux, x86_64-darwin ] robot: [ i686-linux, x86_64-linux, x86_64-darwin ] + robots-txt: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-engine: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-gl: [ i686-linux, x86_64-linux, x86_64-darwin ] roguestar-glut: [ i686-linux, x86_64-linux, x86_64-darwin ] + rollbar: [ i686-linux, x86_64-linux, x86_64-darwin ] + roller: [ i686-linux, x86_64-linux, x86_64-darwin ] RollingDirectory: [ i686-linux, x86_64-linux, x86_64-darwin ] rope: [ i686-linux, x86_64-linux, x86_64-darwin ] rose-trie: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3400,34 +6398,46 @@ dont-distribute-packages: rsagl-frp: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl-math: [ i686-linux, x86_64-linux, x86_64-darwin ] rsagl: [ i686-linux, x86_64-linux, x86_64-darwin ] + rspp: [ i686-linux, x86_64-linux, x86_64-darwin ] rss2irc: [ i686-linux, x86_64-linux, x86_64-darwin ] rss: [ i686-linux, x86_64-linux, x86_64-darwin ] rtcm: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] rtorrent-state: [ i686-linux, x86_64-linux, x86_64-darwin ] + ruby-marshal: [ i686-linux, x86_64-linux, x86_64-darwin ] ruby-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] ruff: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler-core: [ i686-linux, x86_64-linux, x86_64-darwin ] ruler: [ i686-linux, x86_64-linux, x86_64-darwin ] rungekutta: [ i686-linux, x86_64-linux, x86_64-darwin ] + rws: [ i686-linux, x86_64-linux, x86_64-darwin ] RxHaskell: [ i686-linux, x86_64-linux, x86_64-darwin ] s-cargot: [ i686-linux, x86_64-linux, x86_64-darwin ] + SableCC2Hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-access: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-freeze: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-globals: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-lazy-io: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-length: [ i686-linux, x86_64-linux, x86_64-darwin ] safe-plugins: [ i686-linux, x86_64-linux, x86_64-darwin ] + safe-printf: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles-text: [ i686-linux, x86_64-linux, x86_64-darwin ] safer-file-handles: [ i686-linux, x86_64-linux, x86_64-darwin ] + saferoute: [ i686-linux, x86_64-linux, x86_64-darwin ] sai-shape-syb: [ i686-linux, x86_64-linux, x86_64-darwin ] Salsa: [ i686-linux, x86_64-linux, x86_64-darwin ] + saltine-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-demo: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-protocol: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia-websocket: [ i686-linux, x86_64-linux, x86_64-darwin ] salvia: [ i686-linux, x86_64-linux, x86_64-darwin ] + samtools-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] samtools-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] + sandlib: [ i686-linux, x86_64-linux, x86_64-darwin ] + sarasvati: [ i686-linux, x86_64-linux, x86_64-darwin ] sarsi: [ i686-linux, x86_64-linux, x86_64-darwin ] sasl: [ i686-linux, x86_64-linux, x86_64-darwin ] sat-micro-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3440,18 +6450,23 @@ dont-distribute-packages: SBench: [ i686-linux, x86_64-linux, x86_64-darwin ] sbp2udp: [ i686-linux, x86_64-linux, x86_64-darwin ] sbp: [ i686-linux, x86_64-linux, x86_64-darwin ] + scalable-server: [ i686-linux, x86_64-linux, x86_64-darwin ] scaleimage: [ i686-linux, x86_64-linux, x86_64-darwin ] + SCalendar: [ i686-linux, x86_64-linux, x86_64-darwin ] scalp-webhooks: [ i686-linux, x86_64-linux, x86_64-darwin ] scan-vector-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] scenegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] schedevr: [ i686-linux, x86_64-linux, x86_64-darwin ] + schedyield: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-citeproc: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-texmath: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc-types: [ i686-linux, x86_64-linux, x86_64-darwin ] scholdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] science-constants-dimensional: [ i686-linux, x86_64-linux, x86_64-darwin ] + science-constants: [ i686-linux, x86_64-linux, x86_64-darwin ] scion-browser: [ i686-linux, x86_64-linux, x86_64-darwin ] scion: [ i686-linux, x86_64-linux, x86_64-darwin ] + scons2dot: [ i686-linux, x86_64-linux, x86_64-darwin ] scope-cairo: [ i686-linux, x86_64-linux, x86_64-darwin ] scope: [ i686-linux, x86_64-linux, x86_64-darwin ] scottish: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3459,7 +6474,10 @@ dont-distribute-packages: scotty-blaze: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-fay: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-rest: [ i686-linux, x86_64-linux, x86_64-darwin ] scotty-session: [ i686-linux, x86_64-linux, x86_64-darwin ] + scotty-view: [ i686-linux, x86_64-linux, x86_64-darwin ] + scp-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] scrabble-bot: [ i686-linux, x86_64-linux, x86_64-darwin ] ScratchFs: [ i686-linux, x86_64-linux, x86_64-darwin ] scrobble: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3468,15 +6486,18 @@ dont-distribute-packages: scyther-proof: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-compositor: [ i686-linux, x86_64-linux, x86_64-darwin ] sdl2-image: [ i686-linux, x86_64-linux, x86_64-darwin ] + sdr: [ i686-linux, x86_64-linux, x86_64-darwin ] seacat: [ i686-linux, x86_64-linux, x86_64-darwin ] search: [ i686-linux, x86_64-linux, x86_64-darwin ] sec: [ i686-linux, x86_64-linux, x86_64-darwin ] secdh: [ i686-linux, x86_64-linux, x86_64-darwin ] + seclib: [ i686-linux, x86_64-linux, x86_64-darwin ] second-transfer: [ i686-linux, x86_64-linux, x86_64-darwin ] secp256k1: [ i686-linux, x86_64-linux, x86_64-darwin ] secret-santa: [ i686-linux, x86_64-linux, x86_64-darwin ] secret-sharing: [ i686-linux, x86_64-linux, x86_64-darwin ] secrm: [ i686-linux, x86_64-linux, x86_64-darwin ] + secure-sockets: [ i686-linux, x86_64-linux, x86_64-darwin ] sednaDBXML: [ i686-linux, x86_64-linux, x86_64-darwin ] selectors: [ i686-linux, x86_64-linux, x86_64-darwin ] selenium-server: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3487,8 +6508,10 @@ dont-distribute-packages: semigroupoids-syntax: [ i686-linux, x86_64-linux, x86_64-darwin ] semigroups-actions: [ i686-linux, x86_64-linux, x86_64-darwin ] semiring: [ i686-linux, x86_64-linux, x86_64-darwin ] + semver-range: [ i686-linux, x86_64-linux, x86_64-darwin ] sensei: [ i686-linux, x86_64-linux, x86_64-darwin ] sensenet: [ i686-linux, x86_64-linux, x86_64-darwin ] + sentence-jp: [ i686-linux, x86_64-linux, x86_64-darwin ] sentry: [ i686-linux, x86_64-linux, x86_64-darwin ] seqaid: [ i686-linux, x86_64-linux, x86_64-darwin ] SeqAlign: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3507,6 +6530,7 @@ dont-distribute-packages: servant-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-elm: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-github-webhook: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-haxl-client: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-jquery: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-matrix-param: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3514,17 +6538,23 @@ dont-distribute-packages: servant-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-router: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-scotty: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-smsc-ru: [ i686-linux, x86_64-linux, x86_64-darwin ] + servant-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-subscriber: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] servant-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-backend-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] + serversession-backend-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] serversession-frontend-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] ses-html-snaplet: [ i686-linux, x86_64-linux, x86_64-darwin ] + ses-html: [ i686-linux, x86_64-linux, x86_64-darwin ] SessionLogger: [ i686-linux, x86_64-linux, x86_64-darwin ] sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] set-with: [ 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 ] setters: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp-grammar: [ i686-linux, x86_64-linux, x86_64-darwin ] sexp: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3532,44 +6562,69 @@ dont-distribute-packages: sext: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML-control: [ i686-linux, x86_64-linux, x86_64-darwin ] SFML: [ i686-linux, x86_64-linux, x86_64-darwin ] + sfmt: [ i686-linux, x86_64-linux, x86_64-darwin ] SFont: [ i686-linux, x86_64-linux, x86_64-darwin ] SG: [ i686-linux, x86_64-linux, x86_64-darwin ] + sgd: [ i686-linux, x86_64-linux, x86_64-darwin ] SGdemo: [ i686-linux, x86_64-linux, x86_64-darwin ] + sgf: [ i686-linux, x86_64-linux, x86_64-darwin ] sgrep: [ i686-linux, x86_64-linux, x86_64-darwin ] + sha-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] shadower: [ i686-linux, x86_64-linux, x86_64-darwin ] + shadowsocks: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] shady-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-cabal-build: [ i686-linux, x86_64-linux, x86_64-darwin ] shake-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-minify: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-pack: [ i686-linux, x86_64-linux, x86_64-darwin ] + shake-persist: [ i686-linux, x86_64-linux, x86_64-darwin ] shaker: [ i686-linux, x86_64-linux, x86_64-darwin ] + shakespeare-babel: [ i686-linux, x86_64-linux, x86_64-darwin ] shapely-data: [ i686-linux, x86_64-linux, x86_64-darwin ] shared-buffer: [ i686-linux, x86_64-linux, x86_64-darwin ] + shared-fields: [ i686-linux, x86_64-linux, x86_64-darwin ] she: [ i686-linux, x86_64-linux, x86_64-darwin ] shelduck: [ i686-linux, x86_64-linux, x86_64-darwin ] shell-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] Shellac-editline: [ i686-linux, x86_64-linux, x86_64-darwin ] shellish: [ i686-linux, x86_64-linux, x86_64-darwin ] + shellmate-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] + shelltestrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] + shoap: [ i686-linux, x86_64-linux, x86_64-darwin ] + shorten-strings: [ i686-linux, x86_64-linux, x86_64-darwin ] showdown: [ i686-linux, x86_64-linux, x86_64-darwin ] shpider: [ i686-linux, x86_64-linux, x86_64-darwin ] Shu-thing: [ i686-linux, x86_64-linux, x86_64-darwin ] sifflet-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + sifflet: [ i686-linux, x86_64-linux, x86_64-darwin ] signals: [ i686-linux, x86_64-linux, x86_64-darwin ] signed-multiset: [ i686-linux, x86_64-linux, x86_64-darwin ] simd: [ i686-linux, x86_64-linux, x86_64-darwin ] simgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-atom: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-bluetooth: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-c-value: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-config: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-css: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-firewire: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-form: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-genetic-algorithm: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-index: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-log-syslog: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-logger: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-neural-networks: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-nix: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-pascal: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-postgresql-orm: [ i686-linux, x86_64-linux, x86_64-darwin ] + simple-tabular: [ i686-linux, x86_64-linux, x86_64-darwin ] simple-vec3: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleGL: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleH: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleirc-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + simpleirc: [ i686-linux, x86_64-linux, x86_64-darwin ] SimpleLog: [ i686-linux, x86_64-linux, x86_64-darwin ] simplenote: [ i686-linux, x86_64-linux, x86_64-darwin ] simpleprelude: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3578,18 +6633,24 @@ dont-distribute-packages: simplest-sqlite: [ i686-linux, x86_64-linux, x86_64-darwin ] simseq: [ i686-linux, x86_64-linux, x86_64-darwin ] sindre: [ i686-linux, x86_64-linux, x86_64-darwin ] + sink: [ i686-linux, x86_64-linux, x86_64-darwin ] sirkel: [ i686-linux, x86_64-linux, x86_64-darwin ] + sixfiguregroup: [ i686-linux, x86_64-linux, x86_64-darwin ] sized-vector: [ i686-linux, x86_64-linux, x86_64-darwin ] sized: [ i686-linux, x86_64-linux, x86_64-darwin ] sjsp: [ i686-linux, x86_64-linux, x86_64-darwin ] skeleton: [ i686-linux, x86_64-linux, x86_64-darwin ] skell: [ i686-linux, x86_64-linux, x86_64-darwin ] + skemmtun: [ i686-linux, x86_64-linux, x86_64-darwin ] skype4hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + slack-api: [ i686-linux, x86_64-linux, x86_64-darwin ] slack: [ i686-linux, x86_64-linux, x86_64-darwin ] slidemews: [ i686-linux, x86_64-linux, x86_64-darwin ] Slides: [ i686-linux, x86_64-linux, x86_64-darwin ] sloth: [ i686-linux, x86_64-linux, x86_64-darwin ] smallarray: [ i686-linux, x86_64-linux, x86_64-darwin ] + smallcheck-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] + smallcheck-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] smallpt-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] smallstring: [ i686-linux, x86_64-linux, x86_64-darwin ] smartcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3601,16 +6662,21 @@ dont-distribute-packages: Smooth: [ i686-linux, x86_64-linux, x86_64-darwin ] smsaero: [ i686-linux, x86_64-linux, x86_64-darwin ] smt-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] + SmtLib: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp-mail-ng: [ i686-linux, x86_64-linux, x86_64-darwin ] smtp2mta: [ i686-linux, x86_64-linux, x86_64-darwin ] snake-game: [ i686-linux, x86_64-linux, x86_64-darwin ] + snake: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-accept: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-auth-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-blaze-clay: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-configuration-utilities: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-error-collector: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-predicates: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] + snap-server: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-testing: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] snap-web-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3653,31 +6719,44 @@ dont-distribute-packages: snaplet-tasks: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-typed-sessions: [ i686-linux, x86_64-linux, x86_64-darwin ] snaplet-wordpress: [ i686-linux, x86_64-linux, x86_64-darwin ] + snappy-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] snappy-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] sndfile-enumerators: [ i686-linux, x86_64-linux, x86_64-darwin ] + sneakyterm: [ i686-linux, x86_64-linux, x86_64-darwin ] sneathlane-haste: [ i686-linux, x86_64-linux, x86_64-darwin ] SNet: [ i686-linux, x86_64-linux, x86_64-darwin ] snm: [ i686-linux, x86_64-linux, x86_64-darwin ] + snmp: [ i686-linux, x86_64-linux, x86_64-darwin ] + snorkels: [ i686-linux, x86_64-linux, x86_64-darwin ] snow-white: [ i686-linux, x86_64-linux, x86_64-darwin ] + snowflake-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Snusmumrik: [ i686-linux, x86_64-linux, x86_64-darwin ] + soap-openssl: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFun: [ i686-linux, x86_64-linux, x86_64-darwin ] SoccerFunGL: [ i686-linux, x86_64-linux, x86_64-darwin ] sock2stream: [ i686-linux, x86_64-linux, x86_64-darwin ] + socket-io: [ i686-linux, x86_64-linux, x86_64-darwin ] socket-sctp: [ i686-linux, x86_64-linux, x86_64-darwin ] socketio: [ i686-linux, x86_64-linux, x86_64-darwin ] socketson: [ i686-linux, x86_64-linux, x86_64-darwin ] sodium: [ i686-linux, x86_64-linux, x86_64-darwin ] + soegtk: [ i686-linux, x86_64-linux, x86_64-darwin ] solga-swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] + solr: [ i686-linux, x86_64-linux, x86_64-darwin ] sonic-visualiser: [ i686-linux, x86_64-linux, x86_64-darwin ] + Sonnex: [ i686-linux, x86_64-linux, x86_64-darwin ] SoOSiM: [ i686-linux, x86_64-linux, x86_64-darwin ] sort-by-pinyin: [ i686-linux, x86_64-linux, x86_64-darwin ] sorted: [ i686-linux, x86_64-linux, x86_64-darwin ] + sorting: [ i686-linux, x86_64-linux, x86_64-darwin ] + sorty: [ i686-linux, x86_64-linux, x86_64-darwin ] sound-collage: [ i686-linux, x86_64-linux, x86_64-darwin ] source-code-server: [ i686-linux, x86_64-linux, x86_64-darwin ] SourceGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] sousit: [ i686-linux, x86_64-linux, x86_64-darwin ] soyuz: [ i686-linux, x86_64-linux, x86_64-darwin ] SpaceInvaders: [ i686-linux, x86_64-linux, x86_64-darwin ] + spacepart: [ i686-linux, x86_64-linux, x86_64-darwin ] SpacePrivateers: [ i686-linux, x86_64-linux, x86_64-darwin ] spaceprobe: [ i686-linux, x86_64-linux, x86_64-darwin ] spanout: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3688,18 +6767,24 @@ dont-distribute-packages: spata: [ i686-linux, x86_64-linux, x86_64-darwin ] special-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] specialize-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + spelling-suggest: [ i686-linux, x86_64-linux, x86_64-darwin ] sphero: [ i686-linux, x86_64-linux, x86_64-darwin ] sphinx-cli: [ i686-linux, x86_64-linux, x86_64-darwin ] spice: [ i686-linux, x86_64-linux, x86_64-darwin ] spike: [ i686-linux, x86_64-linux, x86_64-darwin ] + SpinCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] + spir-v: [ i686-linux, x86_64-linux, x86_64-darwin ] splaytree: [ i686-linux, x86_64-linux, x86_64-darwin ] spline3: [ i686-linux, x86_64-linux, x86_64-darwin ] splines: [ i686-linux, x86_64-linux, x86_64-darwin ] split-record: [ i686-linux, x86_64-linux, x86_64-darwin ] + splitter: [ i686-linux, x86_64-linux, x86_64-darwin ] Spock-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] + Spock-digestive: [ i686-linux, x86_64-linux, x86_64-darwin ] spoonutil: [ i686-linux, x86_64-linux, x86_64-darwin ] spoty: [ i686-linux, x86_64-linux, x86_64-darwin ] Sprig: [ i686-linux, x86_64-linux, x86_64-darwin ] + spritz: [ i686-linux, x86_64-linux, x86_64-darwin ] spsa: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] sql-simple-pool: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3710,57 +6795,91 @@ dont-distribute-packages: sqlvalue-list: [ i686-linux, x86_64-linux, x86_64-darwin ] squeeze: [ i686-linux, x86_64-linux, x86_64-darwin ] srcinst: [ i686-linux, x86_64-linux, x86_64-darwin ] + sscgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + ssh: [ i686-linux, x86_64-linux, x86_64-darwin ] + sshd-lint: [ i686-linux, x86_64-linux, x86_64-darwin ] sssp: [ i686-linux, x86_64-linux, x86_64-darwin ] sstable: [ i686-linux, x86_64-linux, x86_64-darwin ] + stable-heap: [ i686-linux, x86_64-linux, x86_64-darwin ] + stable-maps: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-marriage: [ i686-linux, x86_64-linux, x86_64-darwin ] + stable-memo: [ i686-linux, x86_64-linux, x86_64-darwin ] stable-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] stack-prism: [ i686-linux, x86_64-linux, x86_64-darwin ] stackage-curator: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage-setup: [ i686-linux, x86_64-linux, x86_64-darwin ] + stackage: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-derive-topdown: [ i686-linux, x86_64-linux, x86_64-darwin ] standalone-haddock: [ i686-linux, x86_64-linux, x86_64-darwin ] + starling: [ i686-linux, x86_64-linux, x86_64-darwin ] starrover2: [ i686-linux, x86_64-linux, x86_64-darwin ] + Stasis: [ i686-linux, x86_64-linux, x86_64-darwin ] state-record: [ i686-linux, x86_64-linux, x86_64-darwin ] + state: [ i686-linux, x86_64-linux, x86_64-darwin ] stateful-mtl: [ i686-linux, x86_64-linux, x86_64-darwin ] statgrab: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-dirichlet: [ i686-linux, x86_64-linux, x86_64-darwin ] statistics-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + statistics-hypergeometric-genvar: [ i686-linux, x86_64-linux, x86_64-darwin ] + stats: [ i686-linux, x86_64-linux, x86_64-darwin ] + statsd: [ i686-linux, x86_64-linux, x86_64-darwin ] stb-truetype: [ i686-linux, x86_64-linux, x86_64-darwin ] + stdata: [ i686-linux, x86_64-linux, x86_64-darwin ] + stdf: [ i686-linux, x86_64-linux, x86_64-darwin ] + steambrowser: [ i686-linux, x86_64-linux, x86_64-darwin ] steeloverseer: [ i686-linux, x86_64-linux, x86_64-darwin ] step-function: [ i686-linux, x86_64-linux, x86_64-darwin ] stepwise: [ i686-linux, x86_64-linux, x86_64-darwin ] stgi: [ i686-linux, x86_64-linux, x86_64-darwin ] stm-chunked-queues: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-firehose: [ i686-linux, x86_64-linux, x86_64-darwin ] + stm-lifted: [ i686-linux, x86_64-linux, x86_64-darwin ] stmcontrol: [ i686-linux, x86_64-linux, x86_64-darwin ] stochastic: [ i686-linux, x86_64-linux, x86_64-darwin ] Stomp: [ i686-linux, x86_64-linux, x86_64-darwin ] storable-static-array: [ i686-linux, x86_64-linux, x86_64-darwin ] storablevector-streamfusion: [ i686-linux, x86_64-linux, x86_64-darwin ] store: [ i686-linux, x86_64-linux, x86_64-darwin ] + str: [ i686-linux, x86_64-linux, x86_64-darwin ] + Strafunski-ATermLib: [ i686-linux, x86_64-linux, x86_64-darwin ] Strafunski-Sdf2Haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + StrappedTemplates: [ i686-linux, x86_64-linux, x86_64-darwin ] stratum-tool: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-http: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-types: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] stratux: [ i686-linux, x86_64-linux, x86_64-darwin ] stream-fusion: [ i686-linux, x86_64-linux, x86_64-darwin ] + stream-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] stream: [ i686-linux, x86_64-linux, x86_64-darwin ] streamed: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-eversion: [ i686-linux, x86_64-linux, x86_64-darwin ] streaming-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] strict-concurrency: [ i686-linux, x86_64-linux, x86_64-darwin ] + strict-identity: [ i686-linux, x86_64-linux, x86_64-darwin ] + strict-io: [ i686-linux, x86_64-linux, x86_64-darwin ] StrictBench: [ i686-linux, x86_64-linux, x86_64-darwin ] + strictly: [ i686-linux, x86_64-linux, x86_64-darwin ] string-typelits: [ i686-linux, x86_64-linux, x86_64-darwin ] stringlike: [ i686-linux, x86_64-linux, x86_64-darwin ] + StringUtils: [ i686-linux, x86_64-linux, x86_64-darwin ] + stripe-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + stripe-http-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] + stripe: [ i686-linux, x86_64-linux, x86_64-darwin ] structs: [ i686-linux, x86_64-linux, x86_64-darwin ] structural-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] + structured-haskell-mode: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] + stylized: [ i686-linux, x86_64-linux, x86_64-darwin ] sub-state: [ i686-linux, x86_64-linux, x86_64-darwin ] subhask: [ i686-linux, x86_64-linux, x86_64-darwin ] subleq-toolchain: [ i686-linux, x86_64-linux, x86_64-darwin ] + suffixarray: [ i686-linux, x86_64-linux, x86_64-darwin ] SuffixStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] suitable: [ i686-linux, x86_64-linux, x86_64-darwin ] + sump: [ i686-linux, x86_64-linux, x86_64-darwin ] sunlight: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-compiler: [ i686-linux, x86_64-linux, x86_64-darwin ] sunroof-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3769,25 +6888,31 @@ dont-distribute-packages: supercollider-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] supercollider-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] superdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] + supermonad: [ i686-linux, x86_64-linux, x86_64-darwin ] supero: [ i686-linux, x86_64-linux, x86_64-darwin ] supervisor: [ i686-linux, x86_64-linux, x86_64-darwin ] SVG2Q: [ i686-linux, x86_64-linux, x86_64-darwin ] svg2q: [ i686-linux, x86_64-linux, x86_64-darwin ] + svgutils: [ i686-linux, x86_64-linux, x86_64-darwin ] svm-simple: [ i686-linux, x86_64-linux, x86_64-darwin ] svndump: [ i686-linux, x86_64-linux, x86_64-darwin ] swagger2: [ i686-linux, x86_64-linux, x86_64-darwin ] + swagger: [ i686-linux, x86_64-linux, x86_64-darwin ] swapper: [ i686-linux, x86_64-linux, x86_64-darwin ] swearjure: [ i686-linux, x86_64-linux, x86_64-darwin ] swf: [ i686-linux, x86_64-linux, x86_64-darwin ] swift-lda: [ i686-linux, x86_64-linux, x86_64-darwin ] swish: [ i686-linux, x86_64-linux, x86_64-darwin ] + SWMMoutGetMB: [ i686-linux, x86_64-linux, x86_64-darwin ] sws: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] syb-with-class-instances-text: [ i686-linux, x86_64-linux, x86_64-darwin ] + SybWidget: [ i686-linux, x86_64-linux, x86_64-darwin ] sylvia: [ i686-linux, x86_64-linux, x86_64-darwin ] sym-plot: [ i686-linux, x86_64-linux, x86_64-darwin ] sym: [ i686-linux, x86_64-linux, x86_64-darwin ] symengine-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] + sync-mht: [ i686-linux, x86_64-linux, x86_64-darwin ] sync: [ i686-linux, x86_64-linux, x86_64-darwin ] syncthing-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] syntactic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3814,26 +6939,42 @@ dont-distribute-packages: system-random-effect: [ i686-linux, x86_64-linux, x86_64-darwin ] systemstats: [ i686-linux, x86_64-linux, x86_64-darwin ] t-regex: [ i686-linux, x86_64-linux, x86_64-darwin ] + t3-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + t3-server: [ i686-linux, x86_64-linux, x86_64-darwin ] ta: [ i686-linux, x86_64-linux, x86_64-darwin ] + table-layout: [ i686-linux, x86_64-linux, x86_64-darwin ] + table-tennis: [ i686-linux, x86_64-linux, x86_64-darwin ] + table: [ i686-linux, x86_64-linux, x86_64-darwin ] Tables: [ i686-linux, x86_64-linux, x86_64-darwin ] tables: [ i686-linux, x86_64-linux, x86_64-darwin ] tablestorage: [ i686-linux, x86_64-linux, x86_64-darwin ] tabloid: [ i686-linux, x86_64-linux, x86_64-darwin ] + tag-bits: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-list: [ i686-linux, x86_64-linux, x86_64-darwin ] tagged-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagged-timers: [ i686-linux, x86_64-linux, x86_64-darwin ] + taglib-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagset-positional: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-ht: [ i686-linux, x86_64-linux, x86_64-darwin ] tagsoup-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] + tagsoup-selection: [ i686-linux, x86_64-linux, x86_64-darwin ] takusen-oracle: [ i686-linux, x86_64-linux, x86_64-darwin ] Takusen: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-term: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-theory: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] tamarin-prover: [ i686-linux, x86_64-linux, x86_64-darwin ] + Tape: [ i686-linux, x86_64-linux, x86_64-darwin ] target: [ i686-linux, x86_64-linux, x86_64-darwin ] task-distribution: [ i686-linux, x86_64-linux, x86_64-darwin ] task: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-fail-fast: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-groundhog-converters: [ i686-linux, x86_64-linux, x86_64-darwin ] tasty-integrate: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-laws: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + tasty-tap: [ i686-linux, x86_64-linux, x86_64-darwin ] + TaxonomyTools: [ i686-linux, x86_64-linux, x86_64-darwin ] TBC: [ i686-linux, x86_64-linux, x86_64-darwin ] TBit: [ i686-linux, x86_64-linux, x86_64-darwin ] tbox: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3844,18 +6985,25 @@ dont-distribute-packages: tdoc: [ i686-linux, x86_64-linux, x86_64-darwin ] TeaHS: [ i686-linux, x86_64-linux, x86_64-darwin ] teams: [ i686-linux, x86_64-linux, x86_64-darwin ] + teeth: [ i686-linux, x86_64-linux, x86_64-darwin ] + telegram-api: [ i686-linux, x86_64-linux, x86_64-darwin ] telegram: [ i686-linux, x86_64-linux, x86_64-darwin ] + tellbot: [ i686-linux, x86_64-linux, x86_64-darwin ] template-default: [ i686-linux, x86_64-linux, x86_64-darwin ] template-haskell-util: [ i686-linux, x86_64-linux, x86_64-darwin ] template-hsml: [ i686-linux, x86_64-linux, x86_64-darwin ] template-yj: [ i686-linux, x86_64-linux, x86_64-darwin ] templateify: [ i686-linux, x86_64-linux, x86_64-darwin ] + templatepg: [ i686-linux, x86_64-linux, x86_64-darwin ] tempodb: [ i686-linux, x86_64-linux, x86_64-darwin ] temporal-csound: [ i686-linux, x86_64-linux, x86_64-darwin ] + temporary-resourcet: [ i686-linux, x86_64-linux, x86_64-darwin ] tempus: [ i686-linux, x86_64-linux, x86_64-darwin ] tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] term-rewriting: [ i686-linux, x86_64-linux, x86_64-darwin ] termbox-bindings: [ i686-linux, x86_64-linux, x86_64-darwin ] + terminal-progress-bar: [ i686-linux, x86_64-linux, x86_64-darwin ] + termination-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] termplot: [ i686-linux, x86_64-linux, x86_64-darwin ] terntup: [ i686-linux, x86_64-linux, x86_64-darwin ] terrahs: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3863,10 +7011,13 @@ dont-distribute-packages: test-framework-doctest: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-framework-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-framework-skip: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-pkg: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-hunit: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox-quickcheck: [ i686-linux, x86_64-linux, x86_64-darwin ] test-sandbox: [ i686-linux, x86_64-linux, x86_64-darwin ] + test-shouldbe: [ i686-linux, x86_64-linux, x86_64-darwin ] testloop: [ i686-linux, x86_64-linux, x86_64-darwin ] testpack: [ i686-linux, x86_64-linux, x86_64-darwin ] testpattern: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3875,15 +7026,23 @@ dont-distribute-packages: tex2txt: [ i686-linux, x86_64-linux, x86_64-darwin ] texrunner: [ i686-linux, x86_64-linux, x86_64-darwin ] text-all: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-and-plots: [ i686-linux, x86_64-linux, x86_64-darwin ] text-json-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] text-normal: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-position: [ i686-linux, x86_64-linux, x86_64-darwin ] text-register-machine: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-render: [ i686-linux, x86_64-linux, x86_64-darwin ] text-show-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] text-show: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-generic: [ i686-linux, x86_64-linux, x86_64-darwin ] text-xml-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + text-zipper-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] textmatetags: [ i686-linux, x86_64-linux, x86_64-darwin ] + textocat-api: [ i686-linux, x86_64-linux, x86_64-darwin ] + textual: [ i686-linux, x86_64-linux, x86_64-darwin ] tfp-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + tftp: [ i686-linux, x86_64-linux, x86_64-darwin ] + tga: [ i686-linux, x86_64-linux, x86_64-darwin ] th-build: [ i686-linux, x86_64-linux, x86_64-darwin ] th-context: [ i686-linux, x86_64-linux, x86_64-darwin ] th-fold: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3895,12 +7054,16 @@ dont-distribute-packages: th-traced: [ i686-linux, x86_64-linux, x86_64-darwin ] th-typegraph: [ i686-linux, x86_64-linux, x86_64-darwin ] THEff: [ i686-linux, x86_64-linux, x86_64-darwin ] + themoviedb: [ i686-linux, x86_64-linux, x86_64-darwin ] + thentos-cookie-session: [ i686-linux, x86_64-linux, x86_64-darwin ] Theora: [ i686-linux, x86_64-linux, x86_64-darwin ] theoremquest-client: [ i686-linux, x86_64-linux, x86_64-darwin ] + theoremquest: [ i686-linux, x86_64-linux, x86_64-darwin ] thih: [ i686-linux, x86_64-linux, x86_64-darwin ] thimk: [ i686-linux, x86_64-linux, x86_64-darwin ] Thingie: [ i686-linux, x86_64-linux, x86_64-darwin ] thorn: [ i686-linux, x86_64-linux, x86_64-darwin ] + threads-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] threepenny-gui: [ i686-linux, x86_64-linux, x86_64-darwin ] Thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3908,38 +7071,53 @@ dont-distribute-packages: tianbar: [ i686-linux, x86_64-linux, x86_64-darwin ] tic-tac-toe: [ i686-linux, x86_64-linux, x86_64-darwin ] tickle: [ i686-linux, x86_64-linux, x86_64-darwin ] + tictactoe3d: [ i686-linux, x86_64-linux, x86_64-darwin ] TicTacToe: [ i686-linux, x86_64-linux, x86_64-darwin ] + tidal-midi: [ i686-linux, x86_64-linux, x86_64-darwin ] tidal-serial: [ i686-linux, x86_64-linux, x86_64-darwin ] tie-knot: [ i686-linux, x86_64-linux, x86_64-darwin ] + tiempo: [ i686-linux, x86_64-linux, x86_64-darwin ] tiger: [ i686-linux, x86_64-linux, x86_64-darwin ] + TigerHash: [ i686-linux, x86_64-linux, x86_64-darwin ] + tightrope: [ i686-linux, x86_64-linux, x86_64-darwin ] tighttp: [ i686-linux, x86_64-linux, x86_64-darwin ] timberc: [ i686-linux, x86_64-linux, x86_64-darwin ] time-extras: [ i686-linux, x86_64-linux, x86_64-darwin ] time-exts: [ i686-linux, x86_64-linux, x86_64-darwin ] time-http: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-io-access: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-patterns: [ i686-linux, x86_64-linux, x86_64-darwin ] time-qq: [ i686-linux, x86_64-linux, x86_64-darwin ] + time-recurrence: [ i686-linux, x86_64-linux, x86_64-darwin ] time-series: [ i686-linux, x86_64-linux, x86_64-darwin ] time-w3c: [ i686-linux, x86_64-linux, x86_64-darwin ] timecalc: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeconsole: [ i686-linux, x86_64-linux, x86_64-darwin ] timeout: [ i686-linux, x86_64-linux, x86_64-darwin ] timeparsers: [ i686-linux, x86_64-linux, x86_64-darwin ] TimePiece: [ i686-linux, x86_64-linux, x86_64-darwin ] timeplot: [ i686-linux, x86_64-linux, x86_64-darwin ] + timeprint: [ i686-linux, x86_64-linux, x86_64-darwin ] timestamp-subprocess-lines: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyLaunchbury: [ i686-linux, x86_64-linux, x86_64-darwin ] + tinyMesh: [ i686-linux, x86_64-linux, x86_64-darwin ] TinyURL: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-haskell-frontend: [ i686-linux, x86_64-linux, x86_64-darwin ] tip-lib: [ i686-linux, x86_64-linux, x86_64-darwin ] Titim: [ i686-linux, x86_64-linux, x86_64-darwin ] + titlecase: [ i686-linux, x86_64-linux, x86_64-darwin ] 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 ] tls-extra: [ i686-linux, x86_64-linux, x86_64-darwin ] + tn: [ i686-linux, x86_64-linux, x86_64-darwin ] to-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-class: [ i686-linux, x86_64-linux, x86_64-darwin ] to-string-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] todos: [ i686-linux, x86_64-linux, x86_64-darwin ] tofromxml: [ i686-linux, x86_64-linux, x86_64-darwin ] toilet: [ i686-linux, x86_64-linux, x86_64-darwin ] + tokenify: [ i686-linux, x86_64-linux, x86_64-darwin ] toktok: [ i686-linux, x86_64-linux, x86_64-darwin ] tokyocabinet-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] toml: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3947,43 +7125,77 @@ dont-distribute-packages: Top: [ i686-linux, x86_64-linux, x86_64-darwin ] topkata: [ i686-linux, x86_64-linux, x86_64-darwin ] torch: [ i686-linux, x86_64-linux, x86_64-darwin ] + total: [ i686-linux, x86_64-linux, x86_64-darwin ] + touched: [ i686-linux, x86_64-linux, x86_64-darwin ] Tournament: [ i686-linux, x86_64-linux, x86_64-darwin ] + toxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] toysolver: [ i686-linux, x86_64-linux, x86_64-darwin ] + tpar: [ i686-linux, x86_64-linux, x86_64-darwin ] + trace-call: [ i686-linux, x86_64-linux, x86_64-darwin ] + trace-function-call: [ i686-linux, x86_64-linux, x86_64-darwin ] trace: [ i686-linux, x86_64-linux, x86_64-darwin ] traced: [ i686-linux, x86_64-linux, x86_64-darwin ] + tracetree: [ i686-linux, x86_64-linux, x86_64-darwin ] tracker: [ i686-linux, x86_64-linux, x86_64-darwin ] + tracy: [ i686-linux, x86_64-linux, x86_64-darwin ] traildb: [ i686-linux, x86_64-linux, x86_64-darwin ] trajectory: [ i686-linux, x86_64-linux, x86_64-darwin ] transactional-events: [ i686-linux, x86_64-linux, x86_64-darwin ] transformations: [ i686-linux, x86_64-linux, x86_64-darwin ] TransformeR: [ i686-linux, x86_64-linux, x86_64-darwin ] + transformers-compose: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-eff: [ i686-linux, x86_64-linux, x86_64-darwin ] transformers-runnable: [ i686-linux, x86_64-linux, x86_64-darwin ] + TransformersStepByStep: [ 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 ] + trawl: [ i686-linux, x86_64-linux, x86_64-darwin ] traypoweroff: [ i686-linux, x86_64-linux, x86_64-darwin ] + TreeCounter: [ i686-linux, x86_64-linux, x86_64-darwin ] + treemap-html-tools: [ i686-linux, x86_64-linux, x86_64-darwin ] + treemap-html: [ i686-linux, x86_64-linux, x86_64-darwin ] + treemap: [ i686-linux, x86_64-linux, x86_64-darwin ] treersec: [ i686-linux, x86_64-linux, x86_64-darwin ] + TreeStructures: [ i686-linux, x86_64-linux, x86_64-darwin ] + Treiber: [ i686-linux, x86_64-linux, x86_64-darwin ] tremulous-query: [ i686-linux, x86_64-linux, x86_64-darwin ] TrendGraph: [ i686-linux, x86_64-linux, x86_64-darwin ] trhsx: [ i686-linux, x86_64-linux, x86_64-darwin ] triangulation: [ i686-linux, x86_64-linux, x86_64-darwin ] TrieMap: [ i686-linux, x86_64-linux, x86_64-darwin ] trimpolya: [ i686-linux, x86_64-linux, x86_64-darwin ] + tripLL: [ i686-linux, x86_64-linux, x86_64-darwin ] tropical: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] tsession: [ i686-linux, x86_64-linux, x86_64-darwin ] tskiplist: [ i686-linux, x86_64-linux, x86_64-darwin ] + tslib: [ i686-linux, x86_64-linux, x86_64-darwin ] + tslogger: [ i686-linux, x86_64-linux, x86_64-darwin ] tsp-viz: [ i686-linux, x86_64-linux, x86_64-darwin ] + tsparse: [ i686-linux, x86_64-linux, x86_64-darwin ] + tsvsql: [ i686-linux, x86_64-linux, x86_64-darwin ] tuntap: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-gen: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-hlist: [ i686-linux, x86_64-linux, x86_64-darwin ] + tuple-lenses: [ i686-linux, x86_64-linux, x86_64-darwin ] tuple-morph: [ i686-linux, x86_64-linux, x86_64-darwin ] tupleinstances: [ i686-linux, x86_64-linux, x86_64-darwin ] + turing-machines: [ i686-linux, x86_64-linux, x86_64-darwin ] + turingMachine: [ i686-linux, x86_64-linux, x86_64-darwin ] + tweak: [ i686-linux, x86_64-linux, x86_64-darwin ] + twee: [ i686-linux, x86_64-linux, x86_64-darwin ] + twentefp-eventloop-graphics: [ i686-linux, x86_64-linux, x86_64-darwin ] + twentefp-graphs: [ i686-linux, x86_64-linux, x86_64-darwin ] twentefp-rosetree: [ i686-linux, x86_64-linux, x86_64-darwin ] + twentefp-trees: [ i686-linux, x86_64-linux, x86_64-darwin ] + twentefp-websockets: [ i686-linux, x86_64-linux, x86_64-darwin ] twentyseven: [ i686-linux, x86_64-linux, x86_64-darwin ] twhs: [ i686-linux, x86_64-linux, x86_64-darwin ] twidge: [ i686-linux, x86_64-linux, x86_64-darwin ] twilight-stm: [ i686-linux, x86_64-linux, x86_64-darwin ] + twilio: [ i686-linux, x86_64-linux, x86_64-darwin ] twill: [ i686-linux, x86_64-linux, x86_64-darwin ] twiml: [ i686-linux, x86_64-linux, x86_64-darwin ] twine: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3991,6 +7203,7 @@ dont-distribute-packages: twitter-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] twitter: [ i686-linux, x86_64-linux, x86_64-darwin ] tx: [ i686-linux, x86_64-linux, x86_64-darwin ] + txtblk: [ i686-linux, x86_64-linux, x86_64-darwin ] TYB: [ i686-linux, x86_64-linux, x86_64-darwin ] typalyze: [ i686-linux, x86_64-linux, x86_64-darwin ] type-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -3999,6 +7212,8 @@ dont-distribute-packages: type-digits: [ i686-linux, x86_64-linux, x86_64-darwin ] type-int: [ i686-linux, x86_64-linux, x86_64-darwin ] type-level-bst: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-level-natural-number-induction: [ i686-linux, x86_64-linux, x86_64-darwin ] + type-level-natural-number-operations: [ i686-linux, x86_64-linux, x86_64-darwin ] type-natural: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord-spine-cereal: [ i686-linux, x86_64-linux, x86_64-darwin ] type-ord: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4009,14 +7224,19 @@ dont-distribute-packages: type-sub-th: [ i686-linux, x86_64-linux, x86_64-darwin ] typeable-th: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeClass: [ i686-linux, x86_64-linux, x86_64-darwin ] + typed-spreadsheet: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire-utils: [ i686-linux, x86_64-linux, x86_64-darwin ] typed-wire: [ i686-linux, x86_64-linux, x86_64-darwin ] typedquery: [ i686-linux, x86_64-linux, x86_64-darwin ] typehash: [ i686-linux, x86_64-linux, x86_64-darwin ] TypeIlluminator: [ i686-linux, x86_64-linux, x86_64-darwin ] typelevel-tensor: [ i686-linux, x86_64-linux, x86_64-darwin ] + typelevel: [ i686-linux, x86_64-linux, x86_64-darwin ] + TypeNat: [ i686-linux, x86_64-linux, x86_64-darwin ] typeparams: [ i686-linux, x86_64-linux, x86_64-darwin ] + types-compat: [ i686-linux, x86_64-linux, x86_64-darwin ] typescript-docs: [ i686-linux, x86_64-linux, x86_64-darwin ] + u2f: [ i686-linux, x86_64-linux, x86_64-darwin ] uAgda: [ i686-linux, x86_64-linux, x86_64-darwin ] uber: [ i686-linux, x86_64-linux, x86_64-darwin ] uberlast: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4024,26 +7244,36 @@ dont-distribute-packages: udbus-model: [ i686-linux, x86_64-linux, x86_64-darwin ] udbus: [ i686-linux, x86_64-linux, x86_64-darwin ] uhc-light: [ i686-linux, x86_64-linux, x86_64-darwin ] + uhexdump: [ i686-linux, x86_64-linux, x86_64-darwin ] ui-command: [ i686-linux, x86_64-linux, x86_64-darwin ] + uid: [ i686-linux, x86_64-linux, x86_64-darwin ] UMM: [ i686-linux, x86_64-linux, x86_64-darwin ] unamb-custom: [ i686-linux, x86_64-linux, x86_64-darwin ] unbounded-delays-units: [ i686-linux, x86_64-linux, x86_64-darwin ] unboxed-containers: [ i686-linux, x86_64-linux, x86_64-darwin ] unbreak: [ i686-linux, x86_64-linux, x86_64-darwin ] unicode-normalization: [ i686-linux, x86_64-linux, x86_64-darwin ] + unicode-symbols: [ i686-linux, x86_64-linux, x86_64-darwin ] unicoder: [ i686-linux, x86_64-linux, x86_64-darwin ] uniform-io: [ i686-linux, x86_64-linux, x86_64-darwin ] union-map: [ i686-linux, x86_64-linux, x86_64-darwin ] + unique-logic-tf: [ i686-linux, x86_64-linux, x86_64-darwin ] + unique-logic: [ i686-linux, x86_64-linux, x86_64-darwin ] uniqueid: [ i686-linux, x86_64-linux, x86_64-darwin ] units-attoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] unittyped: [ i686-linux, x86_64-linux, x86_64-darwin ] universe-th: [ i686-linux, x86_64-linux, x86_64-darwin ] + unix-fcntl: [ i686-linux, x86_64-linux, x86_64-darwin ] unix-process-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] + unjson: [ i686-linux, x86_64-linux, x86_64-darwin ] unlit: [ i686-linux, x86_64-linux, x86_64-darwin ] unordered-containers-rematch: [ i686-linux, x86_64-linux, x86_64-darwin ] unpack-funcs: [ i686-linux, x86_64-linux, x86_64-darwin ] unroll-ghc-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + unsafely: [ i686-linux, x86_64-linux, x86_64-darwin ] unscramble: [ i686-linux, x86_64-linux, x86_64-darwin ] + unsequential: [ i686-linux, x86_64-linux, x86_64-darwin ] + unused: [ i686-linux, x86_64-linux, x86_64-darwin ] up: [ i686-linux, x86_64-linux, x86_64-darwin ] uploadcare: [ i686-linux, x86_64-linux, x86_64-darwin ] upskirt: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4059,8 +7289,10 @@ dont-distribute-packages: urldisp-happstack: [ i686-linux, x86_64-linux, x86_64-darwin ] UrlDisp: [ i686-linux, x86_64-linux, x86_64-darwin ] URLT: [ i686-linux, x86_64-linux, x86_64-darwin ] + urn: [ i686-linux, x86_64-linux, x86_64-darwin ] urxml: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + usb-hid: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-iteratee: [ i686-linux, x86_64-linux, x86_64-darwin ] usb-safe: [ i686-linux, x86_64-linux, x86_64-darwin ] users-persistent: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4078,14 +7310,21 @@ dont-distribute-packages: vacuum-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum-ubigraph: [ i686-linux, x86_64-linux, x86_64-darwin ] vacuum: [ i686-linux, x86_64-linux, x86_64-darwin ] + valid-names: [ i686-linux, x86_64-linux, x86_64-darwin ] + validated-literals: [ i686-linux, x86_64-linux, x86_64-darwin ] + Validation: [ i686-linux, x86_64-linux, x86_64-darwin ] validations: [ i686-linux, x86_64-linux, x86_64-darwin ] vampire: [ i686-linux, x86_64-linux, x86_64-darwin ] var: [ i686-linux, x86_64-linux, x86_64-darwin ] variable-precision: [ i686-linux, x86_64-linux, x86_64-darwin ] + variables: [ i686-linux, x86_64-linux, x86_64-darwin ] vaultaire-common: [ i686-linux, x86_64-linux, x86_64-darwin ] + vcsgui: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Boolean: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-OpenGLRaw: [ i686-linux, x86_64-linux, x86_64-darwin ] Vec-Transform: [ i686-linux, x86_64-linux, x86_64-darwin ] + vect-floating-accelerate: [ i686-linux, x86_64-linux, x86_64-darwin ] + vect-floating: [ i686-linux, x86_64-linux, x86_64-darwin ] vect-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-bytestring: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-clock: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4097,8 +7336,14 @@ dont-distribute-packages: vector-read-instances: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-space-opengl: [ i686-linux, x86_64-linux, x86_64-darwin ] vector-static: [ i686-linux, x86_64-linux, x86_64-darwin ] + Verba: [ i686-linux, x86_64-linux, x86_64-darwin ] + verbalexpressions: [ i686-linux, x86_64-linux, x86_64-darwin ] + verdict-json: [ i686-linux, x86_64-linux, x86_64-darwin ] + verdict: [ i686-linux, x86_64-linux, x86_64-darwin ] verilog: [ i686-linux, x86_64-linux, x86_64-darwin ] + views: [ i686-linux, x86_64-linux, x86_64-darwin ] vigilance: [ i686-linux, x86_64-linux, x86_64-darwin ] + vimeta: [ i686-linux, x86_64-linux, x86_64-darwin ] vimus: [ i686-linux, x86_64-linux, x86_64-darwin ] vintage-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] vinyl-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4123,30 +7368,43 @@ dont-distribute-packages: vulkan: [ i686-linux, x86_64-linux, x86_64-darwin ] wacom-daemon: [ i686-linux, x86_64-linux, x86_64-darwin ] waddle: [ i686-linux, x86_64-linux, x86_64-darwin ] + wahsp: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-app-file-cgi: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-cors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-digestive-functors: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-graceful: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-devel: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-handler-scgi: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-handler-webkit: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-hastache: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-hmac-auth: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-lite: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-logger-prefork: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-catch: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-consul: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-content-type: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-middleware-etag: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-headers: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-hmac-client: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-preprocessor: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-route: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-middleware-static-caching: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-responsible: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-router: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-mysql: [ i686-linux, x86_64-linux, x86_64-darwin ] + wai-session-postgresql: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-session-tokyocabinet: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-static-cache: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-thrift: [ i686-linux, x86_64-linux, x86_64-darwin ] wai-throttler: [ i686-linux, x86_64-linux, x86_64-darwin ] + warc: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-dynamic: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-static: [ i686-linux, x86_64-linux, x86_64-darwin ] warp-tls-uid: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4159,6 +7417,7 @@ dont-distribute-packages: wavy: [ i686-linux, x86_64-linux, x86_64-darwin ] weather-api: [ i686-linux, x86_64-linux, x86_64-darwin ] web-browser-in-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-css: [ i686-linux, x86_64-linux, x86_64-darwin ] web-encodings: [ i686-linux, x86_64-linux, x86_64-darwin ] web-fpco: [ i686-linux, x86_64-linux, x86_64-darwin ] web-inv-route: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4166,19 +7425,24 @@ dont-distribute-packages: web-routes-quasi: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routes-regular: [ i686-linux, x86_64-linux, x86_64-darwin ] web-routes-transformers: [ i686-linux, x86_64-linux, x86_64-darwin ] + web-routing: [ i686-linux, x86_64-linux, x86_64-darwin ] webapi: [ i686-linux, x86_64-linux, x86_64-darwin ] webapp: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-Html: [ i686-linux, x86_64-linux, x86_64-darwin ] WebBits-multiplate: [ i686-linux, x86_64-linux, x86_64-darwin ] + webcloud: [ i686-linux, x86_64-linux, x86_64-darwin ] WebCont: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-dispatch: [ i686-linux, x86_64-linux, x86_64-darwin ] webcrank-wai: [ i686-linux, x86_64-linux, x86_64-darwin ] + webcrank: [ i686-linux, x86_64-linux, x86_64-darwin ] webdriver-snoy: [ i686-linux, x86_64-linux, x86_64-darwin ] + WeberLogic: [ i686-linux, x86_64-linux, x86_64-darwin ] webify: [ i686-linux, x86_64-linux, x86_64-darwin ] webkit-javascriptcore: [ i686-linux, x86_64-linux, x86_64-darwin ] Webrexp: [ i686-linux, x86_64-linux, x86_64-darwin ] webserver: [ i686-linux, x86_64-linux, x86_64-darwin ] websnap: [ i686-linux, x86_64-linux, x86_64-darwin ] + websockets-snap: [ i686-linux, x86_64-linux, x86_64-darwin ] webwire: [ i686-linux, x86_64-linux, x86_64-darwin ] weighted-regexp: [ i686-linux, x86_64-linux, x86_64-darwin ] welshy: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4187,7 +7451,9 @@ dont-distribute-packages: wheb-strapped: [ i686-linux, x86_64-linux, x86_64-darwin ] Wheb: [ i686-linux, x86_64-linux, x86_64-darwin ] whim: [ i686-linux, x86_64-linux, x86_64-darwin ] + whiskers: [ i686-linux, x86_64-linux, x86_64-darwin ] whitespace: [ i686-linux, x86_64-linux, x86_64-darwin ] + why3: [ i686-linux, x86_64-linux, x86_64-darwin ] WikimediaParser: [ i686-linux, x86_64-linux, x86_64-darwin ] wikipedia4epub: [ i686-linux, x86_64-linux, x86_64-darwin ] windowslive: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4196,7 +7462,9 @@ dont-distribute-packages: wire-streams: [ i686-linux, x86_64-linux, x86_64-darwin ] wiring: [ i686-linux, x86_64-linux, x86_64-darwin ] wkt: [ i686-linux, x86_64-linux, x86_64-darwin ] + wl-pprint-ansiterm: [ i686-linux, x86_64-linux, x86_64-darwin ] WL500gPControl: [ i686-linux, x86_64-linux, x86_64-darwin ] + WL500gPLib: [ i686-linux, x86_64-linux, x86_64-darwin ] wlc-hs: [ i686-linux, x86_64-linux, x86_64-darwin ] WMSigner: [ i686-linux, x86_64-linux, x86_64-darwin ] wobsurv: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4209,9 +7477,12 @@ dont-distribute-packages: WordNet: [ i686-linux, x86_64-linux, x86_64-darwin ] wordsearch: [ i686-linux, x86_64-linux, x86_64-darwin ] workflow-osx: [ i686-linux, x86_64-linux, x86_64-darwin ] + workflow-windows: [ i686-linux, x86_64-linux, x86_64-darwin ] wp-archivebot: [ i686-linux, x86_64-linux, x86_64-darwin ] wraxml: [ i686-linux, x86_64-linux, x86_64-darwin ] + wrecker: [ i686-linux, x86_64-linux, x86_64-darwin ] wright: [ i686-linux, x86_64-linux, x86_64-darwin ] + wsedit: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk-gtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wtk: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-basic: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4220,8 +7491,14 @@ dont-distribute-packages: wumpus-microprint: [ i686-linux, x86_64-linux, x86_64-darwin ] wumpus-tree: [ i686-linux, x86_64-linux, x86_64-darwin ] WURFL: [ i686-linux, x86_64-linux, x86_64-darwin ] + wx: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxAsteroids: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxc: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxcore: [ i686-linux, x86_64-linux, x86_64-darwin ] WXDiffCtrl: [ i686-linux, x86_64-linux, x86_64-darwin ] + wxdirect: [ i686-linux, x86_64-linux, x86_64-darwin ] wxFruit: [ i686-linux, x86_64-linux, x86_64-darwin ] + WxGeneric: [ i686-linux, x86_64-linux, x86_64-darwin ] wxhnotepad: [ i686-linux, x86_64-linux, x86_64-darwin ] wxturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] wyvern: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4233,6 +7510,7 @@ dont-distribute-packages: x11-xinput: [ i686-linux, x86_64-linux, x86_64-darwin ] x86-64bit: [ i686-linux, x86_64-linux, x86_64-darwin ] xchat-plugin: [ i686-linux, x86_64-linux, x86_64-darwin ] + xcp: [ i686-linux, x86_64-linux, x86_64-darwin ] xdcc: [ i686-linux, x86_64-linux, x86_64-darwin ] Xec: [ i686-linux, x86_64-linux, x86_64-darwin ] xfconf: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4244,11 +7522,14 @@ dont-distribute-packages: xing-api: [ i686-linux, x86_64-linux, x86_64-darwin ] xkbcommon: [ i686-linux, x86_64-linux, x86_64-darwin ] xkcd: [ i686-linux, x86_64-linux, x86_64-darwin ] + xlsior: [ i686-linux, x86_64-linux, x86_64-darwin ] xlsx-templater: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-catalog: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-conduit-decode: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator-combinators: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-html-conduit-lens: [ i686-linux, x86_64-linux, x86_64-darwin ] + xml-monad: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-parsec: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-pipe: [ i686-linux, x86_64-linux, x86_64-darwin ] xml-prettify: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4266,16 +7547,24 @@ dont-distribute-packages: xmonad-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-contrib-bluetilebranch: [ i686-linux, x86_64-linux, x86_64-darwin ] xmonad-eval: [ i686-linux, x86_64-linux, x86_64-darwin ] + xmonad-windownames: [ i686-linux, x86_64-linux, x86_64-darwin ] xmpipe: [ i686-linux, x86_64-linux, x86_64-darwin ] XMPP: [ i686-linux, x86_64-linux, x86_64-darwin ] + Xorshift128Plus: [ i686-linux, x86_64-linux, x86_64-darwin ] + xournal-builder: [ i686-linux, x86_64-linux, x86_64-darwin ] xournal-convert: [ i686-linux, x86_64-linux, x86_64-darwin ] xournal-render: [ i686-linux, x86_64-linux, x86_64-darwin ] xsact: [ i686-linux, x86_64-linux, x86_64-darwin ] XSaiga: [ i686-linux, x86_64-linux, x86_64-darwin ] xslt: [ i686-linux, x86_64-linux, x86_64-darwin ] + xtc: [ i686-linux, x86_64-linux, x86_64-darwin ] + xturtle: [ i686-linux, x86_64-linux, x86_64-darwin ] + xxhash: [ i686-linux, x86_64-linux, x86_64-darwin ] y0l0bot: [ i686-linux, x86_64-linux, x86_64-darwin ] + yabi-muno: [ i686-linux, x86_64-linux, x86_64-darwin ] Yablog: [ i686-linux, x86_64-linux, x86_64-darwin ] YACPong: [ i686-linux, x86_64-linux, x86_64-darwin ] + yahoo-finance-conduit: [ i686-linux, x86_64-linux, x86_64-darwin ] yahoo-web-search: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl-enumerator: [ i686-linux, x86_64-linux, x86_64-darwin ] yajl: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4284,22 +7573,31 @@ dont-distribute-packages: yaml-rpc: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml-union: [ i686-linux, x86_64-linux, x86_64-darwin ] yaml2owl: [ i686-linux, x86_64-linux, x86_64-darwin ] + yamlkeysdiff: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-canvas: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa-glfw: [ i686-linux, x86_64-linux, x86_64-darwin ] yampa2048: [ i686-linux, x86_64-linux, x86_64-darwin ] Yampa: [ i686-linux, x86_64-linux, x86_64-darwin ] YampaSynth: [ i686-linux, x86_64-linux, x86_64-darwin ] yaop: [ i686-linux, x86_64-linux, x86_64-darwin ] + yap: [ i686-linux, x86_64-linux, x86_64-darwin ] + yarr-image-io: [ i686-linux, x86_64-linux, x86_64-darwin ] yate: [ i686-linux, x86_64-linux, x86_64-darwin ] yavie: [ i686-linux, x86_64-linux, x86_64-darwin ] ycextra: [ i686-linux, x86_64-linux, x86_64-darwin ] + yeller: [ i686-linux, x86_64-linux, x86_64-darwin ] yeshql: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-angular-ui: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-account-fork: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-bcrypt: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-deskcom: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-fb: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-hashdb: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-kerberos: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-ldap: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-pam: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-auth-smbclient: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-auth-zendesk: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-comments: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-content-pdf: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-continuations: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4310,6 +7608,7 @@ dont-distribute-packages: yesod-examples: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-goodies: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-ip: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-job-queue: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-links: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-mangopay: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-paginate: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4321,10 +7620,12 @@ dont-distribute-packages: yesod-purescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-bin: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-raml-mock: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-routes-flow: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes-typescript: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-routes: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-rst: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-s3: [ i686-linux, x86_64-linux, x86_64-darwin ] + yesod-sass: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-session-redis: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-tableview: [ i686-linux, x86_64-linux, x86_64-darwin ] yesod-test-json: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4334,8 +7635,18 @@ dont-distribute-packages: YFrob: [ i686-linux, x86_64-linux, x86_64-darwin ] yhccore: [ i686-linux, x86_64-linux, x86_64-darwin ] yi-contrib: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-keymap-cua: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-keymap-emacs: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-keymap-vim: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-misc-modes: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-mode-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-mode-javascript: [ i686-linux, x86_64-linux, x86_64-darwin ] + yi-spolsky: [ i686-linux, x86_64-linux, x86_64-darwin ] yices: [ i686-linux, x86_64-linux, x86_64-darwin ] + yjftp-libs: [ i686-linux, x86_64-linux, x86_64-darwin ] yjftp: [ i686-linux, x86_64-linux, x86_64-darwin ] + yjsvg: [ i686-linux, x86_64-linux, x86_64-darwin ] + yoctoparsec: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt-Standalone: [ i686-linux, x86_64-linux, x86_64-darwin ] Yogurt: [ i686-linux, x86_64-linux, x86_64-darwin ] yoko: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4347,6 +7658,7 @@ dont-distribute-packages: zabt: [ i686-linux, x86_64-linux, x86_64-darwin ] zampolit: [ i686-linux, x86_64-linux, x86_64-darwin ] zasni-gerna: [ i686-linux, x86_64-linux, x86_64-darwin ] + ZEBEDDE: [ i686-linux, x86_64-linux, x86_64-darwin ] zendesk-api: [ i686-linux, x86_64-linux, x86_64-darwin ] zeno: [ i686-linux, x86_64-linux, x86_64-darwin ] zeromq-haskell: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -4354,9 +7666,14 @@ dont-distribute-packages: zeromq3-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 ] + 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 ] + zipkin: [ 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 ] + zmidi-score: [ i686-linux, x86_64-linux, x86_64-darwin ] zmqat: [ i686-linux, x86_64-linux, x86_64-darwin ] zoneinfo: [ i686-linux, x86_64-linux, x86_64-darwin ] zoom-cache-pcm: [ i686-linux, x86_64-linux, x86_64-darwin ] diff --git a/pkgs/development/haskell-modules/configuration-lts.nix b/pkgs/development/haskell-modules/configuration-lts.nix deleted file mode 100644 index 5ccc5a7351e..00000000000 --- a/pkgs/development/haskell-modules/configuration-lts.nix +++ /dev/null @@ -1,8592 +0,0 @@ -{ pkgs }: - -with import ./lib.nix { inherit pkgs; }; - -self: super: { - - # core libraries provided by the compiler - Cabal = null; - array = null; - base = null; - bin-package-db = null; - binary = null; - bytestring = null; - containers = null; - deepseq = null; - directory = null; - filepath = null; - ghc-prim = null; - hoopl = null; - hpc = null; - integer-gmp = null; - pretty = null; - process = null; - rts = null; - template-haskell = null; - time = null; - transformers = null; - unix = null; - - # lts-6.9 packages - "3d-graphics-examples" = dontDistribute super."3d-graphics-examples"; - "3dmodels" = dontDistribute super."3dmodels"; - "4Blocks" = dontDistribute super."4Blocks"; - "AAI" = dontDistribute super."AAI"; - "ABList" = dontDistribute super."ABList"; - "AC-Angle" = dontDistribute super."AC-Angle"; - "AC-Boolean" = dontDistribute super."AC-Boolean"; - "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform"; - "AC-Colour" = dontDistribute super."AC-Colour"; - "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK"; - "AC-HalfInteger" = dontDistribute super."AC-HalfInteger"; - "AC-MiniTest" = dontDistribute super."AC-MiniTest"; - "AC-PPM" = dontDistribute super."AC-PPM"; - "AC-Random" = dontDistribute super."AC-Random"; - "AC-Terminal" = dontDistribute super."AC-Terminal"; - "AC-VanillaArray" = dontDistribute super."AC-VanillaArray"; - "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy"; - "ACME" = dontDistribute super."ACME"; - "ADPfusion" = dontDistribute super."ADPfusion"; - "AERN-Basics" = dontDistribute super."AERN-Basics"; - "AERN-Net" = dontDistribute super."AERN-Net"; - "AERN-Real" = dontDistribute super."AERN-Real"; - "AERN-Real-Double" = dontDistribute super."AERN-Real-Double"; - "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval"; - "AERN-RnToRm" = dontDistribute super."AERN-RnToRm"; - "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot"; - "AES" = dontDistribute super."AES"; - "AFSM" = dontDistribute super."AFSM"; - "AGI" = dontDistribute super."AGI"; - "ALUT" = dontDistribute super."ALUT"; - "AMI" = dontDistribute super."AMI"; - "ANum" = dontDistribute super."ANum"; - "ASN1" = dontDistribute super."ASN1"; - "AVar" = dontDistribute super."AVar"; - "AWin32Console" = dontDistribute super."AWin32Console"; - "AbortT-monadstf" = dontDistribute super."AbortT-monadstf"; - "AbortT-mtl" = dontDistribute super."AbortT-mtl"; - "AbortT-transformers" = dontDistribute super."AbortT-transformers"; - "ActionKid" = dontDistribute super."ActionKid"; - "Adaptive" = dontDistribute super."Adaptive"; - "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade"; - "Advgame" = dontDistribute super."Advgame"; - "AesonBson" = dontDistribute super."AesonBson"; - "Agata" = dontDistribute super."Agata"; - "Agda" = doDistribute super."Agda_2_5_1"; - "Agda-executable" = dontDistribute super."Agda-executable"; - "AhoCorasick" = dontDistribute super."AhoCorasick"; - "AlanDeniseEricLauren" = dontDistribute super."AlanDeniseEricLauren"; - "AlgorithmW" = dontDistribute super."AlgorithmW"; - "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms"; - "Allure" = dontDistribute super."Allure"; - "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter"; - "Animas" = dontDistribute super."Animas"; - "Annotations" = dontDistribute super."Annotations"; - "Ansi2Html" = dontDistribute super."Ansi2Html"; - "ApplePush" = dontDistribute super."ApplePush"; - "AppleScript" = dontDistribute super."AppleScript"; - "ApproxFun-hs" = dontDistribute super."ApproxFun-hs"; - "ArrayRef" = dontDistribute super."ArrayRef"; - "ArrowVHDL" = dontDistribute super."ArrowVHDL"; - "AspectAG" = dontDistribute super."AspectAG"; - "AttoBencode" = dontDistribute super."AttoBencode"; - "AttoJson" = dontDistribute super."AttoJson"; - "Attrac" = dontDistribute super."Attrac"; - "Aurochs" = dontDistribute super."Aurochs"; - "AutoForms" = dontDistribute super."AutoForms"; - "AvlTree" = dontDistribute super."AvlTree"; - "BASIC" = dontDistribute super."BASIC"; - "BCMtools" = dontDistribute super."BCMtools"; - "BNFC" = dontDistribute super."BNFC"; - "BNFC-meta" = dontDistribute super."BNFC-meta"; - "Baggins" = dontDistribute super."Baggins"; - "Bang" = dontDistribute super."Bang"; - "Barracuda" = dontDistribute super."Barracuda"; - "Befunge93" = dontDistribute super."Befunge93"; - "BenchmarkHistory" = dontDistribute super."BenchmarkHistory"; - "BerkeleyDB" = dontDistribute super."BerkeleyDB"; - "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML"; - "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm"; - "BiGUL" = dontDistribute super."BiGUL"; - "BigPixel" = dontDistribute super."BigPixel"; - "Binpack" = dontDistribute super."Binpack"; - "Biobase" = dontDistribute super."Biobase"; - "BiobaseBlast" = dontDistribute super."BiobaseBlast"; - "BiobaseDotP" = dontDistribute super."BiobaseDotP"; - "BiobaseFR3D" = dontDistribute super."BiobaseFR3D"; - "BiobaseFasta" = dontDistribute super."BiobaseFasta"; - "BiobaseInfernal" = dontDistribute super."BiobaseInfernal"; - "BiobaseMAF" = dontDistribute super."BiobaseMAF"; - "BiobaseNewick" = dontDistribute super."BiobaseNewick"; - "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData"; - "BiobaseTurner" = dontDistribute super."BiobaseTurner"; - "BiobaseTypes" = dontDistribute super."BiobaseTypes"; - "BiobaseVienna" = dontDistribute super."BiobaseVienna"; - "BiobaseXNA" = dontDistribute super."BiobaseXNA"; - "BirdPP" = dontDistribute super."BirdPP"; - "BitSyntax" = dontDistribute super."BitSyntax"; - "Bitly" = dontDistribute super."Bitly"; - "Blobs" = dontDistribute super."Blobs"; - "BluePrintCSS" = dontDistribute super."BluePrintCSS"; - "Blueprint" = dontDistribute super."Blueprint"; - "Bookshelf" = dontDistribute super."Bookshelf"; - "Bravo" = dontDistribute super."Bravo"; - "BufferedSocket" = dontDistribute super."BufferedSocket"; - "Buster" = dontDistribute super."Buster"; - "CBOR" = dontDistribute super."CBOR"; - "CC-delcont" = dontDistribute super."CC-delcont"; - "CC-delcont-alt" = dontDistribute super."CC-delcont-alt"; - "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe"; - "CC-delcont-exc" = dontDistribute super."CC-delcont-exc"; - "CC-delcont-ref" = dontDistribute super."CC-delcont-ref"; - "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf"; - "CCA" = dontDistribute super."CCA"; - "CHXHtml" = dontDistribute super."CHXHtml"; - "CLASE" = dontDistribute super."CLASE"; - "CLI" = dontDistribute super."CLI"; - "CMCompare" = dontDistribute super."CMCompare"; - "CMQ" = dontDistribute super."CMQ"; - "COrdering" = dontDistribute super."COrdering"; - "CPBrainfuck" = dontDistribute super."CPBrainfuck"; - "CPL" = dontDistribute super."CPL"; - "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage"; - "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules"; - "CSPM-Frontend" = dontDistribute super."CSPM-Frontend"; - "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter"; - "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog"; - "CSPM-cspm" = dontDistribute super."CSPM-cspm"; - "CTRex" = dontDistribute super."CTRex"; - "CV" = dontDistribute super."CV"; - "CabalSearch" = dontDistribute super."CabalSearch"; - "Capabilities" = dontDistribute super."Capabilities"; - "Cardinality" = dontDistribute super."Cardinality"; - "CarneadesDSL" = dontDistribute super."CarneadesDSL"; - "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung"; - "Cartesian" = dontDistribute super."Cartesian"; - "Cascade" = dontDistribute super."Cascade"; - "Catana" = dontDistribute super."Catana"; - "Chart" = doDistribute super."Chart_1_6"; - "Chart-cairo" = doDistribute super."Chart-cairo_1_6"; - "Chart-diagrams" = doDistribute super."Chart-diagrams_1_6"; - "Chart-gtk" = dontDistribute super."Chart-gtk"; - "Chart-simple" = dontDistribute super."Chart-simple"; - "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_1"; - "CheatSheet" = dontDistribute super."CheatSheet"; - "Checked" = dontDistribute super."Checked"; - "Chitra" = dontDistribute super."Chitra"; - "ChristmasTree" = dontDistribute super."ChristmasTree"; - "CirruParser" = dontDistribute super."CirruParser"; - "ClassLaws" = dontDistribute super."ClassLaws"; - "ClassyPrelude" = dontDistribute super."ClassyPrelude"; - "Clean" = dontDistribute super."Clean"; - "Clipboard" = dontDistribute super."Clipboard"; - "Coadjute" = dontDistribute super."Coadjute"; - "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF"; - "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL"; - "Combinatorrent" = dontDistribute super."Combinatorrent"; - "Command" = dontDistribute super."Command"; - "Commando" = dontDistribute super."Commando"; - "ComonadSheet" = dontDistribute super."ComonadSheet"; - "Concurrent-Cache" = dontDistribute super."Concurrent-Cache"; - "ConcurrentUtils" = dontDistribute super."ConcurrentUtils"; - "Concurrential" = dontDistribute super."Concurrential"; - "Condor" = dontDistribute super."Condor"; - "ConfigFileTH" = dontDistribute super."ConfigFileTH"; - "Configger" = dontDistribute super."Configger"; - "Configurable" = dontDistribute super."Configurable"; - "ConsStream" = dontDistribute super."ConsStream"; - "Conscript" = dontDistribute super."Conscript"; - "ConstraintKinds" = dontDistribute super."ConstraintKinds"; - "Consumer" = dontDistribute super."Consumer"; - "ContArrow" = dontDistribute super."ContArrow"; - "ContextAlgebra" = dontDistribute super."ContextAlgebra"; - "Contract" = dontDistribute super."Contract"; - "Control-Engine" = dontDistribute super."Control-Engine"; - "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass"; - "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2"; - "CoreDump" = dontDistribute super."CoreDump"; - "CoreErlang" = dontDistribute super."CoreErlang"; - "CoreFoundation" = dontDistribute super."CoreFoundation"; - "Coroutine" = dontDistribute super."Coroutine"; - "CouchDB" = dontDistribute super."CouchDB"; - "Craft3e" = dontDistribute super."Craft3e"; - "Crypto" = dontDistribute super."Crypto"; - "CurryDB" = dontDistribute super."CurryDB"; - "DAG-Tournament" = dontDistribute super."DAG-Tournament"; - "DAV" = doDistribute super."DAV_1_2"; - "DBlimited" = dontDistribute super."DBlimited"; - "DBus" = dontDistribute super."DBus"; - "DCFL" = dontDistribute super."DCFL"; - "DMuCheck" = dontDistribute super."DMuCheck"; - "DOM" = dontDistribute super."DOM"; - "DP" = dontDistribute super."DP"; - "DPM" = dontDistribute super."DPM"; - "DPutils" = dontDistribute super."DPutils"; - "DSA" = dontDistribute super."DSA"; - "DSH" = dontDistribute super."DSH"; - "DSTM" = dontDistribute super."DSTM"; - "DTC" = dontDistribute super."DTC"; - "Dangerous" = dontDistribute super."Dangerous"; - "Dao" = dontDistribute super."Dao"; - "DarcsHelpers" = dontDistribute super."DarcsHelpers"; - "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent"; - "Data-Rope" = dontDistribute super."Data-Rope"; - "DataTreeView" = dontDistribute super."DataTreeView"; - "Deadpan-DDP" = dontDistribute super."Deadpan-DDP"; - "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers"; - "DecisionTree" = dontDistribute super."DecisionTree"; - "DeepArrow" = dontDistribute super."DeepArrow"; - "DefendTheKing" = dontDistribute super."DefendTheKing"; - "Delta-Lambda" = dontDistribute super."Delta-Lambda"; - "DescriptiveKeys" = dontDistribute super."DescriptiveKeys"; - "Dflow" = dontDistribute super."Dflow"; - "Diff" = doDistribute super."Diff_0_3_2"; - "DifferenceLogic" = dontDistribute super."DifferenceLogic"; - "DifferentialEvolution" = dontDistribute super."DifferentialEvolution"; - "Digit" = dontDistribute super."Digit"; - "DigitalOcean" = dontDistribute super."DigitalOcean"; - "DimensionalHash" = dontDistribute super."DimensionalHash"; - "DirectSound" = dontDistribute super."DirectSound"; - "DisTract" = dontDistribute super."DisTract"; - "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem"; - "Dish" = dontDistribute super."Dish"; - "Dist" = dontDistribute super."Dist"; - "DistanceTransform" = dontDistribute super."DistanceTransform"; - "DistanceUnits" = dontDistribute super."DistanceUnits"; - "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment"; - "DocTest" = dontDistribute super."DocTest"; - "Docs" = dontDistribute super."Docs"; - "DrHylo" = dontDistribute super."DrHylo"; - "DrIFT" = dontDistribute super."DrIFT"; - "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized"; - "Dung" = dontDistribute super."Dung"; - "Dust" = dontDistribute super."Dust"; - "Dust-crypto" = dontDistribute super."Dust-crypto"; - "Dust-tools" = dontDistribute super."Dust-tools"; - "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap"; - "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp"; - "DysFRP" = dontDistribute super."DysFRP"; - "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo"; - "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk"; - "EEConfig" = dontDistribute super."EEConfig"; - "EdisonAPI" = doDistribute super."EdisonAPI_1_3"; - "EditTimeReport" = dontDistribute super."EditTimeReport"; - "EitherT" = dontDistribute super."EitherT"; - "Elm" = dontDistribute super."Elm"; - "Emping" = dontDistribute super."Emping"; - "Encode" = dontDistribute super."Encode"; - "EnumContainers" = dontDistribute super."EnumContainers"; - "EnumMap" = dontDistribute super."EnumMap"; - "Eq" = dontDistribute super."Eq"; - "EqualitySolver" = dontDistribute super."EqualitySolver"; - "EsounD" = dontDistribute super."EsounD"; - "EstProgress" = dontDistribute super."EstProgress"; - "EtaMOO" = dontDistribute super."EtaMOO"; - "Etage" = dontDistribute super."Etage"; - "Etage-Graph" = dontDistribute super."Etage-Graph"; - "Eternal10Seconds" = dontDistribute super."Eternal10Seconds"; - "Etherbunny" = dontDistribute super."Etherbunny"; - "EuroIT" = dontDistribute super."EuroIT"; - "Euterpea" = dontDistribute super."Euterpea"; - "EventSocket" = dontDistribute super."EventSocket"; - "Extra" = dontDistribute super."Extra"; - "FComp" = dontDistribute super."FComp"; - "FM-SBLEX" = dontDistribute super."FM-SBLEX"; - "FModExRaw" = dontDistribute super."FModExRaw"; - "FPretty" = dontDistribute super."FPretty"; - "FTGL" = dontDistribute super."FTGL"; - "FTGL-bytestring" = dontDistribute super."FTGL-bytestring"; - "FTPLine" = dontDistribute super."FTPLine"; - "Facts" = dontDistribute super."Facts"; - "FailureT" = dontDistribute super."FailureT"; - "FastxPipe" = dontDistribute super."FastxPipe"; - "FermatsLastMargin" = dontDistribute super."FermatsLastMargin"; - "FerryCore" = dontDistribute super."FerryCore"; - "Feval" = dontDistribute super."Feval"; - "FieldTrip" = dontDistribute super."FieldTrip"; - "FileManip" = dontDistribute super."FileManip"; - "FileManipCompat" = dontDistribute super."FileManipCompat"; - "FilePather" = dontDistribute super."FilePather"; - "FileSystem" = dontDistribute super."FileSystem"; - "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo"; - "Finance-Treasury" = dontDistribute super."Finance-Treasury"; - "FiniteMap" = dontDistribute super."FiniteMap"; - "FirstOrderTheory" = dontDistribute super."FirstOrderTheory"; - "FixedPoint-simple" = dontDistribute super."FixedPoint-simple"; - "Flippi" = dontDistribute super."Flippi"; - "Focus" = dontDistribute super."Focus"; - "Folly" = dontDistribute super."Folly"; - "ForSyDe" = dontDistribute super."ForSyDe"; - "ForestStructures" = dontDistribute super."ForestStructures"; - "ForkableT" = dontDistribute super."ForkableT"; - "FormalGrammars" = dontDistribute super."FormalGrammars"; - "Foster" = dontDistribute super."Foster"; - "FpMLv53" = dontDistribute super."FpMLv53"; - "FractalArt" = dontDistribute super."FractalArt"; - "Fractaler" = dontDistribute super."Fractaler"; - "Frames" = doDistribute super."Frames_0_1_4"; - "Frank" = dontDistribute super."Frank"; - "FreeTypeGL" = dontDistribute super."FreeTypeGL"; - "FunGEn" = dontDistribute super."FunGEn"; - "Fungi" = dontDistribute super."Fungi"; - "GA" = dontDistribute super."GA"; - "GGg" = dontDistribute super."GGg"; - "GHood" = dontDistribute super."GHood"; - "GLFW" = dontDistribute super."GLFW"; - "GLFW-OGL" = dontDistribute super."GLFW-OGL"; - "GLFW-b-demo" = dontDistribute super."GLFW-b-demo"; - "GLFW-task" = dontDistribute super."GLFW-task"; - "GLHUI" = dontDistribute super."GLHUI"; - "GLM" = dontDistribute super."GLM"; - "GLMatrix" = dontDistribute super."GLMatrix"; - "GLUtil" = dontDistribute super."GLUtil"; - "GPX" = dontDistribute super."GPX"; - "GPipe-Collada" = dontDistribute super."GPipe-Collada"; - "GPipe-Examples" = dontDistribute super."GPipe-Examples"; - "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad"; - "GTALib" = dontDistribute super."GTALib"; - "Gamgine" = dontDistribute super."Gamgine"; - "Ganymede" = dontDistribute super."Ganymede"; - "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration"; - "GeBoP" = dontDistribute super."GeBoP"; - "GenI" = dontDistribute super."GenI"; - "GenSmsPdu" = dontDistribute super."GenSmsPdu"; - "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe"; - "GenussFold" = dontDistribute super."GenussFold"; - "GeoIp" = dontDistribute super."GeoIp"; - "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage"; - "Geodetic" = dontDistribute super."Geodetic"; - "GeomPredicates" = dontDistribute super."GeomPredicates"; - "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE"; - "GiST" = dontDistribute super."GiST"; - "Gifcurry" = dontDistribute super."Gifcurry"; - "GiveYouAHead" = dontDistribute super."GiveYouAHead"; - "Glob" = doDistribute super."Glob_0_7_10"; - "GlomeTrace" = dontDistribute super."GlomeTrace"; - "GlomeVec" = dontDistribute super."GlomeVec"; - "GlomeView" = dontDistribute super."GlomeView"; - "GoogleChart" = dontDistribute super."GoogleChart"; - "GoogleDirections" = dontDistribute super."GoogleDirections"; - "GoogleSB" = dontDistribute super."GoogleSB"; - "GoogleSuggest" = dontDistribute super."GoogleSuggest"; - "GoogleTranslate" = dontDistribute super."GoogleTranslate"; - "GotoT-transformers" = dontDistribute super."GotoT-transformers"; - "GrammarProducts" = dontDistribute super."GrammarProducts"; - "Graph500" = dontDistribute super."Graph500"; - "GraphHammer" = dontDistribute super."GraphHammer"; - "GraphHammer-examples" = dontDistribute super."GraphHammer-examples"; - "Graphalyze" = dontDistribute super."Graphalyze"; - "Grempa" = dontDistribute super."Grempa"; - "GroteTrap" = dontDistribute super."GroteTrap"; - "Grow" = dontDistribute super."Grow"; - "GrowlNotify" = dontDistribute super."GrowlNotify"; - "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics"; - "GtkGLTV" = dontDistribute super."GtkGLTV"; - "GtkTV" = dontDistribute super."GtkTV"; - "GuiHaskell" = dontDistribute super."GuiHaskell"; - "GuiTV" = dontDistribute super."GuiTV"; - "H" = doDistribute super."H_0_8_0_0"; - "HARM" = dontDistribute super."HARM"; - "HAppS-Data" = dontDistribute super."HAppS-Data"; - "HAppS-IxSet" = dontDistribute super."HAppS-IxSet"; - "HAppS-Server" = dontDistribute super."HAppS-Server"; - "HAppS-State" = dontDistribute super."HAppS-State"; - "HAppS-Util" = dontDistribute super."HAppS-Util"; - "HAppSHelpers" = dontDistribute super."HAppSHelpers"; - "HCL" = dontDistribute super."HCL"; - "HCard" = dontDistribute super."HCard"; - "HDBC-mysql" = dontDistribute super."HDBC-mysql"; - "HDBC-odbc" = dontDistribute super."HDBC-odbc"; - "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore"; - "HDRUtils" = dontDistribute super."HDRUtils"; - "HERA" = dontDistribute super."HERA"; - "HFrequencyQueue" = dontDistribute super."HFrequencyQueue"; - "HFuse" = dontDistribute super."HFuse"; - "HGE2D" = dontDistribute super."HGE2D"; - "HGL" = dontDistribute super."HGL"; - "HGamer3D" = dontDistribute super."HGamer3D"; - "HGamer3D-API" = dontDistribute super."HGamer3D-API"; - "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio"; - "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding"; - "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding"; - "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding"; - "HGamer3D-Common" = dontDistribute super."HGamer3D-Common"; - "HGamer3D-Data" = dontDistribute super."HGamer3D-Data"; - "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding"; - "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI"; - "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D"; - "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem"; - "HGamer3D-Network" = dontDistribute super."HGamer3D-Network"; - "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding"; - "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding"; - "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding"; - "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding"; - "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent"; - "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire"; - "HGraphStorage" = dontDistribute super."HGraphStorage"; - "HHDL" = dontDistribute super."HHDL"; - "HJScript" = dontDistribute super."HJScript"; - "HJVM" = dontDistribute super."HJVM"; - "HJavaScript" = dontDistribute super."HJavaScript"; - "HLearn-algebra" = dontDistribute super."HLearn-algebra"; - "HLearn-approximation" = dontDistribute super."HLearn-approximation"; - "HLearn-classification" = dontDistribute super."HLearn-classification"; - "HLearn-datastructures" = dontDistribute super."HLearn-datastructures"; - "HLearn-distributions" = dontDistribute super."HLearn-distributions"; - "HListPP" = dontDistribute super."HListPP"; - "HLogger" = dontDistribute super."HLogger"; - "HMM" = dontDistribute super."HMM"; - "HMap" = dontDistribute super."HMap"; - "HNM" = dontDistribute super."HNM"; - "HODE" = dontDistribute super."HODE"; - "HOpenCV" = dontDistribute super."HOpenCV"; - "HPath" = dontDistribute super."HPath"; - "HPhone" = dontDistribute super."HPhone"; - "HPi" = dontDistribute super."HPi"; - "HPlot" = dontDistribute super."HPlot"; - "HPong" = dontDistribute super."HPong"; - "HROOT" = dontDistribute super."HROOT"; - "HROOT-core" = dontDistribute super."HROOT-core"; - "HROOT-graf" = dontDistribute super."HROOT-graf"; - "HROOT-hist" = dontDistribute super."HROOT-hist"; - "HROOT-io" = dontDistribute super."HROOT-io"; - "HROOT-math" = dontDistribute super."HROOT-math"; - "HRay" = dontDistribute super."HRay"; - "HSFFIG" = dontDistribute super."HSFFIG"; - "HSGEP" = dontDistribute super."HSGEP"; - "HSH" = dontDistribute super."HSH"; - "HSHHelpers" = dontDistribute super."HSHHelpers"; - "HSlippyMap" = dontDistribute super."HSlippyMap"; - "HSmarty" = dontDistribute super."HSmarty"; - "HSoundFile" = dontDistribute super."HSoundFile"; - "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers"; - "HSvm" = dontDistribute super."HSvm"; - "HTTP-Simple" = dontDistribute super."HTTP-Simple"; - "HTab" = dontDistribute super."HTab"; - "HTicTacToe" = dontDistribute super."HTicTacToe"; - "HUnit" = doDistribute super."HUnit_1_3_1_1"; - "HUnit-Diff" = dontDistribute super."HUnit-Diff"; - "HUnit-Plus" = dontDistribute super."HUnit-Plus"; - "HUnit-approx" = dontDistribute super."HUnit-approx"; - "HXMPP" = dontDistribute super."HXMPP"; - "HXQ" = dontDistribute super."HXQ"; - "HaLeX" = dontDistribute super."HaLeX"; - "HaMinitel" = dontDistribute super."HaMinitel"; - "HaPy" = dontDistribute super."HaPy"; - "HaRe" = doDistribute super."HaRe_0_8_2_3"; - "HaTeX-meta" = dontDistribute super."HaTeX-meta"; - "HaTeX-qq" = dontDistribute super."HaTeX-qq"; - "HaVSA" = dontDistribute super."HaVSA"; - "Hach" = dontDistribute super."Hach"; - "HackMail" = dontDistribute super."HackMail"; - "Haggressive" = dontDistribute super."Haggressive"; - "HandlerSocketClient" = dontDistribute super."HandlerSocketClient"; - "Hangman" = dontDistribute super."Hangman"; - "HarmTrace" = dontDistribute super."HarmTrace"; - "HarmTrace-Base" = dontDistribute super."HarmTrace-Base"; - "HasGP" = dontDistribute super."HasGP"; - "Haschoo" = dontDistribute super."Haschoo"; - "Hashell" = dontDistribute super."Hashell"; - "HaskRel" = dontDistribute super."HaskRel"; - "HaskellForMaths" = dontDistribute super."HaskellForMaths"; - "HaskellLM" = dontDistribute super."HaskellLM"; - "HaskellNN" = dontDistribute super."HaskellNN"; - "HaskellTorrent" = dontDistribute super."HaskellTorrent"; - "HaskellTutorials" = dontDistribute super."HaskellTutorials"; - "Haskelloids" = dontDistribute super."Haskelloids"; - "Hate" = dontDistribute super."Hate"; - "Hawk" = dontDistribute super."Hawk"; - "Hayoo" = dontDistribute super."Hayoo"; - "Hedi" = dontDistribute super."Hedi"; - "HerbiePlugin" = dontDistribute super."HerbiePlugin"; - "Hermes" = dontDistribute super."Hermes"; - "Hieroglyph" = dontDistribute super."Hieroglyph"; - "HiggsSet" = dontDistribute super."HiggsSet"; - "Hipmunk" = dontDistribute super."Hipmunk"; - "HipmunkPlayground" = dontDistribute super."HipmunkPlayground"; - "Hish" = dontDistribute super."Hish"; - "Histogram" = dontDistribute super."Histogram"; - "Hmpf" = dontDistribute super."Hmpf"; - "Hoed" = dontDistribute super."Hoed"; - "HoleyMonoid" = dontDistribute super."HoleyMonoid"; - "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution"; - "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce"; - "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine"; - "Holumbus-Storage" = dontDistribute super."Holumbus-Storage"; - "Homology" = dontDistribute super."Homology"; - "HongoDB" = dontDistribute super."HongoDB"; - "HostAndPort" = dontDistribute super."HostAndPort"; - "Hricket" = dontDistribute super."Hricket"; - "Hs2lib" = dontDistribute super."Hs2lib"; - "HsASA" = dontDistribute super."HsASA"; - "HsHaruPDF" = dontDistribute super."HsHaruPDF"; - "HsHyperEstraier" = dontDistribute super."HsHyperEstraier"; - "HsJudy" = dontDistribute super."HsJudy"; - "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system"; - "HsParrot" = dontDistribute super."HsParrot"; - "HsPerl5" = dontDistribute super."HsPerl5"; - "HsSVN" = dontDistribute super."HsSVN"; - "HsTools" = dontDistribute super."HsTools"; - "Hsed" = dontDistribute super."Hsed"; - "Hsmtlib" = dontDistribute super."Hsmtlib"; - "HueAPI" = dontDistribute super."HueAPI"; - "HulkImport" = dontDistribute super."HulkImport"; - "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres"; - "IDynamic" = dontDistribute super."IDynamic"; - "IFS" = dontDistribute super."IFS"; - "INblobs" = dontDistribute super."INblobs"; - "IOR" = dontDistribute super."IOR"; - "IORefCAS" = dontDistribute super."IORefCAS"; - "IOSpec" = dontDistribute super."IOSpec"; - "IcoGrid" = dontDistribute super."IcoGrid"; - "Imlib" = dontDistribute super."Imlib"; - "ImperativeHaskell" = dontDistribute super."ImperativeHaskell"; - "IndentParser" = dontDistribute super."IndentParser"; - "IndexedList" = dontDistribute super."IndexedList"; - "InfixApplicative" = dontDistribute super."InfixApplicative"; - "Interpolation" = dontDistribute super."Interpolation"; - "Interpolation-maxs" = dontDistribute super."Interpolation-maxs"; - "Irc" = dontDistribute super."Irc"; - "IrrHaskell" = dontDistribute super."IrrHaskell"; - "IsNull" = dontDistribute super."IsNull"; - "JSON-Combinator" = dontDistribute super."JSON-Combinator"; - "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples"; - "JSONb" = dontDistribute super."JSONb"; - "JYU-Utils" = dontDistribute super."JYU-Utils"; - "JackMiniMix" = dontDistribute super."JackMiniMix"; - "Javasf" = dontDistribute super."Javasf"; - "Javav" = dontDistribute super."Javav"; - "JsContracts" = dontDistribute super."JsContracts"; - "JsonGrammar" = dontDistribute super."JsonGrammar"; - "JuicyPixels" = doDistribute super."JuicyPixels_3_2_7_2"; - "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas"; - "JuicyPixels-extra" = dontDistribute super."JuicyPixels-extra"; - "JuicyPixels-scale-dct" = doDistribute super."JuicyPixels-scale-dct_0_1_1_0"; - "JunkDB" = dontDistribute super."JunkDB"; - "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm"; - "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables"; - "JustParse" = dontDistribute super."JustParse"; - "KMP" = dontDistribute super."KMP"; - "KSP" = dontDistribute super."KSP"; - "Kalman" = dontDistribute super."Kalman"; - "KdTree" = dontDistribute super."KdTree"; - "Ketchup" = dontDistribute super."Ketchup"; - "KiCS" = dontDistribute super."KiCS"; - "KiCS-debugger" = dontDistribute super."KiCS-debugger"; - "KiCS-prophecy" = dontDistribute super."KiCS-prophecy"; - "Kleislify" = dontDistribute super."Kleislify"; - "Konf" = dontDistribute super."Konf"; - "Kriens" = dontDistribute super."Kriens"; - "KyotoCabinet" = dontDistribute super."KyotoCabinet"; - "L-seed" = dontDistribute super."L-seed"; - "LATS" = dontDistribute super."LATS"; - "LDAP" = dontDistribute super."LDAP"; - "LRU" = dontDistribute super."LRU"; - "LTree" = dontDistribute super."LTree"; - "LambdaCalculator" = dontDistribute super."LambdaCalculator"; - "LambdaDB" = dontDistribute super."LambdaDB"; - "LambdaHack" = dontDistribute super."LambdaHack"; - "LambdaINet" = dontDistribute super."LambdaINet"; - "LambdaNet" = dontDistribute super."LambdaNet"; - "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote"; - "LambdaShell" = dontDistribute super."LambdaShell"; - "Lambdajudge" = dontDistribute super."Lambdajudge"; - "Lambdaya" = dontDistribute super."Lambdaya"; - "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy"; - "Lastik" = dontDistribute super."Lastik"; - "Lattices" = dontDistribute super."Lattices"; - "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2"; - "LazyVault" = dontDistribute super."LazyVault"; - "Level0" = dontDistribute super."Level0"; - "LibClang" = dontDistribute super."LibClang"; - "LibZip" = dontDistribute super."LibZip"; - "Limit" = dontDistribute super."Limit"; - "LinearSplit" = dontDistribute super."LinearSplit"; - "LinguisticsTypes" = dontDistribute super."LinguisticsTypes"; - "LinkChecker" = dontDistribute super."LinkChecker"; - "ListLike" = doDistribute super."ListLike_4_2_1"; - "ListTree" = dontDistribute super."ListTree"; - "ListWriter" = dontDistribute super."ListWriter"; - "ListZipper" = dontDistribute super."ListZipper"; - "Logic" = dontDistribute super."Logic"; - "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees"; - "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI"; - "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network"; - "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes"; - "LslPlus" = dontDistribute super."LslPlus"; - "Lucu" = dontDistribute super."Lucu"; - "MC-Fold-DP" = dontDistribute super."MC-Fold-DP"; - "MHask" = dontDistribute super."MHask"; - "MSQueue" = dontDistribute super."MSQueue"; - "MTGBuilder" = dontDistribute super."MTGBuilder"; - "MagicHaskeller" = dontDistribute super."MagicHaskeller"; - "MailchimpSimple" = dontDistribute super."MailchimpSimple"; - "MaybeT" = dontDistribute super."MaybeT"; - "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf"; - "MaybeT-transformers" = dontDistribute super."MaybeT-transformers"; - "MazesOfMonad" = dontDistribute super."MazesOfMonad"; - "MeanShift" = dontDistribute super."MeanShift"; - "Measure" = dontDistribute super."Measure"; - "Mecha" = dontDistribute super."Mecha"; - "Mechs" = dontDistribute super."Mechs"; - "MetaHDBC" = dontDistribute super."MetaHDBC"; - "MetaObject" = dontDistribute super."MetaObject"; - "Metrics" = dontDistribute super."Metrics"; - "Mhailist" = dontDistribute super."Mhailist"; - "Michelangelo" = dontDistribute super."Michelangelo"; - "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator"; - "MiniAgda" = dontDistribute super."MiniAgda"; - "MissingH" = doDistribute super."MissingH_1_3_0_2"; - "MissingK" = dontDistribute super."MissingK"; - "MissingM" = dontDistribute super."MissingM"; - "MissingPy" = dontDistribute super."MissingPy"; - "Modulo" = dontDistribute super."Modulo"; - "Moe" = dontDistribute super."Moe"; - "MoeDict" = dontDistribute super."MoeDict"; - "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl"; - "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign"; - "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign"; - "MonadCompose" = dontDistribute super."MonadCompose"; - "MonadLab" = dontDistribute super."MonadLab"; - "MonadRandomLazy" = dontDistribute super."MonadRandomLazy"; - "MonadStack" = dontDistribute super."MonadStack"; - "Monadius" = dontDistribute super."Monadius"; - "Monaris" = dontDistribute super."Monaris"; - "Monatron" = dontDistribute super."Monatron"; - "Monatron-IO" = dontDistribute super."Monatron-IO"; - "Monocle" = dontDistribute super."Monocle"; - "MorseCode" = dontDistribute super."MorseCode"; - "MuCheck" = dontDistribute super."MuCheck"; - "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit"; - "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec"; - "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck"; - "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck"; - "Munkres" = dontDistribute super."Munkres"; - "Munkres-simple" = dontDistribute super."Munkres-simple"; - "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid"; - "MyPrimes" = dontDistribute super."MyPrimes"; - "NGrams" = dontDistribute super."NGrams"; - "NTRU" = dontDistribute super."NTRU"; - "NXT" = dontDistribute super."NXT"; - "NXTDSL" = dontDistribute super."NXTDSL"; - "NanoProlog" = dontDistribute super."NanoProlog"; - "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets"; - "NaturalSort" = dontDistribute super."NaturalSort"; - "NearContextAlgebra" = dontDistribute super."NearContextAlgebra"; - "Neks" = dontDistribute super."Neks"; - "NestedFunctor" = dontDistribute super."NestedFunctor"; - "NestedSampling" = dontDistribute super."NestedSampling"; - "NetSNMP" = dontDistribute super."NetSNMP"; - "Network-NineP" = doDistribute super."Network-NineP_0_4_0"; - "NewBinary" = dontDistribute super."NewBinary"; - "Ninjas" = dontDistribute super."Ninjas"; - "NoSlow" = dontDistribute super."NoSlow"; - "Noise" = dontDistribute super."Noise"; - "Nomyx" = dontDistribute super."Nomyx"; - "Nomyx-Core" = dontDistribute super."Nomyx-Core"; - "Nomyx-Language" = dontDistribute super."Nomyx-Language"; - "Nomyx-Rules" = dontDistribute super."Nomyx-Rules"; - "Nomyx-Web" = dontDistribute super."Nomyx-Web"; - "NonEmpty" = dontDistribute super."NonEmpty"; - "NonEmptyList" = dontDistribute super."NonEmptyList"; - "NumLazyByteString" = dontDistribute super."NumLazyByteString"; - "NumberSieves" = dontDistribute super."NumberSieves"; - "NumberTheory" = dontDistribute super."NumberTheory"; - "Numbers" = dontDistribute super."Numbers"; - "Nussinov78" = dontDistribute super."Nussinov78"; - "Nutri" = dontDistribute super."Nutri"; - "OGL" = dontDistribute super."OGL"; - "OSM" = dontDistribute super."OSM"; - "OTP" = dontDistribute super."OTP"; - "Object" = dontDistribute super."Object"; - "ObjectIO" = dontDistribute super."ObjectIO"; - "Obsidian" = dontDistribute super."Obsidian"; - "OddWord" = dontDistribute super."OddWord"; - "Omega" = dontDistribute super."Omega"; - "OpenAFP" = dontDistribute super."OpenAFP"; - "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils"; - "OpenAL" = dontDistribute super."OpenAL"; - "OpenCL" = dontDistribute super."OpenCL"; - "OpenCLRaw" = dontDistribute super."OpenCLRaw"; - "OpenCLWrappers" = dontDistribute super."OpenCLWrappers"; - "OpenGLCheck" = dontDistribute super."OpenGLCheck"; - "OpenGLRaw" = doDistribute super."OpenGLRaw_3_2_1_0"; - "OpenGLRaw21" = dontDistribute super."OpenGLRaw21"; - "OpenSCAD" = dontDistribute super."OpenSCAD"; - "OpenVG" = dontDistribute super."OpenVG"; - "OpenVGRaw" = dontDistribute super."OpenVGRaw"; - "Operads" = dontDistribute super."Operads"; - "OptDir" = dontDistribute super."OptDir"; - "OrPatterns" = dontDistribute super."OrPatterns"; - "OrchestrateDB" = dontDistribute super."OrchestrateDB"; - "OrderedBits" = dontDistribute super."OrderedBits"; - "Ordinals" = dontDistribute super."Ordinals"; - "PArrows" = dontDistribute super."PArrows"; - "PBKDF2" = dontDistribute super."PBKDF2"; - "PCLT" = dontDistribute super."PCLT"; - "PCLT-DB" = dontDistribute super."PCLT-DB"; - "PDBtools" = dontDistribute super."PDBtools"; - "PPrinter" = dontDistribute super."PPrinter"; - "PTQ" = dontDistribute super."PTQ"; - "PUH-Project" = dontDistribute super."PUH-Project"; - "PageIO" = dontDistribute super."PageIO"; - "Paillier" = dontDistribute super."Paillier"; - "PandocAgda" = dontDistribute super."PandocAgda"; - "Paraiso" = dontDistribute super."Paraiso"; - "Parry" = dontDistribute super."Parry"; - "ParsecTools" = dontDistribute super."ParsecTools"; - "ParserFunction" = dontDistribute super."ParserFunction"; - "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures"; - "PasswordGenerator" = dontDistribute super."PasswordGenerator"; - "PastePipe" = dontDistribute super."PastePipe"; - "PathTree" = dontDistribute super."PathTree"; - "Pathfinder" = dontDistribute super."Pathfinder"; - "Peano" = dontDistribute super."Peano"; - "PeanoWitnesses" = dontDistribute super."PeanoWitnesses"; - "PerfectHash" = dontDistribute super."PerfectHash"; - "PermuteEffects" = dontDistribute super."PermuteEffects"; - "Phsu" = dontDistribute super."Phsu"; - "Pipe" = dontDistribute super."Pipe"; - "Piso" = dontDistribute super."Piso"; - "PlayHangmanGame" = dontDistribute super."PlayHangmanGame"; - "PlayingCards" = dontDistribute super."PlayingCards"; - "Plot-ho-matic" = dontDistribute super."Plot-ho-matic"; - "PlslTools" = dontDistribute super."PlslTools"; - "Plural" = dontDistribute super."Plural"; - "Pollutocracy" = dontDistribute super."Pollutocracy"; - "PortFusion" = dontDistribute super."PortFusion"; - "PortMidi" = doDistribute super."PortMidi_0_1_6_0"; - "PostgreSQL" = dontDistribute super."PostgreSQL"; - "PrimitiveArray" = dontDistribute super."PrimitiveArray"; - "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty"; - "Printf-TH" = dontDistribute super."Printf-TH"; - "PriorityChansConverger" = dontDistribute super."PriorityChansConverger"; - "ProbabilityMonads" = dontDistribute super."ProbabilityMonads"; - "PropLogic" = dontDistribute super."PropLogic"; - "Proper" = dontDistribute super."Proper"; - "ProxN" = dontDistribute super."ProxN"; - "Pugs" = dontDistribute super."Pugs"; - "Pup-Events" = dontDistribute super."Pup-Events"; - "Pup-Events-Client" = dontDistribute super."Pup-Events-Client"; - "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo"; - "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue"; - "Pup-Events-Server" = dontDistribute super."Pup-Events-Server"; - "QIO" = dontDistribute super."QIO"; - "QLearn" = dontDistribute super."QLearn"; - "QuadEdge" = dontDistribute super."QuadEdge"; - "QuadTree" = dontDistribute super."QuadTree"; - "Quelea" = dontDistribute super."Quelea"; - "QuickAnnotate" = dontDistribute super."QuickAnnotate"; - "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT"; - "QuickCheck-safe" = dontDistribute super."QuickCheck-safe"; - "QuickCheckVariant" = dontDistribute super."QuickCheckVariant"; - "QuickPlot" = dontDistribute super."QuickPlot"; - "Quickson" = dontDistribute super."Quickson"; - "R-pandoc" = dontDistribute super."R-pandoc"; - "RANSAC" = dontDistribute super."RANSAC"; - "RBTree" = dontDistribute super."RBTree"; - "RESTng" = dontDistribute super."RESTng"; - "RFC1751" = dontDistribute super."RFC1751"; - "RJson" = dontDistribute super."RJson"; - "RMP" = dontDistribute super."RMP"; - "RNAFold" = dontDistribute super."RNAFold"; - "RNAFoldProgs" = dontDistribute super."RNAFoldProgs"; - "RNAdesign" = dontDistribute super."RNAdesign"; - "RNAdraw" = dontDistribute super."RNAdraw"; - "RNAwolf" = dontDistribute super."RNAwolf"; - "Raincat" = dontDistribute super."Raincat"; - "Random123" = dontDistribute super."Random123"; - "RandomDotOrg" = dontDistribute super."RandomDotOrg"; - "Randometer" = dontDistribute super."Randometer"; - "Range" = dontDistribute super."Range"; - "Ranged-sets" = dontDistribute super."Ranged-sets"; - "Ranka" = dontDistribute super."Ranka"; - "Rasenschach" = dontDistribute super."Rasenschach"; - "Redmine" = dontDistribute super."Redmine"; - "Ref" = dontDistribute super."Ref"; - "Referees" = dontDistribute super."Referees"; - "RepLib" = dontDistribute super."RepLib"; - "ReplicateEffects" = dontDistribute super."ReplicateEffects"; - "ReviewBoard" = dontDistribute super."ReviewBoard"; - "RichConditional" = dontDistribute super."RichConditional"; - "RollingDirectory" = dontDistribute super."RollingDirectory"; - "RoyalMonad" = dontDistribute super."RoyalMonad"; - "RxHaskell" = dontDistribute super."RxHaskell"; - "SBench" = dontDistribute super."SBench"; - "SCalendar" = dontDistribute super."SCalendar"; - "SConfig" = dontDistribute super."SConfig"; - "SDL" = dontDistribute super."SDL"; - "SDL-gfx" = dontDistribute super."SDL-gfx"; - "SDL-image" = dontDistribute super."SDL-image"; - "SDL-mixer" = dontDistribute super."SDL-mixer"; - "SDL-mpeg" = dontDistribute super."SDL-mpeg"; - "SDL-ttf" = dontDistribute super."SDL-ttf"; - "SDL2-ttf" = dontDistribute super."SDL2-ttf"; - "SFML" = dontDistribute super."SFML"; - "SFML-control" = dontDistribute super."SFML-control"; - "SFont" = dontDistribute super."SFont"; - "SG" = dontDistribute super."SG"; - "SGdemo" = dontDistribute super."SGdemo"; - "SGplus" = dontDistribute super."SGplus"; - "SHA2" = dontDistribute super."SHA2"; - "SMTPClient" = dontDistribute super."SMTPClient"; - "SNet" = dontDistribute super."SNet"; - "SQLDeps" = dontDistribute super."SQLDeps"; - "STL" = dontDistribute super."STL"; - "SVG2Q" = dontDistribute super."SVG2Q"; - "SVGPath" = dontDistribute super."SVGPath"; - "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB"; - "SableCC2Hs" = dontDistribute super."SableCC2Hs"; - "Safe" = dontDistribute super."Safe"; - "Salsa" = dontDistribute super."Salsa"; - "Saturnin" = dontDistribute super."Saturnin"; - "SciFlow" = dontDistribute super."SciFlow"; - "ScratchFs" = dontDistribute super."ScratchFs"; - "Scurry" = dontDistribute super."Scurry"; - "Semantique" = dontDistribute super."Semantique"; - "Semigroup" = dontDistribute super."Semigroup"; - "SeqAlign" = dontDistribute super."SeqAlign"; - "SessionLogger" = dontDistribute super."SessionLogger"; - "ShellCheck" = dontDistribute super."ShellCheck"; - "Shellac" = dontDistribute super."Shellac"; - "Shellac-compatline" = dontDistribute super."Shellac-compatline"; - "Shellac-editline" = dontDistribute super."Shellac-editline"; - "Shellac-haskeline" = dontDistribute super."Shellac-haskeline"; - "Shellac-readline" = dontDistribute super."Shellac-readline"; - "ShowF" = dontDistribute super."ShowF"; - "Shrub" = dontDistribute super."Shrub"; - "Shu-thing" = dontDistribute super."Shu-thing"; - "SimpleAES" = dontDistribute super."SimpleAES"; - "SimpleEA" = dontDistribute super."SimpleEA"; - "SimpleGL" = dontDistribute super."SimpleGL"; - "SimpleH" = dontDistribute super."SimpleH"; - "SimpleLog" = dontDistribute super."SimpleLog"; - "SimpleServer" = dontDistribute super."SimpleServer"; - "SizeCompare" = dontDistribute super."SizeCompare"; - "Slides" = dontDistribute super."Slides"; - "Smooth" = dontDistribute super."Smooth"; - "SmtLib" = dontDistribute super."SmtLib"; - "Snusmumrik" = dontDistribute super."Snusmumrik"; - "SoOSiM" = dontDistribute super."SoOSiM"; - "SoccerFun" = dontDistribute super."SoccerFun"; - "SoccerFunGL" = dontDistribute super."SoccerFunGL"; - "Sonnex" = dontDistribute super."Sonnex"; - "SourceGraph" = dontDistribute super."SourceGraph"; - "Southpaw" = dontDistribute super."Southpaw"; - "SpaceInvaders" = dontDistribute super."SpaceInvaders"; - "SpacePrivateers" = dontDistribute super."SpacePrivateers"; - "SpinCounter" = dontDistribute super."SpinCounter"; - "Spock" = doDistribute super."Spock_0_10_0_1"; - "Spock-api" = dontDistribute super."Spock-api"; - "Spock-api-ghcjs" = dontDistribute super."Spock-api-ghcjs"; - "Spock-api-server" = dontDistribute super."Spock-api-server"; - "Spock-auth" = dontDistribute super."Spock-auth"; - "Spock-core" = dontDistribute super."Spock-core"; - "Spock-digestive" = doDistribute super."Spock-digestive_0_2_0_0"; - "Spock-worker" = doDistribute super."Spock-worker_0_3_0_0"; - "SpreadsheetML" = dontDistribute super."SpreadsheetML"; - "Sprig" = dontDistribute super."Sprig"; - "Stasis" = dontDistribute super."Stasis"; - "StateVar-transformer" = dontDistribute super."StateVar-transformer"; - "StatisticalMethods" = dontDistribute super."StatisticalMethods"; - "Stomp" = dontDistribute super."Stomp"; - "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib"; - "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell"; - "StrappedTemplates" = dontDistribute super."StrappedTemplates"; - "StrategyLib" = dontDistribute super."StrategyLib"; - "Stream" = dontDistribute super."Stream"; - "StrictBench" = dontDistribute super."StrictBench"; - "StringUtils" = dontDistribute super."StringUtils"; - "SuffixStructures" = dontDistribute super."SuffixStructures"; - "SybWidget" = dontDistribute super."SybWidget"; - "SyntaxMacros" = dontDistribute super."SyntaxMacros"; - "Sysmon" = dontDistribute super."Sysmon"; - "TBC" = dontDistribute super."TBC"; - "TBit" = dontDistribute super."TBit"; - "THEff" = dontDistribute super."THEff"; - "TTTAS" = dontDistribute super."TTTAS"; - "TV" = dontDistribute super."TV"; - "TYB" = dontDistribute super."TYB"; - "TableAlgebra" = dontDistribute super."TableAlgebra"; - "Tables" = dontDistribute super."Tables"; - "Tablify" = dontDistribute super."Tablify"; - "Tahin" = dontDistribute super."Tahin"; - "Tainted" = dontDistribute super."Tainted"; - "Takusen" = dontDistribute super."Takusen"; - "Tape" = dontDistribute super."Tape"; - "TeaHS" = dontDistribute super."TeaHS"; - "Tensor" = dontDistribute super."Tensor"; - "TernaryTrees" = dontDistribute super."TernaryTrees"; - "TestExplode" = dontDistribute super."TestExplode"; - "Theora" = dontDistribute super."Theora"; - "Thingie" = dontDistribute super."Thingie"; - "ThreadObjects" = dontDistribute super."ThreadObjects"; - "Thrift" = dontDistribute super."Thrift"; - "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe"; - "TicTacToe" = dontDistribute super."TicTacToe"; - "TigerHash" = dontDistribute super."TigerHash"; - "TimePiece" = dontDistribute super."TimePiece"; - "TinyLaunchbury" = dontDistribute super."TinyLaunchbury"; - "TinyURL" = dontDistribute super."TinyURL"; - "Titim" = dontDistribute super."Titim"; - "Top" = dontDistribute super."Top"; - "Tournament" = dontDistribute super."Tournament"; - "TraceUtils" = dontDistribute super."TraceUtils"; - "TransformeR" = dontDistribute super."TransformeR"; - "TransformersStepByStep" = dontDistribute super."TransformersStepByStep"; - "Transhare" = dontDistribute super."Transhare"; - "TreeCounter" = dontDistribute super."TreeCounter"; - "TreeStructures" = dontDistribute super."TreeStructures"; - "TreeT" = dontDistribute super."TreeT"; - "Treiber" = dontDistribute super."Treiber"; - "TrendGraph" = dontDistribute super."TrendGraph"; - "TrieMap" = dontDistribute super."TrieMap"; - "Twofish" = dontDistribute super."Twofish"; - "TypeClass" = dontDistribute super."TypeClass"; - "TypeCompose" = dontDistribute super."TypeCompose"; - "TypeIlluminator" = dontDistribute super."TypeIlluminator"; - "TypeNat" = dontDistribute super."TypeNat"; - "TypingTester" = dontDistribute super."TypingTester"; - "UISF" = dontDistribute super."UISF"; - "UMM" = dontDistribute super."UMM"; - "URLT" = dontDistribute super."URLT"; - "URLb" = dontDistribute super."URLb"; - "UTFTConverter" = dontDistribute super."UTFTConverter"; - "Unique" = dontDistribute super."Unique"; - "Unixutils-shadow" = dontDistribute super."Unixutils-shadow"; - "Updater" = dontDistribute super."Updater"; - "UrlDisp" = dontDistribute super."UrlDisp"; - "Useful" = dontDistribute super."Useful"; - "UtilityTM" = dontDistribute super."UtilityTM"; - "VKHS" = dontDistribute super."VKHS"; - "Validation" = dontDistribute super."Validation"; - "Vec" = dontDistribute super."Vec"; - "Vec-Boolean" = dontDistribute super."Vec-Boolean"; - "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw"; - "Vec-Transform" = dontDistribute super."Vec-Transform"; - "VecN" = dontDistribute super."VecN"; - "Verba" = dontDistribute super."Verba"; - "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings"; - "Vulkan" = dontDistribute super."Vulkan"; - "WAVE" = dontDistribute super."WAVE"; - "WL500gPControl" = dontDistribute super."WL500gPControl"; - "WL500gPLib" = dontDistribute super."WL500gPLib"; - "WMSigner" = dontDistribute super."WMSigner"; - "WURFL" = dontDistribute super."WURFL"; - "WXDiffCtrl" = dontDistribute super."WXDiffCtrl"; - "WashNGo" = dontDistribute super."WashNGo"; - "WaveFront" = dontDistribute super."WaveFront"; - "Weather" = dontDistribute super."Weather"; - "WebBits" = dontDistribute super."WebBits"; - "WebBits-Html" = dontDistribute super."WebBits-Html"; - "WebBits-multiplate" = dontDistribute super."WebBits-multiplate"; - "WebCont" = dontDistribute super."WebCont"; - "WeberLogic" = dontDistribute super."WeberLogic"; - "Webrexp" = dontDistribute super."Webrexp"; - "Wheb" = dontDistribute super."Wheb"; - "WikimediaParser" = dontDistribute super."WikimediaParser"; - "Win32" = doDistribute super."Win32_2_3_1_0"; - "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server"; - "Win32-errors" = dontDistribute super."Win32-errors"; - "Win32-junction-point" = dontDistribute super."Win32-junction-point"; - "Win32-security" = dontDistribute super."Win32-security"; - "Win32-services" = dontDistribute super."Win32-services"; - "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper"; - "Wired" = dontDistribute super."Wired"; - "WordAlignment" = dontDistribute super."WordAlignment"; - "WordNet" = dontDistribute super."WordNet"; - "WordNet-ghc74" = dontDistribute super."WordNet-ghc74"; - "Wordlint" = dontDistribute super."Wordlint"; - "WxGeneric" = dontDistribute super."WxGeneric"; - "X11-extras" = dontDistribute super."X11-extras"; - "X11-rm" = dontDistribute super."X11-rm"; - "X11-xdamage" = dontDistribute super."X11-xdamage"; - "X11-xfixes" = dontDistribute super."X11-xfixes"; - "X11-xft" = dontDistribute super."X11-xft"; - "X11-xshape" = dontDistribute super."X11-xshape"; - "XAttr" = dontDistribute super."XAttr"; - "XInput" = dontDistribute super."XInput"; - "XMLParser" = dontDistribute super."XMLParser"; - "XMMS" = dontDistribute super."XMMS"; - "XMPP" = dontDistribute super."XMPP"; - "XSaiga" = dontDistribute super."XSaiga"; - "Xec" = dontDistribute super."Xec"; - "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter"; - "Xorshift128Plus" = dontDistribute super."Xorshift128Plus"; - "YACPong" = dontDistribute super."YACPong"; - "YFrob" = dontDistribute super."YFrob"; - "Yablog" = dontDistribute super."Yablog"; - "YamlReference" = dontDistribute super."YamlReference"; - "Yampa-core" = dontDistribute super."Yampa-core"; - "Yocto" = dontDistribute super."Yocto"; - "Yogurt" = dontDistribute super."Yogurt"; - "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone"; - "ZEBEDDE" = dontDistribute super."ZEBEDDE"; - "ZFS" = dontDistribute super."ZFS"; - "ZMachine" = dontDistribute super."ZMachine"; - "ZipFold" = dontDistribute super."ZipFold"; - "ZipperAG" = dontDistribute super."ZipperAG"; - "Zora" = dontDistribute super."Zora"; - "Zwaluw" = dontDistribute super."Zwaluw"; - "a50" = dontDistribute super."a50"; - "abacate" = dontDistribute super."abacate"; - "abc-puzzle" = dontDistribute super."abc-puzzle"; - "abcBridge" = dontDistribute super."abcBridge"; - "abcnotation" = dontDistribute super."abcnotation"; - "abeson" = dontDistribute super."abeson"; - "abnf" = dontDistribute super."abnf"; - "abstract-deque-tests" = dontDistribute super."abstract-deque-tests"; - "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate"; - "abt" = dontDistribute super."abt"; - "ac-machine" = dontDistribute super."ac-machine"; - "ac-machine-conduit" = dontDistribute super."ac-machine-conduit"; - "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic"; - "accelerate-cublas" = dontDistribute super."accelerate-cublas"; - "accelerate-cuda" = dontDistribute super."accelerate-cuda"; - "accelerate-cufft" = dontDistribute super."accelerate-cufft"; - "accelerate-examples" = dontDistribute super."accelerate-examples"; - "accelerate-fft" = dontDistribute super."accelerate-fft"; - "accelerate-fftw" = dontDistribute super."accelerate-fftw"; - "accelerate-fourier" = dontDistribute super."accelerate-fourier"; - "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark"; - "accelerate-io" = dontDistribute super."accelerate-io"; - "accelerate-random" = dontDistribute super."accelerate-random"; - "accelerate-typelits" = dontDistribute super."accelerate-typelits"; - "accelerate-utility" = dontDistribute super."accelerate-utility"; - "accentuateus" = dontDistribute super."accentuateus"; - "access-time" = dontDistribute super."access-time"; - "accuerr" = dontDistribute super."accuerr"; - "acid-state" = doDistribute super."acid-state_0_14_1"; - "acid-state-dist" = dontDistribute super."acid-state-dist"; - "acid-state-tls" = dontDistribute super."acid-state-tls"; - "acl2" = dontDistribute super."acl2"; - "acme-all-monad" = dontDistribute super."acme-all-monad"; - "acme-box" = dontDistribute super."acme-box"; - "acme-cadre" = dontDistribute super."acme-cadre"; - "acme-cofunctor" = dontDistribute super."acme-cofunctor"; - "acme-colosson" = dontDistribute super."acme-colosson"; - "acme-comonad" = dontDistribute super."acme-comonad"; - "acme-cutegirl" = dontDistribute super."acme-cutegirl"; - "acme-default" = dontDistribute super."acme-default"; - "acme-dont" = dontDistribute super."acme-dont"; - "acme-flipping-tables" = dontDistribute super."acme-flipping-tables"; - "acme-grawlix" = dontDistribute super."acme-grawlix"; - "acme-hq9plus" = dontDistribute super."acme-hq9plus"; - "acme-http" = dontDistribute super."acme-http"; - "acme-inator" = dontDistribute super."acme-inator"; - "acme-io" = dontDistribute super."acme-io"; - "acme-iot" = dontDistribute super."acme-iot"; - "acme-left-pad" = dontDistribute super."acme-left-pad"; - "acme-lolcat" = dontDistribute super."acme-lolcat"; - "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval"; - "acme-memorandom" = dontDistribute super."acme-memorandom"; - "acme-microwave" = dontDistribute super."acme-microwave"; - "acme-miscorder" = dontDistribute super."acme-miscorder"; - "acme-missiles" = dontDistribute super."acme-missiles"; - "acme-now" = dontDistribute super."acme-now"; - "acme-numbersystem" = dontDistribute super."acme-numbersystem"; - "acme-omitted" = dontDistribute super."acme-omitted"; - "acme-one" = dontDistribute super."acme-one"; - "acme-operators" = dontDistribute super."acme-operators"; - "acme-php" = dontDistribute super."acme-php"; - "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers"; - "acme-realworld" = dontDistribute super."acme-realworld"; - "acme-safe" = dontDistribute super."acme-safe"; - "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel"; - "acme-strfry" = dontDistribute super."acme-strfry"; - "acme-stringly-typed" = dontDistribute super."acme-stringly-typed"; - "acme-strtok" = dontDistribute super."acme-strtok"; - "acme-timemachine" = dontDistribute super."acme-timemachine"; - "acme-year" = dontDistribute super."acme-year"; - "acme-zero" = dontDistribute super."acme-zero"; - "activehs" = dontDistribute super."activehs"; - "activehs-base" = dontDistribute super."activehs-base"; - "activitystreams-aeson" = dontDistribute super."activitystreams-aeson"; - "actor" = dontDistribute super."actor"; - "adaptive-containers" = dontDistribute super."adaptive-containers"; - "adaptive-tuple" = dontDistribute super."adaptive-tuple"; - "adb" = dontDistribute super."adb"; - "adblock2privoxy" = dontDistribute super."adblock2privoxy"; - "addLicenseInfo" = dontDistribute super."addLicenseInfo"; - "adhoc-network" = dontDistribute super."adhoc-network"; - "adict" = dontDistribute super."adict"; - "adler32" = dontDistribute super."adler32"; - "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange"; - "adp-multi" = dontDistribute super."adp-multi"; - "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp"; - "aeson" = doDistribute super."aeson_0_11_2_0"; - "aeson-applicative" = dontDistribute super."aeson-applicative"; - "aeson-bson" = dontDistribute super."aeson-bson"; - "aeson-coerce" = dontDistribute super."aeson-coerce"; - "aeson-diff" = dontDistribute super."aeson-diff"; - "aeson-filthy" = dontDistribute super."aeson-filthy"; - "aeson-flatten" = dontDistribute super."aeson-flatten"; - "aeson-injector" = dontDistribute super."aeson-injector"; - "aeson-iproute" = dontDistribute super."aeson-iproute"; - "aeson-json-ast" = dontDistribute super."aeson-json-ast"; - "aeson-native" = dontDistribute super."aeson-native"; - "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky"; - "aeson-prefix" = dontDistribute super."aeson-prefix"; - "aeson-pretty" = doDistribute super."aeson-pretty_0_7_2"; - "aeson-schema" = dontDistribute super."aeson-schema"; - "aeson-serialize" = dontDistribute super."aeson-serialize"; - "aeson-smart" = dontDistribute super."aeson-smart"; - "aeson-streams" = dontDistribute super."aeson-streams"; - "aeson-t" = dontDistribute super."aeson-t"; - "aeson-toolkit" = dontDistribute super."aeson-toolkit"; - "aeson-value-parser" = dontDistribute super."aeson-value-parser"; - "aeson-yak" = dontDistribute super."aeson-yak"; - "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc"; - "afis" = dontDistribute super."afis"; - "afv" = dontDistribute super."afv"; - "ag-pictgen" = dontDistribute super."ag-pictgen"; - "agda-server" = dontDistribute super."agda-server"; - "agum" = dontDistribute super."agum"; - "aig" = dontDistribute super."aig"; - "air" = dontDistribute super."air"; - "air-extra" = dontDistribute super."air-extra"; - "air-spec" = dontDistribute super."air-spec"; - "air-th" = dontDistribute super."air-th"; - "airbrake" = dontDistribute super."airbrake"; - "airship" = doDistribute super."airship_0_5_0"; - "aivika" = dontDistribute super."aivika"; - "aivika-branches" = dontDistribute super."aivika-branches"; - "aivika-distributed" = dontDistribute super."aivika-distributed"; - "aivika-experiment" = dontDistribute super."aivika-experiment"; - "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo"; - "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart"; - "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams"; - "aivika-lattice" = dontDistribute super."aivika-lattice"; - "aivika-transformers" = dontDistribute super."aivika-transformers"; - "ajhc" = dontDistribute super."ajhc"; - "al" = dontDistribute super."al"; - "alarmclock" = doDistribute super."alarmclock_0_2_0_9"; - "alea" = dontDistribute super."alea"; - "alex-meta" = dontDistribute super."alex-meta"; - "alex-tools" = dontDistribute super."alex-tools"; - "alfred" = dontDistribute super."alfred"; - "alga" = dontDistribute super."alga"; - "algebra" = dontDistribute super."algebra"; - "algebra-dag" = dontDistribute super."algebra-dag"; - "algebra-sql" = dontDistribute super."algebra-sql"; - "algebraic" = dontDistribute super."algebraic"; - "algebraic-classes" = dontDistribute super."algebraic-classes"; - "algo-s" = dontDistribute super."algo-s"; - "align" = dontDistribute super."align"; - "align-text" = dontDistribute super."align-text"; - "aligned-foreignptr" = dontDistribute super."aligned-foreignptr"; - "allocated-processor" = dontDistribute super."allocated-processor"; - "alloy" = dontDistribute super."alloy"; - "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd"; - "almost-fix" = dontDistribute super."almost-fix"; - "alms" = dontDistribute super."alms"; - "alpha" = dontDistribute super."alpha"; - "alpino-tools" = dontDistribute super."alpino-tools"; - "alsa" = dontDistribute super."alsa"; - "alsa-core" = dontDistribute super."alsa-core"; - "alsa-gui" = dontDistribute super."alsa-gui"; - "alsa-midi" = dontDistribute super."alsa-midi"; - "alsa-mixer" = dontDistribute super."alsa-mixer"; - "alsa-pcm" = dontDistribute super."alsa-pcm"; - "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests"; - "alsa-seq" = dontDistribute super."alsa-seq"; - "alsa-seq-tests" = dontDistribute super."alsa-seq-tests"; - "altcomposition" = dontDistribute super."altcomposition"; - "alternative-io" = dontDistribute super."alternative-io"; - "altfloat" = dontDistribute super."altfloat"; - "alure" = dontDistribute super."alure"; - "amazon-emailer" = dontDistribute super."amazon-emailer"; - "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap"; - "amazon-products" = dontDistribute super."amazon-products"; - "amazonka-application-autoscaling" = dontDistribute super."amazonka-application-autoscaling"; - "amazonka-discovery" = dontDistribute super."amazonka-discovery"; - "ampersand" = dontDistribute super."ampersand"; - "amqp" = doDistribute super."amqp_0_13_1"; - "amqp-conduit" = dontDistribute super."amqp-conduit"; - "amrun" = dontDistribute super."amrun"; - "analyze-client" = dontDistribute super."analyze-client"; - "anansi" = dontDistribute super."anansi"; - "anansi-hscolour" = dontDistribute super."anansi-hscolour"; - "anansi-pandoc" = dontDistribute super."anansi-pandoc"; - "anatomy" = dontDistribute super."anatomy"; - "android" = dontDistribute super."android"; - "android-lint-summary" = dontDistribute super."android-lint-summary"; - "angle" = dontDistribute super."angle"; - "animalcase" = dontDistribute super."animalcase"; - "annah" = dontDistribute super."annah"; - "annihilator" = dontDistribute super."annihilator"; - "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests"; - "ansi-pretty" = dontDistribute super."ansi-pretty"; - "ansigraph" = dontDistribute super."ansigraph"; - "antagonist" = dontDistribute super."antagonist"; - "antfarm" = dontDistribute super."antfarm"; - "anticiv" = dontDistribute super."anticiv"; - "antigate" = dontDistribute super."antigate"; - "antimirov" = dontDistribute super."antimirov"; - "antiquoter" = dontDistribute super."antiquoter"; - "antisplice" = dontDistribute super."antisplice"; - "antlrc" = dontDistribute super."antlrc"; - "anydbm" = dontDistribute super."anydbm"; - "aosd" = dontDistribute super."aosd"; - "ap-reflect" = dontDistribute super."ap-reflect"; - "apache-md5" = dontDistribute super."apache-md5"; - "apelsin" = dontDistribute super."apelsin"; - "api-builder" = dontDistribute super."api-builder"; - "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode"; - "api-tools" = dontDistribute super."api-tools"; - "apiary-helics" = dontDistribute super."apiary-helics"; - "apiary-http-client" = dontDistribute super."apiary-http-client"; - "apiary-purescript" = dontDistribute super."apiary-purescript"; - "apis" = dontDistribute super."apis"; - "apotiki" = dontDistribute super."apotiki"; - "app-lens" = dontDistribute super."app-lens"; - "appc" = dontDistribute super."appc"; - "applicative-extras" = dontDistribute super."applicative-extras"; - "applicative-fail" = dontDistribute super."applicative-fail"; - "applicative-numbers" = dontDistribute super."applicative-numbers"; - "applicative-parsec" = dontDistribute super."applicative-parsec"; - "applicative-quoters" = dontDistribute super."applicative-quoters"; - "applicative-splice" = dontDistribute super."applicative-splice"; - "apply-refact" = doDistribute super."apply-refact_0_2_0_0"; - "apportionment" = dontDistribute super."apportionment"; - "approx-rand-test" = dontDistribute super."approx-rand-test"; - "approximate-equality" = dontDistribute super."approximate-equality"; - "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper"; - "arb-fft" = dontDistribute super."arb-fft"; - "arbb-vm" = dontDistribute super."arbb-vm"; - "arbtt" = doDistribute super."arbtt_0_9_0_9"; - "archive" = dontDistribute super."archive"; - "archiver" = dontDistribute super."archiver"; - "archlinux" = dontDistribute super."archlinux"; - "archlinux-web" = dontDistribute super."archlinux-web"; - "archnews" = dontDistribute super."archnews"; - "arena" = dontDistribute super."arena"; - "arff" = dontDistribute super."arff"; - "arghwxhaskell" = dontDistribute super."arghwxhaskell"; - "argon" = dontDistribute super."argon"; - "argon2" = dontDistribute super."argon2"; - "argparser" = dontDistribute super."argparser"; - "arguedit" = dontDistribute super."arguedit"; - "ariadne" = dontDistribute super."ariadne"; - "arion" = dontDistribute super."arion"; - "arith-encode" = dontDistribute super."arith-encode"; - "arithmatic" = dontDistribute super."arithmatic"; - "arithmetic" = dontDistribute super."arithmetic"; - "armada" = dontDistribute super."armada"; - "arpa" = dontDistribute super."arpa"; - "array-forth" = dontDistribute super."array-forth"; - "array-memoize" = dontDistribute super."array-memoize"; - "array-primops" = dontDistribute super."array-primops"; - "array-utils" = dontDistribute super."array-utils"; - "arrow-improve" = dontDistribute super."arrow-improve"; - "arrowapply-utils" = dontDistribute super."arrowapply-utils"; - "arrowp" = dontDistribute super."arrowp"; - "arrows" = dontDistribute super."arrows"; - "artery" = dontDistribute super."artery"; - "arx" = dontDistribute super."arx"; - "arxiv" = dontDistribute super."arxiv"; - "ascetic" = dontDistribute super."ascetic"; - "ascii" = dontDistribute super."ascii"; - "ascii-cows" = dontDistribute super."ascii-cows"; - "ascii-flatten" = dontDistribute super."ascii-flatten"; - "ascii-table" = dontDistribute super."ascii-table"; - "ascii-vector-avc" = dontDistribute super."ascii-vector-avc"; - "ascii85-conduit" = dontDistribute super."ascii85-conduit"; - "asciidiagram" = doDistribute super."asciidiagram_1_3_1_1"; - "asic" = dontDistribute super."asic"; - "asil" = dontDistribute super."asil"; - "asn1-data" = dontDistribute super."asn1-data"; - "asn1dump" = dontDistribute super."asn1dump"; - "assembler" = dontDistribute super."assembler"; - "assert" = dontDistribute super."assert"; - "assert-failure" = dontDistribute super."assert-failure"; - "assertions" = dontDistribute super."assertions"; - "assimp" = dontDistribute super."assimp"; - "astar" = dontDistribute super."astar"; - "astrds" = dontDistribute super."astrds"; - "astview" = dontDistribute super."astview"; - "astview-utils" = dontDistribute super."astview-utils"; - "async-ajax" = dontDistribute super."async-ajax"; - "async-extras" = dontDistribute super."async-extras"; - "async-manager" = dontDistribute super."async-manager"; - "async-pool" = dontDistribute super."async-pool"; - "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions"; - "aterm" = dontDistribute super."aterm"; - "aterm-utils" = dontDistribute super."aterm-utils"; - "atl" = dontDistribute super."atl"; - "atlassian-connect-core" = dontDistribute super."atlassian-connect-core"; - "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor"; - "atmos" = dontDistribute super."atmos"; - "atmos-dimensional" = dontDistribute super."atmos-dimensional"; - "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf"; - "atom" = dontDistribute super."atom"; - "atom-basic" = dontDistribute super."atom-basic"; - "atom-conduit" = doDistribute super."atom-conduit_0_3_1_1"; - "atom-msp430" = dontDistribute super."atom-msp430"; - "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign"; - "atomic-primops-vector" = dontDistribute super."atomic-primops-vector"; - "atomo" = dontDistribute super."atomo"; - "atp-haskell" = dontDistribute super."atp-haskell"; - "atrans" = dontDistribute super."atrans"; - "attempt" = dontDistribute super."attempt"; - "atto-lisp" = dontDistribute super."atto-lisp"; - "attoparsec-arff" = dontDistribute super."attoparsec-arff"; - "attoparsec-binary" = dontDistribute super."attoparsec-binary"; - "attoparsec-conduit" = dontDistribute super."attoparsec-conduit"; - "attoparsec-csv" = dontDistribute super."attoparsec-csv"; - "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee"; - "attoparsec-parsec" = dontDistribute super."attoparsec-parsec"; - "attoparsec-text" = dontDistribute super."attoparsec-text"; - "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator"; - "attosplit" = dontDistribute super."attosplit"; - "atuin" = dontDistribute super."atuin"; - "audacity" = dontDistribute super."audacity"; - "audiovisual" = dontDistribute super."audiovisual"; - "augeas" = dontDistribute super."augeas"; - "augur" = dontDistribute super."augur"; - "aur" = dontDistribute super."aur"; - "aur-api" = dontDistribute super."aur-api"; - "authenticate-kerberos" = dontDistribute super."authenticate-kerberos"; - "authenticate-ldap" = dontDistribute super."authenticate-ldap"; - "authinfo-hs" = dontDistribute super."authinfo-hs"; - "authoring" = dontDistribute super."authoring"; - "automitive-cse" = dontDistribute super."automitive-cse"; - "automotive-cse" = dontDistribute super."automotive-cse"; - "autonix-deps" = dontDistribute super."autonix-deps"; - "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5"; - "autoproc" = dontDistribute super."autoproc"; - "avahi" = dontDistribute super."avahi"; - "avatar-generator" = dontDistribute super."avatar-generator"; - "average" = dontDistribute super."average"; - "avl-static" = dontDistribute super."avl-static"; - "avr-shake" = dontDistribute super."avr-shake"; - "avwx" = dontDistribute super."avwx"; - "awesome-prelude" = dontDistribute super."awesome-prelude"; - "awesomium" = dontDistribute super."awesomium"; - "awesomium-glut" = dontDistribute super."awesomium-glut"; - "awesomium-raw" = dontDistribute super."awesomium-raw"; - "aws" = doDistribute super."aws_0_13_2"; - "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer"; - "aws-configuration-tools" = dontDistribute super."aws-configuration-tools"; - "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit"; - "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams"; - "aws-ec2" = dontDistribute super."aws-ec2"; - "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder"; - "aws-general" = dontDistribute super."aws-general"; - "aws-kinesis" = dontDistribute super."aws-kinesis"; - "aws-kinesis-client" = dontDistribute super."aws-kinesis-client"; - "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard"; - "aws-lambda" = dontDistribute super."aws-lambda"; - "aws-performance-tests" = dontDistribute super."aws-performance-tests"; - "aws-route53" = dontDistribute super."aws-route53"; - "aws-sdk" = dontDistribute super."aws-sdk"; - "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter"; - "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered"; - "aws-sign4" = dontDistribute super."aws-sign4"; - "aws-sns" = dontDistribute super."aws-sns"; - "azure-acs" = dontDistribute super."azure-acs"; - "azure-service-api" = dontDistribute super."azure-service-api"; - "azure-servicebus" = dontDistribute super."azure-servicebus"; - "azurify" = dontDistribute super."azurify"; - "b-tree" = dontDistribute super."b-tree"; - "babylon" = dontDistribute super."babylon"; - "backdropper" = dontDistribute super."backdropper"; - "backtracking-exceptions" = dontDistribute super."backtracking-exceptions"; - "backward-state" = dontDistribute super."backward-state"; - "bacteria" = dontDistribute super."bacteria"; - "bag" = dontDistribute super."bag"; - "bamboo" = dontDistribute super."bamboo"; - "bamboo-launcher" = dontDistribute super."bamboo-launcher"; - "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight"; - "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo"; - "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint"; - "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5"; - "bamse" = dontDistribute super."bamse"; - "bamstats" = dontDistribute super."bamstats"; - "bank-holiday-usa" = dontDistribute super."bank-holiday-usa"; - "banwords" = dontDistribute super."banwords"; - "barchart" = dontDistribute super."barchart"; - "barcodes-code128" = dontDistribute super."barcodes-code128"; - "barecheck" = dontDistribute super."barecheck"; - "barley" = dontDistribute super."barley"; - "barrie" = dontDistribute super."barrie"; - "barrier-monad" = dontDistribute super."barrier-monad"; - "base-generics" = dontDistribute super."base-generics"; - "base-io-access" = dontDistribute super."base-io-access"; - "base-noprelude" = doDistribute super."base-noprelude_4_8_2_0"; - "base32-bytestring" = dontDistribute super."base32-bytestring"; - "base58-bytestring" = dontDistribute super."base58-bytestring"; - "base58address" = dontDistribute super."base58address"; - "base64-conduit" = dontDistribute super."base64-conduit"; - "base91" = dontDistribute super."base91"; - "basex-client" = dontDistribute super."basex-client"; - "bash" = dontDistribute super."bash"; - "basic-lens" = dontDistribute super."basic-lens"; - "basic-sop" = dontDistribute super."basic-sop"; - "baskell" = dontDistribute super."baskell"; - "battlenet" = dontDistribute super."battlenet"; - "battlenet-yesod" = dontDistribute super."battlenet-yesod"; - "battleships" = dontDistribute super."battleships"; - "bayes-stack" = dontDistribute super."bayes-stack"; - "bbdb" = dontDistribute super."bbdb"; - "bbi" = dontDistribute super."bbi"; - "bcrypt" = doDistribute super."bcrypt_0_0_8"; - "bdd" = dontDistribute super."bdd"; - "bdelta" = dontDistribute super."bdelta"; - "bdo" = dontDistribute super."bdo"; - "beam" = dontDistribute super."beam"; - "beam-th" = dontDistribute super."beam-th"; - "beamable" = dontDistribute super."beamable"; - "bearriver" = dontDistribute super."bearriver"; - "beautifHOL" = dontDistribute super."beautifHOL"; - "bed-and-breakfast" = dontDistribute super."bed-and-breakfast"; - "bein" = dontDistribute super."bein"; - "bench" = dontDistribute super."bench"; - "benchmark-function" = dontDistribute super."benchmark-function"; - "bencoding" = dontDistribute super."bencoding"; - "berkeleydb" = dontDistribute super."berkeleydb"; - "berp" = dontDistribute super."berp"; - "bert" = dontDistribute super."bert"; - "besout" = dontDistribute super."besout"; - "bet" = dontDistribute super."bet"; - "betacode" = dontDistribute super."betacode"; - "between" = dontDistribute super."between"; - "bf-cata" = dontDistribute super."bf-cata"; - "bff" = dontDistribute super."bff"; - "bff-mono" = dontDistribute super."bff-mono"; - "bgmax" = dontDistribute super."bgmax"; - "bgzf" = dontDistribute super."bgzf"; - "bibdb" = dontDistribute super."bibdb"; - "bibtex" = dontDistribute super."bibtex"; - "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined"; - "bidispec" = dontDistribute super."bidispec"; - "bidispec-extras" = dontDistribute super."bidispec-extras"; - "bifunctors" = doDistribute super."bifunctors_5_2"; - "bighugethesaurus" = dontDistribute super."bighugethesaurus"; - "billboard-parser" = dontDistribute super."billboard-parser"; - "billeksah-forms" = dontDistribute super."billeksah-forms"; - "billeksah-main" = dontDistribute super."billeksah-main"; - "billeksah-main-static" = dontDistribute super."billeksah-main-static"; - "billeksah-pane" = dontDistribute super."billeksah-pane"; - "billeksah-services" = dontDistribute super."billeksah-services"; - "bimaps" = dontDistribute super."bimaps"; - "binary-communicator" = dontDistribute super."binary-communicator"; - "binary-derive" = dontDistribute super."binary-derive"; - "binary-enum" = dontDistribute super."binary-enum"; - "binary-file" = dontDistribute super."binary-file"; - "binary-generic" = dontDistribute super."binary-generic"; - "binary-indexed-tree" = dontDistribute super."binary-indexed-tree"; - "binary-literal-qq" = dontDistribute super."binary-literal-qq"; - "binary-protocol" = dontDistribute super."binary-protocol"; - "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq"; - "binary-state" = dontDistribute super."binary-state"; - "binary-store" = dontDistribute super."binary-store"; - "binary-streams" = dontDistribute super."binary-streams"; - "binary-strict" = dontDistribute super."binary-strict"; - "binarydefer" = dontDistribute super."binarydefer"; - "bind-marshal" = dontDistribute super."bind-marshal"; - "binding-core" = dontDistribute super."binding-core"; - "binding-gtk" = dontDistribute super."binding-gtk"; - "binding-wx" = dontDistribute super."binding-wx"; - "bindings" = dontDistribute super."bindings"; - "bindings-EsounD" = dontDistribute super."bindings-EsounD"; - "bindings-K8055" = dontDistribute super."bindings-K8055"; - "bindings-apr" = dontDistribute super."bindings-apr"; - "bindings-apr-util" = dontDistribute super."bindings-apr-util"; - "bindings-audiofile" = dontDistribute super."bindings-audiofile"; - "bindings-bfd" = dontDistribute super."bindings-bfd"; - "bindings-cctools" = dontDistribute super."bindings-cctools"; - "bindings-codec2" = dontDistribute super."bindings-codec2"; - "bindings-common" = dontDistribute super."bindings-common"; - "bindings-dc1394" = dontDistribute super."bindings-dc1394"; - "bindings-directfb" = dontDistribute super."bindings-directfb"; - "bindings-eskit" = dontDistribute super."bindings-eskit"; - "bindings-fann" = dontDistribute super."bindings-fann"; - "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth"; - "bindings-friso" = dontDistribute super."bindings-friso"; - "bindings-glib" = dontDistribute super."bindings-glib"; - "bindings-gobject" = dontDistribute super."bindings-gobject"; - "bindings-gpgme" = dontDistribute super."bindings-gpgme"; - "bindings-gsl" = dontDistribute super."bindings-gsl"; - "bindings-gts" = dontDistribute super."bindings-gts"; - "bindings-hamlib" = dontDistribute super."bindings-hamlib"; - "bindings-hdf5" = dontDistribute super."bindings-hdf5"; - "bindings-levmar" = dontDistribute super."bindings-levmar"; - "bindings-libcddb" = dontDistribute super."bindings-libcddb"; - "bindings-libffi" = dontDistribute super."bindings-libffi"; - "bindings-libftdi" = dontDistribute super."bindings-libftdi"; - "bindings-librrd" = dontDistribute super."bindings-librrd"; - "bindings-libstemmer" = dontDistribute super."bindings-libstemmer"; - "bindings-libusb" = dontDistribute super."bindings-libusb"; - "bindings-libv4l2" = dontDistribute super."bindings-libv4l2"; - "bindings-libzip" = dontDistribute super."bindings-libzip"; - "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2"; - "bindings-lxc" = dontDistribute super."bindings-lxc"; - "bindings-mmap" = dontDistribute super."bindings-mmap"; - "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal"; - "bindings-nettle" = dontDistribute super."bindings-nettle"; - "bindings-parport" = dontDistribute super."bindings-parport"; - "bindings-portaudio" = dontDistribute super."bindings-portaudio"; - "bindings-potrace" = dontDistribute super."bindings-potrace"; - "bindings-ppdev" = dontDistribute super."bindings-ppdev"; - "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd"; - "bindings-sane" = dontDistribute super."bindings-sane"; - "bindings-sc3" = dontDistribute super."bindings-sc3"; - "bindings-sipc" = dontDistribute super."bindings-sipc"; - "bindings-sophia" = dontDistribute super."bindings-sophia"; - "bindings-sqlite3" = dontDistribute super."bindings-sqlite3"; - "bindings-svm" = dontDistribute super."bindings-svm"; - "bindings-uname" = dontDistribute super."bindings-uname"; - "bindings-wlc" = dontDistribute super."bindings-wlc"; - "bindings-yices" = dontDistribute super."bindings-yices"; - "bindynamic" = dontDistribute super."bindynamic"; - "binembed" = dontDistribute super."binembed"; - "binembed-example" = dontDistribute super."binembed-example"; - "bini" = dontDistribute super."bini"; - "bio" = dontDistribute super."bio"; - "biohazard" = dontDistribute super."biohazard"; - "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit"; - "biophd" = doDistribute super."biophd_0_0_4"; - "biosff" = dontDistribute super."biosff"; - "biostockholm" = dontDistribute super."biostockholm"; - "bird" = dontDistribute super."bird"; - "bit-array" = dontDistribute super."bit-array"; - "bit-vector" = dontDistribute super."bit-vector"; - "bitarray" = dontDistribute super."bitarray"; - "bitcoin-payment-channel" = dontDistribute super."bitcoin-payment-channel"; - "bitcoin-rpc" = dontDistribute super."bitcoin-rpc"; - "bitly-cli" = dontDistribute super."bitly-cli"; - "bitmap" = dontDistribute super."bitmap"; - "bitmap-opengl" = dontDistribute super."bitmap-opengl"; - "bitmaps" = dontDistribute super."bitmaps"; - "bits" = doDistribute super."bits_0_4"; - "bits-atomic" = dontDistribute super."bits-atomic"; - "bits-bytestring" = dontDistribute super."bits-bytestring"; - "bits-bytestring-lazy" = dontDistribute super."bits-bytestring-lazy"; - "bits-conduit" = dontDistribute super."bits-conduit"; - "bits-extras" = dontDistribute super."bits-extras"; - "bitset" = dontDistribute super."bitset"; - "bitspeak" = dontDistribute super."bitspeak"; - "bitstream" = dontDistribute super."bitstream"; - "bitstring" = dontDistribute super."bitstring"; - "bittorrent" = dontDistribute super."bittorrent"; - "bitvec" = dontDistribute super."bitvec"; - "bitx-bitcoin" = dontDistribute super."bitx-bitcoin"; - "bk-tree" = dontDistribute super."bk-tree"; - "bkr" = dontDistribute super."bkr"; - "bktrees" = dontDistribute super."bktrees"; - "bla" = dontDistribute super."bla"; - "black-jewel" = dontDistribute super."black-jewel"; - "blacktip" = dontDistribute super."blacktip"; - "blake2" = doDistribute super."blake2_0_1_0"; - "blakesum" = dontDistribute super."blakesum"; - "blakesum-demo" = dontDistribute super."blakesum-demo"; - "blas" = dontDistribute super."blas"; - "blas-hs" = dontDistribute super."blas-hs"; - "blatex" = dontDistribute super."blatex"; - "blaze" = dontDistribute super."blaze"; - "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit"; - "blaze-from-html" = dontDistribute super."blaze-from-html"; - "blaze-html" = doDistribute super."blaze-html_0_8_1_1"; - "blaze-html-contrib" = dontDistribute super."blaze-html-contrib"; - "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat"; - "blaze-html-truncate" = dontDistribute super."blaze-html-truncate"; - "blaze-json" = dontDistribute super."blaze-json"; - "blaze-markup" = doDistribute super."blaze-markup_0_7_0_3"; - "blaze-shields" = dontDistribute super."blaze-shields"; - "blaze-textual-native" = dontDistribute super."blaze-textual-native"; - "blazeMarker" = dontDistribute super."blazeMarker"; - "blink1" = dontDistribute super."blink1"; - "blip" = dontDistribute super."blip"; - "bliplib" = dontDistribute super."bliplib"; - "blockhash" = dontDistribute super."blockhash"; - "blocking-transactions" = dontDistribute super."blocking-transactions"; - "blogination" = dontDistribute super."blogination"; - "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth"; - "bloomfilter-redis" = dontDistribute super."bloomfilter-redis"; - "blosum" = dontDistribute super."blosum"; - "bloxorz" = dontDistribute super."bloxorz"; - "blubber" = dontDistribute super."blubber"; - "blubber-server" = dontDistribute super."blubber-server"; - "bluetile" = dontDistribute super."bluetile"; - "bluetileutils" = dontDistribute super."bluetileutils"; - "blunt" = dontDistribute super."blunt"; - "bmp" = doDistribute super."bmp_1_2_5_2"; - "board-games" = dontDistribute super."board-games"; - "bogre-banana" = dontDistribute super."bogre-banana"; - "bond" = dontDistribute super."bond"; - "bond-haskell" = dontDistribute super."bond-haskell"; - "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler"; - "bookkeeper" = dontDistribute super."bookkeeper"; - "boolean-list" = dontDistribute super."boolean-list"; - "boolean-normal-forms" = dontDistribute super."boolean-normal-forms"; - "boolexpr" = dontDistribute super."boolexpr"; - "bools" = dontDistribute super."bools"; - "boolsimplifier" = dontDistribute super."boolsimplifier"; - "boomange" = dontDistribute super."boomange"; - "boombox" = dontDistribute super."boombox"; - "boomslang" = dontDistribute super."boomslang"; - "borel" = dontDistribute super."borel"; - "boring-window-switcher" = dontDistribute super."boring-window-switcher"; - "bot" = dontDistribute super."bot"; - "botpp" = dontDistribute super."botpp"; - "bound-gen" = dontDistribute super."bound-gen"; - "bounded-tchan" = dontDistribute super."bounded-tchan"; - "boundingboxes" = dontDistribute super."boundingboxes"; - "bowntz" = dontDistribute super."bowntz"; - "box-tuples" = dontDistribute super."box-tuples"; - "bpann" = dontDistribute super."bpann"; - "braid" = dontDistribute super."braid"; - "brainfuck" = dontDistribute super."brainfuck"; - "brainfuck-monad" = dontDistribute super."brainfuck-monad"; - "brainfuck-tut" = dontDistribute super."brainfuck-tut"; - "break" = dontDistribute super."break"; - "breakout" = dontDistribute super."breakout"; - "breve" = dontDistribute super."breve"; - "brians-brain" = dontDistribute super."brians-brain"; - "brick" = doDistribute super."brick_0_4_1"; - "brillig" = dontDistribute super."brillig"; - "broccoli" = dontDistribute super."broccoli"; - "broker-haskell" = dontDistribute super."broker-haskell"; - "bsd-sysctl" = dontDistribute super."bsd-sysctl"; - "bson-generic" = dontDistribute super."bson-generic"; - "bson-generics" = dontDistribute super."bson-generics"; - "bson-mapping" = dontDistribute super."bson-mapping"; - "bspack" = dontDistribute super."bspack"; - "bsparse" = dontDistribute super."bsparse"; - "btree-concurrent" = dontDistribute super."btree-concurrent"; - "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson"; - "buffer-pipe" = dontDistribute super."buffer-pipe"; - "buffon" = dontDistribute super."buffon"; - "bugzilla" = dontDistribute super."bugzilla"; - "buildable" = dontDistribute super."buildable"; - "buildbox" = dontDistribute super."buildbox"; - "buildbox-tools" = dontDistribute super."buildbox-tools"; - "buildwrapper" = dontDistribute super."buildwrapper"; - "bullet" = dontDistribute super."bullet"; - "burst-detection" = dontDistribute super."burst-detection"; - "bus-pirate" = dontDistribute super."bus-pirate"; - "buster" = dontDistribute super."buster"; - "buster-gtk" = dontDistribute super."buster-gtk"; - "buster-network" = dontDistribute super."buster-network"; - "butterflies" = dontDistribute super."butterflies"; - "bv" = dontDistribute super."bv"; - "byline" = dontDistribute super."byline"; - "bytable" = dontDistribute super."bytable"; - "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary"; - "bytestring-builder" = doDistribute super."bytestring-builder_0_10_6_0_0"; - "bytestring-class" = dontDistribute super."bytestring-class"; - "bytestring-csv" = dontDistribute super."bytestring-csv"; - "bytestring-delta" = dontDistribute super."bytestring-delta"; - "bytestring-from" = dontDistribute super."bytestring-from"; - "bytestring-nums" = dontDistribute super."bytestring-nums"; - "bytestring-plain" = dontDistribute super."bytestring-plain"; - "bytestring-rematch" = dontDistribute super."bytestring-rematch"; - "bytestring-short" = dontDistribute super."bytestring-short"; - "bytestring-show" = dontDistribute super."bytestring-show"; - "bytestring-tree-builder" = doDistribute super."bytestring-tree-builder_0_2_7"; - "bytestringparser" = dontDistribute super."bytestringparser"; - "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary"; - "bytestringreadp" = dontDistribute super."bytestringreadp"; - "c-dsl" = dontDistribute super."c-dsl"; - "c-io" = dontDistribute super."c-io"; - "c-storable-deriving" = dontDistribute super."c-storable-deriving"; - "c0check" = dontDistribute super."c0check"; - "c0parser" = dontDistribute super."c0parser"; - "c10k" = dontDistribute super."c10k"; - "c2hsc" = dontDistribute super."c2hsc"; - "cab" = dontDistribute super."cab"; - "cabal" = dontDistribute super."cabal"; - "cabal-audit" = dontDistribute super."cabal-audit"; - "cabal-bounds" = dontDistribute super."cabal-bounds"; - "cabal-cargs" = dontDistribute super."cabal-cargs"; - "cabal-constraints" = dontDistribute super."cabal-constraints"; - "cabal-db" = dontDistribute super."cabal-db"; - "cabal-dev" = dontDistribute super."cabal-dev"; - "cabal-dir" = dontDistribute super."cabal-dir"; - "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags"; - "cabal-ghci" = dontDistribute super."cabal-ghci"; - "cabal-graphdeps" = dontDistribute super."cabal-graphdeps"; - "cabal-helper" = doDistribute super."cabal-helper_0_6_3_1"; - "cabal-info" = dontDistribute super."cabal-info"; - "cabal-install" = doDistribute super."cabal-install_1_22_9_0"; - "cabal-install-bundle" = dontDistribute super."cabal-install-bundle"; - "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72"; - "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74"; - "cabal-lenses" = dontDistribute super."cabal-lenses"; - "cabal-macosx" = dontDistribute super."cabal-macosx"; - "cabal-meta" = dontDistribute super."cabal-meta"; - "cabal-mon" = dontDistribute super."cabal-mon"; - "cabal-nirvana" = dontDistribute super."cabal-nirvana"; - "cabal-progdeps" = dontDistribute super."cabal-progdeps"; - "cabal-query" = dontDistribute super."cabal-query"; - "cabal-rpm" = doDistribute super."cabal-rpm_0_9_11"; - "cabal-scripts" = dontDistribute super."cabal-scripts"; - "cabal-setup" = dontDistribute super."cabal-setup"; - "cabal-sign" = dontDistribute super."cabal-sign"; - "cabal-test" = dontDistribute super."cabal-test"; - "cabal-test-bin" = dontDistribute super."cabal-test-bin"; - "cabal-test-compat" = dontDistribute super."cabal-test-compat"; - "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck"; - "cabal-uninstall" = dontDistribute super."cabal-uninstall"; - "cabal-upload" = dontDistribute super."cabal-upload"; - "cabal2arch" = dontDistribute super."cabal2arch"; - "cabal2doap" = dontDistribute super."cabal2doap"; - "cabal2ebuild" = dontDistribute super."cabal2ebuild"; - "cabal2ghci" = dontDistribute super."cabal2ghci"; - "cabal2nix" = dontDistribute super."cabal2nix"; - "cabal2spec" = dontDistribute super."cabal2spec"; - "cabalQuery" = dontDistribute super."cabalQuery"; - "cabalg" = dontDistribute super."cabalg"; - "cabalgraph" = dontDistribute super."cabalgraph"; - "cabalmdvrpm" = dontDistribute super."cabalmdvrpm"; - "cabalrpmdeps" = dontDistribute super."cabalrpmdeps"; - "cabalvchk" = dontDistribute super."cabalvchk"; - "cabin" = dontDistribute super."cabin"; - "cabocha" = dontDistribute super."cabocha"; - "cache" = dontDistribute super."cache"; - "cached-io" = dontDistribute super."cached-io"; - "cached-traversable" = dontDistribute super."cached-traversable"; - "cacophony" = doDistribute super."cacophony_0_6_0"; - "caf" = dontDistribute super."caf"; - "cafeteria-prelude" = dontDistribute super."cafeteria-prelude"; - "caffegraph" = dontDistribute super."caffegraph"; - "cairo" = doDistribute super."cairo_0_13_1_1"; - "cairo-appbase" = dontDistribute super."cairo-appbase"; - "cake" = dontDistribute super."cake"; - "cake3" = dontDistribute super."cake3"; - "cakyrespa" = dontDistribute super."cakyrespa"; - "cal3d" = dontDistribute super."cal3d"; - "cal3d-examples" = dontDistribute super."cal3d-examples"; - "cal3d-opengl" = dontDistribute super."cal3d-opengl"; - "calc" = dontDistribute super."calc"; - "caldims" = dontDistribute super."caldims"; - "caledon" = dontDistribute super."caledon"; - "calendar-recycling" = dontDistribute super."calendar-recycling"; - "call" = dontDistribute super."call"; - "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything"; - "camfort" = dontDistribute super."camfort"; - "camh" = dontDistribute super."camh"; - "campfire" = dontDistribute super."campfire"; - "canonical-filepath" = dontDistribute super."canonical-filepath"; - "canteven-config" = dontDistribute super."canteven-config"; - "canteven-http" = dontDistribute super."canteven-http"; - "canteven-listen-http" = dontDistribute super."canteven-listen-http"; - "canteven-log" = dontDistribute super."canteven-log"; - "canteven-parsedate" = dontDistribute super."canteven-parsedate"; - "canteven-template" = dontDistribute super."canteven-template"; - "cantor" = dontDistribute super."cantor"; - "cao" = dontDistribute super."cao"; - "cap" = dontDistribute super."cap"; - "capped-list" = dontDistribute super."capped-list"; - "capri" = dontDistribute super."capri"; - "car-pool" = dontDistribute super."car-pool"; - "caramia" = dontDistribute super."caramia"; - "carboncopy" = dontDistribute super."carboncopy"; - "carettah" = dontDistribute super."carettah"; - "carray" = doDistribute super."carray_0_1_6_4"; - "cartel" = doDistribute super."cartel_0_16_0_0"; - "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms"; - "casadi-bindings" = dontDistribute super."casadi-bindings"; - "casadi-bindings-control" = dontDistribute super."casadi-bindings-control"; - "casadi-bindings-core" = dontDistribute super."casadi-bindings-core"; - "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal"; - "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface"; - "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface"; - "cascading" = dontDistribute super."cascading"; - "case-conversion" = dontDistribute super."case-conversion"; - "case-insensitive-match" = dontDistribute super."case-insensitive-match"; - "cash" = dontDistribute super."cash"; - "casing" = dontDistribute super."casing"; - "casr-logbook" = dontDistribute super."casr-logbook"; - "casr-logbook-html" = dontDistribute super."casr-logbook-html"; - "casr-logbook-meta" = dontDistribute super."casr-logbook-meta"; - "casr-logbook-meta-html" = dontDistribute super."casr-logbook-meta-html"; - "casr-logbook-reports" = dontDistribute super."casr-logbook-reports"; - "casr-logbook-reports-html" = dontDistribute super."casr-logbook-reports-html"; - "casr-logbook-reports-meta" = dontDistribute super."casr-logbook-reports-meta"; - "casr-logbook-reports-meta-html" = dontDistribute super."casr-logbook-reports-meta-html"; - "casr-logbook-types" = dontDistribute super."casr-logbook-types"; - "cassandra-cql" = dontDistribute super."cassandra-cql"; - "cassandra-thrift" = dontDistribute super."cassandra-thrift"; - "cassava-conduit" = dontDistribute super."cassava-conduit"; - "cassava-megaparsec" = dontDistribute super."cassava-megaparsec"; - "cassava-streams" = dontDistribute super."cassava-streams"; - "cassette" = dontDistribute super."cassette"; - "cassy" = dontDistribute super."cassy"; - "castle" = dontDistribute super."castle"; - "casui" = dontDistribute super."casui"; - "catamorphism" = dontDistribute super."catamorphism"; - "catch-fd" = dontDistribute super."catch-fd"; - "categorical-algebra" = dontDistribute super."categorical-algebra"; - "categories" = dontDistribute super."categories"; - "category-extras" = dontDistribute super."category-extras"; - "category-printf" = dontDistribute super."category-printf"; - "category-traced" = dontDistribute super."category-traced"; - "cayley-dickson" = dontDistribute super."cayley-dickson"; - "cblrepo" = dontDistribute super."cblrepo"; - "cci" = dontDistribute super."cci"; - "ccnx" = dontDistribute super."ccnx"; - "cctools-workqueue" = dontDistribute super."cctools-workqueue"; - "cedict" = dontDistribute super."cedict"; - "cef" = dontDistribute super."cef"; - "ceilometer-common" = dontDistribute super."ceilometer-common"; - "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo"; - "cerberus" = dontDistribute super."cerberus"; - "cereal" = doDistribute super."cereal_0_5_2_0"; - "cereal-derive" = dontDistribute super."cereal-derive"; - "cereal-enumerator" = dontDistribute super."cereal-enumerator"; - "cereal-ieee754" = dontDistribute super."cereal-ieee754"; - "cereal-io-streams" = dontDistribute super."cereal-io-streams"; - "cereal-plus" = dontDistribute super."cereal-plus"; - "cereal-streams" = dontDistribute super."cereal-streams"; - "cereal-text" = dontDistribute super."cereal-text"; - "certificate" = dontDistribute super."certificate"; - "cf" = dontDistribute super."cf"; - "cfipu" = dontDistribute super."cfipu"; - "cflp" = dontDistribute super."cflp"; - "cfopu" = dontDistribute super."cfopu"; - "cg" = dontDistribute super."cg"; - "cgen" = dontDistribute super."cgen"; - "cgi-undecidable" = dontDistribute super."cgi-undecidable"; - "cgi-utils" = dontDistribute super."cgi-utils"; - "cgrep" = dontDistribute super."cgrep"; - "chain-codes" = dontDistribute super."chain-codes"; - "chalk" = dontDistribute super."chalk"; - "chalkboard" = dontDistribute super."chalkboard"; - "chalkboard-viewer" = dontDistribute super."chalkboard-viewer"; - "chalmers-lava2000" = dontDistribute super."chalmers-lava2000"; - "chan-split" = dontDistribute super."chan-split"; - "change-monger" = dontDistribute super."change-monger"; - "charade" = dontDistribute super."charade"; - "charsetdetect" = dontDistribute super."charsetdetect"; - "chart-histogram" = dontDistribute super."chart-histogram"; - "chaselev-deque" = dontDistribute super."chaselev-deque"; - "chatter" = dontDistribute super."chatter"; - "chatty" = dontDistribute super."chatty"; - "chatty-text" = dontDistribute super."chatty-text"; - "chatty-utils" = dontDistribute super."chatty-utils"; - "cheapskate-terminal" = dontDistribute super."cheapskate-terminal"; - "check-pvp" = dontDistribute super."check-pvp"; - "checked" = dontDistribute super."checked"; - "chell-hunit" = dontDistribute super."chell-hunit"; - "chesshs" = dontDistribute super."chesshs"; - "chevalier-common" = dontDistribute super."chevalier-common"; - "chorale" = dontDistribute super."chorale"; - "chorale-geo" = dontDistribute super."chorale-geo"; - "chp" = dontDistribute super."chp"; - "chp-mtl" = dontDistribute super."chp-mtl"; - "chp-plus" = dontDistribute super."chp-plus"; - "chp-spec" = dontDistribute super."chp-spec"; - "chp-transformers" = dontDistribute super."chp-transformers"; - "chronograph" = dontDistribute super."chronograph"; - "chronos" = dontDistribute super."chronos"; - "chu2" = dontDistribute super."chu2"; - "chuchu" = dontDistribute super."chuchu"; - "chunked-data" = doDistribute super."chunked-data_0_2_0"; - "chunks" = dontDistribute super."chunks"; - "chunky" = dontDistribute super."chunky"; - "church-list" = dontDistribute super."church-list"; - "cil" = dontDistribute super."cil"; - "cinvoke" = dontDistribute super."cinvoke"; - "cio" = dontDistribute super."cio"; - "cipher-aes128" = doDistribute super."cipher-aes128_0_7_0_1"; - "cipher-rc5" = dontDistribute super."cipher-rc5"; - "ciphersaber2" = dontDistribute super."ciphersaber2"; - "circ" = dontDistribute super."circ"; - "circlehs" = dontDistribute super."circlehs"; - "cirru-parser" = dontDistribute super."cirru-parser"; - "citation-resolve" = dontDistribute super."citation-resolve"; - "citeproc-hs" = dontDistribute super."citeproc-hs"; - "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter"; - "cityhash" = dontDistribute super."cityhash"; - "cjk" = dontDistribute super."cjk"; - "clac" = dontDistribute super."clac"; - "clafer" = dontDistribute super."clafer"; - "claferIG" = dontDistribute super."claferIG"; - "claferwiki" = dontDistribute super."claferwiki"; - "clang-pure" = dontDistribute super."clang-pure"; - "clanki" = dontDistribute super."clanki"; - "clarifai" = dontDistribute super."clarifai"; - "clash" = dontDistribute super."clash"; - "clash-ghc" = doDistribute super."clash-ghc_0_6_21"; - "clash-lib" = doDistribute super."clash-lib_0_6_19"; - "clash-prelude" = doDistribute super."clash-prelude_0_10_10"; - "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck"; - "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_7"; - "clash-verilog" = doDistribute super."clash-verilog_0_6_7"; - "clash-vhdl" = doDistribute super."clash-vhdl_0_6_15"; - "classify" = dontDistribute super."classify"; - "classy-parallel" = dontDistribute super."classy-parallel"; - "classy-prelude" = doDistribute super."classy-prelude_0_12_8"; - "classy-prelude-conduit" = doDistribute super."classy-prelude-conduit_0_12_8"; - "classy-prelude-yesod" = doDistribute super."classy-prelude-yesod_0_12_8"; - "clay" = doDistribute super."clay_0_10_1"; - "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com"; - "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs"; - "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot"; - "clckwrks-plugin-page" = doDistribute super."clckwrks-plugin-page_0_4_3_3"; - "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks"; - "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap"; - "cld2" = dontDistribute super."cld2"; - "clean-home" = dontDistribute super."clean-home"; - "clean-unions" = dontDistribute super."clean-unions"; - "cless" = dontDistribute super."cless"; - "clevercss" = dontDistribute super."clevercss"; - "cli" = dontDistribute super."cli"; - "click-clack" = dontDistribute super."click-clack"; - "clifford" = dontDistribute super."clifford"; - "clippard" = dontDistribute super."clippard"; - "clipper" = dontDistribute super."clipper"; - "clippings" = dontDistribute super."clippings"; - "clist" = dontDistribute super."clist"; - "cloben" = dontDistribute super."cloben"; - "clocked" = dontDistribute super."clocked"; - "clogparse" = dontDistribute super."clogparse"; - "clone-all" = dontDistribute super."clone-all"; - "closure" = dontDistribute super."closure"; - "cloud-haskell" = dontDistribute super."cloud-haskell"; - "cloudfront-signer" = dontDistribute super."cloudfront-signer"; - "cloudyfs" = dontDistribute super."cloudyfs"; - "cltw" = dontDistribute super."cltw"; - "clua" = dontDistribute super."clua"; - "cluss" = dontDistribute super."cluss"; - "clustertools" = dontDistribute super."clustertools"; - "clutterhs" = dontDistribute super."clutterhs"; - "cmaes" = dontDistribute super."cmaes"; - "cmark-highlight" = dontDistribute super."cmark-highlight"; - "cmark-lucid" = dontDistribute super."cmark-lucid"; - "cmark-sections" = dontDistribute super."cmark-sections"; - "cmath" = dontDistribute super."cmath"; - "cmathml3" = dontDistribute super."cmathml3"; - "cmd-item" = dontDistribute super."cmd-item"; - "cmdargs-browser" = dontDistribute super."cmdargs-browser"; - "cmdlib" = dontDistribute super."cmdlib"; - "cmdtheline" = dontDistribute super."cmdtheline"; - "cml" = dontDistribute super."cml"; - "cmonad" = dontDistribute super."cmonad"; - "cmph" = dontDistribute super."cmph"; - "cmu" = dontDistribute super."cmu"; - "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler"; - "cndict" = dontDistribute super."cndict"; - "codec" = dontDistribute super."codec"; - "codec-libevent" = dontDistribute super."codec-libevent"; - "codec-mbox" = dontDistribute super."codec-mbox"; - "codecov-haskell" = dontDistribute super."codecov-haskell"; - "codemonitor" = dontDistribute super."codemonitor"; - "codepad" = dontDistribute super."codepad"; - "codeworld-api" = dontDistribute super."codeworld-api"; - "codex" = doDistribute super."codex_0_4_0_10"; - "codo-notation" = dontDistribute super."codo-notation"; - "cofunctor" = dontDistribute super."cofunctor"; - "cognimeta-utils" = dontDistribute super."cognimeta-utils"; - "coin" = dontDistribute super."coin"; - "coinbase-exchange" = dontDistribute super."coinbase-exchange"; - "colada" = dontDistribute super."colada"; - "colchis" = dontDistribute super."colchis"; - "collada-output" = dontDistribute super."collada-output"; - "collada-types" = dontDistribute super."collada-types"; - "collapse-util" = dontDistribute super."collapse-util"; - "collection-json" = dontDistribute super."collection-json"; - "collections" = dontDistribute super."collections"; - "collections-api" = dontDistribute super."collections-api"; - "collections-base-instances" = dontDistribute super."collections-base-instances"; - "colock" = dontDistribute super."colock"; - "colonnade" = dontDistribute super."colonnade"; - "color-counter" = dontDistribute super."color-counter"; - "colorize-haskell" = dontDistribute super."colorize-haskell"; - "colors" = dontDistribute super."colors"; - "coltrane" = dontDistribute super."coltrane"; - "com" = dontDistribute super."com"; - "combinat" = dontDistribute super."combinat"; - "combinat-diagrams" = dontDistribute super."combinat-diagrams"; - "combinator-interactive" = dontDistribute super."combinator-interactive"; - "combinatorial-problems" = dontDistribute super."combinatorial-problems"; - "combinatorics" = dontDistribute super."combinatorics"; - "combobuffer" = dontDistribute super."combobuffer"; - "comfort-graph" = dontDistribute super."comfort-graph"; - "command" = dontDistribute super."command"; - "command-qq" = dontDistribute super."command-qq"; - "commander" = dontDistribute super."commander"; - "commodities" = dontDistribute super."commodities"; - "commsec" = dontDistribute super."commsec"; - "commsec-keyexchange" = dontDistribute super."commsec-keyexchange"; - "comonad" = doDistribute super."comonad_4_2_7_2"; - "comonad-extras" = dontDistribute super."comonad-extras"; - "comonad-random" = dontDistribute super."comonad-random"; - "compact-map" = dontDistribute super."compact-map"; - "compact-socket" = dontDistribute super."compact-socket"; - "compact-string" = dontDistribute super."compact-string"; - "compact-string-fix" = dontDistribute super."compact-string-fix"; - "compare-type" = dontDistribute super."compare-type"; - "compdata-automata" = dontDistribute super."compdata-automata"; - "compdata-dags" = dontDistribute super."compdata-dags"; - "compdata-param" = dontDistribute super."compdata-param"; - "compensated" = dontDistribute super."compensated"; - "competition" = dontDistribute super."competition"; - "compilation" = dontDistribute super."compilation"; - "complex-generic" = dontDistribute super."complex-generic"; - "complex-integrate" = dontDistribute super."complex-integrate"; - "complexity" = dontDistribute super."complexity"; - "compose-ltr" = dontDistribute super."compose-ltr"; - "compose-trans" = dontDistribute super."compose-trans"; - "compound-types" = dontDistribute super."compound-types"; - "compression" = dontDistribute super."compression"; - "compstrat" = dontDistribute super."compstrat"; - "comptrans" = dontDistribute super."comptrans"; - "computational-algebra" = dontDistribute super."computational-algebra"; - "computations" = dontDistribute super."computations"; - "concorde" = dontDistribute super."concorde"; - "concraft" = dontDistribute super."concraft"; - "concraft-hr" = dontDistribute super."concraft-hr"; - "concraft-pl" = dontDistribute super."concraft-pl"; - "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser"; - "concrete-typerep" = dontDistribute super."concrete-typerep"; - "concurrent-barrier" = dontDistribute super."concurrent-barrier"; - "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache"; - "concurrent-machines" = dontDistribute super."concurrent-machines"; - "concurrent-output" = doDistribute super."concurrent-output_1_7_6"; - "concurrent-rpc" = dontDistribute super."concurrent-rpc"; - "concurrent-sa" = dontDistribute super."concurrent-sa"; - "concurrent-split" = dontDistribute super."concurrent-split"; - "concurrent-state" = dontDistribute super."concurrent-state"; - "concurrent-utilities" = dontDistribute super."concurrent-utilities"; - "concurrentoutput" = dontDistribute super."concurrentoutput"; - "cond" = dontDistribute super."cond"; - "condor" = dontDistribute super."condor"; - "condorcet" = dontDistribute super."condorcet"; - "conductive-base" = dontDistribute super."conductive-base"; - "conductive-clock" = dontDistribute super."conductive-clock"; - "conductive-hsc3" = dontDistribute super."conductive-hsc3"; - "conductive-song" = dontDistribute super."conductive-song"; - "conduit" = doDistribute super."conduit_1_2_6_6"; - "conduit-audio" = dontDistribute super."conduit-audio"; - "conduit-audio-lame" = dontDistribute super."conduit-audio-lame"; - "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate"; - "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile"; - "conduit-combinators" = doDistribute super."conduit-combinators_1_0_4"; - "conduit-find" = dontDistribute super."conduit-find"; - "conduit-merge" = dontDistribute super."conduit-merge"; - "conduit-network-stream" = dontDistribute super."conduit-network-stream"; - "conduit-parse" = doDistribute super."conduit-parse_0_1_1_1"; - "conduit-resumablesink" = dontDistribute super."conduit-resumablesink"; - "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec"; - "conf" = dontDistribute super."conf"; - "conffmt" = dontDistribute super."conffmt"; - "config-manager" = dontDistribute super."config-manager"; - "config-select" = dontDistribute super."config-select"; - "config-value" = dontDistribute super."config-value"; - "config-value-getopt" = dontDistribute super."config-value-getopt"; - "configifier" = dontDistribute super."configifier"; - "configuration" = dontDistribute super."configuration"; - "confsolve" = dontDistribute super."confsolve"; - "congruence-relation" = dontDistribute super."congruence-relation"; - "conjugateGradient" = dontDistribute super."conjugateGradient"; - "conjure" = dontDistribute super."conjure"; - "conlogger" = dontDistribute super."conlogger"; - "connection" = doDistribute super."connection_0_2_5"; - "connection-pool" = dontDistribute super."connection-pool"; - "consistent" = dontDistribute super."consistent"; - "console-program" = dontDistribute super."console-program"; - "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin"; - "constrained-categories" = dontDistribute super."constrained-categories"; - "constrained-dynamic" = dontDistribute super."constrained-dynamic"; - "constrained-normal" = dontDistribute super."constrained-normal"; - "constraint-classes" = dontDistribute super."constraint-classes"; - "constructible" = dontDistribute super."constructible"; - "constructive-algebra" = dontDistribute super."constructive-algebra"; - "consumers" = dontDistribute super."consumers"; - "container" = dontDistribute super."container"; - "container-builder" = dontDistribute super."container-builder"; - "container-classes" = dontDistribute super."container-classes"; - "containers-benchmark" = dontDistribute super."containers-benchmark"; - "containers-deepseq" = dontDistribute super."containers-deepseq"; - "context-free-grammar" = dontDistribute super."context-free-grammar"; - "context-stack" = dontDistribute super."context-stack"; - "continue" = dontDistribute super."continue"; - "continuum" = dontDistribute super."continuum"; - "continuum-client" = dontDistribute super."continuum-client"; - "contravariant-extras" = doDistribute super."contravariant-extras_0_3_2"; - "control-event" = dontDistribute super."control-event"; - "control-monad-attempt" = dontDistribute super."control-monad-attempt"; - "control-monad-exception" = dontDistribute super."control-monad-exception"; - "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd"; - "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf"; - "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl"; - "control-monad-failure" = dontDistribute super."control-monad-failure"; - "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl"; - "control-monad-queue" = dontDistribute super."control-monad-queue"; - "control-timeout" = dontDistribute super."control-timeout"; - "contstuff" = dontDistribute super."contstuff"; - "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf"; - "contstuff-transformers" = dontDistribute super."contstuff-transformers"; - "conversion" = dontDistribute super."conversion"; - "conversion-bytestring" = dontDistribute super."conversion-bytestring"; - "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive"; - "conversion-text" = dontDistribute super."conversion-text"; - "convert" = dontDistribute super."convert"; - "convertible-ascii" = dontDistribute super."convertible-ascii"; - "convertible-text" = dontDistribute super."convertible-text"; - "cookbook" = dontDistribute super."cookbook"; - "coordinate" = dontDistribute super."coordinate"; - "copilot" = dontDistribute super."copilot"; - "copilot-c99" = dontDistribute super."copilot-c99"; - "copilot-cbmc" = dontDistribute super."copilot-cbmc"; - "copilot-core" = dontDistribute super."copilot-core"; - "copilot-language" = dontDistribute super."copilot-language"; - "copilot-libraries" = dontDistribute super."copilot-libraries"; - "copilot-sbv" = dontDistribute super."copilot-sbv"; - "copilot-theorem" = dontDistribute super."copilot-theorem"; - "copr" = dontDistribute super."copr"; - "core" = dontDistribute super."core"; - "core-compiler" = dontDistribute super."core-compiler"; - "core-haskell" = dontDistribute super."core-haskell"; - "corebot-bliki" = dontDistribute super."corebot-bliki"; - "coroutine-enumerator" = dontDistribute super."coroutine-enumerator"; - "coroutine-iteratee" = dontDistribute super."coroutine-iteratee"; - "coroutine-object" = dontDistribute super."coroutine-object"; - "couch-hs" = dontDistribute super."couch-hs"; - "couch-simple" = dontDistribute super."couch-simple"; - "couchdb-conduit" = dontDistribute super."couchdb-conduit"; - "couchdb-enumerator" = dontDistribute super."couchdb-enumerator"; - "count" = dontDistribute super."count"; - "countable" = dontDistribute super."countable"; - "counter" = dontDistribute super."counter"; - "courier" = doDistribute super."courier_0_1_1_3"; - "court" = dontDistribute super."court"; - "coverage" = dontDistribute super."coverage"; - "cpio-conduit" = dontDistribute super."cpio-conduit"; - "cplex-hs" = dontDistribute super."cplex-hs"; - "cplusplus-th" = dontDistribute super."cplusplus-th"; - "cpphs" = doDistribute super."cpphs_1_20_1"; - "cprng-aes-effect" = dontDistribute super."cprng-aes-effect"; - "cpsa" = dontDistribute super."cpsa"; - "cpuid" = dontDistribute super."cpuid"; - "cpuinfo" = dontDistribute super."cpuinfo"; - "cpuperf" = dontDistribute super."cpuperf"; - "cpython" = dontDistribute super."cpython"; - "cql" = doDistribute super."cql_3_0_7"; - "cql-io" = doDistribute super."cql-io_0_15_2"; - "cqrs" = dontDistribute super."cqrs"; - "cqrs-core" = dontDistribute super."cqrs-core"; - "cqrs-example" = dontDistribute super."cqrs-example"; - "cqrs-memory" = dontDistribute super."cqrs-memory"; - "cqrs-postgresql" = dontDistribute super."cqrs-postgresql"; - "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3"; - "cqrs-test" = dontDistribute super."cqrs-test"; - "cqrs-testkit" = dontDistribute super."cqrs-testkit"; - "cqrs-types" = dontDistribute super."cqrs-types"; - "cr" = dontDistribute super."cr"; - "crack" = dontDistribute super."crack"; - "craftwerk" = dontDistribute super."craftwerk"; - "craftwerk-cairo" = dontDistribute super."craftwerk-cairo"; - "craftwerk-gtk" = dontDistribute super."craftwerk-gtk"; - "crawlchain" = dontDistribute super."crawlchain"; - "craze" = dontDistribute super."craze"; - "crc" = dontDistribute super."crc"; - "crc16" = dontDistribute super."crc16"; - "crc16-table" = dontDistribute super."crc16-table"; - "creatur" = dontDistribute super."creatur"; - "credentials" = dontDistribute super."credentials"; - "credentials-cli" = dontDistribute super."credentials-cli"; - "crf-chain1" = dontDistribute super."crf-chain1"; - "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained"; - "crf-chain2-generic" = dontDistribute super."crf-chain2-generic"; - "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers"; - "critbit" = dontDistribute super."critbit"; - "criterion-plus" = dontDistribute super."criterion-plus"; - "criterion-to-html" = dontDistribute super."criterion-to-html"; - "crockford" = dontDistribute super."crockford"; - "crocodile" = dontDistribute super."crocodile"; - "cron-compat" = dontDistribute super."cron-compat"; - "cruncher-types" = dontDistribute super."cruncher-types"; - "crunghc" = dontDistribute super."crunghc"; - "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks"; - "crypto-classical" = dontDistribute super."crypto-classical"; - "crypto-conduit" = dontDistribute super."crypto-conduit"; - "crypto-enigma" = dontDistribute super."crypto-enigma"; - "crypto-multihash" = dontDistribute super."crypto-multihash"; - "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh"; - "crypto-random-effect" = dontDistribute super."crypto-random-effect"; - "crypto-totp" = dontDistribute super."crypto-totp"; - "cryptohash-md5" = dontDistribute super."cryptohash-md5"; - "cryptohash-sha1" = dontDistribute super."cryptohash-sha1"; - "cryptohash-sha256" = dontDistribute super."cryptohash-sha256"; - "cryptol" = doDistribute super."cryptol_2_3_0"; - "cryptonite" = doDistribute super."cryptonite_0_15"; - "cryptonite-openssl" = dontDistribute super."cryptonite-openssl"; - "cryptsy-api" = dontDistribute super."cryptsy-api"; - "crystalfontz" = dontDistribute super."crystalfontz"; - "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin"; - "csound-catalog" = dontDistribute super."csound-catalog"; - "csound-expression" = dontDistribute super."csound-expression"; - "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic"; - "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes"; - "csound-expression-typed" = dontDistribute super."csound-expression-typed"; - "csound-sampler" = dontDistribute super."csound-sampler"; - "csp" = dontDistribute super."csp"; - "cspmchecker" = dontDistribute super."cspmchecker"; - "css" = dontDistribute super."css"; - "css-text" = doDistribute super."css-text_0_1_2_1"; - "csv-enumerator" = dontDistribute super."csv-enumerator"; - "csv-nptools" = dontDistribute super."csv-nptools"; - "csv-table" = dontDistribute super."csv-table"; - "csv-to-qif" = dontDistribute super."csv-to-qif"; - "ctemplate" = dontDistribute super."ctemplate"; - "ctkl" = dontDistribute super."ctkl"; - "ctpl" = dontDistribute super."ctpl"; - "cube" = dontDistribute super."cube"; - "cubical" = dontDistribute super."cubical"; - "cubicbezier" = dontDistribute super."cubicbezier"; - "cublas" = dontDistribute super."cublas"; - "cuboid" = dontDistribute super."cuboid"; - "cuda" = dontDistribute super."cuda"; - "cudd" = dontDistribute super."cudd"; - "cufft" = dontDistribute super."cufft"; - "curl-aeson" = dontDistribute super."curl-aeson"; - "curlhs" = dontDistribute super."curlhs"; - "currency" = dontDistribute super."currency"; - "currency-convert" = dontDistribute super."currency-convert"; - "current-locale" = dontDistribute super."current-locale"; - "curry-base" = dontDistribute super."curry-base"; - "curry-frontend" = dontDistribute super."curry-frontend"; - "cursedcsv" = dontDistribute super."cursedcsv"; - "curve25519" = dontDistribute super."curve25519"; - "curves" = dontDistribute super."curves"; - "custom-prelude" = dontDistribute super."custom-prelude"; - "cv-combinators" = dontDistribute super."cv-combinators"; - "cyclotomic" = dontDistribute super."cyclotomic"; - "cypher" = dontDistribute super."cypher"; - "d-bus" = dontDistribute super."d-bus"; - "d3d11binding" = dontDistribute super."d3d11binding"; - "d3js" = dontDistribute super."d3js"; - "daemonize-doublefork" = dontDistribute super."daemonize-doublefork"; - "daemons" = dontDistribute super."daemons"; - "dag" = dontDistribute super."dag"; - "damnpacket" = dontDistribute super."damnpacket"; - "danibot" = dontDistribute super."danibot"; - "dao" = dontDistribute super."dao"; - "dapi" = dontDistribute super."dapi"; - "darcs" = doDistribute super."darcs_2_12_0"; - "darcs-benchmark" = dontDistribute super."darcs-benchmark"; - "darcs-beta" = dontDistribute super."darcs-beta"; - "darcs-buildpackage" = dontDistribute super."darcs-buildpackage"; - "darcs-cabalized" = dontDistribute super."darcs-cabalized"; - "darcs-fastconvert" = dontDistribute super."darcs-fastconvert"; - "darcs-graph" = dontDistribute super."darcs-graph"; - "darcs-monitor" = dontDistribute super."darcs-monitor"; - "darcs-scripts" = dontDistribute super."darcs-scripts"; - "darcs2dot" = dontDistribute super."darcs2dot"; - "darcsden" = dontDistribute super."darcsden"; - "darcswatch" = dontDistribute super."darcswatch"; - "darkplaces-demo" = dontDistribute super."darkplaces-demo"; - "darkplaces-rcon" = dontDistribute super."darkplaces-rcon"; - "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util"; - "darkplaces-text" = dontDistribute super."darkplaces-text"; - "dash-haskell" = dontDistribute super."dash-haskell"; - "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib"; - "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd"; - "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf"; - "data-accessor-template" = dontDistribute super."data-accessor-template"; - "data-accessor-transformers" = dontDistribute super."data-accessor-transformers"; - "data-aviary" = dontDistribute super."data-aviary"; - "data-base" = dontDistribute super."data-base"; - "data-bword" = dontDistribute super."data-bword"; - "data-carousel" = dontDistribute super."data-carousel"; - "data-category" = dontDistribute super."data-category"; - "data-cell" = dontDistribute super."data-cell"; - "data-check" = dontDistribute super."data-check"; - "data-checked" = dontDistribute super."data-checked"; - "data-clist" = dontDistribute super."data-clist"; - "data-concurrent-queue" = dontDistribute super."data-concurrent-queue"; - "data-construction" = dontDistribute super."data-construction"; - "data-cycle" = dontDistribute super."data-cycle"; - "data-default" = doDistribute super."data-default_0_5_3"; - "data-default-class" = doDistribute super."data-default-class_0_0_1"; - "data-default-extra" = dontDistribute super."data-default-extra"; - "data-default-generics" = dontDistribute super."data-default-generics"; - "data-default-instances-base" = doDistribute super."data-default-instances-base_0_1_0"; - "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring"; - "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive"; - "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base"; - "data-default-instances-text" = dontDistribute super."data-default-instances-text"; - "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers"; - "data-default-instances-vector" = dontDistribute super."data-default-instances-vector"; - "data-dispersal" = dontDistribute super."data-dispersal"; - "data-dword" = dontDistribute super."data-dword"; - "data-easy" = dontDistribute super."data-easy"; - "data-elf" = dontDistribute super."data-elf"; - "data-embed" = dontDistribute super."data-embed"; - "data-endian" = dontDistribute super."data-endian"; - "data-extend-generic" = dontDistribute super."data-extend-generic"; - "data-extra" = dontDistribute super."data-extra"; - "data-filepath" = dontDistribute super."data-filepath"; - "data-files-gen" = dontDistribute super."data-files-gen"; - "data-fin" = dontDistribute super."data-fin"; - "data-fin-simple" = dontDistribute super."data-fin-simple"; - "data-fix" = dontDistribute super."data-fix"; - "data-fix-cse" = dontDistribute super."data-fix-cse"; - "data-flags" = dontDistribute super."data-flags"; - "data-flagset" = dontDistribute super."data-flagset"; - "data-fresh" = dontDistribute super."data-fresh"; - "data-function-meld" = dontDistribute super."data-function-meld"; - "data-function-tacit" = dontDistribute super."data-function-tacit"; - "data-interval" = dontDistribute super."data-interval"; - "data-ivar" = dontDistribute super."data-ivar"; - "data-json-token" = dontDistribute super."data-json-token"; - "data-kiln" = dontDistribute super."data-kiln"; - "data-layer" = dontDistribute super."data-layer"; - "data-layout" = dontDistribute super."data-layout"; - "data-lens" = dontDistribute super."data-lens"; - "data-lens-fd" = dontDistribute super."data-lens-fd"; - "data-lens-ixset" = dontDistribute super."data-lens-ixset"; - "data-lens-template" = dontDistribute super."data-lens-template"; - "data-list-sequences" = dontDistribute super."data-list-sequences"; - "data-map-multikey" = dontDistribute super."data-map-multikey"; - "data-msgpack" = dontDistribute super."data-msgpack"; - "data-named" = dontDistribute super."data-named"; - "data-nat" = dontDistribute super."data-nat"; - "data-object" = dontDistribute super."data-object"; - "data-object-json" = dontDistribute super."data-object-json"; - "data-object-yaml" = dontDistribute super."data-object-yaml"; - "data-partition" = dontDistribute super."data-partition"; - "data-pprint" = dontDistribute super."data-pprint"; - "data-quotientref" = dontDistribute super."data-quotientref"; - "data-r-tree" = dontDistribute super."data-r-tree"; - "data-ref" = dontDistribute super."data-ref"; - "data-reify-cse" = dontDistribute super."data-reify-cse"; - "data-repr" = dontDistribute super."data-repr"; - "data-result" = dontDistribute super."data-result"; - "data-rev" = dontDistribute super."data-rev"; - "data-rope" = dontDistribute super."data-rope"; - "data-rtuple" = dontDistribute super."data-rtuple"; - "data-serializer" = dontDistribute super."data-serializer"; - "data-size" = dontDistribute super."data-size"; - "data-spacepart" = dontDistribute super."data-spacepart"; - "data-store" = dontDistribute super."data-store"; - "data-stringmap" = dontDistribute super."data-stringmap"; - "data-structure-inferrer" = dontDistribute super."data-structure-inferrer"; - "data-sword" = dontDistribute super."data-sword"; - "data-tensor" = dontDistribute super."data-tensor"; - "data-textual" = dontDistribute super."data-textual"; - "data-timeout" = dontDistribute super."data-timeout"; - "data-transform" = dontDistribute super."data-transform"; - "data-treify" = dontDistribute super."data-treify"; - "data-type" = dontDistribute super."data-type"; - "data-util" = dontDistribute super."data-util"; - "data-variant" = dontDistribute super."data-variant"; - "database-migrate" = dontDistribute super."database-migrate"; - "database-study" = dontDistribute super."database-study"; - "datadog" = dontDistribute super."datadog"; - "dataenc" = dontDistribute super."dataenc"; - "dataflow" = dontDistribute super."dataflow"; - "datalog" = dontDistribute super."datalog"; - "datapacker" = dontDistribute super."datapacker"; - "date-cache" = dontDistribute super."date-cache"; - "dates" = dontDistribute super."dates"; - "datetime" = dontDistribute super."datetime"; - "datetime-sb" = dontDistribute super."datetime-sb"; - "dawdle" = dontDistribute super."dawdle"; - "dawg" = dontDistribute super."dawg"; - "dawg-ord" = doDistribute super."dawg-ord_0_5_0_1"; - "dbcleaner" = dontDistribute super."dbcleaner"; - "dbf" = dontDistribute super."dbf"; - "dbjava" = dontDistribute super."dbjava"; - "dbm" = dontDistribute super."dbm"; - "dbus-client" = dontDistribute super."dbus-client"; - "dbus-core" = dontDistribute super."dbus-core"; - "dbus-qq" = dontDistribute super."dbus-qq"; - "dbus-th" = dontDistribute super."dbus-th"; - "dbus-th-introspection" = dontDistribute super."dbus-th-introspection"; - "dclabel" = dontDistribute super."dclabel"; - "dclabel-eci11" = dontDistribute super."dclabel-eci11"; - "ddate" = dontDistribute super."ddate"; - "ddc-base" = dontDistribute super."ddc-base"; - "ddc-build" = dontDistribute super."ddc-build"; - "ddc-code" = dontDistribute super."ddc-code"; - "ddc-core" = dontDistribute super."ddc-core"; - "ddc-core-babel" = dontDistribute super."ddc-core-babel"; - "ddc-core-eval" = dontDistribute super."ddc-core-eval"; - "ddc-core-flow" = dontDistribute super."ddc-core-flow"; - "ddc-core-llvm" = dontDistribute super."ddc-core-llvm"; - "ddc-core-salt" = dontDistribute super."ddc-core-salt"; - "ddc-core-simpl" = dontDistribute super."ddc-core-simpl"; - "ddc-core-tetra" = dontDistribute super."ddc-core-tetra"; - "ddc-driver" = dontDistribute super."ddc-driver"; - "ddc-interface" = dontDistribute super."ddc-interface"; - "ddc-source-tetra" = dontDistribute super."ddc-source-tetra"; - "ddc-tools" = dontDistribute super."ddc-tools"; - "ddc-war" = dontDistribute super."ddc-war"; - "ddci-core" = dontDistribute super."ddci-core"; - "dead-code-detection" = dontDistribute super."dead-code-detection"; - "dead-simple-json" = dontDistribute super."dead-simple-json"; - "debian-binary" = dontDistribute super."debian-binary"; - "debian-build" = doDistribute super."debian-build_0_9_2_0"; - "debug-diff" = dontDistribute super."debug-diff"; - "debug-time" = dontDistribute super."debug-time"; - "decepticons" = dontDistribute super."decepticons"; - "decimal-arithmetic" = dontDistribute super."decimal-arithmetic"; - "decode-utf8" = dontDistribute super."decode-utf8"; - "decoder-conduit" = dontDistribute super."decoder-conduit"; - "dedukti" = dontDistribute super."dedukti"; - "deepcontrol" = dontDistribute super."deepcontrol"; - "deeplearning-hs" = dontDistribute super."deeplearning-hs"; - "deepseq-bounded" = dontDistribute super."deepseq-bounded"; - "deepseq-generics" = doDistribute super."deepseq-generics_0_1_1_2"; - "deepseq-magic" = dontDistribute super."deepseq-magic"; - "deepseq-th" = dontDistribute super."deepseq-th"; - "deepzoom" = dontDistribute super."deepzoom"; - "defargs" = dontDistribute super."defargs"; - "definitive-base" = dontDistribute super."definitive-base"; - "definitive-filesystem" = dontDistribute super."definitive-filesystem"; - "definitive-graphics" = dontDistribute super."definitive-graphics"; - "definitive-parser" = dontDistribute super."definitive-parser"; - "definitive-reactive" = dontDistribute super."definitive-reactive"; - "definitive-sound" = dontDistribute super."definitive-sound"; - "deiko-config" = dontDistribute super."deiko-config"; - "deka" = dontDistribute super."deka"; - "deka-tests" = dontDistribute super."deka-tests"; - "delaunay" = dontDistribute super."delaunay"; - "delay" = dontDistribute super."delay"; - "delicious" = dontDistribute super."delicious"; - "delimited-text" = dontDistribute super."delimited-text"; - "delimiter-separated" = dontDistribute super."delimiter-separated"; - "delta" = dontDistribute super."delta"; - "delta-h" = dontDistribute super."delta-h"; - "delude" = dontDistribute super."delude"; - "demarcate" = dontDistribute super."demarcate"; - "denominate" = dontDistribute super."denominate"; - "dense" = dontDistribute super."dense"; - "dependent-map" = doDistribute super."dependent-map_0_2_2_0"; - "dependent-state" = dontDistribute super."dependent-state"; - "depends" = dontDistribute super."depends"; - "dephd" = dontDistribute super."dephd"; - "deque" = dontDistribute super."deque"; - "dequeue" = dontDistribute super."dequeue"; - "derangement" = dontDistribute super."derangement"; - "derivation-trees" = dontDistribute super."derivation-trees"; - "derive-IG" = dontDistribute super."derive-IG"; - "derive-enumerable" = dontDistribute super."derive-enumerable"; - "derive-gadt" = dontDistribute super."derive-gadt"; - "derive-monoid" = dontDistribute super."derive-monoid"; - "derive-topdown" = dontDistribute super."derive-topdown"; - "derive-trie" = dontDistribute super."derive-trie"; - "deriving-compat" = doDistribute super."deriving-compat_0_2"; - "derp" = dontDistribute super."derp"; - "derp-lib" = dontDistribute super."derp-lib"; - "descrilo" = dontDistribute super."descrilo"; - "desert" = dontDistribute super."desert"; - "despair" = dontDistribute super."despair"; - "deterministic-game-engine" = dontDistribute super."deterministic-game-engine"; - "detrospector" = dontDistribute super."detrospector"; - "deunicode" = dontDistribute super."deunicode"; - "devil" = dontDistribute super."devil"; - "dewdrop" = dontDistribute super."dewdrop"; - "dfrac" = dontDistribute super."dfrac"; - "dfsbuild" = dontDistribute super."dfsbuild"; - "dgim" = dontDistribute super."dgim"; - "dgs" = dontDistribute super."dgs"; - "dia-base" = dontDistribute super."dia-base"; - "dia-functions" = dontDistribute super."dia-functions"; - "diagrams-boolean" = dontDistribute super."diagrams-boolean"; - "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_3"; - "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_1"; - "diagrams-canvas" = doDistribute super."diagrams-canvas_1_3_0_5"; - "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_11"; - "diagrams-graphviz" = dontDistribute super."diagrams-graphviz"; - "diagrams-hsqml" = dontDistribute super."diagrams-hsqml"; - "diagrams-html5" = doDistribute super."diagrams-html5_1_3_0_6"; - "diagrams-lib" = doDistribute super."diagrams-lib_1_3_1_3"; - "diagrams-pandoc" = dontDistribute super."diagrams-pandoc"; - "diagrams-pdf" = dontDistribute super."diagrams-pdf"; - "diagrams-pgf" = dontDistribute super."diagrams-pgf"; - "diagrams-qrcode" = dontDistribute super."diagrams-qrcode"; - "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_7"; - "diagrams-reflex" = dontDistribute super."diagrams-reflex"; - "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube"; - "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_10"; - "diagrams-tikz" = dontDistribute super."diagrams-tikz"; - "diagrams-wx" = dontDistribute super."diagrams-wx"; - "dialog" = dontDistribute super."dialog"; - "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit"; - "dicom" = dontDistribute super."dicom"; - "dictionary-sharing" = dontDistribute super."dictionary-sharing"; - "dictparser" = dontDistribute super."dictparser"; - "diet" = dontDistribute super."diet"; - "diff-gestalt" = dontDistribute super."diff-gestalt"; - "diff-parse" = dontDistribute super."diff-parse"; - "diffarray" = dontDistribute super."diffarray"; - "diffcabal" = dontDistribute super."diffcabal"; - "diffdump" = dontDistribute super."diffdump"; - "difftodo" = dontDistribute super."difftodo"; - "digamma" = dontDistribute super."digamma"; - "digest-pure" = dontDistribute super."digest-pure"; - "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid"; - "digestive-functors" = doDistribute super."digestive-functors_0_8_0_1"; - "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack"; - "digestive-functors-heist" = dontDistribute super."digestive-functors-heist"; - "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp"; - "digestive-functors-lucid" = doDistribute super."digestive-functors-lucid_0_0_0_3"; - "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty"; - "digestive-functors-snap" = dontDistribute super."digestive-functors-snap"; - "digit" = dontDistribute super."digit"; - "digitalocean-kzs" = dontDistribute super."digitalocean-kzs"; - "digits" = doDistribute super."digits_0_2"; - "dimensional-codata" = dontDistribute super."dimensional-codata"; - "dimensional-tf" = dontDistribute super."dimensional-tf"; - "dingo-core" = dontDistribute super."dingo-core"; - "dingo-example" = dontDistribute super."dingo-example"; - "dingo-widgets" = dontDistribute super."dingo-widgets"; - "diophantine" = dontDistribute super."diophantine"; - "diplomacy" = dontDistribute super."diplomacy"; - "diplomacy-server" = dontDistribute super."diplomacy-server"; - "direct-binary-files" = dontDistribute super."direct-binary-files"; - "direct-daemonize" = dontDistribute super."direct-daemonize"; - "direct-fastcgi" = dontDistribute super."direct-fastcgi"; - "direct-http" = dontDistribute super."direct-http"; - "direct-murmur-hash" = dontDistribute super."direct-murmur-hash"; - "direct-plugins" = dontDistribute super."direct-plugins"; - "directed-cubical" = dontDistribute super."directed-cubical"; - "directory-layout" = dontDistribute super."directory-layout"; - "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser"; - "directory-tree" = doDistribute super."directory-tree_0_12_0"; - "dirfiles" = dontDistribute super."dirfiles"; - "dirstream" = dontDistribute super."dirstream"; - "disassembler" = dontDistribute super."disassembler"; - "discogs-haskell" = dontDistribute super."discogs-haskell"; - "discordian-calendar" = dontDistribute super."discordian-calendar"; - "discrete-space-map" = dontDistribute super."discrete-space-map"; - "discrimination" = dontDistribute super."discrimination"; - "disjoint-set" = dontDistribute super."disjoint-set"; - "disjoint-sets-st" = dontDistribute super."disjoint-sets-st"; - "dist-upload" = dontDistribute super."dist-upload"; - "distributed-process-azure" = dontDistribute super."distributed-process-azure"; - "distributed-process-ekg" = dontDistribute super."distributed-process-ekg"; - "distributed-process-lifted" = dontDistribute super."distributed-process-lifted"; - "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control"; - "distributed-process-p2p" = dontDistribute super."distributed-process-p2p"; - "distributed-process-platform" = dontDistribute super."distributed-process-platform"; - "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper"; - "distribution" = dontDistribute super."distribution"; - "distribution-nixpkgs" = dontDistribute super."distribution-nixpkgs"; - "distribution-plot" = dontDistribute super."distribution-plot"; - "djembe" = dontDistribute super."djembe"; - "djinn" = dontDistribute super."djinn"; - "djinn-th" = dontDistribute super."djinn-th"; - "dlist" = doDistribute super."dlist_0_7_1_2"; - "dns" = doDistribute super."dns_2_0_4"; - "dnscache" = dontDistribute super."dnscache"; - "dnsrbl" = dontDistribute super."dnsrbl"; - "dnssd" = dontDistribute super."dnssd"; - "do-list" = dontDistribute super."do-list"; - "doc-review" = dontDistribute super."doc-review"; - "doccheck" = dontDistribute super."doccheck"; - "docidx" = dontDistribute super."docidx"; - "docker" = dontDistribute super."docker"; - "dockercook" = dontDistribute super."dockercook"; - "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator"; - "doctest-prop" = dontDistribute super."doctest-prop"; - "docvim" = dontDistribute super."docvim"; - "dom-lt" = dontDistribute super."dom-lt"; - "dom-parser" = dontDistribute super."dom-parser"; - "dom-selector" = dontDistribute super."dom-selector"; - "domain-auth" = dontDistribute super."domain-auth"; - "dominion" = dontDistribute super."dominion"; - "domplate" = dontDistribute super."domplate"; - "dot" = dontDistribute super."dot"; - "dot-linker" = dontDistribute super."dot-linker"; - "dot2graphml" = dontDistribute super."dot2graphml"; - "dotenv" = doDistribute super."dotenv_0_3_0_1"; - "dotfs" = dontDistribute super."dotfs"; - "dotgen" = dontDistribute super."dotgen"; - "double-metaphone" = dontDistribute super."double-metaphone"; - "dove" = dontDistribute super."dove"; - "dow" = dontDistribute super."dow"; - "download-curl" = dontDistribute super."download-curl"; - "download-media-content" = dontDistribute super."download-media-content"; - "dozenal" = dontDistribute super."dozenal"; - "dozens" = dontDistribute super."dozens"; - "dph-base" = dontDistribute super."dph-base"; - "dph-examples" = dontDistribute super."dph-examples"; - "dph-lifted-base" = dontDistribute super."dph-lifted-base"; - "dph-lifted-copy" = dontDistribute super."dph-lifted-copy"; - "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg"; - "dph-par" = dontDistribute super."dph-par"; - "dph-prim-interface" = dontDistribute super."dph-prim-interface"; - "dph-prim-par" = dontDistribute super."dph-prim-par"; - "dph-prim-seq" = dontDistribute super."dph-prim-seq"; - "dph-seq" = dontDistribute super."dph-seq"; - "dpkg" = dontDistribute super."dpkg"; - "dpor" = doDistribute super."dpor_0_1_0_1"; - "drClickOn" = dontDistribute super."drClickOn"; - "draw-poker" = dontDistribute super."draw-poker"; - "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe"; - "drmaa" = dontDistribute super."drmaa"; - "dropbox-sdk" = dontDistribute super."dropbox-sdk"; - "dropsolve" = dontDistribute super."dropsolve"; - "ds-kanren" = dontDistribute super."ds-kanren"; - "dsh-sql" = dontDistribute super."dsh-sql"; - "dsmc" = dontDistribute super."dsmc"; - "dsmc-tools" = dontDistribute super."dsmc-tools"; - "dson" = dontDistribute super."dson"; - "dson-parsec" = dontDistribute super."dson-parsec"; - "dsp" = dontDistribute super."dsp"; - "dstring" = dontDistribute super."dstring"; - "dtab" = dontDistribute super."dtab"; - "dtd" = dontDistribute super."dtd"; - "dtd-text" = dontDistribute super."dtd-text"; - "dtd-types" = dontDistribute super."dtd-types"; - "dtrace" = dontDistribute super."dtrace"; - "dtw" = dontDistribute super."dtw"; - "dump" = dontDistribute super."dump"; - "dunai" = dontDistribute super."dunai"; - "duplo" = dontDistribute super."duplo"; - "dustme" = dontDistribute super."dustme"; - "dvda" = dontDistribute super."dvda"; - "dvdread" = dontDistribute super."dvdread"; - "dvi-processing" = dontDistribute super."dvi-processing"; - "dvorak" = dontDistribute super."dvorak"; - "dwarf" = dontDistribute super."dwarf"; - "dwarf-el" = dontDistribute super."dwarf-el"; - "dwarfadt" = dontDistribute super."dwarfadt"; - "dx9base" = dontDistribute super."dx9base"; - "dx9d3d" = dontDistribute super."dx9d3d"; - "dx9d3dx" = dontDistribute super."dx9d3dx"; - "dynamic-cabal" = dontDistribute super."dynamic-cabal"; - "dynamic-graph" = dontDistribute super."dynamic-graph"; - "dynamic-linker-template" = dontDistribute super."dynamic-linker-template"; - "dynamic-loader" = dontDistribute super."dynamic-loader"; - "dynamic-mvector" = dontDistribute super."dynamic-mvector"; - "dynamic-object" = dontDistribute super."dynamic-object"; - "dynamic-plot" = dontDistribute super."dynamic-plot"; - "dynamic-pp" = dontDistribute super."dynamic-pp"; - "dynobud" = dontDistribute super."dynobud"; - "dywapitchtrack" = dontDistribute super."dywapitchtrack"; - "dzen-utils" = dontDistribute super."dzen-utils"; - "eager-sockets" = dontDistribute super."eager-sockets"; - "easy-api" = dontDistribute super."easy-api"; - "easy-bitcoin" = dontDistribute super."easy-bitcoin"; - "easyjson" = dontDistribute super."easyjson"; - "easyplot" = dontDistribute super."easyplot"; - "easyrender" = dontDistribute super."easyrender"; - "ebeats" = dontDistribute super."ebeats"; - "ebnf-bff" = dontDistribute super."ebnf-bff"; - "ec2-signature" = dontDistribute super."ec2-signature"; - "ec2-unikernel" = dontDistribute super."ec2-unikernel"; - "eccrypto" = dontDistribute super."eccrypto"; - "ecdsa" = dontDistribute super."ecdsa"; - "ecma262" = dontDistribute super."ecma262"; - "ecu" = dontDistribute super."ecu"; - "ed25519" = dontDistribute super."ed25519"; - "ed25519-donna" = dontDistribute super."ed25519-donna"; - "eddie" = dontDistribute super."eddie"; - "ede" = doDistribute super."ede_0_2_8_4"; - "edenmodules" = dontDistribute super."edenmodules"; - "edenskel" = dontDistribute super."edenskel"; - "edentv" = dontDistribute super."edentv"; - "edge" = dontDistribute super."edge"; - "edis" = dontDistribute super."edis"; - "edit-lenses" = dontDistribute super."edit-lenses"; - "edit-lenses-demo" = dontDistribute super."edit-lenses-demo"; - "editable" = dontDistribute super."editable"; - "editline" = dontDistribute super."editline"; - "editpipe" = dontDistribute super."editpipe"; - "effect-monad" = dontDistribute super."effect-monad"; - "effective-aspects" = dontDistribute super."effective-aspects"; - "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv"; - "effects" = dontDistribute super."effects"; - "effects-parser" = dontDistribute super."effects-parser"; - "effin" = dontDistribute super."effin"; - "egison" = dontDistribute super."egison"; - "egison-quote" = dontDistribute super."egison-quote"; - "egison-tutorial" = dontDistribute super."egison-tutorial"; - "ehaskell" = dontDistribute super."ehaskell"; - "ehs" = dontDistribute super."ehs"; - "eibd-client-simple" = dontDistribute super."eibd-client-simple"; - "eigen" = dontDistribute super."eigen"; - "eithers" = dontDistribute super."eithers"; - "ekg-bosun" = dontDistribute super."ekg-bosun"; - "ekg-carbon" = dontDistribute super."ekg-carbon"; - "ekg-log" = dontDistribute super."ekg-log"; - "ekg-push" = dontDistribute super."ekg-push"; - "ekg-rrd" = dontDistribute super."ekg-rrd"; - "ekg-statsd" = doDistribute super."ekg-statsd_0_2_0_4"; - "electrum-mnemonic" = dontDistribute super."electrum-mnemonic"; - "elerea" = dontDistribute super."elerea"; - "elerea-examples" = dontDistribute super."elerea-examples"; - "elerea-sdl" = dontDistribute super."elerea-sdl"; - "elevator" = dontDistribute super."elevator"; - "elf" = dontDistribute super."elf"; - "elision" = dontDistribute super."elision"; - "elm-build-lib" = dontDistribute super."elm-build-lib"; - "elm-compiler" = dontDistribute super."elm-compiler"; - "elm-export" = dontDistribute super."elm-export"; - "elm-get" = dontDistribute super."elm-get"; - "elm-hybrid" = dontDistribute super."elm-hybrid"; - "elm-init" = dontDistribute super."elm-init"; - "elm-make" = dontDistribute super."elm-make"; - "elm-package" = dontDistribute super."elm-package"; - "elm-reactor" = dontDistribute super."elm-reactor"; - "elm-repl" = dontDistribute super."elm-repl"; - "elm-server" = dontDistribute super."elm-server"; - "elm-yesod" = dontDistribute super."elm-yesod"; - "elo" = dontDistribute super."elo"; - "elocrypt" = dontDistribute super."elocrypt"; - "emacs-keys" = dontDistribute super."emacs-keys"; - "email" = dontDistribute super."email"; - "email-header" = dontDistribute super."email-header"; - "email-postmark" = dontDistribute super."email-postmark"; - "email-validate-json" = dontDistribute super."email-validate-json"; - "email-validator" = dontDistribute super."email-validator"; - "emailaddress" = dontDistribute super."emailaddress"; - "emailparse" = dontDistribute super."emailparse"; - "embeddock" = dontDistribute super."embeddock"; - "embeddock-example" = dontDistribute super."embeddock-example"; - "embroidery" = dontDistribute super."embroidery"; - "emgm" = dontDistribute super."emgm"; - "empty" = dontDistribute super."empty"; - "enchant" = dontDistribute super."enchant"; - "encoding" = dontDistribute super."encoding"; - "encoding-io" = dontDistribute super."encoding-io"; - "endo" = dontDistribute super."endo"; - "engine-io-growler" = dontDistribute super."engine-io-growler"; - "engine-io-snap" = dontDistribute super."engine-io-snap"; - "engineering-units" = dontDistribute super."engineering-units"; - "enumerable" = dontDistribute super."enumerable"; - "enumerate" = dontDistribute super."enumerate"; - "enumeration" = dontDistribute super."enumeration"; - "enumerator-fd" = dontDistribute super."enumerator-fd"; - "enumerator-tf" = dontDistribute super."enumerator-tf"; - "enumfun" = dontDistribute super."enumfun"; - "enummapmap" = dontDistribute super."enummapmap"; - "enummapset" = dontDistribute super."enummapset"; - "enummapset-th" = dontDistribute super."enummapset-th"; - "enumset" = dontDistribute super."enumset"; - "env-locale" = dontDistribute super."env-locale"; - "env-parser" = dontDistribute super."env-parser"; - "envparse" = dontDistribute super."envparse"; - "envy" = doDistribute super."envy_1_1_0_0"; - "epanet-haskell" = dontDistribute super."epanet-haskell"; - "epass" = dontDistribute super."epass"; - "epic" = dontDistribute super."epic"; - "epoll" = dontDistribute super."epoll"; - "eprocess" = dontDistribute super."eprocess"; - "epub" = dontDistribute super."epub"; - "epub-metadata" = dontDistribute super."epub-metadata"; - "epub-tools" = dontDistribute super."epub-tools"; - "epubname" = dontDistribute super."epubname"; - "equal-files" = dontDistribute super."equal-files"; - "equational-reasoning" = dontDistribute super."equational-reasoning"; - "erd" = dontDistribute super."erd"; - "erf-native" = dontDistribute super."erf-native"; - "erlang" = dontDistribute super."erlang"; - "eros" = dontDistribute super."eros"; - "eros-client" = dontDistribute super."eros-client"; - "eros-http" = dontDistribute super."eros-http"; - "errno" = dontDistribute super."errno"; - "error-analyze" = dontDistribute super."error-analyze"; - "error-continuations" = dontDistribute super."error-continuations"; - "error-list" = dontDistribute super."error-list"; - "error-loc" = dontDistribute super."error-loc"; - "error-location" = dontDistribute super."error-location"; - "error-message" = dontDistribute super."error-message"; - "error-util" = dontDistribute super."error-util"; - "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance"; - "ersatz" = dontDistribute super."ersatz"; - "ersatz-toysat" = dontDistribute super."ersatz-toysat"; - "ert" = dontDistribute super."ert"; - "esotericbot" = dontDistribute super."esotericbot"; - "ess" = dontDistribute super."ess"; - "estimator" = dontDistribute super."estimator"; - "estimators" = dontDistribute super."estimators"; - "estreps" = dontDistribute super."estreps"; - "eternal" = dontDistribute super."eternal"; - "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell"; - "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db"; - "ethereum-rlp" = dontDistribute super."ethereum-rlp"; - "ety" = dontDistribute super."ety"; - "euler" = dontDistribute super."euler"; - "euphoria" = dontDistribute super."euphoria"; - "eurofxref" = dontDistribute super."eurofxref"; - "event-driven" = dontDistribute super."event-driven"; - "event-handlers" = dontDistribute super."event-handlers"; - "event-list" = dontDistribute super."event-list"; - "event-monad" = dontDistribute super."event-monad"; - "eventloop" = dontDistribute super."eventloop"; - "eventsourced" = dontDistribute super."eventsourced"; - "eventstore" = doDistribute super."eventstore_0_12_0_0"; - "every-bit-counts" = dontDistribute super."every-bit-counts"; - "ewe" = dontDistribute super."ewe"; - "ex-pool" = dontDistribute super."ex-pool"; - "exception-hierarchy" = dontDistribute super."exception-hierarchy"; - "exception-mailer" = dontDistribute super."exception-mailer"; - "exception-monads-fd" = dontDistribute super."exception-monads-fd"; - "exception-monads-tf" = dontDistribute super."exception-monads-tf"; - "execs" = dontDistribute super."execs"; - "exherbo-cabal" = dontDistribute super."exherbo-cabal"; - "exif" = dontDistribute super."exif"; - "exinst" = dontDistribute super."exinst"; - "exinst-aeson" = dontDistribute super."exinst-aeson"; - "exinst-bytes" = dontDistribute super."exinst-bytes"; - "exinst-deepseq" = dontDistribute super."exinst-deepseq"; - "exinst-hashable" = dontDistribute super."exinst-hashable"; - "existential" = dontDistribute super."existential"; - "exists" = dontDistribute super."exists"; - "exit-codes" = dontDistribute super."exit-codes"; - "exp-extended" = dontDistribute super."exp-extended"; - "exp-pairs" = dontDistribute super."exp-pairs"; - "expand" = dontDistribute super."expand"; - "expat-enumerator" = dontDistribute super."expat-enumerator"; - "expiring-cache-map" = doDistribute super."expiring-cache-map_0_0_5_4"; - "expiring-mvar" = dontDistribute super."expiring-mvar"; - "explain" = dontDistribute super."explain"; - "explicit-determinant" = dontDistribute super."explicit-determinant"; - "explicit-iomodes" = dontDistribute super."explicit-iomodes"; - "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring"; - "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text"; - "explicit-sharing" = dontDistribute super."explicit-sharing"; - "explore" = dontDistribute super."explore"; - "exposed-containers" = dontDistribute super."exposed-containers"; - "expression-parser" = dontDistribute super."expression-parser"; - "extcore" = dontDistribute super."extcore"; - "extemp" = dontDistribute super."extemp"; - "extended-categories" = dontDistribute super."extended-categories"; - "extended-reals" = dontDistribute super."extended-reals"; - "extensible" = dontDistribute super."extensible"; - "extensible-data" = dontDistribute super."extensible-data"; - "external-sort" = dontDistribute super."external-sort"; - "extractelf" = dontDistribute super."extractelf"; - "ez-couch" = dontDistribute super."ez-couch"; - "faceted" = dontDistribute super."faceted"; - "factory" = dontDistribute super."factory"; - "factual-api" = dontDistribute super."factual-api"; - "fad" = dontDistribute super."fad"; - "fadno-braids" = dontDistribute super."fadno-braids"; - "failable-list" = dontDistribute super."failable-list"; - "failure" = dontDistribute super."failure"; - "failure-detector" = dontDistribute super."failure-detector"; - "fair-predicates" = dontDistribute super."fair-predicates"; - "fake-type" = dontDistribute super."fake-type"; - "faker" = dontDistribute super."faker"; - "falling-turnip" = dontDistribute super."falling-turnip"; - "fallingblocks" = dontDistribute super."fallingblocks"; - "family-tree" = dontDistribute super."family-tree"; - "fast-digits" = dontDistribute super."fast-digits"; - "fast-math" = dontDistribute super."fast-math"; - "fast-tags" = dontDistribute super."fast-tags"; - "fast-tagsoup" = dontDistribute super."fast-tagsoup"; - "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only"; - "fastbayes" = dontDistribute super."fastbayes"; - "fastcgi" = dontDistribute super."fastcgi"; - "fastedit" = dontDistribute super."fastedit"; - "fastirc" = dontDistribute super."fastirc"; - "fathead-util" = dontDistribute super."fathead-util"; - "fault-tree" = dontDistribute super."fault-tree"; - "fay-geoposition" = dontDistribute super."fay-geoposition"; - "fay-hsx" = dontDistribute super."fay-hsx"; - "fay-ref" = dontDistribute super."fay-ref"; - "fbmessenger-api" = dontDistribute super."fbmessenger-api"; - "fca" = dontDistribute super."fca"; - "fcache" = dontDistribute super."fcache"; - "fcd" = dontDistribute super."fcd"; - "fckeditor" = dontDistribute super."fckeditor"; - "fclabels-monadlib" = dontDistribute super."fclabels-monadlib"; - "fdo-trash" = dontDistribute super."fdo-trash"; - "fec" = dontDistribute super."fec"; - "fedora-packages" = dontDistribute super."fedora-packages"; - "feed-cli" = dontDistribute super."feed-cli"; - "feed-collect" = dontDistribute super."feed-collect"; - "feed-crawl" = dontDistribute super."feed-crawl"; - "feed-gipeda" = dontDistribute super."feed-gipeda"; - "feed-translator" = dontDistribute super."feed-translator"; - "feed2lj" = dontDistribute super."feed2lj"; - "feed2twitter" = dontDistribute super."feed2twitter"; - "feldspar-compiler" = dontDistribute super."feldspar-compiler"; - "feldspar-language" = dontDistribute super."feldspar-language"; - "feldspar-signal" = dontDistribute super."feldspar-signal"; - "fen2s" = dontDistribute super."fen2s"; - "fences" = dontDistribute super."fences"; - "fenfire" = dontDistribute super."fenfire"; - "fez-conf" = dontDistribute super."fez-conf"; - "ffeed" = dontDistribute super."ffeed"; - "fficxx" = dontDistribute super."fficxx"; - "fficxx-runtime" = dontDistribute super."fficxx-runtime"; - "ffmpeg-light" = dontDistribute super."ffmpeg-light"; - "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials"; - "fft" = doDistribute super."fft_0_1_8_3"; - "fftwRaw" = dontDistribute super."fftwRaw"; - "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions"; - "fgl-visualize" = dontDistribute super."fgl-visualize"; - "fibon" = dontDistribute super."fibon"; - "fibonacci" = dontDistribute super."fibonacci"; - "fields" = dontDistribute super."fields"; - "fields-json" = dontDistribute super."fields-json"; - "fieldwise" = dontDistribute super."fieldwise"; - "fig" = dontDistribute super."fig"; - "file-collection" = dontDistribute super."file-collection"; - "file-command-qq" = dontDistribute super."file-command-qq"; - "file-embed-poly" = dontDistribute super."file-embed-poly"; - "file-modules" = doDistribute super."file-modules_0_1_2_3"; - "filediff" = dontDistribute super."filediff"; - "filepath-io-access" = dontDistribute super."filepath-io-access"; - "filepather" = dontDistribute super."filepather"; - "filestore" = dontDistribute super."filestore"; - "filesystem-conduit" = dontDistribute super."filesystem-conduit"; - "filesystem-enumerator" = dontDistribute super."filesystem-enumerator"; - "filesystem-trees" = dontDistribute super."filesystem-trees"; - "filtrable" = dontDistribute super."filtrable"; - "final" = dontDistribute super."final"; - "find-conduit" = dontDistribute super."find-conduit"; - "fingertree-tf" = dontDistribute super."fingertree-tf"; - "finite-field" = dontDistribute super."finite-field"; - "finite-typelits" = dontDistribute super."finite-typelits"; - "first-and-last" = dontDistribute super."first-and-last"; - "first-class-patterns" = dontDistribute super."first-class-patterns"; - "firstify" = dontDistribute super."firstify"; - "fishfood" = dontDistribute super."fishfood"; - "fit" = dontDistribute super."fit"; - "fitsio" = dontDistribute super."fitsio"; - "fitspec" = dontDistribute super."fitspec"; - "fix-imports" = dontDistribute super."fix-imports"; - "fix-parser-simple" = dontDistribute super."fix-parser-simple"; - "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit"; - "fixed-length" = dontDistribute super."fixed-length"; - "fixed-point" = dontDistribute super."fixed-point"; - "fixed-point-vector" = dontDistribute super."fixed-point-vector"; - "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space"; - "fixed-precision" = dontDistribute super."fixed-precision"; - "fixed-storable-array" = dontDistribute super."fixed-storable-array"; - "fixed-vector-binary" = dontDistribute super."fixed-vector-binary"; - "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal"; - "fixedprec" = dontDistribute super."fixedprec"; - "fixedwidth-hs" = dontDistribute super."fixedwidth-hs"; - "fixfile" = dontDistribute super."fixfile"; - "fixhs" = dontDistribute super."fixhs"; - "fixplate" = dontDistribute super."fixplate"; - "fixpoint" = dontDistribute super."fixpoint"; - "fixtime" = dontDistribute super."fixtime"; - "fizz-buzz" = dontDistribute super."fizz-buzz"; - "fizzbuzz" = dontDistribute super."fizzbuzz"; - "flaccuraterip" = dontDistribute super."flaccuraterip"; - "flamethrower" = dontDistribute super."flamethrower"; - "flamingra" = dontDistribute super."flamingra"; - "flat-maybe" = dontDistribute super."flat-maybe"; - "flat-tex" = dontDistribute super."flat-tex"; - "flexible-time" = dontDistribute super."flexible-time"; - "flexible-unlit" = dontDistribute super."flexible-unlit"; - "flexiwrap" = dontDistribute super."flexiwrap"; - "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck"; - "flickr" = dontDistribute super."flickr"; - "flippers" = dontDistribute super."flippers"; - "flite" = dontDistribute super."flite"; - "flo" = dontDistribute super."flo"; - "float-binstring" = dontDistribute super."float-binstring"; - "floating-bits" = dontDistribute super."floating-bits"; - "floatshow" = dontDistribute super."floatshow"; - "flow-er" = dontDistribute super."flow-er"; - "flow2dot" = dontDistribute super."flow2dot"; - "flowdock" = dontDistribute super."flowdock"; - "flowdock-api" = dontDistribute super."flowdock-api"; - "flowdock-rest" = dontDistribute super."flowdock-rest"; - "flower" = dontDistribute super."flower"; - "flowlocks-framework" = dontDistribute super."flowlocks-framework"; - "flowsim" = dontDistribute super."flowsim"; - "fltkhs" = dontDistribute super."fltkhs"; - "fltkhs-demos" = dontDistribute super."fltkhs-demos"; - "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos"; - "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples"; - "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world"; - "fluent-logger" = dontDistribute super."fluent-logger"; - "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit"; - "fluidsynth" = dontDistribute super."fluidsynth"; - "fmark" = dontDistribute super."fmark"; - "foldl-incremental" = dontDistribute super."foldl-incremental"; - "foldl-transduce" = dontDistribute super."foldl-transduce"; - "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec"; - "folds" = dontDistribute super."folds"; - "folds-common" = dontDistribute super."folds-common"; - "follower" = dontDistribute super."follower"; - "foma" = dontDistribute super."foma"; - "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6"; - "foo" = dontDistribute super."foo"; - "foobar" = dontDistribute super."foobar"; - "for-free" = dontDistribute super."for-free"; - "forbidden-fruit" = dontDistribute super."forbidden-fruit"; - "fordo" = dontDistribute super."fordo"; - "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric"; - "foreign-var" = dontDistribute super."foreign-var"; - "forger" = dontDistribute super."forger"; - "forkable-monad" = dontDistribute super."forkable-monad"; - "formal" = dontDistribute super."formal"; - "format" = dontDistribute super."format"; - "format-status" = dontDistribute super."format-status"; - "formattable" = dontDistribute super."formattable"; - "forml" = dontDistribute super."forml"; - "formlets" = dontDistribute super."formlets"; - "formlets-hsp" = dontDistribute super."formlets-hsp"; - "formura" = dontDistribute super."formura"; - "forth-hll" = dontDistribute super."forth-hll"; - "fortran-src" = dontDistribute super."fortran-src"; - "foscam-directory" = dontDistribute super."foscam-directory"; - "foscam-filename" = dontDistribute super."foscam-filename"; - "foscam-sort" = dontDistribute super."foscam-sort"; - "foundation" = dontDistribute super."foundation"; - "foundation-edge" = dontDistribute super."foundation-edge"; - "fountain" = dontDistribute super."fountain"; - "fpco-api" = dontDistribute super."fpco-api"; - "fpipe" = dontDistribute super."fpipe"; - "fpnla" = dontDistribute super."fpnla"; - "fpnla-examples" = dontDistribute super."fpnla-examples"; - "fptest" = dontDistribute super."fptest"; - "fquery" = dontDistribute super."fquery"; - "fractal" = dontDistribute super."fractal"; - "fractals" = dontDistribute super."fractals"; - "fraction" = dontDistribute super."fraction"; - "frag" = dontDistribute super."frag"; - "frame" = dontDistribute super."frame"; - "frame-markdown" = dontDistribute super."frame-markdown"; - "franchise" = dontDistribute super."franchise"; - "fraxl" = dontDistribute super."fraxl"; - "freddy" = dontDistribute super."freddy"; - "free-concurrent" = dontDistribute super."free-concurrent"; - "free-functors" = dontDistribute super."free-functors"; - "free-game" = dontDistribute super."free-game"; - "free-http" = dontDistribute super."free-http"; - "free-operational" = dontDistribute super."free-operational"; - "free-theorems" = dontDistribute super."free-theorems"; - "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples"; - "free-theorems-seq" = dontDistribute super."free-theorems-seq"; - "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui"; - "free-theorems-webui" = dontDistribute super."free-theorems-webui"; - "free-vector-spaces" = dontDistribute super."free-vector-spaces"; - "freekick2" = dontDistribute super."freekick2"; - "freer" = dontDistribute super."freer"; - "freesect" = dontDistribute super."freesect"; - "freesound" = dontDistribute super."freesound"; - "freetype-simple" = dontDistribute super."freetype-simple"; - "freetype2" = dontDistribute super."freetype2"; - "fresco-binding" = dontDistribute super."fresco-binding"; - "fresh" = dontDistribute super."fresh"; - "friday" = dontDistribute super."friday"; - "friday-devil" = dontDistribute super."friday-devil"; - "friday-juicypixels" = dontDistribute super."friday-juicypixels"; - "friday-scale-dct" = dontDistribute super."friday-scale-dct"; - "friendly-time" = dontDistribute super."friendly-time"; - "frown" = dontDistribute super."frown"; - "frp-arduino" = dontDistribute super."frp-arduino"; - "frpnow" = dontDistribute super."frpnow"; - "frpnow-gloss" = dontDistribute super."frpnow-gloss"; - "frpnow-gtk" = dontDistribute super."frpnow-gtk"; - "frquotes" = dontDistribute super."frquotes"; - "fs-events" = dontDistribute super."fs-events"; - "fsharp" = dontDistribute super."fsharp"; - "fsmActions" = dontDistribute super."fsmActions"; - "fsnotify-conduit" = dontDistribute super."fsnotify-conduit"; - "fst" = dontDistribute super."fst"; - "fsutils" = dontDistribute super."fsutils"; - "fswatcher" = dontDistribute super."fswatcher"; - "ftdi" = dontDistribute super."ftdi"; - "ftp-conduit" = dontDistribute super."ftp-conduit"; - "ftphs" = dontDistribute super."ftphs"; - "ftree" = dontDistribute super."ftree"; - "ftshell" = dontDistribute super."ftshell"; - "fugue" = dontDistribute super."fugue"; - "full-sessions" = dontDistribute super."full-sessions"; - "full-text-search" = dontDistribute super."full-text-search"; - "fullstop" = dontDistribute super."fullstop"; - "funbot" = dontDistribute super."funbot"; - "funbot-client" = dontDistribute super."funbot-client"; - "funbot-ext-events" = dontDistribute super."funbot-ext-events"; - "funbot-git-hook" = dontDistribute super."funbot-git-hook"; - "funcons-tools" = dontDistribute super."funcons-tools"; - "function-combine" = dontDistribute super."function-combine"; - "function-instances-algebra" = dontDistribute super."function-instances-algebra"; - "functional-arrow" = dontDistribute super."functional-arrow"; - "functional-kmp" = dontDistribute super."functional-kmp"; - "functor-apply" = dontDistribute super."functor-apply"; - "functor-combo" = dontDistribute super."functor-combo"; - "functor-infix" = dontDistribute super."functor-infix"; - "functor-monadic" = dontDistribute super."functor-monadic"; - "functor-utils" = dontDistribute super."functor-utils"; - "functorm" = dontDistribute super."functorm"; - "functors" = dontDistribute super."functors"; - "funion" = dontDistribute super."funion"; - "funnyprint" = dontDistribute super."funnyprint"; - "funpat" = dontDistribute super."funpat"; - "funsat" = dontDistribute super."funsat"; - "fusion" = dontDistribute super."fusion"; - "futun" = dontDistribute super."futun"; - "future" = dontDistribute super."future"; - "future-resource" = dontDistribute super."future-resource"; - "fuzzy" = dontDistribute super."fuzzy"; - "fuzzy-timings" = dontDistribute super."fuzzy-timings"; - "fuzzytime" = dontDistribute super."fuzzytime"; - "fwgl" = dontDistribute super."fwgl"; - "fwgl-glfw" = dontDistribute super."fwgl-glfw"; - "fwgl-javascript" = dontDistribute super."fwgl-javascript"; - "g-npm" = dontDistribute super."g-npm"; - "gact" = dontDistribute super."gact"; - "game-of-life" = dontDistribute super."game-of-life"; - "game-probability" = dontDistribute super."game-probability"; - "game-tree" = dontDistribute super."game-tree"; - "gameclock" = dontDistribute super."gameclock"; - "gang-of-threads" = dontDistribute super."gang-of-threads"; - "garepinoh" = dontDistribute super."garepinoh"; - "garsia-wachs" = dontDistribute super."garsia-wachs"; - "gasp" = dontDistribute super."gasp"; - "gbu" = dontDistribute super."gbu"; - "gc" = dontDistribute super."gc"; - "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai"; - "gcodehs" = dontDistribute super."gcodehs"; - "gconf" = dontDistribute super."gconf"; - "gdiff" = dontDistribute super."gdiff"; - "gdiff-ig" = dontDistribute super."gdiff-ig"; - "gdiff-th" = dontDistribute super."gdiff-th"; - "gdo" = dontDistribute super."gdo"; - "gearbox" = dontDistribute super."gearbox"; - "geek" = dontDistribute super."geek"; - "geek-server" = dontDistribute super."geek-server"; - "gelatin" = dontDistribute super."gelatin"; - "gemstone" = dontDistribute super."gemstone"; - "gencheck" = dontDistribute super."gencheck"; - "gender" = dontDistribute super."gender"; - "genders" = dontDistribute super."genders"; - "general-prelude" = dontDistribute super."general-prelude"; - "generator" = dontDistribute super."generator"; - "generators" = dontDistribute super."generators"; - "generic-accessors" = dontDistribute super."generic-accessors"; - "generic-binary" = dontDistribute super."generic-binary"; - "generic-church" = dontDistribute super."generic-church"; - "generic-deepseq" = dontDistribute super."generic-deepseq"; - "generic-deriving" = doDistribute super."generic-deriving_1_10_5"; - "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold"; - "generic-maybe" = dontDistribute super."generic-maybe"; - "generic-pretty" = dontDistribute super."generic-pretty"; - "generic-random" = dontDistribute super."generic-random"; - "generic-records" = dontDistribute super."generic-records"; - "generic-server" = dontDistribute super."generic-server"; - "generic-storable" = dontDistribute super."generic-storable"; - "generic-tree" = dontDistribute super."generic-tree"; - "generic-xml" = dontDistribute super."generic-xml"; - "generics-sop-lens" = dontDistribute super."generics-sop-lens"; - "genericserialize" = dontDistribute super."genericserialize"; - "genetics" = dontDistribute super."genetics"; - "geni-gui" = dontDistribute super."geni-gui"; - "geni-util" = dontDistribute super."geni-util"; - "geniconvert" = dontDistribute super."geniconvert"; - "genifunctors" = dontDistribute super."genifunctors"; - "geniplate" = dontDistribute super."geniplate"; - "geniserver" = dontDistribute super."geniserver"; - "genprog" = dontDistribute super."genprog"; - "gentlemark" = dontDistribute super."gentlemark"; - "genvalidity" = dontDistribute super."genvalidity"; - "genvalidity-containers" = dontDistribute super."genvalidity-containers"; - "genvalidity-hspec" = dontDistribute super."genvalidity-hspec"; - "genvalidity-text" = dontDistribute super."genvalidity-text"; - "geo-resolver" = dontDistribute super."geo-resolver"; - "geo-uk" = dontDistribute super."geo-uk"; - "geocalc" = dontDistribute super."geocalc"; - "geocode-google" = dontDistribute super."geocode-google"; - "geodetic" = dontDistribute super."geodetic"; - "geodetics" = dontDistribute super."geodetics"; - "geohash" = dontDistribute super."geohash"; - "geoip2" = dontDistribute super."geoip2"; - "geojson" = dontDistribute super."geojson"; - "geojson-types" = dontDistribute super."geojson-types"; - "geolite-csv" = dontDistribute super."geolite-csv"; - "geom2d" = dontDistribute super."geom2d"; - "getemx" = dontDistribute super."getemx"; - "getflag" = dontDistribute super."getflag"; - "getopt-simple" = dontDistribute super."getopt-simple"; - "gf" = dontDistribute super."gf"; - "ggtsTC" = dontDistribute super."ggtsTC"; - "ghc-core" = dontDistribute super."ghc-core"; - "ghc-core-html" = dontDistribute super."ghc-core-html"; - "ghc-datasize" = dontDistribute super."ghc-datasize"; - "ghc-dump-tree" = dontDistribute super."ghc-dump-tree"; - "ghc-dup" = dontDistribute super."ghc-dup"; - "ghc-events-analyze" = dontDistribute super."ghc-events-analyze"; - "ghc-events-parallel" = dontDistribute super."ghc-events-parallel"; - "ghc-exactprint" = doDistribute super."ghc-exactprint_0_5_1_1"; - "ghc-gc-tune" = dontDistribute super."ghc-gc-tune"; - "ghc-generic-instances" = dontDistribute super."ghc-generic-instances"; - "ghc-make" = dontDistribute super."ghc-make"; - "ghc-man-completion" = dontDistribute super."ghc-man-completion"; - "ghc-mod" = doDistribute super."ghc-mod_5_5_0_0"; - "ghc-options" = dontDistribute super."ghc-options"; - "ghc-parmake" = dontDistribute super."ghc-parmake"; - "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix"; - "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib"; - "ghc-prof" = dontDistribute super."ghc-prof"; - "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph"; - "ghc-server" = dontDistribute super."ghc-server"; - "ghc-simple" = dontDistribute super."ghc-simple"; - "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin"; - "ghc-syb" = dontDistribute super."ghc-syb"; - "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof"; - "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1_3"; - "ghc-typelits-knownnat" = dontDistribute super."ghc-typelits-knownnat"; - "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4_6"; - "ghc-typelits-presburger" = dontDistribute super."ghc-typelits-presburger"; - "ghc-vis" = dontDistribute super."ghc-vis"; - "ghci-diagrams" = dontDistribute super."ghci-diagrams"; - "ghci-haskeline" = dontDistribute super."ghci-haskeline"; - "ghci-history-parser" = dontDistribute super."ghci-history-parser"; - "ghci-lib" = dontDistribute super."ghci-lib"; - "ghci-ng" = dontDistribute super."ghci-ng"; - "ghci-pretty" = dontDistribute super."ghci-pretty"; - "ghcid" = doDistribute super."ghcid_0_6_4"; - "ghcjs-ajax" = dontDistribute super."ghcjs-ajax"; - "ghcjs-dom" = doDistribute super."ghcjs-dom_0_2_4_0"; - "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello"; - "ghcjs-dom-jsaddle" = dontDistribute super."ghcjs-dom-jsaddle"; - "ghcjs-dom-jsffi" = dontDistribute super."ghcjs-dom-jsffi"; - "ghcjs-dom-webkit" = dontDistribute super."ghcjs-dom-webkit"; - "ghcjs-hplay" = dontDistribute super."ghcjs-hplay"; - "ghcjs-perch" = dontDistribute super."ghcjs-perch"; - "ghcjs-websockets" = dontDistribute super."ghcjs-websockets"; - "ghclive" = dontDistribute super."ghclive"; - "ghczdecode" = dontDistribute super."ghczdecode"; - "ght" = dontDistribute super."ght"; - "gi-girepository" = dontDistribute super."gi-girepository"; - "gi-gst" = dontDistribute super."gi-gst"; - "gi-gstaudio" = dontDistribute super."gi-gstaudio"; - "gi-gstbase" = dontDistribute super."gi-gstbase"; - "gi-gstvideo" = dontDistribute super."gi-gstvideo"; - "gi-gtk-hs" = dontDistribute super."gi-gtk-hs"; - "gi-gtkosxapplication" = dontDistribute super."gi-gtkosxapplication"; - "gi-gtksource" = dontDistribute super."gi-gtksource"; - "gi-javascriptcore" = dontDistribute super."gi-javascriptcore"; - "gi-notify" = dontDistribute super."gi-notify"; - "gi-pangocairo" = dontDistribute super."gi-pangocairo"; - "gi-poppler" = dontDistribute super."gi-poppler"; - "gi-soup" = dontDistribute super."gi-soup"; - "gi-vte" = dontDistribute super."gi-vte"; - "gi-webkit" = dontDistribute super."gi-webkit"; - "gi-webkit2" = dontDistribute super."gi-webkit2"; - "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension"; - "giak" = dontDistribute super."giak"; - "gimlh" = dontDistribute super."gimlh"; - "ginger" = dontDistribute super."ginger"; - "ginsu" = dontDistribute super."ginsu"; - "gio" = doDistribute super."gio_0_13_1_1"; - "gipeda" = doDistribute super."gipeda_0_2_0_1"; - "gist" = dontDistribute super."gist"; - "git" = dontDistribute super."git"; - "git-all" = dontDistribute super."git-all"; - "git-annex" = doDistribute super."git-annex_6_20160511"; - "git-checklist" = dontDistribute super."git-checklist"; - "git-date" = dontDistribute super."git-date"; - "git-embed" = dontDistribute super."git-embed"; - "git-freq" = dontDistribute super."git-freq"; - "git-gpush" = dontDistribute super."git-gpush"; - "git-jump" = dontDistribute super."git-jump"; - "git-monitor" = dontDistribute super."git-monitor"; - "git-object" = dontDistribute super."git-object"; - "git-repair" = dontDistribute super."git-repair"; - "git-sanity" = dontDistribute super."git-sanity"; - "git-vogue" = dontDistribute super."git-vogue"; - "gitHUD" = dontDistribute super."gitHUD"; - "gitcache" = dontDistribute super."gitcache"; - "gitdo" = dontDistribute super."gitdo"; - "github-backup" = doDistribute super."github-backup_1_20160522"; - "github-post-receive" = dontDistribute super."github-post-receive"; - "github-utils" = dontDistribute super."github-utils"; - "gitignore" = dontDistribute super."gitignore"; - "gitit" = dontDistribute super."gitit"; - "gitlib-cmdline" = dontDistribute super."gitlib-cmdline"; - "gitlib-cross" = dontDistribute super."gitlib-cross"; - "gitlib-s3" = dontDistribute super."gitlib-s3"; - "gitlib-sample" = dontDistribute super."gitlib-sample"; - "gitlib-utils" = dontDistribute super."gitlib-utils"; - "gitson" = doDistribute super."gitson_0_5_1"; - "gitter" = dontDistribute super."gitter"; - "givegif" = dontDistribute super."givegif"; - "gl-capture" = dontDistribute super."gl-capture"; - "glabrous" = dontDistribute super."glabrous"; - "glade" = dontDistribute super."glade"; - "gladexml-accessor" = dontDistribute super."gladexml-accessor"; - "glambda" = dontDistribute super."glambda"; - "glapp" = dontDistribute super."glapp"; - "glasso" = dontDistribute super."glasso"; - "glib" = doDistribute super."glib_0_13_2_2"; - "glicko" = dontDistribute super."glicko"; - "glider-nlp" = dontDistribute super."glider-nlp"; - "glintcollider" = dontDistribute super."glintcollider"; - "glirc" = dontDistribute super."glirc"; - "gll" = dontDistribute super."gll"; - "global" = dontDistribute super."global"; - "global-config" = dontDistribute super."global-config"; - "global-lock" = dontDistribute super."global-lock"; - "global-variables" = dontDistribute super."global-variables"; - "glome-hs" = dontDistribute super."glome-hs"; - "gloss" = dontDistribute super."gloss"; - "gloss-accelerate" = dontDistribute super."gloss-accelerate"; - "gloss-algorithms" = dontDistribute super."gloss-algorithms"; - "gloss-banana" = dontDistribute super."gloss-banana"; - "gloss-devil" = dontDistribute super."gloss-devil"; - "gloss-examples" = dontDistribute super."gloss-examples"; - "gloss-game" = dontDistribute super."gloss-game"; - "gloss-juicy" = dontDistribute super."gloss-juicy"; - "gloss-raster" = dontDistribute super."gloss-raster"; - "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate"; - "gloss-rendering" = dontDistribute super."gloss-rendering"; - "gloss-sodium" = dontDistribute super."gloss-sodium"; - "glpk-hs" = dontDistribute super."glpk-hs"; - "glue" = dontDistribute super."glue"; - "glue-common" = dontDistribute super."glue-common"; - "glue-core" = dontDistribute super."glue-core"; - "glue-ekg" = dontDistribute super."glue-ekg"; - "glue-example" = dontDistribute super."glue-example"; - "gluturtle" = dontDistribute super."gluturtle"; - "gmap" = dontDistribute super."gmap"; - "gmndl" = dontDistribute super."gmndl"; - "gnome-desktop" = dontDistribute super."gnome-desktop"; - "gnome-keyring" = dontDistribute super."gnome-keyring"; - "gnomevfs" = dontDistribute super."gnomevfs"; - "gnss-converters" = dontDistribute super."gnss-converters"; - "gnuplot" = dontDistribute super."gnuplot"; - "goa" = dontDistribute super."goa"; - "goal-core" = dontDistribute super."goal-core"; - "goal-geometry" = dontDistribute super."goal-geometry"; - "goal-probability" = dontDistribute super."goal-probability"; - "goal-simulation" = dontDistribute super."goal-simulation"; - "goatee" = dontDistribute super."goatee"; - "goatee-gtk" = dontDistribute super."goatee-gtk"; - "gofer-prelude" = dontDistribute super."gofer-prelude"; - "gogol" = dontDistribute super."gogol"; - "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer"; - "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller"; - "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer"; - "gogol-admin-directory" = dontDistribute super."gogol-admin-directory"; - "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration"; - "gogol-admin-reports" = dontDistribute super."gogol-admin-reports"; - "gogol-adsense" = dontDistribute super."gogol-adsense"; - "gogol-adsense-host" = dontDistribute super."gogol-adsense-host"; - "gogol-affiliates" = dontDistribute super."gogol-affiliates"; - "gogol-analytics" = dontDistribute super."gogol-analytics"; - "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise"; - "gogol-android-publisher" = dontDistribute super."gogol-android-publisher"; - "gogol-appengine" = dontDistribute super."gogol-appengine"; - "gogol-apps-activity" = dontDistribute super."gogol-apps-activity"; - "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar"; - "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing"; - "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller"; - "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks"; - "gogol-appstate" = dontDistribute super."gogol-appstate"; - "gogol-autoscaler" = dontDistribute super."gogol-autoscaler"; - "gogol-bigquery" = dontDistribute super."gogol-bigquery"; - "gogol-billing" = dontDistribute super."gogol-billing"; - "gogol-blogger" = dontDistribute super."gogol-blogger"; - "gogol-books" = dontDistribute super."gogol-books"; - "gogol-civicinfo" = dontDistribute super."gogol-civicinfo"; - "gogol-classroom" = dontDistribute super."gogol-classroom"; - "gogol-cloudmonitoring" = dontDistribute super."gogol-cloudmonitoring"; - "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace"; - "gogol-compute" = dontDistribute super."gogol-compute"; - "gogol-container" = dontDistribute super."gogol-container"; - "gogol-core" = dontDistribute super."gogol-core"; - "gogol-customsearch" = dontDistribute super."gogol-customsearch"; - "gogol-dataflow" = dontDistribute super."gogol-dataflow"; - "gogol-dataproc" = dontDistribute super."gogol-dataproc"; - "gogol-datastore" = dontDistribute super."gogol-datastore"; - "gogol-debugger" = dontDistribute super."gogol-debugger"; - "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager"; - "gogol-dfareporting" = dontDistribute super."gogol-dfareporting"; - "gogol-discovery" = dontDistribute super."gogol-discovery"; - "gogol-dns" = dontDistribute super."gogol-dns"; - "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids"; - "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search"; - "gogol-drive" = dontDistribute super."gogol-drive"; - "gogol-firebase-rules" = dontDistribute super."gogol-firebase-rules"; - "gogol-fitness" = dontDistribute super."gogol-fitness"; - "gogol-fonts" = dontDistribute super."gogol-fonts"; - "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch"; - "gogol-fusiontables" = dontDistribute super."gogol-fusiontables"; - "gogol-games" = dontDistribute super."gogol-games"; - "gogol-games-configuration" = dontDistribute super."gogol-games-configuration"; - "gogol-games-management" = dontDistribute super."gogol-games-management"; - "gogol-genomics" = dontDistribute super."gogol-genomics"; - "gogol-gmail" = dontDistribute super."gogol-gmail"; - "gogol-groups-migration" = dontDistribute super."gogol-groups-migration"; - "gogol-groups-settings" = dontDistribute super."gogol-groups-settings"; - "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit"; - "gogol-kgsearch" = dontDistribute super."gogol-kgsearch"; - "gogol-latencytest" = dontDistribute super."gogol-latencytest"; - "gogol-logging" = dontDistribute super."gogol-logging"; - "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate"; - "gogol-maps-engine" = dontDistribute super."gogol-maps-engine"; - "gogol-mirror" = dontDistribute super."gogol-mirror"; - "gogol-monitoring" = dontDistribute super."gogol-monitoring"; - "gogol-oauth2" = dontDistribute super."gogol-oauth2"; - "gogol-pagespeed" = dontDistribute super."gogol-pagespeed"; - "gogol-partners" = dontDistribute super."gogol-partners"; - "gogol-people" = dontDistribute super."gogol-people"; - "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner"; - "gogol-plus" = dontDistribute super."gogol-plus"; - "gogol-plus-domains" = dontDistribute super."gogol-plus-domains"; - "gogol-prediction" = dontDistribute super."gogol-prediction"; - "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon"; - "gogol-pubsub" = dontDistribute super."gogol-pubsub"; - "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress"; - "gogol-replicapool" = dontDistribute super."gogol-replicapool"; - "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater"; - "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager"; - "gogol-resourceviews" = dontDistribute super."gogol-resourceviews"; - "gogol-script" = dontDistribute super."gogol-script"; - "gogol-sheets" = dontDistribute super."gogol-sheets"; - "gogol-shopping-content" = dontDistribute super."gogol-shopping-content"; - "gogol-siteverification" = dontDistribute super."gogol-siteverification"; - "gogol-spectrum" = dontDistribute super."gogol-spectrum"; - "gogol-sqladmin" = dontDistribute super."gogol-sqladmin"; - "gogol-storage" = dontDistribute super."gogol-storage"; - "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer"; - "gogol-tagmanager" = dontDistribute super."gogol-tagmanager"; - "gogol-taskqueue" = dontDistribute super."gogol-taskqueue"; - "gogol-translate" = dontDistribute super."gogol-translate"; - "gogol-urlshortener" = dontDistribute super."gogol-urlshortener"; - "gogol-useraccounts" = dontDistribute super."gogol-useraccounts"; - "gogol-vision" = dontDistribute super."gogol-vision"; - "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools"; - "gogol-youtube" = dontDistribute super."gogol-youtube"; - "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics"; - "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting"; - "gooey" = dontDistribute super."gooey"; - "google-dictionary" = dontDistribute super."google-dictionary"; - "google-drive" = dontDistribute super."google-drive"; - "google-html5-slide" = dontDistribute super."google-html5-slide"; - "google-mail-filters" = dontDistribute super."google-mail-filters"; - "google-oauth2" = dontDistribute super."google-oauth2"; - "google-oauth2-jwt" = dontDistribute super."google-oauth2-jwt"; - "google-search" = dontDistribute super."google-search"; - "google-translate" = dontDistribute super."google-translate"; - "googleplus" = dontDistribute super."googleplus"; - "googlepolyline" = dontDistribute super."googlepolyline"; - "gopherbot" = dontDistribute super."gopherbot"; - "gore-and-ash" = dontDistribute super."gore-and-ash"; - "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor"; - "gore-and-ash-async" = dontDistribute super."gore-and-ash-async"; - "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo"; - "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw"; - "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging"; - "gore-and-ash-network" = dontDistribute super."gore-and-ash-network"; - "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl"; - "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync"; - "gpah" = dontDistribute super."gpah"; - "gpcsets" = dontDistribute super."gpcsets"; - "gpio" = dontDistribute super."gpio"; - "gps" = dontDistribute super."gps"; - "gps2htmlReport" = dontDistribute super."gps2htmlReport"; - "gpx-conduit" = dontDistribute super."gpx-conduit"; - "graceful" = dontDistribute super."graceful"; - "grammar-combinators" = dontDistribute super."grammar-combinators"; - "grapefruit-examples" = dontDistribute super."grapefruit-examples"; - "grapefruit-frp" = dontDistribute super."grapefruit-frp"; - "grapefruit-records" = dontDistribute super."grapefruit-records"; - "grapefruit-ui" = dontDistribute super."grapefruit-ui"; - "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk"; - "graph-generators" = dontDistribute super."graph-generators"; - "graph-matchings" = dontDistribute super."graph-matchings"; - "graph-rewriting" = dontDistribute super."graph-rewriting"; - "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl"; - "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl"; - "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope"; - "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout"; - "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski"; - "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies"; - "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs"; - "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww"; - "graph-serialize" = dontDistribute super."graph-serialize"; - "graph-utils" = dontDistribute super."graph-utils"; - "graph-visit" = dontDistribute super."graph-visit"; - "graphbuilder" = dontDistribute super."graphbuilder"; - "graphene" = dontDistribute super."graphene"; - "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators"; - "graphics-formats-collada" = dontDistribute super."graphics-formats-collada"; - "graphicsFormats" = dontDistribute super."graphicsFormats"; - "graphicstools" = dontDistribute super."graphicstools"; - "graphmod" = dontDistribute super."graphmod"; - "graphql" = dontDistribute super."graphql"; - "graphtype" = dontDistribute super."graphtype"; - "grasp" = dontDistribute super."grasp"; - "gray-code" = dontDistribute super."gray-code"; - "gray-extended" = dontDistribute super."gray-extended"; - "greencard" = dontDistribute super."greencard"; - "greencard-lib" = dontDistribute super."greencard-lib"; - "greg-client" = dontDistribute super."greg-client"; - "gremlin-haskell" = dontDistribute super."gremlin-haskell"; - "greplicate" = dontDistribute super."greplicate"; - "grid" = dontDistribute super."grid"; - "gridfs" = dontDistribute super."gridfs"; - "gridland" = dontDistribute super."gridland"; - "grm" = dontDistribute super."grm"; - "groundhog-converters" = dontDistribute super."groundhog-converters"; - "groundhog-inspector" = dontDistribute super."groundhog-inspector"; - "group-with" = dontDistribute super."group-with"; - "groupoid" = dontDistribute super."groupoid"; - "gruff" = dontDistribute super."gruff"; - "gruff-examples" = dontDistribute super."gruff-examples"; - "gsc-weighting" = dontDistribute super."gsc-weighting"; - "gsl-random" = dontDistribute super."gsl-random"; - "gsl-random-fu" = dontDistribute super."gsl-random-fu"; - "gsmenu" = dontDistribute super."gsmenu"; - "gstreamer" = dontDistribute super."gstreamer"; - "gt-tools" = dontDistribute super."gt-tools"; - "gtfs" = dontDistribute super."gtfs"; - "gtk" = doDistribute super."gtk_0_14_2"; - "gtk-helpers" = dontDistribute super."gtk-helpers"; - "gtk-jsinput" = dontDistribute super."gtk-jsinput"; - "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore"; - "gtk-mac-integration" = dontDistribute super."gtk-mac-integration"; - "gtk-serialized-event" = dontDistribute super."gtk-serialized-event"; - "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view"; - "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list"; - "gtk-toy" = dontDistribute super."gtk-toy"; - "gtk-traymanager" = dontDistribute super."gtk-traymanager"; - "gtk2hs-buildtools" = doDistribute super."gtk2hs-buildtools_0_13_0_5"; - "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade"; - "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib"; - "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs"; - "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk"; - "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext"; - "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2"; - "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th"; - "gtk2hs-hello" = dontDistribute super."gtk2hs-hello"; - "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn"; - "gtk3" = doDistribute super."gtk3_0_14_2"; - "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration"; - "gtkglext" = dontDistribute super."gtkglext"; - "gtkimageview" = dontDistribute super."gtkimageview"; - "gtkrsync" = dontDistribute super."gtkrsync"; - "gtksourceview2" = dontDistribute super."gtksourceview2"; - "gtksourceview3" = doDistribute super."gtksourceview3_0_13_2_1"; - "guarded-rewriting" = dontDistribute super."guarded-rewriting"; - "guess-combinator" = dontDistribute super."guess-combinator"; - "guid" = dontDistribute super."guid"; - "gulcii" = dontDistribute super."gulcii"; - "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis"; - "gyah-bin" = dontDistribute super."gyah-bin"; - "h-booru" = dontDistribute super."h-booru"; - "h-gpgme" = dontDistribute super."h-gpgme"; - "h2048" = dontDistribute super."h2048"; - "hArduino" = dontDistribute super."hArduino"; - "hBDD" = dontDistribute super."hBDD"; - "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD"; - "hBDD-CUDD" = dontDistribute super."hBDD-CUDD"; - "hCsound" = dontDistribute super."hCsound"; - "hDFA" = dontDistribute super."hDFA"; - "hF2" = dontDistribute super."hF2"; - "hGelf" = dontDistribute super."hGelf"; - "hLLVM" = dontDistribute super."hLLVM"; - "hMollom" = dontDistribute super."hMollom"; - "hOpenPGP" = doDistribute super."hOpenPGP_2_4_4"; - "hPDB-examples" = dontDistribute super."hPDB-examples"; - "hPushover" = dontDistribute super."hPushover"; - "hR" = dontDistribute super."hR"; - "hRESP" = dontDistribute super."hRESP"; - "hS3" = dontDistribute super."hS3"; - "hScraper" = dontDistribute super."hScraper"; - "hSimpleDB" = dontDistribute super."hSimpleDB"; - "hTalos" = dontDistribute super."hTalos"; - "hTensor" = dontDistribute super."hTensor"; - "hVOIDP" = dontDistribute super."hVOIDP"; - "hXmixer" = dontDistribute super."hXmixer"; - "haar" = dontDistribute super."haar"; - "hablog" = dontDistribute super."hablog"; - "hacanon-light" = dontDistribute super."hacanon-light"; - "hack" = dontDistribute super."hack"; - "hack-contrib" = dontDistribute super."hack-contrib"; - "hack-contrib-press" = dontDistribute super."hack-contrib-press"; - "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack"; - "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi"; - "hack-handler-cgi" = dontDistribute super."hack-handler-cgi"; - "hack-handler-epoll" = dontDistribute super."hack-handler-epoll"; - "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp"; - "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi"; - "hack-handler-happstack" = dontDistribute super."hack-handler-happstack"; - "hack-handler-hyena" = dontDistribute super."hack-handler-hyena"; - "hack-handler-kibro" = dontDistribute super."hack-handler-kibro"; - "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver"; - "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath"; - "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession"; - "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip"; - "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp"; - "hack2" = dontDistribute super."hack2"; - "hack2-contrib" = dontDistribute super."hack2-contrib"; - "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra"; - "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server"; - "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http"; - "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server"; - "hack2-handler-warp" = dontDistribute super."hack2-handler-warp"; - "hack2-interface-wai" = dontDistribute super."hack2-interface-wai"; - "hackage-diff" = dontDistribute super."hackage-diff"; - "hackage-plot" = dontDistribute super."hackage-plot"; - "hackage-processing" = dontDistribute super."hackage-processing"; - "hackage-proxy" = dontDistribute super."hackage-proxy"; - "hackage-repo-tool" = dontDistribute super."hackage-repo-tool"; - "hackage-security" = dontDistribute super."hackage-security"; - "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP"; - "hackage-server" = dontDistribute super."hackage-server"; - "hackage-sparks" = dontDistribute super."hackage-sparks"; - "hackage2hwn" = dontDistribute super."hackage2hwn"; - "hackage2twitter" = dontDistribute super."hackage2twitter"; - "hackager" = dontDistribute super."hackager"; - "hackernews" = dontDistribute super."hackernews"; - "hackertyper" = dontDistribute super."hackertyper"; - "hackport" = dontDistribute super."hackport"; - "hactor" = dontDistribute super."hactor"; - "hactors" = dontDistribute super."hactors"; - "haddock" = dontDistribute super."haddock"; - "haddock-api" = doDistribute super."haddock-api_2_16_1"; - "haddock-leksah" = dontDistribute super."haddock-leksah"; - "haddock-library" = doDistribute super."haddock-library_1_2_1"; - "haddock-test" = dontDistribute super."haddock-test"; - "haddocset" = doDistribute super."haddocset_0_4_1"; - "hadoop-formats" = dontDistribute super."hadoop-formats"; - "hadoop-rpc" = dontDistribute super."hadoop-rpc"; - "hadoop-tools" = dontDistribute super."hadoop-tools"; - "haeredes" = dontDistribute super."haeredes"; - "haggis" = dontDistribute super."haggis"; - "haha" = dontDistribute super."haha"; - "hahp" = dontDistribute super."hahp"; - "haiji" = dontDistribute super."haiji"; - "hailgun" = dontDistribute super."hailgun"; - "hailgun-send" = dontDistribute super."hailgun-send"; - "hails" = dontDistribute super."hails"; - "hails-bin" = dontDistribute super."hails-bin"; - "hairy" = dontDistribute super."hairy"; - "hakaru" = dontDistribute super."hakaru"; - "hake" = dontDistribute super."hake"; - "hakismet" = dontDistribute super."hakismet"; - "hako" = dontDistribute super."hako"; - "hakyll-R" = dontDistribute super."hakyll-R"; - "hakyll-agda" = dontDistribute super."hakyll-agda"; - "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates"; - "hakyll-contrib" = dontDistribute super."hakyll-contrib"; - "hakyll-contrib-csv" = dontDistribute super."hakyll-contrib-csv"; - "hakyll-contrib-elm" = dontDistribute super."hakyll-contrib-elm"; - "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation"; - "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links"; - "hakyll-convert" = dontDistribute super."hakyll-convert"; - "hakyll-elm" = dontDistribute super."hakyll-elm"; - "hakyll-filestore" = dontDistribute super."hakyll-filestore"; - "hakyll-ogmarkup" = dontDistribute super."hakyll-ogmarkup"; - "hakyll-shakespeare" = dontDistribute super."hakyll-shakespeare"; - "halberd" = dontDistribute super."halberd"; - "halfs" = dontDistribute super."halfs"; - "halipeto" = dontDistribute super."halipeto"; - "halive" = dontDistribute super."halive"; - "halma" = dontDistribute super."halma"; - "haltavista" = dontDistribute super."haltavista"; - "hamid" = dontDistribute super."hamid"; - "hampp" = dontDistribute super."hampp"; - "hamtmap" = dontDistribute super."hamtmap"; - "hamusic" = dontDistribute super."hamusic"; - "handa-data" = dontDistribute super."handa-data"; - "handa-gdata" = dontDistribute super."handa-gdata"; - "handa-geodata" = dontDistribute super."handa-geodata"; - "handa-opengl" = dontDistribute super."handa-opengl"; - "handle-like" = dontDistribute super."handle-like"; - "handsy" = dontDistribute super."handsy"; - "hangman" = dontDistribute super."hangman"; - "hannahci" = dontDistribute super."hannahci"; - "hans" = dontDistribute super."hans"; - "hans-pcap" = dontDistribute super."hans-pcap"; - "hans-pfq" = dontDistribute super."hans-pfq"; - "haphviz" = dontDistribute super."haphviz"; - "happindicator" = dontDistribute super."happindicator"; - "happindicator3" = dontDistribute super."happindicator3"; - "happraise" = dontDistribute super."happraise"; - "happs-hsp" = dontDistribute super."happs-hsp"; - "happs-hsp-template" = dontDistribute super."happs-hsp-template"; - "happs-tutorial" = dontDistribute super."happs-tutorial"; - "happstack" = dontDistribute super."happstack"; - "happstack-auth" = dontDistribute super."happstack-auth"; - "happstack-authenticate" = doDistribute super."happstack-authenticate_2_3_4_3"; - "happstack-contrib" = dontDistribute super."happstack-contrib"; - "happstack-data" = dontDistribute super."happstack-data"; - "happstack-dlg" = dontDistribute super."happstack-dlg"; - "happstack-facebook" = dontDistribute super."happstack-facebook"; - "happstack-fastcgi" = dontDistribute super."happstack-fastcgi"; - "happstack-fay" = dontDistribute super."happstack-fay"; - "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax"; - "happstack-foundation" = dontDistribute super."happstack-foundation"; - "happstack-hamlet" = dontDistribute super."happstack-hamlet"; - "happstack-heist" = dontDistribute super."happstack-heist"; - "happstack-helpers" = dontDistribute super."happstack-helpers"; - "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate"; - "happstack-ixset" = dontDistribute super."happstack-ixset"; - "happstack-lite" = dontDistribute super."happstack-lite"; - "happstack-monad-peel" = dontDistribute super."happstack-monad-peel"; - "happstack-plugins" = dontDistribute super."happstack-plugins"; - "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite"; - "happstack-state" = dontDistribute super."happstack-state"; - "happstack-static-routing" = dontDistribute super."happstack-static-routing"; - "happstack-util" = dontDistribute super."happstack-util"; - "happstack-yui" = dontDistribute super."happstack-yui"; - "happy-meta" = dontDistribute super."happy-meta"; - "happybara" = dontDistribute super."happybara"; - "happybara-webkit" = dontDistribute super."happybara-webkit"; - "happybara-webkit-server" = dontDistribute super."happybara-webkit-server"; - "hapstone" = dontDistribute super."hapstone"; - "har" = dontDistribute super."har"; - "harchive" = dontDistribute super."harchive"; - "hardware-edsl" = dontDistribute super."hardware-edsl"; - "hark" = dontDistribute super."hark"; - "harmony" = dontDistribute super."harmony"; - "haroonga" = dontDistribute super."haroonga"; - "haroonga-httpd" = dontDistribute super."haroonga-httpd"; - "harpy" = dontDistribute super."harpy"; - "harvest-api" = dontDistribute super."harvest-api"; - "has" = dontDistribute super."has"; - "has-th" = dontDistribute super."has-th"; - "hascal" = dontDistribute super."hascal"; - "hascar" = dontDistribute super."hascar"; - "hascas" = dontDistribute super."hascas"; - "hascat" = dontDistribute super."hascat"; - "hascat-lib" = dontDistribute super."hascat-lib"; - "hascat-setup" = dontDistribute super."hascat-setup"; - "hascat-system" = dontDistribute super."hascat-system"; - "hash" = dontDistribute super."hash"; - "hashable-generics" = dontDistribute super."hashable-generics"; - "hashabler" = dontDistribute super."hashabler"; - "hashed-storage" = dontDistribute super."hashed-storage"; - "hashids" = dontDistribute super."hashids"; - "hashing" = dontDistribute super."hashing"; - "hashmap" = dontDistribute super."hashmap"; - "hashring" = dontDistribute super."hashring"; - "hashtables-plus" = dontDistribute super."hashtables-plus"; - "hasim" = dontDistribute super."hasim"; - "hask" = dontDistribute super."hask"; - "hask-home" = dontDistribute super."hask-home"; - "haskades" = dontDistribute super."haskades"; - "haskakafka" = dontDistribute super."haskakafka"; - "haskanoid" = dontDistribute super."haskanoid"; - "haskarrow" = dontDistribute super."haskarrow"; - "haskbot-core" = dontDistribute super."haskbot-core"; - "haskdeep" = dontDistribute super."haskdeep"; - "haskdogs" = dontDistribute super."haskdogs"; - "haskeem" = dontDistribute super."haskeem"; - "haskeline" = doDistribute super."haskeline_0_7_2_3"; - "haskeline-class" = dontDistribute super."haskeline-class"; - "haskell-aliyun" = dontDistribute super."haskell-aliyun"; - "haskell-awk" = dontDistribute super."haskell-awk"; - "haskell-bcrypt" = dontDistribute super."haskell-bcrypt"; - "haskell-brainfuck" = dontDistribute super."haskell-brainfuck"; - "haskell-cnc" = dontDistribute super."haskell-cnc"; - "haskell-coffee" = dontDistribute super."haskell-coffee"; - "haskell-compression" = dontDistribute super."haskell-compression"; - "haskell-course-preludes" = dontDistribute super."haskell-course-preludes"; - "haskell-docs" = dontDistribute super."haskell-docs"; - "haskell-eigen-util" = dontDistribute super."haskell-eigen-util"; - "haskell-exp-parser" = dontDistribute super."haskell-exp-parser"; - "haskell-fake-user-agent" = dontDistribute super."haskell-fake-user-agent"; - "haskell-formatter" = dontDistribute super."haskell-formatter"; - "haskell-ftp" = dontDistribute super."haskell-ftp"; - "haskell-generate" = dontDistribute super."haskell-generate"; - "haskell-gi" = doDistribute super."haskell-gi_0_17_4"; - "haskell-gi-base" = doDistribute super."haskell-gi-base_0_17"; - "haskell-google-trends" = dontDistribute super."haskell-google-trends"; - "haskell-igraph" = dontDistribute super."haskell-igraph"; - "haskell-import-graph" = dontDistribute super."haskell-import-graph"; - "haskell-in-space" = dontDistribute super."haskell-in-space"; - "haskell-kubernetes" = dontDistribute super."haskell-kubernetes"; - "haskell-lexer" = doDistribute super."haskell-lexer_1_0"; - "haskell-modbus" = dontDistribute super."haskell-modbus"; - "haskell-mpfr" = dontDistribute super."haskell-mpfr"; - "haskell-mpi" = dontDistribute super."haskell-mpi"; - "haskell-names" = dontDistribute super."haskell-names"; - "haskell-openflow" = dontDistribute super."haskell-openflow"; - "haskell-packages" = dontDistribute super."haskell-packages"; - "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter"; - "haskell-platform-test" = dontDistribute super."haskell-platform-test"; - "haskell-player" = dontDistribute super."haskell-player"; - "haskell-plot" = dontDistribute super."haskell-plot"; - "haskell-proxy-list" = dontDistribute super."haskell-proxy-list"; - "haskell-qrencode" = dontDistribute super."haskell-qrencode"; - "haskell-read-editor" = dontDistribute super."haskell-read-editor"; - "haskell-reflect" = dontDistribute super."haskell-reflect"; - "haskell-rules" = dontDistribute super."haskell-rules"; - "haskell-src-exts-prisms" = dontDistribute super."haskell-src-exts-prisms"; - "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq"; - "haskell-src-exts-simple" = dontDistribute super."haskell-src-exts-simple"; - "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton"; - "haskell-token-utils" = dontDistribute super."haskell-token-utils"; - "haskell-tools-ast" = dontDistribute super."haskell-tools-ast"; - "haskell-tools-ast-fromghc" = dontDistribute super."haskell-tools-ast-fromghc"; - "haskell-tools-ast-gen" = dontDistribute super."haskell-tools-ast-gen"; - "haskell-tools-ast-trf" = dontDistribute super."haskell-tools-ast-trf"; - "haskell-tools-prettyprint" = dontDistribute super."haskell-tools-prettyprint"; - "haskell-tools-refactor" = dontDistribute super."haskell-tools-refactor"; - "haskell-tor" = dontDistribute super."haskell-tor"; - "haskell-type-exts" = dontDistribute super."haskell-type-exts"; - "haskell-typescript" = dontDistribute super."haskell-typescript"; - "haskell-tyrant" = dontDistribute super."haskell-tyrant"; - "haskell-updater" = dontDistribute super."haskell-updater"; - "haskell-xmpp" = dontDistribute super."haskell-xmpp"; - "haskell2010" = dontDistribute super."haskell2010"; - "haskell98" = dontDistribute super."haskell98"; - "haskell98libraries" = dontDistribute super."haskell98libraries"; - "haskelldb" = dontDistribute super."haskelldb"; - "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc"; - "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl"; - "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf"; - "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers"; - "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted"; - "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic"; - "haskelldb-flat" = dontDistribute super."haskelldb-flat"; - "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc"; - "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql"; - "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc"; - "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql"; - "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3"; - "haskelldb-hsql" = dontDistribute super."haskelldb-hsql"; - "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql"; - "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc"; - "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle"; - "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql"; - "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite"; - "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3"; - "haskelldb-th" = dontDistribute super."haskelldb-th"; - "haskelldb-wx" = dontDistribute super."haskelldb-wx"; - "haskellscrabble" = dontDistribute super."haskellscrabble"; - "haskellscript" = dontDistribute super."haskellscript"; - "haskelm" = dontDistribute super."haskelm"; - "haskelzinc" = dontDistribute super."haskelzinc"; - "haskgame" = dontDistribute super."haskgame"; - "haskheap" = dontDistribute super."haskheap"; - "haskhol-core" = dontDistribute super."haskhol-core"; - "haskmon" = dontDistribute super."haskmon"; - "haskoin" = dontDistribute super."haskoin"; - "haskoin-core" = dontDistribute super."haskoin-core"; - "haskoin-crypto" = dontDistribute super."haskoin-crypto"; - "haskoin-node" = dontDistribute super."haskoin-node"; - "haskoin-protocol" = dontDistribute super."haskoin-protocol"; - "haskoin-script" = dontDistribute super."haskoin-script"; - "haskoin-util" = dontDistribute super."haskoin-util"; - "haskoin-wallet" = dontDistribute super."haskoin-wallet"; - "haskoon" = dontDistribute super."haskoon"; - "haskoon-httpspec" = dontDistribute super."haskoon-httpspec"; - "haskoon-salvia" = dontDistribute super."haskoon-salvia"; - "haskore" = dontDistribute super."haskore"; - "haskore-realtime" = dontDistribute super."haskore-realtime"; - "haskore-supercollider" = dontDistribute super."haskore-supercollider"; - "haskore-synthesizer" = dontDistribute super."haskore-synthesizer"; - "haskore-vintage" = dontDistribute super."haskore-vintage"; - "hasktags" = dontDistribute super."hasktags"; - "haslo" = dontDistribute super."haslo"; - "hasloGUI" = dontDistribute super."hasloGUI"; - "hasparql-client" = dontDistribute super."hasparql-client"; - "haspell" = dontDistribute super."haspell"; - "hasql" = doDistribute super."hasql_0_19_14"; - "hasql-backend" = dontDistribute super."hasql-backend"; - "hasql-class" = dontDistribute super."hasql-class"; - "hasql-cursor-query" = dontDistribute super."hasql-cursor-query"; - "hasql-cursor-transaction" = dontDistribute super."hasql-cursor-transaction"; - "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative"; - "hasql-pool" = dontDistribute super."hasql-pool"; - "hasql-postgres" = dontDistribute super."hasql-postgres"; - "hasql-postgres-options" = dontDistribute super."hasql-postgres-options"; - "hasql-th" = dontDistribute super."hasql-th"; - "hasql-transaction" = dontDistribute super."hasql-transaction"; - "hastache-aeson" = dontDistribute super."hastache-aeson"; - "haste" = dontDistribute super."haste"; - "haste-compiler" = dontDistribute super."haste-compiler"; - "haste-gapi" = dontDistribute super."haste-gapi"; - "haste-markup" = dontDistribute super."haste-markup"; - "haste-perch" = dontDistribute super."haste-perch"; - "hastily" = dontDistribute super."hastily"; - "hat" = dontDistribute super."hat"; - "hatex-guide" = dontDistribute super."hatex-guide"; - "hath" = dontDistribute super."hath"; - "hats" = dontDistribute super."hats"; - "hatt" = dontDistribute super."hatt"; - "haverer" = dontDistribute super."haverer"; - "hawitter" = dontDistribute super."hawitter"; - "haxl-facebook" = dontDistribute super."haxl-facebook"; - "haxparse" = dontDistribute super."haxparse"; - "haxr" = doDistribute super."haxr_3000_11_1_6"; - "haxr-th" = dontDistribute super."haxr-th"; - "haxy" = dontDistribute super."haxy"; - "hayland" = dontDistribute super."hayland"; - "hayoo-cli" = dontDistribute super."hayoo-cli"; - "hback" = dontDistribute super."hback"; - "hbb" = dontDistribute super."hbb"; - "hbcd" = dontDistribute super."hbcd"; - "hbeat" = dontDistribute super."hbeat"; - "hblas" = dontDistribute super."hblas"; - "hblock" = dontDistribute super."hblock"; - "hbro" = dontDistribute super."hbro"; - "hbro-contrib" = dontDistribute super."hbro-contrib"; - "hburg" = dontDistribute super."hburg"; - "hcc" = dontDistribute super."hcc"; - "hcg-minus" = dontDistribute super."hcg-minus"; - "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo"; - "hcheat" = dontDistribute super."hcheat"; - "hchesslib" = dontDistribute super."hchesslib"; - "hcltest" = dontDistribute super."hcltest"; - "hcoap" = dontDistribute super."hcoap"; - "hcron" = dontDistribute super."hcron"; - "hcube" = dontDistribute super."hcube"; - "hcwiid" = dontDistribute super."hcwiid"; - "hdaemonize" = doDistribute super."hdaemonize_0_5_0_2"; - "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix"; - "hdbc-aeson" = dontDistribute super."hdbc-aeson"; - "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore"; - "hdbc-tuple" = dontDistribute super."hdbc-tuple"; - "hdbi" = dontDistribute super."hdbi"; - "hdbi-conduit" = dontDistribute super."hdbi-conduit"; - "hdbi-postgresql" = dontDistribute super."hdbi-postgresql"; - "hdbi-sqlite" = dontDistribute super."hdbi-sqlite"; - "hdbi-tests" = dontDistribute super."hdbi-tests"; - "hdevtools" = doDistribute super."hdevtools_0_1_3_2"; - "hdf" = dontDistribute super."hdf"; - "hdigest" = dontDistribute super."hdigest"; - "hdirect" = dontDistribute super."hdirect"; - "hdis86" = dontDistribute super."hdis86"; - "hdiscount" = dontDistribute super."hdiscount"; - "hdm" = dontDistribute super."hdm"; - "hdo" = dontDistribute super."hdo"; - "hdph" = dontDistribute super."hdph"; - "hdph-closure" = dontDistribute super."hdph-closure"; - "hdr-histogram" = dontDistribute super."hdr-histogram"; - "headergen" = dontDistribute super."headergen"; - "heapsort" = dontDistribute super."heapsort"; - "hecc" = dontDistribute super."hecc"; - "heckle" = dontDistribute super."heckle"; - "hedis" = doDistribute super."hedis_0_6_10"; - "hedis-config" = dontDistribute super."hedis-config"; - "hedis-monadic" = dontDistribute super."hedis-monadic"; - "hedis-namespace" = dontDistribute super."hedis-namespace"; - "hedis-pile" = dontDistribute super."hedis-pile"; - "hedis-simple" = dontDistribute super."hedis-simple"; - "hedis-tags" = dontDistribute super."hedis-tags"; - "hedn" = dontDistribute super."hedn"; - "hein" = dontDistribute super."hein"; - "heist" = doDistribute super."heist_0_14_1_4"; - "heist-aeson" = dontDistribute super."heist-aeson"; - "heist-async" = dontDistribute super."heist-async"; - "helics" = dontDistribute super."helics"; - "helics-wai" = dontDistribute super."helics-wai"; - "helisp" = dontDistribute super."helisp"; - "helium" = dontDistribute super."helium"; - "helium-overture" = dontDistribute super."helium-overture"; - "helix" = dontDistribute super."helix"; - "hell" = dontDistribute super."hell"; - "hellage" = dontDistribute super."hellage"; - "hellnet" = dontDistribute super."hellnet"; - "hello" = dontDistribute super."hello"; - "helm" = dontDistribute super."helm"; - "help-esb" = dontDistribute super."help-esb"; - "hemkay" = dontDistribute super."hemkay"; - "hemkay-core" = dontDistribute super."hemkay-core"; - "hemokit" = dontDistribute super."hemokit"; - "hen" = dontDistribute super."hen"; - "henet" = dontDistribute super."henet"; - "hepevt" = dontDistribute super."hepevt"; - "her-lexer" = dontDistribute super."her-lexer"; - "her-lexer-parsec" = dontDistribute super."her-lexer-parsec"; - "herbalizer" = dontDistribute super."herbalizer"; - "heredocs" = dontDistribute super."heredocs"; - "herf-time" = dontDistribute super."herf-time"; - "hermit" = dontDistribute super."hermit"; - "hermit-syb" = dontDistribute super."hermit-syb"; - "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets"; - "heroku" = dontDistribute super."heroku"; - "heroku-persistent" = dontDistribute super."heroku-persistent"; - "herringbone" = dontDistribute super."herringbone"; - "herringbone-embed" = dontDistribute super."herringbone-embed"; - "herringbone-wai" = dontDistribute super."herringbone-wai"; - "hesh" = dontDistribute super."hesh"; - "hesql" = dontDistribute super."hesql"; - "hetero-dict" = dontDistribute super."hetero-dict"; - "hetero-map" = dontDistribute super."hetero-map"; - "hetris" = dontDistribute super."hetris"; - "heukarya" = dontDistribute super."heukarya"; - "hevolisa" = dontDistribute super."hevolisa"; - "hevolisa-dph" = dontDistribute super."hevolisa-dph"; - "hexdump" = dontDistribute super."hexdump"; - "hexif" = dontDistribute super."hexif"; - "hexpat-iteratee" = dontDistribute super."hexpat-iteratee"; - "hexpat-lens" = dontDistribute super."hexpat-lens"; - "hexpat-pickle" = dontDistribute super."hexpat-pickle"; - "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic"; - "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup"; - "hexpr" = dontDistribute super."hexpr"; - "hexquote" = dontDistribute super."hexquote"; - "hext" = dontDistribute super."hext"; - "heyefi" = dontDistribute super."heyefi"; - "hfann" = dontDistribute super."hfann"; - "hfd" = dontDistribute super."hfd"; - "hfiar" = dontDistribute super."hfiar"; - "hfmt" = dontDistribute super."hfmt"; - "hfoil" = dontDistribute super."hfoil"; - "hfov" = dontDistribute super."hfov"; - "hfractal" = dontDistribute super."hfractal"; - "hfusion" = dontDistribute super."hfusion"; - "hg-buildpackage" = dontDistribute super."hg-buildpackage"; - "hgal" = dontDistribute super."hgal"; - "hgalib" = dontDistribute super."hgalib"; - "hgdbmi" = dontDistribute super."hgdbmi"; - "hgearman" = dontDistribute super."hgearman"; - "hgen" = dontDistribute super."hgen"; - "hgeometric" = dontDistribute super."hgeometric"; - "hgeometry" = dontDistribute super."hgeometry"; - "hgeos" = dontDistribute super."hgeos"; - "hgithub" = dontDistribute super."hgithub"; - "hgl-example" = dontDistribute super."hgl-example"; - "hgmp" = dontDistribute super."hgmp"; - "hgom" = dontDistribute super."hgom"; - "hgopher" = dontDistribute super."hgopher"; - "hgrev" = dontDistribute super."hgrev"; - "hgrib" = dontDistribute super."hgrib"; - "hharp" = dontDistribute super."hharp"; - "hi" = dontDistribute super."hi"; - "hi3status" = dontDistribute super."hi3status"; - "hiccup" = dontDistribute super."hiccup"; - "hichi" = dontDistribute super."hichi"; - "hieraclus" = dontDistribute super."hieraclus"; - "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams"; - "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions"; - "hierarchy" = dontDistribute super."hierarchy"; - "hiernotify" = dontDistribute super."hiernotify"; - "highWaterMark" = dontDistribute super."highWaterMark"; - "higher-leveldb" = dontDistribute super."higher-leveldb"; - "higherorder" = dontDistribute super."higherorder"; - "highlight-versions" = dontDistribute super."highlight-versions"; - "highlighter" = dontDistribute super."highlighter"; - "highlighter2" = dontDistribute super."highlighter2"; - "hills" = dontDistribute super."hills"; - "himerge" = dontDistribute super."himerge"; - "himg" = dontDistribute super."himg"; - "himpy" = dontDistribute super."himpy"; - "hindley-milner" = dontDistribute super."hindley-milner"; - "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori"; - "hinduce-classifier" = dontDistribute super."hinduce-classifier"; - "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree"; - "hinduce-examples" = dontDistribute super."hinduce-examples"; - "hinduce-missingh" = dontDistribute super."hinduce-missingh"; - "hinotify-bytestring" = dontDistribute super."hinotify-bytestring"; - "hinquire" = dontDistribute super."hinquire"; - "hinstaller" = dontDistribute super."hinstaller"; - "hint" = doDistribute super."hint_0_5_2"; - "hint-server" = dontDistribute super."hint-server"; - "hinvaders" = dontDistribute super."hinvaders"; - "hinze-streams" = dontDistribute super."hinze-streams"; - "hip" = dontDistribute super."hip"; - "hipbot" = dontDistribute super."hipbot"; - "hipchat-hs" = dontDistribute super."hipchat-hs"; - "hipe" = dontDistribute super."hipe"; - "hips" = dontDistribute super."hips"; - "hircules" = dontDistribute super."hircules"; - "hirt" = dontDistribute super."hirt"; - "hissmetrics" = dontDistribute super."hissmetrics"; - "hist-pl" = dontDistribute super."hist-pl"; - "hist-pl-dawg" = dontDistribute super."hist-pl-dawg"; - "hist-pl-fusion" = dontDistribute super."hist-pl-fusion"; - "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon"; - "hist-pl-lmf" = dontDistribute super."hist-pl-lmf"; - "hist-pl-transliter" = dontDistribute super."hist-pl-transliter"; - "hist-pl-types" = dontDistribute super."hist-pl-types"; - "histogram-fill-binary" = dontDistribute super."histogram-fill-binary"; - "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal"; - "historian" = dontDistribute super."historian"; - "hit-graph" = dontDistribute super."hit-graph"; - "hjcase" = dontDistribute super."hjcase"; - "hjs" = dontDistribute super."hjs"; - "hjsmin" = doDistribute super."hjsmin_0_2_0_1"; - "hjson-query" = dontDistribute super."hjson-query"; - "hjsonpointer" = dontDistribute super."hjsonpointer"; - "hjsonschema" = dontDistribute super."hjsonschema"; - "hkdf" = dontDistribute super."hkdf"; - "hlatex" = dontDistribute super."hlatex"; - "hlbfgsb" = dontDistribute super."hlbfgsb"; - "hlcm" = dontDistribute super."hlcm"; - "hleap" = dontDistribute super."hleap"; - "hledger" = doDistribute super."hledger_0_27"; - "hledger-chart" = dontDistribute super."hledger-chart"; - "hledger-diff" = dontDistribute super."hledger-diff"; - "hledger-irr" = dontDistribute super."hledger-irr"; - "hledger-lib" = doDistribute super."hledger-lib_0_27"; - "hledger-ui" = doDistribute super."hledger-ui_0_27_4"; - "hledger-vty" = dontDistribute super."hledger-vty"; - "hlibBladeRF" = dontDistribute super."hlibBladeRF"; - "hlibev" = dontDistribute super."hlibev"; - "hlibfam" = dontDistribute super."hlibfam"; - "hlogger" = dontDistribute super."hlogger"; - "hlongurl" = dontDistribute super."hlongurl"; - "hls" = dontDistribute super."hls"; - "hlwm" = dontDistribute super."hlwm"; - "hly" = dontDistribute super."hly"; - "hmark" = dontDistribute super."hmark"; - "hmarkup" = dontDistribute super."hmarkup"; - "hmatrix-banded" = dontDistribute super."hmatrix-banded"; - "hmatrix-csv" = dontDistribute super."hmatrix-csv"; - "hmatrix-glpk" = dontDistribute super."hmatrix-glpk"; - "hmatrix-mmap" = dontDistribute super."hmatrix-mmap"; - "hmatrix-nipals" = dontDistribute super."hmatrix-nipals"; - "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp"; - "hmatrix-repa" = dontDistribute super."hmatrix-repa"; - "hmatrix-special" = dontDistribute super."hmatrix-special"; - "hmatrix-static" = dontDistribute super."hmatrix-static"; - "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc"; - "hmatrix-syntax" = dontDistribute super."hmatrix-syntax"; - "hmatrix-tests" = dontDistribute super."hmatrix-tests"; - "hmeap" = dontDistribute super."hmeap"; - "hmeap-utils" = dontDistribute super."hmeap-utils"; - "hmemdb" = dontDistribute super."hmemdb"; - "hmenu" = dontDistribute super."hmenu"; - "hmidi" = dontDistribute super."hmidi"; - "hmk" = dontDistribute super."hmk"; - "hmm" = dontDistribute super."hmm"; - "hmm-hmatrix" = dontDistribute super."hmm-hmatrix"; - "hmp3" = dontDistribute super."hmp3"; - "hmpfr" = dontDistribute super."hmpfr"; - "hmt-diagrams" = dontDistribute super."hmt-diagrams"; - "hmumps" = dontDistribute super."hmumps"; - "hnetcdf" = dontDistribute super."hnetcdf"; - "hnix" = dontDistribute super."hnix"; - "hnn" = dontDistribute super."hnn"; - "hnop" = dontDistribute super."hnop"; - "ho-rewriting" = dontDistribute super."ho-rewriting"; - "hoauth" = dontDistribute super."hoauth"; - "hob" = dontDistribute super."hob"; - "hobbes" = dontDistribute super."hobbes"; - "hobbits" = dontDistribute super."hobbits"; - "hocilib" = dontDistribute super."hocilib"; - "hoe" = dontDistribute super."hoe"; - "hofix-mtl" = dontDistribute super."hofix-mtl"; - "hog" = dontDistribute super."hog"; - "hogg" = dontDistribute super."hogg"; - "hogre" = dontDistribute super."hogre"; - "hogre-examples" = dontDistribute super."hogre-examples"; - "hois" = dontDistribute super."hois"; - "hoist-error" = dontDistribute super."hoist-error"; - "hold-em" = dontDistribute super."hold-em"; - "hole" = dontDistribute super."hole"; - "holey-format" = dontDistribute super."holey-format"; - "homeomorphic" = dontDistribute super."homeomorphic"; - "hommage" = dontDistribute super."hommage"; - "hommage-ds" = dontDistribute super."hommage-ds"; - "homoiconic" = dontDistribute super."homoiconic"; - "homplexity" = dontDistribute super."homplexity"; - "honi" = dontDistribute super."honi"; - "honk" = dontDistribute super."honk"; - "hoobuddy" = dontDistribute super."hoobuddy"; - "hood" = dontDistribute super."hood"; - "hood-off" = dontDistribute super."hood-off"; - "hood2" = dontDistribute super."hood2"; - "hoodie" = dontDistribute super."hoodie"; - "hoodle" = dontDistribute super."hoodle"; - "hoodle-builder" = dontDistribute super."hoodle-builder"; - "hoodle-core" = dontDistribute super."hoodle-core"; - "hoodle-extra" = dontDistribute super."hoodle-extra"; - "hoodle-parser" = dontDistribute super."hoodle-parser"; - "hoodle-publish" = dontDistribute super."hoodle-publish"; - "hoodle-render" = dontDistribute super."hoodle-render"; - "hoodle-types" = dontDistribute super."hoodle-types"; - "hoogle" = doDistribute super."hoogle_4_2_43"; - "hoogle-index" = dontDistribute super."hoogle-index"; - "hooks-dir" = dontDistribute super."hooks-dir"; - "hoovie" = dontDistribute super."hoovie"; - "hopencc" = dontDistribute super."hopencc"; - "hopencl" = dontDistribute super."hopencl"; - "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_18"; - "hopfield" = dontDistribute super."hopfield"; - "hopfield-networks" = dontDistribute super."hopfield-networks"; - "hopfli" = dontDistribute super."hopfli"; - "hoppy-docs" = dontDistribute super."hoppy-docs"; - "hoppy-generator" = dontDistribute super."hoppy-generator"; - "hoppy-runtime" = dontDistribute super."hoppy-runtime"; - "hoppy-std" = dontDistribute super."hoppy-std"; - "hops" = dontDistribute super."hops"; - "hoq" = dontDistribute super."hoq"; - "horizon" = dontDistribute super."horizon"; - "hosc-json" = dontDistribute super."hosc-json"; - "hosc-utils" = dontDistribute super."hosc-utils"; - "hosts-server" = dontDistribute super."hosts-server"; - "hothasktags" = dontDistribute super."hothasktags"; - "hotswap" = dontDistribute super."hotswap"; - "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing"; - "houseman" = dontDistribute super."houseman"; - "hp2any-core" = dontDistribute super."hp2any-core"; - "hp2any-graph" = dontDistribute super."hp2any-graph"; - "hp2any-manager" = dontDistribute super."hp2any-manager"; - "hp2html" = dontDistribute super."hp2html"; - "hp2pretty" = dontDistribute super."hp2pretty"; - "hpack-convert" = dontDistribute super."hpack-convert"; - "hpaco" = dontDistribute super."hpaco"; - "hpaco-lib" = dontDistribute super."hpaco-lib"; - "hpage" = dontDistribute super."hpage"; - "hpapi" = dontDistribute super."hpapi"; - "hpaste" = dontDistribute super."hpaste"; - "hpasteit" = dontDistribute super."hpasteit"; - "hpath" = dontDistribute super."hpath"; - "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_4"; - "hpc-strobe" = dontDistribute super."hpc-strobe"; - "hpc-tracer" = dontDistribute super."hpc-tracer"; - "hpdft" = dontDistribute super."hpdft"; - "hpio" = dontDistribute super."hpio"; - "hplayground" = dontDistribute super."hplayground"; - "hplaylist" = dontDistribute super."hplaylist"; - "hpodder" = dontDistribute super."hpodder"; - "hpp" = dontDistribute super."hpp"; - "hpqtypes" = dontDistribute super."hpqtypes"; - "hpqtypes-extras" = dontDistribute super."hpqtypes-extras"; - "hprotoc" = doDistribute super."hprotoc_2_2_0"; - "hprotoc-fork" = dontDistribute super."hprotoc-fork"; - "hps" = dontDistribute super."hps"; - "hps-cairo" = dontDistribute super."hps-cairo"; - "hps-kmeans" = dontDistribute super."hps-kmeans"; - "hpuz" = dontDistribute super."hpuz"; - "hpygments" = dontDistribute super."hpygments"; - "hpylos" = dontDistribute super."hpylos"; - "hpyrg" = dontDistribute super."hpyrg"; - "hquantlib" = dontDistribute super."hquantlib"; - "hquery" = dontDistribute super."hquery"; - "hranker" = dontDistribute super."hranker"; - "hreader" = dontDistribute super."hreader"; - "hricket" = dontDistribute super."hricket"; - "hruby" = dontDistribute super."hruby"; - "hs-blake2" = dontDistribute super."hs-blake2"; - "hs-captcha" = dontDistribute super."hs-captcha"; - "hs-carbon" = dontDistribute super."hs-carbon"; - "hs-carbon-examples" = dontDistribute super."hs-carbon-examples"; - "hs-cdb" = dontDistribute super."hs-cdb"; - "hs-dotnet" = dontDistribute super."hs-dotnet"; - "hs-duktape" = dontDistribute super."hs-duktape"; - "hs-excelx" = dontDistribute super."hs-excelx"; - "hs-ffmpeg" = dontDistribute super."hs-ffmpeg"; - "hs-fltk" = dontDistribute super."hs-fltk"; - "hs-gchart" = dontDistribute super."hs-gchart"; - "hs-gen-iface" = dontDistribute super."hs-gen-iface"; - "hs-gizapp" = dontDistribute super."hs-gizapp"; - "hs-inspector" = dontDistribute super."hs-inspector"; - "hs-java" = dontDistribute super."hs-java"; - "hs-json-rpc" = dontDistribute super."hs-json-rpc"; - "hs-logo" = dontDistribute super."hs-logo"; - "hs-mesos" = dontDistribute super."hs-mesos"; - "hs-nombre-generator" = dontDistribute super."hs-nombre-generator"; - "hs-pgms" = dontDistribute super."hs-pgms"; - "hs-php-session" = dontDistribute super."hs-php-session"; - "hs-pkg-config" = dontDistribute super."hs-pkg-config"; - "hs-pkpass" = dontDistribute super."hs-pkpass"; - "hs-popen" = dontDistribute super."hs-popen"; - "hs-re" = dontDistribute super."hs-re"; - "hs-scrape" = dontDistribute super."hs-scrape"; - "hs-twitter" = dontDistribute super."hs-twitter"; - "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver"; - "hs-vcard" = dontDistribute super."hs-vcard"; - "hs-watchman" = dontDistribute super."hs-watchman"; - "hs2048" = dontDistribute super."hs2048"; - "hs2bf" = dontDistribute super."hs2bf"; - "hs2dot" = dontDistribute super."hs2dot"; - "hsConfigure" = dontDistribute super."hsConfigure"; - "hsSqlite3" = dontDistribute super."hsSqlite3"; - "hsXenCtrl" = dontDistribute super."hsXenCtrl"; - "hsay" = dontDistribute super."hsay"; - "hsbackup" = dontDistribute super."hsbackup"; - "hsbencher" = dontDistribute super."hsbencher"; - "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed"; - "hsbencher-fusion" = dontDistribute super."hsbencher-fusion"; - "hsc2hs" = dontDistribute super."hsc2hs"; - "hsc3" = dontDistribute super."hsc3"; - "hsc3-auditor" = dontDistribute super."hsc3-auditor"; - "hsc3-cairo" = dontDistribute super."hsc3-cairo"; - "hsc3-data" = dontDistribute super."hsc3-data"; - "hsc3-db" = dontDistribute super."hsc3-db"; - "hsc3-dot" = dontDistribute super."hsc3-dot"; - "hsc3-forth" = dontDistribute super."hsc3-forth"; - "hsc3-graphs" = dontDistribute super."hsc3-graphs"; - "hsc3-lang" = dontDistribute super."hsc3-lang"; - "hsc3-lisp" = dontDistribute super."hsc3-lisp"; - "hsc3-plot" = dontDistribute super."hsc3-plot"; - "hsc3-process" = dontDistribute super."hsc3-process"; - "hsc3-rec" = dontDistribute super."hsc3-rec"; - "hsc3-rw" = dontDistribute super."hsc3-rw"; - "hsc3-server" = dontDistribute super."hsc3-server"; - "hsc3-sf" = dontDistribute super."hsc3-sf"; - "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile"; - "hsc3-unsafe" = dontDistribute super."hsc3-unsafe"; - "hsc3-utils" = dontDistribute super."hsc3-utils"; - "hscaffold" = dontDistribute super."hscaffold"; - "hscamwire" = dontDistribute super."hscamwire"; - "hscassandra" = dontDistribute super."hscassandra"; - "hscd" = dontDistribute super."hscd"; - "hsclock" = dontDistribute super."hsclock"; - "hscope" = dontDistribute super."hscope"; - "hscrtmpl" = dontDistribute super."hscrtmpl"; - "hscuid" = dontDistribute super."hscuid"; - "hscurses" = dontDistribute super."hscurses"; - "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex"; - "hsdif" = dontDistribute super."hsdif"; - "hsdip" = dontDistribute super."hsdip"; - "hsdns" = dontDistribute super."hsdns"; - "hsdns-cache" = dontDistribute super."hsdns-cache"; - "hsemail-ns" = dontDistribute super."hsemail-ns"; - "hsenv" = dontDistribute super."hsenv"; - "hserv" = dontDistribute super."hserv"; - "hset" = dontDistribute super."hset"; - "hsfacter" = dontDistribute super."hsfacter"; - "hsfcsh" = dontDistribute super."hsfcsh"; - "hsfilt" = dontDistribute super."hsfilt"; - "hsgnutls" = dontDistribute super."hsgnutls"; - "hsgnutls-yj" = dontDistribute super."hsgnutls-yj"; - "hsgsom" = dontDistribute super."hsgsom"; - "hsgtd" = dontDistribute super."hsgtd"; - "hsharc" = dontDistribute super."hsharc"; - "hsilop" = dontDistribute super."hsilop"; - "hsimport" = dontDistribute super."hsimport"; - "hsini" = dontDistribute super."hsini"; - "hskeleton" = dontDistribute super."hskeleton"; - "hslackbuilder" = dontDistribute super."hslackbuilder"; - "hslibsvm" = dontDistribute super."hslibsvm"; - "hslinks" = dontDistribute super."hslinks"; - "hslogger-reader" = dontDistribute super."hslogger-reader"; - "hslogger-template" = dontDistribute super."hslogger-template"; - "hslogger4j" = dontDistribute super."hslogger4j"; - "hslogstash" = dontDistribute super."hslogstash"; - "hsmagick" = dontDistribute super."hsmagick"; - "hsmisc" = dontDistribute super."hsmisc"; - "hsmtpclient" = dontDistribute super."hsmtpclient"; - "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector"; - "hsnock" = dontDistribute super."hsnock"; - "hsnoise" = dontDistribute super."hsnoise"; - "hsns" = dontDistribute super."hsns"; - "hsnsq" = dontDistribute super."hsnsq"; - "hsntp" = dontDistribute super."hsntp"; - "hsoptions" = dontDistribute super."hsoptions"; - "hsp-cgi" = dontDistribute super."hsp-cgi"; - "hsparklines" = dontDistribute super."hsparklines"; - "hsparql" = dontDistribute super."hsparql"; - "hspear" = dontDistribute super."hspear"; - "hspec-checkers" = dontDistribute super."hspec-checkers"; - "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens"; - "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted"; - "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty"; - "hspec-experimental" = dontDistribute super."hspec-experimental"; - "hspec-golden-aeson" = dontDistribute super."hspec-golden-aeson"; - "hspec-hashable" = dontDistribute super."hspec-hashable"; - "hspec-laws" = dontDistribute super."hspec-laws"; - "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_1"; - "hspec-monad-control" = dontDistribute super."hspec-monad-control"; - "hspec-server" = dontDistribute super."hspec-server"; - "hspec-shouldbe" = dontDistribute super."hspec-shouldbe"; - "hspec-slow" = dontDistribute super."hspec-slow"; - "hspec-snap" = doDistribute super."hspec-snap_0_4_0_1"; - "hspec-stack-rerun" = dontDistribute super."hspec-stack-rerun"; - "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter"; - "hspec-test-framework" = dontDistribute super."hspec-test-framework"; - "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th"; - "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox"; - "hspec-webdriver" = doDistribute super."hspec-webdriver_1_1_0"; - "hspec2" = dontDistribute super."hspec2"; - "hspecVariant" = dontDistribute super."hspecVariant"; - "hspr-sh" = dontDistribute super."hspr-sh"; - "hspread" = dontDistribute super."hspread"; - "hspresent" = dontDistribute super."hspresent"; - "hsprocess" = dontDistribute super."hsprocess"; - "hsql" = dontDistribute super."hsql"; - "hsql-mysql" = dontDistribute super."hsql-mysql"; - "hsql-odbc" = dontDistribute super."hsql-odbc"; - "hsql-postgresql" = dontDistribute super."hsql-postgresql"; - "hsql-sqlite3" = dontDistribute super."hsql-sqlite3"; - "hsqml" = dontDistribute super."hsqml"; - "hsqml-datamodel" = dontDistribute super."hsqml-datamodel"; - "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl"; - "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris"; - "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes"; - "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples"; - "hsqml-morris" = dontDistribute super."hsqml-morris"; - "hsreadability" = dontDistribute super."hsreadability"; - "hsrelp" = dontDistribute super."hsrelp"; - "hsseccomp" = dontDistribute super."hsseccomp"; - "hsshellscript" = dontDistribute super."hsshellscript"; - "hssourceinfo" = dontDistribute super."hssourceinfo"; - "hssqlppp" = dontDistribute super."hssqlppp"; - "hssqlppp-th" = dontDistribute super."hssqlppp-th"; - "hstats" = dontDistribute super."hstats"; - "hstest" = dontDistribute super."hstest"; - "hstidy" = dontDistribute super."hstidy"; - "hstorchat" = dontDistribute super."hstorchat"; - "hstradeking" = dontDistribute super."hstradeking"; - "hstyle" = dontDistribute super."hstyle"; - "hstzaar" = dontDistribute super."hstzaar"; - "hsubconvert" = dontDistribute super."hsubconvert"; - "hsverilog" = dontDistribute super."hsverilog"; - "hswip" = dontDistribute super."hswip"; - "hsx" = dontDistribute super."hsx"; - "hsx-xhtml" = dontDistribute super."hsx-xhtml"; - "hsyscall" = dontDistribute super."hsyscall"; - "hsyslog" = doDistribute super."hsyslog_2_0"; - "hsyslog-udp" = dontDistribute super."hsyslog-udp"; - "hszephyr" = dontDistribute super."hszephyr"; - "htags" = dontDistribute super."htags"; - "htar" = dontDistribute super."htar"; - "htestu" = dontDistribute super."htestu"; - "htiled" = dontDistribute super."htiled"; - "htime" = dontDistribute super."htime"; - "html-email-validate" = dontDistribute super."html-email-validate"; - "html-entities" = dontDistribute super."html-entities"; - "html-kure" = dontDistribute super."html-kure"; - "html-minimalist" = dontDistribute super."html-minimalist"; - "html-parse" = dontDistribute super."html-parse"; - "html-rules" = dontDistribute super."html-rules"; - "html-tokenizer" = dontDistribute super."html-tokenizer"; - "html-truncate" = dontDistribute super."html-truncate"; - "html2hamlet" = dontDistribute super."html2hamlet"; - "html5-entity" = dontDistribute super."html5-entity"; - "htodo" = dontDistribute super."htodo"; - "htrace" = dontDistribute super."htrace"; - "hts" = dontDistribute super."hts"; - "htsn" = dontDistribute super."htsn"; - "htsn-common" = dontDistribute super."htsn-common"; - "htsn-import" = dontDistribute super."htsn-import"; - "http-attoparsec" = dontDistribute super."http-attoparsec"; - "http-client" = doDistribute super."http-client_0_4_31"; - "http-client-auth" = dontDistribute super."http-client-auth"; - "http-client-conduit" = dontDistribute super."http-client-conduit"; - "http-client-lens" = dontDistribute super."http-client-lens"; - "http-client-multipart" = dontDistribute super."http-client-multipart"; - "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers"; - "http-client-session" = dontDistribute super."http-client-session"; - "http-client-streams" = dontDistribute super."http-client-streams"; - "http-conduit-browser" = dontDistribute super."http-conduit-browser"; - "http-conduit-downloader" = dontDistribute super."http-conduit-downloader"; - "http-dispatch" = dontDistribute super."http-dispatch"; - "http-encodings" = dontDistribute super."http-encodings"; - "http-enumerator" = dontDistribute super."http-enumerator"; - "http-kinder" = dontDistribute super."http-kinder"; - "http-kit" = dontDistribute super."http-kit"; - "http-link-header" = doDistribute super."http-link-header_1_0_1"; - "http-listen" = dontDistribute super."http-listen"; - "http-monad" = dontDistribute super."http-monad"; - "http-proxy" = dontDistribute super."http-proxy"; - "http-querystring" = dontDistribute super."http-querystring"; - "http-response-decoder" = dontDistribute super."http-response-decoder"; - "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_3"; - "http-server" = dontDistribute super."http-server"; - "http-shed" = dontDistribute super."http-shed"; - "http-streams" = doDistribute super."http-streams_0_8_3_3"; - "http-test" = dontDistribute super."http-test"; - "http-trace" = dontDistribute super."http-trace"; - "http-wget" = dontDistribute super."http-wget"; - "http2" = doDistribute super."http2_1_6_1"; - "https-everywhere-rules" = dontDistribute super."https-everywhere-rules"; - "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw"; - "httpspec" = dontDistribute super."httpspec"; - "htune" = dontDistribute super."htune"; - "htzaar" = dontDistribute super."htzaar"; - "hub" = dontDistribute super."hub"; - "hubigraph" = dontDistribute super."hubigraph"; - "hubris" = dontDistribute super."hubris"; - "huckleberry" = dontDistribute super."huckleberry"; - "huffman" = dontDistribute super."huffman"; - "hugs2yc" = dontDistribute super."hugs2yc"; - "hulk" = dontDistribute super."hulk"; - "hums" = dontDistribute super."hums"; - "hunch" = dontDistribute super."hunch"; - "hunit-gui" = dontDistribute super."hunit-gui"; - "hunit-parsec" = dontDistribute super."hunit-parsec"; - "hunit-rematch" = dontDistribute super."hunit-rematch"; - "hunp" = dontDistribute super."hunp"; - "hunt-searchengine" = dontDistribute super."hunt-searchengine"; - "hunt-server" = dontDistribute super."hunt-server"; - "hunt-server-cli" = dontDistribute super."hunt-server-cli"; - "hurdle" = dontDistribute super."hurdle"; - "husk-scheme" = dontDistribute super."husk-scheme"; - "husk-scheme-libs" = dontDistribute super."husk-scheme-libs"; - "husky" = dontDistribute super."husky"; - "hutton" = dontDistribute super."hutton"; - "huttons-razor" = dontDistribute super."huttons-razor"; - "huzzy" = dontDistribute super."huzzy"; - "hw-bits" = doDistribute super."hw-bits_0_0_0_6"; - "hw-diagnostics" = doDistribute super."hw-diagnostics_0_0_0_2"; - "hw-json" = doDistribute super."hw-json_0_0_0_2"; - "hw-mquery" = dontDistribute super."hw-mquery"; - "hw-prim" = doDistribute super."hw-prim_0_0_0_10"; - "hw-rankselect" = doDistribute super."hw-rankselect_0_0_0_2"; - "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk"; - "hws" = dontDistribute super."hws"; - "hwsl2" = dontDistribute super."hwsl2"; - "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector"; - "hwsl2-reducers" = dontDistribute super."hwsl2-reducers"; - "hx" = dontDistribute super."hx"; - "hxmppc" = dontDistribute super."hxmppc"; - "hxournal" = dontDistribute super."hxournal"; - "hxt-binary" = dontDistribute super."hxt-binary"; - "hxt-cache" = dontDistribute super."hxt-cache"; - "hxt-css" = doDistribute super."hxt-css_0_1_0_2"; - "hxt-extras" = dontDistribute super."hxt-extras"; - "hxt-filter" = dontDistribute super."hxt-filter"; - "hxt-xpath" = dontDistribute super."hxt-xpath"; - "hxt-xslt" = dontDistribute super."hxt-xslt"; - "hxthelper" = dontDistribute super."hxthelper"; - "hxweb" = dontDistribute super."hxweb"; - "hyahtzee" = dontDistribute super."hyahtzee"; - "hyakko" = dontDistribute super."hyakko"; - "hybrid" = dontDistribute super."hybrid"; - "hydra-hs" = dontDistribute super."hydra-hs"; - "hydra-print" = dontDistribute super."hydra-print"; - "hydrogen" = dontDistribute super."hydrogen"; - "hydrogen-cli" = dontDistribute super."hydrogen-cli"; - "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args"; - "hydrogen-data" = dontDistribute super."hydrogen-data"; - "hydrogen-multimap" = dontDistribute super."hydrogen-multimap"; - "hydrogen-parsing" = dontDistribute super."hydrogen-parsing"; - "hydrogen-prelude" = dontDistribute super."hydrogen-prelude"; - "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec"; - "hydrogen-syntax" = dontDistribute super."hydrogen-syntax"; - "hydrogen-util" = dontDistribute super."hydrogen-util"; - "hydrogen-version" = dontDistribute super."hydrogen-version"; - "hyena" = dontDistribute super."hyena"; - "hylide" = dontDistribute super."hylide"; - "hylogen" = dontDistribute super."hylogen"; - "hylolib" = dontDistribute super."hylolib"; - "hylotab" = dontDistribute super."hylotab"; - "hyloutils" = dontDistribute super."hyloutils"; - "hyperdrive" = dontDistribute super."hyperdrive"; - "hyperfunctions" = dontDistribute super."hyperfunctions"; - "hyperloglogplus" = dontDistribute super."hyperloglogplus"; - "hyperpublic" = dontDistribute super."hyperpublic"; - "hyphenate" = dontDistribute super."hyphenate"; - "hypher" = dontDistribute super."hypher"; - "hzaif" = dontDistribute super."hzaif"; - "hzk" = dontDistribute super."hzk"; - "i18n" = dontDistribute super."i18n"; - "iCalendar" = dontDistribute super."iCalendar"; - "iException" = dontDistribute super."iException"; - "iap-verifier" = dontDistribute super."iap-verifier"; - "ib-api" = dontDistribute super."ib-api"; - "iban" = dontDistribute super."iban"; - "ibus-hs" = dontDistribute super."ibus-hs"; - "ideas" = dontDistribute super."ideas"; - "ideas-math" = dontDistribute super."ideas-math"; - "idempotent" = dontDistribute super."idempotent"; - "identicon" = dontDistribute super."identicon"; - "identifiers" = dontDistribute super."identifiers"; - "idiii" = dontDistribute super."idiii"; - "idna" = dontDistribute super."idna"; - "idna2008" = dontDistribute super."idna2008"; - "idringen" = dontDistribute super."idringen"; - "idris" = doDistribute super."idris_0_11_2"; - "ieee" = dontDistribute super."ieee"; - "ieee-utils" = dontDistribute super."ieee-utils"; - "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix"; - "ieee754-parser" = dontDistribute super."ieee754-parser"; - "ifcxt" = dontDistribute super."ifcxt"; - "iff" = dontDistribute super."iff"; - "ifscs" = dontDistribute super."ifscs"; - "ig" = doDistribute super."ig_0_7"; - "ige-mac-integration" = dontDistribute super."ige-mac-integration"; - "igraph" = dontDistribute super."igraph"; - "igrf" = dontDistribute super."igrf"; - "ihaskell-display" = dontDistribute super."ihaskell-display"; - "ihaskell-parsec" = dontDistribute super."ihaskell-parsec"; - "ihaskell-plot" = dontDistribute super."ihaskell-plot"; - "ihaskell-widgets" = dontDistribute super."ihaskell-widgets"; - "ihttp" = dontDistribute super."ihttp"; - "ilist" = dontDistribute super."ilist"; - "illuminate" = dontDistribute super."illuminate"; - "image-type" = dontDistribute super."image-type"; - "imagefilters" = dontDistribute super."imagefilters"; - "imagemagick" = dontDistribute super."imagemagick"; - "imagepaste" = dontDistribute super."imagepaste"; - "imap" = dontDistribute super."imap"; - "imapget" = dontDistribute super."imapget"; - "imbib" = dontDistribute super."imbib"; - "imgurder" = dontDistribute super."imgurder"; - "imm" = dontDistribute super."imm"; - "imparse" = dontDistribute super."imparse"; - "imperative-edsl" = dontDistribute super."imperative-edsl"; - "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl"; - "implicit" = dontDistribute super."implicit"; - "implicit-logging" = dontDistribute super."implicit-logging"; - "implicit-params" = dontDistribute super."implicit-params"; - "imports" = dontDistribute super."imports"; - "impossible" = dontDistribute super."impossible"; - "improve" = dontDistribute super."improve"; - "impure-containers" = dontDistribute super."impure-containers"; - "inc-ref" = dontDistribute super."inc-ref"; - "inch" = dontDistribute super."inch"; - "inchworm" = dontDistribute super."inchworm"; - "incremental-computing" = dontDistribute super."incremental-computing"; - "incremental-maps" = dontDistribute super."incremental-maps"; - "incremental-sat-solver" = dontDistribute super."incremental-sat-solver"; - "increments" = dontDistribute super."increments"; - "indentation" = dontDistribute super."indentation"; - "indentation-core" = dontDistribute super."indentation-core"; - "indentation-parsec" = dontDistribute super."indentation-parsec"; - "indentation-trifecta" = dontDistribute super."indentation-trifecta"; - "indentparser" = dontDistribute super."indentparser"; - "index-core" = dontDistribute super."index-core"; - "indexed" = dontDistribute super."indexed"; - "indexed-do-notation" = dontDistribute super."indexed-do-notation"; - "indexed-extras" = dontDistribute super."indexed-extras"; - "indexed-free" = dontDistribute super."indexed-free"; - "indian-language-font-converter" = dontDistribute super."indian-language-font-converter"; - "indices" = dontDistribute super."indices"; - "indieweb-algorithms" = dontDistribute super."indieweb-algorithms"; - "inf-interval" = dontDistribute super."inf-interval"; - "infer-upstream" = dontDistribute super."infer-upstream"; - "infernu" = dontDistribute super."infernu"; - "infinite-search" = dontDistribute super."infinite-search"; - "infinity" = dontDistribute super."infinity"; - "infix" = dontDistribute super."infix"; - "inflist" = dontDistribute super."inflist"; - "influxdb" = dontDistribute super."influxdb"; - "informative" = dontDistribute super."informative"; - "ini-qq" = dontDistribute super."ini-qq"; - "inilist" = dontDistribute super."inilist"; - "inject" = dontDistribute super."inject"; - "inject-function" = dontDistribute super."inject-function"; - "inline-c" = doDistribute super."inline-c_0_5_5_5"; - "inline-c-win32" = dontDistribute super."inline-c-win32"; - "inline-java" = dontDistribute super."inline-java"; - "inline-r" = doDistribute super."inline-r_0_8_0_1"; - "inquire" = dontDistribute super."inquire"; - "inserts" = dontDistribute super."inserts"; - "inspection-proxy" = dontDistribute super."inspection-proxy"; - "instance-control" = dontDistribute super."instance-control"; - "instant-aeson" = dontDistribute super."instant-aeson"; - "instant-bytes" = dontDistribute super."instant-bytes"; - "instant-deepseq" = dontDistribute super."instant-deepseq"; - "instant-generics" = dontDistribute super."instant-generics"; - "instant-hashable" = dontDistribute super."instant-hashable"; - "instant-zipper" = dontDistribute super."instant-zipper"; - "instinct" = dontDistribute super."instinct"; - "instrument-chord" = dontDistribute super."instrument-chord"; - "int-cast" = dontDistribute super."int-cast"; - "integer-pure" = dontDistribute super."integer-pure"; - "integer-simple" = dontDistribute super."integer-simple"; - "intel-aes" = dontDistribute super."intel-aes"; - "interchangeable" = dontDistribute super."interchangeable"; - "interleavableGen" = dontDistribute super."interleavableGen"; - "interleavableIO" = dontDistribute super."interleavableIO"; - "interleave" = dontDistribute super."interleave"; - "interlude" = dontDistribute super."interlude"; - "interlude-l" = dontDistribute super."interlude-l"; - "intern" = dontDistribute super."intern"; - "internetmarke" = dontDistribute super."internetmarke"; - "intero" = dontDistribute super."intero"; - "interpol" = dontDistribute super."interpol"; - "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq"; - "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton"; - "interpolation" = dontDistribute super."interpolation"; - "interruptible" = dontDistribute super."interruptible"; - "interspersed" = dontDistribute super."interspersed"; - "interval" = dontDistribute super."interval"; - "intricacy" = dontDistribute super."intricacy"; - "intset" = dontDistribute super."intset"; - "invariant" = doDistribute super."invariant_0_3_1"; - "invertible" = dontDistribute super."invertible"; - "invertible-syntax" = dontDistribute super."invertible-syntax"; - "io-capture" = dontDistribute super."io-capture"; - "io-reactive" = dontDistribute super."io-reactive"; - "io-streams-haproxy" = dontDistribute super."io-streams-haproxy"; - "io-streams-http" = dontDistribute super."io-streams-http"; - "io-throttle" = dontDistribute super."io-throttle"; - "ioctl" = dontDistribute super."ioctl"; - "ioref-stable" = dontDistribute super."ioref-stable"; - "iothread" = dontDistribute super."iothread"; - "iotransaction" = dontDistribute super."iotransaction"; - "ip" = dontDistribute super."ip"; - "ip-quoter" = dontDistribute super."ip-quoter"; - "ipatch" = dontDistribute super."ipatch"; - "ipc" = dontDistribute super."ipc"; - "ipcvar" = dontDistribute super."ipcvar"; - "ipopt-hs" = dontDistribute super."ipopt-hs"; - "ipprint" = dontDistribute super."ipprint"; - "iptables-helpers" = dontDistribute super."iptables-helpers"; - "iptadmin" = dontDistribute super."iptadmin"; - "irc-bytestring" = dontDistribute super."irc-bytestring"; - "irc-client" = doDistribute super."irc-client_0_3_0_0"; - "irc-colors" = dontDistribute super."irc-colors"; - "irc-conduit" = doDistribute super."irc-conduit_0_1_2_0"; - "irc-core" = dontDistribute super."irc-core"; - "irc-dcc" = doDistribute super."irc-dcc_1_2_1"; - "irc-fun-bot" = dontDistribute super."irc-fun-bot"; - "irc-fun-client" = dontDistribute super."irc-fun-client"; - "irc-fun-color" = dontDistribute super."irc-fun-color"; - "irc-fun-messages" = dontDistribute super."irc-fun-messages"; - "irc-fun-types" = dontDistribute super."irc-fun-types"; - "ircbot" = dontDistribute super."ircbot"; - "ircbouncer" = dontDistribute super."ircbouncer"; - "ireal" = dontDistribute super."ireal"; - "iridium" = dontDistribute super."iridium"; - "iron-mq" = dontDistribute super."iron-mq"; - "ironforge" = dontDistribute super."ironforge"; - "is" = dontDistribute super."is"; - "isdicom" = dontDistribute super."isdicom"; - "isevaluated" = dontDistribute super."isevaluated"; - "isiz" = dontDistribute super."isiz"; - "ismtp" = dontDistribute super."ismtp"; - "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps"; - "isobmff-builder" = dontDistribute super."isobmff-builder"; - "isohunt" = dontDistribute super."isohunt"; - "isotope" = dontDistribute super."isotope"; - "ispositive" = dontDistribute super."ispositive"; - "itanium-abi" = dontDistribute super."itanium-abi"; - "iter-stats" = dontDistribute super."iter-stats"; - "iterIO" = dontDistribute super."iterIO"; - "iteratee" = dontDistribute super."iteratee"; - "iteratee-compress" = dontDistribute super."iteratee-compress"; - "iteratee-mtl" = dontDistribute super."iteratee-mtl"; - "iteratee-parsec" = dontDistribute super."iteratee-parsec"; - "iteratee-stm" = dontDistribute super."iteratee-stm"; - "iterio-server" = dontDistribute super."iterio-server"; - "ivar-simple" = dontDistribute super."ivar-simple"; - "ivor" = dontDistribute super."ivor"; - "ivory" = dontDistribute super."ivory"; - "ivory-artifact" = dontDistribute super."ivory-artifact"; - "ivory-backend-c" = dontDistribute super."ivory-backend-c"; - "ivory-bitdata" = dontDistribute super."ivory-bitdata"; - "ivory-eval" = dontDistribute super."ivory-eval"; - "ivory-examples" = dontDistribute super."ivory-examples"; - "ivory-hw" = dontDistribute super."ivory-hw"; - "ivory-opts" = dontDistribute super."ivory-opts"; - "ivory-quickcheck" = dontDistribute super."ivory-quickcheck"; - "ivory-serialize" = dontDistribute super."ivory-serialize"; - "ivory-stdlib" = dontDistribute super."ivory-stdlib"; - "ivy-web" = dontDistribute super."ivy-web"; - "ixdopp" = dontDistribute super."ixdopp"; - "ixmonad" = dontDistribute super."ixmonad"; - "iyql" = dontDistribute super."iyql"; - "j2hs" = dontDistribute super."j2hs"; - "ja-base-extra" = dontDistribute super."ja-base-extra"; - "jack" = dontDistribute super."jack"; - "jack-bindings" = dontDistribute super."jack-bindings"; - "jackminimix" = dontDistribute super."jackminimix"; - "jacobi-roots" = dontDistribute super."jacobi-roots"; - "jail" = dontDistribute super."jail"; - "jailbreak-cabal" = dontDistribute super."jailbreak-cabal"; - "jalaali" = dontDistribute super."jalaali"; - "jalla" = dontDistribute super."jalla"; - "jammittools" = dontDistribute super."jammittools"; - "jarfind" = dontDistribute super."jarfind"; - "java-bridge" = dontDistribute super."java-bridge"; - "java-bridge-extras" = dontDistribute super."java-bridge-extras"; - "java-character" = dontDistribute super."java-character"; - "java-poker" = dontDistribute super."java-poker"; - "java-reflect" = dontDistribute super."java-reflect"; - "javaclass" = dontDistribute super."javaclass"; - "javasf" = dontDistribute super."javasf"; - "javav" = dontDistribute super."javav"; - "jcdecaux-vls" = dontDistribute super."jcdecaux-vls"; - "jdi" = dontDistribute super."jdi"; - "jespresso" = dontDistribute super."jespresso"; - "jobqueue" = dontDistribute super."jobqueue"; - "join" = dontDistribute super."join"; - "joinlist" = dontDistribute super."joinlist"; - "jonathanscard" = dontDistribute super."jonathanscard"; - "jort" = dontDistribute super."jort"; - "jpeg" = dontDistribute super."jpeg"; - "js-good-parts" = dontDistribute super."js-good-parts"; - "js-jquery" = doDistribute super."js-jquery_1_12_4"; - "jsaddle" = doDistribute super."jsaddle_0_3_0_3"; - "jsaddle-dom" = dontDistribute super."jsaddle-dom"; - "jsaddle-hello" = dontDistribute super."jsaddle-hello"; - "jsc" = dontDistribute super."jsc"; - "jsmw" = dontDistribute super."jsmw"; - "json-api" = dontDistribute super."json-api"; - "json-assertions" = dontDistribute super."json-assertions"; - "json-ast" = dontDistribute super."json-ast"; - "json-ast-json-encoder" = dontDistribute super."json-ast-json-encoder"; - "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck"; - "json-b" = dontDistribute super."json-b"; - "json-encoder" = dontDistribute super."json-encoder"; - "json-enumerator" = dontDistribute super."json-enumerator"; - "json-extra" = dontDistribute super."json-extra"; - "json-fu" = dontDistribute super."json-fu"; - "json-incremental-decoder" = dontDistribute super."json-incremental-decoder"; - "json-litobj" = dontDistribute super."json-litobj"; - "json-pointer" = dontDistribute super."json-pointer"; - "json-pointer-aeson" = dontDistribute super."json-pointer-aeson"; - "json-pointer-hasql" = dontDistribute super."json-pointer-hasql"; - "json-python" = dontDistribute super."json-python"; - "json-qq" = dontDistribute super."json-qq"; - "json-rpc" = dontDistribute super."json-rpc"; - "json-rpc-client" = dontDistribute super."json-rpc-client"; - "json-rpc-generic" = dontDistribute super."json-rpc-generic"; - "json-rpc-server" = dontDistribute super."json-rpc-server"; - "json-sop" = dontDistribute super."json-sop"; - "json-state" = dontDistribute super."json-state"; - "json-stream" = dontDistribute super."json-stream"; - "json-togo" = dontDistribute super."json-togo"; - "json-tools" = dontDistribute super."json-tools"; - "json-types" = dontDistribute super."json-types"; - "json2" = dontDistribute super."json2"; - "json2-hdbc" = dontDistribute super."json2-hdbc"; - "json2-types" = dontDistribute super."json2-types"; - "json2yaml" = dontDistribute super."json2yaml"; - "jsonresume" = dontDistribute super."jsonresume"; - "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit"; - "jsonschema-gen" = dontDistribute super."jsonschema-gen"; - "jsonsql" = dontDistribute super."jsonsql"; - "jsontsv" = dontDistribute super."jsontsv"; - "jspath" = dontDistribute super."jspath"; - "juandelacosa" = dontDistribute super."juandelacosa"; - "judy" = dontDistribute super."judy"; - "jukebox" = dontDistribute super."jukebox"; - "jump" = dontDistribute super."jump"; - "jumpthefive" = dontDistribute super."jumpthefive"; - "jupyter" = dontDistribute super."jupyter"; - "jvm-parser" = dontDistribute super."jvm-parser"; - "kademlia" = dontDistribute super."kademlia"; - "kafka-client" = dontDistribute super."kafka-client"; - "kaleidoscope" = dontDistribute super."kaleidoscope"; - "kan-extensions" = doDistribute super."kan-extensions_4_2_3"; - "kangaroo" = dontDistribute super."kangaroo"; - "kansas-lava" = dontDistribute super."kansas-lava"; - "kansas-lava-cores" = dontDistribute super."kansas-lava-cores"; - "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio"; - "kansas-lava-shake" = dontDistribute super."kansas-lava-shake"; - "karakuri" = dontDistribute super."karakuri"; - "karver" = dontDistribute super."karver"; - "katip" = doDistribute super."katip_0_2_0_0"; - "katip-elasticsearch" = doDistribute super."katip-elasticsearch_0_2_1_0"; - "katt" = dontDistribute super."katt"; - "kawaii" = dontDistribute super."kawaii"; - "kawhi" = dontDistribute super."kawhi"; - "kazura-queue" = dontDistribute super."kazura-queue"; - "kbq-gu" = dontDistribute super."kbq-gu"; - "kd-tree" = dontDistribute super."kd-tree"; - "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra"; - "keenser" = dontDistribute super."keenser"; - "keera-callbacks" = dontDistribute super."keera-callbacks"; - "keera-hails-i18n" = dontDistribute super."keera-hails-i18n"; - "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller"; - "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk"; - "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel"; - "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel"; - "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config"; - "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk"; - "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view"; - "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk"; - "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs"; - "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk"; - "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network"; - "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling"; - "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx"; - "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa"; - "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses"; - "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues"; - "keera-posture" = dontDistribute super."keera-posture"; - "keiretsu" = dontDistribute super."keiretsu"; - "keter" = doDistribute super."keter_1_4_3_1"; - "kevin" = dontDistribute super."kevin"; - "keycode" = doDistribute super."keycode_0_2"; - "keyed" = dontDistribute super."keyed"; - "keyring" = dontDistribute super."keyring"; - "keysafe" = dontDistribute super."keysafe"; - "keystore" = dontDistribute super."keystore"; - "keyvaluehash" = dontDistribute super."keyvaluehash"; - "keyword-args" = dontDistribute super."keyword-args"; - "khph" = dontDistribute super."khph"; - "kibro" = dontDistribute super."kibro"; - "kicad-data" = dontDistribute super."kicad-data"; - "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser"; - "kickchan" = dontDistribute super."kickchan"; - "kif-parser" = dontDistribute super."kif-parser"; - "kinds" = dontDistribute super."kinds"; - "kit" = dontDistribute super."kit"; - "kmeans-par" = dontDistribute super."kmeans-par"; - "kmeans-vector" = dontDistribute super."kmeans-vector"; - "knead" = dontDistribute super."knead"; - "knead-arithmetic" = dontDistribute super."knead-arithmetic"; - "knots" = dontDistribute super."knots"; - "koellner-phonetic" = dontDistribute super."koellner-phonetic"; - "kontrakcja-templates" = dontDistribute super."kontrakcja-templates"; - "korfu" = dontDistribute super."korfu"; - "kqueue" = dontDistribute super."kqueue"; - "krpc" = dontDistribute super."krpc"; - "ks-test" = dontDistribute super."ks-test"; - "ktx" = dontDistribute super."ktx"; - "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate"; - "kyotocabinet" = dontDistribute super."kyotocabinet"; - "l-bfgs-b" = dontDistribute super."l-bfgs-b"; - "labeled-graph" = dontDistribute super."labeled-graph"; - "labeled-tree" = dontDistribute super."labeled-tree"; - "labels" = dontDistribute super."labels"; - "laborantin-hs" = dontDistribute super."laborantin-hs"; - "labyrinth" = dontDistribute super."labyrinth"; - "labyrinth-server" = dontDistribute super."labyrinth-server"; - "lagrangian" = dontDistribute super."lagrangian"; - "laika" = dontDistribute super."laika"; - "lambda-ast" = dontDistribute super."lambda-ast"; - "lambda-bridge" = dontDistribute super."lambda-bridge"; - "lambda-canvas" = dontDistribute super."lambda-canvas"; - "lambda-devs" = dontDistribute super."lambda-devs"; - "lambda-options" = dontDistribute super."lambda-options"; - "lambda-placeholders" = dontDistribute super."lambda-placeholders"; - "lambda-toolbox" = dontDistribute super."lambda-toolbox"; - "lambda2js" = dontDistribute super."lambda2js"; - "lambdaBase" = dontDistribute super."lambdaBase"; - "lambdaFeed" = dontDistribute super."lambdaFeed"; - "lambdaLit" = dontDistribute super."lambdaLit"; - "lambdabot" = dontDistribute super."lambdabot"; - "lambdabot-core" = dontDistribute super."lambdabot-core"; - "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins"; - "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins"; - "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins"; - "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins"; - "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins"; - "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins"; - "lambdabot-trusted" = dontDistribute super."lambdabot-trusted"; - "lambdabot-utils" = dontDistribute super."lambdabot-utils"; - "lambdacat" = dontDistribute super."lambdacat"; - "lambdacms-core" = dontDistribute super."lambdacms-core"; - "lambdacms-media" = dontDistribute super."lambdacms-media"; - "lambdacube" = dontDistribute super."lambdacube"; - "lambdacube-bullet" = dontDistribute super."lambdacube-bullet"; - "lambdacube-core" = dontDistribute super."lambdacube-core"; - "lambdacube-edsl" = dontDistribute super."lambdacube-edsl"; - "lambdacube-engine" = dontDistribute super."lambdacube-engine"; - "lambdacube-examples" = dontDistribute super."lambdacube-examples"; - "lambdacube-samples" = dontDistribute super."lambdacube-samples"; - "lambdatex" = dontDistribute super."lambdatex"; - "lambdatwit" = dontDistribute super."lambdatwit"; - "lambdaya-bus" = dontDistribute super."lambdaya-bus"; - "lambdiff" = dontDistribute super."lambdiff"; - "lame-tester" = dontDistribute super."lame-tester"; - "language-asn1" = dontDistribute super."language-asn1"; - "language-bash" = dontDistribute super."language-bash"; - "language-boogie" = dontDistribute super."language-boogie"; - "language-c-comments" = dontDistribute super."language-c-comments"; - "language-c-inline" = dontDistribute super."language-c-inline"; - "language-c-quote" = doDistribute super."language-c-quote_0_11_6_2"; - "language-cil" = dontDistribute super."language-cil"; - "language-conf" = dontDistribute super."language-conf"; - "language-css" = dontDistribute super."language-css"; - "language-dart" = dontDistribute super."language-dart"; - "language-dockerfile" = dontDistribute super."language-dockerfile"; - "language-dot" = dontDistribute super."language-dot"; - "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis"; - "language-eiffel" = dontDistribute super."language-eiffel"; - "language-fortran" = dontDistribute super."language-fortran"; - "language-gcl" = dontDistribute super."language-gcl"; - "language-go" = dontDistribute super."language-go"; - "language-guess" = dontDistribute super."language-guess"; - "language-hcl" = dontDistribute super."language-hcl"; - "language-java-classfile" = dontDistribute super."language-java-classfile"; - "language-kort" = dontDistribute super."language-kort"; - "language-lua" = dontDistribute super."language-lua"; - "language-lua-qq" = dontDistribute super."language-lua-qq"; - "language-mixal" = dontDistribute super."language-mixal"; - "language-objc" = dontDistribute super."language-objc"; - "language-openscad" = dontDistribute super."language-openscad"; - "language-pig" = dontDistribute super."language-pig"; - "language-puppet" = dontDistribute super."language-puppet"; - "language-python" = dontDistribute super."language-python"; - "language-python-colour" = dontDistribute super."language-python-colour"; - "language-python-test" = dontDistribute super."language-python-test"; - "language-qux" = dontDistribute super."language-qux"; - "language-sh" = dontDistribute super."language-sh"; - "language-slice" = dontDistribute super."language-slice"; - "language-spelling" = dontDistribute super."language-spelling"; - "language-sqlite" = dontDistribute super."language-sqlite"; - "language-thrift" = doDistribute super."language-thrift_0_8_0_1"; - "language-typescript" = dontDistribute super."language-typescript"; - "language-vhdl" = dontDistribute super."language-vhdl"; - "language-webidl" = dontDistribute super."language-webidl"; - "large-hashable" = dontDistribute super."large-hashable"; - "lat" = dontDistribute super."lat"; - "latest-npm-version" = dontDistribute super."latest-npm-version"; - "latex" = dontDistribute super."latex"; - "launchpad-control" = dontDistribute super."launchpad-control"; - "lax" = dontDistribute super."lax"; - "layers" = dontDistribute super."layers"; - "layers-game" = dontDistribute super."layers-game"; - "layout" = dontDistribute super."layout"; - "layout-bootstrap" = dontDistribute super."layout-bootstrap"; - "lazy-io" = dontDistribute super."lazy-io"; - "lazy-search" = dontDistribute super."lazy-search"; - "lazyarray" = dontDistribute super."lazyarray"; - "lazyio" = dontDistribute super."lazyio"; - "lazysmallcheck" = dontDistribute super."lazysmallcheck"; - "lazysplines" = dontDistribute super."lazysplines"; - "lbfgs" = dontDistribute super."lbfgs"; - "lcs" = dontDistribute super."lcs"; - "ld-intervals" = dontDistribute super."ld-intervals"; - "lda" = dontDistribute super."lda"; - "ldap-client" = dontDistribute super."ldap-client"; - "ldif" = dontDistribute super."ldif"; - "leaf" = dontDistribute super."leaf"; - "leaky" = dontDistribute super."leaky"; - "leancheck" = dontDistribute super."leancheck"; - "leankit-api" = dontDistribute super."leankit-api"; - "leapseconds-announced" = dontDistribute super."leapseconds-announced"; - "learn" = dontDistribute super."learn"; - "learn-physics" = dontDistribute super."learn-physics"; - "learn-physics-examples" = dontDistribute super."learn-physics-examples"; - "learning-hmm" = dontDistribute super."learning-hmm"; - "leetify" = dontDistribute super."leetify"; - "legion" = dontDistribute super."legion"; - "leksah" = dontDistribute super."leksah"; - "lendingclub" = dontDistribute super."lendingclub"; - "lens" = doDistribute super."lens_4_13"; - "lens-family-th" = doDistribute super."lens-family-th_0_4_1_0"; - "lens-prelude" = dontDistribute super."lens-prelude"; - "lens-properties" = dontDistribute super."lens-properties"; - "lens-sop" = dontDistribute super."lens-sop"; - "lens-text-encoding" = dontDistribute super."lens-text-encoding"; - "lens-time" = dontDistribute super."lens-time"; - "lens-tutorial" = dontDistribute super."lens-tutorial"; - "lens-utils" = dontDistribute super."lens-utils"; - "lenses" = dontDistribute super."lenses"; - "lensref" = dontDistribute super."lensref"; - "lentil" = doDistribute super."lentil_0_1_12_0"; - "lenz" = dontDistribute super."lenz"; - "lenz-template" = dontDistribute super."lenz-template"; - "level-monad" = dontDistribute super."level-monad"; - "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork"; - "levmar" = dontDistribute super."levmar"; - "levmar-chart" = dontDistribute super."levmar-chart"; - "lfst" = dontDistribute super."lfst"; - "lgtk" = dontDistribute super."lgtk"; - "lha" = dontDistribute super."lha"; - "lhae" = dontDistribute super."lhae"; - "lhc" = dontDistribute super."lhc"; - "lhe" = dontDistribute super."lhe"; - "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl"; - "lhs2html" = dontDistribute super."lhs2html"; - "lhslatex" = dontDistribute super."lhslatex"; - "libGenI" = dontDistribute super."libGenI"; - "libarchive-conduit" = dontDistribute super."libarchive-conduit"; - "libconfig" = dontDistribute super."libconfig"; - "libcspm" = dontDistribute super."libcspm"; - "libexpect" = dontDistribute super."libexpect"; - "libffi" = dontDistribute super."libffi"; - "libgraph" = dontDistribute super."libgraph"; - "libhbb" = dontDistribute super."libhbb"; - "libjenkins" = dontDistribute super."libjenkins"; - "liblastfm" = dontDistribute super."liblastfm"; - "liblinear-enumerator" = dontDistribute super."liblinear-enumerator"; - "libltdl" = dontDistribute super."libltdl"; - "libmpd" = dontDistribute super."libmpd"; - "libnotify" = doDistribute super."libnotify_0_1_1_0"; - "libnvvm" = dontDistribute super."libnvvm"; - "liboleg" = dontDistribute super."liboleg"; - "libpafe" = dontDistribute super."libpafe"; - "libpq" = dontDistribute super."libpq"; - "librandomorg" = dontDistribute super."librandomorg"; - "libravatar" = dontDistribute super."libravatar"; - "libroman" = dontDistribute super."libroman"; - "libssh2" = dontDistribute super."libssh2"; - "libssh2-conduit" = dontDistribute super."libssh2-conduit"; - "libstackexchange" = dontDistribute super."libstackexchange"; - "libsystemd-daemon" = dontDistribute super."libsystemd-daemon"; - "libtagc" = dontDistribute super."libtagc"; - "libvirt-hs" = dontDistribute super."libvirt-hs"; - "libvorbis" = dontDistribute super."libvorbis"; - "libxls" = dontDistribute super."libxls"; - "libxml" = dontDistribute super."libxml"; - "libxml-enumerator" = dontDistribute super."libxml-enumerator"; - "libxslt" = dontDistribute super."libxslt"; - "libzfs" = dontDistribute super."libzfs"; - "licensor" = dontDistribute super."licensor"; - "life" = dontDistribute super."life"; - "lifted-protolude" = dontDistribute super."lifted-protolude"; - "lifted-threads" = dontDistribute super."lifted-threads"; - "lifter" = dontDistribute super."lifter"; - "ligature" = dontDistribute super."ligature"; - "ligd" = dontDistribute super."ligd"; - "lighttpd-conf" = dontDistribute super."lighttpd-conf"; - "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq"; - "lilypond" = dontDistribute super."lilypond"; - "limp" = dontDistribute super."limp"; - "limp-cbc" = dontDistribute super."limp-cbc"; - "lin-alg" = dontDistribute super."lin-alg"; - "linda" = dontDistribute super."linda"; - "lindenmayer" = dontDistribute super."lindenmayer"; - "line-break" = dontDistribute super."line-break"; - "line2pdf" = dontDistribute super."line2pdf"; - "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas"; - "linear-circuit" = dontDistribute super."linear-circuit"; - "linear-grammar" = dontDistribute super."linear-grammar"; - "linear-maps" = dontDistribute super."linear-maps"; - "linear-opengl" = dontDistribute super."linear-opengl"; - "linear-vect" = dontDistribute super."linear-vect"; - "linearEqSolver" = dontDistribute super."linearEqSolver"; - "linearscan" = dontDistribute super."linearscan"; - "linearscan-hoopl" = dontDistribute super."linearscan-hoopl"; - "linebreak" = dontDistribute super."linebreak"; - "linguistic-ordinals" = dontDistribute super."linguistic-ordinals"; - "link-relations" = dontDistribute super."link-relations"; - "linkchk" = dontDistribute super."linkchk"; - "linkcore" = dontDistribute super."linkcore"; - "linkedhashmap" = dontDistribute super."linkedhashmap"; - "linklater" = dontDistribute super."linklater"; - "linode" = dontDistribute super."linode"; - "linode-v4" = dontDistribute super."linode-v4"; - "linux-blkid" = dontDistribute super."linux-blkid"; - "linux-cgroup" = dontDistribute super."linux-cgroup"; - "linux-evdev" = dontDistribute super."linux-evdev"; - "linux-inotify" = dontDistribute super."linux-inotify"; - "linux-kmod" = dontDistribute super."linux-kmod"; - "linux-mount" = dontDistribute super."linux-mount"; - "linux-perf" = dontDistribute super."linux-perf"; - "linux-ptrace" = dontDistribute super."linux-ptrace"; - "linux-xattr" = dontDistribute super."linux-xattr"; - "linx-gateway" = dontDistribute super."linx-gateway"; - "lio" = dontDistribute super."lio"; - "lio-eci11" = dontDistribute super."lio-eci11"; - "lio-fs" = dontDistribute super."lio-fs"; - "lio-simple" = dontDistribute super."lio-simple"; - "lipsum-gen" = dontDistribute super."lipsum-gen"; - "liquid" = dontDistribute super."liquid"; - "liquid-fixpoint" = dontDistribute super."liquid-fixpoint"; - "liquidhaskell" = dontDistribute super."liquidhaskell"; - "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal"; - "liquidhaskell-cabal-demo" = dontDistribute super."liquidhaskell-cabal-demo"; - "lispparser" = dontDistribute super."lispparser"; - "list-extras" = dontDistribute super."list-extras"; - "list-grouping" = dontDistribute super."list-grouping"; - "list-mux" = dontDistribute super."list-mux"; - "list-remote-forwards" = dontDistribute super."list-remote-forwards"; - "list-t" = doDistribute super."list-t_0_4_7"; - "list-t-attoparsec" = dontDistribute super."list-t-attoparsec"; - "list-t-html-parser" = dontDistribute super."list-t-html-parser"; - "list-t-http-client" = dontDistribute super."list-t-http-client"; - "list-t-libcurl" = dontDistribute super."list-t-libcurl"; - "list-t-text" = dontDistribute super."list-t-text"; - "list-transformer" = dontDistribute super."list-transformer"; - "list-tries" = dontDistribute super."list-tries"; - "list-zip-def" = dontDistribute super."list-zip-def"; - "listlike-instances" = dontDistribute super."listlike-instances"; - "lists" = dontDistribute super."lists"; - "listsafe" = dontDistribute super."listsafe"; - "lit" = dontDistribute super."lit"; - "literals" = dontDistribute super."literals"; - "live-sequencer" = dontDistribute super."live-sequencer"; - "ll-picosat" = dontDistribute super."ll-picosat"; - "llrbtree" = dontDistribute super."llrbtree"; - "llsd" = dontDistribute super."llsd"; - "llvm" = dontDistribute super."llvm"; - "llvm-analysis" = dontDistribute super."llvm-analysis"; - "llvm-base" = dontDistribute super."llvm-base"; - "llvm-base-types" = dontDistribute super."llvm-base-types"; - "llvm-base-util" = dontDistribute super."llvm-base-util"; - "llvm-data-interop" = dontDistribute super."llvm-data-interop"; - "llvm-extra" = dontDistribute super."llvm-extra"; - "llvm-ffi" = dontDistribute super."llvm-ffi"; - "llvm-ffi-tools" = dontDistribute super."llvm-ffi-tools"; - "llvm-general" = dontDistribute super."llvm-general"; - "llvm-general-pure" = dontDistribute super."llvm-general-pure"; - "llvm-general-quote" = dontDistribute super."llvm-general-quote"; - "llvm-ht" = dontDistribute super."llvm-ht"; - "llvm-pkg-config" = dontDistribute super."llvm-pkg-config"; - "llvm-pretty" = dontDistribute super."llvm-pretty"; - "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser"; - "llvm-tf" = dontDistribute super."llvm-tf"; - "llvm-tools" = dontDistribute super."llvm-tools"; - "lmdb" = dontDistribute super."lmdb"; - "lmonad" = dontDistribute super."lmonad"; - "lmonad-yesod" = dontDistribute super."lmonad-yesod"; - "loadavg" = dontDistribute super."loadavg"; - "local-address" = dontDistribute super."local-address"; - "local-search" = dontDistribute super."local-search"; - "located" = dontDistribute super."located"; - "located-base" = dontDistribute super."located-base"; - "located-monad-logger" = dontDistribute super."located-monad-logger"; - "locators" = dontDistribute super."locators"; - "loch" = dontDistribute super."loch"; - "lock-file" = dontDistribute super."lock-file"; - "locked-poll" = dontDistribute super."locked-poll"; - "lockfree-queue" = dontDistribute super."lockfree-queue"; - "log" = dontDistribute super."log"; - "log-effect" = dontDistribute super."log-effect"; - "log2json" = dontDistribute super."log2json"; - "logentries" = dontDistribute super."logentries"; - "logger" = dontDistribute super."logger"; - "logging" = dontDistribute super."logging"; - "logging-effect" = dontDistribute super."logging-effect"; - "logging-facade-journald" = dontDistribute super."logging-facade-journald"; - "logic-TPTP" = dontDistribute super."logic-TPTP"; - "logic-classes" = dontDistribute super."logic-classes"; - "logicst" = dontDistribute super."logicst"; - "logict-state" = dontDistribute super."logict-state"; - "logplex-parse" = dontDistribute super."logplex-parse"; - "logsink" = dontDistribute super."logsink"; - "lojban" = dontDistribute super."lojban"; - "lojbanParser" = dontDistribute super."lojbanParser"; - "lojbanXiragan" = dontDistribute super."lojbanXiragan"; - "lojysamban" = dontDistribute super."lojysamban"; - "lol" = dontDistribute super."lol"; - "lol-apps" = dontDistribute super."lol-apps"; - "lol-calculus" = dontDistribute super."lol-calculus"; - "lol-typing" = dontDistribute super."lol-typing"; - "loli" = dontDistribute super."loli"; - "lookup-tables" = dontDistribute super."lookup-tables"; - "loop-effin" = dontDistribute super."loop-effin"; - "loop-while" = dontDistribute super."loop-while"; - "loops" = dontDistribute super."loops"; - "loopy" = dontDistribute super."loopy"; - "lord" = dontDistribute super."lord"; - "lorem" = dontDistribute super."lorem"; - "loris" = dontDistribute super."loris"; - "loshadka" = dontDistribute super."loshadka"; - "lostcities" = dontDistribute super."lostcities"; - "lowgl" = dontDistribute super."lowgl"; - "lp-diagrams" = dontDistribute super."lp-diagrams"; - "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg"; - "lrucaching" = dontDistribute super."lrucaching"; - "ls-usb" = dontDistribute super."ls-usb"; - "lscabal" = dontDistribute super."lscabal"; - "lss" = dontDistribute super."lss"; - "lsystem" = dontDistribute super."lsystem"; - "ltext" = doDistribute super."ltext_0_0_2_1"; - "ltiv1p1" = dontDistribute super."ltiv1p1"; - "ltl" = dontDistribute super."ltl"; - "lua-bc" = dontDistribute super."lua-bc"; - "lua-bytecode" = dontDistribute super."lua-bytecode"; - "luachunk" = dontDistribute super."luachunk"; - "luautils" = dontDistribute super."luautils"; - "lub" = dontDistribute super."lub"; - "lucid" = doDistribute super."lucid_2_9_5"; - "lucid-foundation" = dontDistribute super."lucid-foundation"; - "lucid-svg" = doDistribute super."lucid-svg_0_6_0_1"; - "lucienne" = dontDistribute super."lucienne"; - "luhn" = dontDistribute super."luhn"; - "lui" = dontDistribute super."lui"; - "luis-client" = dontDistribute super."luis-client"; - "luka" = dontDistribute super."luka"; - "luminance" = doDistribute super."luminance_0_11_0_2"; - "lushtags" = dontDistribute super."lushtags"; - "luthor" = dontDistribute super."luthor"; - "lvish" = dontDistribute super."lvish"; - "lvmlib" = dontDistribute super."lvmlib"; - "lvmrun" = dontDistribute super."lvmrun"; - "lxc" = dontDistribute super."lxc"; - "lye" = dontDistribute super."lye"; - "lz4" = dontDistribute super."lz4"; - "lzma" = dontDistribute super."lzma"; - "lzma-clib" = dontDistribute super."lzma-clib"; - "lzma-enumerator" = dontDistribute super."lzma-enumerator"; - "lzma-streams" = dontDistribute super."lzma-streams"; - "maam" = dontDistribute super."maam"; - "mac" = dontDistribute super."mac"; - "macbeth-lib" = dontDistribute super."macbeth-lib"; - "maccatcher" = dontDistribute super."maccatcher"; - "machinecell" = dontDistribute super."machinecell"; - "machines" = doDistribute super."machines_0_5_1"; - "machines-zlib" = dontDistribute super."machines-zlib"; - "macho" = dontDistribute super."macho"; - "maclight" = dontDistribute super."maclight"; - "macosx-make-standalone" = dontDistribute super."macosx-make-standalone"; - "mage" = dontDistribute super."mage"; - "magico" = dontDistribute super."magico"; - "magma" = dontDistribute super."magma"; - "mahoro" = dontDistribute super."mahoro"; - "maid" = dontDistribute super."maid"; - "mailbox-count" = dontDistribute super."mailbox-count"; - "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe"; - "mailgun" = dontDistribute super."mailgun"; - "majordomo" = dontDistribute super."majordomo"; - "majority" = dontDistribute super."majority"; - "make-hard-links" = dontDistribute super."make-hard-links"; - "make-package" = dontDistribute super."make-package"; - "makedo" = dontDistribute super."makedo"; - "makefile" = dontDistribute super."makefile"; - "manatee" = dontDistribute super."manatee"; - "manatee-all" = dontDistribute super."manatee-all"; - "manatee-anything" = dontDistribute super."manatee-anything"; - "manatee-browser" = dontDistribute super."manatee-browser"; - "manatee-core" = dontDistribute super."manatee-core"; - "manatee-curl" = dontDistribute super."manatee-curl"; - "manatee-editor" = dontDistribute super."manatee-editor"; - "manatee-filemanager" = dontDistribute super."manatee-filemanager"; - "manatee-imageviewer" = dontDistribute super."manatee-imageviewer"; - "manatee-ircclient" = dontDistribute super."manatee-ircclient"; - "manatee-mplayer" = dontDistribute super."manatee-mplayer"; - "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer"; - "manatee-processmanager" = dontDistribute super."manatee-processmanager"; - "manatee-reader" = dontDistribute super."manatee-reader"; - "manatee-template" = dontDistribute super."manatee-template"; - "manatee-terminal" = dontDistribute super."manatee-terminal"; - "manatee-welcome" = dontDistribute super."manatee-welcome"; - "mancala" = dontDistribute super."mancala"; - "mandrill" = doDistribute super."mandrill_0_5_2_2"; - "mandulia" = dontDistribute super."mandulia"; - "mangopay" = dontDistribute super."mangopay"; - "manifold-random" = dontDistribute super."manifold-random"; - "manifolds" = dontDistribute super."manifolds"; - "map-exts" = dontDistribute super."map-exts"; - "map-syntax" = doDistribute super."map-syntax_0_2"; - "mappy" = dontDistribute super."mappy"; - "marionetta" = dontDistribute super."marionetta"; - "markdown-kate" = dontDistribute super."markdown-kate"; - "markdown-pap" = dontDistribute super."markdown-pap"; - "markdown2svg" = dontDistribute super."markdown2svg"; - "marked-pretty" = dontDistribute super."marked-pretty"; - "markov" = dontDistribute super."markov"; - "markov-chain" = dontDistribute super."markov-chain"; - "markov-processes" = dontDistribute super."markov-processes"; - "markup-preview" = dontDistribute super."markup-preview"; - "marmalade-upload" = dontDistribute super."marmalade-upload"; - "marquise" = dontDistribute super."marquise"; - "mars" = dontDistribute super."mars"; - "marxup" = dontDistribute super."marxup"; - "masakazu-bot" = dontDistribute super."masakazu-bot"; - "mastermind" = dontDistribute super."mastermind"; - "matcher" = dontDistribute super."matcher"; - "matchers" = dontDistribute super."matchers"; - "math-functions" = doDistribute super."math-functions_0_1_7_0"; - "mathblog" = dontDistribute super."mathblog"; - "mathgenealogy" = dontDistribute super."mathgenealogy"; - "mathista" = dontDistribute super."mathista"; - "mathlink" = dontDistribute super."mathlink"; - "matlab" = dontDistribute super."matlab"; - "matrix-market" = dontDistribute super."matrix-market"; - "matrix-market-pure" = dontDistribute super."matrix-market-pure"; - "matsuri" = dontDistribute super."matsuri"; - "maude" = dontDistribute super."maude"; - "maxent" = dontDistribute super."maxent"; - "maxsharing" = dontDistribute super."maxsharing"; - "maybe-justify" = dontDistribute super."maybe-justify"; - "maybench" = dontDistribute super."maybench"; - "mbox-tools" = dontDistribute super."mbox-tools"; - "mcm" = dontDistribute super."mcm"; - "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples"; - "mcmc-samplers" = dontDistribute super."mcmc-samplers"; - "mcmc-synthesis" = dontDistribute super."mcmc-synthesis"; - "mcpi" = dontDistribute super."mcpi"; - "mdapi" = dontDistribute super."mdapi"; - "mdcat" = dontDistribute super."mdcat"; - "mdo" = dontDistribute super."mdo"; - "mdp" = dontDistribute super."mdp"; - "means" = dontDistribute super."means"; - "mecab" = dontDistribute super."mecab"; - "mech" = dontDistribute super."mech"; - "mecha" = dontDistribute super."mecha"; - "mechs" = dontDistribute super."mechs"; - "mediawiki" = dontDistribute super."mediawiki"; - "mediawiki2latex" = dontDistribute super."mediawiki2latex"; - "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell"; - "meep" = dontDistribute super."meep"; - "mega-sdist" = dontDistribute super."mega-sdist"; - "megaparsec" = doDistribute super."megaparsec_4_4_0"; - "meldable-heap" = dontDistribute super."meldable-heap"; - "mellon-core" = dontDistribute super."mellon-core"; - "mellon-gpio" = dontDistribute super."mellon-gpio"; - "mellon-web" = dontDistribute super."mellon-web"; - "melody" = dontDistribute super."melody"; - "memcache" = dontDistribute super."memcache"; - "memcache-conduit" = dontDistribute super."memcache-conduit"; - "memcache-haskell" = dontDistribute super."memcache-haskell"; - "memcached" = dontDistribute super."memcached"; - "memexml" = dontDistribute super."memexml"; - "memo-ptr" = dontDistribute super."memo-ptr"; - "memo-sqlite" = dontDistribute super."memo-sqlite"; - "memoize" = doDistribute super."memoize_0_7"; - "memorypool" = dontDistribute super."memorypool"; - "memscript" = dontDistribute super."memscript"; - "merge-bash-history" = dontDistribute super."merge-bash-history"; - "mersenne-random" = dontDistribute super."mersenne-random"; - "messagepack" = doDistribute super."messagepack_0_5_1"; - "messente" = dontDistribute super."messente"; - "meta-misc" = dontDistribute super."meta-misc"; - "meta-par" = dontDistribute super."meta-par"; - "meta-par-accelerate" = dontDistribute super."meta-par-accelerate"; - "metadata" = dontDistribute super."metadata"; - "metamorphic" = dontDistribute super."metamorphic"; - "metaplug" = dontDistribute super."metaplug"; - "metric" = dontDistribute super."metric"; - "metricsd-client" = dontDistribute super."metricsd-client"; - "metronome" = dontDistribute super."metronome"; - "mezzolens" = dontDistribute super."mezzolens"; - "mfsolve" = dontDistribute super."mfsolve"; - "mgeneric" = dontDistribute super."mgeneric"; - "mi" = dontDistribute super."mi"; - "microbench" = dontDistribute super."microbench"; - "microformats2-types" = dontDistribute super."microformats2-types"; - "microlens" = doDistribute super."microlens_0_4_5_0"; - "microlens-aeson" = doDistribute super."microlens-aeson_2_1_1"; - "microlens-each" = dontDistribute super."microlens-each"; - "microlens-ghc" = doDistribute super."microlens-ghc_0_4_5_0"; - "microlens-mtl" = doDistribute super."microlens-mtl_0_1_9_0"; - "microlens-platform" = doDistribute super."microlens-platform_0_3_3_0"; - "microlens-th" = doDistribute super."microlens-th_0_4_0_0"; - "micrologger" = dontDistribute super."micrologger"; - "microspec" = dontDistribute super."microspec"; - "microtimer" = dontDistribute super."microtimer"; - "mida" = dontDistribute super."mida"; - "midi" = dontDistribute super."midi"; - "midi-alsa" = dontDistribute super."midi-alsa"; - "midi-music-box" = dontDistribute super."midi-music-box"; - "midi-util" = dontDistribute super."midi-util"; - "midi-utils" = dontDistribute super."midi-utils"; - "midimory" = dontDistribute super."midimory"; - "midisurface" = dontDistribute super."midisurface"; - "mighttpd" = dontDistribute super."mighttpd"; - "mighttpd2" = dontDistribute super."mighttpd2"; - "mikmod" = dontDistribute super."mikmod"; - "miku" = dontDistribute super."miku"; - "milena" = dontDistribute super."milena"; - "mime" = dontDistribute super."mime"; - "mime-directory" = dontDistribute super."mime-directory"; - "mime-string" = dontDistribute super."mime-string"; - "minecraft-data" = dontDistribute super."minecraft-data"; - "mines" = dontDistribute super."mines"; - "minesweeper" = dontDistribute super."minesweeper"; - "miniball" = dontDistribute super."miniball"; - "miniforth" = dontDistribute super."miniforth"; - "minilens" = dontDistribute super."minilens"; - "minimal-configuration" = dontDistribute super."minimal-configuration"; - "minimorph" = dontDistribute super."minimorph"; - "minimung" = dontDistribute super."minimung"; - "minions" = dontDistribute super."minions"; - "minioperational" = dontDistribute super."minioperational"; - "miniplex" = dontDistribute super."miniplex"; - "minirotate" = dontDistribute super."minirotate"; - "minisat" = dontDistribute super."minisat"; - "ministg" = dontDistribute super."ministg"; - "miniutter" = dontDistribute super."miniutter"; - "minlen" = dontDistribute super."minlen"; - "minst-idx" = dontDistribute super."minst-idx"; - "mios" = dontDistribute super."mios"; - "mirror-tweet" = dontDistribute super."mirror-tweet"; - "missing-py2" = dontDistribute super."missing-py2"; - "mix-arrows" = dontDistribute super."mix-arrows"; - "mixed-strategies" = dontDistribute super."mixed-strategies"; - "mkbndl" = dontDistribute super."mkbndl"; - "mkcabal" = dontDistribute super."mkcabal"; - "ml-w" = dontDistribute super."ml-w"; - "mlist" = dontDistribute super."mlist"; - "mmtl" = dontDistribute super."mmtl"; - "mmtl-base" = dontDistribute super."mmtl-base"; - "mnist-idx" = dontDistribute super."mnist-idx"; - "moan" = dontDistribute super."moan"; - "modbus-tcp" = dontDistribute super."modbus-tcp"; - "modelicaparser" = dontDistribute super."modelicaparser"; - "modsplit" = dontDistribute super."modsplit"; - "modular-arithmetic" = dontDistribute super."modular-arithmetic"; - "modular-prelude" = dontDistribute super."modular-prelude"; - "modular-prelude-classy" = dontDistribute super."modular-prelude-classy"; - "module-management" = dontDistribute super."module-management"; - "modulespection" = dontDistribute super."modulespection"; - "modulo" = dontDistribute super."modulo"; - "moe" = dontDistribute super."moe"; - "mohws" = dontDistribute super."mohws"; - "mollie-api-haskell" = dontDistribute super."mollie-api-haskell"; - "monad-abort-fd" = dontDistribute super."monad-abort-fd"; - "monad-atom" = dontDistribute super."monad-atom"; - "monad-atom-simple" = dontDistribute super."monad-atom-simple"; - "monad-bool" = dontDistribute super."monad-bool"; - "monad-classes" = dontDistribute super."monad-classes"; - "monad-codec" = dontDistribute super."monad-codec"; - "monad-connect" = dontDistribute super."monad-connect"; - "monad-dijkstra" = dontDistribute super."monad-dijkstra"; - "monad-exception" = dontDistribute super."monad-exception"; - "monad-fork" = dontDistribute super."monad-fork"; - "monad-gen" = dontDistribute super."monad-gen"; - "monad-hash" = dontDistribute super."monad-hash"; - "monad-interleave" = dontDistribute super."monad-interleave"; - "monad-levels" = dontDistribute super."monad-levels"; - "monad-lgbt" = dontDistribute super."monad-lgbt"; - "monad-log" = dontDistribute super."monad-log"; - "monad-logger-prefix" = dontDistribute super."monad-logger-prefix"; - "monad-loops-stm" = dontDistribute super."monad-loops-stm"; - "monad-lrs" = dontDistribute super."monad-lrs"; - "monad-memo" = dontDistribute super."monad-memo"; - "monad-mersenne-random" = dontDistribute super."monad-mersenne-random"; - "monad-open" = dontDistribute super."monad-open"; - "monad-ox" = dontDistribute super."monad-ox"; - "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar"; - "monad-param" = dontDistribute super."monad-param"; - "monad-ran" = dontDistribute super."monad-ran"; - "monad-resumption" = dontDistribute super."monad-resumption"; - "monad-state" = dontDistribute super."monad-state"; - "monad-statevar" = dontDistribute super."monad-statevar"; - "monad-ste" = dontDistribute super."monad-ste"; - "monad-stlike-io" = dontDistribute super."monad-stlike-io"; - "monad-stlike-stm" = dontDistribute super."monad-stlike-stm"; - "monad-stm" = dontDistribute super."monad-stm"; - "monad-supply" = dontDistribute super."monad-supply"; - "monad-task" = dontDistribute super."monad-task"; - "monad-timing" = dontDistribute super."monad-timing"; - "monad-tx" = dontDistribute super."monad-tx"; - "monad-unify" = dontDistribute super."monad-unify"; - "monad-wrap" = dontDistribute super."monad-wrap"; - "monadIO" = dontDistribute super."monadIO"; - "monadLib-compose" = dontDistribute super."monadLib-compose"; - "monadacme" = dontDistribute super."monadacme"; - "monadbi" = dontDistribute super."monadbi"; - "monadfibre" = dontDistribute super."monadfibre"; - "monadiccp" = dontDistribute super."monadiccp"; - "monadiccp-gecode" = dontDistribute super."monadiccp-gecode"; - "monadio-unwrappable" = dontDistribute super."monadio-unwrappable"; - "monadlist" = dontDistribute super."monadlist"; - "monadloc-pp" = dontDistribute super."monadloc-pp"; - "monads-fd" = dontDistribute super."monads-fd"; - "monadtransform" = dontDistribute super."monadtransform"; - "monarch" = dontDistribute super."monarch"; - "mondo" = dontDistribute super."mondo"; - "mongoDB" = doDistribute super."mongoDB_2_0_10"; - "mongodb-queue" = dontDistribute super."mongodb-queue"; - "mongrel2-handler" = dontDistribute super."mongrel2-handler"; - "monitor" = dontDistribute super."monitor"; - "monky" = dontDistribute super."monky"; - "mono-foldable" = dontDistribute super."mono-foldable"; - "mono-traversable" = doDistribute super."mono-traversable_0_10_2"; - "mono-traversable-instances" = dontDistribute super."mono-traversable-instances"; - "monoid-absorbing" = dontDistribute super."monoid-absorbing"; - "monoid-owns" = dontDistribute super."monoid-owns"; - "monoid-record" = dontDistribute super."monoid-record"; - "monoid-statistics" = dontDistribute super."monoid-statistics"; - "monoid-subclasses" = doDistribute super."monoid-subclasses_0_4_2"; - "monoid-transformer" = dontDistribute super."monoid-transformer"; - "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_5"; - "monoidplus" = dontDistribute super."monoidplus"; - "monoids" = dontDistribute super."monoids"; - "monomorphic" = dontDistribute super."monomorphic"; - "montage" = dontDistribute super."montage"; - "montage-client" = dontDistribute super."montage-client"; - "monte-carlo" = dontDistribute super."monte-carlo"; - "monzo" = dontDistribute super."monzo"; - "moo" = dontDistribute super."moo"; - "moonshine" = dontDistribute super."moonshine"; - "morfette" = dontDistribute super."morfette"; - "morfeusz" = dontDistribute super."morfeusz"; - "morph" = dontDistribute super."morph"; - "morte" = doDistribute super."morte_1_6_1"; - "mosaico-lib" = dontDistribute super."mosaico-lib"; - "mount" = dontDistribute super."mount"; - "mp" = dontDistribute super."mp"; - "mp3decoder" = dontDistribute super."mp3decoder"; - "mpdmate" = dontDistribute super."mpdmate"; - "mpppc" = dontDistribute super."mpppc"; - "mpretty" = dontDistribute super."mpretty"; - "mpris" = dontDistribute super."mpris"; - "mprover" = dontDistribute super."mprover"; - "mps" = dontDistribute super."mps"; - "mpvguihs" = dontDistribute super."mpvguihs"; - "mqtt-hs" = dontDistribute super."mqtt-hs"; - "mrm" = dontDistribute super."mrm"; - "ms" = dontDistribute super."ms"; - "msgpack" = dontDistribute super."msgpack"; - "msgpack-aeson" = dontDistribute super."msgpack-aeson"; - "msgpack-idl" = dontDistribute super."msgpack-idl"; - "msgpack-rpc" = dontDistribute super."msgpack-rpc"; - "msh" = dontDistribute super."msh"; - "msu" = dontDistribute super."msu"; - "mtgoxapi" = dontDistribute super."mtgoxapi"; - "mtl-c" = dontDistribute super."mtl-c"; - "mtl-evil-instances" = dontDistribute super."mtl-evil-instances"; - "mtl-extras" = dontDistribute super."mtl-extras"; - "mtl-tf" = dontDistribute super."mtl-tf"; - "mtl-unleashed" = dontDistribute super."mtl-unleashed"; - "mtlparse" = dontDistribute super."mtlparse"; - "mtlx" = dontDistribute super."mtlx"; - "mtp" = dontDistribute super."mtp"; - "mtree" = dontDistribute super."mtree"; - "mucipher" = dontDistribute super."mucipher"; - "mudbath" = dontDistribute super."mudbath"; - "muesli" = dontDistribute super."muesli"; - "mueval" = dontDistribute super."mueval"; - "mulang" = dontDistribute super."mulang"; - "multext-east-msd" = dontDistribute super."multext-east-msd"; - "multi-cabal" = dontDistribute super."multi-cabal"; - "multiaddr" = dontDistribute super."multiaddr"; - "multifocal" = dontDistribute super."multifocal"; - "multihash" = dontDistribute super."multihash"; - "multipart-names" = dontDistribute super."multipart-names"; - "multipass" = dontDistribute super."multipass"; - "multiplate-simplified" = dontDistribute super."multiplate-simplified"; - "multiplicity" = dontDistribute super."multiplicity"; - "multirec" = dontDistribute super."multirec"; - "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver"; - "multirec-binary" = dontDistribute super."multirec-binary"; - "multisetrewrite" = dontDistribute super."multisetrewrite"; - "multistate" = dontDistribute super."multistate"; - "muon" = dontDistribute super."muon"; - "murder" = dontDistribute super."murder"; - "murmur" = dontDistribute super."murmur"; - "murmur3" = dontDistribute super."murmur3"; - "murmurhash3" = dontDistribute super."murmurhash3"; - "music-articulation" = dontDistribute super."music-articulation"; - "music-diatonic" = dontDistribute super."music-diatonic"; - "music-dynamics" = dontDistribute super."music-dynamics"; - "music-dynamics-literal" = dontDistribute super."music-dynamics-literal"; - "music-graphics" = dontDistribute super."music-graphics"; - "music-parts" = dontDistribute super."music-parts"; - "music-pitch" = dontDistribute super."music-pitch"; - "music-pitch-literal" = dontDistribute super."music-pitch-literal"; - "music-preludes" = dontDistribute super."music-preludes"; - "music-score" = dontDistribute super."music-score"; - "music-sibelius" = dontDistribute super."music-sibelius"; - "music-suite" = dontDistribute super."music-suite"; - "music-util" = dontDistribute super."music-util"; - "musicbrainz-email" = dontDistribute super."musicbrainz-email"; - "musicxml" = dontDistribute super."musicxml"; - "musicxml2" = dontDistribute super."musicxml2"; - "mustache" = doDistribute super."mustache_1_0_2"; - "mustache-haskell" = dontDistribute super."mustache-haskell"; - "mustache2hs" = dontDistribute super."mustache2hs"; - "mutable-iter" = dontDistribute super."mutable-iter"; - "mute-unmute" = dontDistribute super."mute-unmute"; - "mvc" = dontDistribute super."mvc"; - "mvc-updates" = dontDistribute super."mvc-updates"; - "mvclient" = dontDistribute super."mvclient"; - "mwc-random-monad" = dontDistribute super."mwc-random-monad"; - "myTestlll" = dontDistribute super."myTestlll"; - "mybitcoin-sci" = dontDistribute super."mybitcoin-sci"; - "myo" = dontDistribute super."myo"; - "mysnapsession" = dontDistribute super."mysnapsession"; - "mysnapsession-example" = dontDistribute super."mysnapsession-example"; - "mysql-effect" = dontDistribute super."mysql-effect"; - "mysql-haskell" = dontDistribute super."mysql-haskell"; - "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi"; - "mysql-simple-typed" = dontDistribute super."mysql-simple-typed"; - "mystem" = dontDistribute super."mystem"; - "mywatch" = dontDistribute super."mywatch"; - "mzv" = dontDistribute super."mzv"; - "n-m" = dontDistribute super."n-m"; - "nagios-perfdata" = dontDistribute super."nagios-perfdata"; - "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg"; - "named-formlet" = dontDistribute super."named-formlet"; - "named-lock" = dontDistribute super."named-lock"; - "named-records" = dontDistribute super."named-records"; - "namelist" = dontDistribute super."namelist"; - "names" = dontDistribute super."names"; - "namespace" = dontDistribute super."namespace"; - "nano-cryptr" = dontDistribute super."nano-cryptr"; - "nano-hmac" = dontDistribute super."nano-hmac"; - "nano-md5" = dontDistribute super."nano-md5"; - "nanoAgda" = dontDistribute super."nanoAgda"; - "nanocurses" = dontDistribute super."nanocurses"; - "nanomsg" = dontDistribute super."nanomsg"; - "nanomsg-haskell" = dontDistribute super."nanomsg-haskell"; - "nanoparsec" = dontDistribute super."nanoparsec"; - "nanovg" = dontDistribute super."nanovg"; - "nanq" = dontDistribute super."nanq"; - "narc" = dontDistribute super."narc"; - "nat" = dontDistribute super."nat"; - "native" = dontDistribute super."native"; - "nats-queue" = dontDistribute super."nats-queue"; - "natural-number" = dontDistribute super."natural-number"; - "natural-numbers" = dontDistribute super."natural-numbers"; - "naturalcomp" = dontDistribute super."naturalcomp"; - "naturals" = dontDistribute super."naturals"; - "naver-translate" = dontDistribute super."naver-translate"; - "nbt" = dontDistribute super."nbt"; - "nc-indicators" = dontDistribute super."nc-indicators"; - "ncurses" = dontDistribute super."ncurses"; - "neat" = dontDistribute super."neat"; - "needle" = dontDistribute super."needle"; - "neet" = dontDistribute super."neet"; - "nehe-tuts" = dontDistribute super."nehe-tuts"; - "neil" = dontDistribute super."neil"; - "neither" = dontDistribute super."neither"; - "nemesis" = dontDistribute super."nemesis"; - "nemesis-titan" = dontDistribute super."nemesis-titan"; - "nerf" = dontDistribute super."nerf"; - "nero" = dontDistribute super."nero"; - "nero-wai" = dontDistribute super."nero-wai"; - "nero-warp" = dontDistribute super."nero-warp"; - "nested-routes" = doDistribute super."nested-routes_7_0_0"; - "nested-sequence" = dontDistribute super."nested-sequence"; - "nested-sets" = dontDistribute super."nested-sets"; - "nestedmap" = dontDistribute super."nestedmap"; - "net-concurrent" = dontDistribute super."net-concurrent"; - "netclock" = dontDistribute super."netclock"; - "netcore" = dontDistribute super."netcore"; - "netlines" = dontDistribute super."netlines"; - "netlink" = dontDistribute super."netlink"; - "netlist" = dontDistribute super."netlist"; - "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl"; - "netpbm" = dontDistribute super."netpbm"; - "netrc" = dontDistribute super."netrc"; - "netspec" = dontDistribute super."netspec"; - "netstring-enumerator" = dontDistribute super."netstring-enumerator"; - "nettle-frp" = dontDistribute super."nettle-frp"; - "nettle-netkit" = dontDistribute super."nettle-netkit"; - "nettle-openflow" = dontDistribute super."nettle-openflow"; - "netwire" = dontDistribute super."netwire"; - "netwire-input" = dontDistribute super."netwire-input"; - "netwire-input-glfw" = dontDistribute super."netwire-input-glfw"; - "network" = doDistribute super."network_2_6_2_1"; - "network-address" = dontDistribute super."network-address"; - "network-api-support" = dontDistribute super."network-api-support"; - "network-bitcoin" = dontDistribute super."network-bitcoin"; - "network-builder" = dontDistribute super."network-builder"; - "network-bytestring" = dontDistribute super."network-bytestring"; - "network-conduit" = dontDistribute super."network-conduit"; - "network-connection" = dontDistribute super."network-connection"; - "network-data" = dontDistribute super."network-data"; - "network-dbus" = dontDistribute super."network-dbus"; - "network-dns" = dontDistribute super."network-dns"; - "network-enumerator" = dontDistribute super."network-enumerator"; - "network-fancy" = dontDistribute super."network-fancy"; - "network-hans" = dontDistribute super."network-hans"; - "network-interfacerequest" = dontDistribute super."network-interfacerequest"; - "network-ip" = dontDistribute super."network-ip"; - "network-metrics" = dontDistribute super."network-metrics"; - "network-minihttp" = dontDistribute super."network-minihttp"; - "network-msg" = dontDistribute super."network-msg"; - "network-msgpack-rpc" = dontDistribute super."network-msgpack-rpc"; - "network-netpacket" = dontDistribute super."network-netpacket"; - "network-pgi" = dontDistribute super."network-pgi"; - "network-rpca" = dontDistribute super."network-rpca"; - "network-server" = dontDistribute super."network-server"; - "network-service" = dontDistribute super."network-service"; - "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr"; - "network-simple-tls" = dontDistribute super."network-simple-tls"; - "network-socket-options" = dontDistribute super."network-socket-options"; - "network-stream" = dontDistribute super."network-stream"; - "network-topic-models" = dontDistribute super."network-topic-models"; - "network-transport-amqp" = dontDistribute super."network-transport-amqp"; - "network-uri-flag" = dontDistribute super."network-uri-flag"; - "network-uri-static" = dontDistribute super."network-uri-static"; - "network-wai-router" = dontDistribute super."network-wai-router"; - "network-websocket" = dontDistribute super."network-websocket"; - "networked-game" = dontDistribute super."networked-game"; - "neural" = dontDistribute super."neural"; - "newports" = dontDistribute super."newports"; - "newsynth" = dontDistribute super."newsynth"; - "newt" = dontDistribute super."newt"; - "newtype-deriving" = dontDistribute super."newtype-deriving"; - "newtype-th" = dontDistribute super."newtype-th"; - "newtyper" = dontDistribute super."newtyper"; - "nextstep-plist" = dontDistribute super."nextstep-plist"; - "nf" = dontDistribute super."nf"; - "ngrams-loader" = dontDistribute super."ngrams-loader"; - "ngx-export" = dontDistribute super."ngx-export"; - "niagra" = dontDistribute super."niagra"; - "nibblestring" = dontDistribute super."nibblestring"; - "nicify" = dontDistribute super."nicify"; - "nicovideo-translator" = dontDistribute super."nicovideo-translator"; - "nikepub" = dontDistribute super."nikepub"; - "nimber" = dontDistribute super."nimber"; - "nist-beacon" = dontDistribute super."nist-beacon"; - "nitro" = dontDistribute super."nitro"; - "nix-eval" = dontDistribute super."nix-eval"; - "nixfromnpm" = dontDistribute super."nixfromnpm"; - "nixos-types" = dontDistribute super."nixos-types"; - "nkjp" = dontDistribute super."nkjp"; - "nlp-scores" = dontDistribute super."nlp-scores"; - "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts"; - "nm" = dontDistribute super."nm"; - "nme" = dontDistribute super."nme"; - "nntp" = dontDistribute super."nntp"; - "no-buffering-workaround" = dontDistribute super."no-buffering-workaround"; - "no-role-annots" = dontDistribute super."no-role-annots"; - "nofib-analyse" = dontDistribute super."nofib-analyse"; - "nofib-analyze" = dontDistribute super."nofib-analyze"; - "noise" = dontDistribute super."noise"; - "non-empty" = dontDistribute super."non-empty"; - "non-empty-sequence" = dontDistribute super."non-empty-sequence"; - "non-negative" = dontDistribute super."non-negative"; - "nondeterminism" = dontDistribute super."nondeterminism"; - "nonempty-alternative" = dontDistribute super."nonempty-alternative"; - "nonfree" = dontDistribute super."nonfree"; - "nonlinear-optimization" = dontDistribute super."nonlinear-optimization"; - "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad"; - "noodle" = dontDistribute super."noodle"; - "normaldistribution" = dontDistribute super."normaldistribution"; - "normalization-insensitive" = dontDistribute super."normalization-insensitive"; - "not-gloss" = dontDistribute super."not-gloss"; - "not-gloss-examples" = dontDistribute super."not-gloss-examples"; - "not-in-base" = dontDistribute super."not-in-base"; - "notcpp" = dontDistribute super."notcpp"; - "notmuch-haskell" = dontDistribute super."notmuch-haskell"; - "notmuch-web" = dontDistribute super."notmuch-web"; - "notzero" = dontDistribute super."notzero"; - "np-extras" = dontDistribute super."np-extras"; - "np-linear" = dontDistribute super."np-linear"; - "nptools" = dontDistribute super."nptools"; - "nth-prime" = dontDistribute super."nth-prime"; - "ntha" = dontDistribute super."ntha"; - "nthable" = dontDistribute super."nthable"; - "ntp-control" = dontDistribute super."ntp-control"; - "null-canvas" = dontDistribute super."null-canvas"; - "nullary" = dontDistribute super."nullary"; - "nullpipe" = dontDistribute super."nullpipe"; - "number" = dontDistribute super."number"; - "number-length" = dontDistribute super."number-length"; - "numbering" = dontDistribute super."numbering"; - "numerals" = dontDistribute super."numerals"; - "numerals-base" = dontDistribute super."numerals-base"; - "numeric-limits" = dontDistribute super."numeric-limits"; - "numeric-prelude" = dontDistribute super."numeric-prelude"; - "numeric-qq" = dontDistribute super."numeric-qq"; - "numeric-quest" = dontDistribute super."numeric-quest"; - "numeric-ranges" = dontDistribute super."numeric-ranges"; - "numeric-tools" = dontDistribute super."numeric-tools"; - "numericpeano" = dontDistribute super."numericpeano"; - "nums" = dontDistribute super."nums"; - "numtype" = dontDistribute super."numtype"; - "numtype-tf" = dontDistribute super."numtype-tf"; - "nurbs" = dontDistribute super."nurbs"; - "nvim-hs" = dontDistribute super."nvim-hs"; - "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib"; - "nyan" = dontDistribute super."nyan"; - "nylas" = dontDistribute super."nylas"; - "nymphaea" = dontDistribute super."nymphaea"; - "oanda-rest-api" = dontDistribute super."oanda-rest-api"; - "oauthenticated" = dontDistribute super."oauthenticated"; - "obdd" = dontDistribute super."obdd"; - "oberon0" = dontDistribute super."oberon0"; - "obj" = dontDistribute super."obj"; - "objectid" = dontDistribute super."objectid"; - "observable-sharing" = dontDistribute super."observable-sharing"; - "octane" = doDistribute super."octane_0_4_24"; - "octohat" = dontDistribute super."octohat"; - "octopus" = dontDistribute super."octopus"; - "oculus" = dontDistribute super."oculus"; - "oden-go-packages" = dontDistribute super."oden-go-packages"; - "oeis" = dontDistribute super."oeis"; - "off-simple" = dontDistribute super."off-simple"; - "ogmarkup" = dontDistribute super."ogmarkup"; - "ohloh-hs" = dontDistribute super."ohloh-hs"; - "oi" = dontDistribute super."oi"; - "oidc-client" = dontDistribute super."oidc-client"; - "ois-input-manager" = dontDistribute super."ois-input-manager"; - "old-version" = dontDistribute super."old-version"; - "olwrapper" = dontDistribute super."olwrapper"; - "omaketex" = dontDistribute super."omaketex"; - "ombra" = dontDistribute super."ombra"; - "omega" = dontDistribute super."omega"; - "omnicodec" = dontDistribute super."omnicodec"; - "on-a-horse" = dontDistribute super."on-a-horse"; - "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel"; - "once" = doDistribute super."once_0_1_0_0"; - "one-liner" = dontDistribute super."one-liner"; - "one-time-password" = dontDistribute super."one-time-password"; - "oneOfN" = dontDistribute super."oneOfN"; - "oneormore" = dontDistribute super."oneormore"; - "only" = dontDistribute super."only"; - "onu-course" = dontDistribute super."onu-course"; - "opaleye" = doDistribute super."opaleye_0_4_2_0"; - "opaleye-classy" = dontDistribute super."opaleye-classy"; - "opaleye-sqlite" = dontDistribute super."opaleye-sqlite"; - "open-haddock" = dontDistribute super."open-haddock"; - "open-pandoc" = dontDistribute super."open-pandoc"; - "open-signals" = dontDistribute super."open-signals"; - "open-symbology" = dontDistribute super."open-symbology"; - "open-typerep" = dontDistribute super."open-typerep"; - "open-union" = dontDistribute super."open-union"; - "open-witness" = dontDistribute super."open-witness"; - "opencog-atomspace" = dontDistribute super."opencog-atomspace"; - "opencv-raw" = dontDistribute super."opencv-raw"; - "opendatatable" = dontDistribute super."opendatatable"; - "openexchangerates" = dontDistribute super."openexchangerates"; - "openflow" = dontDistribute super."openflow"; - "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo"; - "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator"; - "opengles" = dontDistribute super."opengles"; - "openid" = dontDistribute super."openid"; - "openpgp" = dontDistribute super."openpgp"; - "openpgp-Crypto" = dontDistribute super."openpgp-Crypto"; - "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api"; - "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht"; - "openssh-github-keys" = dontDistribute super."openssh-github-keys"; - "openssl-createkey" = dontDistribute super."openssl-createkey"; - "opentheory" = dontDistribute super."opentheory"; - "opentheory-bits" = dontDistribute super."opentheory-bits"; - "opentheory-byte" = dontDistribute super."opentheory-byte"; - "opentheory-char" = dontDistribute super."opentheory-char"; - "opentheory-divides" = dontDistribute super."opentheory-divides"; - "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci"; - "opentheory-parser" = dontDistribute super."opentheory-parser"; - "opentheory-prime" = dontDistribute super."opentheory-prime"; - "opentheory-primitive" = dontDistribute super."opentheory-primitive"; - "opentheory-probability" = dontDistribute super."opentheory-probability"; - "opentheory-stream" = dontDistribute super."opentheory-stream"; - "opentheory-unicode" = dontDistribute super."opentheory-unicode"; - "operational" = doDistribute super."operational_0_2_3_2"; - "operational-alacarte" = dontDistribute super."operational-alacarte"; - "operational-extra" = dontDistribute super."operational-extra"; - "opml" = dontDistribute super."opml"; - "opn" = dontDistribute super."opn"; - "optimal-blocks" = dontDistribute super."optimal-blocks"; - "optimization" = dontDistribute super."optimization"; - "optimusprime" = dontDistribute super."optimusprime"; - "option" = dontDistribute super."option"; - "optional" = dontDistribute super."optional"; - "options-time" = dontDistribute super."options-time"; - "optparse-declarative" = dontDistribute super."optparse-declarative"; - "optparse-text" = dontDistribute super."optparse-text"; - "orc" = dontDistribute super."orc"; - "orchestrate" = dontDistribute super."orchestrate"; - "orchid" = dontDistribute super."orchid"; - "orchid-demo" = dontDistribute super."orchid-demo"; - "ord-adhoc" = dontDistribute super."ord-adhoc"; - "order-maintenance" = dontDistribute super."order-maintenance"; - "order-statistic-tree" = dontDistribute super."order-statistic-tree"; - "order-statistics" = dontDistribute super."order-statistics"; - "ordered" = dontDistribute super."ordered"; - "orders" = dontDistribute super."orders"; - "ordrea" = dontDistribute super."ordrea"; - "organize-imports" = dontDistribute super."organize-imports"; - "orgmode" = dontDistribute super."orgmode"; - "orgmode-parse" = dontDistribute super."orgmode-parse"; - "origami" = dontDistribute super."origami"; - "os-release" = dontDistribute super."os-release"; - "osc" = dontDistribute super."osc"; - "oscpacking" = dontDistribute super."oscpacking"; - "osm-conduit" = dontDistribute super."osm-conduit"; - "osm-download" = dontDistribute super."osm-download"; - "oso2pdf" = dontDistribute super."oso2pdf"; - "osx-ar" = dontDistribute super."osx-ar"; - "ot" = dontDistribute super."ot"; - "ottparse-pretty" = dontDistribute super."ottparse-pretty"; - "overloaded-records" = dontDistribute super."overloaded-records"; - "overture" = dontDistribute super."overture"; - "pack" = dontDistribute super."pack"; - "package-o-tron" = dontDistribute super."package-o-tron"; - "package-vt" = dontDistribute super."package-vt"; - "packed-dawg" = dontDistribute super."packed-dawg"; - "packedstring" = dontDistribute super."packedstring"; - "packer" = dontDistribute super."packer"; - "packman" = dontDistribute super."packman"; - "packunused" = dontDistribute super."packunused"; - "pacman-memcache" = dontDistribute super."pacman-memcache"; - "padKONTROL" = dontDistribute super."padKONTROL"; - "pagarme" = dontDistribute super."pagarme"; - "pagination" = dontDistribute super."pagination"; - "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver"; - "palette" = doDistribute super."palette_0_1_0_3"; - "palindromes" = dontDistribute super."palindromes"; - "pam" = dontDistribute super."pam"; - "panda" = dontDistribute super."panda"; - "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9_1_1"; - "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble"; - "pandoc-crossref" = dontDistribute super."pandoc-crossref"; - "pandoc-csv2table" = dontDistribute super."pandoc-csv2table"; - "pandoc-include" = dontDistribute super."pandoc-include"; - "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters"; - "pandoc-lens" = dontDistribute super."pandoc-lens"; - "pandoc-placetable" = dontDistribute super."pandoc-placetable"; - "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams"; - "pandoc-types" = doDistribute super."pandoc-types_1_16_1"; - "pandoc-unlit" = dontDistribute super."pandoc-unlit"; - "pango" = doDistribute super."pango_0_13_1_1"; - "papa" = dontDistribute super."papa"; - "papa-lens" = dontDistribute super."papa-lens"; - "papa-prelude" = dontDistribute super."papa-prelude"; - "papa-prelude-core" = dontDistribute super."papa-prelude-core"; - "papa-prelude-lens" = dontDistribute super."papa-prelude-lens"; - "papa-prelude-semigroupoids" = dontDistribute super."papa-prelude-semigroupoids"; - "papa-prelude-semigroups" = dontDistribute super."papa-prelude-semigroups"; - "papillon" = dontDistribute super."papillon"; - "pappy" = dontDistribute super."pappy"; - "paprika" = dontDistribute super."paprika"; - "para" = dontDistribute super."para"; - "paragon" = dontDistribute super."paragon"; - "parallel-tasks" = dontDistribute super."parallel-tasks"; - "parallel-tree-search" = dontDistribute super."parallel-tree-search"; - "parameterized-data" = dontDistribute super."parameterized-data"; - "paranoia" = dontDistribute super."paranoia"; - "parco" = dontDistribute super."parco"; - "parco-attoparsec" = dontDistribute super."parco-attoparsec"; - "parco-parsec" = dontDistribute super."parco-parsec"; - "parcom-lib" = dontDistribute super."parcom-lib"; - "parconc-examples" = dontDistribute super."parconc-examples"; - "parport" = dontDistribute super."parport"; - "parse-dimacs" = dontDistribute super."parse-dimacs"; - "parse-help" = dontDistribute super."parse-help"; - "parsec-extra" = dontDistribute super."parsec-extra"; - "parsec-numbers" = dontDistribute super."parsec-numbers"; - "parsec-parsers" = dontDistribute super."parsec-parsers"; - "parsec-permutation" = dontDistribute super."parsec-permutation"; - "parsec-pratt" = dontDistribute super."parsec-pratt"; - "parsec-tagsoup" = dontDistribute super."parsec-tagsoup"; - "parsec-trace" = dontDistribute super."parsec-trace"; - "parsec-utils" = dontDistribute super."parsec-utils"; - "parsec1" = dontDistribute super."parsec1"; - "parsec2" = dontDistribute super."parsec2"; - "parsec3" = dontDistribute super."parsec3"; - "parsec3-numbers" = dontDistribute super."parsec3-numbers"; - "parsedate" = dontDistribute super."parsedate"; - "parseerror-eq" = dontDistribute super."parseerror-eq"; - "parsek" = dontDistribute super."parsek"; - "parsely" = dontDistribute super."parsely"; - "parser-helper" = dontDistribute super."parser-helper"; - "parser241" = dontDistribute super."parser241"; - "parsergen" = dontDistribute super."parsergen"; - "parsestar" = dontDistribute super."parsestar"; - "parsimony" = dontDistribute super."parsimony"; - "partage" = dontDistribute super."partage"; - "partial" = dontDistribute super."partial"; - "partial-lens" = dontDistribute super."partial-lens"; - "partial-uri" = dontDistribute super."partial-uri"; - "partly" = dontDistribute super."partly"; - "passage" = dontDistribute super."passage"; - "passwords" = dontDistribute super."passwords"; - "pasta" = dontDistribute super."pasta"; - "pastis" = dontDistribute super."pastis"; - "pasty" = dontDistribute super."pasty"; - "patch-combinators" = dontDistribute super."patch-combinators"; - "patch-image" = dontDistribute super."patch-image"; - "path" = doDistribute super."path_0_5_8"; - "path-io" = doDistribute super."path-io_1_1_0"; - "pathfinding" = dontDistribute super."pathfinding"; - "pathfindingcore" = dontDistribute super."pathfindingcore"; - "pathtype" = dontDistribute super."pathtype"; - "patronscraper" = dontDistribute super."patronscraper"; - "patterns" = dontDistribute super."patterns"; - "paymill" = dontDistribute super."paymill"; - "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops"; - "paypal-api" = dontDistribute super."paypal-api"; - "pb" = dontDistribute super."pb"; - "pbc4hs" = dontDistribute super."pbc4hs"; - "pbkdf" = dontDistribute super."pbkdf"; - "pcap-conduit" = dontDistribute super."pcap-conduit"; - "pcap-enumerator" = dontDistribute super."pcap-enumerator"; - "pcd-loader" = dontDistribute super."pcd-loader"; - "pcf" = dontDistribute super."pcf"; - "pcg-random" = dontDistribute super."pcg-random"; - "pcre-less" = dontDistribute super."pcre-less"; - "pcre-light-extra" = dontDistribute super."pcre-light-extra"; - "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer"; - "pdf2line" = dontDistribute super."pdf2line"; - "pdfsplit" = dontDistribute super."pdfsplit"; - "pdynload" = dontDistribute super."pdynload"; - "peakachu" = dontDistribute super."peakachu"; - "peano" = dontDistribute super."peano"; - "peano-inf" = dontDistribute super."peano-inf"; - "pec" = dontDistribute super."pec"; - "pecoff" = dontDistribute super."pecoff"; - "peg" = dontDistribute super."peg"; - "peggy" = dontDistribute super."peggy"; - "pell" = dontDistribute super."pell"; - "penn-treebank" = dontDistribute super."penn-treebank"; - "penny" = dontDistribute super."penny"; - "penny-bin" = dontDistribute super."penny-bin"; - "penny-lib" = dontDistribute super."penny-lib"; - "peparser" = dontDistribute super."peparser"; - "perceptron" = dontDistribute super."perceptron"; - "perdure" = dontDistribute super."perdure"; - "perfecthash" = dontDistribute super."perfecthash"; - "period" = dontDistribute super."period"; - "periodic" = dontDistribute super."periodic"; - "perm" = dontDistribute super."perm"; - "permute" = dontDistribute super."permute"; - "persist2er" = dontDistribute super."persist2er"; - "persistent" = doDistribute super."persistent_2_2_4_1"; - "persistent-audit" = dontDistribute super."persistent-audit"; - "persistent-cereal" = dontDistribute super."persistent-cereal"; - "persistent-database-url" = dontDistribute super."persistent-database-url"; - "persistent-equivalence" = dontDistribute super."persistent-equivalence"; - "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp"; - "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute"; - "persistent-iproute" = dontDistribute super."persistent-iproute"; - "persistent-map" = dontDistribute super."persistent-map"; - "persistent-mongoDB" = doDistribute super."persistent-mongoDB_2_1_4"; - "persistent-mysql" = doDistribute super."persistent-mysql_2_3_0_2"; - "persistent-odbc" = dontDistribute super."persistent-odbc"; - "persistent-parser" = dontDistribute super."persistent-parser"; - "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_2"; - "persistent-protobuf" = dontDistribute super."persistent-protobuf"; - "persistent-ratelimit" = dontDistribute super."persistent-ratelimit"; - "persistent-redis" = dontDistribute super."persistent-redis"; - "persistent-sqlite" = doDistribute super."persistent-sqlite_2_2_1"; - "persistent-template" = doDistribute super."persistent-template_2_1_8_1"; - "persistent-vector" = dontDistribute super."persistent-vector"; - "persistent-zookeeper" = dontDistribute super."persistent-zookeeper"; - "persona" = dontDistribute super."persona"; - "persona-idp" = dontDistribute super."persona-idp"; - "pesca" = dontDistribute super."pesca"; - "peyotls" = dontDistribute super."peyotls"; - "peyotls-codec" = dontDistribute super."peyotls-codec"; - "pez" = dontDistribute super."pez"; - "pg-harness" = dontDistribute super."pg-harness"; - "pg-harness-client" = dontDistribute super."pg-harness-client"; - "pg-harness-server" = dontDistribute super."pg-harness-server"; - "pg-store" = dontDistribute super."pg-store"; - "pgdl" = dontDistribute super."pgdl"; - "pgm" = dontDistribute super."pgm"; - "pgsql-simple" = dontDistribute super."pgsql-simple"; - "pgstream" = dontDistribute super."pgstream"; - "phasechange" = dontDistribute super."phasechange"; - "phash" = dontDistribute super."phash"; - "phizzle" = dontDistribute super."phizzle"; - "phoityne" = dontDistribute super."phoityne"; - "phoityne-vscode" = dontDistribute super."phoityne-vscode"; - "phone-metadata" = dontDistribute super."phone-metadata"; - "phone-numbers" = dontDistribute super."phone-numbers"; - "phone-push" = dontDistribute super."phone-push"; - "phonetic-code" = dontDistribute super."phonetic-code"; - "phooey" = dontDistribute super."phooey"; - "photoname" = dontDistribute super."photoname"; - "phraskell" = dontDistribute super."phraskell"; - "phybin" = dontDistribute super."phybin"; - "pi-calculus" = dontDistribute super."pi-calculus"; - "pi-forall" = dontDistribute super."pi-forall"; - "pia-forward" = dontDistribute super."pia-forward"; - "pianola" = dontDistribute super."pianola"; - "picologic" = dontDistribute super."picologic"; - "picosat" = dontDistribute super."picosat"; - "piet" = dontDistribute super."piet"; - "piki" = dontDistribute super."piki"; - "pinboard" = dontDistribute super."pinboard"; - "pinch" = doDistribute super."pinch_0_2_0_2"; - "pinchot" = doDistribute super."pinchot_0_18_2_0"; - "pipe-enumerator" = dontDistribute super."pipe-enumerator"; - "pipeclip" = dontDistribute super."pipeclip"; - "pipes-async" = dontDistribute super."pipes-async"; - "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming"; - "pipes-bzip" = dontDistribute super."pipes-bzip"; - "pipes-cacophony" = doDistribute super."pipes-cacophony_0_2_1"; - "pipes-cellular" = dontDistribute super."pipes-cellular"; - "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv"; - "pipes-cereal" = dontDistribute super."pipes-cereal"; - "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus"; - "pipes-cliff" = doDistribute super."pipes-cliff_0_10_0_4"; - "pipes-conduit" = dontDistribute super."pipes-conduit"; - "pipes-core" = dontDistribute super."pipes-core"; - "pipes-courier" = dontDistribute super."pipes-courier"; - "pipes-errors" = dontDistribute super."pipes-errors"; - "pipes-extra" = dontDistribute super."pipes-extra"; - "pipes-files" = dontDistribute super."pipes-files"; - "pipes-http" = doDistribute super."pipes-http_1_0_3"; - "pipes-interleave" = dontDistribute super."pipes-interleave"; - "pipes-io" = dontDistribute super."pipes-io"; - "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv"; - "pipes-lzma" = dontDistribute super."pipes-lzma"; - "pipes-network-tls" = dontDistribute super."pipes-network-tls"; - "pipes-p2p" = dontDistribute super."pipes-p2p"; - "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples"; - "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple"; - "pipes-protolude" = dontDistribute super."pipes-protolude"; - "pipes-random" = dontDistribute super."pipes-random"; - "pipes-rt" = dontDistribute super."pipes-rt"; - "pipes-s3" = dontDistribute super."pipes-s3"; - "pipes-shell" = dontDistribute super."pipes-shell"; - "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple"; - "pipes-vector" = dontDistribute super."pipes-vector"; - "pipes-websockets" = dontDistribute super."pipes-websockets"; - "pipes-zeromq4" = dontDistribute super."pipes-zeromq4"; - "pipes-zlib" = dontDistribute super."pipes-zlib"; - "pisigma" = dontDistribute super."pisigma"; - "pit" = dontDistribute super."pit"; - "pitchtrack" = dontDistribute super."pitchtrack"; - "pivotal-tracker" = dontDistribute super."pivotal-tracker"; - "pixelated-avatar-generator" = dontDistribute super."pixelated-avatar-generator"; - "pkcs1" = dontDistribute super."pkcs1"; - "pkcs7" = dontDistribute super."pkcs7"; - "pkggraph" = dontDistribute super."pkggraph"; - "pktree" = dontDistribute super."pktree"; - "plailude" = dontDistribute super."plailude"; - "planar-graph" = dontDistribute super."planar-graph"; - "plat" = dontDistribute super."plat"; - "playlists" = dontDistribute super."playlists"; - "plist" = dontDistribute super."plist"; - "plist-buddy" = dontDistribute super."plist-buddy"; - "plivo" = dontDistribute super."plivo"; - "plot-lab" = dontDistribute super."plot-lab"; - "plotfont" = dontDistribute super."plotfont"; - "plotserver-api" = dontDistribute super."plotserver-api"; - "plugins" = dontDistribute super."plugins"; - "plugins-auto" = dontDistribute super."plugins-auto"; - "plugins-multistage" = dontDistribute super."plugins-multistage"; - "plumbers" = dontDistribute super."plumbers"; - "ply-loader" = dontDistribute super."ply-loader"; - "png-file" = dontDistribute super."png-file"; - "pngload" = dontDistribute super."pngload"; - "pngload-fixed" = dontDistribute super."pngload-fixed"; - "pnm" = dontDistribute super."pnm"; - "pocket-dns" = dontDistribute super."pocket-dns"; - "pointed" = doDistribute super."pointed_4_2_0_2"; - "pointedalternative" = dontDistribute super."pointedalternative"; - "pointfree" = dontDistribute super."pointfree"; - "pointless-haskell" = dontDistribute super."pointless-haskell"; - "pointless-lenses" = dontDistribute super."pointless-lenses"; - "pointless-rewrite" = dontDistribute super."pointless-rewrite"; - "pokemon-go-protobuf-types" = dontDistribute super."pokemon-go-protobuf-types"; - "poker-eval" = dontDistribute super."poker-eval"; - "pokitdok" = dontDistribute super."pokitdok"; - "polar" = dontDistribute super."polar"; - "polar-configfile" = dontDistribute super."polar-configfile"; - "polar-shader" = dontDistribute super."polar-shader"; - "polh-lexicon" = dontDistribute super."polh-lexicon"; - "polimorf" = dontDistribute super."polimorf"; - "poll" = dontDistribute super."poll"; - "poly-control" = dontDistribute super."poly-control"; - "polyToMonoid" = dontDistribute super."polyToMonoid"; - "polymap" = dontDistribute super."polymap"; - "polynom" = dontDistribute super."polynom"; - "polynomial" = dontDistribute super."polynomial"; - "polyseq" = dontDistribute super."polyseq"; - "polysoup" = dontDistribute super."polysoup"; - "polytypeable" = dontDistribute super."polytypeable"; - "polytypeable-utils" = dontDistribute super."polytypeable-utils"; - "pomodoro" = dontDistribute super."pomodoro"; - "ponder" = dontDistribute super."ponder"; - "pong-server" = dontDistribute super."pong-server"; - "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver"; - "pontarius-xmpp" = dontDistribute super."pontarius-xmpp"; - "pontarius-xpmn" = dontDistribute super."pontarius-xpmn"; - "pony" = dontDistribute super."pony"; - "pool" = dontDistribute super."pool"; - "pool-conduit" = dontDistribute super."pool-conduit"; - "pooled-io" = dontDistribute super."pooled-io"; - "pop3-client" = dontDistribute super."pop3-client"; - "popenhs" = dontDistribute super."popenhs"; - "poppler" = dontDistribute super."poppler"; - "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache"; - "portable-lines" = dontDistribute super."portable-lines"; - "portaudio" = dontDistribute super."portaudio"; - "porte" = dontDistribute super."porte"; - "porter" = dontDistribute super."porter"; - "ports" = dontDistribute super."ports"; - "ports-tools" = dontDistribute super."ports-tools"; - "positive" = dontDistribute super."positive"; - "posix-acl" = dontDistribute super."posix-acl"; - "posix-error-codes" = dontDistribute super."posix-error-codes"; - "posix-escape" = dontDistribute super."posix-escape"; - "posix-filelock" = dontDistribute super."posix-filelock"; - "posix-paths" = dontDistribute super."posix-paths"; - "posix-pty" = dontDistribute super."posix-pty"; - "posix-timer" = dontDistribute super."posix-timer"; - "posix-waitpid" = dontDistribute super."posix-waitpid"; - "possible" = dontDistribute super."possible"; - "postcodes" = dontDistribute super."postcodes"; - "postgres-tmp" = dontDistribute super."postgres-tmp"; - "postgresql-binary" = doDistribute super."postgresql-binary_0_9_0_1"; - "postgresql-config" = dontDistribute super."postgresql-config"; - "postgresql-connector" = dontDistribute super."postgresql-connector"; - "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape"; - "postgresql-cube" = dontDistribute super."postgresql-cube"; - "postgresql-error-codes" = dontDistribute super."postgresql-error-codes"; - "postgresql-libpq" = doDistribute super."postgresql-libpq_0_9_1_1"; - "postgresql-query" = dontDistribute super."postgresql-query"; - "postgresql-simple-bind" = dontDistribute super."postgresql-simple-bind"; - "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration"; - "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop"; - "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed"; - "postgresql-typed" = dontDistribute super."postgresql-typed"; - "postgrest" = dontDistribute super."postgrest"; - "postgrest-ws" = dontDistribute super."postgrest-ws"; - "postie" = dontDistribute super."postie"; - "postmark" = dontDistribute super."postmark"; - "postmaster" = dontDistribute super."postmaster"; - "potato-tool" = dontDistribute super."potato-tool"; - "potrace" = dontDistribute super."potrace"; - "potrace-diagrams" = dontDistribute super."potrace-diagrams"; - "powermate" = dontDistribute super."powermate"; - "powerpc" = dontDistribute super."powerpc"; - "ppm" = dontDistribute super."ppm"; - "pqc" = dontDistribute super."pqc"; - "pqueue" = dontDistribute super."pqueue"; - "pqueue-mtl" = dontDistribute super."pqueue-mtl"; - "practice-room" = dontDistribute super."practice-room"; - "precis" = dontDistribute super."precis"; - "predicates" = dontDistribute super."predicates"; - "predictive" = dontDistribute super."predictive"; - "prednote-test" = dontDistribute super."prednote-test"; - "prefork" = dontDistribute super."prefork"; - "pregame" = dontDistribute super."pregame"; - "preliminaries" = dontDistribute super."preliminaries"; - "prelude-compat" = dontDistribute super."prelude-compat"; - "prelude-edsl" = dontDistribute super."prelude-edsl"; - "prelude-generalize" = dontDistribute super."prelude-generalize"; - "prelude-plus" = dontDistribute super."prelude-plus"; - "prelude-prime" = dontDistribute super."prelude-prime"; - "prelude2010" = dontDistribute super."prelude2010"; - "preprocess-haskell" = dontDistribute super."preprocess-haskell"; - "preprocessor" = dontDistribute super."preprocessor"; - "present" = dontDistribute super."present"; - "press" = dontDistribute super."press"; - "presto-hdbc" = dontDistribute super."presto-hdbc"; - "prettify" = dontDistribute super."prettify"; - "pretty-compact" = dontDistribute super."pretty-compact"; - "pretty-error" = dontDistribute super."pretty-error"; - "pretty-ncols" = dontDistribute super."pretty-ncols"; - "pretty-sop" = dontDistribute super."pretty-sop"; - "pretty-tree" = dontDistribute super."pretty-tree"; - "pretty-types" = dontDistribute super."pretty-types"; - "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing"; - "prim-spoon" = dontDistribute super."prim-spoon"; - "prim-uniq" = dontDistribute super."prim-uniq"; - "primitive-simd" = dontDistribute super."primitive-simd"; - "primula-board" = dontDistribute super."primula-board"; - "primula-bot" = dontDistribute super."primula-bot"; - "pringletons" = dontDistribute super."pringletons"; - "print-debugger" = dontDistribute super."print-debugger"; - "printf-mauke" = dontDistribute super."printf-mauke"; - "printf-safe" = dontDistribute super."printf-safe"; - "printxosd" = dontDistribute super."printxosd"; - "priority-queue" = dontDistribute super."priority-queue"; - "priority-sync" = dontDistribute super."priority-sync"; - "privileged-concurrency" = dontDistribute super."privileged-concurrency"; - "prizm" = dontDistribute super."prizm"; - "probability" = dontDistribute super."probability"; - "probable" = dontDistribute super."probable"; - "proc" = dontDistribute super."proc"; - "proc-net" = dontDistribute super."proc-net"; - "process-conduit" = dontDistribute super."process-conduit"; - "process-extras" = doDistribute super."process-extras_0_3_3_8"; - "process-iterio" = dontDistribute super."process-iterio"; - "process-leksah" = dontDistribute super."process-leksah"; - "process-listlike" = dontDistribute super."process-listlike"; - "process-progress" = dontDistribute super."process-progress"; - "process-qq" = dontDistribute super."process-qq"; - "processing" = dontDistribute super."processing"; - "processing-for-haskell" = dontDistribute super."processing-for-haskell"; - "processor-creative-kit" = dontDistribute super."processor-creative-kit"; - "procrastinating-structure" = dontDistribute super."procrastinating-structure"; - "procrastinating-variable" = dontDistribute super."procrastinating-variable"; - "procstat" = dontDistribute super."procstat"; - "proctest" = dontDistribute super."proctest"; - "prof2dot" = dontDistribute super."prof2dot"; - "prof2pretty" = dontDistribute super."prof2pretty"; - "progress" = dontDistribute super."progress"; - "progressbar" = dontDistribute super."progressbar"; - "progression" = dontDistribute super."progression"; - "progressive" = dontDistribute super."progressive"; - "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings"; - "projection" = dontDistribute super."projection"; - "prolog" = dontDistribute super."prolog"; - "prolog-graph" = dontDistribute super."prolog-graph"; - "prolog-graph-lib" = dontDistribute super."prolog-graph-lib"; - "prologue" = dontDistribute super."prologue"; - "prometheus" = dontDistribute super."prometheus"; - "promise" = dontDistribute super."promise"; - "promises" = dontDistribute super."promises"; - "propane" = dontDistribute super."propane"; - "propellor" = dontDistribute super."propellor"; - "properties" = dontDistribute super."properties"; - "property-list" = dontDistribute super."property-list"; - "proplang" = dontDistribute super."proplang"; - "props" = dontDistribute super."props"; - "prosper" = dontDistribute super."prosper"; - "proteaaudio" = dontDistribute super."proteaaudio"; - "proto-lens" = dontDistribute super."proto-lens"; - "proto-lens-arbitrary" = dontDistribute super."proto-lens-arbitrary"; - "proto-lens-combinators" = dontDistribute super."proto-lens-combinators"; - "proto-lens-optparse" = dontDistribute super."proto-lens-optparse"; - "proto-lens-protoc" = dontDistribute super."proto-lens-protoc"; - "protobuf-native" = dontDistribute super."protobuf-native"; - "protocol-buffers" = doDistribute super."protocol-buffers_2_2_0"; - "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_2_0"; - "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork"; - "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork"; - "protolude" = doDistribute super."protolude_0_1_6"; - "proton-haskell" = dontDistribute super."proton-haskell"; - "prototype" = dontDistribute super."prototype"; - "prove-everywhere-server" = dontDistribute super."prove-everywhere-server"; - "proxy-kindness" = dontDistribute super."proxy-kindness"; - "psc-ide" = dontDistribute super."psc-ide"; - "pseudo-boolean" = dontDistribute super."pseudo-boolean"; - "pseudo-trie" = dontDistribute super."pseudo-trie"; - "pseudomacros" = dontDistribute super."pseudomacros"; - "psqueues" = doDistribute super."psqueues_0_2_2_1"; - "pstemmer" = dontDistribute super."pstemmer"; - "pub" = dontDistribute super."pub"; - "publicsuffix" = doDistribute super."publicsuffix_0_20160522"; - "publicsuffixlist" = dontDistribute super."publicsuffixlist"; - "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate"; - "pubnub" = dontDistribute super."pubnub"; - "pubsub" = dontDistribute super."pubsub"; - "puffytools" = dontDistribute super."puffytools"; - "pugixml" = dontDistribute super."pugixml"; - "pugs-DrIFT" = dontDistribute super."pugs-DrIFT"; - "pugs-HsSyck" = dontDistribute super."pugs-HsSyck"; - "pugs-compat" = dontDistribute super."pugs-compat"; - "pugs-hsregex" = dontDistribute super."pugs-hsregex"; - "pulse" = dontDistribute super."pulse"; - "pulse-simple" = dontDistribute super."pulse-simple"; - "pulseaudio" = dontDistribute super."pulseaudio"; - "punkt" = dontDistribute super."punkt"; - "punycode" = dontDistribute super."punycode"; - "puppetresources" = dontDistribute super."puppetresources"; - "pure-fft" = dontDistribute super."pure-fft"; - "pure-priority-queue" = dontDistribute super."pure-priority-queue"; - "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests"; - "pure-zlib" = dontDistribute super."pure-zlib"; - "purescript" = doDistribute super."purescript_0_8_5_0"; - "purescript-bridge" = dontDistribute super."purescript-bridge"; - "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast"; - "pursuit-client" = dontDistribute super."pursuit-client"; - "push-notify" = dontDistribute super."push-notify"; - "push-notify-ccs" = dontDistribute super."push-notify-ccs"; - "push-notify-general" = dontDistribute super."push-notify-general"; - "pusher-haskell" = dontDistribute super."pusher-haskell"; - "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_2"; - "pusher-ws" = dontDistribute super."pusher-ws"; - "pushme" = dontDistribute super."pushme"; - "putlenses" = dontDistribute super."putlenses"; - "puzzle-draw" = dontDistribute super."puzzle-draw"; - "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline"; - "pvd" = dontDistribute super."pvd"; - "pwstore-cli" = dontDistribute super."pwstore-cli"; - "pxsl-tools" = dontDistribute super."pxsl-tools"; - "pyffi" = dontDistribute super."pyffi"; - "pyfi" = dontDistribute super."pyfi"; - "python-pickle" = dontDistribute super."python-pickle"; - "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator"; - "qd" = dontDistribute super."qd"; - "qd-vec" = dontDistribute super."qd-vec"; - "qed" = dontDistribute super."qed"; - "qhull-simple" = dontDistribute super."qhull-simple"; - "qrcode" = dontDistribute super."qrcode"; - "qt" = dontDistribute super."qt"; - "qtah-cpp-qt5" = dontDistribute super."qtah-cpp-qt5"; - "qtah-examples" = dontDistribute super."qtah-examples"; - "qtah-generator" = dontDistribute super."qtah-generator"; - "qtah-qt5" = dontDistribute super."qtah-qt5"; - "quack" = dontDistribute super."quack"; - "quadratic-irrational" = dontDistribute super."quadratic-irrational"; - "quantfin" = dontDistribute super."quantfin"; - "quantities" = dontDistribute super."quantities"; - "quantum-arrow" = dontDistribute super."quantum-arrow"; - "quantum-random" = dontDistribute super."quantum-random"; - "qudb" = dontDistribute super."qudb"; - "quenya-verb" = dontDistribute super."quenya-verb"; - "querystring-pickle" = dontDistribute super."querystring-pickle"; - "queue" = dontDistribute super."queue"; - "queuelike" = dontDistribute super."queuelike"; - "quick-generator" = dontDistribute super."quick-generator"; - "quick-schema" = dontDistribute super."quick-schema"; - "quickbooks" = dontDistribute super."quickbooks"; - "quickcheck-arbitrary-adt" = dontDistribute super."quickcheck-arbitrary-adt"; - "quickcheck-combinators" = dontDistribute super."quickcheck-combinators"; - "quickcheck-poly" = dontDistribute super."quickcheck-poly"; - "quickcheck-properties" = dontDistribute super."quickcheck-properties"; - "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb"; - "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad"; - "quickcheck-regex" = dontDistribute super."quickcheck-regex"; - "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng"; - "quickcheck-rematch" = dontDistribute super."quickcheck-rematch"; - "quickcheck-script" = dontDistribute super."quickcheck-script"; - "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver"; - "quicklz" = dontDistribute super."quicklz"; - "quickpull" = dontDistribute super."quickpull"; - "quickset" = dontDistribute super."quickset"; - "quickspec" = dontDistribute super."quickspec"; - "quickterm" = dontDistribute super."quickterm"; - "quicktest" = dontDistribute super."quicktest"; - "quickwebapp" = dontDistribute super."quickwebapp"; - "quipper" = dontDistribute super."quipper"; - "quiver" = dontDistribute super."quiver"; - "quiver-binary" = dontDistribute super."quiver-binary"; - "quiver-bytestring" = dontDistribute super."quiver-bytestring"; - "quiver-cell" = dontDistribute super."quiver-cell"; - "quiver-csv" = dontDistribute super."quiver-csv"; - "quiver-enumerator" = dontDistribute super."quiver-enumerator"; - "quiver-groups" = dontDistribute super."quiver-groups"; - "quiver-http" = dontDistribute super."quiver-http"; - "quiver-instances" = dontDistribute super."quiver-instances"; - "quiver-interleave" = dontDistribute super."quiver-interleave"; - "quiver-sort" = dontDistribute super."quiver-sort"; - "quoridor-hs" = dontDistribute super."quoridor-hs"; - "qux" = dontDistribute super."qux"; - "raaz" = dontDistribute super."raaz"; - "rabocsv2qif" = dontDistribute super."rabocsv2qif"; - "rad" = dontDistribute super."rad"; - "radian" = dontDistribute super."radian"; - "radium" = dontDistribute super."radium"; - "radium-formula-parser" = dontDistribute super."radium-formula-parser"; - "radix" = dontDistribute super."radix"; - "rados-haskell" = dontDistribute super."rados-haskell"; - "raft" = dontDistribute super."raft"; - "rail-compiler-editor" = dontDistribute super."rail-compiler-editor"; - "rainbow-tests" = dontDistribute super."rainbow-tests"; - "rake" = dontDistribute super."rake"; - "rakhana" = dontDistribute super."rakhana"; - "ralist" = dontDistribute super."ralist"; - "rallod" = dontDistribute super."rallod"; - "raml" = dontDistribute super."raml"; - "rand-vars" = dontDistribute super."rand-vars"; - "randfile" = dontDistribute super."randfile"; - "random-access-list" = dontDistribute super."random-access-list"; - "random-derive" = dontDistribute super."random-derive"; - "random-eff" = dontDistribute super."random-eff"; - "random-effin" = dontDistribute super."random-effin"; - "random-extras" = dontDistribute super."random-extras"; - "random-fu-multivariate" = dontDistribute super."random-fu-multivariate"; - "random-hypergeometric" = dontDistribute super."random-hypergeometric"; - "random-stream" = dontDistribute super."random-stream"; - "random-strings" = dontDistribute super."random-strings"; - "random-variates" = dontDistribute super."random-variates"; - "randomgen" = dontDistribute super."randomgen"; - "randproc" = dontDistribute super."randproc"; - "randsolid" = dontDistribute super."randsolid"; - "range-space" = dontDistribute super."range-space"; - "rangemin" = dontDistribute super."rangemin"; - "ranges" = dontDistribute super."ranges"; - "rapid" = dontDistribute super."rapid"; - "rascal" = dontDistribute super."rascal"; - "rate-limit" = dontDistribute super."rate-limit"; - "ratel" = doDistribute super."ratel_0_1_3"; - "ratel-wai" = doDistribute super."ratel-wai_0_1_2"; - "ratio-int" = dontDistribute super."ratio-int"; - "raven-haskell" = dontDistribute super."raven-haskell"; - "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty"; - "raw-feldspar" = dontDistribute super."raw-feldspar"; - "rawr" = dontDistribute super."rawr"; - "rawstring-qm" = dontDistribute super."rawstring-qm"; - "razom-text-util" = dontDistribute super."razom-text-util"; - "rbr" = dontDistribute super."rbr"; - "rclient" = dontDistribute super."rclient"; - "rcu" = dontDistribute super."rcu"; - "rdf" = dontDistribute super."rdf"; - "rdf4h" = dontDistribute super."rdf4h"; - "rdioh" = dontDistribute super."rdioh"; - "rdtsc" = dontDistribute super."rdtsc"; - "rdtsc-enolan" = dontDistribute super."rdtsc-enolan"; - "re2" = dontDistribute super."re2"; - "react-flux" = dontDistribute super."react-flux"; - "react-flux-servant" = dontDistribute super."react-flux-servant"; - "react-haskell" = dontDistribute super."react-haskell"; - "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server"; - "reaction-logic" = dontDistribute super."reaction-logic"; - "reactive" = dontDistribute super."reactive"; - "reactive-bacon" = dontDistribute super."reactive-bacon"; - "reactive-balsa" = dontDistribute super."reactive-balsa"; - "reactive-banana" = dontDistribute super."reactive-banana"; - "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl"; - "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2"; - "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny"; - "reactive-banana-wx" = dontDistribute super."reactive-banana-wx"; - "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip"; - "reactive-glut" = dontDistribute super."reactive-glut"; - "reactive-haskell" = dontDistribute super."reactive-haskell"; - "reactive-io" = dontDistribute super."reactive-io"; - "reactive-thread" = dontDistribute super."reactive-thread"; - "reactivity" = dontDistribute super."reactivity"; - "reactor" = dontDistribute super."reactor"; - "read-bounded" = dontDistribute super."read-bounded"; - "read-env-var" = doDistribute super."read-env-var_0_1_0_0"; - "readline-statevar" = dontDistribute super."readline-statevar"; - "readpyc" = dontDistribute super."readpyc"; - "readshp" = dontDistribute super."readshp"; - "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser"; - "reasonable-lens" = dontDistribute super."reasonable-lens"; - "reasonable-operational" = dontDistribute super."reasonable-operational"; - "rebase" = dontDistribute super."rebase"; - "recaptcha" = dontDistribute super."recaptcha"; - "record" = dontDistribute super."record"; - "record-aeson" = dontDistribute super."record-aeson"; - "record-gl" = dontDistribute super."record-gl"; - "record-preprocessor" = dontDistribute super."record-preprocessor"; - "record-syntax" = dontDistribute super."record-syntax"; - "records" = dontDistribute super."records"; - "records-th" = dontDistribute super."records-th"; - "recursive-line-count" = dontDistribute super."recursive-line-count"; - "redHandlers" = dontDistribute super."redHandlers"; - "reddit" = dontDistribute super."reddit"; - "redis" = dontDistribute super."redis"; - "redis-hs" = dontDistribute super."redis-hs"; - "redis-job-queue" = dontDistribute super."redis-job-queue"; - "redis-simple" = dontDistribute super."redis-simple"; - "redo" = dontDistribute super."redo"; - "reenact" = dontDistribute super."reenact"; - "reexport-crypto-random" = dontDistribute super."reexport-crypto-random"; - "ref" = dontDistribute super."ref"; - "ref-mtl" = dontDistribute super."ref-mtl"; - "ref-tf" = dontDistribute super."ref-tf"; - "refcount" = dontDistribute super."refcount"; - "reference" = dontDistribute super."reference"; - "references" = dontDistribute super."references"; - "refh" = dontDistribute super."refh"; - "refined" = dontDistribute super."refined"; - "reflection-extras" = dontDistribute super."reflection-extras"; - "reflection-without-remorse" = dontDistribute super."reflection-without-remorse"; - "reflex" = dontDistribute super."reflex"; - "reflex-animation" = dontDistribute super."reflex-animation"; - "reflex-dom" = dontDistribute super."reflex-dom"; - "reflex-dom-colonnade" = dontDistribute super."reflex-dom-colonnade"; - "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib"; - "reflex-dom-helpers" = dontDistribute super."reflex-dom-helpers"; - "reflex-gloss" = dontDistribute super."reflex-gloss"; - "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene"; - "reflex-jsx" = dontDistribute super."reflex-jsx"; - "reflex-orphans" = dontDistribute super."reflex-orphans"; - "reflex-transformers" = dontDistribute super."reflex-transformers"; - "regex-deriv" = dontDistribute super."regex-deriv"; - "regex-dfa" = dontDistribute super."regex-dfa"; - "regex-easy" = dontDistribute super."regex-easy"; - "regex-genex" = dontDistribute super."regex-genex"; - "regex-parsec" = dontDistribute super."regex-parsec"; - "regex-pderiv" = dontDistribute super."regex-pderiv"; - "regex-posix-unittest" = dontDistribute super."regex-posix-unittest"; - "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes"; - "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter"; - "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest"; - "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8"; - "regex-tre" = dontDistribute super."regex-tre"; - "regex-type" = dontDistribute super."regex-type"; - "regex-xmlschema" = dontDistribute super."regex-xmlschema"; - "regexchar" = dontDistribute super."regexchar"; - "regexdot" = dontDistribute super."regexdot"; - "regexp-tries" = dontDistribute super."regexp-tries"; - "regexpr" = dontDistribute super."regexpr"; - "regexpr-symbolic" = dontDistribute super."regexpr-symbolic"; - "regexqq" = dontDistribute super."regexqq"; - "regional-pointers" = dontDistribute super."regional-pointers"; - "regions" = dontDistribute super."regions"; - "regions-monadsfd" = dontDistribute super."regions-monadsfd"; - "regions-monadstf" = dontDistribute super."regions-monadstf"; - "regions-mtl" = dontDistribute super."regions-mtl"; - "register-machine-typelevel" = dontDistribute super."register-machine-typelevel"; - "regress" = dontDistribute super."regress"; - "regular" = dontDistribute super."regular"; - "regular-extras" = dontDistribute super."regular-extras"; - "regular-web" = dontDistribute super."regular-web"; - "regular-xmlpickler" = dontDistribute super."regular-xmlpickler"; - "reheat" = dontDistribute super."reheat"; - "rehoo" = dontDistribute super."rehoo"; - "rei" = dontDistribute super."rei"; - "reified-records" = dontDistribute super."reified-records"; - "reify" = dontDistribute super."reify"; - "relacion" = dontDistribute super."relacion"; - "relation" = dontDistribute super."relation"; - "relational-postgresql8" = dontDistribute super."relational-postgresql8"; - "relational-query" = doDistribute super."relational-query_0_8_3_0"; - "relational-record" = doDistribute super."relational-record_0_1_5_0"; - "relational-record-examples" = dontDistribute super."relational-record-examples"; - "relative-date" = dontDistribute super."relative-date"; - "relit" = dontDistribute super."relit"; - "reload" = dontDistribute super."reload"; - "rematch-text" = dontDistribute super."rematch-text"; - "remote" = dontDistribute super."remote"; - "remote-debugger" = dontDistribute super."remote-debugger"; - "remote-json" = dontDistribute super."remote-json"; - "remote-json-client" = dontDistribute super."remote-json-client"; - "remote-json-server" = dontDistribute super."remote-json-server"; - "remote-monad" = dontDistribute super."remote-monad"; - "remotion" = dontDistribute super."remotion"; - "renderable" = dontDistribute super."renderable"; - "reord" = dontDistribute super."reord"; - "reorderable" = dontDistribute super."reorderable"; - "repa-array" = dontDistribute super."repa-array"; - "repa-bytestring" = dontDistribute super."repa-bytestring"; - "repa-convert" = dontDistribute super."repa-convert"; - "repa-eval" = dontDistribute super."repa-eval"; - "repa-examples" = dontDistribute super."repa-examples"; - "repa-fftw" = dontDistribute super."repa-fftw"; - "repa-flow" = dontDistribute super."repa-flow"; - "repa-linear-algebra" = dontDistribute super."repa-linear-algebra"; - "repa-plugin" = dontDistribute super."repa-plugin"; - "repa-scalar" = dontDistribute super."repa-scalar"; - "repa-series" = dontDistribute super."repa-series"; - "repa-sndfile" = dontDistribute super."repa-sndfile"; - "repa-stream" = dontDistribute super."repa-stream"; - "repa-v4l2" = dontDistribute super."repa-v4l2"; - "repl" = dontDistribute super."repl"; - "repl-toolkit" = dontDistribute super."repl-toolkit"; - "replicant" = dontDistribute super."replicant"; - "repline" = dontDistribute super."repline"; - "repo-based-blog" = dontDistribute super."repo-based-blog"; - "repr" = dontDistribute super."repr"; - "repr-tree-syb" = dontDistribute super."repr-tree-syb"; - "representable-functors" = dontDistribute super."representable-functors"; - "representable-profunctors" = dontDistribute super."representable-profunctors"; - "representable-tries" = dontDistribute super."representable-tries"; - "reqcatcher" = dontDistribute super."reqcatcher"; - "request-monad" = dontDistribute super."request-monad"; - "reroute" = doDistribute super."reroute_0_3_1_0"; - "reserve" = dontDistribute super."reserve"; - "resistor-cube" = dontDistribute super."resistor-cube"; - "resource-effect" = dontDistribute super."resource-effect"; - "resource-embed" = dontDistribute super."resource-embed"; - "resource-pool-catchio" = dontDistribute super."resource-pool-catchio"; - "resource-pool-monad" = dontDistribute super."resource-pool-monad"; - "resource-simple" = dontDistribute super."resource-simple"; - "resourcet" = doDistribute super."resourcet_1_1_7_4"; - "respond" = dontDistribute super."respond"; - "rest-example" = dontDistribute super."rest-example"; - "restful-snap" = dontDistribute super."restful-snap"; - "restricted-workers" = dontDistribute super."restricted-workers"; - "restyle" = dontDistribute super."restyle"; - "result" = dontDistribute super."result"; - "resumable-exceptions" = dontDistribute super."resumable-exceptions"; - "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_22"; - "rethinkdb-model" = dontDistribute super."rethinkdb-model"; - "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster"; - "retryer" = dontDistribute super."retryer"; - "revdectime" = dontDistribute super."revdectime"; - "reverse-apply" = dontDistribute super."reverse-apply"; - "reverse-arguments" = dontDistribute super."reverse-arguments"; - "reverse-geocoding" = dontDistribute super."reverse-geocoding"; - "reversi" = dontDistribute super."reversi"; - "rewrite" = dontDistribute super."rewrite"; - "rewriting" = dontDistribute super."rewriting"; - "rex" = dontDistribute super."rex"; - "rezoom" = dontDistribute super."rezoom"; - "rfc3339" = dontDistribute super."rfc3339"; - "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial"; - "riak" = doDistribute super."riak_1_0_1_1"; - "riak-protobuf" = doDistribute super."riak-protobuf_0_21_0_0"; - "richreports" = dontDistribute super."richreports"; - "riemann" = dontDistribute super."riemann"; - "riff" = dontDistribute super."riff"; - "ring-buffer" = dontDistribute super."ring-buffer"; - "riot" = dontDistribute super."riot"; - "ripple" = dontDistribute super."ripple"; - "ripple-federation" = dontDistribute super."ripple-federation"; - "risc386" = dontDistribute super."risc386"; - "rison" = dontDistribute super."rison"; - "rivers" = dontDistribute super."rivers"; - "rivet" = dontDistribute super."rivet"; - "rivet-adaptor-postgresql" = dontDistribute super."rivet-adaptor-postgresql"; - "rivet-autoimporter" = dontDistribute super."rivet-autoimporter"; - "rivet-core" = dontDistribute super."rivet-core"; - "rivet-migration" = dontDistribute super."rivet-migration"; - "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy"; - "rlglue" = dontDistribute super."rlglue"; - "rlist" = dontDistribute super."rlist"; - "rlwe-challenges" = dontDistribute super."rlwe-challenges"; - "rmonad" = dontDistribute super."rmonad"; - "rncryptor" = dontDistribute super."rncryptor"; - "robin" = dontDistribute super."robin"; - "robot" = dontDistribute super."robot"; - "robots-txt" = dontDistribute super."robots-txt"; - "rocksdb-haskell" = dontDistribute super."rocksdb-haskell"; - "roguestar" = dontDistribute super."roguestar"; - "roguestar-engine" = dontDistribute super."roguestar-engine"; - "roguestar-gl" = dontDistribute super."roguestar-gl"; - "roguestar-glut" = dontDistribute super."roguestar-glut"; - "rollbar" = dontDistribute super."rollbar"; - "roller" = dontDistribute super."roller"; - "rolling-queue" = dontDistribute super."rolling-queue"; - "roman-numerals" = dontDistribute super."roman-numerals"; - "romkan" = dontDistribute super."romkan"; - "roots" = dontDistribute super."roots"; - "rope" = dontDistribute super."rope"; - "rosa" = dontDistribute super."rosa"; - "rose-trie" = dontDistribute super."rose-trie"; - "roshask" = dontDistribute super."roshask"; - "rosso" = dontDistribute super."rosso"; - "rot13" = dontDistribute super."rot13"; - "roundRobin" = dontDistribute super."roundRobin"; - "rounding" = dontDistribute super."rounding"; - "roundtrip" = dontDistribute super."roundtrip"; - "roundtrip-aeson" = dontDistribute super."roundtrip-aeson"; - "roundtrip-string" = dontDistribute super."roundtrip-string"; - "roundtrip-xml" = dontDistribute super."roundtrip-xml"; - "route-generator" = dontDistribute super."route-generator"; - "route-planning" = dontDistribute super."route-planning"; - "rowrecord" = dontDistribute super."rowrecord"; - "rpc" = dontDistribute super."rpc"; - "rpc-framework" = dontDistribute super."rpc-framework"; - "rpf" = dontDistribute super."rpf"; - "rpm" = dontDistribute super."rpm"; - "rsagl" = dontDistribute super."rsagl"; - "rsagl-frp" = dontDistribute super."rsagl-frp"; - "rsagl-math" = dontDistribute super."rsagl-math"; - "rspp" = dontDistribute super."rspp"; - "rss" = dontDistribute super."rss"; - "rss2irc" = dontDistribute super."rss2irc"; - "rtcm" = dontDistribute super."rtcm"; - "rtld" = dontDistribute super."rtld"; - "rtlsdr" = dontDistribute super."rtlsdr"; - "rtorrent-rpc" = dontDistribute super."rtorrent-rpc"; - "rtorrent-state" = dontDistribute super."rtorrent-state"; - "rts-loader" = dontDistribute super."rts-loader"; - "rubberband" = dontDistribute super."rubberband"; - "ruby-marshal" = dontDistribute super."ruby-marshal"; - "ruby-qq" = dontDistribute super."ruby-qq"; - "ruff" = dontDistribute super."ruff"; - "ruin" = dontDistribute super."ruin"; - "ruler" = dontDistribute super."ruler"; - "ruler-core" = dontDistribute super."ruler-core"; - "rungekutta" = dontDistribute super."rungekutta"; - "runghc" = dontDistribute super."runghc"; - "rwlock" = dontDistribute super."rwlock"; - "rws" = dontDistribute super."rws"; - "s-cargot" = dontDistribute super."s-cargot"; - "safe-access" = dontDistribute super."safe-access"; - "safe-exceptions" = dontDistribute super."safe-exceptions"; - "safe-failure" = dontDistribute super."safe-failure"; - "safe-failure-cme" = dontDistribute super."safe-failure-cme"; - "safe-freeze" = dontDistribute super."safe-freeze"; - "safe-globals" = dontDistribute super."safe-globals"; - "safe-lazy-io" = dontDistribute super."safe-lazy-io"; - "safe-length" = dontDistribute super."safe-length"; - "safe-plugins" = dontDistribute super."safe-plugins"; - "safe-printf" = dontDistribute super."safe-printf"; - "safeint" = dontDistribute super."safeint"; - "safepath" = dontDistribute super."safepath"; - "safer-file-handles" = dontDistribute super."safer-file-handles"; - "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring"; - "safer-file-handles-text" = dontDistribute super."safer-file-handles-text"; - "saferoute" = dontDistribute super."saferoute"; - "sai-shape-syb" = dontDistribute super."sai-shape-syb"; - "saltine" = dontDistribute super."saltine"; - "saltine-quickcheck" = dontDistribute super."saltine-quickcheck"; - "salvia" = dontDistribute super."salvia"; - "salvia-demo" = dontDistribute super."salvia-demo"; - "salvia-extras" = dontDistribute super."salvia-extras"; - "salvia-protocol" = dontDistribute super."salvia-protocol"; - "salvia-sessions" = dontDistribute super."salvia-sessions"; - "salvia-websocket" = dontDistribute super."salvia-websocket"; - "sample-frame" = dontDistribute super."sample-frame"; - "sample-frame-np" = dontDistribute super."sample-frame-np"; - "samtools" = dontDistribute super."samtools"; - "samtools-conduit" = dontDistribute super."samtools-conduit"; - "samtools-enumerator" = dontDistribute super."samtools-enumerator"; - "samtools-iteratee" = dontDistribute super."samtools-iteratee"; - "sandi" = doDistribute super."sandi_0_3_6"; - "sandlib" = dontDistribute super."sandlib"; - "sarasvati" = dontDistribute super."sarasvati"; - "sarsi" = dontDistribute super."sarsi"; - "sasl" = dontDistribute super."sasl"; - "sat" = dontDistribute super."sat"; - "sat-micro-hs" = dontDistribute super."sat-micro-hs"; - "satchmo" = dontDistribute super."satchmo"; - "satchmo-backends" = dontDistribute super."satchmo-backends"; - "satchmo-examples" = dontDistribute super."satchmo-examples"; - "satchmo-funsat" = dontDistribute super."satchmo-funsat"; - "satchmo-minisat" = dontDistribute super."satchmo-minisat"; - "satchmo-toysat" = dontDistribute super."satchmo-toysat"; - "sbp" = dontDistribute super."sbp"; - "sbp2udp" = dontDistribute super."sbp2udp"; - "sbv" = doDistribute super."sbv_5_11"; - "sbvPlugin" = dontDistribute super."sbvPlugin"; - "sc3-rdu" = dontDistribute super."sc3-rdu"; - "scalable-server" = dontDistribute super."scalable-server"; - "scaleimage" = dontDistribute super."scaleimage"; - "scalp-webhooks" = dontDistribute super."scalp-webhooks"; - "scan" = dontDistribute super."scan"; - "scan-vector-machine" = dontDistribute super."scan-vector-machine"; - "scanner-attoparsec" = dontDistribute super."scanner-attoparsec"; - "scat" = dontDistribute super."scat"; - "scc" = dontDistribute super."scc"; - "scenegraph" = dontDistribute super."scenegraph"; - "scgi" = dontDistribute super."scgi"; - "schedevr" = dontDistribute super."schedevr"; - "schedule-planner" = dontDistribute super."schedule-planner"; - "schedyield" = dontDistribute super."schedyield"; - "scholdoc" = dontDistribute super."scholdoc"; - "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc"; - "scholdoc-texmath" = dontDistribute super."scholdoc-texmath"; - "scholdoc-types" = dontDistribute super."scholdoc-types"; - "schonfinkeling" = dontDistribute super."schonfinkeling"; - "sci-ratio" = dontDistribute super."sci-ratio"; - "science-constants" = dontDistribute super."science-constants"; - "science-constants-dimensional" = dontDistribute super."science-constants-dimensional"; - "scion" = dontDistribute super."scion"; - "scion-browser" = dontDistribute super."scion-browser"; - "scons2dot" = dontDistribute super."scons2dot"; - "scope" = dontDistribute super."scope"; - "scope-cairo" = dontDistribute super."scope-cairo"; - "scottish" = dontDistribute super."scottish"; - "scotty-binding-play" = dontDistribute super."scotty-binding-play"; - "scotty-blaze" = dontDistribute super."scotty-blaze"; - "scotty-cookie" = dontDistribute super."scotty-cookie"; - "scotty-fay" = dontDistribute super."scotty-fay"; - "scotty-hastache" = dontDistribute super."scotty-hastache"; - "scotty-params-parser" = dontDistribute super."scotty-params-parser"; - "scotty-resource" = dontDistribute super."scotty-resource"; - "scotty-rest" = dontDistribute super."scotty-rest"; - "scotty-session" = dontDistribute super."scotty-session"; - "scotty-tls" = dontDistribute super."scotty-tls"; - "scotty-view" = dontDistribute super."scotty-view"; - "scp-streams" = dontDistribute super."scp-streams"; - "scrabble-bot" = dontDistribute super."scrabble-bot"; - "scrape-changes" = dontDistribute super."scrape-changes"; - "scrobble" = dontDistribute super."scrobble"; - "scroll" = dontDistribute super."scroll"; - "scrz" = dontDistribute super."scrz"; - "scyther-proof" = dontDistribute super."scyther-proof"; - "sde-solver" = dontDistribute super."sde-solver"; - "sdf2p1-parser" = dontDistribute super."sdf2p1-parser"; - "sdl2" = doDistribute super."sdl2_2_1_2_1"; - "sdl2-cairo" = dontDistribute super."sdl2-cairo"; - "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image"; - "sdl2-compositor" = dontDistribute super."sdl2-compositor"; - "sdl2-image" = dontDistribute super."sdl2-image"; - "sdl2-ttf" = dontDistribute super."sdl2-ttf"; - "sdnv" = dontDistribute super."sdnv"; - "sdr" = dontDistribute super."sdr"; - "seacat" = dontDistribute super."seacat"; - "seal-module" = dontDistribute super."seal-module"; - "search" = dontDistribute super."search"; - "sec" = dontDistribute super."sec"; - "secd" = dontDistribute super."secd"; - "secdh" = dontDistribute super."secdh"; - "seclib" = dontDistribute super."seclib"; - "second-transfer" = dontDistribute super."second-transfer"; - "secp256k1" = dontDistribute super."secp256k1"; - "secret-santa" = dontDistribute super."secret-santa"; - "secret-sharing" = dontDistribute super."secret-sharing"; - "secrm" = dontDistribute super."secrm"; - "secure-sockets" = dontDistribute super."secure-sockets"; - "sednaDBXML" = dontDistribute super."sednaDBXML"; - "select" = dontDistribute super."select"; - "selectors" = dontDistribute super."selectors"; - "selenium" = dontDistribute super."selenium"; - "selenium-server" = dontDistribute super."selenium-server"; - "selfrestart" = dontDistribute super."selfrestart"; - "selinux" = dontDistribute super."selinux"; - "semaphore-plus" = dontDistribute super."semaphore-plus"; - "semi-iso" = dontDistribute super."semi-iso"; - "semibounded-lattices" = dontDistribute super."semibounded-lattices"; - "semigroupoids" = doDistribute super."semigroupoids_5_0_1"; - "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax"; - "semigroups" = doDistribute super."semigroups_0_18_1"; - "semigroups-actions" = dontDistribute super."semigroups-actions"; - "semiring" = dontDistribute super."semiring"; - "semver-range" = dontDistribute super."semver-range"; - "sendgrid-haskell" = dontDistribute super."sendgrid-haskell"; - "sensei" = dontDistribute super."sensei"; - "sensenet" = dontDistribute super."sensenet"; - "sentence-jp" = dontDistribute super."sentence-jp"; - "sentry" = dontDistribute super."sentry"; - "senza" = dontDistribute super."senza"; - "separated" = dontDistribute super."separated"; - "seqaid" = dontDistribute super."seqaid"; - "seqid" = dontDistribute super."seqid"; - "seqid-streams" = dontDistribute super."seqid-streams"; - "seqloc-datafiles" = dontDistribute super."seqloc-datafiles"; - "sequence" = dontDistribute super."sequence"; - "sequent-core" = dontDistribute super."sequent-core"; - "sequential-index" = dontDistribute super."sequential-index"; - "sequor" = dontDistribute super."sequor"; - "serial" = dontDistribute super."serial"; - "serial-test-generators" = dontDistribute super."serial-test-generators"; - "serpentine" = dontDistribute super."serpentine"; - "serv" = dontDistribute super."serv"; - "serv-wai" = dontDistribute super."serv-wai"; - "servant-aeson-specs" = dontDistribute super."servant-aeson-specs"; - "servant-auth-cookie" = dontDistribute super."servant-auth-cookie"; - "servant-auth-hmac" = dontDistribute super."servant-auth-hmac"; - "servant-auth-token" = dontDistribute super."servant-auth-token"; - "servant-auth-token-api" = dontDistribute super."servant-auth-token-api"; - "servant-cassava" = doDistribute super."servant-cassava_0_7_1"; - "servant-csharp" = dontDistribute super."servant-csharp"; - "servant-ede" = dontDistribute super."servant-ede"; - "servant-elm" = dontDistribute super."servant-elm"; - "servant-examples" = dontDistribute super."servant-examples"; - "servant-github" = dontDistribute super."servant-github"; - "servant-haxl-client" = dontDistribute super."servant-haxl-client"; - "servant-jquery" = dontDistribute super."servant-jquery"; - "servant-matrix-param" = dontDistribute super."servant-matrix-param"; - "servant-pandoc" = dontDistribute super."servant-pandoc"; - "servant-pool" = dontDistribute super."servant-pool"; - "servant-postgresql" = dontDistribute super."servant-postgresql"; - "servant-purescript" = dontDistribute super."servant-purescript"; - "servant-quickcheck" = dontDistribute super."servant-quickcheck"; - "servant-response" = dontDistribute super."servant-response"; - "servant-router" = dontDistribute super."servant-router"; - "servant-scotty" = dontDistribute super."servant-scotty"; - "servant-smsc-ru" = dontDistribute super."servant-smsc-ru"; - "servant-subscriber" = dontDistribute super."servant-subscriber"; - "servant-swagger" = doDistribute super."servant-swagger_1_0_3"; - "servant-swagger-ui" = dontDistribute super."servant-swagger-ui"; - "server-generic" = dontDistribute super."server-generic"; - "ses-html-snaplet" = dontDistribute super."ses-html-snaplet"; - "sessions" = dontDistribute super."sessions"; - "set-cover" = dontDistribute super."set-cover"; - "set-with" = dontDistribute super."set-with"; - "setdown" = dontDistribute super."setdown"; - "setgame" = dontDistribute super."setgame"; - "setops" = dontDistribute super."setops"; - "setters" = dontDistribute super."setters"; - "settings" = dontDistribute super."settings"; - "sexp" = dontDistribute super."sexp"; - "sexp-grammar" = dontDistribute super."sexp-grammar"; - "sexp-show" = dontDistribute super."sexp-show"; - "sexpr" = dontDistribute super."sexpr"; - "sext" = dontDistribute super."sext"; - "sfml-audio" = dontDistribute super."sfml-audio"; - "sfmt" = dontDistribute super."sfmt"; - "sfnt2woff" = dontDistribute super."sfnt2woff"; - "sgd" = dontDistribute super."sgd"; - "sgf" = dontDistribute super."sgf"; - "sgrep" = dontDistribute super."sgrep"; - "sha-streams" = dontDistribute super."sha-streams"; - "shadower" = dontDistribute super."shadower"; - "shadowsocks" = dontDistribute super."shadowsocks"; - "shady-gen" = dontDistribute super."shady-gen"; - "shady-graphics" = dontDistribute super."shady-graphics"; - "shake-cabal-build" = dontDistribute super."shake-cabal-build"; - "shake-extras" = dontDistribute super."shake-extras"; - "shake-language-c" = doDistribute super."shake-language-c_0_9_1"; - "shake-minify" = dontDistribute super."shake-minify"; - "shake-pack" = dontDistribute super."shake-pack"; - "shake-persist" = dontDistribute super."shake-persist"; - "shaker" = dontDistribute super."shaker"; - "shakespeare" = doDistribute super."shakespeare_2_0_9"; - "shakespeare-babel" = dontDistribute super."shakespeare-babel"; - "shakespeare-css" = dontDistribute super."shakespeare-css"; - "shakespeare-i18n" = dontDistribute super."shakespeare-i18n"; - "shakespeare-js" = dontDistribute super."shakespeare-js"; - "shakespeare-sass" = dontDistribute super."shakespeare-sass"; - "shakespeare-text" = dontDistribute super."shakespeare-text"; - "shana" = dontDistribute super."shana"; - "shapefile" = dontDistribute super."shapefile"; - "shapely-data" = dontDistribute super."shapely-data"; - "sharc-timbre" = dontDistribute super."sharc-timbre"; - "shared-buffer" = dontDistribute super."shared-buffer"; - "shared-fields" = dontDistribute super."shared-fields"; - "shared-memory" = dontDistribute super."shared-memory"; - "sharedio" = dontDistribute super."sharedio"; - "she" = dontDistribute super."she"; - "shelduck" = dontDistribute super."shelduck"; - "shell-escape" = dontDistribute super."shell-escape"; - "shell-monad" = dontDistribute super."shell-monad"; - "shell-pipe" = dontDistribute super."shell-pipe"; - "shellish" = dontDistribute super."shellish"; - "shellmate" = dontDistribute super."shellmate"; - "shellmate-extras" = dontDistribute super."shellmate-extras"; - "shelly-extra" = dontDistribute super."shelly-extra"; - "shine" = dontDistribute super."shine"; - "shine-varying" = dontDistribute super."shine-varying"; - "shivers-cfg" = dontDistribute super."shivers-cfg"; - "shoap" = dontDistribute super."shoap"; - "shortcircuit" = dontDistribute super."shortcircuit"; - "shorten-strings" = dontDistribute super."shorten-strings"; - "show" = dontDistribute super."show"; - "show-type" = dontDistribute super."show-type"; - "showdown" = dontDistribute super."showdown"; - "shpider" = dontDistribute super."shpider"; - "shplit" = dontDistribute super."shplit"; - "shqq" = dontDistribute super."shqq"; - "shuffle" = dontDistribute super."shuffle"; - "sieve" = dontDistribute super."sieve"; - "sifflet" = dontDistribute super."sifflet"; - "sifflet-lib" = dontDistribute super."sifflet-lib"; - "sign" = dontDistribute super."sign"; - "signals" = dontDistribute super."signals"; - "signed-multiset" = dontDistribute super."signed-multiset"; - "simd" = dontDistribute super."simd"; - "simgi" = dontDistribute super."simgi"; - "simple-actors" = dontDistribute super."simple-actors"; - "simple-atom" = dontDistribute super."simple-atom"; - "simple-bluetooth" = dontDistribute super."simple-bluetooth"; - "simple-c-value" = dontDistribute super."simple-c-value"; - "simple-conduit" = dontDistribute super."simple-conduit"; - "simple-config" = dontDistribute super."simple-config"; - "simple-css" = dontDistribute super."simple-css"; - "simple-download" = dontDistribute super."simple-download"; - "simple-effects" = dontDistribute super."simple-effects"; - "simple-eval" = dontDistribute super."simple-eval"; - "simple-firewire" = dontDistribute super."simple-firewire"; - "simple-form" = dontDistribute super."simple-form"; - "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm"; - "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr"; - "simple-get-opt" = dontDistribute super."simple-get-opt"; - "simple-index" = dontDistribute super."simple-index"; - "simple-log-syslog" = dontDistribute super."simple-log-syslog"; - "simple-logger" = dontDistribute super."simple-logger"; - "simple-neural-networks" = dontDistribute super."simple-neural-networks"; - "simple-nix" = dontDistribute super."simple-nix"; - "simple-observer" = dontDistribute super."simple-observer"; - "simple-pascal" = dontDistribute super."simple-pascal"; - "simple-pipe" = dontDistribute super."simple-pipe"; - "simple-rope" = dontDistribute super."simple-rope"; - "simple-server" = dontDistribute super."simple-server"; - "simple-sessions" = dontDistribute super."simple-sessions"; - "simple-sql-parser" = dontDistribute super."simple-sql-parser"; - "simple-stacked-vm" = dontDistribute super."simple-stacked-vm"; - "simple-tabular" = dontDistribute super."simple-tabular"; - "simple-tar" = dontDistribute super."simple-tar"; - "simple-vec3" = dontDistribute super."simple-vec3"; - "simple-zipper" = dontDistribute super."simple-zipper"; - "simpleargs" = dontDistribute super."simpleargs"; - "simpleirc-lens" = dontDistribute super."simpleirc-lens"; - "simplenote" = dontDistribute super."simplenote"; - "simpleprelude" = dontDistribute super."simpleprelude"; - "simplesmtpclient" = dontDistribute super."simplesmtpclient"; - "simplessh" = dontDistribute super."simplessh"; - "simplest-sqlite" = dontDistribute super."simplest-sqlite"; - "simplex" = dontDistribute super."simplex"; - "simplex-basic" = dontDistribute super."simplex-basic"; - "simseq" = dontDistribute super."simseq"; - "simtreelo" = dontDistribute super."simtreelo"; - "sindre" = dontDistribute super."sindre"; - "singleton-bool" = dontDistribute super."singleton-bool"; - "singleton-nats" = dontDistribute super."singleton-nats"; - "singletons" = doDistribute super."singletons_2_0_1"; - "sink" = dontDistribute super."sink"; - "siphon" = dontDistribute super."siphon"; - "sirkel" = dontDistribute super."sirkel"; - "sitemap" = dontDistribute super."sitemap"; - "size-based" = dontDistribute super."size-based"; - "sized" = dontDistribute super."sized"; - "sized-types" = dontDistribute super."sized-types"; - "sized-vector" = dontDistribute super."sized-vector"; - "sizes" = dontDistribute super."sizes"; - "sjsp" = dontDistribute super."sjsp"; - "skeleton" = dontDistribute super."skeleton"; - "skell" = dontDistribute super."skell"; - "skemmtun" = dontDistribute super."skemmtun"; - "skulk" = dontDistribute super."skulk"; - "skype4hs" = dontDistribute super."skype4hs"; - "skypelogexport" = dontDistribute super."skypelogexport"; - "slack" = dontDistribute super."slack"; - "slack-api" = dontDistribute super."slack-api"; - "slack-notify-haskell" = dontDistribute super."slack-notify-haskell"; - "slave-thread" = doDistribute super."slave-thread_1_0_1_1"; - "sleep" = dontDistribute super."sleep"; - "slice-cpp-gen" = dontDistribute super."slice-cpp-gen"; - "slidemews" = dontDistribute super."slidemews"; - "slim" = dontDistribute super."slim"; - "sloane" = dontDistribute super."sloane"; - "slot-lambda" = dontDistribute super."slot-lambda"; - "sloth" = dontDistribute super."sloth"; - "slug" = doDistribute super."slug_0_1_4"; - "smallarray" = dontDistribute super."smallarray"; - "smallcheck-laws" = dontDistribute super."smallcheck-laws"; - "smallcheck-lens" = dontDistribute super."smallcheck-lens"; - "smallcheck-series" = dontDistribute super."smallcheck-series"; - "smallpt-hs" = dontDistribute super."smallpt-hs"; - "smallstring" = dontDistribute super."smallstring"; - "smaoin" = dontDistribute super."smaoin"; - "smartGroup" = dontDistribute super."smartGroup"; - "smartcheck" = dontDistribute super."smartcheck"; - "smartconstructor" = dontDistribute super."smartconstructor"; - "smartword" = dontDistribute super."smartword"; - "sme" = dontDistribute super."sme"; - "smerdyakov" = dontDistribute super."smerdyakov"; - "smoothie" = doDistribute super."smoothie_0_4_2_2"; - "smsaero" = dontDistribute super."smsaero"; - "smt-lib" = dontDistribute super."smt-lib"; - "smtlib2" = dontDistribute super."smtlib2"; - "smtp-mail-ng" = dontDistribute super."smtp-mail-ng"; - "smtp2mta" = dontDistribute super."smtp2mta"; - "smtps-gmail" = dontDistribute super."smtps-gmail"; - "snake" = dontDistribute super."snake"; - "snake-game" = dontDistribute super."snake-game"; - "snap" = doDistribute super."snap_0_14_0_7"; - "snap-accept" = dontDistribute super."snap-accept"; - "snap-app" = dontDistribute super."snap-app"; - "snap-auth-cli" = dontDistribute super."snap-auth-cli"; - "snap-blaze" = dontDistribute super."snap-blaze"; - "snap-blaze-clay" = dontDistribute super."snap-blaze-clay"; - "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities"; - "snap-core" = doDistribute super."snap-core_0_9_8_0"; - "snap-cors" = dontDistribute super."snap-cors"; - "snap-elm" = dontDistribute super."snap-elm"; - "snap-error-collector" = dontDistribute super."snap-error-collector"; - "snap-extras" = dontDistribute super."snap-extras"; - "snap-language" = dontDistribute super."snap-language"; - "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic"; - "snap-loader-static" = dontDistribute super."snap-loader-static"; - "snap-predicates" = dontDistribute super."snap-predicates"; - "snap-routes" = dontDistribute super."snap-routes"; - "snap-server" = doDistribute super."snap-server_0_9_5_1"; - "snap-templates" = dontDistribute super."snap-templates"; - "snap-testing" = dontDistribute super."snap-testing"; - "snap-utils" = dontDistribute super."snap-utils"; - "snap-web-routes" = dontDistribute super."snap-web-routes"; - "snaplet-acid-state" = dontDistribute super."snaplet-acid-state"; - "snaplet-actionlog" = dontDistribute super."snaplet-actionlog"; - "snaplet-amqp" = dontDistribute super."snaplet-amqp"; - "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid"; - "snaplet-coffee" = dontDistribute super."snaplet-coffee"; - "snaplet-css-min" = dontDistribute super."snaplet-css-min"; - "snaplet-environments" = dontDistribute super."snaplet-environments"; - "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs"; - "snaplet-hasql" = dontDistribute super."snaplet-hasql"; - "snaplet-haxl" = dontDistribute super."snaplet-haxl"; - "snaplet-hdbc" = dontDistribute super."snaplet-hdbc"; - "snaplet-hslogger" = dontDistribute super."snaplet-hslogger"; - "snaplet-i18n" = dontDistribute super."snaplet-i18n"; - "snaplet-influxdb" = dontDistribute super."snaplet-influxdb"; - "snaplet-lss" = dontDistribute super."snaplet-lss"; - "snaplet-mandrill" = dontDistribute super."snaplet-mandrill"; - "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB"; - "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic"; - "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple"; - "snaplet-oauth" = dontDistribute super."snaplet-oauth"; - "snaplet-persistent" = dontDistribute super."snaplet-persistent"; - "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple"; - "snaplet-postmark" = dontDistribute super."snaplet-postmark"; - "snaplet-purescript" = dontDistribute super."snaplet-purescript"; - "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha"; - "snaplet-redis" = dontDistribute super."snaplet-redis"; - "snaplet-redson" = dontDistribute super."snaplet-redson"; - "snaplet-rest" = dontDistribute super."snaplet-rest"; - "snaplet-riak" = dontDistribute super."snaplet-riak"; - "snaplet-sass" = dontDistribute super."snaplet-sass"; - "snaplet-scoped-session" = dontDistribute super."snaplet-scoped-session"; - "snaplet-sedna" = dontDistribute super."snaplet-sedna"; - "snaplet-ses-html" = dontDistribute super."snaplet-ses-html"; - "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple"; - "snaplet-stripe" = dontDistribute super."snaplet-stripe"; - "snaplet-tasks" = dontDistribute super."snaplet-tasks"; - "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions"; - "snaplet-wordpress" = dontDistribute super."snaplet-wordpress"; - "snappy" = dontDistribute super."snappy"; - "snappy-conduit" = dontDistribute super."snappy-conduit"; - "snappy-framing" = dontDistribute super."snappy-framing"; - "snappy-iteratee" = dontDistribute super."snappy-iteratee"; - "sndfile-enumerators" = dontDistribute super."sndfile-enumerators"; - "sneakyterm" = dontDistribute super."sneakyterm"; - "sneathlane-haste" = dontDistribute super."sneathlane-haste"; - "snippet-extractor" = dontDistribute super."snippet-extractor"; - "snm" = dontDistribute super."snm"; - "snow-white" = dontDistribute super."snow-white"; - "snowball" = dontDistribute super."snowball"; - "snowglobe" = dontDistribute super."snowglobe"; - "soap" = doDistribute super."soap_0_2_3_0"; - "sock2stream" = dontDistribute super."sock2stream"; - "sockaddr" = dontDistribute super."sockaddr"; - "socket" = doDistribute super."socket_0_6_0_1"; - "socket-activation" = dontDistribute super."socket-activation"; - "socket-sctp" = dontDistribute super."socket-sctp"; - "socketio" = dontDistribute super."socketio"; - "socketson" = dontDistribute super."socketson"; - "soegtk" = dontDistribute super."soegtk"; - "solga" = dontDistribute super."solga"; - "solga-swagger" = dontDistribute super."solga-swagger"; - "solr" = dontDistribute super."solr"; - "sonic-visualiser" = dontDistribute super."sonic-visualiser"; - "sophia" = dontDistribute super."sophia"; - "sort-by-pinyin" = dontDistribute super."sort-by-pinyin"; - "sorted" = dontDistribute super."sorted"; - "sorted-list" = doDistribute super."sorted-list_0_1_6_1"; - "sorting" = dontDistribute super."sorting"; - "sorty" = dontDistribute super."sorty"; - "sound-collage" = dontDistribute super."sound-collage"; - "sounddelay" = dontDistribute super."sounddelay"; - "source-code-server" = dontDistribute super."source-code-server"; - "sousit" = dontDistribute super."sousit"; - "sox" = dontDistribute super."sox"; - "soxlib" = dontDistribute super."soxlib"; - "soyuz" = dontDistribute super."soyuz"; - "spacefill" = dontDistribute super."spacefill"; - "spacepart" = dontDistribute super."spacepart"; - "spaceprobe" = dontDistribute super."spaceprobe"; - "spanout" = dontDistribute super."spanout"; - "sparkle" = dontDistribute super."sparkle"; - "sparse" = dontDistribute super."sparse"; - "sparse-lin-alg" = dontDistribute super."sparse-lin-alg"; - "sparsebit" = dontDistribute super."sparsebit"; - "sparsecheck" = dontDistribute super."sparsecheck"; - "sparser" = dontDistribute super."sparser"; - "spata" = dontDistribute super."spata"; - "spatial-math" = dontDistribute super."spatial-math"; - "spawn" = dontDistribute super."spawn"; - "spe" = dontDistribute super."spe"; - "special-functors" = dontDistribute super."special-functors"; - "special-keys" = dontDistribute super."special-keys"; - "specialize-th" = dontDistribute super."specialize-th"; - "species" = dontDistribute super."species"; - "speculation-transformers" = dontDistribute super."speculation-transformers"; - "spelling-suggest" = dontDistribute super."spelling-suggest"; - "sphero" = dontDistribute super."sphero"; - "sphinx-cli" = dontDistribute super."sphinx-cli"; - "spice" = dontDistribute super."spice"; - "spike" = dontDistribute super."spike"; - "spine" = dontDistribute super."spine"; - "spir-v" = dontDistribute super."spir-v"; - "splay" = dontDistribute super."splay"; - "splaytree" = dontDistribute super."splaytree"; - "spline3" = dontDistribute super."spline3"; - "splines" = dontDistribute super."splines"; - "split-channel" = dontDistribute super."split-channel"; - "split-record" = dontDistribute super."split-record"; - "split-tchan" = dontDistribute super."split-tchan"; - "splitter" = dontDistribute super."splitter"; - "splot" = dontDistribute super."splot"; - "spoonutil" = dontDistribute super."spoonutil"; - "spoty" = dontDistribute super."spoty"; - "spreadsheet" = dontDistribute super."spreadsheet"; - "spritz" = dontDistribute super."spritz"; - "sproxy" = dontDistribute super."sproxy"; - "sproxy-web" = dontDistribute super."sproxy-web"; - "spsa" = dontDistribute super."spsa"; - "spy" = dontDistribute super."spy"; - "sql-simple" = dontDistribute super."sql-simple"; - "sql-simple-mysql" = dontDistribute super."sql-simple-mysql"; - "sql-simple-pool" = dontDistribute super."sql-simple-pool"; - "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql"; - "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite"; - "sqlite" = dontDistribute super."sqlite"; - "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed"; - "sqlvalue-list" = dontDistribute super."sqlvalue-list"; - "squeeze" = dontDistribute super."squeeze"; - "sr-extra" = dontDistribute super."sr-extra"; - "srcinst" = dontDistribute super."srcinst"; - "srec" = dontDistribute super."srec"; - "sscgi" = dontDistribute super."sscgi"; - "sscript" = dontDistribute super."sscript"; - "ssh" = dontDistribute super."ssh"; - "sshd-lint" = dontDistribute super."sshd-lint"; - "sshtun" = dontDistribute super."sshtun"; - "sssp" = dontDistribute super."sssp"; - "sstable" = dontDistribute super."sstable"; - "ssv" = dontDistribute super."ssv"; - "stable-heap" = dontDistribute super."stable-heap"; - "stable-maps" = dontDistribute super."stable-maps"; - "stable-marriage" = dontDistribute super."stable-marriage"; - "stable-memo" = dontDistribute super."stable-memo"; - "stable-tree" = dontDistribute super."stable-tree"; - "stache" = dontDistribute super."stache"; - "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls"; - "stack-prism" = dontDistribute super."stack-prism"; - "stack-run" = dontDistribute super."stack-run"; - "stackage-curator" = doDistribute super."stackage-curator_0_14_0"; - "stackage-upload" = doDistribute super."stackage-upload_0_1_0_5"; - "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown"; - "standalone-haddock" = dontDistribute super."standalone-haddock"; - "star-to-star" = dontDistribute super."star-to-star"; - "star-to-star-contra" = dontDistribute super."star-to-star-contra"; - "starling" = dontDistribute super."starling"; - "starrover2" = dontDistribute super."starrover2"; - "stash" = dontDistribute super."stash"; - "state" = dontDistribute super."state"; - "state-bag" = dontDistribute super."state-bag"; - "state-record" = dontDistribute super."state-record"; - "statechart" = dontDistribute super."statechart"; - "stateful-mtl" = dontDistribute super."stateful-mtl"; - "statethread" = dontDistribute super."statethread"; - "statgrab" = dontDistribute super."statgrab"; - "static-hash" = dontDistribute super."static-hash"; - "static-resources" = dontDistribute super."static-resources"; - "staticanalysis" = dontDistribute super."staticanalysis"; - "statistics-dirichlet" = dontDistribute super."statistics-dirichlet"; - "statistics-fusion" = dontDistribute super."statistics-fusion"; - "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar"; - "stats" = dontDistribute super."stats"; - "statsd" = dontDistribute super."statsd"; - "statsd-client" = dontDistribute super."statsd-client"; - "statsd-datadog" = dontDistribute super."statsd-datadog"; - "statvfs" = dontDistribute super."statvfs"; - "stb-image" = dontDistribute super."stb-image"; - "stb-truetype" = dontDistribute super."stb-truetype"; - "stdata" = dontDistribute super."stdata"; - "stdf" = dontDistribute super."stdf"; - "steambrowser" = dontDistribute super."steambrowser"; - "steeloverseer" = dontDistribute super."steeloverseer"; - "stemmer" = dontDistribute super."stemmer"; - "step-function" = dontDistribute super."step-function"; - "stepwise" = dontDistribute super."stepwise"; - "stgi" = dontDistribute super."stgi"; - "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey"; - "stitch" = dontDistribute super."stitch"; - "stm-channelize" = dontDistribute super."stm-channelize"; - "stm-chunked-queues" = dontDistribute super."stm-chunked-queues"; - "stm-conduit" = doDistribute super."stm-conduit_2_8_0"; - "stm-containers" = doDistribute super."stm-containers_0_2_14"; - "stm-firehose" = dontDistribute super."stm-firehose"; - "stm-io-hooks" = dontDistribute super."stm-io-hooks"; - "stm-lifted" = dontDistribute super."stm-lifted"; - "stm-linkedlist" = dontDistribute super."stm-linkedlist"; - "stm-orelse-io" = dontDistribute super."stm-orelse-io"; - "stm-promise" = dontDistribute super."stm-promise"; - "stm-queue-extras" = dontDistribute super."stm-queue-extras"; - "stm-sbchan" = dontDistribute super."stm-sbchan"; - "stm-split" = dontDistribute super."stm-split"; - "stm-tlist" = dontDistribute super."stm-tlist"; - "stmcontrol" = dontDistribute super."stmcontrol"; - "stochastic" = dontDistribute super."stochastic"; - "stomp-conduit" = dontDistribute super."stomp-conduit"; - "stomp-patterns" = dontDistribute super."stomp-patterns"; - "stomp-queue" = dontDistribute super."stomp-queue"; - "stompl" = dontDistribute super."stompl"; - "storable" = dontDistribute super."storable"; - "storable-record" = dontDistribute super."storable-record"; - "storable-static-array" = dontDistribute super."storable-static-array"; - "storable-tuple" = dontDistribute super."storable-tuple"; - "storablevector" = dontDistribute super."storablevector"; - "storablevector-carray" = dontDistribute super."storablevector-carray"; - "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion"; - "store" = dontDistribute super."store"; - "store-core" = dontDistribute super."store-core"; - "str" = dontDistribute super."str"; - "stratosphere" = doDistribute super."stratosphere_0_1_2_1"; - "stratum-tool" = dontDistribute super."stratum-tool"; - "stratux" = dontDistribute super."stratux"; - "stratux-http" = dontDistribute super."stratux-http"; - "stratux-types" = dontDistribute super."stratux-types"; - "stratux-websockets" = dontDistribute super."stratux-websockets"; - "stream" = dontDistribute super."stream"; - "stream-fusion" = dontDistribute super."stream-fusion"; - "stream-monad" = dontDistribute super."stream-monad"; - "streamed" = dontDistribute super."streamed"; - "streaming-eversion" = dontDistribute super."streaming-eversion"; - "streaming-histogram" = dontDistribute super."streaming-histogram"; - "streaming-png" = dontDistribute super."streaming-png"; - "streaming-utils" = dontDistribute super."streaming-utils"; - "streaming-wai" = dontDistribute super."streaming-wai"; - "streams" = doDistribute super."streams_3_2_1"; - "strict-concurrency" = dontDistribute super."strict-concurrency"; - "strict-data" = dontDistribute super."strict-data"; - "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin"; - "strict-identity" = dontDistribute super."strict-identity"; - "strict-io" = dontDistribute super."strict-io"; - "strictify" = dontDistribute super."strictify"; - "strictly" = dontDistribute super."strictly"; - "string" = dontDistribute super."string"; - "string-convert" = dontDistribute super."string-convert"; - "string-quote" = dontDistribute super."string-quote"; - "string-similarity" = dontDistribute super."string-similarity"; - "string-typelits" = dontDistribute super."string-typelits"; - "stringlike" = dontDistribute super."stringlike"; - "stringprep" = dontDistribute super."stringprep"; - "strings" = dontDistribute super."strings"; - "stringtable-atom" = dontDistribute super."stringtable-atom"; - "strio" = dontDistribute super."strio"; - "stripe" = dontDistribute super."stripe"; - "stripe-core" = doDistribute super."stripe-core_2_0_3"; - "stripe-haskell" = doDistribute super."stripe-haskell_2_0_3"; - "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_3"; - "strive" = doDistribute super."strive_2_2_2"; - "strptime" = dontDistribute super."strptime"; - "structs" = dontDistribute super."structs"; - "structural-induction" = dontDistribute super."structural-induction"; - "structural-traversal" = dontDistribute super."structural-traversal"; - "structured-haskell-mode" = dontDistribute super."structured-haskell-mode"; - "structured-mongoDB" = dontDistribute super."structured-mongoDB"; - "structures" = dontDistribute super."structures"; - "stunclient" = dontDistribute super."stunclient"; - "stunts" = dontDistribute super."stunts"; - "stylish-haskell" = doDistribute super."stylish-haskell_0_5_17_0"; - "stylized" = dontDistribute super."stylized"; - "sub-state" = dontDistribute super."sub-state"; - "subhask" = dontDistribute super."subhask"; - "subleq-toolchain" = dontDistribute super."subleq-toolchain"; - "subnet" = dontDistribute super."subnet"; - "subtitleParser" = dontDistribute super."subtitleParser"; - "subtitles" = dontDistribute super."subtitles"; - "subwordgraph" = dontDistribute super."subwordgraph"; - "suffixarray" = dontDistribute super."suffixarray"; - "suffixtree" = dontDistribute super."suffixtree"; - "sugarhaskell" = dontDistribute super."sugarhaskell"; - "suitable" = dontDistribute super."suitable"; - "sump" = dontDistribute super."sump"; - "sunlight" = dontDistribute super."sunlight"; - "sunroof-compiler" = dontDistribute super."sunroof-compiler"; - "sunroof-examples" = dontDistribute super."sunroof-examples"; - "sunroof-server" = dontDistribute super."sunroof-server"; - "super-user-spark" = dontDistribute super."super-user-spark"; - "supercollider-ht" = dontDistribute super."supercollider-ht"; - "supercollider-midi" = dontDistribute super."supercollider-midi"; - "superdoc" = dontDistribute super."superdoc"; - "supero" = dontDistribute super."supero"; - "supervisor" = dontDistribute super."supervisor"; - "supplemented" = dontDistribute super."supplemented"; - "suspend" = dontDistribute super."suspend"; - "svg2q" = dontDistribute super."svg2q"; - "svgcairo" = dontDistribute super."svgcairo"; - "svgutils" = dontDistribute super."svgutils"; - "svm" = dontDistribute super."svm"; - "svm-light-utils" = dontDistribute super."svm-light-utils"; - "svm-simple" = dontDistribute super."svm-simple"; - "svndump" = dontDistribute super."svndump"; - "swagger2" = doDistribute super."swagger2_2_0_2"; - "swapper" = dontDistribute super."swapper"; - "swearjure" = dontDistribute super."swearjure"; - "swf" = dontDistribute super."swf"; - "swift-lda" = dontDistribute super."swift-lda"; - "swish" = dontDistribute super."swish"; - "sws" = dontDistribute super."sws"; - "syb-extras" = dontDistribute super."syb-extras"; - "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text"; - "sylvia" = dontDistribute super."sylvia"; - "sym" = dontDistribute super."sym"; - "sym-plot" = dontDistribute super."sym-plot"; - "symengine" = dontDistribute super."symengine"; - "symengine-hs" = dontDistribute super."symengine-hs"; - "symon" = dontDistribute super."symon"; - "sync" = dontDistribute super."sync"; - "synchronous-channels" = dontDistribute super."synchronous-channels"; - "syncthing-hs" = dontDistribute super."syncthing-hs"; - "synt" = dontDistribute super."synt"; - "syntactic" = dontDistribute super."syntactic"; - "syntactical" = dontDistribute super."syntactical"; - "syntax" = dontDistribute super."syntax"; - "syntax-attoparsec" = dontDistribute super."syntax-attoparsec"; - "syntax-example" = dontDistribute super."syntax-example"; - "syntax-example-json" = dontDistribute super."syntax-example-json"; - "syntax-pretty" = dontDistribute super."syntax-pretty"; - "syntax-printer" = dontDistribute super."syntax-printer"; - "syntax-trees" = dontDistribute super."syntax-trees"; - "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn"; - "synthesizer" = dontDistribute super."synthesizer"; - "synthesizer-alsa" = dontDistribute super."synthesizer-alsa"; - "synthesizer-core" = dontDistribute super."synthesizer-core"; - "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional"; - "synthesizer-filter" = dontDistribute super."synthesizer-filter"; - "synthesizer-inference" = dontDistribute super."synthesizer-inference"; - "synthesizer-llvm" = dontDistribute super."synthesizer-llvm"; - "synthesizer-midi" = dontDistribute super."synthesizer-midi"; - "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient"; - "sys-process" = dontDistribute super."sys-process"; - "system-canonicalpath" = dontDistribute super."system-canonicalpath"; - "system-command" = dontDistribute super."system-command"; - "system-gpio" = dontDistribute super."system-gpio"; - "system-info" = dontDistribute super."system-info"; - "system-inotify" = dontDistribute super."system-inotify"; - "system-lifted" = dontDistribute super."system-lifted"; - "system-locale" = dontDistribute super."system-locale"; - "system-random-effect" = dontDistribute super."system-random-effect"; - "system-test" = dontDistribute super."system-test"; - "system-time-monotonic" = dontDistribute super."system-time-monotonic"; - "system-util" = dontDistribute super."system-util"; - "system-uuid" = dontDistribute super."system-uuid"; - "systemd" = dontDistribute super."systemd"; - "systemstats" = dontDistribute super."systemstats"; - "t-regex" = dontDistribute super."t-regex"; - "t3-client" = dontDistribute super."t3-client"; - "t3-game" = dontDistribute super."t3-game"; - "t3-server" = dontDistribute super."t3-server"; - "ta" = dontDistribute super."ta"; - "table" = dontDistribute super."table"; - "table-layout" = dontDistribute super."table-layout"; - "table-tennis" = dontDistribute super."table-tennis"; - "tableaux" = dontDistribute super."tableaux"; - "tables" = dontDistribute super."tables"; - "tablestorage" = dontDistribute super."tablestorage"; - "tabloid" = dontDistribute super."tabloid"; - "taffybar" = dontDistribute super."taffybar"; - "tag-bits" = dontDistribute super."tag-bits"; - "tag-stream" = dontDistribute super."tag-stream"; - "tagchup" = dontDistribute super."tagchup"; - "tagged" = doDistribute super."tagged_0_8_4"; - "tagged-exception-core" = dontDistribute super."tagged-exception-core"; - "tagged-list" = dontDistribute super."tagged-list"; - "tagged-th" = dontDistribute super."tagged-th"; - "tagged-timers" = dontDistribute super."tagged-timers"; - "tagged-transformer" = dontDistribute super."tagged-transformer"; - "tagging" = dontDistribute super."tagging"; - "taglib" = dontDistribute super."taglib"; - "taglib-api" = dontDistribute super."taglib-api"; - "tagset-positional" = dontDistribute super."tagset-positional"; - "tagsoup" = doDistribute super."tagsoup_0_13_10"; - "tagsoup-ht" = dontDistribute super."tagsoup-ht"; - "tagsoup-megaparsec" = dontDistribute super."tagsoup-megaparsec"; - "tagsoup-parsec" = dontDistribute super."tagsoup-parsec"; - "tai64" = dontDistribute super."tai64"; - "tak" = dontDistribute super."tak"; - "tak-ai" = dontDistribute super."tak-ai"; - "takahashi" = dontDistribute super."takahashi"; - "takusen-oracle" = dontDistribute super."takusen-oracle"; - "tal" = dontDistribute super."tal"; - "tamarin-prover" = dontDistribute super."tamarin-prover"; - "tamarin-prover-term" = dontDistribute super."tamarin-prover-term"; - "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory"; - "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils"; - "tamper" = dontDistribute super."tamper"; - "target" = dontDistribute super."target"; - "task" = dontDistribute super."task"; - "task-distribution" = dontDistribute super."task-distribution"; - "taskpool" = dontDistribute super."taskpool"; - "tasty" = doDistribute super."tasty_0_11_0_3"; - "tasty-golden" = doDistribute super."tasty-golden_2_3_1"; - "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters"; - "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter"; - "tasty-integrate" = dontDistribute super."tasty-integrate"; - "tasty-laws" = dontDistribute super."tasty-laws"; - "tasty-lens" = dontDistribute super."tasty-lens"; - "tasty-program" = dontDistribute super."tasty-program"; - "tasty-silver" = doDistribute super."tasty-silver_3_1_8_1"; - "tateti-tateti" = dontDistribute super."tateti-tateti"; - "tau" = dontDistribute super."tau"; - "tbox" = dontDistribute super."tbox"; - "tcache-AWS" = dontDistribute super."tcache-AWS"; - "tccli" = dontDistribute super."tccli"; - "tce-conf" = dontDistribute super."tce-conf"; - "tconfig" = dontDistribute super."tconfig"; - "tcp" = dontDistribute super."tcp"; - "tcp-streams" = dontDistribute super."tcp-streams"; - "tdd-util" = dontDistribute super."tdd-util"; - "tdoc" = dontDistribute super."tdoc"; - "teams" = dontDistribute super."teams"; - "teeth" = dontDistribute super."teeth"; - "telegram" = dontDistribute super."telegram"; - "telegram-api" = doDistribute super."telegram-api_0_4_3_1"; - "teleport" = dontDistribute super."teleport"; - "template-default" = dontDistribute super."template-default"; - "template-haskell-util" = dontDistribute super."template-haskell-util"; - "template-hsml" = dontDistribute super."template-hsml"; - "template-yj" = dontDistribute super."template-yj"; - "templateify" = dontDistribute super."templateify"; - "templatepg" = dontDistribute super."templatepg"; - "templater" = dontDistribute super."templater"; - "tempo" = dontDistribute super."tempo"; - "tempodb" = dontDistribute super."tempodb"; - "temporal-csound" = dontDistribute super."temporal-csound"; - "temporal-media" = dontDistribute super."temporal-media"; - "temporal-music-notation" = dontDistribute super."temporal-music-notation"; - "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo"; - "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western"; - "temporary-resourcet" = dontDistribute super."temporary-resourcet"; - "tempus" = dontDistribute super."tempus"; - "tempus-fugit" = dontDistribute super."tempus-fugit"; - "tensor" = dontDistribute super."tensor"; - "term-rewriting" = dontDistribute super."term-rewriting"; - "termbox-bindings" = dontDistribute super."termbox-bindings"; - "termination-combinators" = dontDistribute super."termination-combinators"; - "terminfo" = doDistribute super."terminfo_0_4_0_2"; - "terminfo-hs" = dontDistribute super."terminfo-hs"; - "termplot" = dontDistribute super."termplot"; - "terntup" = dontDistribute super."terntup"; - "terrahs" = dontDistribute super."terrahs"; - "tersmu" = dontDistribute super."tersmu"; - "test-fixture" = dontDistribute super."test-fixture"; - "test-framework-doctest" = dontDistribute super."test-framework-doctest"; - "test-framework-golden" = dontDistribute super."test-framework-golden"; - "test-framework-program" = dontDistribute super."test-framework-program"; - "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck"; - "test-framework-sandbox" = dontDistribute super."test-framework-sandbox"; - "test-framework-skip" = dontDistribute super."test-framework-skip"; - "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat"; - "test-invariant" = dontDistribute super."test-invariant"; - "test-pkg" = dontDistribute super."test-pkg"; - "test-sandbox" = dontDistribute super."test-sandbox"; - "test-sandbox-compose" = dontDistribute super."test-sandbox-compose"; - "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit"; - "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck"; - "test-shouldbe" = dontDistribute super."test-shouldbe"; - "testPkg" = dontDistribute super."testPkg"; - "testbench" = dontDistribute super."testbench"; - "testing-type-modifiers" = dontDistribute super."testing-type-modifiers"; - "testloop" = dontDistribute super."testloop"; - "testpack" = dontDistribute super."testpack"; - "testpattern" = dontDistribute super."testpattern"; - "testrunner" = dontDistribute super."testrunner"; - "tetris" = dontDistribute super."tetris"; - "tex2txt" = dontDistribute super."tex2txt"; - "texmath" = doDistribute super."texmath_0_8_6_4"; - "texrunner" = dontDistribute super."texrunner"; - "text-all" = dontDistribute super."text-all"; - "text-and-plots" = dontDistribute super."text-and-plots"; - "text-conversions" = dontDistribute super."text-conversions"; - "text-format-simple" = dontDistribute super."text-format-simple"; - "text-icu-normalized" = dontDistribute super."text-icu-normalized"; - "text-icu-translit" = dontDistribute super."text-icu-translit"; - "text-json-qq" = dontDistribute super."text-json-qq"; - "text-latin1" = dontDistribute super."text-latin1"; - "text-lips" = dontDistribute super."text-lips"; - "text-loc" = dontDistribute super."text-loc"; - "text-locale-encoding" = dontDistribute super."text-locale-encoding"; - "text-markup" = dontDistribute super."text-markup"; - "text-metrics" = dontDistribute super."text-metrics"; - "text-normal" = dontDistribute super."text-normal"; - "text-position" = dontDistribute super."text-position"; - "text-printer" = dontDistribute super."text-printer"; - "text-regex-replace" = dontDistribute super."text-regex-replace"; - "text-register-machine" = dontDistribute super."text-register-machine"; - "text-render" = dontDistribute super."text-render"; - "text-show" = doDistribute super."text-show_2_1_2"; - "text-show-instances" = dontDistribute super."text-show-instances"; - "text-stream-decode" = dontDistribute super."text-stream-decode"; - "text-utf7" = dontDistribute super."text-utf7"; - "text-xml-generic" = dontDistribute super."text-xml-generic"; - "text-xml-qq" = dontDistribute super."text-xml-qq"; - "text-zipper" = doDistribute super."text-zipper_0_4"; - "text-zipper-monad" = dontDistribute super."text-zipper-monad"; - "text1" = dontDistribute super."text1"; - "textPlot" = dontDistribute super."textPlot"; - "textmatetags" = dontDistribute super."textmatetags"; - "textocat-api" = dontDistribute super."textocat-api"; - "texts" = dontDistribute super."texts"; - "textual" = dontDistribute super."textual"; - "tfp" = dontDistribute super."tfp"; - "tfp-th" = dontDistribute super."tfp-th"; - "tftp" = dontDistribute super."tftp"; - "tga" = dontDistribute super."tga"; - "th-alpha" = dontDistribute super."th-alpha"; - "th-build" = dontDistribute super."th-build"; - "th-cas" = dontDistribute super."th-cas"; - "th-context" = dontDistribute super."th-context"; - "th-desugar" = doDistribute super."th-desugar_1_5_5"; - "th-fold" = dontDistribute super."th-fold"; - "th-inline-io-action" = dontDistribute super."th-inline-io-action"; - "th-instance-reification" = dontDistribute super."th-instance-reification"; - "th-instances" = dontDistribute super."th-instances"; - "th-kinds" = dontDistribute super."th-kinds"; - "th-kinds-fork" = dontDistribute super."th-kinds-fork"; - "th-orphans" = doDistribute super."th-orphans_0_13_0"; - "th-printf" = dontDistribute super."th-printf"; - "th-sccs" = dontDistribute super."th-sccs"; - "th-traced" = dontDistribute super."th-traced"; - "th-typegraph" = dontDistribute super."th-typegraph"; - "th-utilities" = dontDistribute super."th-utilities"; - "themoviedb" = dontDistribute super."themoviedb"; - "themplate" = dontDistribute super."themplate"; - "thentos-cookie-session" = dontDistribute super."thentos-cookie-session"; - "theoremquest" = dontDistribute super."theoremquest"; - "theoremquest-client" = dontDistribute super."theoremquest-client"; - "these" = doDistribute super."these_0_6_2_1"; - "thespian" = dontDistribute super."thespian"; - "theta-functions" = dontDistribute super."theta-functions"; - "thih" = dontDistribute super."thih"; - "thimk" = dontDistribute super."thimk"; - "thorn" = dontDistribute super."thorn"; - "thread-local-storage" = dontDistribute super."thread-local-storage"; - "threadPool" = dontDistribute super."threadPool"; - "threadmanager" = dontDistribute super."threadmanager"; - "threads-pool" = dontDistribute super."threads-pool"; - "threads-supervisor" = dontDistribute super."threads-supervisor"; - "threadscope" = dontDistribute super."threadscope"; - "threefish" = dontDistribute super."threefish"; - "threepenny-gui" = dontDistribute super."threepenny-gui"; - "thrift" = dontDistribute super."thrift"; - "thrist" = dontDistribute super."thrist"; - "throttle" = dontDistribute super."throttle"; - "throttled-io-loop" = dontDistribute super."throttled-io-loop"; - "thumbnail" = dontDistribute super."thumbnail"; - "tianbar" = dontDistribute super."tianbar"; - "tic-tac-toe" = dontDistribute super."tic-tac-toe"; - "tickle" = dontDistribute super."tickle"; - "tictactoe3d" = dontDistribute super."tictactoe3d"; - "tidal" = doDistribute super."tidal_0_7_1"; - "tidal-midi" = dontDistribute super."tidal-midi"; - "tidal-serial" = dontDistribute super."tidal-serial"; - "tidal-vis" = dontDistribute super."tidal-vis"; - "tie-knot" = dontDistribute super."tie-knot"; - "tiempo" = dontDistribute super."tiempo"; - "tiger" = dontDistribute super."tiger"; - "tight-apply" = dontDistribute super."tight-apply"; - "tightrope" = dontDistribute super."tightrope"; - "tighttp" = dontDistribute super."tighttp"; - "tilings" = dontDistribute super."tilings"; - "timberc" = dontDistribute super."timberc"; - "time-cache" = dontDistribute super."time-cache"; - "time-extras" = dontDistribute super."time-extras"; - "time-exts" = dontDistribute super."time-exts"; - "time-http" = dontDistribute super."time-http"; - "time-interval" = dontDistribute super."time-interval"; - "time-io-access" = dontDistribute super."time-io-access"; - "time-out" = dontDistribute super."time-out"; - "time-patterns" = dontDistribute super."time-patterns"; - "time-qq" = dontDistribute super."time-qq"; - "time-recurrence" = dontDistribute super."time-recurrence"; - "time-series" = dontDistribute super."time-series"; - "time-w3c" = dontDistribute super."time-w3c"; - "timecalc" = dontDistribute super."timecalc"; - "timeconsole" = dontDistribute super."timeconsole"; - "timelens" = dontDistribute super."timelens"; - "timeless" = dontDistribute super."timeless"; - "timelike" = dontDistribute super."timelike"; - "timelike-clock" = dontDistribute super."timelike-clock"; - "timelike-time" = dontDistribute super."timelike-time"; - "timeout" = dontDistribute super."timeout"; - "timeout-control" = dontDistribute super."timeout-control"; - "timeout-with-results" = dontDistribute super."timeout-with-results"; - "timeparsers" = dontDistribute super."timeparsers"; - "timeplot" = dontDistribute super."timeplot"; - "timeprint" = dontDistribute super."timeprint"; - "timers" = dontDistribute super."timers"; - "timers-updatable" = dontDistribute super."timers-updatable"; - "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines"; - "timestamper" = dontDistribute super."timestamper"; - "timezone-olson-th" = dontDistribute super."timezone-olson-th"; - "timing-convenience" = dontDistribute super."timing-convenience"; - "tinyMesh" = dontDistribute super."tinyMesh"; - "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend"; - "tip-lib" = dontDistribute super."tip-lib"; - "tiphys" = dontDistribute super."tiphys"; - "titlecase" = dontDistribute super."titlecase"; - "tkhs" = dontDistribute super."tkhs"; - "tkyprof" = dontDistribute super."tkyprof"; - "tld" = dontDistribute super."tld"; - "tls-extra" = dontDistribute super."tls-extra"; - "tmpl" = dontDistribute super."tmpl"; - "tn" = dontDistribute super."tn"; - "tnet" = dontDistribute super."tnet"; - "to-haskell" = dontDistribute super."to-haskell"; - "to-string-class" = dontDistribute super."to-string-class"; - "to-string-instances" = dontDistribute super."to-string-instances"; - "todos" = dontDistribute super."todos"; - "tofromxml" = dontDistribute super."tofromxml"; - "toilet" = dontDistribute super."toilet"; - "tokenify" = dontDistribute super."tokenify"; - "tokenize" = dontDistribute super."tokenize"; - "toktok" = dontDistribute super."toktok"; - "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell"; - "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell"; - "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal"; - "toml" = dontDistribute super."toml"; - "toolshed" = dontDistribute super."toolshed"; - "topkata" = dontDistribute super."topkata"; - "torch" = dontDistribute super."torch"; - "total" = dontDistribute super."total"; - "total-alternative" = dontDistribute super."total-alternative"; - "total-map" = dontDistribute super."total-map"; - "total-maps" = dontDistribute super."total-maps"; - "touched" = dontDistribute super."touched"; - "toysolver" = dontDistribute super."toysolver"; - "tpar" = dontDistribute super."tpar"; - "tpdb" = dontDistribute super."tpdb"; - "trace" = dontDistribute super."trace"; - "trace-call" = dontDistribute super."trace-call"; - "trace-function-call" = dontDistribute super."trace-function-call"; - "traced" = dontDistribute super."traced"; - "tracer" = dontDistribute super."tracer"; - "tracetree" = dontDistribute super."tracetree"; - "tracker" = dontDistribute super."tracker"; - "traildb" = dontDistribute super."traildb"; - "trajectory" = dontDistribute super."trajectory"; - "transactional-events" = dontDistribute super."transactional-events"; - "transf" = dontDistribute super."transf"; - "transformations" = dontDistribute super."transformations"; - "transformers-abort" = dontDistribute super."transformers-abort"; - "transformers-compat" = doDistribute super."transformers-compat_0_4_0_4"; - "transformers-compose" = dontDistribute super."transformers-compose"; - "transformers-convert" = dontDistribute super."transformers-convert"; - "transformers-eff" = dontDistribute super."transformers-eff"; - "transformers-free" = dontDistribute super."transformers-free"; - "transformers-runnable" = dontDistribute super."transformers-runnable"; - "transformers-supply" = dontDistribute super."transformers-supply"; - "transient" = dontDistribute super."transient"; - "transient-universe" = dontDistribute super."transient-universe"; - "translatable-intset" = dontDistribute super."translatable-intset"; - "translate" = dontDistribute super."translate"; - "travis" = dontDistribute super."travis"; - "travis-meta-yaml" = dontDistribute super."travis-meta-yaml"; - "trawl" = dontDistribute super."trawl"; - "traypoweroff" = dontDistribute super."traypoweroff"; - "tree-monad" = dontDistribute super."tree-monad"; - "treemap" = dontDistribute super."treemap"; - "treemap-html" = dontDistribute super."treemap-html"; - "treemap-html-tools" = dontDistribute super."treemap-html-tools"; - "treersec" = dontDistribute super."treersec"; - "treeviz" = dontDistribute super."treeviz"; - "tremulous-query" = dontDistribute super."tremulous-query"; - "trhsx" = dontDistribute super."trhsx"; - "triangulation" = dontDistribute super."triangulation"; - "trifecta" = doDistribute super."trifecta_1_5_2"; - "trimpolya" = dontDistribute super."trimpolya"; - "tripLL" = dontDistribute super."tripLL"; - "trivia" = dontDistribute super."trivia"; - "trivial-constraint" = dontDistribute super."trivial-constraint"; - "tropical" = dontDistribute super."tropical"; - "truelevel" = dontDistribute super."truelevel"; - "trurl" = dontDistribute super."trurl"; - "truthful" = dontDistribute super."truthful"; - "tsession" = dontDistribute super."tsession"; - "tsession-happstack" = dontDistribute super."tsession-happstack"; - "tskiplist" = dontDistribute super."tskiplist"; - "tslib" = dontDistribute super."tslib"; - "tslogger" = dontDistribute super."tslogger"; - "tsp-viz" = dontDistribute super."tsp-viz"; - "tsparse" = dontDistribute super."tsparse"; - "tst" = dontDistribute super."tst"; - "tsvsql" = dontDistribute super."tsvsql"; - "ttask" = dontDistribute super."ttask"; - "tttool" = doDistribute super."tttool_1_6_1_1"; - "tubes" = dontDistribute super."tubes"; - "tuntap" = dontDistribute super."tuntap"; - "tup-functor" = dontDistribute super."tup-functor"; - "tuple-gen" = dontDistribute super."tuple-gen"; - "tuple-generic" = dontDistribute super."tuple-generic"; - "tuple-hlist" = dontDistribute super."tuple-hlist"; - "tuple-lenses" = dontDistribute super."tuple-lenses"; - "tuple-morph" = dontDistribute super."tuple-morph"; - "tupleinstances" = dontDistribute super."tupleinstances"; - "turing" = dontDistribute super."turing"; - "turing-machines" = dontDistribute super."turing-machines"; - "turing-music" = dontDistribute super."turing-music"; - "turingMachine" = dontDistribute super."turingMachine"; - "turkish-deasciifier" = dontDistribute super."turkish-deasciifier"; - "turni" = dontDistribute super."turni"; - "tweak" = dontDistribute super."tweak"; - "twee" = dontDistribute super."twee"; - "twentefp" = dontDistribute super."twentefp"; - "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics"; - "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees"; - "twentefp-graphs" = dontDistribute super."twentefp-graphs"; - "twentefp-number" = dontDistribute super."twentefp-number"; - "twentefp-rosetree" = dontDistribute super."twentefp-rosetree"; - "twentefp-trees" = dontDistribute super."twentefp-trees"; - "twentefp-websockets" = dontDistribute super."twentefp-websockets"; - "twentyseven" = dontDistribute super."twentyseven"; - "twhs" = dontDistribute super."twhs"; - "twidge" = dontDistribute super."twidge"; - "twilight-stm" = dontDistribute super."twilight-stm"; - "twilio" = dontDistribute super."twilio"; - "twill" = dontDistribute super."twill"; - "twiml" = dontDistribute super."twiml"; - "twine" = dontDistribute super."twine"; - "twisty" = dontDistribute super."twisty"; - "twitch" = dontDistribute super."twitch"; - "twitter" = dontDistribute super."twitter"; - "twitter-enumerator" = dontDistribute super."twitter-enumerator"; - "twitter-feed" = doDistribute super."twitter-feed_0_2_0_7"; - "tx" = dontDistribute super."tx"; - "txt-sushi" = dontDistribute super."txt-sushi"; - "txt2rtf" = dontDistribute super."txt2rtf"; - "txtblk" = dontDistribute super."txtblk"; - "ty" = dontDistribute super."ty"; - "typalyze" = dontDistribute super."typalyze"; - "type-booleans" = dontDistribute super."type-booleans"; - "type-cache" = dontDistribute super."type-cache"; - "type-cereal" = dontDistribute super."type-cereal"; - "type-combinators" = dontDistribute super."type-combinators"; - "type-combinators-quote" = dontDistribute super."type-combinators-quote"; - "type-digits" = dontDistribute super."type-digits"; - "type-equality" = dontDistribute super."type-equality"; - "type-equality-check" = dontDistribute super."type-equality-check"; - "type-fun" = dontDistribute super."type-fun"; - "type-functions" = dontDistribute super."type-functions"; - "type-hint" = dontDistribute super."type-hint"; - "type-int" = dontDistribute super."type-int"; - "type-iso" = dontDistribute super."type-iso"; - "type-level" = dontDistribute super."type-level"; - "type-level-bst" = dontDistribute super."type-level-bst"; - "type-level-natural-number" = dontDistribute super."type-level-natural-number"; - "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction"; - "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations"; - "type-level-sets" = dontDistribute super."type-level-sets"; - "type-level-tf" = dontDistribute super."type-level-tf"; - "type-list" = doDistribute super."type-list_0_3_0_4"; - "type-natural" = dontDistribute super."type-natural"; - "type-operators" = dontDistribute super."type-operators"; - "type-ord" = dontDistribute super."type-ord"; - "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal"; - "type-prelude" = dontDistribute super."type-prelude"; - "type-settheory" = dontDistribute super."type-settheory"; - "type-spec" = dontDistribute super."type-spec"; - "type-spine" = dontDistribute super."type-spine"; - "type-structure" = dontDistribute super."type-structure"; - "type-sub-th" = dontDistribute super."type-sub-th"; - "type-unary" = dontDistribute super."type-unary"; - "typeable-th" = dontDistribute super."typeable-th"; - "typed-spreadsheet" = dontDistribute super."typed-spreadsheet"; - "typed-wire" = dontDistribute super."typed-wire"; - "typed-wire-utils" = dontDistribute super."typed-wire-utils"; - "typedquery" = dontDistribute super."typedquery"; - "typehash" = dontDistribute super."typehash"; - "typelevel" = dontDistribute super."typelevel"; - "typelevel-tensor" = dontDistribute super."typelevel-tensor"; - "typeof" = dontDistribute super."typeof"; - "typeparams" = dontDistribute super."typeparams"; - "typesafe-endian" = dontDistribute super."typesafe-endian"; - "typescript-docs" = dontDistribute super."typescript-docs"; - "typical" = dontDistribute super."typical"; - "tz" = doDistribute super."tz_0_1_1_1"; - "uAgda" = dontDistribute super."uAgda"; - "uacpid" = dontDistribute super."uacpid"; - "uber" = dontDistribute super."uber"; - "uberlast" = dontDistribute super."uberlast"; - "uconv" = dontDistribute super."uconv"; - "udbus" = dontDistribute super."udbus"; - "udbus-model" = dontDistribute super."udbus-model"; - "udcode" = dontDistribute super."udcode"; - "udev" = dontDistribute super."udev"; - "uhc-light" = dontDistribute super."uhc-light"; - "uhc-util" = dontDistribute super."uhc-util"; - "uhexdump" = dontDistribute super."uhexdump"; - "uhttpc" = dontDistribute super."uhttpc"; - "ui-command" = dontDistribute super."ui-command"; - "uid" = dontDistribute super."uid"; - "una" = dontDistribute super."una"; - "unagi-bloomfilter" = dontDistribute super."unagi-bloomfilter"; - "unagi-chan" = dontDistribute super."unagi-chan"; - "unagi-streams" = dontDistribute super."unagi-streams"; - "unamb" = dontDistribute super."unamb"; - "unamb-custom" = dontDistribute super."unamb-custom"; - "unbound" = dontDistribute super."unbound"; - "unbounded-delays-units" = dontDistribute super."unbounded-delays-units"; - "unboxed-containers" = dontDistribute super."unboxed-containers"; - "unbreak" = dontDistribute super."unbreak"; - "unfoldable" = dontDistribute super."unfoldable"; - "unfoldable-restricted" = dontDistribute super."unfoldable-restricted"; - "ungadtagger" = dontDistribute super."ungadtagger"; - "uni-events" = dontDistribute super."uni-events"; - "uni-graphs" = dontDistribute super."uni-graphs"; - "uni-htk" = dontDistribute super."uni-htk"; - "uni-posixutil" = dontDistribute super."uni-posixutil"; - "uni-reactor" = dontDistribute super."uni-reactor"; - "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph"; - "uni-util" = dontDistribute super."uni-util"; - "unicode" = dontDistribute super."unicode"; - "unicode-names" = dontDistribute super."unicode-names"; - "unicode-normalization" = dontDistribute super."unicode-normalization"; - "unicode-prelude" = dontDistribute super."unicode-prelude"; - "unicode-properties" = dontDistribute super."unicode-properties"; - "unicode-show" = dontDistribute super."unicode-show"; - "unicode-symbols" = dontDistribute super."unicode-symbols"; - "unicode-transforms" = dontDistribute super."unicode-transforms"; - "unicoder" = dontDistribute super."unicoder"; - "uniform-io" = dontDistribute super."uniform-io"; - "uniform-pair" = dontDistribute super."uniform-pair"; - "union" = doDistribute super."union_0_1_1_0"; - "union-find-array" = dontDistribute super."union-find-array"; - "union-map" = dontDistribute super."union-map"; - "unique" = dontDistribute super."unique"; - "unique-logic" = dontDistribute super."unique-logic"; - "unique-logic-tf" = dontDistribute super."unique-logic-tf"; - "uniqueid" = dontDistribute super."uniqueid"; - "unit" = dontDistribute super."unit"; - "unit-constraint" = dontDistribute super."unit-constraint"; - "units" = dontDistribute super."units"; - "units-attoparsec" = dontDistribute super."units-attoparsec"; - "units-defs" = dontDistribute super."units-defs"; - "units-parser" = dontDistribute super."units-parser"; - "unittyped" = dontDistribute super."unittyped"; - "universal-binary" = dontDistribute super."universal-binary"; - "universe-th" = dontDistribute super."universe-th"; - "unix-compat" = doDistribute super."unix-compat_0_4_1_4"; - "unix-fcntl" = dontDistribute super."unix-fcntl"; - "unix-handle" = dontDistribute super."unix-handle"; - "unix-io-extra" = dontDistribute super."unix-io-extra"; - "unix-memory" = dontDistribute super."unix-memory"; - "unix-process-conduit" = dontDistribute super."unix-process-conduit"; - "unix-pty-light" = dontDistribute super."unix-pty-light"; - "unix-time" = doDistribute super."unix-time_0_3_6"; - "unlambda" = dontDistribute super."unlambda"; - "unlit" = dontDistribute super."unlit"; - "unm-hip" = dontDistribute super."unm-hip"; - "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch"; - "unordered-graphs" = dontDistribute super."unordered-graphs"; - "unpack-funcs" = dontDistribute super."unpack-funcs"; - "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin"; - "unsafe" = dontDistribute super."unsafe"; - "unsafe-promises" = dontDistribute super."unsafe-promises"; - "unsafely" = dontDistribute super."unsafely"; - "unsafeperformst" = dontDistribute super."unsafeperformst"; - "unscramble" = dontDistribute super."unscramble"; - "unsequential" = dontDistribute super."unsequential"; - "unusable-pkg" = dontDistribute super."unusable-pkg"; - "unused" = dontDistribute super."unused"; - "uom-plugin" = dontDistribute super."uom-plugin"; - "up" = dontDistribute super."up"; - "up-grade" = dontDistribute super."up-grade"; - "uploadcare" = dontDistribute super."uploadcare"; - "upskirt" = dontDistribute super."upskirt"; - "ureader" = dontDistribute super."ureader"; - "urembed" = dontDistribute super."urembed"; - "uri" = dontDistribute super."uri"; - "uri-bytestring" = doDistribute super."uri-bytestring_0_2_1_2"; - "uri-conduit" = dontDistribute super."uri-conduit"; - "uri-encode" = doDistribute super."uri-encode_1_5_0_4"; - "uri-enumerator" = dontDistribute super."uri-enumerator"; - "uri-enumerator-file" = dontDistribute super."uri-enumerator-file"; - "uri-template" = dontDistribute super."uri-template"; - "url-generic" = dontDistribute super."url-generic"; - "urlcheck" = dontDistribute super."urlcheck"; - "urldecode" = dontDistribute super."urldecode"; - "urldisp-happstack" = dontDistribute super."urldisp-happstack"; - "urlencoded" = dontDistribute super."urlencoded"; - "urn" = dontDistribute super."urn"; - "urxml" = dontDistribute super."urxml"; - "usb" = dontDistribute super."usb"; - "usb-enumerator" = dontDistribute super."usb-enumerator"; - "usb-hid" = dontDistribute super."usb-hid"; - "usb-id-database" = dontDistribute super."usb-id-database"; - "usb-iteratee" = dontDistribute super."usb-iteratee"; - "usb-safe" = dontDistribute super."usb-safe"; - "userid" = doDistribute super."userid_0_1_2_6"; - "utc" = dontDistribute super."utc"; - "utf8-env" = dontDistribute super."utf8-env"; - "utf8-prelude" = dontDistribute super."utf8-prelude"; - "utility-ht" = doDistribute super."utility-ht_0_0_11"; - "uu-cco" = dontDistribute super."uu-cco"; - "uu-cco-examples" = dontDistribute super."uu-cco-examples"; - "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing"; - "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib"; - "uu-options" = dontDistribute super."uu-options"; - "uu-tc" = dontDistribute super."uu-tc"; - "uuagc" = dontDistribute super."uuagc"; - "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap"; - "uuagc-cabal" = dontDistribute super."uuagc-cabal"; - "uuagc-diagrams" = dontDistribute super."uuagc-diagrams"; - "uuagd" = dontDistribute super."uuagd"; - "uuid-aeson" = dontDistribute super."uuid-aeson"; - "uuid-le" = dontDistribute super."uuid-le"; - "uuid-orphans" = doDistribute super."uuid-orphans_1_3_11_1"; - "uuid-quasi" = dontDistribute super."uuid-quasi"; - "uulib" = dontDistribute super."uulib"; - "uvector" = dontDistribute super."uvector"; - "uvector-algorithms" = dontDistribute super."uvector-algorithms"; - "uxadt" = dontDistribute super."uxadt"; - "uzbl-with-source" = dontDistribute super."uzbl-with-source"; - "v4l2" = dontDistribute super."v4l2"; - "v4l2-examples" = dontDistribute super."v4l2-examples"; - "vacuum" = dontDistribute super."vacuum"; - "vacuum-cairo" = dontDistribute super."vacuum-cairo"; - "vacuum-graphviz" = dontDistribute super."vacuum-graphviz"; - "vacuum-opengl" = dontDistribute super."vacuum-opengl"; - "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph"; - "valid-names" = dontDistribute super."valid-names"; - "validate" = dontDistribute super."validate"; - "validated-literals" = dontDistribute super."validated-literals"; - "validations" = dontDistribute super."validations"; - "validity" = dontDistribute super."validity"; - "validity-containers" = dontDistribute super."validity-containers"; - "value-supply" = dontDistribute super."value-supply"; - "vampire" = dontDistribute super."vampire"; - "var" = dontDistribute super."var"; - "varan" = dontDistribute super."varan"; - "variable-precision" = dontDistribute super."variable-precision"; - "variables" = dontDistribute super."variables"; - "varying" = dontDistribute super."varying"; - "vaultaire-common" = dontDistribute super."vaultaire-common"; - "vcache" = dontDistribute super."vcache"; - "vcache-trie" = dontDistribute super."vcache-trie"; - "vcard" = dontDistribute super."vcard"; - "vcatt" = dontDistribute super."vcatt"; - "vcd" = dontDistribute super."vcd"; - "vcs-revision" = dontDistribute super."vcs-revision"; - "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse"; - "vect-floating" = dontDistribute super."vect-floating"; - "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate"; - "vect-opengl" = dontDistribute super."vect-opengl"; - "vector-binary" = dontDistribute super."vector-binary"; - "vector-bytes-instances" = dontDistribute super."vector-bytes-instances"; - "vector-bytestring" = dontDistribute super."vector-bytestring"; - "vector-clock" = dontDistribute super."vector-clock"; - "vector-conduit" = dontDistribute super."vector-conduit"; - "vector-fftw" = doDistribute super."vector-fftw_0_1_3_6"; - "vector-functorlazy" = dontDistribute super."vector-functorlazy"; - "vector-heterogenous" = dontDistribute super."vector-heterogenous"; - "vector-instances-collections" = dontDistribute super."vector-instances-collections"; - "vector-mmap" = dontDistribute super."vector-mmap"; - "vector-random" = dontDistribute super."vector-random"; - "vector-read-instances" = dontDistribute super."vector-read-instances"; - "vector-sized" = dontDistribute super."vector-sized"; - "vector-space-map" = dontDistribute super."vector-space-map"; - "vector-space-opengl" = dontDistribute super."vector-space-opengl"; - "vector-space-points" = dontDistribute super."vector-space-points"; - "vector-static" = dontDistribute super."vector-static"; - "vector-strategies" = dontDistribute super."vector-strategies"; - "vectortiles" = dontDistribute super."vectortiles"; - "verbalexpressions" = dontDistribute super."verbalexpressions"; - "verbosity" = dontDistribute super."verbosity"; - "verdict" = dontDistribute super."verdict"; - "verdict-json" = dontDistribute super."verdict-json"; - "verilog" = dontDistribute super."verilog"; - "versions" = doDistribute super."versions_2_0_0"; - "vhdl" = dontDistribute super."vhdl"; - "views" = dontDistribute super."views"; - "vigilance" = dontDistribute super."vigilance"; - "vimeta" = dontDistribute super."vimeta"; - "vimus" = dontDistribute super."vimus"; - "vintage-basic" = dontDistribute super."vintage-basic"; - "vinyl-gl" = dontDistribute super."vinyl-gl"; - "vinyl-json" = dontDistribute super."vinyl-json"; - "vinyl-operational" = dontDistribute super."vinyl-operational"; - "vinyl-plus" = dontDistribute super."vinyl-plus"; - "vinyl-vectors" = dontDistribute super."vinyl-vectors"; - "virthualenv" = dontDistribute super."virthualenv"; - "visibility" = dontDistribute super."visibility"; - "vision" = dontDistribute super."vision"; - "visual-graphrewrite" = dontDistribute super."visual-graphrewrite"; - "visual-prof" = dontDistribute super."visual-prof"; - "vk-aws-route53" = dontDistribute super."vk-aws-route53"; - "vk-posix-pty" = dontDistribute super."vk-posix-pty"; - "vocabulary-kadma" = dontDistribute super."vocabulary-kadma"; - "vorbiscomment" = dontDistribute super."vorbiscomment"; - "vowpal-utils" = dontDistribute super."vowpal-utils"; - "voyeur" = dontDistribute super."voyeur"; - "vrpn" = dontDistribute super."vrpn"; - "vte" = dontDistribute super."vte"; - "vtegtk3" = dontDistribute super."vtegtk3"; - "vty" = doDistribute super."vty_5_5_0"; - "vty-examples" = dontDistribute super."vty-examples"; - "vty-menu" = dontDistribute super."vty-menu"; - "vty-ui" = dontDistribute super."vty-ui"; - "vty-ui-extras" = dontDistribute super."vty-ui-extras"; - "vulkan" = dontDistribute super."vulkan"; - "wacom-daemon" = dontDistribute super."wacom-daemon"; - "waddle" = dontDistribute super."waddle"; - "wai-accept-language" = dontDistribute super."wai-accept-language"; - "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi"; - "wai-app-static" = doDistribute super."wai-app-static_3_1_5"; - "wai-devel" = dontDistribute super."wai-devel"; - "wai-digestive-functors" = dontDistribute super."wai-digestive-functors"; - "wai-dispatch" = dontDistribute super."wai-dispatch"; - "wai-extra" = doDistribute super."wai-extra_3_0_16_1"; - "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi"; - "wai-graceful" = dontDistribute super."wai-graceful"; - "wai-handler-devel" = dontDistribute super."wai-handler-devel"; - "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi"; - "wai-handler-scgi" = dontDistribute super."wai-handler-scgi"; - "wai-handler-snap" = dontDistribute super."wai-handler-snap"; - "wai-handler-webkit" = dontDistribute super."wai-handler-webkit"; - "wai-hastache" = dontDistribute super."wai-hastache"; - "wai-hmac-auth" = dontDistribute super."wai-hmac-auth"; - "wai-http2-extra" = dontDistribute super."wai-http2-extra"; - "wai-lens" = dontDistribute super."wai-lens"; - "wai-lite" = dontDistribute super."wai-lite"; - "wai-logger" = doDistribute super."wai-logger_2_2_7"; - "wai-logger-prefork" = dontDistribute super."wai-logger-prefork"; - "wai-make-assets" = dontDistribute super."wai-make-assets"; - "wai-middleware-cache" = dontDistribute super."wai-middleware-cache"; - "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis"; - "wai-middleware-catch" = dontDistribute super."wai-middleware-catch"; - "wai-middleware-content-type" = doDistribute super."wai-middleware-content-type_0_4_0"; - "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_4_1"; - "wai-middleware-etag" = dontDistribute super."wai-middleware-etag"; - "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip"; - "wai-middleware-headers" = dontDistribute super."wai-middleware-headers"; - "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac"; - "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client"; - "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor"; - "wai-middleware-route" = dontDistribute super."wai-middleware-route"; - "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching"; - "wai-middleware-verbs" = doDistribute super."wai-middleware-verbs_0_2_0"; - "wai-predicates" = doDistribute super."wai-predicates_0_8_6"; - "wai-request-spec" = dontDistribute super."wai-request-spec"; - "wai-responsible" = dontDistribute super."wai-responsible"; - "wai-route" = doDistribute super."wai-route_0_3_1"; - "wai-router" = dontDistribute super."wai-router"; - "wai-routing" = doDistribute super."wai-routing_0_12_3"; - "wai-session-alt" = dontDistribute super."wai-session-alt"; - "wai-session-clientsession" = dontDistribute super."wai-session-clientsession"; - "wai-session-mysql" = dontDistribute super."wai-session-mysql"; - "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet"; - "wai-static-cache" = dontDistribute super."wai-static-cache"; - "wai-static-pages" = dontDistribute super."wai-static-pages"; - "wai-test" = dontDistribute super."wai-test"; - "wai-thrift" = dontDistribute super."wai-thrift"; - "wai-throttler" = dontDistribute super."wai-throttler"; - "wai-websockets" = doDistribute super."wai-websockets_3_0_0_9"; - "wait-handle" = dontDistribute super."wait-handle"; - "waitfree" = dontDistribute super."waitfree"; - "warc" = dontDistribute super."warc"; - "warp" = doDistribute super."warp_3_2_7"; - "warp-dynamic" = dontDistribute super."warp-dynamic"; - "warp-static" = dontDistribute super."warp-static"; - "warp-tls-uid" = dontDistribute super."warp-tls-uid"; - "watchdog" = dontDistribute super."watchdog"; - "watcher" = dontDistribute super."watcher"; - "watchit" = dontDistribute super."watchit"; - "wavconvert" = dontDistribute super."wavconvert"; - "wavesurfer" = dontDistribute super."wavesurfer"; - "wavy" = dontDistribute super."wavy"; - "wcwidth" = dontDistribute super."wcwidth"; - "weather-api" = dontDistribute super."weather-api"; - "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell"; - "web-css" = dontDistribute super."web-css"; - "web-encodings" = dontDistribute super."web-encodings"; - "web-inv-route" = dontDistribute super."web-inv-route"; - "web-mongrel2" = dontDistribute super."web-mongrel2"; - "web-page" = dontDistribute super."web-page"; - "web-routes" = doDistribute super."web-routes_0_27_10"; - "web-routes-mtl" = dontDistribute super."web-routes-mtl"; - "web-routes-quasi" = dontDistribute super."web-routes-quasi"; - "web-routes-regular" = dontDistribute super."web-routes-regular"; - "web-routes-transformers" = dontDistribute super."web-routes-transformers"; - "webapi" = dontDistribute super."webapi"; - "webapp" = dontDistribute super."webapp"; - "webcloud" = dontDistribute super."webcloud"; - "webcrank" = dontDistribute super."webcrank"; - "webcrank-dispatch" = dontDistribute super."webcrank-dispatch"; - "webcrank-wai" = dontDistribute super."webcrank-wai"; - "webdriver-angular" = doDistribute super."webdriver-angular_0_1_10"; - "webdriver-snoy" = dontDistribute super."webdriver-snoy"; - "webfinger-client" = dontDistribute super."webfinger-client"; - "webidl" = dontDistribute super."webidl"; - "webify" = dontDistribute super."webify"; - "webkit" = dontDistribute super."webkit"; - "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore"; - "webkitgtk3" = doDistribute super."webkitgtk3_0_14_1_1"; - "webkitgtk3-javascriptcore" = doDistribute super."webkitgtk3-javascriptcore_0_13_1_2"; - "webrtc-vad" = dontDistribute super."webrtc-vad"; - "webserver" = dontDistribute super."webserver"; - "websnap" = dontDistribute super."websnap"; - "websockets" = doDistribute super."websockets_0_9_6_2"; - "websockets-snap" = doDistribute super."websockets-snap_0_9_2_0"; - "webwire" = dontDistribute super."webwire"; - "wedding-announcement" = dontDistribute super."wedding-announcement"; - "wedged" = dontDistribute super."wedged"; - "weighted-regexp" = dontDistribute super."weighted-regexp"; - "weighted-search" = dontDistribute super."weighted-search"; - "welshy" = dontDistribute super."welshy"; - "werewolf" = doDistribute super."werewolf_1_0_2_2"; - "werewolf-slack" = doDistribute super."werewolf-slack_1_0_1_4"; - "wheb-mongo" = dontDistribute super."wheb-mongo"; - "wheb-redis" = dontDistribute super."wheb-redis"; - "wheb-strapped" = dontDistribute super."wheb-strapped"; - "while-lang-parser" = dontDistribute super."while-lang-parser"; - "whim" = dontDistribute super."whim"; - "whiskers" = dontDistribute super."whiskers"; - "whitespace" = dontDistribute super."whitespace"; - "whois" = dontDistribute super."whois"; - "why3" = dontDistribute super."why3"; - "wigner-symbols" = dontDistribute super."wigner-symbols"; - "wikicfp-scraper" = dontDistribute super."wikicfp-scraper"; - "wikipedia4epub" = dontDistribute super."wikipedia4epub"; - "win-hp-path" = dontDistribute super."win-hp-path"; - "windowslive" = dontDistribute super."windowslive"; - "winerror" = dontDistribute super."winerror"; - "winio" = dontDistribute super."winio"; - "wire-streams" = dontDistribute super."wire-streams"; - "wires" = dontDistribute super."wires"; - "wiring" = dontDistribute super."wiring"; - "witness" = dontDistribute super."witness"; - "witty" = dontDistribute super."witty"; - "wkt" = dontDistribute super."wkt"; - "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm"; - "wlc-hs" = dontDistribute super."wlc-hs"; - "wobsurv" = dontDistribute super."wobsurv"; - "woffex" = dontDistribute super."woffex"; - "wol" = dontDistribute super."wol"; - "wolf" = dontDistribute super."wolf"; - "woot" = dontDistribute super."woot"; - "word-vector" = dontDistribute super."word-vector"; - "word24" = dontDistribute super."word24"; - "wordcloud" = dontDistribute super."wordcloud"; - "wordexp" = dontDistribute super."wordexp"; - "words" = dontDistribute super."words"; - "wordsearch" = dontDistribute super."wordsearch"; - "wordsetdiff" = dontDistribute super."wordsetdiff"; - "workdays" = dontDistribute super."workdays"; - "workflow-osx" = dontDistribute super."workflow-osx"; - "wp-archivebot" = dontDistribute super."wp-archivebot"; - "wraparound" = dontDistribute super."wraparound"; - "wraxml" = dontDistribute super."wraxml"; - "wreq-sb" = dontDistribute super."wreq-sb"; - "wright" = dontDistribute super."wright"; - "writer-cps-monads-tf" = dontDistribute super."writer-cps-monads-tf"; - "writer-cps-mtl" = dontDistribute super."writer-cps-mtl"; - "writer-cps-transformers" = dontDistribute super."writer-cps-transformers"; - "wsdl" = dontDistribute super."wsdl"; - "wsedit" = dontDistribute super."wsedit"; - "wtk" = dontDistribute super."wtk"; - "wtk-gtk" = dontDistribute super."wtk-gtk"; - "wumpus-basic" = dontDistribute super."wumpus-basic"; - "wumpus-core" = dontDistribute super."wumpus-core"; - "wumpus-drawing" = dontDistribute super."wumpus-drawing"; - "wumpus-microprint" = dontDistribute super."wumpus-microprint"; - "wumpus-tree" = dontDistribute super."wumpus-tree"; - "wuss" = doDistribute super."wuss_1_0_4"; - "wx" = dontDistribute super."wx"; - "wxAsteroids" = dontDistribute super."wxAsteroids"; - "wxFruit" = dontDistribute super."wxFruit"; - "wxc" = dontDistribute super."wxc"; - "wxcore" = dontDistribute super."wxcore"; - "wxdirect" = dontDistribute super."wxdirect"; - "wxhnotepad" = dontDistribute super."wxhnotepad"; - "wxturtle" = dontDistribute super."wxturtle"; - "wybor" = dontDistribute super."wybor"; - "wyvern" = dontDistribute super."wyvern"; - "x-dsp" = dontDistribute super."x-dsp"; - "x11-xim" = dontDistribute super."x11-xim"; - "x11-xinput" = dontDistribute super."x11-xinput"; - "x509-util" = dontDistribute super."x509-util"; - "x86-64bit" = dontDistribute super."x86-64bit"; - "xattr" = dontDistribute super."xattr"; - "xbattbar" = dontDistribute super."xbattbar"; - "xcb-types" = dontDistribute super."xcb-types"; - "xcffib" = dontDistribute super."xcffib"; - "xchat-plugin" = dontDistribute super."xchat-plugin"; - "xcp" = dontDistribute super."xcp"; - "xdcc" = doDistribute super."xdcc_1_0_4"; - "xdg-userdirs" = dontDistribute super."xdg-userdirs"; - "xdot" = dontDistribute super."xdot"; - "xfconf" = dontDistribute super."xfconf"; - "xhaskell-library" = dontDistribute super."xhaskell-library"; - "xhb" = dontDistribute super."xhb"; - "xhb-atom-cache" = dontDistribute super."xhb-atom-cache"; - "xhb-ewmh" = dontDistribute super."xhb-ewmh"; - "xhtml" = doDistribute super."xhtml_3000_2_1"; - "xhtml-combinators" = dontDistribute super."xhtml-combinators"; - "xilinx-lava" = dontDistribute super."xilinx-lava"; - "xine" = dontDistribute super."xine"; - "xing-api" = dontDistribute super."xing-api"; - "xinput-conduit" = dontDistribute super."xinput-conduit"; - "xkbcommon" = dontDistribute super."xkbcommon"; - "xkcd" = dontDistribute super."xkcd"; - "xlsx" = doDistribute super."xlsx_0_2_3"; - "xlsx-templater" = dontDistribute super."xlsx-templater"; - "xml-basic" = dontDistribute super."xml-basic"; - "xml-catalog" = dontDistribute super."xml-catalog"; - "xml-conduit-decode" = dontDistribute super."xml-conduit-decode"; - "xml-enumerator" = dontDistribute super."xml-enumerator"; - "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators"; - "xml-extractors" = dontDistribute super."xml-extractors"; - "xml-helpers" = dontDistribute super."xml-helpers"; - "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens"; - "xml-monad" = dontDistribute super."xml-monad"; - "xml-parsec" = dontDistribute super."xml-parsec"; - "xml-picklers" = dontDistribute super."xml-picklers"; - "xml-pipe" = dontDistribute super."xml-pipe"; - "xml-prettify" = dontDistribute super."xml-prettify"; - "xml-push" = dontDistribute super."xml-push"; - "xml-query" = dontDistribute super."xml-query"; - "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit"; - "xml-query-xml-types" = dontDistribute super."xml-query-xml-types"; - "xml2html" = dontDistribute super."xml2html"; - "xml2json" = dontDistribute super."xml2json"; - "xml2x" = dontDistribute super."xml2x"; - "xmlhtml" = doDistribute super."xmlhtml_0_2_3_4"; - "xmltv" = dontDistribute super."xmltv"; - "xmms2-client" = dontDistribute super."xmms2-client"; - "xmms2-client-glib" = dontDistribute super."xmms2-client-glib"; - "xmobar" = dontDistribute super."xmobar"; - "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch"; - "xmonad-contrib" = dontDistribute super."xmonad-contrib"; - "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch"; - "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl"; - "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper"; - "xmonad-eval" = dontDistribute super."xmonad-eval"; - "xmonad-extras" = dontDistribute super."xmonad-extras"; - "xmonad-screenshot" = dontDistribute super."xmonad-screenshot"; - "xmonad-utils" = dontDistribute super."xmonad-utils"; - "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper"; - "xmonad-windownames" = dontDistribute super."xmonad-windownames"; - "xmpipe" = dontDistribute super."xmpipe"; - "xorshift" = dontDistribute super."xorshift"; - "xosd" = dontDistribute super."xosd"; - "xournal-builder" = dontDistribute super."xournal-builder"; - "xournal-convert" = dontDistribute super."xournal-convert"; - "xournal-parser" = dontDistribute super."xournal-parser"; - "xournal-render" = dontDistribute super."xournal-render"; - "xournal-types" = dontDistribute super."xournal-types"; - "xpathdsv" = dontDistribute super."xpathdsv"; - "xsact" = dontDistribute super."xsact"; - "xsd" = dontDistribute super."xsd"; - "xsha1" = dontDistribute super."xsha1"; - "xslt" = dontDistribute super."xslt"; - "xtc" = dontDistribute super."xtc"; - "xtest" = dontDistribute super."xtest"; - "xturtle" = dontDistribute super."xturtle"; - "xxhash" = dontDistribute super."xxhash"; - "y0l0bot" = dontDistribute super."y0l0bot"; - "yabi" = dontDistribute super."yabi"; - "yabi-muno" = dontDistribute super."yabi-muno"; - "yahoo-finance-api" = dontDistribute super."yahoo-finance-api"; - "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit"; - "yahoo-web-search" = dontDistribute super."yahoo-web-search"; - "yajl" = dontDistribute super."yajl"; - "yajl-enumerator" = dontDistribute super."yajl-enumerator"; - "yall" = dontDistribute super."yall"; - "yamemo" = dontDistribute super."yamemo"; - "yaml" = doDistribute super."yaml_0_8_18_1"; - "yaml-config" = dontDistribute super."yaml-config"; - "yaml-light-lens" = dontDistribute super."yaml-light-lens"; - "yaml-rpc" = dontDistribute super."yaml-rpc"; - "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty"; - "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap"; - "yaml-union" = dontDistribute super."yaml-union"; - "yaml2owl" = dontDistribute super."yaml2owl"; - "yamlkeysdiff" = dontDistribute super."yamlkeysdiff"; - "yampa-canvas" = dontDistribute super."yampa-canvas"; - "yampa-glfw" = dontDistribute super."yampa-glfw"; - "yampa-glut" = dontDistribute super."yampa-glut"; - "yampa2048" = dontDistribute super."yampa2048"; - "yandex-translate" = dontDistribute super."yandex-translate"; - "yaop" = dontDistribute super."yaop"; - "yap" = dontDistribute super."yap"; - "yarr" = dontDistribute super."yarr"; - "yarr-image-io" = dontDistribute super."yarr-image-io"; - "yate" = dontDistribute super."yate"; - "yavie" = dontDistribute super."yavie"; - "ycextra" = dontDistribute super."ycextra"; - "yeganesh" = dontDistribute super."yeganesh"; - "yeller" = dontDistribute super."yeller"; - "yeshql" = dontDistribute super."yeshql"; - "yesod-angular" = dontDistribute super."yesod-angular"; - "yesod-angular-ui" = dontDistribute super."yesod-angular-ui"; - "yesod-auth" = doDistribute super."yesod-auth_1_4_13_3"; - "yesod-auth-account" = doDistribute super."yesod-auth-account_1_4_2"; - "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt"; - "yesod-auth-hashdb" = doDistribute super."yesod-auth-hashdb_1_5_1_1"; - "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos"; - "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap"; - "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre"; - "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native"; - "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth"; - "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_10"; - "yesod-auth-pam" = dontDistribute super."yesod-auth-pam"; - "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient"; - "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk"; - "yesod-bin" = doDistribute super."yesod-bin_1_4_18_2"; - "yesod-bootstrap" = dontDistribute super."yesod-bootstrap"; - "yesod-comments" = dontDistribute super."yesod-comments"; - "yesod-content-pdf" = dontDistribute super."yesod-content-pdf"; - "yesod-continuations" = dontDistribute super."yesod-continuations"; - "yesod-core" = doDistribute super."yesod-core_1_4_22"; - "yesod-crud" = dontDistribute super."yesod-crud"; - "yesod-crud-persist" = dontDistribute super."yesod-crud-persist"; - "yesod-csp" = dontDistribute super."yesod-csp"; - "yesod-datatables" = dontDistribute super."yesod-datatables"; - "yesod-dsl" = dontDistribute super."yesod-dsl"; - "yesod-examples" = dontDistribute super."yesod-examples"; - "yesod-form-json" = dontDistribute super."yesod-form-json"; - "yesod-goodies" = dontDistribute super."yesod-goodies"; - "yesod-ip" = dontDistribute super."yesod-ip"; - "yesod-json" = dontDistribute super."yesod-json"; - "yesod-links" = dontDistribute super."yesod-links"; - "yesod-lucid" = dontDistribute super."yesod-lucid"; - "yesod-mangopay" = dontDistribute super."yesod-mangopay"; - "yesod-markdown" = dontDistribute super."yesod-markdown"; - "yesod-media-simple" = dontDistribute super."yesod-media-simple"; - "yesod-paginate" = dontDistribute super."yesod-paginate"; - "yesod-pagination" = dontDistribute super."yesod-pagination"; - "yesod-paginator" = dontDistribute super."yesod-paginator"; - "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_5"; - "yesod-platform" = dontDistribute super."yesod-platform"; - "yesod-pnotify" = dontDistribute super."yesod-pnotify"; - "yesod-pure" = dontDistribute super."yesod-pure"; - "yesod-purescript" = dontDistribute super."yesod-purescript"; - "yesod-raml" = dontDistribute super."yesod-raml"; - "yesod-raml-bin" = dontDistribute super."yesod-raml-bin"; - "yesod-raml-docs" = dontDistribute super."yesod-raml-docs"; - "yesod-raml-mock" = dontDistribute super."yesod-raml-mock"; - "yesod-recaptcha" = dontDistribute super."yesod-recaptcha"; - "yesod-routes" = dontDistribute super."yesod-routes"; - "yesod-routes-flow" = dontDistribute super."yesod-routes-flow"; - "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript"; - "yesod-rst" = dontDistribute super."yesod-rst"; - "yesod-s3" = dontDistribute super."yesod-s3"; - "yesod-sass" = dontDistribute super."yesod-sass"; - "yesod-session-redis" = dontDistribute super."yesod-session-redis"; - "yesod-static" = doDistribute super."yesod-static_1_5_0_3"; - "yesod-tableview" = dontDistribute super."yesod-tableview"; - "yesod-test" = doDistribute super."yesod-test_1_5_1_1"; - "yesod-test-json" = dontDistribute super."yesod-test-json"; - "yesod-tls" = dontDistribute super."yesod-tls"; - "yesod-transloadit" = dontDistribute super."yesod-transloadit"; - "yesod-vend" = dontDistribute super."yesod-vend"; - "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra"; - "yesod-worker" = dontDistribute super."yesod-worker"; - "yet-another-logger" = dontDistribute super."yet-another-logger"; - "yhccore" = dontDistribute super."yhccore"; - "yi-contrib" = dontDistribute super."yi-contrib"; - "yi-emacs-colours" = dontDistribute super."yi-emacs-colours"; - "yi-gtk" = dontDistribute super."yi-gtk"; - "yi-monokai" = dontDistribute super."yi-monokai"; - "yi-rope" = doDistribute super."yi-rope_0_7_0_1"; - "yi-snippet" = dontDistribute super."yi-snippet"; - "yi-solarized" = dontDistribute super."yi-solarized"; - "yi-spolsky" = dontDistribute super."yi-spolsky"; - "yi-vty" = dontDistribute super."yi-vty"; - "yices" = dontDistribute super."yices"; - "yices-easy" = dontDistribute super."yices-easy"; - "yices-painless" = dontDistribute super."yices-painless"; - "yjftp" = dontDistribute super."yjftp"; - "yjftp-libs" = dontDistribute super."yjftp-libs"; - "yjsvg" = dontDistribute super."yjsvg"; - "yocto" = dontDistribute super."yocto"; - "yoctoparsec" = dontDistribute super."yoctoparsec"; - "yoko" = dontDistribute super."yoko"; - "york-lava" = dontDistribute super."york-lava"; - "youtube" = dontDistribute super."youtube"; - "yql" = dontDistribute super."yql"; - "yst" = dontDistribute super."yst"; - "yuiGrid" = dontDistribute super."yuiGrid"; - "yuuko" = dontDistribute super."yuuko"; - "yxdb-utils" = dontDistribute super."yxdb-utils"; - "z3" = dontDistribute super."z3"; - "z3-encoding" = dontDistribute super."z3-encoding"; - "zabt" = dontDistribute super."zabt"; - "zalgo" = dontDistribute super."zalgo"; - "zampolit" = dontDistribute super."zampolit"; - "zasni-gerna" = dontDistribute super."zasni-gerna"; - "zcache" = dontDistribute super."zcache"; - "zenc" = dontDistribute super."zenc"; - "zendesk-api" = dontDistribute super."zendesk-api"; - "zeno" = dontDistribute super."zeno"; - "zerobin" = dontDistribute super."zerobin"; - "zeromq-haskell" = dontDistribute super."zeromq-haskell"; - "zeromq3-conduit" = dontDistribute super."zeromq3-conduit"; - "zeromq3-haskell" = dontDistribute super."zeromq3-haskell"; - "zeroth" = dontDistribute super."zeroth"; - "zigbee-znet25" = dontDistribute super."zigbee-znet25"; - "zip-archive" = doDistribute super."zip-archive_0_2_3_7"; - "zip-conduit" = dontDistribute super."zip-conduit"; - "zipedit" = dontDistribute super."zipedit"; - "zipkin" = dontDistribute super."zipkin"; - "zipper" = dontDistribute super."zipper"; - "zippo" = dontDistribute super."zippo"; - "zlib-conduit" = dontDistribute super."zlib-conduit"; - "zmcat" = dontDistribute super."zmcat"; - "zmidi-core" = dontDistribute super."zmidi-core"; - "zmidi-score" = dontDistribute super."zmidi-score"; - "zmqat" = dontDistribute super."zmqat"; - "zoneinfo" = dontDistribute super."zoneinfo"; - "zoom" = dontDistribute super."zoom"; - "zoom-cache" = dontDistribute super."zoom-cache"; - "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm"; - "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile"; - "zoom-refs" = dontDistribute super."zoom-refs"; - "zsh-battery" = dontDistribute super."zsh-battery"; - "ztail" = dontDistribute super."ztail"; - "zxcvbn-c" = dontDistribute super."zxcvbn-c"; - -} diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix index baec1bfb818..9020f1ee467 100644 --- a/pkgs/development/haskell-modules/default.nix +++ b/pkgs/development/haskell-modules/default.nix @@ -6,12 +6,13 @@ let - allCabalFiles = pkgs.fetchFromGitHub { - owner = "commercialhaskell"; - repo = "all-cabal-hashes"; - rev = "72f1318540eff69544eb8c14a16f630d0c5448b8"; - sha256 = "1czi1rajk2726mqrw3qp7a43h26acbjw54ll3ns063yzg9hg469m"; - }; + allCabalFiles = stdenv.mkDerivation { + name = "all-cabal-hashes-0"; + buildCommand = '' + mkdir -p $out + tar -C $out --strip-components=1 -x -f ${builtins.fetchurl "https://github.com/commercialhaskell/all-cabal-hashes/archive/hackage.tar.gz"} + ''; + }; inherit (stdenv.lib) fix' extends; @@ -49,7 +50,7 @@ let overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; }; - mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome // scope; + mkScope = scope: pkgs // pkgs.xorg // pkgs.gnome2 // scope; defaultScope = mkScope self; callPackage = drv: args: callPackageWithScope defaultScope drv args; @@ -87,7 +88,7 @@ let packages = selectFrom self; hoogle = callPackage ./hoogle.nix { inherit packages; - hoogle = self.hoogle_4_2_43; + hoogle = self.hoogle_5_0_4; }; in withPackages (packages ++ [ hoogle ]); diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 5eb4e1fac83..2b597532b44 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -47,6 +47,7 @@ , shellHook ? "" , coreSetup ? false # Use only core packages to build Setup.hs. , useCpphs ? false +, hardeningDisable ? [] } @ args: assert editedCabalFile != null -> revision != null; @@ -329,5 +330,6 @@ stdenv.mkDerivation ({ // optionalAttrs (preFixup != "") { inherit preFixup; } // optionalAttrs (postFixup != "") { inherit postFixup; } // optionalAttrs (dontStrip) { inherit dontStrip; } +// optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; } // optionalAttrs (stdenv.isLinux) { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; } ) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index e9ec33c96e0..d18f4ca5125 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -27,7 +27,6 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring linear packer ]; - jailbreak = true; homepage = "https://github.com/capsjac/3dmodels"; description = "3D model parsers"; license = stdenv.lib.licenses.lgpl3; @@ -45,7 +44,6 @@ self: { executableHaskellDepends = [ base cairo containers gtk haskell98 mtl ]; - jailbreak = true; homepage = "http://lambdacolyte.wordpress.com/2009/08/06/tetris-in-haskell/"; description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)"; license = stdenv.lib.licenses.bsd3; @@ -59,9 +57,9 @@ self: { version = "0.2.0.1"; sha256 = "d0f14c6e9040c1947c63bf82b5e3f68389e7ebf4d12177575285aecb3404b86d"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Abstract Application Interface"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ABList" = callPackage @@ -203,7 +201,6 @@ self: { version = "1.1.2"; sha256 = "7b4430ab596a5aae4245df83de7682966d8bb1a0e9b931819f398a57188f9310"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; description = "Immutable arrays with plain integer indicies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -287,7 +284,6 @@ self: { test-framework-quickcheck2 ]; executableHaskellDepends = [ base containers directory ]; - jailbreak = true; homepage = "http://code.google.com/p/aern/"; description = "foundational type classes for approximating exact real numbers"; license = stdenv.lib.licenses.bsd3; @@ -305,7 +301,6 @@ self: { libraryHaskellDepends = [ AERN-Real AERN-RnToRm base binary containers html stm time ]; - jailbreak = true; homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN"; description = "Compositional lazy dataflow networks for exact real number computation"; license = stdenv.lib.licenses.bsd3; @@ -324,7 +319,6 @@ self: { AERN-Basics base criterion QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://code.google.com/p/aern/"; description = "arbitrary precision real interval arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -350,7 +344,6 @@ self: { AERN-Basics AERN-Real AERN-Real-Interval base criterion ieee-utils QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://code.google.com/p/aern/"; description = "arbitrary precision real interval arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -369,7 +362,6 @@ self: { AERN-Basics AERN-Real base deepseq QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://code.google.com/p/aern/"; description = "arbitrary precision real interval arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -388,7 +380,6 @@ self: { AERN-Real base binary containers directory filepath html QuickCheck time ]; - jailbreak = true; homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN"; description = "polynomial function enclosures (PFEs) approximating exact real functions"; license = stdenv.lib.licenses.bsd3; @@ -408,7 +399,6 @@ self: { AERN-Real AERN-RnToRm base binary containers directory filepath glade glib gtk gtkglext mtl OpenGL stm time ]; - jailbreak = true; homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN"; description = "GL plotting of polynomial function enclosures (PFEs)"; license = stdenv.lib.licenses.bsd3; @@ -550,6 +540,7 @@ self: { homepage = "http://github.com/gcross/AbortT-transformers"; description = "Monads-tf instances for the AbortT monad transformer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AbortT-mtl" = callPackage @@ -562,6 +553,7 @@ self: { homepage = "http://github.com/gcross/AbortT-mtl"; description = "mtl instances for the AbortT monad transformer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AbortT-transformers" = callPackage @@ -577,10 +569,10 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; - jailbreak = true; homepage = "http://github.com/gcross/AbortT-transformers"; description = "A monad and monadic transformer providing \"abort\" functionality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ActionKid" = callPackage @@ -602,7 +594,6 @@ self: { template-haskell ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; homepage = "https://github.com/egonSchiele/actionkid"; description = "An easy-to-use video game framework for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -620,7 +611,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Library for incremental computing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -649,7 +639,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 mtl ]; - jailbreak = true; description = "Lisperati's adventure game in Lisp translated to Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -667,7 +656,6 @@ self: { aeson attoparsec base bson unordered-containers vector ]; testHaskellDepends = [ aeson base bson hspec HUnit text ]; - jailbreak = true; homepage = "https://github.com/nh2/AesonBson"; description = "Mapping between Aeson's JSON and Bson objects"; license = "unknown"; @@ -685,60 +673,11 @@ self: { libraryHaskellDepends = [ base containers mtl QuickCheck tagged template-haskell ]; - jailbreak = true; description = "Generator-generator for QuickCheck"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Agda_2_5_1" = callPackage - ({ mkDerivation, alex, array, base, binary, boxes, bytestring - , containers, cpphs, data-hash, deepseq, directory, EdisonAPI - , EdisonCore, edit-distance, emacs, equivalence, filemanip - , filepath, geniplate-mirror, happy, hashable, hashtables - , haskeline, haskell-src-exts, monadplus, mtl, parallel, pretty - , process, QuickCheck, strict, template-haskell, text, time - , transformers, transformers-compat, unordered-containers, xhtml - , zlib - }: - mkDerivation { - pname = "Agda"; - version = "2.5.1"; - sha256 = "ee4658eafb514460d598322fa98528d1af6e25e5aa51843bb473c0d8a325c0c8"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary boxes bytestring containers data-hash deepseq - directory EdisonAPI EdisonCore edit-distance equivalence filepath - geniplate-mirror hashable hashtables haskeline haskell-src-exts - monadplus mtl parallel pretty process QuickCheck strict - template-haskell text time transformers transformers-compat - unordered-containers xhtml zlib - ]; - libraryToolDepends = [ alex cpphs happy ]; - executableHaskellDepends = [ - base binary containers directory filemanip filepath - haskell-src-exts mtl process - ]; - executableToolDepends = [ emacs ]; - jailbreak = true; - postInstall = '' - files=("$out/share/"*"-ghc-"*"/Agda-"*"/lib/prim/Agda/"{Primitive.agda,Builtin"/"*.agda}) - for f in "''${files[@]}" ; do - $out/bin/agda $f - done - for f in "''${files[@]}" ; do - $out/bin/agda -c --no-main $f - done - $out/bin/agda-mode compile - ''; - homepage = "http://wiki.portal.chalmers.se/agda/"; - description = "A dependently typed functional programming language and proof assistant"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ abbradar ]; - }) {inherit (pkgs) emacs;}; - "Agda" = callPackage ({ mkDerivation, alex, array, base, binary, boxes, bytestring , containers, cpphs, data-hash, deepseq, directory, EdisonAPI @@ -796,10 +735,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ Agda base ]; - jailbreak = true; homepage = "http://wiki.portal.chalmers.se/agda/"; description = "Command-line program for type-checking and compiling Agda programs"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AhoCorasick" = callPackage @@ -833,10 +772,10 @@ self: { base containers hspec hspec-core MonadRandom QuickCheck random transformers ]; - jailbreak = true; homepage = "http://github.com/enolan/AlanDeniseEricLauren"; description = "Find the minimal subset/submap satisfying some property"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AlgorithmW" = callPackage @@ -848,10 +787,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl pretty ]; - jailbreak = true; homepage = "https://github.com/mgrabmueller/AlgorithmW"; description = "Example implementation of Algorithm W for Hindley-Milner type inference"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "AlignmentAlgorithms" = callPackage @@ -866,7 +805,6 @@ self: { ADPfusion base containers fmlist FormalGrammars GrammarProducts PrimitiveArray vector ]; - jailbreak = true; homepage = "https://github.com/choener/AlignmentAlgorithms"; description = "Collection of alignment algorithms"; license = stdenv.lib.licenses.gpl3; @@ -912,7 +850,6 @@ self: { base bytestring cmdtheline containers mtl network opml pretty process QuickCheck split transformers xml ]; - jailbreak = true; description = "Android view hierarchy importer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -998,10 +935,10 @@ self: { version = "0.1.0.0"; sha256 = "fe621b16f2e3b81c689e43b30173fe70534747c3bfc9e514da6f151991afeae8"; libraryHaskellDepends = [ base vector ]; - jailbreak = true; homepage = "https://github.com/idontgetoutmuch/ApproxFun.hs"; description = "Function approximation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ArrayRef" = callPackage @@ -1024,7 +961,6 @@ self: { version = "1.1"; sha256 = "0b262766252398758e1a63a8ac7fb535387cd7894f294a9f5a4a0786493567d3"; libraryHaskellDepends = [ base process ]; - jailbreak = true; homepage = "https://github.com/frosch03/arrowVHDL"; description = "A library to generate Netlist code from Arrow descriptions"; license = stdenv.lib.licenses.publicDomain; @@ -1042,7 +978,6 @@ self: { libraryHaskellDepends = [ base containers HList mtl template-haskell ]; - jailbreak = true; homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG"; description = "Attribute Grammars in the form of an EDSL"; license = "LGPL"; @@ -1065,7 +1000,6 @@ self: { base bytestring containers QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://bitbucket.org/FlorianHartwig/attobencode"; description = "Fast Bencode encoding and parsing library"; license = stdenv.lib.licenses.bsd3; @@ -1101,7 +1035,6 @@ self: { executableHaskellDepends = [ array base colour GLUT OpenGL random ]; - jailbreak = true; homepage = "http://patch-tag.com/r/rhz/StrangeAttractors"; description = "Visualisation of Strange Attractors in 3-Dimensions"; license = stdenv.lib.licenses.bsd3; @@ -1227,7 +1160,6 @@ self: { alex-meta array base happy-meta haskell-src-meta syb template-haskell ]; - jailbreak = true; description = "Deriving Parsers and Quasi-Quoters from BNF Grammars"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -1242,7 +1174,6 @@ self: { revision = "1"; editedCabalFile = "654cbc7a4109bf3baaa2491f10a7f49d1831008129d4d5ef9e0e558a5a374098"; libraryHaskellDepends = [ base cairo containers mtl ]; - jailbreak = true; homepage = "http://pageperso.lif.univ-mrs.fr/~pierre-etienne.meunier/Baggins"; description = "Tools for self-assembly"; license = stdenv.lib.licenses.gpl3; @@ -1260,10 +1191,10 @@ self: { libraryHaskellDepends = [ base bifunctors hmidi mtl stm time transformers ]; - jailbreak = true; homepage = "https://github.com/5outh/Bang/"; description = "A Drum Machine DSL for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Barracuda" = callPackage @@ -1305,7 +1236,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base mtl random ]; - jailbreak = true; homepage = "http://coder.bsimmons.name/blog/2010/05/befunge-93-interpreter-on-hackage"; description = "An interpreter for the Befunge-93 Programming Language"; license = stdenv.lib.licenses.bsd3; @@ -1323,10 +1253,10 @@ self: { libraryHaskellDepends = [ base bytestring cassava deepseq directory statistics time vector ]; - jailbreak = true; homepage = "https://github.com/choener/BenchmarkHistory"; description = "Benchmark functions with history"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BerkeleyDB" = callPackage @@ -1366,9 +1296,9 @@ self: { version = "0.1.0.0"; sha256 = "d9d799d9a3b8bff9a953b36aa3868323e74b8708a2de29037dd7a196b2bb9293"; libraryHaskellDepends = [ base besout ]; - jailbreak = true; description = "Factorization of polynomials over finite field"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiGUL" = callPackage @@ -1428,7 +1358,6 @@ self: { ParsecTools primitive PrimitiveArray split tuple utility-ht vector vector-read-instances zlib ]; - jailbreak = true; homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "Base library for bioinformatics"; license = stdenv.lib.licenses.gpl3; @@ -1472,7 +1401,6 @@ self: { libraryHaskellDepends = [ base BiobaseXNA bytestring containers filemanip iteratee tuple ]; - jailbreak = true; homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "Importer for FR3D resources"; license = stdenv.lib.licenses.gpl3; @@ -1493,7 +1421,6 @@ self: { base biocore bytestring conduit containers transformers ]; executableHaskellDepends = [ cmdargs ]; - jailbreak = true; homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "conduit-based FASTA parser"; license = stdenv.lib.licenses.gpl3; @@ -1515,7 +1442,6 @@ self: { bytestring-lexing conduit containers either-unwrap lens primitive PrimitiveArray repa transformers tuple vector ]; - jailbreak = true; homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "Infernal data structures and tools"; license = stdenv.lib.licenses.gpl3; @@ -1553,10 +1479,10 @@ self: { aeson base binary cereal QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/choener/BiobaseNewick"; description = "Newick file format parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseTrainingData" = callPackage @@ -1574,7 +1500,6 @@ self: { iteratee vector ]; executableHaskellDepends = [ cmdargs ]; - jailbreak = true; homepage = "http://www.tbi.univie.ac.at/~choener/"; description = "RNA folding training data"; license = stdenv.lib.licenses.gpl3; @@ -1620,10 +1545,10 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th ]; - jailbreak = true; homepage = "https://github.com/choener/BiobaseTypes"; description = "Collection of types for bioinformatics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BiobaseVienna" = callPackage @@ -1662,10 +1587,10 @@ self: { vector-th-unbox ]; executableHaskellDepends = [ base cmdargs ]; - jailbreak = true; homepage = "https://github.com/choener/BiobaseXNA"; description = "Efficient RNA/DNA representations"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BirdPP" = callPackage @@ -1677,7 +1602,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 ]; - jailbreak = true; description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -1774,6 +1698,7 @@ self: { homepage = "http://byorgey.wordpress.com/blogliterately/"; description = "A tool for posting Haskelly articles to blogs"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BlogLiterately-diagrams" = callPackage @@ -1792,9 +1717,9 @@ self: { diagrams-rasterific directory filepath JuicyPixels pandoc safe ]; executableHaskellDepends = [ base BlogLiterately ]; - jailbreak = true; description = "Include images in blog posts with inline diagrams code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "BluePrintCSS" = callPackage @@ -1876,7 +1801,6 @@ self: { base haskell-src-exts haskell-src-meta mtl parsec syb template-haskell ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Bravo"; description = "Static text template generation library"; license = stdenv.lib.licenses.bsd3; @@ -1914,7 +1838,6 @@ self: { base bytestring errors hslogger hspec hspec-expectations http-conduit http-types string-qq temporary unix yaml ]; - jailbreak = true; homepage = "http://github.com/michaelxavier/Buster"; description = "Hits a set of urls periodically to bust caches"; license = stdenv.lib.licenses.mit; @@ -2080,9 +2003,9 @@ self: { sha256 = "942a45623c5b904d63aeeb2ab13e37a33da67b508af1cea9c7cd76f38f0d47bc"; libraryHaskellDepends = [ base directory split time ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; description = "CLI tools"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CMCompare" = callPackage @@ -2099,7 +2022,6 @@ self: { array base BiobaseInfernal BiobaseXNA containers lens ]; executableHaskellDepends = [ cmdargs ]; - jailbreak = true; homepage = "http://www.tbi.univie.ac.at/software/cmcompare/"; description = "Infernal covariance model comparison"; license = stdenv.lib.licenses.gpl3; @@ -2187,9 +2109,9 @@ self: { base containers CSPM-CoreLanguage mtl parallel-tree-search QuickCheck random tree-monad ]; - jailbreak = true; description = "Firing rules semantic of CSPM"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CSPM-Frontend" = callPackage @@ -2205,7 +2127,6 @@ self: { syb transformers ]; libraryToolDepends = [ alex ]; - jailbreak = true; description = "A CSP-M parser compatible with FDR-2.91"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2223,7 +2144,6 @@ self: { array base containers CSPM-CoreLanguage CSPM-Frontend mtl prettyclass syb ]; - jailbreak = true; description = "An interpreter for CSPM"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2240,7 +2160,6 @@ self: { libraryHaskellDepends = [ array base containers CSPM-Frontend ghc-prim pretty ]; - jailbreak = true; description = "some modules specific for the ProB tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2267,7 +2186,6 @@ self: { CSPM-Frontend CSPM-Interpreter CSPM-ToProlog hslua parallel pretty prettyclass syb transformers xml ]; - jailbreak = true; description = "cspm command line tool for analyzing CSPM specifications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2313,7 +2231,6 @@ self: { opencv_ml opencv_objdetect opencv_video ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; homepage = "http://aleator.github.com/CV/"; description = "OpenCV based machine vision library"; license = "GPL"; @@ -2343,7 +2260,6 @@ self: { process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; - jailbreak = true; doCheck = false; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; @@ -2370,35 +2286,6 @@ self: { process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.haskell.org/cabal/"; - description = "A framework for packaging Haskell software"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "Cabal_1_22_8_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , deepseq, directory, extensible-exceptions, filepath, HUnit - , old-time, pretty, process, QuickCheck, regex-posix - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , time, unix - }: - mkDerivation { - pname = "Cabal"; - version = "1.22.8.0"; - sha256 = "2a42a2ddecb6450f87ed3a2b37af81dcc573dfde8f0db16f695c78674a80a34e"; - libraryHaskellDepends = [ - array base binary bytestring containers deepseq directory filepath - pretty process time unix - ]; - testHaskellDepends = [ - base bytestring containers directory extensible-exceptions filepath - HUnit old-time process QuickCheck regex-posix test-framework - test-framework-hunit test-framework-quickcheck2 unix - ]; - jailbreak = true; doCheck = false; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; @@ -2452,9 +2339,6 @@ self: { filepath HUnit old-time process QuickCheck regex-posix test-framework test-framework-hunit test-framework-quickcheck2 unix ]; - doHaddock = false; - jailbreak = true; - doCheck = false; homepage = "http://www.haskell.org/cabal/"; description = "A framework for packaging Haskell software"; license = stdenv.lib.licenses.bsd3; @@ -2474,10 +2358,10 @@ self: { executableHaskellDepends = [ base bytestring directory filepath HDBC HDBC-sqlite3 process unix ]; - jailbreak = true; homepage = "http://github.com/brinchj/cabalsearch"; description = "Search cabal packages by name"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Capabilities" = callPackage @@ -2487,7 +2371,6 @@ self: { version = "0.1.0.0"; sha256 = "0434c5659c3f893942159bde4bd760089e81a3942f799010d04bd5bee0f6a559"; libraryHaskellDepends = [ base compdata directory free unix ]; - jailbreak = true; homepage = "https://github.com/Icelandjack/Capabilities"; description = "Separate and contain effects of IO monad"; license = stdenv.lib.licenses.bsd3; @@ -2535,15 +2418,15 @@ self: { }) {}; "Cartesian" = callPackage - ({ mkDerivation, base, lens, template-haskell }: + ({ mkDerivation, base, lens, linear, template-haskell }: mkDerivation { pname = "Cartesian"; - version = "0.2.1.0"; - sha256 = "b9a611298eab7e2da27a300124d4522c7dae77dd1c19ad73f4b5c781dab718d6"; - libraryHaskellDepends = [ base lens template-haskell ]; - jailbreak = true; + version = "0.6.0.0"; + sha256 = "74f6d388bf6cc91f1bde2677fe53b9e429d1cad3f84e9514854828bb40524dbc"; + libraryHaskellDepends = [ base lens linear template-haskell ]; description = "Coordinate systems"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Cascade" = callPackage @@ -2553,7 +2436,6 @@ self: { version = "0.1.0.0"; sha256 = "cf42ad930c046204753dc670a6f37da894c254d3bb17d6e29bacab2458f308c6"; libraryHaskellDepends = [ base comonad ghc-prim mtl void ]; - jailbreak = true; homepage = "http://github.com/rampion/Cascade"; description = "Playing with reified categorical composition"; license = stdenv.lib.licenses.publicDomain; @@ -2584,25 +2466,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart_1_6" = callPackage - ({ mkDerivation, array, base, colour, data-default-class, lens, mtl - , old-locale, operational, time, vector - }: - mkDerivation { - pname = "Chart"; - version = "1.6"; - sha256 = "0f73779ab322346cac7c131f58dbda9bcaf1f43693a9e102510be80a07569ea5"; - libraryHaskellDepends = [ - array base colour data-default-class lens mtl old-locale - operational time vector - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "A library for generating 2D Charts and Plots"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart" = callPackage ({ mkDerivation, array, base, colour, data-default-class, lens, mtl , old-locale, operational, time, vector @@ -2620,25 +2483,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart-cairo_1_6" = callPackage - ({ mkDerivation, array, base, cairo, Chart, colour - , data-default-class, lens, mtl, old-locale, operational, time - }: - mkDerivation { - pname = "Chart-cairo"; - version = "1.6"; - sha256 = "e209b6b4d7d7f392593cbd3e8a8cde1d5af83066fee994195e4b25bda680ca0f"; - libraryHaskellDepends = [ - array base cairo Chart colour data-default-class lens mtl - old-locale operational time - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Cairo backend for Charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart-cairo" = callPackage ({ mkDerivation, array, base, cairo, Chart, colour , data-default-class, lens, mtl, old-locale, operational, time @@ -2656,29 +2500,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Chart-diagrams_1_6" = callPackage - ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour - , containers, data-default-class, diagrams-core, diagrams-lib - , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl - , old-locale, operational, SVGFonts, text, time - }: - mkDerivation { - pname = "Chart-diagrams"; - version = "1.6"; - sha256 = "c4c5a60bc623bb3221da113c84c0400b4dd75c481e64f5a9b6788b923ff998eb"; - libraryHaskellDepends = [ - base blaze-markup bytestring Chart colour containers - data-default-class diagrams-core diagrams-lib diagrams-postscript - diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts - text time - ]; - jailbreak = true; - homepage = "https://github.com/timbod7/haskell-chart/wiki"; - description = "Diagrams backend for Charts"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Chart-diagrams" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour , containers, data-default-class, diagrams-core, diagrams-lib @@ -2729,28 +2550,9 @@ self: { array base cairo Chart Chart-cairo Chart-gtk colour data-default-class gtk mtl old-locale time ]; - jailbreak = true; homepage = "https://github.com/timbod7/haskell-chart/wiki"; description = "A wrapper for the chart library to assist with basic plots (Deprecated - use the Easy module instead)"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "ChasingBottoms_1_3_1" = callPackage - ({ mkDerivation, array, base, containers, mtl, QuickCheck, random - , syb - }: - mkDerivation { - pname = "ChasingBottoms"; - version = "1.3.1"; - sha256 = "116cf6aad779499fb02fd1f44e0d42236b69401723bb29ed6138ff6b59eee888"; - libraryHaskellDepends = [ - base containers mtl QuickCheck random syb - ]; - testHaskellDepends = [ - array base containers mtl QuickCheck random syb - ]; - description = "For testing partial and infinite values"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -2760,8 +2562,8 @@ self: { }: mkDerivation { pname = "ChasingBottoms"; - version = "1.3.1.1"; - sha256 = "1d8cdde87ec1fb29dfc77d3234bf9f604c1849c1562e99de9a94c96a441f1925"; + version = "1.3.1.2"; + sha256 = "796e278b60c4a24eb6772155ea0edff9e20f96d396cfcd6c5a55d10a3bd2b8d6"; libraryHaskellDepends = [ base containers mtl QuickCheck random syb ]; @@ -2793,9 +2595,9 @@ self: { version = "0.0.0.2"; sha256 = "440b4e5ad21da2100d3b2ee7a18639a74cf1fb141698688b32990e08f31023d7"; libraryHaskellDepends = [ base text ]; - jailbreak = true; description = "Inbuilt checking for ultra reliable computing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Chitra" = callPackage @@ -2824,7 +2626,6 @@ self: { libraryHaskellDepends = [ base containers fgl template-haskell TTTAS uulib ]; - jailbreak = true; homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS"; description = "Alternative approach of 'read' that composes grammars instead of parsers"; license = "LGPL"; @@ -2850,7 +2651,6 @@ self: { version = "0.3.1.0"; sha256 = "f3714acd50d8e99f1e112c84a82166855b1a4fbe0fbc6ffb69fd428286dde788"; libraryHaskellDepends = [ base ChasingBottoms mtl QuickCheck ]; - jailbreak = true; homepage = "http://wiki.portal.chalmers.se/cse/pmwiki.php/FP/ClassLaws"; description = "Stating and checking laws for type class methods"; license = stdenv.lib.licenses.bsd3; @@ -2876,7 +2676,6 @@ self: { version = "0.6"; sha256 = "ae006102e1a503c23a6663d647d09a272b948529dd66c8ba658b0bc84688294f"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "A light, clean and powerful utility library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -2924,7 +2723,6 @@ self: { array base bytestring bytestring-csv containers directory fgl filepath mtl old-time pretty pureMD5 safe utf8-string ]; - jailbreak = true; homepage = "http://iki.fi/matti.niemenmaa/coadjute/"; description = "A generic build tool"; license = stdenv.lib.licenses.bsd3; @@ -3011,7 +2809,6 @@ self: { base data-default fsnotify optparse-applicative process system-fileio system-filepath text ]; - jailbreak = true; homepage = "https://github.com/sordina/Commando"; description = "Watch some files; Rerun a command"; license = stdenv.lib.licenses.mit; @@ -3031,10 +2828,10 @@ self: { applicative-numbers base comonad containers distributive IndexedList NestedFunctor PeanoWitnesses Stream Tape transformers ]; - jailbreak = true; homepage = "https://github.com/kwf/ComonadSheet"; description = "A library for expressing spreadsheet-like computations as the fixed-points of comonads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Concurrent-Cache" = callPackage @@ -3076,10 +2873,10 @@ self: { version = "0.5.0.1"; sha256 = "addb2abcf81ad9619d42e2f25e5866f7e998f29527409e40c7954078cc9fd676"; libraryHaskellDepends = [ async base ]; - jailbreak = true; homepage = "http://github.com/avieth/Concurrential"; description = "Mix concurrent and sequential computation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Condor" = callPackage @@ -3099,7 +2896,6 @@ self: { testHaskellDepends = [ base binary Cabal containers glider-nlp HUnit text ]; - jailbreak = true; homepage = "https://github.com/klangner/Condor"; description = "Information retrieval library"; license = stdenv.lib.licenses.bsd3; @@ -3151,10 +2947,10 @@ self: { version = "0.1.0.0"; sha256 = "4b277ee5ddb5a9d0c6b0a8323d5b802b363a85ebcf04b88394ff58679c83c0c5"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/tel/Configurable"; description = "Declare types as Configurable then specialize them all in one place"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ConsStream" = callPackage @@ -3178,10 +2974,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process ]; - jailbreak = true; homepage = "https://github.com/sordina/Conscript"; description = "Restart a command on STDIN activity"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ConstraintKinds" = callPackage @@ -3191,7 +2987,6 @@ self: { version = "1.3.0"; sha256 = "eab751ffb0274e79830003bf1ce453e29c493c7e9a5d64a5cf0d963d302f1e66"; libraryHaskellDepends = [ base dlist ghc-prim vector ]; - jailbreak = true; description = "Repackages standard type classes with the ConstraintKinds extension"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -3217,9 +3012,9 @@ self: { version = "0.0.5"; sha256 = "2b481952047a77ce6a30a6154b5fb74e2c4714f38be910562fd1a0293a4752dd"; libraryHaskellDepends = [ arrows base ]; - jailbreak = true; description = "Control.Arrow.Transformer.Cont"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ContextAlgebra" = callPackage @@ -3235,7 +3030,6 @@ self: { executableHaskellDepends = [ base containers criterion multiset QuickCheck statistics vector ]; - jailbreak = true; homepage = "https://github.com/juergenhah/ContextAlgebra"; description = "Implementation of the context algebra"; license = stdenv.lib.licenses.bsd3; @@ -3315,7 +3109,6 @@ self: { version = "0.1.2.0"; sha256 = "240a9a03ba1643cd48a3eaab22825d0ab88931c9da0022d165fab30e23e4e0e4"; libraryHaskellDepends = [ base ghc pretty pretty-show ]; - jailbreak = true; description = "A GHC plugin for printing GHC's internal Core data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -3328,10 +3121,10 @@ self: { version = "0.0.3"; sha256 = "cc0eb5184c11d7bda4352a80ceadbe1761d94b85cef692535d43397bb9082084"; libraryHaskellDepends = [ base parsec pretty ]; - jailbreak = true; homepage = "http://github.com/amtal/CoreErlang"; description = "Manipulating Core Erlang source code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "CoreFoundation" = callPackage @@ -3348,7 +3141,6 @@ self: { tagged text time transformers vector ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; homepage = "https://github.com/reinerp/CoreFoundation"; description = "Bindings to Mac OSX's CoreFoundation framework"; license = stdenv.lib.licenses.bsd3; @@ -3401,7 +3193,6 @@ self: { base HUnit mtl old-locale QuickCheck time ]; doHaddock = false; - jailbreak = true; homepage = "http://www.haskellcraft.com/"; description = "Code for Haskell: the Craft of Functional Programming, 3rd ed"; license = stdenv.lib.licenses.mit; @@ -3475,39 +3266,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "DAV_1_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , data-default, exceptions, http-client, http-client-tls - , http-types, lens, mtl, mtl-compat, network, network-uri - , optparse-applicative, transformers, transformers-base - , transformers-compat, utf8-string, xml-conduit, xml-hamlet - }: - mkDerivation { - pname = "DAV"; - version = "1.2"; - sha256 = "1a07c8ef17cd4207c6f889e7eb5c45d9f025374f2cdacc1e34e6d71fe103b746"; - revision = "1"; - editedCabalFile = "6c084095b369b6a2cb797a19a9accf5488f729f19bb6c0240e0f6faf1ac266bb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - http-client http-client-tls http-types lens mtl mtl-compat - transformers transformers-base transformers-compat utf8-string - xml-conduit xml-hamlet - ]; - executableHaskellDepends = [ - base bytestring case-insensitive containers data-default exceptions - http-client http-client-tls http-types lens mtl mtl-compat network - network-uri optparse-applicative transformers transformers-base - transformers-compat utf8-string xml-conduit xml-hamlet - ]; - homepage = "http://floss.scru.org/hDAV"; - description = "RFC 4918 WebDAV support"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "DAV" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , data-default, exceptions, haskeline, http-client, http-client-tls @@ -3547,10 +3305,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers parsec ]; - jailbreak = true; homepage = "http://projects.haskell.org/DBlimited/"; description = "A command-line SQL interface for flat files (tdf,csv,etc.)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DBus" = callPackage @@ -3587,10 +3345,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base MuCheck ]; - jailbreak = true; homepage = "https://bitbucket.com/osu-testing/d-mucheck"; description = "Distributed Mutation Analysis framework for MuCheck"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DOM" = callPackage @@ -3600,7 +3358,6 @@ self: { version = "2.0.1"; sha256 = "4bf0d678279b7e0012aea7d9bf9766a219de7f1c488ee85e01ba78749e24f28f"; libraryHaskellDepends = [ base mtl WebBits ]; - jailbreak = true; description = "DOM Level 2 bindings for the WebBits package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -3617,7 +3374,6 @@ self: { libraryHaskellDepends = [ array base containers list-tries mtl QuickCheck safe semiring ]; - jailbreak = true; homepage = "http://github.com/srush/SemiRings/tree/master"; description = "Pragmatic framework for dynamic programming"; license = stdenv.lib.licenses.bsd3; @@ -3643,7 +3399,6 @@ self: { ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "Darcs Patch Manager"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -3688,7 +3443,6 @@ self: { crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel prettyclass QuickCheck tagged test-framework test-framework-hunit ]; - doCheck = false; description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -3829,7 +3583,6 @@ self: { version = "0.1"; sha256 = "c30ae43ca3a711f13a1d8a40d3d00647d71e591efd761e5280b48fd6e155d80a"; libraryHaskellDepends = [ base HaXml mtl parsec safe xml-parsec ]; - jailbreak = true; description = "Code used by Patch-Shack that seemed sensible to open for reusability"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -3863,6 +3616,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "DataIndex" = callPackage + ({ mkDerivation, base, tasty, tasty-hspec }: + mkDerivation { + pname = "DataIndex"; + version = "0.1.1"; + sha256 = "60dda6e5fafec65578339f9e3ac21dda26b44c4fbc1fad83bd866b81f21bedf3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base tasty tasty-hspec ]; + homepage = "https://github.com/yuhangwang/DataIndex#readme"; + description = "A package for adding index column to data files"; + license = stdenv.lib.licenses.mit; + }) {}; + "DataTreeView" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, glib, gtk , lifted-base, ListLike, MissingH, monad-control, mtl, syb @@ -4032,20 +3801,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Diff_0_3_2" = callPackage - ({ mkDerivation, array, base, pretty }: - mkDerivation { - pname = "Diff"; - version = "0.3.2"; - sha256 = "7f032b9842228c2282a66d096e0c943b830138493fbbc5f176a7b2a66ec5388e"; - revision = "1"; - editedCabalFile = "86ab9f6bcb253cabff2673437995faa4c130be7c3898df778b27a801c5361328"; - libraryHaskellDepends = [ array base pretty ]; - description = "O(ND) diff algorithm in haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Diff" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 @@ -4072,7 +3827,6 @@ self: { libraryHaskellDepends = [ base containers fgl FirstOrderTheory HUnit ]; - jailbreak = true; homepage = "https://github.com/dillonhuff/DifferenceLogic"; description = "A theory solver for conjunctions of literals in difference logic"; license = stdenv.lib.licenses.bsd3; @@ -4090,7 +3844,6 @@ self: { libraryHaskellDepends = [ base deepseq fclabels mtl mwc-random parallel primitive vector ]; - jailbreak = true; homepage = "http://yousource.it.jyu.fi/optimization-with-haskell"; description = "Global optimization using Differential Evolution"; license = stdenv.lib.licenses.mit; @@ -4128,7 +3881,6 @@ self: { transformers unordered-containers vector wreq ]; testHaskellDepends = [ base hspec lens mtl text ]; - jailbreak = true; description = "A client library for the DigitalOcean API"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -4193,10 +3945,10 @@ self: { base blaze-html blaze-markup html parsers ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "https://github.com/minamiyama1994/DiscussionSupportSystem"; description = "Discussion support system"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Dish" = callPackage @@ -4209,10 +3961,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base bytestring ]; executableHaskellDepends = [ base bytestring ]; - jailbreak = true; homepage = "http://github.com/zcourts/Dish"; description = "Hash modules (currently Murmur3)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Dist" = callPackage @@ -4223,10 +3975,10 @@ self: { sha256 = "71b3cfb410c08cf1692d4aa484b3190cc0840245adc23ea7ed8bb3e109a41c88"; libraryHaskellDepends = [ base containers MonadRandom ]; testHaskellDepends = [ base containers MonadRandom ]; - jailbreak = true; homepage = "https://github.com/wyager/Dist"; description = "A Haskell library for probability distributions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "DistanceTransform" = callPackage @@ -4298,7 +4050,6 @@ self: { executableHaskellDepends = [ base containers ghc ghc-paths haddock HUnit process ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/DocTest"; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; @@ -4331,7 +4082,6 @@ self: { base haskell-src-exts mtl pointless-haskell syb ]; executableHaskellDepends = [ array base containers pretty ]; - jailbreak = true; homepage = "http://haskell.di.uminho.pt/wiki/DrHylo"; description = "A tool for deriving hylomorphisms"; license = stdenv.lib.licenses.bsd3; @@ -4498,7 +4248,6 @@ self: { executableHaskellDepends = [ array base criterion QuickCheck random vector ]; - jailbreak = true; homepage = "https://github.com/zombiecalypse/DynamicTimeWarp"; description = "Dynamic time warping of sequences"; license = stdenv.lib.licenses.lgpl3; @@ -4595,19 +4344,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "EdisonAPI_1_3" = callPackage - ({ mkDerivation, base, mtl }: - mkDerivation { - pname = "EdisonAPI"; - version = "1.3"; - sha256 = "a369d5c9b412bafb16a023121a72470a6fed0116b3d6d143a03dd54cb854154f"; - libraryHaskellDepends = [ base mtl ]; - homepage = "http://rwd.rdockins.name/edison/home/"; - description = "A library of efficent, purely-functional data structures (API)"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "EdisonAPI" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -4669,7 +4405,6 @@ self: { libraryHaskellDepends = [ base monad-control transformers transformers-base ]; - jailbreak = true; description = "EitherT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -4710,7 +4445,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text transformers union-find unordered-containers ]; - jailbreak = true; homepage = "http://elm-lang.org"; description = "The Elm language module"; license = stdenv.lib.licenses.bsd3; @@ -4760,10 +4494,10 @@ self: { base biocore bytestring conduit HTTP http-conduit hxt mtl network Taxonomy transformers ]; - jailbreak = true; homepage = "https://github.com/eggzilla/EntrezHTTP"; description = "Libary to interface with the NCBI Entrez REST service"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EnumContainers" = callPackage @@ -4773,9 +4507,9 @@ self: { version = "0.1"; sha256 = "6802cc98b4b39834d53c9e18c114aa0cc47ce7a46b58191a60c3dbb8d5bb9391"; libraryHaskellDepends = [ base containers deepseq ]; - jailbreak = true; description = "Simple Enum-class-based int containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EnumMap" = callPackage @@ -4785,7 +4519,6 @@ self: { version = "0.0.2"; sha256 = "5f7e33f1845f6d620375e7e3792dddb9c3e83368cbdc7d69dbcbcf9268b872ec"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "More general IntMap replacement"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -4805,7 +4538,6 @@ self: { array base containers filepath HaXml mtl parsec template-haskell transformers ]; - jailbreak = true; description = "Render math formula in ASCII, and perform some simplifications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -4820,9 +4552,9 @@ self: { libraryHaskellDepends = [ base containers HUnit mtl union-find-array ]; - jailbreak = true; description = "A theory solver for conjunctions of literals in the theory of uninterpreted functions with equality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "EsounD" = callPackage @@ -4838,7 +4570,6 @@ self: { base base-unicode-symbols bindings-EsounD monad-control network regions safer-file-handles storablevector transformers unix ]; - jailbreak = true; homepage = "http://cielonegro.org/EsounD.html"; description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)"; license = stdenv.lib.licenses.publicDomain; @@ -4913,7 +4644,6 @@ self: { executableHaskellDepends = [ array base containers deepseq Etage fgl mtl parallel random time ]; - jailbreak = true; homepage = "http://mitar.tnode.com"; description = "Data-flow based graph algorithms"; license = stdenv.lib.licenses.lgpl3; @@ -4981,7 +4711,6 @@ self: { array arrows base bytestring containers deepseq ghc-prim HCodecs heap PortMidi random stm ]; - jailbreak = true; homepage = "http://www.euterpea.com"; description = "Library for computer music research and education"; license = stdenv.lib.licenses.bsd3; @@ -5046,7 +4775,6 @@ self: { instant-generics ListLike midi mtl QuickCheck random template-haskell time uu-parsinglib ]; - jailbreak = true; description = "Compose music"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -5152,9 +4880,9 @@ self: { libraryHaskellDepends = [ AC-Angle base containers digits QuickCheck template-haskell ]; - jailbreak = true; description = "A collection of facts about the real world"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FailureT" = callPackage @@ -5181,9 +4909,9 @@ self: { attoparsec base blaze-builder bytestring pipes pipes-attoparsec pipes-bytestring ]; - jailbreak = true; description = "Fasta and Fastq streaming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FenwickTree" = callPackage @@ -5246,10 +4974,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl parsec ]; - jailbreak = true; homepage = "http://github.com/burz/Feval"; description = "Evaluation using F-Algebras"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "FieldTrip" = callPackage @@ -5330,13 +5058,28 @@ self: { libraryHaskellDepends = [ base binary bytestring directory filepath mtl old-time ]; - jailbreak = true; homepage = "http://ddiaz.asofilak.es/packages/FileSystem"; description = "File system data structure and monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "Files" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "Files"; + version = "0.1.1.0"; + sha256 = "76171c4e0b341ee54297279be1345181e4532ece6455580d03f81900fd33949e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/yuhangwang/Files#readme"; + description = "File content extraction/rearrangement"; + license = stdenv.lib.licenses.mit; + }) {}; + "Finance-Quote-Yahoo" = callPackage ({ mkDerivation, base, bytestring, http-conduit, network , old-locale, time @@ -5403,7 +5146,6 @@ self: { version = "0.1.0.6"; sha256 = "f1884e300a05a1f253bf4bbddce633025a6da245ff119fe7c2432ad4278b81a4"; libraryHaskellDepends = [ base containers Proper ]; - jailbreak = true; description = "Grammar and typeclass for first order theories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -5518,10 +5260,10 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/choener/ForestStructures"; description = "Tree- and forest structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ForkableT" = callPackage @@ -5556,10 +5298,10 @@ self: { executableHaskellDepends = [ ansi-wl-pprint base cmdargs trifecta ]; - jailbreak = true; homepage = "https://github.com/choener/FormalGrammars"; description = "(Context-free) grammars in formal language theory"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Foster" = callPackage @@ -5575,7 +5317,6 @@ self: { executableHaskellDepends = [ array base cmdtheline containers random strict ]; - jailbreak = true; description = "Utilities to generate and solve puzzles"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -5626,28 +5367,10 @@ self: { executableHaskellDepends = [ base FTGL GLFW-b OpenGLRaw parallel random time ]; - jailbreak = true; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Frames_0_1_4" = callPackage - ({ mkDerivation, base, ghc-prim, pipes, primitive, readable - , template-haskell, text, transformers, vector, vinyl - }: - mkDerivation { - pname = "Frames"; - version = "0.1.4"; - sha256 = "3330b53867f07959c58b2cfc237390422ea08ca474b329547f092b6cb2bf39a0"; - libraryHaskellDepends = [ - base ghc-prim pipes primitive readable template-haskell text - transformers vector vinyl - ]; - description = "Data frames For working with tabular data files"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Frames" = callPackage ({ mkDerivation, base, ghc-prim, pipes, primitive, readable , template-haskell, text, transformers, vector, vinyl @@ -5686,7 +5409,6 @@ self: { version = "0.0.4"; sha256 = "4e85f39777c29cc145b760289906b3a9f8e518296af258004223d87bbbdc5183"; libraryHaskellDepends = [ base freetype2 OpenGL ]; - jailbreak = true; description = "Loadable texture fonts for OpenGL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -5722,10 +5444,10 @@ self: { base bytestring containers directory filepath ListZipper mtl mwc-random old-time process random transformers tuple ]; - jailbreak = true; homepage = "https://github.com/thomaseding/fungi"; description = "Funge-98 interpreter written in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GA" = callPackage @@ -5749,10 +5471,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bimap ]; - jailbreak = true; homepage = "https://github.com/xnil/GGg"; description = "GGg cipher"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GHood" = callPackage @@ -5800,16 +5522,12 @@ self: { }: mkDerivation { pname = "GLFW-b"; - version = "1.4.8.0"; - sha256 = "4e88c518d527e28606c9f150c74ace2e350bbb5630d51e4f365a13b2c14ef4ef"; - revision = "1"; - editedCabalFile = "f686b01337a2a511c3c6819d07dda3cb604ee44647a4b3dbde3bff24470a2836"; + version = "1.4.8.1"; + sha256 = "438a49ec5cf6cbda95966fcc42750b9245f54fe7daf69a6493e7703c3f178ae9"; libraryHaskellDepends = [ base bindings-GLFW ]; testHaskellDepends = [ base bindings-GLFW HUnit test-framework test-framework-hunit ]; - jailbreak = true; - doCheck = false; description = "Bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -5827,9 +5545,9 @@ self: { executableHaskellDepends = [ base GLFW-b mtl OpenGL pretty stm transformers ]; - jailbreak = true; description = "GLFW-b demo"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GLFW-task" = callPackage @@ -5841,10 +5559,10 @@ self: { libraryHaskellDepends = [ base GLFW monad-task OpenGL transformers ]; - jailbreak = true; homepage = "http://github.com/ninegua/GLFW-task"; description = "GLFW utility functions to use together with monad-task"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GLHUI" = callPackage @@ -5895,7 +5613,6 @@ self: { version = "0.1.0.1"; sha256 = "64f3be373987c3fd41bfba94a68701b414e35ed2fb75862654e3504f6f06c88e"; libraryHaskellDepends = [ base OpenGLRaw ]; - jailbreak = true; homepage = "https://github.com/fiendfan1/GLMatrix"; description = "Utilities for working with OpenGL matrices"; license = stdenv.lib.licenses.gpl3; @@ -5960,7 +5677,6 @@ self: { base comonad comonad-transformers containers data-lens hxt newtype xsd ]; - jailbreak = true; homepage = "https://github.com/tonymorris/geo-gpx"; description = "Parse GPX files"; license = stdenv.lib.licenses.bsd3; @@ -5973,14 +5689,13 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.1.7"; - sha256 = "ebb54d9994bcb9c14064af5468c3c0f34f02db07d6033f562dd09b4718538814"; + version = "2.1.8"; + sha256 = "236735a9ed98628d70c66f153378ff8a8b6e84c6e3d9ede1c1d0c2cc66e1fbca"; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear transformers ]; - jailbreak = true; - homepage = "http://tobbebex.blogspot.se/"; + homepage = "https://github.com/tobbebex/GPipe-Core#readme"; description = "Typesafe functional GPU graphics programming"; license = stdenv.lib.licenses.mit; }) {}; @@ -5994,7 +5709,6 @@ self: { libraryHaskellDepends = [ array base containers GPipe HaXml mtl Vec ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GPipe"; description = "Load GPipe meshes from Collada files"; license = stdenv.lib.licenses.bsd3; @@ -6026,10 +5740,10 @@ self: { version = "1.2.2"; sha256 = "b2c2764511504225550b7e03badba80ba6e264eb86bee3fcc2f7d54e2e11d652"; libraryHaskellDepends = [ base GLFW-b GPipe transformers ]; - jailbreak = true; homepage = "https://github.com/plredmond/GPipe-GLFW"; description = "GLFW OpenGL context creation for GPipe"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GPipe-TextureLoad" = callPackage @@ -6059,7 +5773,6 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://bitbucket.org/emoto/gtalib"; description = "A library for GTA programming"; license = stdenv.lib.licenses.bsd3; @@ -6098,7 +5811,6 @@ self: { executableHaskellDepends = [ base containers directory filepath mtl parsec transformers ]; - jailbreak = true; homepage = "https://github.com/BMeph/Ganymede"; description = "An Io interpreter in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -6130,6 +5842,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/GeBoP"; description = "Several games"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GenI" = callPackage @@ -6160,7 +5873,6 @@ self: { test-framework-quickcheck2 test-framework-smallcheck text transformers ]; - jailbreak = true; homepage = "http://projects.haskell.org/GenI"; description = "A natural language generator (specifically, an FB-LTAG surface realiser)"; license = "GPL"; @@ -6208,7 +5920,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://afonso.xyz"; description = "A general TicTacToe game implementation"; license = stdenv.lib.licenses.mit; @@ -6250,7 +5961,6 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/choener/GenussFold"; description = "MCFGs for Genus-1 RNA Pseudoknots"; license = stdenv.lib.licenses.gpl3; @@ -6276,7 +5986,6 @@ self: { version = "0.1.0.1"; sha256 = "ab70cbd8a73d45b6ed8c4d692e39e54180def339f29ff1ba9671f24d07e7bab0"; libraryHaskellDepends = [ aeson base bytestring HTTP text ]; - jailbreak = true; homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git"; description = "Geocoder and Reverse Geocoding Service Wrapper"; license = "GPL"; @@ -6325,9 +6034,9 @@ self: { version = "0.0.1"; sha256 = "2e450cc29ff9bf7b6021c35ddb1b92a0dafb98c74fd8535040ed9e78b1d47b7a"; libraryHaskellDepends = [ base text ]; - jailbreak = true; description = "A Haskell implementation of a Generalized Search Tree (GiST)"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Gifcurry" = callPackage @@ -6335,15 +6044,14 @@ self: { }: mkDerivation { pname = "Gifcurry"; - version = "2.0.0.0"; - sha256 = "c6a13b6a4f1fcaf3d24428862222f52d383570eb4d5872e21cb5e2882d936809"; + version = "2.0.0.2"; + sha256 = "1a7f269eda348fa34fe57f9a35cc810b304acc646f5146c4db2d72eb738c8b32"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory process temporary ]; executableHaskellDepends = [ base cmdargs directory gtk3 process temporary ]; - jailbreak = true; homepage = "https://github.com/lettier/gifcurry"; description = "Create animated GIFs, overlaid with optional text, from video files"; license = stdenv.lib.licenses.asl20; @@ -6361,30 +6069,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "Glob_0_7_10" = callPackage - ({ mkDerivation, base, containers, directory, dlist, filepath - , HUnit, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, transformers, transformers-compat - }: - mkDerivation { - pname = "Glob"; - version = "0.7.10"; - sha256 = "db8f67725566df72379cdbbdb2f7aaf6500163b94924229b4b0aa9bbaa9804a7"; - libraryHaskellDepends = [ - base containers directory dlist filepath transformers - transformers-compat - ]; - testHaskellDepends = [ - base containers directory dlist filepath HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - transformers transformers-compat - ]; - homepage = "http://iki.fi/matti.niemenmaa/glob/"; - description = "Globbing library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Glob" = callPackage ({ mkDerivation, base, containers, directory, dlist, filepath , HUnit, QuickCheck, test-framework, test-framework-hunit @@ -6392,8 +6076,8 @@ self: { }: mkDerivation { pname = "Glob"; - version = "0.7.11"; - sha256 = "0a23f90be0e6a7129efef83716ce1ccd8f48f3c17063aff663232f8eaa18c377"; + version = "0.7.12"; + sha256 = "c7ca5459b2d98ae9f5db56351a512680c4375cfdf907073848aaf15d6b92c175"; libraryHaskellDepends = [ base containers directory dlist filepath transformers transformers-compat @@ -6510,6 +6194,7 @@ self: { ]; description = "Interface to Google Suggest API"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GoogleTranslate" = callPackage @@ -6534,10 +6219,10 @@ self: { version = "1.0.0.1"; sha256 = "1e7ed7020302f606e7a172709a2e4b50e2bf50a9900b00328db1d9cbc40d3cf0"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://github.com/gcross/GotoT-transformers"; description = "A monad and monadic transformer providing \"goto\" functionality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "GrammarProducts" = callPackage @@ -6555,10 +6240,10 @@ self: { FormalGrammars lens newtype parsers PrimitiveArray semigroups template-haskell transformers trifecta ]; - jailbreak = true; homepage = "https://github.com/choener/GrammarProducts"; description = "Grammar products and higher-dimensional grammars"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Graph500" = callPackage @@ -6637,7 +6322,6 @@ self: { array base bktrees containers directory fgl filepath graphviz old-locale pandoc process random text time ]; - jailbreak = true; description = "Graph-Theoretic Analysis library"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -6660,16 +6344,22 @@ self: { }) {}; "GroteTrap" = callPackage - ({ mkDerivation, base, mtl, parsec, QuickCheck, syb }: + ({ mkDerivation, base, mtl, parsec, QuickCheck, syb, test-framework + , test-framework-quickcheck2 + }: mkDerivation { pname = "GroteTrap"; - version = "0.5.1"; - sha256 = "f38863a54d907ec32193f0a2be684fe184b7b0d34cd58d6d5bed2aa5ee30318c"; - libraryHaskellDepends = [ base mtl parsec QuickCheck syb ]; - jailbreak = true; + version = "0.5.2"; + sha256 = "9c5197b6db4257c9def0f6f10c777dbe47ac73b3fd1864042b2ea9aa645ae270"; + libraryHaskellDepends = [ base mtl parsec syb ]; + testHaskellDepends = [ + base mtl parsec QuickCheck test-framework + test-framework-quickcheck2 + ]; homepage = "http://www.haskell.org/haskellwiki/GroteTrap"; description = "Parser and selection library for expression languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Grow" = callPackage @@ -6689,7 +6379,6 @@ self: { definitive-filesystem definitive-parser definitive-reactive directory filepath old-locale primitive process time unix vector ]; - jailbreak = true; homepage = "http://coiffier.net/projects/grow.html"; description = "A declarative make-like interpreter"; license = "unknown"; @@ -6796,31 +6485,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "H_0_8_0_0" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, directory, file-embed - , inline-r, pretty, process, singletons, tasty, tasty-golden - , tasty-hunit, temporary, text, vector - }: - mkDerivation { - pname = "H"; - version = "0.8.0.0"; - sha256 = "b679dc140f783afa598da1bc2d111d603ad94b5f04d7db912452194635d47484"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base bytestring cmdargs file-embed inline-r pretty process - temporary vector - ]; - testHaskellDepends = [ - base bytestring directory inline-r process singletons tasty - tasty-golden tasty-hunit text vector - ]; - doCheck = false; - description = "The Haskell/R mixed programming environment"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "H" = callPackage ({ mkDerivation, base, bytestring, cmdargs, file-embed, inline-r , pretty, process, temporary, vector @@ -6868,7 +6532,6 @@ self: { base binary bytestring containers HAppS-Util HaXml mtl pretty syb syb-with-class template-haskell ]; - jailbreak = true; description = "HAppS data manipulation libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -6906,7 +6569,6 @@ self: { old-locale old-time parsec process random syb template-haskell unix xhtml ]; - jailbreak = true; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -6927,7 +6589,6 @@ self: { HAppS-Util HaXml hslogger hspread mtl network old-locale old-time random stm syb template-haskell unix ]; - jailbreak = true; description = "Event-based distributed state"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -6973,7 +6634,6 @@ self: { executableHaskellDepends = [ base containers mtl QuickCheck random ]; - jailbreak = true; homepage = "http://github.com/m4dc4p/hcl/tree/master"; description = "High-level library for building command line interfaces"; license = stdenv.lib.licenses.bsd3; @@ -7030,21 +6690,22 @@ self: { }) {}; "HDBC-mysql" = callPackage - ({ mkDerivation, base, bytestring, HDBC, mysqlclient, time - , utf8-string + ({ mkDerivation, base, bytestring, Cabal, HDBC, mysqlclient + , openssl, time, utf8-string, zlib }: mkDerivation { pname = "HDBC-mysql"; - version = "0.6.6.4"; - sha256 = "01df81920b9a005cd9e11467aa5e05b10534d284933fddc34991400e5888048b"; + version = "0.7.0.0"; + sha256 = "cc46b7ae684062998a3eb4f8e710436d5e2ced94e09d40777116cf20a43df1e4"; + setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ base bytestring HDBC time utf8-string ]; - librarySystemDepends = [ mysqlclient ]; - jailbreak = true; - homepage = "https://github.com/ryantm/hdbc-mysql"; + librarySystemDepends = [ mysqlclient openssl zlib ]; + homepage = "http://github.com/ryantm/hdbc-mysql"; description = "MySQL driver for HDBC"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {mysqlclient = null;}; + }) {mysqlclient = null; inherit (pkgs) openssl; + inherit (pkgs) zlib;}; "HDBC-odbc" = callPackage ({ mkDerivation, base, bytestring, concurrent-extra, HDBC, mtl @@ -7088,18 +6749,18 @@ self: { version = "0.0.1.2"; sha256 = "2dc856b0f467b0d51c93965e31784606b247eac597dffd12847185e27150a718"; libraryHaskellDepends = [ attoparsec base containers HDBC text ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/hdbc-postgresql-hstore"; description = "Manipulate data in PostgreSQL \"hstore\" columns"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HDBC-session" = callPackage ({ mkDerivation, base, HDBC }: mkDerivation { pname = "HDBC-session"; - version = "0.1.0.1"; - sha256 = "bf9342008c1d86733f05c60f90b18974e8c6748b9bd254bb47555245b6f77008"; + version = "0.1.1.0"; + sha256 = "4ad37a6c9d17b8f2f049ec4f3c4ea5efc8d866b02b226c6c066ab11153fc80b9"; libraryHaskellDepends = [ base HDBC ]; homepage = "http://khibino.github.io/haskell-relational-record/"; description = "Bracketed connection for HDBC"; @@ -7130,7 +6791,6 @@ self: { sha256 = "0f78820cedd8e9d8a5aa4d2a0f75116bce9d73daa0b94dfba62ce28b6b9f7e66"; libraryHaskellDepends = [ array base colour containers mtl unix ]; librarySystemDepends = [ pfstools ]; - jailbreak = true; homepage = "http://vis.renci.org/jeff/pfs"; description = "Utilities for reading, manipulating, and writing HDR images"; license = stdenv.lib.licenses.bsd3; @@ -7156,7 +6816,6 @@ self: { version = "0.2.0.0"; sha256 = "b03c5de4cbb14d379f3555698a03a076fb2d10c748c2a7054b83c74f95e30626"; libraryHaskellDepends = [ base c-storable-deriving ]; - jailbreak = true; homepage = "https://github.com/Bellaz/HfrequencyList"; description = "A Queue with a random (weighted) pick function"; license = stdenv.lib.licenses.gpl3; @@ -7219,10 +6878,10 @@ self: { base bytestring cereal clock containers directory filepath fresco-binding messagepack text vect ]; - jailbreak = true; homepage = "http://www.hgamer3d.org"; description = "Toolset for the Haskell Game Programmer"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HGamer3D-API" = callPackage @@ -7237,7 +6896,6 @@ self: { base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding HGamer3D-SFML-Binding ]; - jailbreak = true; homepage = "http://www.althainz.de/HGamer3D.html"; description = "Library to enable 3D game development for Haskell - API"; license = "unknown"; @@ -7283,7 +6941,6 @@ self: { sha256 = "41f9a22c27d9e64bc9bbbbdca58b97c7674df1321abdb0e05391406ba173c9e0"; libraryHaskellDepends = [ base haskell98 HGamer3D-Data ]; librarySystemDepends = [ HGamer3DCAudio015 ]; - jailbreak = true; homepage = "http://www.althainz.de/HGamer3D.html"; description = "Library to enable 3D game development for Haskell - cAudio Bindings"; license = "unknown"; @@ -7369,7 +7026,6 @@ self: { libraryHaskellDepends = [ base HGamer3D-CEGUI-Binding HGamer3D-Data HGamer3D-WinEvent split ]; - jailbreak = true; homepage = "http://www.hgamer3d.org"; description = "GUI Functionality for HGamer3D"; license = "unknown"; @@ -7444,7 +7100,6 @@ self: { base haskell98 HGamer3D-Data HGamer3D-Ogre-Binding ]; librarySystemDepends = [ HGamer3DOIS015 ]; - jailbreak = true; homepage = "http://www.althainz.de/HGamer3D.html"; description = "Library to enable 3D game development for Haskell - OIS Bindings"; license = "unknown"; @@ -7521,7 +7176,6 @@ self: { libraryHaskellDepends = [ base HGamer3D-Data HGamer3D-SDL2-Binding text ]; - jailbreak = true; homepage = "http://www.hgamer3d.org"; description = "Windowing and Event Functionality for HGamer3D"; license = "unknown"; @@ -7541,7 +7195,6 @@ self: { base containers HGamer3D HGamer3D-Audio HGamer3D-Data HGamer3D-GUI HGamer3D-InputSystem HGamer3D-WinEvent mtl netwire transformers ]; - jailbreak = true; homepage = "http://www.hgamer3d.org"; description = "Wire Functionality for HGamer3D"; license = "unknown"; @@ -7581,7 +7234,6 @@ self: { version = "0.1.0.0"; sha256 = "183c5e1307e60a255fc7cafeadf0261c13de49224c63ec44a373ad41cdb72588"; libraryHaskellDepends = [ base containers mtl template-haskell ]; - jailbreak = true; homepage = "http://thesz.mskhug.ru/svn/hhdl/hackage/hhdl/"; description = "Hardware Description Language embedded in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -7652,7 +7304,6 @@ self: { base ConstraintKinds containers deepseq hashable MonadRandom parallel random template-haskell vector vector-heterogenous ]; - jailbreak = true; homepage = "http://github.com/mikeizbicki/HLearn/"; description = "Algebraic foundation for homomorphic learning"; license = stdenv.lib.licenses.bsd3; @@ -7697,7 +7348,6 @@ self: { math-functions MonadRandom normaldistribution parsec primitive QuickCheck statistics vector vector-th-unbox ]; - jailbreak = true; homepage = "http://github.com/mikeizbicki/HLearn/"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -7761,7 +7411,6 @@ self: { array base cmdargs directory doctest filepath hspec lens mtl process QuickCheck syb template-haskell ]; - jailbreak = true; description = "Heterogeneous lists"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -7778,10 +7427,10 @@ self: { executableHaskellDepends = [ applicative-quoters base regex-applicative ]; - jailbreak = true; homepage = "http://code.haskell.org/~aavogt/HListPP"; description = "A preprocessor for HList labelable labels"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HLogger" = callPackage @@ -7794,7 +7443,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base old-locale time ]; executableHaskellDepends = [ base old-locale time ]; - jailbreak = true; homepage = "http://www.pontarius.org/sub-projects/hlogger/"; description = "Simple, concurrent and easy-to-use logging library"; license = stdenv.lib.licenses.bsd3; @@ -7918,7 +7566,6 @@ self: { base Cabal containers directory filepath haskell-src-exts mtl parsec utf8-string ]; - jailbreak = true; homepage = "http://github.com/solidsnack/HPath"; description = "Extract Haskell declarations by name"; license = stdenv.lib.licenses.bsd3; @@ -7968,7 +7615,6 @@ self: { libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base glade glib gtk ]; executablePkgconfigDepends = [ plplotd-gnome2 ]; - jailbreak = true; homepage = "http://yakov.cc/HPlot.html"; description = "A minimal monadic PLplot interface for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -8112,7 +7758,6 @@ self: { executableHaskellDepends = [ array base Cabal containers directory filepath parsec process unix ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/HSFFIG"; description = "Generate FFI import declarations from C include files"; license = stdenv.lib.licenses.bsd3; @@ -8171,7 +7816,6 @@ self: { base bytestring DebugTraceHelpers directory filepath HSH HStringTemplateHelpers MissingH mtl regex-pcre unix ]; - jailbreak = true; description = "Convenience functions that use HSH, instances for HSH"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -8197,10 +7841,10 @@ self: { revision = "2"; editedCabalFile = "31ff4b5f5128f8ebd327f4af1dbb711dbfc906757e97526497a58865f5d18347"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/41px/HSlippyMap"; description = "OpenStreetMap (OSM) Slippy Map"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HSmarty" = callPackage @@ -8315,7 +7959,6 @@ self: { process random regex-compat template-haskell temporary text unordered-containers ]; - doCheck = false; homepage = "https://github.com/skogsbaer/HTF/"; description = "The Haskell Test Framework"; license = "LGPL"; @@ -8370,10 +8013,10 @@ self: { executableHaskellDepends = [ base cmdargs containers deepseq hylolib mtl strict ]; - jailbreak = true; homepage = "http://www.glyc.dc.uba.ar/intohylo/htab.php"; description = "Tableau based theorem prover for hybrid logics"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HTicTacToe" = callPackage @@ -8394,20 +8037,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HUnit_1_3_1_1" = callPackage - ({ mkDerivation, base, deepseq, filepath }: - mkDerivation { - pname = "HUnit"; - version = "1.3.1.1"; - sha256 = "93e5fc4290ab685b469209f04d9858338ffff486e15c23a11260c47e32da8ef8"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base 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" = callPackage ({ mkDerivation, base, deepseq, filepath }: mkDerivation { @@ -8421,6 +8050,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HUnit_1_4_0_0" = callPackage + ({ mkDerivation, base, call-stack, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.4.0.0"; + sha256 = "dce3bd1ac11ed34e0181f39aba16cb6ff0f5005f663bbe37e6ab0162dcf3ec95"; + 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 { @@ -8428,7 +8071,6 @@ self: { version = "0.1"; sha256 = "a61bb6cdc8d8baf196c9af502f06ecd478e0c2806f4951169c385b16b1e99a36"; libraryHaskellDepends = [ ansi-terminal base Diff groom HUnit ]; - jailbreak = true; homepage = "https://github.com/dag/HUnit-Diff"; description = "Assertions for HUnit with difference reporting"; license = stdenv.lib.licenses.bsd3; @@ -8492,7 +8134,6 @@ self: { network pureMD5 random regex-posix text transformers utf8-string xml-enumerator xml-types ]; - jailbreak = true; homepage = "http://www.pontarius.org/sub-projects/hxmpp/"; description = "A (prototyped) easy to use XMPP library"; license = stdenv.lib.licenses.bsd3; @@ -8538,10 +8179,10 @@ self: { version = "0.1.0.0"; sha256 = "a810ac58ba5089b7fa5e1347f3c6a1b71571fd18a08463d3c362660e7ec1ee60"; libraryHaskellDepends = [ base bytestring serialport stm ]; - jailbreak = true; homepage = "https://github.com/Zigazou/HaMinitel"; description = "An Haskell library to drive the french Minitel through a serial port"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaPy" = callPackage @@ -8551,58 +8192,12 @@ self: { version = "0.1.1.1"; sha256 = "9fd74b2ce999bbf8b52cc2dbe2b17c84ee2804a09a74d7426407cf7bc4242052"; libraryHaskellDepends = [ base template-haskell th-lift ]; - jailbreak = true; homepage = "https://github.com/sakana/HaPy"; description = "Haskell bindings for Python"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "HaRe_0_8_2_3" = callPackage - ({ mkDerivation, array, base, Cabal, cabal-helper, containers - , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod - , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit - , monad-control, monoid-extras, mtl, old-time, parsec, pretty - , process, QuickCheck, rosezipper, semigroups, silently - , Strafunski-StrategyLib, stringbuilder, syb, syz, time - , transformers, transformers-base - }: - mkDerivation { - pname = "HaRe"; - version = "0.8.2.3"; - sha256 = "8ccd728cd666929cc59ac1ad9fc16a5a462454a6c04c7c5019767f0b490a0e04"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger - monad-control monoid-extras mtl old-time pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base - ]; - executableHaskellDepends = [ - array base Cabal cabal-helper containers directory filepath ghc - ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger - monad-control monoid-extras mtl old-time parsec pretty rosezipper - semigroups Strafunski-StrategyLib syb syz time transformers - transformers-base - ]; - testHaskellDepends = [ - base Cabal cabal-helper containers deepseq Diff directory filepath - ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils - hslogger hspec HUnit monad-control monoid-extras mtl old-time - process QuickCheck rosezipper semigroups silently - Strafunski-StrategyLib stringbuilder syb syz time transformers - transformers-base - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/RefactoringTools/HaRe/wiki"; - description = "the Haskell Refactorer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "HaRe" = callPackage ({ mkDerivation, array, base, Cabal, cabal-helper, containers , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod @@ -8642,10 +8237,10 @@ self: { Strafunski-StrategyLib stringbuilder syb syz time transformers transformers-base ]; - doCheck = false; homepage = "https://github.com/RefactoringTools/HaRe/wiki"; description = "the Haskell Refactorer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaTeX" = callPackage @@ -8683,7 +8278,6 @@ self: { base Cabal containers directory filepath ghc haddock haskell-src-exts mtl parsec ]; - jailbreak = true; description = "This package is deprecated. From version 3, HaTeX does not need this anymore."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -8701,9 +8295,9 @@ self: { antiquoter base haskell-src-meta HaTeX template-haskell text uniplate ]; - jailbreak = true; description = "Quasiquoters for HaTeX"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HaVSA" = callPackage @@ -8721,7 +8315,6 @@ self: { base HUnit logict QuickCheck test-framework test-framework-hunit test-framework-quickcheck ]; - jailbreak = true; description = "An implementation of the Version Space Algebra learning framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -8845,10 +8438,10 @@ self: { isExecutable = true; executableHaskellDepends = [ base random transformers ]; testHaskellDepends = [ base hspec transformers ]; - jailbreak = true; homepage = "https://github.com/lf94/Hangman"; description = "The classic game of Hangman"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HarmTrace" = callPackage @@ -8874,7 +8467,6 @@ self: { HarmTrace-Base hmatrix hmatrix-gsl-stats instant-generics ListLike mtl parallel process sox template-haskell uu-parsinglib vector ]; - jailbreak = true; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/HarmTrace"; description = "Harmony Analysis and Retrieval of Music"; license = stdenv.lib.licenses.gpl3; @@ -8895,7 +8487,6 @@ self: { testHaskellDepends = [ base binary containers ghc-prim ListLike QuickCheck uu-parsinglib ]; - jailbreak = true; homepage = "https://bitbucket.org/bash/harmtrace-base"; description = "Parsing and unambiguously representing musical chords"; license = stdenv.lib.licenses.lgpl3; @@ -8913,7 +8504,6 @@ self: { libraryHaskellDepends = [ base haskell98 hmatrix hmatrix-special mtl parsec random ]; - jailbreak = true; homepage = "http://www.cl.cam.ac.uk/~sbh11/HasGP"; description = "A Haskell library for inference using Gaussian processes"; license = stdenv.lib.licenses.gpl3; @@ -8933,7 +8523,6 @@ self: { executableHaskellDepends = [ array base list-tries monad-loops mtl numbers parsec ]; - jailbreak = true; homepage = "http://iki.fi/matti.niemenmaa/misc-projects.html#haschoo"; description = "Minimalist R5RS Scheme interpreter"; license = stdenv.lib.licenses.bsd3; @@ -8954,7 +8543,6 @@ self: { base directory ghc haskell98 parsec process readline regex-compat unix ]; - jailbreak = true; description = "Simple shell written in Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -8971,7 +8559,6 @@ self: { libraryHaskellDepends = [ base containers directory ghc-prim HList tagged ]; - jailbreak = true; description = "HaskRel, Haskell as a DBMS with support for the relational algebra"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -9078,10 +8665,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs text ]; - jailbreak = true; homepage = "https://github.com/mrLSD/HaskellTutorials"; description = "Haskell Tutorials by Evgeny Ukhanov"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Haskelloids" = callPackage @@ -9097,7 +8684,6 @@ self: { executableHaskellDepends = [ base containers HGL hmatrix MonadRandom random Yampa ]; - jailbreak = true; homepage = "http://www.matthewhayden.co.uk"; description = "A reproduction of the Atari 1979 classic \"Asteroids\""; license = stdenv.lib.licenses.bsd3; @@ -9123,7 +8709,6 @@ self: { base GLFW-b GLUtil JuicyPixels JuicyPixels-util lens mtl OpenGL random transformers vect vect-opengl vector ]; - jailbreak = true; homepage = "http://github.com/bananu7/Hate"; description = "A small 2D game framework"; license = stdenv.lib.licenses.mit; @@ -9147,7 +8732,6 @@ self: { hslogger hslogger-template HTTP hxt json-b MonadCatchIO-mtl mtl network regex-posix SHA template-haskell time utf8-string ]; - jailbreak = true; description = "Haskell Web Application Kit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9175,7 +8759,6 @@ self: { MonadCatchIO-transformers mtl network old-time parsec process snap snap-core snap-server tar text transformers xhtml-combinators zlib ]; - jailbreak = true; homepage = "http://holumbus.fh-wedel.de"; description = "The Hayoo! search engine for Haskell API search on hackage"; license = stdenv.lib.licenses.mit; @@ -9189,7 +8772,6 @@ self: { version = "3.0.0.4"; sha256 = "d8c80bd2d035571cd76ce4f69453e9fcef4096dbc8868eb4cfcd7eb74fe5f712"; libraryHaskellDepends = [ base mtl process strict ]; - doCheck = false; homepage = "https://github.com/jetho/Hclip"; description = "A small cross-platform library for reading and modifying the system clipboard"; license = stdenv.lib.licenses.bsd3; @@ -9229,7 +8811,6 @@ self: { template-haskell text ]; testHaskellDepends = [ base linear subhask ]; - jailbreak = true; homepage = "github.com/mikeizbicki/herbie-haskell"; description = "automatically improve your code's numeric stability"; license = stdenv.lib.licenses.bsd3; @@ -9250,7 +8831,6 @@ self: { old-time random random-shuffle RSA SHA2 stm syb time transformers unamb yjtools ]; - jailbreak = true; description = "Message-based middleware layer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9269,7 +8849,6 @@ self: { array base buster bytestring cairo colour containers glib GLUT gtk gtkglext IfElse mtl OpenGL parallel pretty random ]; - jailbreak = true; homepage = "http://vis.renci.org/jeff/hieroglyph"; description = "Purely functional 2D graphics for visualization"; license = stdenv.lib.licenses.bsd3; @@ -9321,10 +8900,10 @@ self: { executableHaskellDepends = [ base containers GLFW Hipmunk OpenGL StateVar transformers ]; - jailbreak = true; homepage = "https://github.com/meteficha/HipmunkPlayground"; description = "A playground for testing Hipmunk"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Hish" = callPackage @@ -9343,7 +8922,6 @@ self: { executableHaskellDepends = [ base directory MissingH process regex-tdfa time ]; - jailbreak = true; homepage = "https://github.com/jaiyalas/Hish"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9391,7 +8969,6 @@ self: { libgraph mtl process RBTree regex-posix template-haskell threepenny-gui time ]; - jailbreak = true; homepage = "https://wiki.haskell.org/Hoed"; description = "Lightweight algorithmic debugging"; license = stdenv.lib.licenses.bsd3; @@ -9524,7 +9101,6 @@ self: { unix-bytestring unordered-containers ]; testHaskellDepends = [ base process random ]; - jailbreak = true; description = "A Simple Key Value Store"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9552,7 +9128,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "http://github.com/Raynes/Hricket"; description = "A Cricket scoring application"; license = stdenv.lib.licenses.bsd3; @@ -9581,7 +9156,6 @@ self: { syb time ]; testHaskellDepends = [ base directory filepath process ]; - jailbreak = true; homepage = "http://blog.zhox.com/category/hs2lib/"; description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs"; license = stdenv.lib.licenses.bsd3; @@ -9624,7 +9198,6 @@ self: { base base-unicode-symbols bytestring network text ]; libraryPkgconfigDepends = [ hyperestraier qdbm ]; - jailbreak = true; homepage = "http://cielonegro.org/HsHyperEstraier.html"; description = "HyperEstraier binding for Haskell"; license = stdenv.lib.licenses.publicDomain; @@ -9647,26 +9220,23 @@ self: { "HsOpenSSL" = callPackage ({ mkDerivation, base, bytestring, HUnit, integer-gmp, network - , old-locale, openssl, test-framework, test-framework-hunit, time + , openssl, test-framework, test-framework-hunit, time }: mkDerivation { pname = "HsOpenSSL"; - version = "0.11.1.1"; - sha256 = "4a61e074e968a9863e0f3440b3be8ac131457b3d34eb983ca8102122d8ebc4c1"; - revision = "1"; - editedCabalFile = "be351c277db7ddbc2ece8fb2d10b8f1f686b91000a552dd9d8155b79f8db9a5f"; + version = "0.11.2.4"; + sha256 = "9c38800459534966f12bf25380844c4d26fead17af4d0a8773a95e2c9e3bc1b8"; libraryHaskellDepends = [ - base bytestring integer-gmp network old-locale time + base bytestring integer-gmp network time ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/phonohawk/HsOpenSSL"; + homepage = "https://github.com/vshabanov/HsOpenSSL"; description = "Partial OpenSSL binding for Haskell"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "HsOpenSSL-x509-system" = callPackage @@ -9679,6 +9249,7 @@ self: { homepage = "https://github.com/redneb/HsOpenSSL-x509-system"; description = "Use the system's native CA certificate store with HsOpenSSL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HsParrot" = callPackage @@ -9713,7 +9284,6 @@ self: { version = "0.4.3.3"; sha256 = "87ddd1a22d3e2a6a5f3ee29d7e5b19a6a3352394082198bf2573fa2ad96fa4fb"; libraryHaskellDepends = [ base bytestring mtl stm ]; - jailbreak = true; homepage = "https://github.com/phonohawk/HsSVN"; description = "Partial Subversion (SVN) binding for Haskell"; license = stdenv.lib.licenses.publicDomain; @@ -9781,7 +9351,6 @@ self: { libraryHaskellDepends = [ base containers parsec pretty process smtLib transformers ]; - jailbreak = true; homepage = "https://github.com/MfesGA/Hsmtlib"; description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers"; license = stdenv.lib.licenses.bsd3; @@ -9799,10 +9368,10 @@ self: { libraryHaskellDepends = [ aeson base containers lens lens-aeson mtl transformers wreq ]; - jailbreak = true; homepage = "https://github.com/sjoerdvisscher/HueAPI"; description = "API for controlling Philips Hue lights"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "HulkImport" = callPackage @@ -9847,7 +9416,6 @@ self: { version = "0.1"; sha256 = "e83b1962e9cacd32779a0ce7c184041132cf179e9b1804ffec0bdccf3b1490dc"; libraryHaskellDepends = [ base containers directory ]; - jailbreak = true; description = "Indexable, serializable form of Data.Dynamic"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -9957,7 +9525,6 @@ self: { version = "0.1.2"; sha256 = "16317e247510e2bc1e4920f21299e06af7c394543205f0b0e8ac35d70b16cb67"; libraryHaskellDepends = [ array base GlomeVec ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/IcoGrid"; description = "Library for generating grids of hexagons and pentagons mapped to a sphere"; license = "GPL"; @@ -10018,10 +9585,10 @@ self: { version = "0.1.0.1"; sha256 = "d57539709179de74c116781907d6a31d7b79979e957b308d00924889e3d8efc4"; libraryHaskellDepends = [ base PeanoWitnesses ]; - jailbreak = true; homepage = "https://github.com/kwf/IndexedList"; description = "Length- and element-indexed lists sitting somewhere between homogeneous and fully heterogeneous"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "InfixApplicative" = callPackage @@ -10085,10 +9652,10 @@ self: { base data-default mtl network transformers ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "https://github.com/yunxing/Irc"; description = "DSL for IRC bots"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "IrrHaskell" = callPackage @@ -10118,10 +9685,10 @@ self: { quickcheck-instances system-filepath text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/jcristovao/IsNull"; description = "A typeclass to determine if a given value is null"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JSON-Combinator" = callPackage @@ -10170,7 +9737,6 @@ self: { attoparsec base bytestring bytestring-nums bytestring-trie containers utf8-string ]; - jailbreak = true; homepage = "http://github.com/solidsnack/JSONb/"; description = "JSON parser that uses byte strings"; license = stdenv.lib.licenses.bsd3; @@ -10192,7 +9758,6 @@ self: { lazysmallcheck mtl mwc-random parallel process QuickCheck random stm template-haskell unix zlib ]; - jailbreak = true; description = "Some utility functions for JYU projects"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -10259,7 +9824,6 @@ self: { executableHaskellDepends = [ base containers mtl parsec pretty syb WebBits WebBits-Html ]; - jailbreak = true; homepage = "http://www.cs.brown.edu/research/plt/"; description = "Design-by-contract for JavaScript"; license = stdenv.lib.licenses.bsd3; @@ -10273,8 +9837,8 @@ self: { }: mkDerivation { pname = "JsonGrammar"; - version = "1.0.4"; - sha256 = "cb411635c4f9e30e0e59ed4a0b3294b5df78ccd70dc646a0eb896a56451e72bd"; + version = "1.0.5"; + sha256 = "25a476a80407037b8d951a1994186f8a6ec4883414fd4ad04b64425c59f2e18a"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers language-typescript mtl stack-prism text unordered-containers vector @@ -10289,24 +9853,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels_3_2_7_2" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl - , primitive, transformers, vector, zlib - }: - mkDerivation { - pname = "JuicyPixels"; - version = "3.2.7.2"; - sha256 = "500b0ed64e1385a5f5e5fa4b51f3575d38e77ebac19a374942a308a04fa7c902"; - libraryHaskellDepends = [ - base binary bytestring containers deepseq mtl primitive - transformers vector zlib - ]; - homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "JuicyPixels" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl , primitive, transformers, vector, zlib @@ -10331,10 +9877,10 @@ self: { version = "0.1.0.0"; sha256 = "95f5c368a7b6a7f9a5776abfca575925e3c84ffbfa2e5d3eb583bdf4f80ce978"; libraryHaskellDepends = [ base containers JuicyPixels ]; - jailbreak = true; homepage = "http://eax.me/"; description = "Functions for drawing lines, squares and so on pixel by pixel"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JuicyPixels-extra" = callPackage @@ -10365,28 +9911,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "JuicyPixels-scale-dct_0_1_1_0" = callPackage - ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels - , JuicyPixels-util, time - }: - mkDerivation { - pname = "JuicyPixels-scale-dct"; - version = "0.1.1.0"; - sha256 = "dc7ee68f2e28e2b2344bdaabd5810ebfc15353d4013cd10387289189e8bae9f9"; - revision = "2"; - editedCabalFile = "d80ead4c776cec3babb37a69c099560b421e5eb929b9ebe8e433a8fa4ef243ea"; - libraryHaskellDepends = [ - base base-compat carray fft JuicyPixels - ]; - testHaskellDepends = [ - base base-compat carray fft JuicyPixels JuicyPixels-util time - ]; - homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; - description = "Scale JuicyPixels images with DCT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "JuicyPixels-scale-dct" = callPackage ({ mkDerivation, base, base-compat, carray, fft, JuicyPixels, time }: @@ -10400,7 +9924,6 @@ self: { testHaskellDepends = [ base base-compat carray fft JuicyPixels time ]; - doCheck = false; homepage = "https://github.com/phadej/JuicyPixels-scale-dct#readme"; description = "Scale JuicyPixels images with DCT"; license = stdenv.lib.licenses.bsd3; @@ -10430,8 +9953,8 @@ self: { aeson base binary bytestring conduit data-default directory filepath mtl network resourcet ]; - jailbreak = true; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JunkDB-driver-gdbm" = callPackage @@ -10445,7 +9968,6 @@ self: { libraryHaskellDepends = [ base bytestring conduit directory filepath JunkDB mtl resourcet ]; - jailbreak = true; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -10461,8 +9983,8 @@ self: { libraryHaskellDepends = [ base bytestring conduit hashable hashtables JunkDB mtl resourcet ]; - jailbreak = true; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "JustParse" = callPackage @@ -10497,10 +10019,10 @@ self: { version = "0.1"; sha256 = "c662e788017fb8122c3ac36946e95202871f8d7f0130717dd9cbf6ad76ca52a7"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/frosch03/kerbal"; description = "A library with the kerbal space program universe and demo code"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Kalman" = callPackage @@ -10510,10 +10032,10 @@ self: { version = "0.1.0.1"; sha256 = "85e7a6a2a6b7edb257315ddfdb3454f893d6d92ff84f66b91b3a06018d54edd7"; libraryHaskellDepends = [ base hmatrix ]; - jailbreak = true; homepage = "https://github.com/idontgetoutmuch/Kalman"; description = "A slightly extended Kalman filter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "KdTree" = callPackage @@ -10542,7 +10064,6 @@ self: { libraryHaskellDepends = [ base base64-bytestring bytestring directory mime-types network text ]; - jailbreak = true; homepage = "https://github.com/Hamcha/Ketchup"; description = "A super small web framework for those who don't like big and fancy codebases"; license = stdenv.lib.licenses.mit; @@ -10591,7 +10112,6 @@ self: { executableHaskellDepends = [ base curry-base directory haskell-src KiCS KiCS-prophecy ]; - jailbreak = true; homepage = "http://curry-language.org"; description = "debug features for kics"; license = "unknown"; @@ -10608,7 +10128,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base filepath KiCS ]; executableHaskellDepends = [ base KiCS ]; - jailbreak = true; homepage = "http://curry-language.org"; description = "a transformation used by the kics debugger"; license = "unknown"; @@ -10633,7 +10152,6 @@ self: { version = "0.1.0.0"; sha256 = "2623d1b198ae9e56ba3ea50ab7dfe876b73ff288b44fa54292272cc4d5ea7284"; libraryHaskellDepends = [ base containers parsec ]; - jailbreak = true; homepage = "http://www.gkayaalp.com/p/konf.html"; description = "A configuration language and a parser"; license = "unknown"; @@ -10647,10 +10165,10 @@ self: { version = "0.1.0.1"; sha256 = "5c8fa68abb1db66c234dcb378cf0de08b21e3e6a2daaf888feda5a0c0c22d9ac"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/matteoprovenzano/kriens-hs.git"; description = "Category for Continuation Passing Style"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "KyotoCabinet" = callPackage @@ -10682,7 +10200,6 @@ self: { libraryHaskellDepends = [ base cairo containers gtk mtl old-time parsec random ]; - jailbreak = true; homepage = "http://www.entropia.de/wiki/L-seed"; description = "Plant growing programming game"; license = stdenv.lib.licenses.bsd3; @@ -10704,6 +10221,7 @@ self: { homepage = "http://github.com/guaraqe/lats#readme"; description = "Linear Algebra on Typed Spaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openblasCompat;}; "LDAP" = callPackage @@ -10811,7 +10329,6 @@ self: { template-haskell text transformers unordered-containers vector vector-binary-instances zlib ]; - jailbreak = true; homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A game engine library for roguelike dungeon crawlers"; license = stdenv.lib.licenses.bsd3; @@ -10849,7 +10366,6 @@ self: { libraryHaskellDepends = [ base binary bytestring hmatrix random random-shuffle split ]; - jailbreak = true; description = "A configurable and extensible neural network library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -10907,10 +10423,10 @@ self: { sha256 = "652cc0c857d0fc65d405fdc62bd4e84d8bf18e878a2fbf66d79c087d38d3436d"; libraryHaskellDepends = [ base filepath hspec mtl process text ]; testHaskellDepends = [ base filepath hspec mtl process text ]; - jailbreak = true; homepage = "http://venugangireddy.github.io/Lambdajudge/"; description = "A library to easily host Haskell based programming competitions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Lambdaya" = callPackage @@ -10927,6 +10443,7 @@ self: { ]; description = "Library for RedPitaya"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LargeCardinalHierarchy" = callPackage @@ -10936,9 +10453,9 @@ self: { version = "0.0.1"; sha256 = "e221b2bb87d0e64b98a4c134ab868cfcc7e6928ecc5b2c474ecb17385211f829"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "A transfinite cardinal arithmetic library including all known large cardinals"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Lastik" = callPackage @@ -11000,10 +10517,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory filepath unix ]; - jailbreak = true; homepage = "https://github.com/AtticHacker/lazyvault"; description = "A simple sandboxing tool for Haskell packages"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Level0" = callPackage @@ -11015,10 +10532,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory random SDL SDL-ttf ]; - jailbreak = true; homepage = "http://quasimal.com/projects/level_0.html"; description = "A Snake II clone written using SDL"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LibClang" = callPackage @@ -11036,7 +10553,6 @@ self: { ]; librarySystemDepends = [ ncurses ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; homepage = "https://github.com/chetant/LibClang/issues"; description = "Haskell bindings for libclang (a C++ parsing library)"; license = stdenv.lib.licenses.bsd3; @@ -11109,7 +10625,6 @@ self: { aeson base binary cereal QuickCheck stringable test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/choener/LinguisticsTypes"; description = "Collection of types for natural language"; license = stdenv.lib.licenses.bsd3; @@ -11147,28 +10662,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ListLike_4_2_1" = callPackage - ({ mkDerivation, array, base, bytestring, containers, dlist, fmlist - , HUnit, QuickCheck, random, text, vector - }: - mkDerivation { - pname = "ListLike"; - version = "4.2.1"; - sha256 = "d6542ae5bef685e3571cd46b018c5adac2b6c854f72777ddd35a6823bcf08859"; - libraryHaskellDepends = [ - array base bytestring containers dlist fmlist text vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text vector - ]; - doCheck = false; - homepage = "http://software.complete.org/listlike"; - description = "Generic support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ListLike" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string @@ -11186,7 +10679,6 @@ self: { array base bytestring containers dlist fmlist HUnit QuickCheck random text utf8-string vector ]; - doCheck = false; homepage = "http://github.com/JohnLato/listlike"; description = "Generic support for list-like structures"; license = stdenv.lib.licenses.bsd3; @@ -11237,10 +10729,10 @@ self: { version = "0.1.0.0"; sha256 = "0170311de6b6f3f6bc190efd4cbb1ed29fc87920cdcf8f112d398b9880f7f44a"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://gogotanaka.me/"; description = "Logic"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "LogicGrowsOnTrees" = callPackage @@ -11272,7 +10764,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 test-framework-smallcheck time transformers uuid void ]; - jailbreak = true; description = "a parallel implementation of logic programming using distributed tree exploration"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11293,7 +10784,6 @@ self: { MonadCatchIO-transformers stm transformers ]; librarySystemDepends = [ openmpi ]; - jailbreak = true; description = "an adapter for LogicGrowsOnTrees that uses MPI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11318,7 +10808,6 @@ self: { base hslogger hslogger-template HUnit LogicGrowsOnTrees network random stm test-framework test-framework-hunit transformers ]; - jailbreak = true; description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11343,7 +10832,6 @@ self: { base cereal hslogger hslogger-template HUnit LogicGrowsOnTrees random test-framework test-framework-hunit transformers ]; - jailbreak = true; description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11365,7 +10853,6 @@ self: { mtl network old-time parsec pureMD5 random syb template-haskell utf8-string ]; - jailbreak = true; homepage = "http:/lslplus.sourceforge.net/"; description = "An execution and testing framework for the Linden Scripting Language (LSL)"; license = stdenv.lib.licenses.bsd3; @@ -11388,7 +10875,6 @@ self: { directory filepath haskell-src HsOpenSSL hxt mtl network stm time time-http unix zlib ]; - jailbreak = true; homepage = "http://cielonegro.org/Lucu.html"; description = "HTTP Daemonic Library"; license = stdenv.lib.licenses.publicDomain; @@ -11403,9 +10889,9 @@ self: { sha256 = "ec88b0727eb25a3f9a7d5d71dbc3fe9e935cd11a1be698422d7b952a129bbab9"; libraryHaskellDepends = [ base containers mtl ]; testHaskellDepends = [ base containers mtl ]; - jailbreak = true; description = "Generate MASM code from haskell"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MC-Fold-DP" = callPackage @@ -11460,7 +10946,6 @@ self: { version = "0.3.0.0"; sha256 = "6a67398197c1958f06bbb11a3dcd230f29a0ae31191f1a3676fe46a84848925a"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "https://github.com/DanBurton/MHask#readme"; description = "The category of monads"; license = stdenv.lib.licenses.bsd3; @@ -11474,10 +10959,10 @@ self: { version = "0.0.1"; sha256 = "5e9c85341a23a1720beaf0e8ebaef2268ab970211ddd443f3ec4b3031471db13"; libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ]; - jailbreak = true; homepage = "https://github.com/Julek"; description = "Michael-Scott queue"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MTGBuilder" = callPackage @@ -11489,9 +10974,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl parsec ]; - jailbreak = true; description = "Builds decks out of a meta"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MagicHaskeller" = callPackage @@ -11538,10 +11023,10 @@ self: { directory filepath http-conduit http-types lens safe text time transformers vector ]; - jailbreak = true; homepage = "https://github.com/Dananji/MailchimpSimple"; description = "Haskell library to interact with Mailchimp JSON API Version 3.0"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MaybeT" = callPackage @@ -11553,7 +11038,6 @@ self: { revision = "1"; editedCabalFile = "399ec60488680853ace716790b8ebaeee1a74da8a24ced5b5caaea4341b88580"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; description = "MaybeT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11566,7 +11050,6 @@ self: { version = "0.2.0.1"; sha256 = "9d1c094635773a24e6e12b5fa1b0041dd5e997f61bde4cb686c1ca468d4d9b0c"; libraryHaskellDepends = [ base monads-tf transformers ]; - jailbreak = true; description = "MaybeT monad transformer compatible with monads-tf (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11579,7 +11062,6 @@ self: { version = "0.2"; sha256 = "9e4621e689c0cbcbee7f53a5c40cf8d7aabbc982084ca3989eef60df6f433ca1"; libraryHaskellDepends = [ base monads-fd transformers ]; - jailbreak = true; description = "MaybeT monad transformer using transformers instead of mtl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11611,9 +11093,9 @@ self: { version = "0.1"; sha256 = "3c15fad58a94bfa708398ca990179e82ca860f3f3a167effd27d303cf879cb66"; libraryHaskellDepends = [ base vector ]; - jailbreak = true; description = "Mean shift algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Measure" = callPackage @@ -11623,7 +11105,6 @@ self: { version = "0.0.2"; sha256 = "ba090d3a19d6a2426d60e738283a8eccaf5fce096263bf8231fbb2e4e5f4c8ef"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "A library for units of measurement"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11636,10 +11117,10 @@ self: { version = "0.0.0.0"; sha256 = "5c2c92bdb2e808a01430a0b3a4c0e666e6cc644c1f1dd9527c07858a61de0de3"; libraryHaskellDepends = [ base machines ]; - jailbreak = true; homepage = "http://github.com/cartazio/mecha"; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Mechs" = callPackage @@ -11649,10 +11130,10 @@ self: { version = "0.0.0.0"; sha256 = "612a9965148844bdc7c0981d1b3cc1a40a805a9d062362b19cc85adf7cee7503"; libraryHaskellDepends = [ base machines ]; - jailbreak = true; homepage = "http://github.com/cartazio/mecha"; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MemoTrie" = callPackage @@ -11664,12 +11145,24 @@ self: { revision = "1"; editedCabalFile = "035cea173a56cf920ebb4c84b4033d2ea270c1ee24d07ad323b9b2701ebc72e7"; libraryHaskellDepends = [ base ]; - doHaddock = false; homepage = "https://github.com/conal/MemoTrie"; description = "Trie-based memo functions"; license = stdenv.lib.licenses.bsd3; }) {}; + "MemoTrie_0_6_7" = callPackage + ({ mkDerivation, base, newtype-generics }: + mkDerivation { + pname = "MemoTrie"; + version = "0.6.7"; + sha256 = "cdab03dc1394e982dd3144ac433b7548d51a55a1c44ddb864e5ac14057c41672"; + libraryHaskellDepends = [ base newtype-generics ]; + homepage = "https://github.com/conal/MemoTrie"; + description = "Trie-based memo functions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "MetaHDBC" = callPackage ({ mkDerivation, base, convertible, hashtables, HDBC, HDBC-odbc , mtl, template-haskell @@ -11681,9 +11174,9 @@ self: { libraryHaskellDepends = [ base convertible hashtables HDBC HDBC-odbc mtl template-haskell ]; - jailbreak = true; description = "Statically checked database access"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MetaObject" = callPackage @@ -11704,7 +11197,6 @@ self: { version = "0.1.2"; sha256 = "9df832cee4d6fa42667b1ee1a985f2366a1771f84409b7b9414d284af78045cf"; libraryHaskellDepends = [ base hstats ]; - jailbreak = true; homepage = "http://github.com/benhamner/Metrics/"; description = "Evaluation metrics commonly used in supervised machine learning"; license = stdenv.lib.licenses.bsd3; @@ -11725,7 +11217,6 @@ self: { base binary bytestring directory filepath haskell98 mtl old-locale process time ]; - jailbreak = true; description = "Haskell mailing list manager"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11743,7 +11234,6 @@ self: { base bytestring containers GLUtil lens linear OpenGL OpenGLRaw WaveFront ]; - jailbreak = true; description = "OpenGL for dummies"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -11761,9 +11251,9 @@ self: { aeson base bytestring datetime exceptions http-client lens text transformers url wreq xml ]; - jailbreak = true; description = "Interface for Microsoft Translator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MiniAgda" = callPackage @@ -11780,41 +11270,12 @@ self: { array base containers haskell-src-exts mtl pretty ]; executableToolDepends = [ alex happy ]; - jailbreak = true; homepage = "http://www.tcs.ifi.lmu.de/~abel/miniagda/"; description = "A toy dependently typed programming language with type-based termination"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "MissingH_1_3_0_2" = callPackage - ({ mkDerivation, array, base, containers, directory - , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network - , old-locale, old-time, parsec, process, QuickCheck, random - , regex-compat, testpack, time, unix - }: - mkDerivation { - pname = "MissingH"; - version = "1.3.0.2"; - sha256 = "64b870214f406d83e48fa13f58f9e4ebf8b69ae898c99788d2d0f3ebfed55ab2"; - revision = "2"; - editedCabalFile = "e3f9dfdd2ff45ad9877fffe9bc6d9cd1d2e150cc6aa8dfcf4b3c37ea16bacbe3"; - libraryHaskellDepends = [ - array base containers directory filepath hslogger HUnit mtl network - old-locale old-time parsec process random regex-compat time unix - ]; - testHaskellDepends = [ - array base containers directory errorcall-eq-instance filepath - hslogger HUnit mtl network old-locale old-time parsec process - QuickCheck random regex-compat testpack time unix - ]; - doCheck = false; - homepage = "http://software.complete.org/missingh"; - description = "Large utility library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "MissingH" = callPackage ({ mkDerivation, array, base, containers, directory , errorcall-eq-instance, filepath, hslogger, HUnit, mtl, network @@ -11834,7 +11295,6 @@ self: { hslogger HUnit mtl network old-locale old-time parsec process QuickCheck random regex-compat testpack time unix ]; - doCheck = false; homepage = "http://software.complete.org/missingh"; description = "Large utility library"; license = stdenv.lib.licenses.bsd3; @@ -11935,10 +11395,10 @@ self: { libraryHaskellDepends = [ base extensible-exceptions MonadCatchIO-transformers ]; - jailbreak = true; homepage = "http://darcsden.com/jcpetruzza/MonadCatchIO-mtl"; description = "Monad-transformer version of the Control.Exception module"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadCatchIO-mtl-foreign" = callPackage @@ -11948,7 +11408,6 @@ self: { version = "0.1"; sha256 = "56c9f548cc2cae4a40f55997e56dd28020ec558217df6d6d4db4bf28c32ed849"; libraryHaskellDepends = [ base MonadCatchIO-mtl mtl primitive ]; - jailbreak = true; description = "Polymorphic combinators for working with foreign functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -11965,9 +11424,9 @@ self: { libraryHaskellDepends = [ base extensible-exceptions monads-tf transformers ]; - jailbreak = true; description = "Monad-transformer compatible version of the Control.Exception module"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadCatchIO-transformers-foreign" = callPackage @@ -11981,7 +11440,6 @@ self: { libraryHaskellDepends = [ base MonadCatchIO-transformers primitive transformers ]; - jailbreak = true; description = "Polymorphic combinators for working with foreign functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -12000,10 +11458,10 @@ self: { base data-default ghc-prim kan-extensions mmorph monad-products mtl parallel random transformers transformers-compat ]; - jailbreak = true; homepage = "http://alkalisoftware.net"; description = "Methods for composing monads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MonadLab" = callPackage @@ -12068,10 +11526,10 @@ self: { version = "0.1.0.3"; sha256 = "9fbd6311057ae23e48894ea61b87b8af2a263c1ffc91f2abc563d7de4e60563b"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; homepage = "https://github.com/bhurt/MonadStack"; description = "Generalizing lift to monad stacks"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Monadius" = callPackage @@ -12127,7 +11585,6 @@ self: { version = "1.0"; sha256 = "605bcdc40eaa189f9f4e447b0de931a62860149a91f36098959c76b2bff36d6b"; libraryHaskellDepends = [ base Monatron transformers ]; - jailbreak = true; homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO"; description = "MonadIO instances for the Monatron transformers"; license = stdenv.lib.licenses.bsd3; @@ -12256,9 +11713,9 @@ self: { version = "0.1.0.1"; sha256 = "2b0b964aad3898d2053d411f93f8cf52f85ce57b73cbd41d2c112d98f119bb4c"; libraryHaskellDepends = [ array base bimap containers Munkres ]; - jailbreak = true; description = "Simple and typesafe layer over the Munkres package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "MusicBrainz" = callPackage @@ -12303,10 +11760,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "http://afonso.xyz"; description = "Generate all primes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NGrams" = callPackage @@ -12335,7 +11792,6 @@ self: { arithmoi base bytestring containers crypto-api polynomial random SHA split ]; - jailbreak = true; description = "NTRU Cryptography"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -12387,6 +11843,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "NameGenerator" = callPackage + ({ mkDerivation, base, containers, random }: + mkDerivation { + pname = "NameGenerator"; + version = "0.0.1"; + sha256 = "2e7983afdeebabd32562b26cfc1b133aa7967174c65a671ac5b4bbd60949ecff"; + libraryHaskellDepends = [ base containers random ]; + homepage = "http://github.com/pommicket/name-generator-haskell"; + description = "A name generator written in Haskell"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "NanoProlog" = callPackage ({ mkDerivation, base, containers, ListLike, uu-parsinglib }: mkDerivation { @@ -12397,9 +11865,9 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers ListLike uu-parsinglib ]; executableHaskellDepends = [ base uu-parsinglib ]; - jailbreak = true; description = "Very small interpreter for a Prolog-like language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NaturalLanguageAlphabets" = callPackage @@ -12424,7 +11892,6 @@ self: { test-framework test-framework-quickcheck2 test-framework-th text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/choener/NaturalLanguageAlphabets"; description = "Simple scoring schemes for word alignments"; license = stdenv.lib.licenses.bsd3; @@ -12456,7 +11923,6 @@ self: { executableHaskellDepends = [ base containers ContextAlgebra lattices multiset QuickCheck ]; - jailbreak = true; description = "Context Algebra of near"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -12480,9 +11946,9 @@ self: { base bytestring cereal containers directory hashable messagepack network stm vector ]; - jailbreak = true; description = "Simple networked key/value store"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NestedFunctor" = callPackage @@ -12492,10 +11958,10 @@ self: { version = "0.2.0.2"; sha256 = "651c4617b2bcb9cedff0a8e52c9ecda1177b65b5a9bce4390b16cfae2010bbce"; libraryHaskellDepends = [ base comonad distributive ]; - jailbreak = true; homepage = "https://github.com/kwf/NestedFunctor"; description = "Nested composition of functors with a type index tracking nesting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "NestedSampling" = callPackage @@ -12525,28 +11991,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) net_snmp;}; - "Network-NineP_0_4_0" = callPackage - ({ mkDerivation, base, binary, bytestring, containers, convertible - , exceptions, monad-loops, monad-peel, mstate, mtl, network, NineP - , regex-posix, stateref, transformers - }: - mkDerivation { - pname = "Network-NineP"; - version = "0.4.0"; - sha256 = "2d7e78e03feeb484d5812a3a8cef5f248d26e9daad8b7fe535516f6ec20dd7c0"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring containers convertible exceptions - monad-loops monad-peel mstate mtl network NineP regex-posix - stateref transformers - ]; - jailbreak = true; - description = "High-level abstraction over 9P protocol"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Network-NineP" = callPackage ({ mkDerivation, base, binary, bytestring, containers, convertible , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl @@ -12574,7 +12018,6 @@ self: { version = "0.2.1"; sha256 = "f8d3db5b0c70c2641bb8725764b6298c51dffa0a1c17d7e5e98c31d4270ce732"; libraryHaskellDepends = [ array base integer ]; - jailbreak = true; description = "A binary I/O library"; license = "unknown"; broken = true; @@ -12606,7 +12049,6 @@ self: { base binary bytestring containers filepath gloss network networked-game random ]; - jailbreak = true; homepage = "http://github.com/glguy/ninjas"; description = "Ninja game"; license = stdenv.lib.licenses.bsd3; @@ -12628,7 +12070,6 @@ self: { array base containers criterion dph-base dph-prim-seq statistics storablevector template-haskell uvector vector ]; - jailbreak = true; homepage = "http://code.haskell.org/NoSlow"; description = "Microbenchmarks for various array libraries"; license = stdenv.lib.licenses.bsd3; @@ -12674,7 +12115,6 @@ self: { base directory exceptions filepath hint-server mtl network Nomyx-Core Nomyx-Language Nomyx-Web safe stm time ]; - jailbreak = true; homepage = "http://www.nomyx.net"; description = "A Nomic game in haskell"; license = stdenv.lib.licenses.bsd3; @@ -12702,7 +12142,6 @@ self: { Nomyx-Language old-locale random safe safecopy stm tar template-haskell temporary text time unix ]; - jailbreak = true; homepage = "http://www.nomyx.net"; description = "A Nomic game in haskell"; license = stdenv.lib.licenses.bsd3; @@ -12723,7 +12162,6 @@ self: { DebugTraceHelpers ghc mtl old-locale random safe time time-recurrence ]; - jailbreak = true; homepage = "http://www.nomyx.net"; description = "Language to express rules for Nomic"; license = stdenv.lib.licenses.bsd3; @@ -12766,7 +12204,6 @@ self: { reform-happstack safe split stm text time web-routes web-routes-happstack web-routes-regular web-routes-th ]; - jailbreak = true; homepage = "http://www.nomyx.net"; description = "Web gui for Nomyx"; license = stdenv.lib.licenses.bsd3; @@ -12875,7 +12312,6 @@ self: { libraryHaskellDepends = [ ADPfusion base ghc-prim mtl primitive PrimitiveArray vector ]; - jailbreak = true; homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion"; description = "Nussinov78 using the ADPfusion library"; license = stdenv.lib.licenses.gpl3; @@ -12889,10 +12325,10 @@ self: { version = "0.1"; sha256 = "b28cd8c652a0588c8db01547fd426ab3720ad9cf6796a2ccbcb2fce67fe9f8d4"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/frosch03/Nutri"; description = "A little library to calculate nutrition values of food items"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OGL" = callPackage @@ -12994,7 +12430,6 @@ self: { base containers cuda language-c-quote mainland-pretty mtl mwc-random process rdtsc text value-supply vector ]; - jailbreak = true; homepage = "https://github.com/svenssonjoel/Obsidian"; description = "Embedded language for GPU Programming"; license = stdenv.lib.licenses.bsd3; @@ -13118,7 +12553,6 @@ self: { librarySystemDepends = [ OpenCL ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "https://github.com/IFCA/opencl"; description = "Haskell high-level wrapper for OpenCL"; license = stdenv.lib.licenses.bsd3; @@ -13132,7 +12566,6 @@ self: { version = "1.0.1001"; sha256 = "07501b636c29dcec37992e008f09f0cb5dafcaa83d1db9e0605c8edb6ba636a9"; libraryHaskellDepends = [ base bytestring mtl ]; - jailbreak = true; homepage = "http://vis.renci.org/jeff/opencl"; description = "The OpenCL Standard for heterogenous data-parallel computing"; license = stdenv.lib.licenses.bsd3; @@ -13146,10 +12579,10 @@ self: { version = "0.1.0.3"; sha256 = "1a913126fdf547e8c895aef4c29aac65aa901138e4dd095b70925c3da5119576"; libraryHaskellDepends = [ base bytestring mtl ]; - jailbreak = true; homepage = "https://github.com/jkarlson/OpenCLWrappers"; description = "The OpenCL Standard for heterogenous data-parallel computing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OpenGL" = callPackage @@ -13183,32 +12616,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "OpenGLRaw_3_2_1_0" = callPackage - ({ mkDerivation, base, bytestring, containers, fixed, half, mesa - , text, transformers - }: - mkDerivation { - pname = "OpenGLRaw"; - version = "3.2.1.0"; - sha256 = "a1554684460bd34b2e031cfc5f5e5388e6266f67482bd77829575b5b8b339afe"; - libraryHaskellDepends = [ - base bytestring containers fixed half text transformers - ]; - librarySystemDepends = [ mesa ]; - homepage = "http://www.haskell.org/haskellwiki/Opengl"; - description = "A raw binding for the OpenGL graphics system"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) mesa;}; - "OpenGLRaw" = callPackage ({ mkDerivation, base, bytestring, containers, fixed, half, mesa , text, transformers }: mkDerivation { pname = "OpenGLRaw"; - version = "3.2.2.0"; - sha256 = "65df144730044166fd8ea2f81470d71e6c5026a7c31df6be45aac9e6ddf93771"; + version = "3.2.3.0"; + sha256 = "e64cb1b8ea0f87857e44396fb948751bdcace2a1c924875c8aa91b20e4d90ba3"; libraryHaskellDepends = [ base bytestring containers fixed half text transformers ]; @@ -13225,7 +12640,6 @@ self: { version = "2.0.0.2"; sha256 = "e1af60d7b2b931310b8c04427993b8ea072230d1acdf851cffad506e25e7cfcd"; libraryHaskellDepends = [ OpenGLRaw ]; - jailbreak = true; description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -13272,7 +12686,6 @@ self: { version = "0.4.0"; sha256 = "a2971a855bb8eae79b87e0e43f417bcace87619d5fcd569fe96674e1d02aafb9"; libraryHaskellDepends = [ base OpenGLRaw ]; - jailbreak = true; homepage = "http://code.google.com/p/copperbox/"; description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation)."; license = stdenv.lib.licenses.bsd3; @@ -13286,7 +12699,6 @@ self: { version = "1.0"; sha256 = "130b8ce62168206b8feb0506a6804dc86a171391f6ea9f821c9cf7f6330508ad"; libraryHaskellDepends = [ array base containers mtl ]; - jailbreak = true; homepage = "http://math.stanford.edu/~mik/operads"; description = "Groebner basis computation for Operads"; license = stdenv.lib.licenses.bsd3; @@ -13316,9 +12728,9 @@ self: { base containers haskell-src-exts haskell-src-meta mtl split syb template-haskell ]; - jailbreak = true; description = "A quasiquoter for or-patterns"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "OrchestrateDB" = callPackage @@ -13336,7 +12748,6 @@ self: { aeson base bytestring HTTP http-conduit http-types lifted-base random ]; - jailbreak = true; homepage = "https://github.com/dwd31415/Haskell-OrchestrateDB"; description = "Unofficial Haskell Client Library for the Orchestrate.io API"; license = stdenv.lib.licenses.bsd3; @@ -13395,9 +12806,9 @@ self: { revision = "1"; editedCabalFile = "6e8829aa00d16484705a23417f548b237aa1bd152c864a7cfa6948996584db3e"; libraryHaskellDepends = [ base binary bytestring Crypto random ]; - jailbreak = true; description = "Make password-based security schemes more secure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PCLT" = callPackage @@ -13452,9 +12863,9 @@ self: { version = "0.0.4"; sha256 = "b3841e572ab3dd8648938b6dbc566c9a7df6aa40f3a3e6d6ea28f267e9a94c04"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "A generic derivable Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PSQueue" = callPackage @@ -13500,7 +12911,6 @@ self: { persistent persistent-sqlite persistent-template pwstore-fast random smtp-mail text time transformers ]; - jailbreak = true; description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -13547,9 +12957,9 @@ self: { base crypto-numbers crypto-random HUnit QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; description = "a simple Paillier cryptosystem"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PandocAgda" = callPackage @@ -13567,7 +12977,6 @@ self: { QuickCheck text time xhtml ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "Pandoc support for literate Agda"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -13659,10 +13068,10 @@ self: { version = "0.1.0.0"; sha256 = "fc436e7823fb378cedea25e52715245ecd647995c7066e3c54c189782bf59d8a"; libraryHaskellDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "https://github.com/VictorDenisov/PasswordGenerator"; description = "Simple library for generating passwords"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PastePipe" = callPackage @@ -13692,10 +13101,10 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/pjrt/PathTree#readme"; description = "A tree used to merge and maintain paths"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Pathfinder" = callPackage @@ -13729,9 +13138,9 @@ self: { version = "0.1.0.0"; sha256 = "ef55355140c40adccaa566c214e1d2fb60c3efb539216c1f4134bf21349703bd"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "GADT type witnesses for Peano-style natural numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "PerfectHash" = callPackage @@ -13758,7 +13167,6 @@ self: { version = "0.2"; sha256 = "94f8e7b2b24e48acd8e90a145981af7eb7563fc5ae932282181370bbf0d6b552"; libraryHaskellDepends = [ base ReplicateEffects ]; - jailbreak = true; homepage = "https://github.com/MedeaMelana/PermuteEffects"; description = "Permutations of effectful computations"; license = stdenv.lib.licenses.bsd3; @@ -13785,7 +13193,6 @@ self: { old-locale process regex-base regex-pcre safecopy string-conversions temporary text time ]; - jailbreak = true; homepage = "localhost:9119"; description = "Personal Happstack Server Utils"; license = stdenv.lib.licenses.gpl3; @@ -13847,9 +13254,9 @@ self: { libraryHaskellDepends = [ base HUnit MonadRandom QuickCheck random-shuffle ]; - jailbreak = true; description = "Playing cards api"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Plot-ho-matic" = callPackage @@ -13930,20 +13337,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "PortMidi_0_1_6_0" = callPackage - ({ mkDerivation, alsaLib, base }: - mkDerivation { - pname = "PortMidi"; - version = "0.1.6.0"; - sha256 = "54599bc0377847ab17b175641023ec495587ca82807fd2360e17f4c5575814b1"; - libraryHaskellDepends = [ base ]; - librarySystemDepends = [ alsaLib ]; - homepage = "http://haskell.org/haskellwiki/PortMidi"; - description = "A binding for PortMedia/PortMidi"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) alsaLib;}; - "PortMidi" = callPackage ({ mkDerivation, alsaLib, base }: mkDerivation { @@ -14010,10 +13403,10 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/choener/PrimitiveArray-Pretty"; description = "Pretty-printing for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Printf-TH" = callPackage @@ -14218,10 +13611,10 @@ self: { version = "0.1.0.0"; sha256 = "87d899997011c59e0f1f1a7efa434aa026e5c67f13681cdbe68ac8d300db736d"; libraryHaskellDepends = [ base random vector ]; - jailbreak = true; homepage = "poincare.github.io/QLearn"; description = "A library for fast, easy-to-use Q-learning"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "QuadEdge" = callPackage @@ -14244,7 +13637,6 @@ self: { sha256 = "ce22be7f089d90babe9e46217cc99cb5da0c7771739423e7c6cec3b94da294e2"; libraryHaskellDepends = [ base composition lens ]; testHaskellDepends = [ base composition lens QuickCheck ]; - jailbreak = true; description = "QuadTree library for Haskell, with lens support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -14298,7 +13690,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base haskell-src-exts ]; - jailbreak = true; homepage = "http://code.haskell.org/QuickAnnotate/"; description = "Annotation Framework"; license = stdenv.lib.licenses.bsd3; @@ -14314,7 +13705,6 @@ self: { revision = "2"; editedCabalFile = "8f06f07cae74e90cd5bdde3eed23b0e3293ad494f42f0f0cb77074fa3b7950d9"; libraryHaskellDepends = [ base random ]; - jailbreak = true; homepage = "http://www.math.chalmers.se/~rjmh/QuickCheck/"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; @@ -14340,21 +13730,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "QuickCheck_2_9_1" = callPackage + "QuickCheck_2_9_2" = callPackage ({ mkDerivation, base, containers, random, template-haskell , test-framework, tf-random, transformers }: mkDerivation { pname = "QuickCheck"; - version = "2.9.1"; - sha256 = "f8769cbef895a67f9bd1ac554faa577e6c1fb41e271425880a759009e454d05f"; + version = "2.9.2"; + sha256 = "155c1656f583bc797587846ee1959143d2b1b9c88fbcb9d3f510f58d8fb93685"; libraryHaskellDepends = [ base containers random template-haskell tf-random transformers ]; testHaskellDepends = [ base containers template-haskell test-framework ]; - jailbreak = true; homepage = "https://github.com/nick8325/quickcheck"; description = "Automatic testing of Haskell programs"; license = stdenv.lib.licenses.bsd3; @@ -14449,7 +13838,6 @@ self: { base directory filepath pandoc-types process split ]; executableHaskellDepends = [ base pandoc-types ]; - jailbreak = true; description = "A pandoc filter to express R plots inside markdown"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -14495,7 +13883,6 @@ self: { base HDBC HDBC-postgresql mtl old-time parsec redHandlers xhtml yuiGrid ]; - jailbreak = true; description = "A framework for writing RESTful applications"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -14596,7 +13983,6 @@ self: { base Biobase BiobaseTurner BiobaseTypes BiobaseVienna cmdargs containers HsTools primitive PrimitiveArray RNAFold split vector ]; - jailbreak = true; description = "RNA secondary structure folding"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -14675,9 +14061,9 @@ self: { directory either-unwrap filepath process random split time vector ViennaRNAParser ]; - jailbreak = true; description = "Unsupervized construction of RNA family models"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "RNAwolf" = callPackage @@ -14696,7 +14082,6 @@ self: { directory parallel PrimitiveArray random StatisticalMethods vector ]; executableHaskellDepends = [ cmdargs split ]; - jailbreak = true; homepage = "http://www.tbi.univie.ac.at/software/rnawolf/"; description = "RNA folding with non-canonical basepairs and base-triplets"; license = stdenv.lib.licenses.gpl3; @@ -14793,9 +14178,9 @@ self: { version = "0.1.0.0"; sha256 = "10e7ee42c0e9670e13fdc955ebbbe6afc5532fd6a664291352eb97a31128a91c"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Data structure for managing ranges"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Ranged-sets" = callPackage @@ -14875,11 +14260,10 @@ self: { libraryHaskellDepends = [ base system-filepath text ]; executableHaskellDepends = [ base system-filepath text ]; testHaskellDepends = [ base hspec system-filepath text ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/rampion/ReadArgs"; description = "Simple command line argument parsing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Redmine" = callPackage @@ -14915,7 +14299,6 @@ self: { version = "0.1.1.0"; sha256 = "15920fe1123d96b8717710e170d4095fe9fca1de0a4e6d045b6a35bfe49a1197"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "https://bitbucket.org/carter/ref"; description = "Generic Mutable Ref Abstraction Layer"; license = stdenv.lib.licenses.bsd3; @@ -14953,7 +14336,6 @@ self: { executableHaskellDepends = [ base cmdargs cond containers directory ]; - jailbreak = true; homepage = "https://github.com/pablocouto/Referees"; description = "A utility for computing distributions of material to review among reviewers"; license = stdenv.lib.licenses.gpl3; @@ -15014,10 +14396,10 @@ self: { version = "0.1.0.0"; sha256 = "5caa6c1b74782a5ed2f1d43d389a6a56c92e343c3e1437a95226e4c227a3b718"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/avieth/RichConditional"; description = "Tiny library to replace classic if/else"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Rlang-QQ" = callPackage @@ -15038,7 +14420,6 @@ self: { utf8-string vector zlib ]; testHaskellDepends = [ base directory doctest hspec lens vector ]; - doCheck = false; homepage = "http://code.haskell.org/~aavogt/Rlang-QQ"; description = "quasiquoter for inline-R code"; license = stdenv.lib.licenses.bsd3; @@ -15120,10 +14501,10 @@ self: { version = "0.1.0.0"; sha256 = "896fbdaa6db59df65666f68d622841d4df46196b207eb1e37d5b592850767537"; libraryHaskellDepends = [ base containers text time ]; - jailbreak = true; homepage = "https://github.com/sebasHack/SCalendar"; description = "Library for managing calendars and resource availability"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SConfig" = callPackage @@ -15224,7 +14605,6 @@ self: { sha256 = "06a20c0c8652c3c2ed53db5e638c44cb7b3f2199bc490324dfb72001e344cf0e"; libraryHaskellDepends = [ base SDL2 ]; librarySystemDepends = [ SDL2_ttf ]; - jailbreak = true; description = "Binding to libSDL-ttf"; license = stdenv.lib.licenses.mit; broken = true; @@ -15237,8 +14617,8 @@ self: { }: mkDerivation { pname = "SFML"; - version = "2.3.2.2"; - sha256 = "b61578cc1bc95554aca715ed0ae15eadf89dbf3fe49866541903d384387fdf2d"; + version = "2.3.2.4"; + sha256 = "0aad64bf7b91f5cc212e80982578c626e8d1aedc97a1487aa3bb45460a5f5bc3"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ csfml-audio csfml-graphics csfml-network csfml-system csfml-window @@ -15300,7 +14680,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT OpenGL SG ]; - jailbreak = true; description = "An example of using the SG and OpenGL libraries"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -15375,7 +14754,6 @@ self: { base bindings-DSL containers data-default lens mtl transformers ]; libraryToolDepends = [ c2hsc ]; - jailbreak = true; homepage = "http://www.snet-home.org/"; description = "Declarative coördination language for streaming networks"; license = stdenv.lib.licenses.lgpl3; @@ -15433,7 +14811,6 @@ self: { executableHaskellDepends = [ base haskell98 language-c pretty svgutils syb xml ]; - jailbreak = true; homepage = "http://www.informatik.uni-kiel.de/~jgr/svg2q"; description = "Code generation tool for Quartz code from a SVG"; license = stdenv.lib.licenses.bsd3; @@ -15504,6 +14881,7 @@ self: { homepage = "https://github.com/siddhanathan/SWMMoutGetMB"; description = "A parser for SWMM 5 binary .OUT files"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SableCC2Hs" = callPackage @@ -15521,9 +14899,9 @@ self: { array base containers filepath loch-th pretty text transformers wl-pprint-text xml ]; - jailbreak = true; description = "Generate a parser (in Haskell) with the SableCC parser generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Safe" = callPackage @@ -15623,7 +15001,6 @@ self: { base bytestring directory filepath HFuse hsyslog process regex-compat sqlite-simple unix ]; - jailbreak = true; homepage = "http://github.com/hirschenberger/ScratchFS"; description = "Size limited temp filesystem based on fuse"; license = stdenv.lib.licenses.gpl3; @@ -15675,7 +15052,6 @@ self: { base bytestring classify containers mongoDB mtl network process split tagsoup text ]; - jailbreak = true; description = "Command-line tool for maintaining the Semantique database"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -15716,7 +15092,6 @@ self: { libraryHaskellDepends = [ base directory filepath hslogger mtl old-locale random time ]; - jailbreak = true; description = "Easy Loggingframework"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -15888,7 +15263,6 @@ self: { libraryHaskellDepends = [ base GLFW JuicyPixels OpenGL SimpleH vector ]; - jailbreak = true; description = "A Simple Graphics Library from the SimpleH framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -15906,7 +15280,6 @@ self: { base bytestring clock containers cpu directory filepath network time unix ]; - jailbreak = true; description = "A light, clean and powerful Haskell utility library"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -15949,7 +15322,6 @@ self: { executableHaskellDepends = [ base cmdargs dyre transformers wai-routes warp ]; - jailbreak = true; description = "A simple static file server, for when apache is overkill"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -15978,7 +15350,6 @@ self: { base colour diagrams-lib diagrams-svg file-embed regex-applicative ]; testHaskellDepends = [ base file-embed ]; - jailbreak = true; description = "Generate slides from Haskell code"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -15995,7 +15366,6 @@ self: { libraryHaskellDepends = [ base containers DifferenceLogic FirstOrderTheory HUnit Proper ]; - jailbreak = true; description = "A tiny, lazy SMT solver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -16008,10 +15378,10 @@ self: { version = "0.1.0.0"; sha256 = "6133bcb354742ffc6b46e221887a1c3935768a975cd02966c46e2dab06fdad72"; libraryHaskellDepends = [ base parsec transformers ]; - jailbreak = true; homepage = "https://github.com/MfesGA/HsmtlibParser"; description = "Library for parsing SMTLIB2"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Snusmumrik" = callPackage @@ -16032,7 +15402,6 @@ self: { ]; executableSystemDepends = [ zip ]; executableToolDepends = [ cpphs ]; - jailbreak = true; homepage = "http://bitbucket.org/jetxee/snusmumrik/"; description = "E-library directory based on FUSE virtual file system"; license = stdenv.lib.licenses.bsd3; @@ -16051,7 +15420,6 @@ self: { base concurrent-supply containers monad-coroutine mtl stm transformers ]; - jailbreak = true; homepage = "http://www.soos-project.eu/"; description = "Abstract full system simulator"; license = stdenv.lib.licenses.bsd3; @@ -16072,7 +15440,6 @@ self: { base base-unicode-symbols binary derive directory mtl process random zlib ]; - jailbreak = true; homepage = "http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html"; description = "Football simulation framework for teaching functional programming"; license = stdenv.lib.licenses.bsd3; @@ -16093,7 +15460,6 @@ self: { base base-unicode-symbols binary GLUT OpenGL process random SoccerFun ]; - jailbreak = true; homepage = "http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html"; description = "OpenGL UI for the SoccerFun framework"; license = stdenv.lib.licenses.bsd3; @@ -16108,10 +15474,10 @@ self: { sha256 = "aa7daf85955ef1db716594997e5cb3b7bc13b0c65be372e82c83d60339e10a3b"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "https://github.com/Zigazou/Sonnex"; description = "Sonnex is an alternative to Soundex for french language"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SourceGraph" = callPackage @@ -16128,7 +15494,6 @@ self: { base Cabal containers directory fgl filepath Graphalyze graphviz haskell-src-exts mtl multiset random ]; - jailbreak = true; description = "Static code analysis using graph-theoretic techniques"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -16147,7 +15512,6 @@ self: { ALUT base bytestring cairo containers filepath GLFW-b gtk3 JuicyPixels OpenAL OpenGL vector Win32 ]; - jailbreak = true; description = "Assorted utility modules"; license = stdenv.lib.licenses.mit; }) {}; @@ -16183,7 +15547,6 @@ self: { base containers enummapset-th filepath LambdaHack template-haskell text ]; - jailbreak = true; homepage = "https://github.com/tuturto/space-privateers"; description = "Simple space pirate roguelike"; license = stdenv.lib.licenses.bsd3; @@ -16197,10 +15560,10 @@ self: { version = "0.0.1"; sha256 = "22060672e6d23e14116b1925b3357d92d91adb1b956f2b7c75784ca192c9c9e5"; libraryHaskellDepends = [ base monad-loops ref-mtl stm ]; - jailbreak = true; homepage = "https://github.com/Julek"; description = "Lock free Spin Counter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spintax" = callPackage @@ -16215,39 +15578,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock_0_10_0_1" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, bytestring - , case-insensitive, containers, crypto-random, directory, focus - , hashable, hspec, hspec-wai, http-types, hvect, list-t - , monad-control, mtl, old-locale, path-pieces, random, reroute - , resource-pool, resourcet, stm, stm-containers, text, time - , transformers, transformers-base, unordered-containers, vault, wai - , wai-extra, warp - }: - mkDerivation { - pname = "Spock"; - version = "0.10.0.1"; - sha256 = "ef80deb37728e89369f34c3a8cc9c4190d8aa50911a08a9e1e0c1993466595d2"; - revision = "1"; - editedCabalFile = "4c9fc2e3aae3df4e64c014a0fcba192dda7e1bd244c87145e0723bf0c6b2abf4"; - libraryHaskellDepends = [ - aeson base base64-bytestring bytestring case-insensitive containers - crypto-random directory focus hashable http-types hvect list-t - monad-control mtl old-locale path-pieces random reroute - resource-pool resourcet stm stm-containers text time transformers - transformers-base unordered-containers vault wai wai-extra warp - ]; - testHaskellDepends = [ - base base64-bytestring bytestring hspec hspec-wai http-types - reroute stm text time unordered-containers wai wai-extra - ]; - jailbreak = true; - homepage = "http://www.spock.li"; - description = "Another Haskell web framework for rapid development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, containers , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect @@ -16299,7 +15629,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring ghcjs-base hvect Spock-api text ]; - jailbreak = true; homepage = "https://www.spock.li"; description = "Another Haskell web framework for rapid development"; license = stdenv.lib.licenses.bsd3; @@ -16325,7 +15654,6 @@ self: { version = "0.2.0.1"; sha256 = "a05fdae300281affe0ca45c2f2338f62afdd01da5ea8bf7c8a1958895ba199ed"; libraryHaskellDepends = [ base http-types Spock text time ]; - jailbreak = true; homepage = "https://github.com/agrafix/Spock-auth"; description = "Provides authentification helpers for Spock"; license = stdenv.lib.licenses.bsd3; @@ -16358,27 +15686,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock-digestive_0_2_0_0" = callPackage - ({ mkDerivation, base, digestive-functors, http-types, mtl, Spock - , text, unordered-containers, wai - }: - mkDerivation { - pname = "Spock-digestive"; - version = "0.2.0.0"; - sha256 = "e5571d88d7b9dcafc7f5c364c8499a1d8d698d1698f2615b5f26698c85080260"; - revision = "1"; - editedCabalFile = "040e9c024b49a598fe3fa0a5aa2593e601c1d47b16986d7a52de079c7dac0c35"; - libraryHaskellDepends = [ - base digestive-functors http-types mtl Spock text - unordered-containers wai - ]; - jailbreak = true; - homepage = "https://github.com/agrafix/Spock-digestive"; - description = "Digestive functors support for Spock"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock-digestive" = callPackage ({ mkDerivation, base, digestive-functors, http-types, mtl , Spock-core, text, unordered-containers, wai @@ -16394,6 +15701,7 @@ self: { homepage = "https://github.com/agrafix/Spock-digestive"; description = "Digestive functors support for Spock"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Spock-lucid" = callPackage @@ -16410,28 +15718,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "Spock-worker_0_3_0_0" = callPackage - ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl - , Spock, stm, text, time, transformers, vector - }: - mkDerivation { - pname = "Spock-worker"; - version = "0.3.0.0"; - sha256 = "f5ec5c09125a6dd6c6cd0534a1eb7bc0d6bfe9908f7328d999bf14bd785835f3"; - revision = "1"; - editedCabalFile = "4e69af8f88f8afd53d7c02d5fb5171de1f584e039d638b15b223e3e6f1a434c5"; - libraryHaskellDepends = [ - base containers errors lifted-base mtl Spock stm text time - transformers vector - ]; - testHaskellDepends = [ base containers HTF stm vector ]; - jailbreak = true; - homepage = "http://github.com/agrafix/Spock-worker"; - description = "Background workers for Spock"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "Spock-worker" = callPackage ({ mkDerivation, base, containers, errors, HTF, lifted-base, mtl , Spock, stm, text, time, transformers, vector @@ -16484,10 +15770,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/zcourts/Stasis"; description = "A simple MVCC like library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "StateVar" = callPackage @@ -16550,9 +15836,9 @@ self: { version = "1.6.0.3"; sha256 = "fc378082e94514decc28de2820c498986d53a61b359d3b3c9189fa591af92cb2"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "An abstract data type designed for the exchange of tree-like data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Strafunski-Sdf2Haskell" = callPackage @@ -16569,7 +15855,6 @@ self: { base directory haskell-src mtl pretty process Strafunski-ATermLib Strafunski-StrategyLib template-haskell ]; - jailbreak = true; description = "Converts SDF to Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -16599,10 +15884,10 @@ self: { parsec text transformers ]; testHaskellDepends = [ base blaze-builder bytestring hspec text ]; - jailbreak = true; homepage = "https://github.com/hansonkd/StrappedTemplates"; description = "General purpose templates in haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "StrategyLib" = callPackage @@ -16647,9 +15932,9 @@ self: { version = "0.1.0.0"; sha256 = "9208f603ae362ab0788b7f61aa424e7b929e4eaaea97b6eca0a1b83c51eaacdb"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "String manipulation utilities"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SuffixStructures" = callPackage @@ -16670,7 +15955,6 @@ self: { executableHaskellDepends = [ aeson base binary bytestring cereal cmdargs containers vector ]; - jailbreak = true; homepage = "http://www.bioinf.uni-leipzig.de/~choener/"; description = "Suffix array construction"; license = stdenv.lib.licenses.bsd3; @@ -16688,9 +15972,9 @@ self: { libraryHaskellDepends = [ base containers mtl syb-with-class template-haskell TypeCompose ]; - jailbreak = true; description = "Library which aids constructing generic (SYB3-based) widgets"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "SyntaxMacros" = callPackage @@ -16763,7 +16047,6 @@ self: { base containers deepseq fgl free hmatrix integration list-extras mtl numeric-tools parallel ]; - jailbreak = true; description = "Utilities for condensed matter physics tight binding calculations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -16792,7 +16075,6 @@ self: { version = "0.1.1.0"; sha256 = "545725746fa7ea7d77cdb1447a1f2564ddfe36624c8a3118a7e8d0b009ef2462"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; description = "TH implementation of effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -16862,7 +16144,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cookbook ]; - jailbreak = true; description = "A client for Quill databases"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -16933,10 +16214,10 @@ self: { version = "0.4.0.0"; sha256 = "77199900d9deff059a92de2e10f13e55b2c4e074ddd16714c1c3b2c88ea1c6b4"; libraryHaskellDepends = [ base comonad distributive Stream ]; - jailbreak = true; homepage = "https://github.com/kwf/Tape"; description = "Bidirectionally infinite streams, akin to the tape of a Turing machine"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Taxonomy" = callPackage @@ -16973,6 +16254,7 @@ self: { ]; description = "Tool for parsing, processing, comparing and visualizing taxonomy data"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TeaHS" = callPackage @@ -17084,7 +16366,6 @@ self: { libraryHaskellDepends = [ base binary bytestring ghc-prim HTTP network ]; - jailbreak = true; homepage = "http://thrift.apache.org"; description = "Haskell bindings for the Apache Thrift RPC system"; license = "unknown"; @@ -17131,6 +16412,7 @@ self: { libraryHaskellDepends = [ base binary bytestring dataenc ]; description = "TigerHash with C implementation"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TimePiece" = callPackage @@ -17189,7 +16471,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers matrix random ]; - jailbreak = true; description = "Game for Lounge Marmelade"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -17224,7 +16505,6 @@ self: { base containers mtl QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/clux/tournament.hs"; description = "Tournament related algorithms"; license = stdenv.lib.licenses.mit; @@ -17256,7 +16536,6 @@ self: { libraryHaskellDepends = [ base haskell-src-exts mtl parsec ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "https://github.com/remysucre/TransformeR#readme"; description = "eDSL in R for Safe Variable Transformarion"; license = stdenv.lib.licenses.bsd3; @@ -17272,10 +16551,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers mtl ]; - jailbreak = true; homepage = "https://github.com/mgrabmueller/TransformersStepByStep"; description = "Tutorial on monad transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Transhare" = callPackage @@ -17296,10 +16575,10 @@ self: { version = "0.0.2"; sha256 = "54fd5c837a9193e97d490ec3169f5cb3d5c1cf821bdfccc7894f53f7d0269119"; libraryHaskellDepends = [ base ref-mtl stm ]; - jailbreak = true; homepage = "https://github.com/Julek"; description = "Wait-free Tree Counter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TreeStructures" = callPackage @@ -17309,10 +16588,10 @@ self: { version = "0.0.2"; sha256 = "5dfb5bacaddc363e88706bd8fead6f977f635bc7fd6c891d28e838148d0992d1"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://www.github.com/bhickey/TreeStructures"; description = "A collection of heaps and search trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TreeT" = callPackage @@ -17333,10 +16612,10 @@ self: { version = "0.0.4"; sha256 = "4d8eef82810106d23463bfcd43dbb63becb7a96d6f873ba17213ffe1c34d4d27"; libraryHaskellDepends = [ base ghc-prim monad-loops ref-mtl stm ]; - jailbreak = true; homepage = "https://github.com/Julek"; description = "Lock free Treiber stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TrendGraph" = callPackage @@ -17351,7 +16630,6 @@ self: { base containers diagrams-cairo diagrams-lib mtl optparse-applicative time ]; - jailbreak = true; description = "A simple trend Graph script"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -17409,7 +16687,6 @@ self: { base containers filepath random reactive-banana reactive-banana-sdl SDL SDL-ttf transformers ]; - jailbreak = true; description = "Typing speed game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -17449,10 +16726,10 @@ self: { version = "0.4.0.1"; sha256 = "e62ef42bad43ca0487d59fe7840313e31fe47a05f210cf37786dd6f5897504f3"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/avieth/TypeNat"; description = "Some Nat-indexed types for GHC"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "TypingTester" = callPackage @@ -17553,7 +16830,6 @@ self: { testHaskellDepends = [ base bytestring directory filepath hspec JuicyPixels time ]; - jailbreak = true; homepage = "http://github.com/cirquit/UTFTConverter"; description = "Processing popular picture formats into .c or .raw format in RGB565"; license = stdenv.lib.licenses.mit; @@ -17623,7 +16899,6 @@ self: { version = "0.1.7"; sha256 = "f7ef9c0b2e92b7ac90a03de4dfb1df1f900e502cf7b391cb4752277d66d941f8"; libraryHaskellDepends = [ base cgi MaybeT mtl ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/UrlDisp"; description = "Url dispatcher. Helps to retain friendly URLs in web applications."; license = stdenv.lib.licenses.bsd3; @@ -17690,10 +16965,10 @@ self: { libraryHaskellDepends = [ base bifunctors semigroupoids semigroups ]; - jailbreak = true; homepage = "https://github.com/tonymorris/validation"; description = "A data-type like Either but with an accumulating Applicative"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Vec" = callPackage @@ -17715,7 +16990,6 @@ self: { version = "1.0.6"; sha256 = "13ea1c747329764c0415a989e930994a20411bb10fa490cfceb4b60699bfbd7f"; libraryHaskellDepends = [ base Boolean Vec ]; - jailbreak = true; description = "Provides Boolean instances for the Vec package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -17767,9 +17041,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers matrix ]; - jailbreak = true; description = "A solver for the WordBrain game"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ViennaRNA-bindings" = callPackage @@ -17797,6 +17071,23 @@ self: { license = "GPL"; }) {}; + "ViennaRNAParser_1_3_0" = callPackage + ({ mkDerivation, base, hspec, parsec, ParsecTools, process + , transformers + }: + mkDerivation { + pname = "ViennaRNAParser"; + version = "1.3.0"; + sha256 = "a0d10a770b194f3bf6ed5143f89ea3654eebe860bf980a85806c84889efea738"; + libraryHaskellDepends = [ + base parsec ParsecTools process transformers + ]; + testHaskellDepends = [ base hspec parsec ]; + description = "Libary for parsing ViennaRNA package output"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Vulkan" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -17837,7 +17128,6 @@ self: { executableHaskellDepends = [ base directory filepath mtl unix WL500gPLib ]; - jailbreak = true; description = "A simple command line tools to control the Asus WL500gP router"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -17853,9 +17143,9 @@ self: { isExecutable = true; libraryHaskellDepends = [ base curl mtl tagsoup ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "A simple library to access to the WL 500gP router from the Haskell code"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "WMSigner" = callPackage @@ -17873,7 +17163,6 @@ self: { testHaskellDepends = [ base bytestring cryptohash hspec lens random split vector ]; - jailbreak = true; description = "WebMoney authentication module"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -17918,7 +17207,6 @@ self: { base containers haskell98 parsec regex-compat ]; executableHaskellDepends = [ directory ghc-paths process ]; - jailbreak = true; homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/"; description = "WASH is a family of EDSLs for programming Web applications in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -17936,7 +17224,6 @@ self: { libraryHaskellDepends = [ base Cartesian containers filepath GLUtil lens linear OpenGL ]; - jailbreak = true; description = "Parsers and utilities for the OBJ WaveFront 3D model format"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -17981,7 +17268,6 @@ self: { libraryHaskellDepends = [ base containers mtl parsec pretty syb WebBits ]; - jailbreak = true; homepage = "http://www.cs.brown.edu/research/plt/"; description = "JavaScript analysis tools"; license = "LGPL"; @@ -17999,7 +17285,6 @@ self: { libraryHaskellDepends = [ base multiplate multiplate-simplified transformers WebBits ]; - jailbreak = true; description = "A Multiplate instance for JavaScript"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -18035,10 +17320,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base parsec ]; executableHaskellDepends = [ base parsec ]; - jailbreak = true; homepage = "https://github.com/cameronbwhite/WeberLogic"; description = "Logic interpreter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "Webrexp" = callPackage @@ -18063,7 +17348,6 @@ self: { HTTP hxt mtl network parsec process regex-pcre-builtin template-haskell text transformers unordered-containers vector ]; - jailbreak = true; description = "Regexp-like engine to scrap web data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18089,7 +17373,6 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "https://github.com/hansonkd/Wheb-Framework"; description = "The frictionless WAI Framework"; license = stdenv.lib.licenses.bsd3; @@ -18108,25 +17391,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_3_1_0" = callPackage - ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 - , shfolder, user32, winmm - }: - mkDerivation { - pname = "Win32"; - version = "2.3.1.0"; - sha256 = "685a695e9ec86efb06d3a2effb3e18f916c8696e71ca4811cb53befa04323ff9"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ - advapi32 gdi32 shell32 shfolder user32 winmm - ]; - homepage = "https://github.com/haskell/win32"; - description = "A binding to part of the Win32 library"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.none; - }) {advapi32 = null; gdi32 = null; shell32 = null; - shfolder = null; user32 = null; winmm = null;}; - "Win32" = callPackage ({ mkDerivation, advapi32, base, bytestring, gdi32, shell32 , shfolder, user32, winmm @@ -18146,6 +17410,18 @@ self: { }) {advapi32 = null; gdi32 = null; shell32 = null; shfolder = null; user32 = null; winmm = null;}; + "Win32-console" = callPackage + ({ mkDerivation, base, Win32 }: + mkDerivation { + pname = "Win32-console"; + version = "0.1.0.0"; + sha256 = "69d8cc973b9d08571e01eb33aca6840aae4a084e80e55313c878ac3602712704"; + libraryHaskellDepends = [ base Win32 ]; + description = "Binding to the Win32 console API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Win32-dhcp-server" = callPackage ({ mkDerivation, base, text, Win32, Win32-errors }: mkDerivation { @@ -18153,7 +17429,6 @@ self: { version = "0.3.2"; sha256 = "3f6fd5dcd65f0883f40a5e3ee9467df0039abf7fc4f5cf0a119c56696d120664"; libraryHaskellDepends = [ base text Win32 Win32-errors ]; - jailbreak = true; homepage = "http://github.com/mikesteele81/win32-dhcp-server"; description = "Win32 DHCP Server Management API"; license = stdenv.lib.licenses.bsd3; @@ -18167,7 +17442,6 @@ self: { version = "0.2.2.1"; sha256 = "61803f36a418726540f230df294b8a86331a8ffa1b79d04e3398064af7a9efec"; libraryHaskellDepends = [ base template-haskell text Win32 ]; - jailbreak = true; homepage = "http://github.com/mikesteele81/win32-errors"; description = "Alternative error handling for Win32 foreign calls"; license = stdenv.lib.licenses.bsd3; @@ -18195,7 +17469,6 @@ self: { version = "0.2.1.1"; sha256 = "81a4c662c07ca698434775c9fdfdaf6d80eff3ccb0515bec449f71721bdc74df"; libraryHaskellDepends = [ base text Win32 Win32-errors ]; - jailbreak = true; homepage = "http://github.com/mikesteele81/Win32-junction-point"; description = "Support for manipulating NTFS junction points"; license = stdenv.lib.licenses.bsd3; @@ -18235,7 +17508,6 @@ self: { sha256 = "5aa626c00d3c255a0d20fad34f2c96661d31825f12e19f8a7848144d4ef16b1f"; libraryHaskellDepends = [ base Win32 Win32-errors ]; librarySystemDepends = [ Advapi32 ]; - jailbreak = true; homepage = "http://github.com/mikesteele81/win32-services"; description = "Windows service applications"; license = stdenv.lib.licenses.bsd3; @@ -18253,7 +17525,6 @@ self: { libraryHaskellDepends = [ base directory filepath Win32 Win32-errors Win32-services ]; - jailbreak = true; description = "Wrapper code for making a Win32 service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18309,7 +17580,6 @@ self: { base QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/choener/WordAlignment"; description = "Bigram word pair alignments"; license = stdenv.lib.licenses.gpl3; @@ -18350,7 +17620,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base boxes cmdargs ]; executableHaskellDepends = [ base boxes cmdargs ]; - jailbreak = true; homepage = "https://github.com/gbgar/Wordlint"; description = "Plaintext prose redundancy linter"; license = "unknown"; @@ -18386,10 +17655,10 @@ self: { libraryHaskellDepends = [ base containers mtl SybWidget wx wxcore xtc ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/WxGeneric"; description = "Generic (SYB3) construction of wxHaskell widgets"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "X11" = callPackage @@ -18421,7 +17690,6 @@ self: { editedCabalFile = "f7b315acd1fb4d44ee6312b2e8d397b7cda103cf5e9e8ca6867389ef6cadff3c"; libraryHaskellDepends = [ base X11 ]; librarySystemDepends = [ libX11 ]; - jailbreak = true; description = "Missing bindings to the X11 graphics library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -18520,8 +17788,8 @@ self: { ({ mkDerivation, base, parsec }: mkDerivation { pname = "XMLParser"; - version = "0.1.0.3"; - sha256 = "d62e8062e1a2d2f00d8e6d8a707fb798ae5b5cc2c48a513375d5634fef116fd4"; + version = "0.1.0.4"; + sha256 = "79e55f9ae14054c8673f25325503c75af2bb750e0068f5fefbce3a98c7e04d94"; libraryHaskellDepends = [ base parsec ]; homepage = "xy30.com"; description = "A library to parse xml"; @@ -18554,7 +17822,6 @@ self: { libraryHaskellDepends = [ base haskell98 hsdns mtl network parsec random utf8-string ]; - jailbreak = true; homepage = "http://kagami.touhou.ru/projects/show/matsuri"; description = "XMPP library"; license = stdenv.lib.licenses.bsd3; @@ -18579,7 +17846,6 @@ self: { executableHaskellDepends = [ base cgi containers hsparql pretty rdf4h text ]; - jailbreak = true; homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html"; description = "An implementation of a polynomial-time top-down parser suitable for NLP"; license = stdenv.lib.licenses.bsd3; @@ -18637,10 +17903,10 @@ self: { version = "0.1.0.1"; sha256 = "bd09b98dfbb9125a21684e9495d4a624f34ae4912337fb658101edc46e7ce185"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/kanaihiroki/Xorshift128Plus"; description = "Pure haskell implementation of xorshift128plus random number generator"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "YACPong" = callPackage @@ -18842,9 +18108,9 @@ self: { revision = "3"; editedCabalFile = "bd302015dbeab652042fed7c86f942d1cdf28d365de82e742290d5aac13d97c2"; libraryHaskellDepends = [ base vect ]; - jailbreak = true; description = "Polymer growth simulation method"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ZFS" = callPackage @@ -18857,7 +18123,6 @@ self: { libraryHaskellDepends = [ base CC-delcont containers mtl network unix ]; - jailbreak = true; homepage = "https://github.com/jkarni/ZipperFS"; description = "Oleg's Zipper FS"; license = stdenv.lib.licenses.publicDomain; @@ -18959,10 +18224,10 @@ self: { sha256 = "af0d3d6e860826a12029fa048f8616713ffb8374ce9a13119567ba73ecb0bad3"; libraryHaskellDepends = [ base parsec text ]; testHaskellDepends = [ base HUnit text ]; - jailbreak = true; homepage = "http://github.com/marcotmarcot/abacate"; description = "Parser for a language similar to Cucumber's Gherkin"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "abc-puzzle" = callPackage @@ -19014,9 +18279,9 @@ self: { libraryHaskellDepends = [ base parsec prettify process semigroups ]; - jailbreak = true; description = "Haskell representation and parser for ABC notation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "abeson" = callPackage @@ -19034,10 +18299,10 @@ self: { aeson base base64-bytestring bson bytestring data-default-class scientific text time unordered-containers uuid vector ]; - jailbreak = true; homepage = "https://github.com/philopon/abeson"; description = "interconversion between aeson and bson"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "abnf" = callPackage @@ -19131,9 +18396,9 @@ self: { libraryHaskellDepends = [ base profunctors transformers transformers-compat vinyl ]; - jailbreak = true; description = "Abstract binding trees for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ac-machine" = callPackage @@ -19145,9 +18410,9 @@ self: { libraryHaskellDepends = [ base hashable unordered-containers vector ]; - jailbreak = true; description = "Aho-Corasick string matching algorithm in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ac-machine-conduit" = callPackage @@ -19157,9 +18422,9 @@ self: { version = "0.1.0.0"; sha256 = "837eae5d369b4c53293b66c4c5a6c3156ffcdc4ec08dc199c7cb7e4ee95e56db"; libraryHaskellDepends = [ ac-machine base conduit text ]; - jailbreak = true; description = "Drive Aho-Corasick machines in Conduit pipelines"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate" = callPackage @@ -19194,7 +18459,6 @@ self: { accelerate accelerate-utility base QuickCheck utility-ht ]; testHaskellDepends = [ accelerate base QuickCheck ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-arithmetic/"; description = "Linear algebra and interpolation using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; @@ -19220,7 +18484,6 @@ self: { accelerate accelerate-arithmetic accelerate-cuda accelerate-utility base cublas random ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-cublas/"; description = "Basic Linear Algebra using native CUBLAS library"; license = stdenv.lib.licenses.bsd3; @@ -19244,7 +18507,6 @@ self: { mainland-pretty mtl old-time pretty process SafeSemaphore srcloc template-haskell text transformers unix unordered-containers ]; - jailbreak = true; homepage = "https://github.com/AccelerateHS/accelerate-cuda/"; description = "Accelerate backend for NVIDIA GPUs"; license = stdenv.lib.licenses.bsd3; @@ -19263,7 +18525,6 @@ self: { accelerate accelerate-cuda accelerate-fourier accelerate-utility base cuda cufft ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-cufft/"; description = "Accelerate frontend to the CUFFT library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; @@ -19303,7 +18564,6 @@ self: { repa-io test-framework test-framework-hunit test-framework-quickcheck2 vector vector-algorithms ]; - jailbreak = true; homepage = "https://github.com/AccelerateHS/accelerate-examples"; description = "Examples using the Accelerate library"; license = stdenv.lib.licenses.bsd3; @@ -19319,7 +18579,6 @@ self: { libraryHaskellDepends = [ accelerate accelerate-cuda base cuda cufft ]; - jailbreak = true; homepage = "https://github.com/AccelerateHS/accelerate-fft"; description = "FFT using the Accelerate library"; license = stdenv.lib.licenses.bsd3; @@ -19337,10 +18596,10 @@ self: { libraryHaskellDepends = [ accelerate accelerate-io base carray fft storable-complex ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-fftw/"; description = "Accelerate frontend to the FFTW library (Fourier transform)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-fourier" = callPackage @@ -19360,7 +18619,6 @@ self: { accelerate accelerate-arithmetic accelerate-utility base QuickCheck utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-fourier/"; description = "Fast Fourier transform and convolution using the Accelerate framework"; license = stdenv.lib.licenses.bsd3; @@ -19381,7 +18639,6 @@ self: { accelerate accelerate-cuda accelerate-cufft accelerate-fftw accelerate-fourier base criterion ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-fourier-benchmark/"; description = "Compare different implementations of the Fast Fourier Transform"; license = stdenv.lib.licenses.bsd3; @@ -19399,10 +18656,10 @@ self: { libraryHaskellDepends = [ accelerate array base bmp bytestring repa vector ]; - jailbreak = true; homepage = "https://github.com/AccelerateHS/accelerate-io"; description = "Read and write Accelerate arrays in various formats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-random" = callPackage @@ -19412,9 +18669,9 @@ self: { version = "0.15.0.0"; sha256 = "6d2600b2b4eac2246658e926a088447b1aa8add76994071a3cf8a5c455081ef3"; libraryHaskellDepends = [ accelerate base mwc-random ]; - jailbreak = true; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "accelerate-typelits" = callPackage @@ -19447,7 +18704,6 @@ self: { version = "0.1"; sha256 = "fbbe0d70a474d82bdfe7d4b6ded152145df23dc0f1fcc256e9a20b1ae9f4b0d8"; libraryHaskellDepends = [ accelerate base utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/accelerate-utility/"; description = "Utility functions for the Accelerate framework"; license = stdenv.lib.licenses.bsd3; @@ -19461,7 +18717,6 @@ self: { version = "0.9.4"; sha256 = "1e82b7b3c5f6e6d980242d3819f379a8c0d5fdfe34c17cf55eef0fcd02d20f9a"; libraryHaskellDepends = [ base bytestring HTTP json network text ]; - jailbreak = true; homepage = "http://accentuate.us/"; description = "A Haskell implementation of the Accentuate.us API."; license = stdenv.lib.licenses.bsd3; @@ -19475,7 +18730,6 @@ self: { version = "0.1.0.4"; sha256 = "fa598105be558f8d079bda919eb14ab5fdba490f04acc34146c8459b65456f8e"; libraryHaskellDepends = [ base filepath old-time time unix ]; - jailbreak = true; homepage = "http://www.github.com/batterseapower/access-time"; description = "Cross-platform support for retrieving file access times"; license = stdenv.lib.licenses.bsd3; @@ -19512,26 +18766,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "acid-state_0_14_1" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , directory, extensible-exceptions, filepath, mtl, network - , safecopy, stm, template-haskell, unix - }: - mkDerivation { - pname = "acid-state"; - version = "0.14.1"; - sha256 = "5ae9dde518e2aedbb1650445023ff45049541a18e8ca5e7f1a5269507c034fc2"; - libraryHaskellDepends = [ - array base bytestring cereal containers directory - extensible-exceptions filepath mtl network safecopy stm - template-haskell unix - ]; - homepage = "http://acid-state.seize.it/"; - description = "Add ACID guarantees to any serializable Haskell data structure"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "acid-state" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , directory, extensible-exceptions, filepath, mtl, network @@ -19568,7 +18802,6 @@ self: { testHaskellDepends = [ acid-state base directory mtl random safecopy ]; - jailbreak = true; description = "A replication backend for acid-state"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -19585,10 +18818,10 @@ self: { libraryHaskellDepends = [ acid-state base directory HsOpenSSL network safecopy ]; - jailbreak = true; homepage = "http://acid-state.seize.it/"; description = "Add TLS support for Data.Acid.Remote"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acl2" = callPackage @@ -19609,9 +18842,9 @@ self: { version = "0.1.0.0"; sha256 = "fb2dcbc36232d9a93dcff35ecdcb3c26a32dd653d3c665157a524b6f423d5ee1"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; description = "A monad which is powerful enough to interpret any action"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-box" = callPackage @@ -19671,9 +18904,9 @@ self: { version = "0.1.0.0"; sha256 = "1a75f1f516870cfe2de7cd6c9fda7f8e54fcd7c4c0134c3c0a9abad7385580e9"; libraryHaskellDepends = [ base comonad ]; - jailbreak = true; description = "A more efficient dualization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-cutegirl" = callPackage @@ -19721,10 +18954,10 @@ self: { version = "0"; sha256 = "a71c3bd27e878d2501bc2eeee2a426cceebda53e36bfd9dc218fa963187f85f6"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/jystic/acme-flipping-tables"; description = "Stop execution with rage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-grawlix" = callPackage @@ -19792,10 +19025,10 @@ self: { version = "0.1.0.1"; sha256 = "8b0d441cdc3389bbd3672b43ca3685d1a8ce2c43da0aae9a2d8735bf58fb2c24"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "N/A"; description = "The only true way to do IO in Haskell!"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-iot" = callPackage @@ -19816,9 +19049,9 @@ self: { version = "3.0"; sha256 = "acbac093f071fc08b8cd4081c3e3675d369304626bcba85ef011ddc169f9370d"; libraryHaskellDepends = [ base text ]; - jailbreak = true; description = "free your haskell from the tyranny of npm!"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-lolcat" = callPackage @@ -19875,9 +19108,9 @@ self: { version = "0.1.0.0"; sha256 = "44826a0f6d37ccd99a3173cda9ecbc754e81feff10610cc011ab2fba89d10ea0"; libraryHaskellDepends = [ base random ]; - jailbreak = true; description = "Miscellaneous newtypes for orderings of discutable use"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-missiles" = callPackage @@ -19898,9 +19131,9 @@ self: { version = "1.0.0.1"; sha256 = "55f34fa960eecf16317414f4bfc4baa4966164b95526f8f65900e4d39bd5d952"; libraryHaskellDepends = [ base time ]; - jailbreak = true; description = "An interface to the philosophical and metaphysical \"now\""; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-numbersystem" = callPackage @@ -19910,7 +19143,6 @@ self: { version = "0.3.0.0"; sha256 = "07ed4a91c5cfc38c4d44120c927082000558068274fbb11ff646b7dab46eb9dc"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; description = "Define the less than and add and subtract for nats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -19948,10 +19180,10 @@ self: { version = "0.2.0.0"; sha256 = "3c80f60d4add0170b1a0a94d53abfc6d14a2a4efc7c3dd9ecf5a840d6f14c1f1"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/phadej/acme-operators#readme"; description = "Operators of base, all in one place!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-php" = callPackage @@ -19964,6 +19196,7 @@ self: { homepage = "http://hackage.haskell.org/package/acme-php-0.0.5/src/docs.html"; description = "The flexibility of Haskell and the safety of PHP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-pointful-numbers" = callPackage @@ -20025,10 +19258,10 @@ self: { version = "0.1"; sha256 = "8b2208e73aaab38d3a948a8be016a7d0ac651d980b2d0a0dfe700ad1fdb4dde4"; libraryHaskellDepends = [ base bytestring ]; - jailbreak = true; homepage = "https://github.com/ehird/acme-strfry"; description = "A binding to the glibc strfry function"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-stringly-typed" = callPackage @@ -20038,9 +19271,9 @@ self: { version = "1.0.0.0"; sha256 = "ce045ee38baade76be3e83f59f709b28bd4dec4d8ef8c8156b09f255dbd69ba3"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Stringly Typed Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "acme-strtok" = callPackage @@ -20085,7 +19318,6 @@ self: { version = "0.0.2"; sha256 = "c68d82cbf3bda44ce0b63055a751ab81a681e375a6bff979c29c63a4da85a419"; doHaddock = false; - jailbreak = true; homepage = "https://github.com/ion1/acme-zero-one"; description = "The absorbing element of package dependencies"; license = stdenv.lib.licenses.publicDomain; @@ -20135,7 +19367,6 @@ self: { testHaskellDepends = [ base lens linear QuickCheck semigroupoids semigroups vector ]; - jailbreak = true; description = "Abstractions for animation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -20162,7 +19393,6 @@ self: { old-time pandoc process pureMD5 QuickCheck simple-reflect snap-core snap-server split syb text time utf8-string xhtml ]; - jailbreak = true; description = "Haskell code presentation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -20188,10 +19418,10 @@ self: { libraryHaskellDepends = [ aeson base text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/aisamanra/activitystreams-aeson"; description = "An interface to the ActivityStreams specification"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "actor" = callPackage @@ -20221,7 +19451,6 @@ self: { transformers ]; testHaskellDepends = [ base directory doctest filepath ]; - doCheck = false; homepage = "http://github.com/ekmett/ad"; description = "Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; @@ -20247,7 +19476,6 @@ self: { version = "0.2.0"; sha256 = "218f0271298f9a42aad50c10cc042388c62d1619624b750f0b665be4f068c4cd"; libraryHaskellDepends = [ base template-haskell type-level ]; - jailbreak = true; homepage = "http://inmachina.net/~jwlato/haskell/"; description = "Self-optimizing tuple types"; license = stdenv.lib.licenses.bsd3; @@ -20264,9 +19492,9 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers mtl network ]; - jailbreak = true; description = "Android Debug Bridge (ADB) protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "adblock2privoxy" = callPackage @@ -20394,7 +19622,6 @@ self: { executableHaskellDepends = [ base binary bytestring data-binary-ieee754 language-css mtl pretty ]; - jailbreak = true; homepage = "https://github.com/stepcut/ase2css"; description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors"; license = stdenv.lib.licenses.bsd3; @@ -20415,7 +19642,6 @@ self: { array base containers htrace HUnit mtl QuickCheck random-shuffle test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://adp-multi.ruhoh.com"; description = "ADP for multiple context-free languages"; license = stdenv.lib.licenses.bsd3; @@ -20435,7 +19661,6 @@ self: { adp-multi base containers monadiccp mtl QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://adp-multi.ruhoh.com"; description = "Subword construction in adp-multi using monadiccp"; license = stdenv.lib.licenses.bsd3; @@ -20465,38 +19690,6 @@ self: { 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "aeson_0_11_2_0" = callPackage - ({ mkDerivation, attoparsec, base, base-orphans, bytestring - , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl - , QuickCheck, quickcheck-instances, scientific, 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"; - sha256 = "447a454b51b8d6ca9e3b59bc5918115a880a9320afeb9030000fe6c87fd2285e"; - revision = "3"; - editedCabalFile = "eba3349e8834893267f4cd28c153613c8c6ea0acb9775db221ad9532d6f96ce1"; - 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 base-orphans bytestring containers ghc-prim - hashable HUnit QuickCheck quickcheck-instances tagged - template-haskell test-framework test-framework-hunit - test-framework-quickcheck2 text time unordered-containers vector - ]; homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; @@ -20515,6 +19708,8 @@ self: { pname = "aeson"; version = "0.11.2.1"; sha256 = "cc3bc708b5ea5598ae4e37fd8a96d117576031be4b4e2943953e9e19af01b74c"; + revision = "1"; + editedCabalFile = "e97fac43eddd037bf21752ea10150a224b9c08d267f634ea54f799023a6c5e13"; libraryHaskellDepends = [ attoparsec base bytestring containers deepseq dlist fail ghc-prim hashable mtl scientific syb tagged template-haskell text time @@ -20531,7 +19726,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_0_0_0" = callPackage + "aeson_1_0_2_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat, base-orphans , bytestring, containers, deepseq, dlist, generic-deriving , ghc-prim, hashable, hashable-time, HUnit, QuickCheck @@ -20541,8 +19736,8 @@ self: { }: mkDerivation { pname = "aeson"; - version = "1.0.0.0"; - sha256 = "a336e25fcd547a277e55f5bdbfdbf896038d0e2311e8396cca15fb3973ef6be9"; + version = "1.0.2.0"; + sha256 = "c265f138a906caebeb8d539b9acf6006a7d2edcc2912e6346f0fb158b2135b6f"; libraryHaskellDepends = [ attoparsec base base-compat bytestring containers deepseq dlist ghc-prim hashable scientific tagged template-haskell text time @@ -20555,7 +19750,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time time-locale-compat unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/bos/aeson"; description = "Fast JSON parsing and encoding"; license = stdenv.lib.licenses.bsd3; @@ -20569,7 +19763,6 @@ self: { version = "0.1.0.0"; sha256 = "1f8f9bd254cfc56f44a9c1994815a3c8ebd36978ca12378a42aed2172cbd8b5e"; libraryHaskellDepends = [ aeson base text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/gregwebs/aeson-applicative-dsl"; description = "make To/From JSOn instances from an applicative description"; license = stdenv.lib.licenses.mit; @@ -20608,7 +19801,6 @@ self: { aeson array attoparsec base bson bytestring containers text unordered-containers vector ]; - jailbreak = true; description = "Mapping between Aeson's JSON and Bson objects"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -20651,10 +19843,10 @@ self: { }: mkDerivation { pname = "aeson-compat"; - version = "0.3.5.1"; - sha256 = "6ab707c4e4f15d2f55e968a91809ab52c06d0099a58c1255c0f0c382caf3c843"; + version = "0.3.6"; + sha256 = "7aa365d9f44f708f25c939489528836aa10b411e0a3e630c8c2888670874d142"; revision = "1"; - editedCabalFile = "3cf09a8689292ddb50651736b5e0b197e4d473632965855f265fbe3e91b8be63"; + editedCabalFile = "8e6a7142358e3189e10f906f5a0d2ae2306a2191f9ebf8a7ad85a6c70e15e6d9"; libraryHaskellDepends = [ aeson attoparsec base base-compat bytestring containers exceptions hashable nats scientific semigroups tagged text time @@ -20705,25 +19897,22 @@ self: { , bytestring, containers, exceptions, hashable, parsec , quickcheck-instances, recursion-schemes, scientific, tasty , tasty-hunit, tasty-quickcheck, template-haskell, text, these - , time, time-parsers, transformers, unordered-containers, vector + , time, time-parsers, unordered-containers, vector }: mkDerivation { pname = "aeson-extra"; - version = "0.3.2.0"; - sha256 = "7af0de540f971c156ec9ce16188233beefa24a4320e71f2344791bdf69ddec0d"; + version = "0.4.0.0"; + sha256 = "78ecedf65f8b68c09223912878e2a055aa38536489eddc9b47911cbc05aba594"; libraryHaskellDepends = [ aeson aeson-compat attoparsec base base-compat bytestring containers exceptions hashable parsec recursion-schemes scientific - template-haskell text time time-parsers transformers - unordered-containers vector + template-haskell text time time-parsers unordered-containers vector ]; testHaskellDepends = [ - aeson aeson-compat base base-compat bytestring containers - exceptions hashable parsec quickcheck-instances scientific tasty - tasty-hunit tasty-quickcheck template-haskell text these time - time-parsers unordered-containers vector + base containers quickcheck-instances tasty tasty-hunit + tasty-quickcheck these time time-parsers unordered-containers + vector ]; - jailbreak = true; homepage = "https://github.com/phadej/aeson-extra#readme"; description = "Extra goodies for aeson"; license = stdenv.lib.licenses.bsd3; @@ -20742,10 +19931,10 @@ self: { aeson base bytestring text unordered-containers ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "https://github.com/deviant-logic/aeson-filthy"; description = "Several newtypes and combinators for dealing with less-than-cleanly JSON input"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-flatten" = callPackage @@ -20763,6 +19952,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "aeson-generic-compat" = callPackage + ({ mkDerivation, aeson, base }: + mkDerivation { + pname = "aeson-generic-compat"; + version = "0.0.1.0"; + sha256 = "d4a05e4d351350f4ce7e270c85dcd990c81d879fd1208a6371865f5b2190d3ad"; + libraryHaskellDepends = [ aeson base ]; + description = "Compatible generic class names of Aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-injector" = callPackage ({ mkDerivation, aeson, base, bifunctors, deepseq, HUnit, lens , QuickCheck, quickcheck-text, scientific, servant-docs, swagger2 @@ -20771,8 +19971,8 @@ self: { }: mkDerivation { pname = "aeson-injector"; - version = "1.0.5.1"; - sha256 = "61cd48cf2f6fa2ace98841918b092727e478099bf1f9b159eed0966ae3c6a8d9"; + version = "1.0.6.0"; + sha256 = "3c0a68d4b3b55813eb3b4d93a0bd130504f367727308e77c01b8e1774024d78d"; libraryHaskellDepends = [ aeson base bifunctors deepseq lens servant-docs swagger2 text unordered-containers @@ -20822,7 +20022,6 @@ self: { aeson base bytestring lens text unordered-containers vector ]; testHaskellDepends = [ base doctest ]; - doCheck = false; description = "Lens of Aeson"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -20843,7 +20042,6 @@ self: { containers deepseq hashable mtl old-locale syb text time unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/mailrank/aeson"; description = "Fast JSON parsing and encoding (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -20911,8 +20109,8 @@ self: { }: mkDerivation { pname = "aeson-pretty"; - version = "0.8.1"; - sha256 = "922a7c4413394b28c83e70d41f105e5bb2b991e1e47e2d802876a33589b6e6a1"; + version = "0.8.2"; + sha256 = "6cb429821040bdd6f819b1c6170cac630a4155fa57fa24eb3d496c06030fb9b0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -21002,7 +20200,6 @@ self: { aeson base data-default template-haskell text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/lassoinc/aeson-smart"; description = "Smart derivation of Aeson instances"; license = stdenv.lib.licenses.mit; @@ -21020,10 +20217,10 @@ self: { libraryHaskellDepends = [ aeson attoparsec base bytestring HsOpenSSL http-streams io-streams ]; - jailbreak = true; homepage = "https://github.com/noteed/aeson-streams"; description = "An HTTP client library for JSON-based APIs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-t" = callPackage @@ -21041,10 +20238,10 @@ self: { aeson aeson-qq base bytestring hspec text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/begriffs/aeson-t"; description = "Transform JSON"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aeson-toolkit" = callPackage @@ -21117,10 +20314,10 @@ self: { libraryHaskellDepends = [ base containers mwc-random primitive split vector ]; - jailbreak = true; homepage = "http://github.com/jtobin/affine-invariant-ensemble-mcmc"; description = "General-purpose sampling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "afis" = callPackage @@ -21158,7 +20355,6 @@ self: { executableHaskellDepends = [ base bytestring directory language-c mtl process yices ]; - jailbreak = true; homepage = "http://tomahawkins.org"; description = "Infinite state model checking of iterative C programs"; license = stdenv.lib.licenses.bsd3; @@ -21213,10 +20409,10 @@ self: { Agda base containers mtl network-uri xhtml ]; executableHaskellDepends = [ Agda base network-uri transformers ]; - jailbreak = true; homepage = "http://github.com/liamoc/agda-snippets#readme"; description = "Render just the Agda snippets of a literate Agda file to HTML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agda-snippets-hakyll" = callPackage @@ -21231,10 +20427,10 @@ self: { agda-snippets base directory filepath hakyll network-uri pandoc pandoc-types ]; - jailbreak = true; homepage = "https://github.com/liamoc/agda-snippets#readme"; description = "Literate Agda support using agda-snippets, for Hakyll pages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agentx" = callPackage @@ -21252,9 +20448,9 @@ self: { fclabels mtl network pipes pipes-concurrency pipes-network safe snmp time transformers unix ]; - jailbreak = true; description = "AgentX protocol for write SNMP subagents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "agum" = callPackage @@ -21361,40 +20557,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "airship_0_5_0" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder - , bytestring, bytestring-trie, case-insensitive, cryptohash - , directory, either, filepath, http-date, http-media, http-types - , lifted-base, microlens, mime-types, mmorph, monad-control, mtl - , network, old-locale, random, tasty, tasty-hunit, tasty-quickcheck - , text, time, transformers, transformers-base, unix - , unordered-containers, wai, wai-extra - }: - mkDerivation { - pname = "airship"; - version = "0.5.0"; - sha256 = "f42e81e118a419125ed559f6041a7c17fd07020d2bb5052d1649301049689951"; - revision = "1"; - editedCabalFile = "ab014ad2f1fe2d23bb67c980755c67622843dd6b1a591470de4f7773668fffd2"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring blaze-builder bytestring - bytestring-trie case-insensitive cryptohash directory either - filepath http-date http-media http-types lifted-base microlens - mime-types mmorph monad-control mtl network old-locale random text - time transformers transformers-base unix unordered-containers wai - wai-extra - ]; - testHaskellDepends = [ - base bytestring tasty tasty-hunit tasty-quickcheck text - transformers wai - ]; - jailbreak = true; - homepage = "https://github.com/helium/airship/"; - description = "A Webmachine-inspired HTTP library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "airship" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder , bytestring, bytestring-trie, case-insensitive, containers @@ -21513,13 +20675,12 @@ self: { }: mkDerivation { pname = "aivika-experiment-chart"; - version = "4.3.1"; - sha256 = "16a94b1d7fb03a6184755ad10b3c6691d9a7b5f2a02006b2891fefd6087ecaa1"; + version = "4.3.2"; + sha256 = "819e5f3d0c36cddf108979c816ee96fbe8da54d097939971501677cdabd2bed9"; libraryHaskellDepends = [ aivika aivika-experiment array base Chart colour containers data-default-class filepath lens mtl split ]; - jailbreak = true; homepage = "http://github.com/dsorokin/aivika-experiment-chart"; description = "Simulation experiments with charting for the Aivika library"; license = stdenv.lib.licenses.bsd3; @@ -21617,23 +20778,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openal;}; - "alarmclock_0_2_0_9" = callPackage - ({ mkDerivation, base, stm, time, unbounded-delays }: - mkDerivation { - pname = "alarmclock"; - version = "0.2.0.9"; - sha256 = "606b06d8e037258cdd51a4f0aa9869b33dfa9dc34eb605c2f6a7357778bd676d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base stm time unbounded-delays ]; - executableHaskellDepends = [ base time ]; - jailbreak = true; - homepage = "https://bitbucket.org/davecturner/alarmclock"; - description = "Wake up and perform an action at a certain time"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "alarmclock" = callPackage ({ mkDerivation, async, base, clock, stm, time, unbounded-delays }: mkDerivation { @@ -21684,6 +20828,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alex_3_2_0" = callPackage + ({ mkDerivation, array, base, containers, directory, happy, process + , QuickCheck + }: + mkDerivation { + pname = "alex"; + version = "3.2.0"; + sha256 = "8034ef1e7f66145295a5b0e70de5b6caa409e36888fe4123d0e022aac97a4d92"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + array base containers directory QuickCheck + ]; + executableToolDepends = [ happy ]; + testHaskellDepends = [ base process ]; + homepage = "http://www.haskell.org/alex/"; + description = "Alex is a tool for generating lexical analysers in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alex-meta" = callPackage ({ mkDerivation, alex, array, base, containers, happy , haskell-src-meta, QuickCheck, template-haskell @@ -21696,9 +20861,9 @@ self: { array base containers haskell-src-meta QuickCheck template-haskell ]; libraryToolDepends = [ alex happy ]; - jailbreak = true; description = "Quasi-quoter for Alex lexers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alex-tools" = callPackage @@ -21734,31 +20899,29 @@ self: { "alga" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions - , filepath, formatting, haskeline, hxt, megaparsec, mtl - , optparse-applicative, path, path-io, QuickCheck, random - , test-framework, test-framework-quickcheck2, text, tf-random - , transformers, yaml + , file-embed, filepath, formatting, haskeline, hspec, hxt + , megaparsec, mtl, optparse-applicative, path, path-io, QuickCheck + , random, text, tf-random, transformers, yaml }: mkDerivation { pname = "alga"; - version = "0.2.1"; - sha256 = "157f622f2851da9bcc2a05df9c192c8abb955745d22d4acdfc8d3a89b765d8e7"; + version = "0.2.2"; + sha256 = "3e90507199b1eb960bdad6bf6a531068cc60898d1fa289d52fa230500ee920f2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions haskeline hxt megaparsec mtl path random - text tf-random transformers + base containers exceptions haskeline hxt megaparsec mtl path + QuickCheck random text tf-random transformers ]; executableHaskellDepends = [ - aeson base containers data-default exceptions filepath formatting - haskeline hxt megaparsec mtl optparse-applicative path path-io - random text tf-random transformers yaml + aeson base containers data-default exceptions file-embed filepath + formatting haskeline hxt megaparsec mtl optparse-applicative path + path-io QuickCheck random text tf-random transformers yaml ]; testHaskellDepends = [ - base containers hxt megaparsec mtl QuickCheck random test-framework - test-framework-quickcheck2 text tf-random transformers + base containers hspec hxt megaparsec mtl QuickCheck random text + tf-random transformers ]; - jailbreak = true; homepage = "https://github.com/mrkkrp/alga"; description = "Algorithmic automation for various DAWs"; license = stdenv.lib.licenses.gpl3; @@ -21830,7 +20993,6 @@ self: { version = "0.1.0.2"; sha256 = "905b4727b737349d9754059cd7dd3d729ab8d34913b46532304980bf1337fb95"; libraryHaskellDepends = [ accelerate base ]; - jailbreak = true; homepage = "https://github.com/wdanilo/algebraic"; description = "General linear algebra structures"; license = stdenv.lib.licenses.bsd3; @@ -21869,9 +21031,9 @@ self: { testHaskellDepends = [ base errors foldl hspec mwc-random QuickCheck smallcheck ]; - jailbreak = true; description = "An implementation of Knuth's algorithm S"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "align" = callPackage @@ -21894,10 +21056,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base optparse-applicative text ]; - jailbreak = true; homepage = "https://github.com/danchoi/align-text"; description = "A simple unix filter to align text on specified substrings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aligned-foreignptr" = callPackage @@ -21995,13 +21157,30 @@ self: { containers COrdering cpphs directory filepath ghc-prim mtl parsec transformers unix ]; - jailbreak = true; homepage = "http://www.alpha-lang.net/"; description = "A compiler for the Alpha language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "alphachar" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens, parsec + , parsers, QuickCheck, template-haskell + }: + mkDerivation { + pname = "alphachar"; + version = "0.0.1"; + sha256 = "3b0e0f756de147603602b45e8d5018abd705d3a4c73ca662f306daec65e7b75d"; + libraryHaskellDepends = [ base lens parsers ]; + testHaskellDepends = [ + base directory doctest filepath parsec QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/alphachar"; + description = "A character between a-z"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alpino-tools" = callPackage ({ mkDerivation, base, bytestring, bytestring-lexing, conduit , containers, hexpat-pickle, MonadRandom, mtl, random-shuffle @@ -22020,7 +21199,6 @@ self: { executableHaskellDepends = [ base conduit containers MonadRandom mtl resourcet utf8-string ]; - jailbreak = true; homepage = "http://github.com/danieldk/alpino-tools"; description = "Alpino data manipulation tools"; license = "unknown"; @@ -22039,7 +21217,6 @@ self: { array base extensible-exceptions sample-frame ]; librarySystemDepends = [ alsaLib ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Binding to the ALSA Library API"; license = stdenv.lib.licenses.bsd3; @@ -22072,10 +21249,10 @@ self: { executableHaskellDepends = [ alsa-core alsa-seq base midi midi-alsa wx wxcore ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Some simple interactive programs for sending MIDI control messages via ALSA"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "alsa-midi" = callPackage @@ -22093,7 +21270,6 @@ self: { ]; librarySystemDepends = [ alsaLib ]; executableSystemDepends = [ alsaLib ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/ALSA"; description = "Bindings for the ALSA sequencer API (MIDI stuff)"; license = "GPL"; @@ -22174,7 +21350,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ alsa base ]; - jailbreak = true; description = "Tests for the ALSA sequencer library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -22205,7 +21380,6 @@ self: { libraryHaskellDepends = [ base lifted-base monad-control transformers transformers-base ]; - jailbreak = true; description = "IO as Alternative instance (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -22252,7 +21426,6 @@ self: { base bytestring configurator http-conduit lifted-base mime-mail mime-mail-ses postgresql-simple resourcet text time ]; - jailbreak = true; homepage = "https://github.com/dbp/amazon-emailer"; description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue"; license = stdenv.lib.licenses.bsd3; @@ -22269,7 +21442,6 @@ self: { libraryHaskellDepends = [ base mtl snap snaplet-postgresql-simple text ]; - jailbreak = true; homepage = "https://github.com/dbp/amazon-emailer-client-snap"; description = "Client library for amazon-emailer daemon"; license = stdenv.lib.licenses.bsd3; @@ -22297,7 +21469,6 @@ self: { executableHaskellDepends = [ base bytestring http-conduit text transformers ]; - jailbreak = true; homepage = "https://github.com/AndrewRademacher/hs-amazon-products"; description = "Connector for Amazon Products API"; license = stdenv.lib.licenses.mit; @@ -22875,7 +22046,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Elastic Compute Cloud SDK"; license = "unknown"; @@ -23399,7 +22569,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Storage Service SDK"; license = "unknown"; @@ -23563,7 +22732,6 @@ self: { amazonka-core amazonka-test base bytestring tasty tasty-hunit text time unordered-containers ]; - doCheck = false; homepage = "https://github.com/brendanhay/amazonka"; description = "Amazon Simple Workflow Service SDK"; license = "unknown"; @@ -23652,43 +22820,12 @@ self: { simple-sql-parser text time transformers utf8-string wl-pprint xlsx zlib ]; - jailbreak = true; homepage = "http://wiki.tarski.nl"; description = "Toolsuite for automated design of business processes"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "amqp_0_13_1" = callPackage - ({ mkDerivation, base, binary, bytestring, clock, connection - , containers, data-binary-ieee754, hspec, hspec-expectations - , monad-control, network, network-uri, split, stm, text, vector - , xml - }: - mkDerivation { - pname = "amqp"; - version = "0.13.1"; - sha256 = "3ea6523228f1c2bf0622d52ebf73c9e3c2e2af637a7ea29908c07ff9fa0dd4ae"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 monad-control network network-uri split stm - text vector - ]; - executableHaskellDepends = [ base containers xml ]; - testHaskellDepends = [ - base binary bytestring clock connection containers - data-binary-ieee754 hspec hspec-expectations network network-uri - split stm text vector - ]; - doCheck = false; - homepage = "https://github.com/hreinhardt/amqp"; - description = "Client library for AMQP servers (currently only RabbitMQ)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "amqp" = callPackage ({ mkDerivation, base, binary, bytestring, clock, connection , containers, data-binary-ieee754, hspec, hspec-expectations @@ -23712,7 +22849,6 @@ self: { data-binary-ieee754 hspec hspec-expectations network network-uri split stm text vector ]; - doCheck = false; homepage = "https://github.com/hreinhardt/amqp"; description = "Client library for AMQP servers (currently only RabbitMQ)"; license = stdenv.lib.licenses.bsd3; @@ -23734,7 +22870,6 @@ self: { testHaskellDepends = [ amqp base bytestring conduit hspec HUnit resourcet transformers ]; - jailbreak = true; homepage = "http://github.com/tatac1/amqp-conduit/"; description = "Conduit bindings for AMQP (see amqp package)"; license = stdenv.lib.licenses.mit; @@ -23766,7 +22901,6 @@ self: { base bytestring http-conduit MonadCatchIO-transformers mtl snap snap-core time ]; - jailbreak = true; homepage = "https://github.com/dbp/analyze-client"; description = "Client for analyze service"; license = stdenv.lib.licenses.bsd3; @@ -23823,7 +22957,6 @@ self: { libraryHaskellDepends = [ anansi base bytestring containers monads-tf pandoc text ]; - jailbreak = true; homepage = "https://john-millikin.com/software/anansi/"; description = "Looms which use Pandoc to parse and produce a variety of formats"; license = stdenv.lib.licenses.gpl3; @@ -23864,10 +22997,10 @@ self: { version = "0.0.2"; sha256 = "85b112bebb356f4def496e61421651b9e81060af8cab107dbadaf075ae9ac0f2"; libraryHaskellDepends = [ base process ]; - jailbreak = true; homepage = "https://github.com/keera-studios/android-haskell"; description = "Android methods exposed to Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "android-lint-summary" = callPackage @@ -23892,7 +23025,6 @@ self: { testHaskellDepends = [ base basic-prelude directory hspec hxt QuickCheck stringable ]; - jailbreak = true; homepage = "https://github.com/passy/android-lint-summary"; description = "A pretty printer for Android Lint errors"; license = stdenv.lib.licenses.asl20; @@ -23920,7 +23052,6 @@ self: { tasty-hunit tasty-quickcheck text time transformers unix unordered-containers ]; - doCheck = false; homepage = "http://github.com/MichaelXavier/Angel"; description = "Process management and supervision daemon"; license = stdenv.lib.licenses.bsd3; @@ -23949,7 +23080,6 @@ self: { base containers mtl QuickCheck tasty tasty-quickcheck transformers transformers-compat ]; - jailbreak = true; description = "A small, general-purpose programming language"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -23967,6 +23097,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "anki-tools" = callPackage + ({ mkDerivation, aeson, base, bytestring, data-default, directory + , exceptions, filepath, mtl, scientific, sqlite-simple, text, time + , unordered-containers + }: + mkDerivation { + pname = "anki-tools"; + version = "0.1.0.0"; + sha256 = "a90256daf1b04e8c85d95bed5f58708ea4a03bfec4abd81e90db4b375374db3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring data-default directory exceptions filepath + mtl scientific sqlite-simple text time unordered-containers + ]; + executableHaskellDepends = [ base data-default ]; + description = "Tools for interacting with Anki database"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "annah" = callPackage ({ mkDerivation, alex, array, base, Earley, lens-family-core, morte , optparse-applicative, pipes, system-fileio, system-filepath, text @@ -23986,9 +23136,9 @@ self: { executableHaskellDepends = [ base morte optparse-applicative system-fileio system-filepath text ]; - jailbreak = true; description = "Medium-level language that desugars to Morte"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "annihilator" = callPackage @@ -24009,6 +23159,8 @@ self: { pname = "annotated-wl-pprint"; version = "0.7.0"; sha256 = "0c262d7fe13a9a50216438ec882c13e25f31236b886a5692e3c35b85cd773d18"; + revision = "1"; + editedCabalFile = "5d6e26cfeb17a187e992d482d8811d89df6a061f2bf0c6dba120d1dd3111138d"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/david-christiansen/annotated-wl-pprint"; description = "The Wadler/Leijen Pretty Printer, with annotation support"; @@ -24048,8 +23200,8 @@ self: { pname = "ansi-pretty"; version = "0.1.2.0"; sha256 = "11079e97b7faaf3825d0ab2bb3e111b5d1b9085343e6505fc2b58240c4eaa424"; - revision = "2"; - editedCabalFile = "76329a4d951e443e7d43bc570d6420d03b9a6a0aa337f22efbb5f4ff7006bf22"; + revision = "3"; + editedCabalFile = "f95f677bc3d419b5ad555799a7456684a11612e35ab08e2fe557323ed22d3127"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base bytestring containers generics-sop nats scientific semigroups tagged text time unordered-containers @@ -24097,12 +23249,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ansigraph_0_3_0_0" = callPackage + "ansigraph_0_3_0_2" = callPackage ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }: mkDerivation { pname = "ansigraph"; - version = "0.3.0.0"; - sha256 = "0eb9433a0f282e07ee5f0eabba5bda296daedc801293a6a3c54915b0fbbc510f"; + version = "0.3.0.2"; + sha256 = "d3cefc45710751473685ca621969e04e9bc27218ecc581d3c38164c81df05a20"; libraryHaskellDepends = [ ansi-terminal base ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/BlackBrane/ansigraph"; @@ -24130,7 +23282,6 @@ self: { antisplice base chatty chatty-utils ironforge mtl shakespeare text time time-locale-compat yesod yesod-auth ]; - jailbreak = true; homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "A web interface to Antisplice dungeons"; license = stdenv.lib.licenses.agpl3; @@ -24180,7 +23331,6 @@ self: { antisplice base chatty chatty-text chatty-utils ctpl directory ironforge mtl network plugins time transformers ]; - jailbreak = true; description = "This is an IRC bot for Mafia and Resistance"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -24220,6 +23370,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "antiprimes" = callPackage + ({ mkDerivation, base, hspec, primes }: + mkDerivation { + pname = "antiprimes"; + version = "0.1.0.1"; + sha256 = "8e8b457ec223b9df3c3036d1c5fd1fd4c62144a911a4284a3e38fc2a1a9c292b"; + libraryHaskellDepends = [ base primes ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/wokibe/antiprimes#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "antiquoter" = callPackage ({ mkDerivation, base, syb, template-haskell }: mkDerivation { @@ -24243,7 +23406,6 @@ self: { base chatty chatty-utils haskeline mtl template-haskell text time transformers ]; - jailbreak = true; homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "An engine for text-based dungeons"; license = stdenv.lib.licenses.agpl3; @@ -24310,8 +23472,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "ap-reflect"; - version = "0.2"; - sha256 = "42087f76e791ecc541b1156e967517ab078468978b878ce535691b21938d00c6"; + version = "0.3"; + sha256 = "fae1845bea949bd04ed83fd508ab80947587056c0f2902bce08861a0b61a109a"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/cmc-msu-ai/ap-reflect"; description = "Partial evaluation reflection a la simple-reflect"; @@ -24450,7 +23612,6 @@ self: { tasty-quickcheck template-haskell text time unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/iconnect/api-tools"; description = "DSL for generating API boilerplate and docs"; license = stdenv.lib.licenses.bsd3; @@ -24483,7 +23644,6 @@ self: { aeson base bytestring directory http-types HUnit mtl tasty tasty-hunit tasty-quickcheck wai wai-extra ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Simple and type safe web framework that generate web API documentation"; license = stdenv.lib.licenses.mit; @@ -24507,7 +23667,6 @@ self: { cereal data-default-class http-client http-client-tls http-types monad-control resourcet text types-compat wai web-routing ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "authenticate support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24529,7 +23688,6 @@ self: { apiary apiary-cookie apiary-session base bytestring cereal clientsession data-default-class time unix-compat vault ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "clientsession support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24550,7 +23708,6 @@ self: { apiary base blaze-builder blaze-html bytestring cookie time types-compat wai web-routing ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "Cookie support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24566,7 +23723,6 @@ self: { revision = "2"; editedCabalFile = "0ffc00bdbd735fd5ee59130daa2b6800dc66306bc3da2fccb48145961b04cc95"; libraryHaskellDepends = [ apiary base blaze-builder wai-extra ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "eventsource support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24588,7 +23744,6 @@ self: { apiary base bytestring data-default-class helics helics-wai monad-control text transformers types-compat vault wai ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "helics support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24607,7 +23762,6 @@ self: { apiary base bytestring bytestring-builder http-client http-types text transformers types-compat wai ]; - jailbreak = true; homepage = "https://github.com/winterland1989/apiary-http-client"; description = "A http client for Apiary"; license = stdenv.lib.licenses.mit; @@ -24630,7 +23784,6 @@ self: { monad-control monad-logger transformers transformers-base types-compat ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "fast-logger support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24651,7 +23804,6 @@ self: { apiary base bytestring data-default-class memcached-binary monad-control text transformers types-compat ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "memcached client for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24673,7 +23825,6 @@ self: { apiary base bson data-default-class lifted-base monad-control mongoDB resource-pool text time transformers types-compat ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "mongoDB support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24696,7 +23847,6 @@ self: { resource-pool resourcet transformers transformers-base types-compat web-routing ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "persistent support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24718,7 +23868,6 @@ self: { apiary base bytestring data-default-class filepath Glob parsec purescript text transformers types-compat unordered-containers ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "purescript compiler for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24736,7 +23885,6 @@ self: { libraryHaskellDepends = [ apiary base types-compat wai web-routing ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "session support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24756,7 +23904,6 @@ self: { libraryHaskellDepends = [ apiary base wai-websockets web-routing websockets ]; - jailbreak = true; homepage = "https://github.com/philopon/apiary"; description = "websockets support for apiary web framework"; license = stdenv.lib.licenses.mit; @@ -24779,7 +23926,6 @@ self: { template-haskell text th-lift time transformers unordered-containers utf8-string yql ]; - jailbreak = true; homepage = "https://github.com/fabianbergmark/APIs"; description = "A Template Haskell library for generating type safe API calls"; license = stdenv.lib.licenses.bsd2; @@ -24811,7 +23957,6 @@ self: { openpgp-crypto-api scotty strict tar text transformers wai-extra wai-middleware-static zlib ]; - jailbreak = true; homepage = "https://github.com/pyr/apotiki"; description = "a faster debian repository"; license = stdenv.lib.licenses.mit; @@ -24822,10 +23967,9 @@ self: { ({ mkDerivation, base, containers, lens, mtl }: mkDerivation { pname = "app-lens"; - version = "0.1.0.1"; - sha256 = "717cb2d1abc9add860d6e058b2da8ba45a124f8a637b4ab5984a89a42d485627"; + version = "0.1.0.3"; + sha256 = "ecb966a61eee1465d2e89d98ee2dfbdd52c7bc37707e817809ff520c91f9d744"; libraryHaskellDepends = [ base containers lens mtl ]; - jailbreak = true; homepage = "https://bitbucket.org/kztk/app-lens"; description = "applicative (functional) bidirectional programming beyond composition chains"; license = stdenv.lib.licenses.bsd3; @@ -24838,8 +23982,8 @@ self: { }: mkDerivation { pname = "app-settings"; - version = "0.2.0.7"; - sha256 = "bd6a675de64863a61459670cb8469c629273d3d43b515b6f7e34cc146a07f9f8"; + version = "0.2.0.8"; + sha256 = "b31c0da1a2bde88f1e366dda17703c62ddc7ed97740221bc90f4aaaa483fea68"; libraryHaskellDepends = [ base containers directory mtl parsec text ]; @@ -24883,7 +24027,6 @@ self: { testHaskellDepends = [ aeson base hspec hspec-smallcheck semver smallcheck text uuid ]; - jailbreak = true; description = "app container types and tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -24945,7 +24088,6 @@ self: { testHaskellDepends = [ base mtl QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://www.github.com/ktvoelker/AParsec"; description = "An applicative parser combinator library"; license = stdenv.lib.licenses.gpl3; @@ -24961,9 +24103,9 @@ self: { revision = "1"; editedCabalFile = "5786bfaf50dbb1e35310eb17f4e090eabfd015c754f551cf637cf63be8b48d31"; libraryHaskellDepends = [ base haskell-src-meta template-haskell ]; - jailbreak = true; description = "Quasiquoters for idiom brackets and an applicative do-notation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "applicative-splice" = callPackage @@ -24982,39 +24124,6 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "apply-refact_0_2_0_0" = callPackage - ({ mkDerivation, base, containers, directory, filemanip, filepath - , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact - , silently, syb, tasty, tasty-expected-failure, tasty-golden - , temporary, transformers, unix-compat - }: - mkDerivation { - pname = "apply-refact"; - version = "0.2.0.0"; - sha256 = "f74abeae9f6ad6e3ab5b00b108e99c4351ff26f691f5a0c1d3662b2b18648d5c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers directory filemanip ghc ghc-exactprint mtl process - refact syb temporary transformers unix-compat - ]; - executableHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact syb temporary transformers - unix-compat - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-exactprint mtl - optparse-applicative process refact silently syb tasty - tasty-expected-failure tasty-golden temporary transformers - unix-compat - ]; - jailbreak = true; - description = "Perform refactorings specified by the refact library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact @@ -25084,7 +24193,6 @@ self: { base HUnit ieee754 mersenne-random-pure64 monad-mersenne-random mtl test-framework test-framework-hunit vector ]; - jailbreak = true; homepage = "http://github.com/danieldk/approx-rand-test"; description = "Approximate randomization test"; license = "unknown"; @@ -25109,10 +24217,10 @@ self: { testHaskellDepends = [ base directory doctest filepath semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/approximate/"; description = "Approximate discrete values and numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "approximate-equality" = callPackage @@ -25161,7 +24269,6 @@ self: { testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck vector ]; - jailbreak = true; homepage = "https://github.com/ian-ross/arb-fft"; description = "Pure Haskell arbitrary length FFT library"; license = stdenv.lib.licenses.bsd3; @@ -25186,36 +24293,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {arbb_dev = null;}; - "arbtt_0_9_0_9" = callPackage - ({ mkDerivation, aeson, array, base, binary, bytestring - , bytestring-progress, containers, deepseq, directory, filepath - , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty - , tasty-golden, tasty-hunit, terminal-progress-bar, time - , transformers, unix, utf8-string, X11 - }: - mkDerivation { - pname = "arbtt"; - version = "0.9.0.9"; - sha256 = "4fdb7d699030c593c25b3a58638988a2c51c122ee49777e644b4a70ea86319a5"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson array base binary bytestring bytestring-progress containers - deepseq directory filepath parsec pcre-light strict - terminal-progress-bar time transformers unix utf8-string X11 - ]; - executableSystemDepends = [ libXScrnSaver ]; - testHaskellDepends = [ - base binary bytestring containers deepseq directory parsec - pcre-light process-extras tasty tasty-golden tasty-hunit time - transformers unix utf8-string - ]; - homepage = "http://arbtt.nomeata.de/"; - description = "Automatic Rule-Based Time Tracker"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.xorg) libXScrnSaver;}; - "arbtt" = callPackage ({ mkDerivation, aeson, array, base, binary, bytestring , bytestring-progress, containers, deepseq, directory, filepath @@ -25243,6 +24320,7 @@ self: { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXScrnSaver;}; "archive" = callPackage @@ -25262,7 +24340,6 @@ self: { HUnit mtl network old-locale pretty process progress regex-compat regex-posix time unix Unixutils xhtml ]; - jailbreak = true; description = "A library and programs for creating hardlinked incremental archives or backups"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -25345,6 +24422,7 @@ self: { homepage = "http://archhaskell.wordpress.com/"; description = "Convert Arch Linux package updates in RSS to pretty markdown"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arena" = callPackage @@ -25381,7 +24459,6 @@ self: { base binary bytestring bytestring-lexing bytestring-show old-locale time ]; - jailbreak = true; homepage = "http://code.haskell.org/~StefanKersten/code/arff"; description = "Generate Attribute-Relation File Format (ARFF) files"; license = stdenv.lib.licenses.bsd3; @@ -25397,10 +24474,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory wx ]; - jailbreak = true; homepage = "https://wiki.haskell.org/Argh!"; description = "An interpreter for the Argh! programming language in wxHaskell"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "argon" = callPackage @@ -25425,7 +24502,6 @@ self: { aeson ansi-terminal base filepath ghc hlint hspec pipes pipes-safe QuickCheck ]; - jailbreak = true; homepage = "http://github.com/rubik/argon"; description = "Measure your code's complexity"; license = stdenv.lib.licenses.isc; @@ -25438,13 +24514,12 @@ self: { }: mkDerivation { pname = "argon2"; - version = "1.1.0"; - sha256 = "42fc5495434739408115cd932e7b3a6853e4f999e86bd408422ed0abfa19837a"; + version = "1.2.0"; + sha256 = "a579557bf24cc5d3cfd787dea648e6b94c6a89abffdaa7af8978fa4316a4fcff"; libraryHaskellDepends = [ base bytestring text transformers ]; testHaskellDepends = [ base bytestring QuickCheck tasty tasty-quickcheck text ]; - jailbreak = true; homepage = "https://github.com/ocharles/argon2.git"; description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function"; license = stdenv.lib.licenses.bsd3; @@ -25477,7 +24552,6 @@ self: { executableHaskellDepends = [ base bimap containers glib gtk HDBC indents mtl parsec ]; - jailbreak = true; description = "A computer assisted argumentation transcription and editing software"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -25601,19 +24675,20 @@ self: { "arithmoi" = callPackage ({ mkDerivation, array, base, containers, ghc-prim, integer-gmp , mtl, QuickCheck, random, smallcheck, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck + , tasty-quickcheck, tasty-smallcheck, transformers + , transformers-compat }: mkDerivation { pname = "arithmoi"; - version = "0.4.2.0"; - sha256 = "6cc6ade285cdbd437c3e5587e588d4d55152a273e9c276a4679cc22a6e1d2a88"; + version = "0.4.3.0"; + sha256 = "daa3343d4be19d0a8574c542c9188f6f3075098c86c69d3bc66acd5091d5d196"; configureFlags = [ "-f-llvm" ]; libraryHaskellDepends = [ array base containers ghc-prim integer-gmp mtl random ]; testHaskellDepends = [ - base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck - tasty-smallcheck + base containers QuickCheck smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck transformers transformers-compat ]; homepage = "https://github.com/cartazio/arithmoi"; description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms."; @@ -25645,12 +24720,36 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/sfischer13/haskell-arpa"; description = "Library for reading ARPA n-gram models"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "arpack" = callPackage + ({ mkDerivation, arpack, base, concurrent-extra, containers + , control-monad-loop, data-default, hmatrix, hspec, ieee754 + , QuickCheck, storable-complex, transformers, vector + , vector-algorithms + }: + mkDerivation { + pname = "arpack"; + version = "0.1.0.0"; + sha256 = "166ab4f3172c51ef666c09947feed28e35f6f7f6a4d53e46b7d0a4a6a56c4a10"; + libraryHaskellDepends = [ + base concurrent-extra containers control-monad-loop data-default + hmatrix ieee754 storable-complex transformers vector + vector-algorithms + ]; + libraryPkgconfigDepends = [ arpack ]; + testHaskellDepends = [ + base hmatrix hspec QuickCheck vector vector-algorithms + ]; + description = "Solve large scale eigenvalue problems"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) arpack;}; + "array_0_5_1_1" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -25684,7 +24783,6 @@ self: { base HUnit QuickCheck test-framework-hunit test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; description = "A simple interpreter for arrayForth, the language used on GreenArrays chips"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -25713,7 +24811,6 @@ self: { testHaskellDepends = [ base ghc-prim QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; description = "Extra foreign primops for primitive arrays"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -25740,7 +24837,6 @@ self: { libraryHaskellDepends = [ arrows base pointed profunctors semigroupoids ]; - jailbreak = true; homepage = "https://github.com/prophile/arrow-improve/"; description = "Improved arrows"; license = stdenv.lib.licenses.mit; @@ -25807,10 +24903,10 @@ self: { libraryHaskellDepends = [ base containers profunctors transformers ]; - jailbreak = true; homepage = "https://github.com/fumieval/artery"; description = "A simple, arrow-based reactive programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "arx" = callPackage @@ -25873,10 +24969,10 @@ self: { libraryHaskellDepends = [ base blaze-builder bytestring case-insensitive hashable text ]; - jailbreak = true; homepage = "https://github.com/snoyberg/ascii"; description = "Type-safe, bytestring-based ASCII values. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ascii-cows" = callPackage @@ -25901,10 +24997,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base text ]; - jailbreak = true; homepage = "https://github.com/danchoi/ascii-flatten"; description = "Flattens European non-ASCII characaters into ASCII"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ascii-progress" = callPackage @@ -25961,9 +25057,9 @@ self: { attoparsec base binary bytestring deepseq deepseq-generics HUnit split zlib ]; - jailbreak = true; description = "Process Ascii Vectors for Advantest 93k"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ascii85-conduit" = callPackage @@ -25974,41 +25070,11 @@ self: { sha256 = "856abadac7fa9e61307089f0455df72ff6de4cee7b297bf6e72bcbe183e138a4"; libraryHaskellDepends = [ base bytestring conduit ]; testHaskellDepends = [ base bytestring conduit hspec ]; - jailbreak = true; description = "Conduit for encoding ByteString into Ascii85"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "asciidiagram_1_3_1_1" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, containers - , directory, filepath, FontyFruity, JuicyPixels, lens, linear, mtl - , optparse-applicative, rasterific-svg, svg-tree, text, vector - }: - mkDerivation { - pname = "asciidiagram"; - version = "1.3.1.1"; - sha256 = "7210b71dd14b86286ac874e4de7d042402bca7cb1cff4376269b590c1df0522f"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers FontyFruity JuicyPixels lens linear mtl - rasterific-svg svg-tree text vector - ]; - executableHaskellDepends = [ - base bytestring directory filepath FontyFruity JuicyPixels - optparse-applicative rasterific-svg svg-tree text - ]; - testHaskellDepends = [ - base blaze-html containers directory filepath JuicyPixels - rasterific-svg svg-tree text - ]; - doCheck = false; - description = "Pretty rendering of Ascii diagram into svg or png"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "asciidiagram" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative @@ -26152,7 +25218,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers ghc-binary parsec ]; executableHaskellDepends = [ base containers ghc-binary parsec ]; - jailbreak = true; description = "Haskell Assembler"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -26243,7 +25308,6 @@ self: { base containers directory MonadRandom mtl OpenGL random SDL SDL-image SDL-mixer SDL-ttf unix ]; - jailbreak = true; description = "an incomplete 2d space game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -26310,13 +25374,17 @@ self: { }) {}; "async-dejafu" = callPackage - ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }: + ({ mkDerivation, base, concurrency, dejafu, exceptions, HUnit + , hunit-dejafu + }: mkDerivation { pname = "async-dejafu"; - version = "0.1.2.2"; - sha256 = "ff459f69420e8ef8c26d5c7f2158d49501d1ee06a4c3a664b8826fb90f517db0"; - libraryHaskellDepends = [ base dejafu exceptions ]; - testHaskellDepends = [ base dejafu HUnit hunit-dejafu ]; + version = "0.1.3.0"; + sha256 = "d893a14c85af9cb947e3b3298b77c3665112a54cc8876dca8fc08e6871952afd"; + libraryHaskellDepends = [ base concurrency exceptions ]; + testHaskellDepends = [ + base concurrency dejafu HUnit hunit-dejafu + ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Run MonadConc operations asynchronously and wait for their results"; license = stdenv.lib.licenses.bsd3; @@ -26328,8 +25396,8 @@ self: { }: mkDerivation { pname = "async-extras"; - version = "0.1.2.0"; - sha256 = "d0ff0c9a29e3acfe926bc4d4be83642944c9b0eab2bd2a177c75d14ed8bcfb8c"; + version = "0.1.3.1"; + sha256 = "c134da7e8955354670916cde8c5199b2bf08e455605d19a355a781d925b4d28e"; libraryHaskellDepends = [ async base lifted-async lifted-base monad-control SafeSemaphore stm transformers-base @@ -26350,10 +25418,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ async base stm unordered-containers ]; executableHaskellDepends = [ async base stm unordered-containers ]; - jailbreak = true; homepage = "http://github.com/jfischoff/async-manager"; description = "A thread manager for async"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "async-pool" = callPackage @@ -26383,10 +25451,10 @@ self: { version = "1.1.0.1"; sha256 = "1ad5b98f306f55365f27909eafa753f747f36c3ede2b62cb605107c36714dd6d"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/feuerbach/asynchronous-exceptions"; description = "Distinguish between synchronous and asynchronous exceptions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aterm" = callPackage @@ -26421,11 +25489,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "atl"; - version = "15409.2"; - sha256 = "0273021bd03c2210b6dab28a24ccc6c16a14c365d7fd0403ccc00d3d7207c2af"; + version = "17072"; + sha256 = "3aee6a8ddfe9d9b0db710889fb49b8a08662ee3026153e15ca83100e2a34a07a"; libraryHaskellDepends = [ base ]; description = "Arrow Transformer Library"; - license = "LGPL"; + license = stdenv.lib.licenses.bsd3; }) {}; "atlassian-connect-core" = callPackage @@ -26447,7 +25515,6 @@ self: { http-types jwt mtl network network-api-support network-uri snap snap-core split text time time-units transformers ]; - jailbreak = true; homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core"; description = "Atlassian Connect snaplet for the Snap Framework and helper code"; license = stdenv.lib.licenses.asl20; @@ -26461,8 +25528,8 @@ self: { }: mkDerivation { pname = "atlassian-connect-descriptor"; - version = "0.4.4.0"; - sha256 = "4e4cac3e768e7488772751264b8ecf217841a8bc45e0fc2931398d1b056f416b"; + version = "0.4.4.1"; + sha256 = "4a6c8efba3282d57abde8852e16aa8ea387858dcfbe1bbb28db2e18b47f80db8"; libraryHaskellDepends = [ aeson base cases network network-uri text time-units unordered-containers @@ -26566,36 +25633,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "atom-conduit_0_3_1_1" = callPackage - ({ mkDerivation, base, conduit, conduit-parse, data-default - , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers - , quickcheck-instances, resourcet, tasty, tasty-hunit - , tasty-quickcheck, text, time, timerep, uri-bytestring - , xml-conduit, xml-conduit-parse, xml-types - }: - mkDerivation { - pname = "atom-conduit"; - version = "0.3.1.1"; - sha256 = "d0603a5a726fade01a9fe6c5859d81c6f53d8770dc0db8b889e2717e63a3d2b3"; - revision = "1"; - editedCabalFile = "8ebc45eae1c2408eb475b62923c8801b07abe999d107f3d9b22ec22c2e8c1dad"; - libraryHaskellDepends = [ - base conduit conduit-parse exceptions foldl lens-simple - mono-traversable parsers text time timerep uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - testHaskellDepends = [ - base conduit conduit-parse data-default exceptions hlint - lens-simple mono-traversable parsers quickcheck-instances resourcet - tasty tasty-hunit tasty-quickcheck text time uri-bytestring - xml-conduit xml-conduit-parse xml-types - ]; - jailbreak = true; - description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "atom-conduit" = callPackage ({ mkDerivation, base, conduit, conduit-parse, data-default , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers @@ -26622,6 +25659,33 @@ self: { license = "unknown"; }) {}; + "atom-conduit_0_4_0_1" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators + , data-default, hlint, lens-simple, mono-traversable, parsers + , quickcheck-instances, resourcet, safe-exceptions, tasty + , tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types + }: + mkDerivation { + pname = "atom-conduit"; + version = "0.4.0.1"; + sha256 = "62965b9adac9b4fefda18a2aceb464b15e15c0ef267edba80372e8c3225b5ccf"; + libraryHaskellDepends = [ + base blaze-builder conduit conduit-combinators lens-simple + mono-traversable parsers safe-exceptions text time timerep + uri-bytestring xml-conduit xml-types + ]; + testHaskellDepends = [ + base conduit data-default hlint lens-simple mono-traversable + parsers quickcheck-instances resourcet safe-exceptions tasty + tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit + xml-types + ]; + description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)."; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "atom-msp430" = callPackage ({ mkDerivation, atom, base, mtl }: mkDerivation { @@ -26661,7 +25725,6 @@ self: { testHaskellDepends = [ base bits-atomic HUnit test-framework test-framework-hunit time ]; - jailbreak = true; homepage = "https://github.com/rrnewton/haskell-lockfree/wiki"; description = "An atomic counter implemented using the FFI"; license = stdenv.lib.licenses.bsd3; @@ -26676,7 +25739,6 @@ self: { sha256 = "07ef111ffb8ba7804862d6843a2006b714a9d76f261e9831249a9d1f7ba49554"; libraryHaskellDepends = [ atomic-primops base primitive vector ]; testHaskellDepends = [ base vector ]; - jailbreak = true; description = "Atomic operations on Data.Vector types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -26728,15 +25790,15 @@ self: { }) {}; "atp-haskell" = callPackage - ({ mkDerivation, applicative-extras, base, containers, HUnit, mtl - , parsec, pretty, template-haskell, time + ({ mkDerivation, applicative-extras, base, containers, extra, HUnit + , mtl, parsec, pretty, template-haskell, time }: mkDerivation { pname = "atp-haskell"; - version = "1.13"; - sha256 = "9e71ff29922844208afc039bf0541392a58ef4d651f6020e19679a8fa68bb5b0"; + version = "1.14"; + sha256 = "350bd95dee79275f6ee1929f8ea4940a2a909f8ab8133f20c0c3c4abbfec04d0"; libraryHaskellDepends = [ - applicative-extras base containers HUnit mtl parsec pretty + applicative-extras base containers extra HUnit mtl parsec pretty template-haskell time ]; testHaskellDepends = [ base containers HUnit time ]; @@ -26798,8 +25860,8 @@ self: { }: mkDerivation { pname = "attoparsec"; - version = "0.13.0.2"; - sha256 = "69f7f381f644ba4a6f348bbff9b2b4280b7b602e8e25e59eadb6e30ad5f2ec6a"; + version = "0.13.1.0"; + sha256 = "52dc74d4955e457ce4f76f5c9d6dba05c1d07e2cd2a542d6251c6dbc66ce3f64"; libraryHaskellDepends = [ array base bytestring containers deepseq scientific text transformers @@ -26896,7 +25958,6 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring iteratee transformers ]; - jailbreak = true; homepage = "http://github.com/gregorycollins"; description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees"; license = stdenv.lib.licenses.bsd3; @@ -26926,7 +25987,6 @@ self: { version = "0.8.5.3"; sha256 = "258c59ab01b7bc7bd6ba614a8209272b18caaf894e594b8d02082a1d2e1504e3"; libraryHaskellDepends = [ array attoparsec base containers text ]; - jailbreak = true; homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home"; description = "(deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -26940,7 +26000,6 @@ self: { version = "0.2.0.1"; sha256 = "ff85052120fc1fac70f67d97f918d284760456096bab9313d03290102567ce31"; libraryHaskellDepends = [ attoparsec-text base enumerator text ]; - jailbreak = true; description = "(deprecated)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -26953,10 +26012,10 @@ self: { version = "0.1.1.0"; sha256 = "472999fbb9ba157b4cdabb3fd933b9e3c8414879843963ab1c21e708e1a14b53"; libraryHaskellDepends = [ attoparsec base transformers ]; - jailbreak = true; homepage = "https://github.com/srijs/haskell-attoparsec-trans"; description = "Interleaved effects for attoparsec parsers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "attosplit" = callPackage @@ -26966,10 +26025,10 @@ self: { version = "0.1.0.0"; sha256 = "e4f9ae353ebeb1e2c36aa905838a2545a6e25826c72e1a3aee808064d3445007"; libraryHaskellDepends = [ attoparsec base bytestring ]; - jailbreak = true; homepage = "http://projects.haskell.org/attosplit"; description = "Split a lazy bytestring at boundaries defined by an attoparsec parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "atuin" = callPackage @@ -26996,10 +26055,10 @@ self: { version = "0.0"; sha256 = "1f578e6cf8bfc5524a9e49ff306a736ab1c5db2a8a4ab4a3e4f47cb34a2fd7ed"; libraryHaskellDepends = [ base deepseq utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/audacity"; description = "Interchange with the Audacity sound signal editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "audiovisual" = callPackage @@ -27017,7 +26076,6 @@ self: { hashable JuicyPixels JuicyPixels-util lens linear mtl objective random template-haskell transformers vector void WAVE ]; - jailbreak = true; homepage = "https://github.com/fumieval/audiovisual"; description = "A battery-included audiovisual framework"; license = stdenv.lib.licenses.bsd3; @@ -27058,7 +26116,6 @@ self: { base bytestring classify containers directory filepath HaXml mtl process ]; - jailbreak = true; description = "Renaming media collections in a breeze"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -27076,10 +26133,10 @@ self: { aeson base http-client http-client-tls mtl servant servant-client text transformers ]; - jailbreak = true; homepage = "https://github.com/fosskers/haskell-aur"; description = "Access metadata from the Arch Linux User Repository"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aur-api" = callPackage @@ -27139,10 +26196,10 @@ self: { version = "0.0.3"; sha256 = "c553e23553500dabb18f0a5f997d564a5f5b03934eec08ff95805079e8205df3"; libraryHaskellDepends = [ base LDAP text transformers ]; - jailbreak = true; homepage = "http://github.com:mlitchard/authenticate-ldap"; description = "LDAP authentication for Haskell web applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "authenticate-oauth" = callPackage @@ -27377,10 +26434,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base JuicyPixels random ]; - jailbreak = true; homepage = "http://github.com/keera-studios/avatar-generator"; description = "A simple random avatar icon generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "average" = callPackage @@ -27405,8 +26462,8 @@ self: { }: mkDerivation { pname = "avers"; - version = "0.0.15"; - sha256 = "538d2461859dae2edd6a6b2abcd5ca45447a1927017fa94cb777c896c2bf7e5e"; + version = "0.0.16"; + sha256 = "04221c75c07aa82789ce79674a0ba5add253855087fd42c123f1d77fb94f1c85"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring clock containers cryptohash filepath inflections MonadRandom mtl network network-uri @@ -27478,9 +26535,9 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "A compile-time balanced AVL tree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avr-shake" = callPackage @@ -27490,25 +26547,29 @@ self: { version = "0.0.1.2"; sha256 = "60102786473f189ea0f97d97b91d9de5a2867dde466b96386c28afbe22e056cc"; libraryHaskellDepends = [ base dependent-sum mtl process shake ]; - jailbreak = true; homepage = "https://github.com/mokus0/avr-shake"; description = "AVR Crosspack actions for shake build systems"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "avwx" = callPackage - ({ mkDerivation, attoparsec, base, HTTP, pretty-show, text }: + ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative + , parsers, pretty-show, text + }: mkDerivation { pname = "avwx"; - version = "0.1.0.1"; - sha256 = "6c1c7a58489a6b2b1e19c4b5ade3d606b80f61e663e755526adbcb5c5cfcd7e8"; + version = "0.3.0.2"; + sha256 = "b4299cc4e05a4c94f53d06f05b30baac1e15c59663b59afd1dd32417a280fb0a"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ attoparsec base HTTP text ]; - executableHaskellDepends = [ base pretty-show ]; - testHaskellDepends = [ base text ]; - homepage = "https://github.com/hce/avwx"; - description = "Parse METAR weather reports"; + libraryHaskellDepends = [ attoparsec base HTTP lens parsers text ]; + executableHaskellDepends = [ + base optparse-applicative pretty-show text + ]; + testHaskellDepends = [ attoparsec base lens pretty-show text ]; + homepage = "https://www.hcesperer.org/posts/2016-09-20-avwx.html"; + description = "Parse aviation weather reports"; license = stdenv.lib.licenses.mit; }) {}; @@ -27519,10 +26580,10 @@ self: { version = "0.1.0.0"; sha256 = "cf5edb7500a02aaba7400f3baab984680898dbedc0cf5b09ded2ca40568e6e57"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://notabug.org/koz.ross/awesome-prelude"; description = "A prelude which I can be happy with. Based on base-prelude."; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "awesomium" = callPackage @@ -27567,42 +26628,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {awesomium = null;}; - "aws_0_13_2" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , base64-bytestring, blaze-builder, byteable, bytestring - , case-insensitive, cereal, conduit, conduit-extra, containers - , cryptohash, data-default, directory, errors, filepath - , http-client, http-conduit, http-types, lifted-base, monad-control - , mtl, network, old-locale, QuickCheck, quickcheck-instances - , resourcet, safe, scientific, tagged, tasty, tasty-quickcheck - , text, time, transformers, transformers-base, unordered-containers - , utf8-string, vector, xml-conduit - }: - mkDerivation { - pname = "aws"; - version = "0.13.2"; - sha256 = "998a9ddc9bc3e74a292e733aac1e9af0ec654d17aa1834319f9f6af4d907ff59"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring base64-bytestring - blaze-builder byteable bytestring case-insensitive cereal conduit - conduit-extra containers cryptohash data-default directory filepath - http-conduit http-types lifted-base monad-control mtl network - old-locale resourcet safe scientific tagged text time transformers - unordered-containers utf8-string vector xml-conduit - ]; - testHaskellDepends = [ - aeson base bytestring errors http-client lifted-base monad-control - mtl QuickCheck quickcheck-instances resourcet tagged tasty - tasty-quickcheck text time transformers transformers-base - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/aristidb/aws"; - description = "Amazon Web Services (AWS) for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "aws" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , base64-bytestring, blaze-builder, byteable, bytestring @@ -27617,8 +26642,8 @@ self: { }: mkDerivation { pname = "aws"; - version = "0.14.0"; - sha256 = "b5b959f9b0ae8c07baf91e067b4005dc554d76c1ab15d019f13a4dc88a8a813e"; + version = "0.14.1"; + sha256 = "6a2079853ddc781b46fe3ddce31e88c0b6b2441f458141bca3cd1c7216cbe579"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring base64-bytestring blaze-builder byteable bytestring case-insensitive cereal conduit @@ -27633,7 +26658,6 @@ self: { resourcet tagged tasty tasty-hunit tasty-quickcheck text time transformers transformers-base ]; - doCheck = false; homepage = "http://github.com/aristidb/aws"; description = "Amazon Web Services (AWS) for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -27689,10 +26713,10 @@ self: { aeson attoparsec-trans aws base bytestring conduit containers http-conduit http-types json-togo resourcet text transformers ]; - jailbreak = true; homepage = "https://github.com/srijs/haskell-aws-dynamodb-query"; description = "Conduit-based interface for AWS DynamoDB"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "aws-dynamodb-streams" = callPackage @@ -27713,7 +26737,6 @@ self: { http-conduit http-types mtl old-locale parsers profunctors resourcet scientific text time ]; - jailbreak = true; description = "Haskell bindings for Amazon DynamoDB Streams"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -27855,7 +26878,6 @@ self: { http-conduit kan-extensions lens lifted-async lifted-base monad-control mtl optparse-applicative text transformers ]; - jailbreak = true; description = "A producer & consumer client library for AWS Kinesis"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -27885,7 +26907,6 @@ self: { lifted-base monad-control mtl optparse-applicative resourcet text time transformers ]; - jailbreak = true; homepage = "https://github.com/alephcloud/hs-aws-kinesis-reshard"; description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics"; license = stdenv.lib.licenses.asl20; @@ -27907,7 +26928,6 @@ self: { exceptions filepath http-client http-types lens lens-action lens-aeson mtl old-locale text time wreq zip-archive ]; - jailbreak = true; homepage = "https://github.com/alephcloud/hs-aws-lambda"; description = "Haskell bindings for AWS Lambda"; license = stdenv.lib.licenses.asl20; @@ -28052,7 +27072,6 @@ self: { bytestring-lexing Cabal case-insensitive cryptohash directory filepath http-types old-locale safe text time ]; - jailbreak = true; homepage = "http://github.com/iconnect/aws-sign4"; description = "Amazon Web Services (AWS) Signature v4 HTTP request signer"; license = stdenv.lib.licenses.bsd3; @@ -28116,7 +27135,6 @@ self: { crypto-pubkey-types http-conduit hxt hxt-xpath pretty resourcet tls tls-extra transformers ]; - jailbreak = true; homepage = "github.com/haskell-distributed/azure-service-api"; description = "Haskell bindings for the Microsoft Azure Service Management API"; license = stdenv.lib.licenses.bsd3; @@ -28136,10 +27154,10 @@ self: { aeson async attoparsec azure-acs base bytestring case-insensitive conduit connection http-client http-conduit http-types network text ]; - jailbreak = true; homepage = "https://github.com/kapilash/hs-azure"; description = "Haskell wrapper over Microsoft Azure ServiceBus REST API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "azurify" = callPackage @@ -28187,7 +27205,6 @@ self: { mmap mtl pipes pipes-interleave transformers vector ]; testHaskellDepends = [ base binary containers pipes QuickCheck ]; - jailbreak = true; homepage = "http://github.com/bgamari/b-tree"; description = "Immutable disk-based B* trees"; license = stdenv.lib.licenses.bsd3; @@ -28240,6 +27257,7 @@ self: { ]; description = "An implementation of a simple 2-player board game"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backdropper" = callPackage @@ -28255,7 +27273,6 @@ self: { executableHaskellDepends = [ base directory haskell98 hslogger old-time process random ]; - jailbreak = true; description = "Rotates backdrops for X11 displays using Imagemagic"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -28273,10 +27290,10 @@ self: { base either free kan-extensions mtl semigroupoids semigroups transformers ]; - jailbreak = true; homepage = "https://github.com/tapuu/backtracking-exceptions"; description = "A monad transformer for backtracking exceptions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "backward-state" = callPackage @@ -28286,10 +27303,10 @@ self: { version = "0.1.0.2"; sha256 = "5579bc4be23e25324129dae278a768fb804909e64044de6581d7be2136a87daa"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "https://github.com/luqui/backward-state"; description = "A state monad that runs the state in reverse through the computation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bacteria" = callPackage @@ -28542,10 +27559,10 @@ self: { attoparsec base HUnit test-framework test-framework-hunit text vector ]; - jailbreak = true; homepage = "https://github.com/fanjam/banwords"; description = "Generalized word blacklister"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barchart" = callPackage @@ -28558,7 +27575,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base csv diagrams filepath ]; executableHaskellDepends = [ base cmdargs csv diagrams filepath ]; - jailbreak = true; homepage = "http://sebfisch.github.com/haskell-barchart"; description = "Creating Bar Charts in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -28572,7 +27588,6 @@ self: { version = "0.1.0"; sha256 = "af4ec35570d85202ee03e51b75967ffc586a852e8e9c712e3b2fd9aba0ec7491"; libraryHaskellDepends = [ base bytestring HPDF ]; - jailbreak = true; description = "Generate Code 128 barcodes as PDFs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -28585,10 +27600,10 @@ self: { version = "0.2.0.8"; sha256 = "470d1042ec1a345f8c4d131828918d977085500eeef340b0c2ca85fd32254a42"; libraryHaskellDepends = [ base containers QuickCheck text time ]; - jailbreak = true; homepage = "http://github.com/massysett/barecheck"; description = "QuickCheck implementations for common types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barley" = callPackage @@ -28606,7 +27621,6 @@ self: { base bytestring containers directory filepath ghc ghc-prim html plugins snap-core snap-server text transformers unix-compat ]; - jailbreak = true; description = "A web based environment for learning and tinkering with Haskell"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -28642,10 +27656,10 @@ self: { testHaskellDepends = [ base bytestring lens-family-core tasty tasty-golden ]; - jailbreak = true; homepage = "https://github.com/philopon/barrier"; description = "Shield.io style badge generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "barrier-monad" = callPackage @@ -28655,7 +27669,6 @@ self: { version = "0.1.0.1"; sha256 = "d5962991329b0922df49fb5010045dc6ea9b6eda849f5ffcd67466cb83609604"; libraryHaskellDepends = [ base comonad mtl transformers ]; - jailbreak = true; description = "Implementation of barrier monad, can use custom front/back type"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -28670,7 +27683,6 @@ self: { libraryHaskellDepends = [ ghc-prim invalid-cabal-flag-settings rts ]; - jailbreak = true; description = "Basic libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -28696,7 +27708,6 @@ self: { version = "0.1.0.1"; sha256 = "bab2aaa9a35d39ab5aa07999ca68bb619e24abb4c5863584fa379c6b0c9d66a6"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/HaskellZhangSong/base-generics"; description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well."; license = stdenv.lib.licenses.mit; @@ -28710,24 +27721,9 @@ self: { version = "0.4.0.0"; sha256 = "c3886b6203a5f963dcb249efb7bc87c33b17e5cc97276d91c38248019b451134"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/bheklilr/base-io-access"; description = "The IO functions included in base delimited into small, composable classes"; license = stdenv.lib.licenses.gpl2; - }) {}; - - "base-noprelude_4_8_2_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "base-noprelude"; - version = "4.8.2.0"; - sha256 = "bd4ab7685a14d82f7586074b1af88e22a8401e552a439286710592e3a2d763c7"; - libraryHaskellDepends = [ base ]; - doHaddock = false; - jailbreak = true; - homepage = "https://github.com/hvr/base-noprelude"; - description = "\"base\" package sans \"Prelude\" module"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -28905,10 +27901,10 @@ self: { base base64-bytestring bytestring conduit hspec QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Base64-encode and decode streams of bytes. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "base64-string" = callPackage @@ -28987,24 +27983,6 @@ self: { }) {}; "basic-prelude" = callPackage - ({ mkDerivation, base, bytestring, containers, filepath, hashable - , lifted-base, ReadArgs, safe, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "basic-prelude"; - version = "0.5.2"; - sha256 = "96666a0ddd6b12eaa4d172cf76e0a4b3846da49d96a2b68d627e949ea7c75752"; - 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; - }) {}; - - "basic-prelude_0_6_1" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, hashable , lifted-base, ReadArgs, safe, text, transformers , unordered-containers, vector @@ -29054,6 +28032,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "batch-rename" = callPackage + ({ mkDerivation, base, directory, filepath, Glob }: + mkDerivation { + pname = "batch-rename"; + version = "0.1.1.0"; + sha256 = "c22af153685c355df65c048986da2b9e5133f3892bc398dcf88aa1a6e864645e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base directory filepath Glob ]; + homepage = "https://github.com/uppet/batch_rename"; + description = "Make Linux or MacOS do things like \"rename *.mp3 *.mp4\""; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "battlenet" = callPackage ({ mkDerivation, aeson, base, containers, http-conduit, text }: mkDerivation { @@ -29063,10 +28055,10 @@ self: { libraryHaskellDepends = [ aeson base containers http-conduit text ]; - jailbreak = true; homepage = "https://github.com/teozkr/hs-battlenet/"; description = "API client for Battle.Net"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "battlenet-yesod" = callPackage @@ -29078,10 +28070,10 @@ self: { libraryHaskellDepends = [ base battlenet http-conduit text yesod-core ]; - jailbreak = true; homepage = "https://github.com/teozkr/hs-battlenet/"; description = "Yesod integration for the battlenet package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "battleships" = callPackage @@ -29112,7 +28104,6 @@ self: { diagrams-svg filepath MonadRandom mtl transformers wai-handler-fastcgi yesod ]; - jailbreak = true; homepage = "https://github.com/zrho/afp"; description = "A web-based implementation of battleships including an AI opponent"; license = stdenv.lib.licenses.bsd3; @@ -29167,18 +28158,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bcrypt_0_0_8" = callPackage - ({ mkDerivation, base, bytestring, entropy, memory }: - mkDerivation { - pname = "bcrypt"; - version = "0.0.8"; - sha256 = "9cd100975d7349190a1d8ed6459d9e2677a74385ce86b35f2da3f5c582e11100"; - libraryHaskellDepends = [ base bytestring entropy memory ]; - description = "Haskell bindings to the bcrypt password hash"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bcrypt" = callPackage ({ mkDerivation, base, bytestring, data-default, entropy, memory }: mkDerivation { @@ -29249,10 +28228,10 @@ self: { base conduit containers convertible HDBC HDBC-sqlite3 microlens mtl pretty semigroups tagged text time uniplate ]; - jailbreak = true; homepage = "http://travis.athougies.net/projects/beam.html"; description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "beam-th" = callPackage @@ -29294,7 +28273,6 @@ self: { base blaze-builder bytestring ghc-prim integer-gmp murmur-hash QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "Generic serializer/deserializer with compact representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -29341,7 +28319,6 @@ self: { array base binary deepseq template-haskell ]; testHaskellDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "https://hackage.haskell.org/package/bed-and-breakfast"; description = "Efficient Matrix operations in 100% Haskell"; license = stdenv.lib.licenses.mit; @@ -29439,7 +28416,6 @@ self: { testHaskellDepends = [ attoparsec base bytestring containers ghc-prim hspec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/cobit/bencoding"; description = "A library for encoding and decoding of BEncode data"; license = stdenv.lib.licenses.bsd3; @@ -29492,7 +28468,6 @@ self: { ghc-paths haskeline haskell-src-exts language-python monads-tf parseargs process transformers ]; - jailbreak = true; homepage = "http://wiki.github.com/bjpop/berp/"; description = "An implementation of Python 3"; license = stdenv.lib.licenses.bsd3; @@ -29529,9 +28504,9 @@ self: { version = "0.2.0.1"; sha256 = "41d3af0a84244fde61e4c902dd2e30e995a38df4e4f279cae6c1c968ac45662f"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Extended GCD of polynomials over F_p[x]"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bet" = callPackage @@ -29554,7 +28529,6 @@ self: { base lens QuickCheck semigroups test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/Noeda/bet/"; description = "Betfair API bindings. Bet on sports on betting exchanges."; license = stdenv.lib.licenses.mit; @@ -29573,9 +28547,9 @@ self: { attoparsec base errors hashable text text-icu ]; testHaskellDepends = [ base hspec QuickCheck smallcheck ]; - jailbreak = true; description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code)."; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "between" = callPackage @@ -29613,7 +28587,6 @@ self: { base bimap category-extras containers derive haskell98 mtl template-haskell unix ]; - jailbreak = true; description = "Bidirectionalization for Free! (POPL'09)"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -29639,10 +28612,10 @@ self: { version = "0.1.0.1"; sha256 = "ba68978e53d15d069ac31064069d641a89bfee1d5133c05670848112076ce271"; libraryHaskellDepends = [ attoparsec base bytestring time ]; - jailbreak = true; homepage = "http://github.com/jonpetterbergman/bgmax"; description = "Parse BgMax-files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bgzf" = callPackage @@ -29679,7 +28652,6 @@ self: { parsec pretty transformers ]; executableToolDepends = [ alex happy ]; - jailbreak = true; homepage = "https://github.com/cacay/bibdb"; description = "A database based bibliography manager for BibTeX"; license = stdenv.lib.licenses.mit; @@ -29737,32 +28709,8 @@ self: { version = "0.1"; sha256 = "3583e5fb2f6be1d4fd85adf4b60baa89b3810a27a84c40d3f8fb193c4cc4da46"; libraryHaskellDepends = [ base bytestring dataenc mtl ]; - jailbreak = true; description = "Extra helper functions for bidirectional specifications"; license = "LGPL"; - }) {}; - - "bifunctors_5_2" = callPackage - ({ mkDerivation, base, comonad, containers, hspec, QuickCheck - , semigroups, tagged, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "bifunctors"; - version = "5.2"; - sha256 = "46e173dac5863a7b8404b44ab1ead2de94e743d24a2de571ff086cfb8748de14"; - libraryHaskellDepends = [ - base comonad containers semigroups tagged template-haskell - transformers - ]; - testHaskellDepends = [ - base hspec QuickCheck transformers transformers-compat - ]; - doHaddock = false; - jailbreak = true; - homepage = "http://github.com/ekmett/bifunctors/"; - description = "Bifunctors"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -29816,7 +28764,6 @@ self: { base directory filepath HarmTrace-Base HUnit ListLike mtl parseargs uu-parsinglib ]; - jailbreak = true; homepage = "http://ddmal.music.mcgill.ca/billboard"; description = "A parser for the Billboard chord dataset"; license = stdenv.lib.licenses.lgpl3; @@ -29836,7 +28783,6 @@ self: { base billeksah-pane billeksah-services Cabal containers directory filepath glib gtk mtl parsec pretty transformers ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Leksah library"; license = "LGPL"; @@ -29857,7 +28803,6 @@ self: { base billeksah-services containers directory filepath mtl parsec plugins pretty transformers ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Leksah plugin base"; license = "LGPL"; @@ -29881,7 +28826,6 @@ self: { directory filepath leksah-dummy leksah-main leksah-plugin-pane mtl parsec pretty transformers ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Leksah plugin base"; license = "LGPL"; @@ -29901,7 +28845,6 @@ self: { base billeksah-services containers directory filepath glib gtk mtl parsec pretty time transformers ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Leksah library"; license = "LGPL"; @@ -29919,7 +28862,6 @@ self: { libraryHaskellDepends = [ base containers directory filepath mtl parsec pretty transformers ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Leksah library"; license = "LGPL"; @@ -30046,9 +28988,9 @@ self: { version = "1.0.2.2"; sha256 = "68c267c40d08bb0a574a35bb8bc2eab06172e1084fbf1fdeeb2d7015a9e56cf0"; libraryHaskellDepends = [ base binary bytestring mtl ]; - jailbreak = true; description = "Flexible way to ease transmission of binary data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-conduit" = callPackage @@ -30078,7 +29020,6 @@ self: { version = "0.1.0"; sha256 = "7433551080e23843fb4ed8f819f2c04dca13eb7d37dbd36a30065358fa7564e5"; libraryHaskellDepends = [ base binary ghc-prim ]; - jailbreak = true; description = "Automatic deriving of Binary using GHC.Generics"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -30179,8 +29120,8 @@ self: { pname = "binary-orphans"; version = "0.1.5.1"; sha256 = "c60442199ad6139654a6a672dc66d321dbe8a23199fb5269ef295b2adc23af4c"; - revision = "2"; - editedCabalFile = "987c5b6812e28ae7ab9b6073cbb6e5db7d4e1f6c286dc5b69d8a1d6bcb51831b"; + revision = "4"; + editedCabalFile = "842aed0eac15d13b8178dd9ded2b2e296eabc950bd607593bb22c307d77c551e"; libraryHaskellDepends = [ aeson base binary case-insensitive hashable scientific tagged text text-binary time unordered-containers vector @@ -30212,6 +29153,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "binary-parsers" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , bytestring-lexing, deepseq, directory, filepath, QuickCheck + , quickcheck-instances, quickcheck-unicode, scientific, tasty + , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector + }: + mkDerivation { + pname = "binary-parsers"; + version = "0.2.3.0"; + sha256 = "bc6195493b950efcbeb9ef54dfe47a6badf894dff934cf02a4b170331c1b217a"; + libraryHaskellDepends = [ + base binary bytestring bytestring-lexing scientific + ]; + testHaskellDepends = [ + attoparsec base binary bytestring bytestring-lexing deepseq + directory filepath QuickCheck quickcheck-instances + quickcheck-unicode scientific tasty tasty-hunit tasty-quickcheck + text unordered-containers vector + ]; + homepage = "https://github.com/winterland1989/binary-parsers"; + description = "Extends binary with parsec/attoparsec style parsing combinators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-protocol" = callPackage ({ mkDerivation, base, binary, bytestring, mtl }: mkDerivation { @@ -30219,10 +29184,10 @@ self: { version = "1.0"; sha256 = "7084bcca057dcb968587d9c67fbc34d4a384aaaacab39b4fb4e803210993c6c2"; libraryHaskellDepends = [ base binary bytestring mtl ]; - jailbreak = true; homepage = "http://github.com/gcross/binary-protocol"; description = "Monad to ease implementing a binary network protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binary-protocol-zmq" = callPackage @@ -30252,7 +29217,6 @@ self: { testHaskellDepends = [ base directory doctest filepath hspec QuickCheck ]; - doCheck = false; description = "Binary and exponential searches"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -30296,7 +29260,6 @@ self: { testHaskellDepends = [ base binary-list QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; description = "Format to store data using the binary transform"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -30315,7 +29278,6 @@ self: { base binary bytestring Cabal cabal-test-quickcheck io-streams QuickCheck ]; - jailbreak = true; homepage = "http://github.com/jonpetterbergman/binary-streams"; description = "data serialization/deserialization io-streams library"; license = stdenv.lib.licenses.bsd3; @@ -30405,7 +29367,6 @@ self: { base bytestring containers deepseq ghc-prim monads-tf mtl numeric-prelude random stm strict transformers type-level-tf unix ]; - jailbreak = true; homepage = "https://github.com/coreyoconnor/bind-marshal"; description = "Data marshaling library that uses type level equations to optimize buffering"; license = stdenv.lib.licenses.bsd3; @@ -30456,6 +29417,7 @@ self: { homepage = "https://bitbucket.org/accursoft/binding"; description = "Data Binding in WxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bindings" = callPackage @@ -30502,10 +29464,8 @@ self: { }: mkDerivation { pname = "bindings-GLFW"; - version = "3.1.2.1"; - sha256 = "083cea7d2262aecd8a80f74d80c82c2aaa84cf80e960d456e8e34fc38398decb"; - revision = "1"; - editedCabalFile = "d215ed7ea8c1d6879f877e446ce3e3ab78d7721ab9e6fbb4d8e91cf004b4cda3"; + version = "3.1.2.2"; + sha256 = "537385a35b0ca0f6980f9a785434dcca5e0f8b75475dafa2e9c9d719dd503fc9"; libraryHaskellDepends = [ base bindings-DSL template-haskell ]; librarySystemDepends = [ libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr @@ -30514,8 +29474,6 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - jailbreak = true; - doCheck = false; description = "Low-level bindings to GLFW OpenGL library"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; @@ -30546,7 +29504,6 @@ self: { sha256 = "d324f6517ad3615aa7065e5f2a247f146655a7315ac70006ef0ded4bce0f873b"; libraryHaskellDepends = [ base bindings-DSL ]; libraryPkgconfigDepends = [ apr-1 ]; - jailbreak = true; homepage = "http://cielonegro.org/Bindings-APR.html"; description = "Low level bindings to Apache Portable Runtime (APR)"; license = stdenv.lib.licenses.publicDomain; @@ -30561,7 +29518,6 @@ self: { sha256 = "9d93dae4cb05d24a2fe50778bdf972df23ca0be5e8f85a85bb744e757720206b"; libraryHaskellDepends = [ base bindings-apr bindings-DSL ]; libraryPkgconfigDepends = [ apr-util-1 ]; - jailbreak = true; homepage = "http://cielonegro.org/Bindings-APR.html"; description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)"; license = stdenv.lib.licenses.publicDomain; @@ -30592,7 +29548,6 @@ self: { libraryHaskellDepends = [ array base containers unix ]; librarySystemDepends = [ bfd opcodes ]; libraryToolDepends = [ alex happy ]; - jailbreak = true; homepage = "http://projects.haskell.org/bindings-bfd/"; description = "Bindings for libbfd, a library of the GNU `binutils'"; license = stdenv.lib.licenses.lgpl3; @@ -30682,7 +29637,6 @@ self: { libraryHaskellDepends = [ array base bindings-DSL ]; librarySystemDepends = [ eskit ]; libraryPkgconfigDepends = [ eskit ]; - jailbreak = true; homepage = "http://github.com/a1kmm/bindings-eskit"; description = "Bindings to ESKit"; license = stdenv.lib.licenses.bsd3; @@ -30829,10 +29783,10 @@ self: { sha256 = "809175b1ebd5675506755e53901104ea52cdc68e761c7ce01df54ace11b249b5"; libraryHaskellDepends = [ base bindings-DSL ]; librarySystemDepends = [ blas liblapack ]; - jailbreak = true; homepage = "https://github.com/basvandijk/bindings-levmar"; description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; "bindings-libcddb" = callPackage @@ -30899,7 +29853,6 @@ self: { base bindings-DSL resourcet transformers ]; librarySystemDepends = [ stemmer ]; - jailbreak = true; description = "Binding for libstemmer with low level binding"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -30989,7 +29942,6 @@ self: { version = "0.8.0.0"; sha256 = "458a10151e6a22a78ca8360573f3d842f4396ba5cd606fdd95cdb6ac774426a2"; libraryHaskellDepends = [ base bindings-DSL ]; - jailbreak = true; homepage = "http://www.github.com/massysett/bindings-mpdecimal"; description = "bindings to mpdecimal library"; license = stdenv.lib.licenses.bsd3; @@ -31219,10 +30171,10 @@ self: { version = "1.0.0.0"; sha256 = "f1e9c392ea6a9be6a4d7200ed8060e5560ac6881c65c9423cc6e63d2bbe7246e"; libraryHaskellDepends = [ base binary bytestring rank1dynamic ]; - jailbreak = true; homepage = "https://github.com/lspitzner/bindynamic"; description = "A variation of Data.Dynamic.Dynamic with a Binary instance"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binembed" = callPackage @@ -31239,10 +30191,10 @@ self: { executableHaskellDepends = [ base containers directory dlist filepath ]; - jailbreak = true; homepage = "http://code.mathr.co.uk/binembed"; description = "Embed data into object files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "binembed-example" = callPackage @@ -31257,10 +30209,10 @@ self: { executableHaskellDepends = [ base binembed bytestring containers filepath ]; - jailbreak = true; homepage = "http://code.mathr.co.uk/binembed"; description = "Example project using binembed to embed data in object files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bini" = callPackage @@ -31291,7 +30243,6 @@ self: { parsec QuickCheck tagsoup ]; executableHaskellDepends = [ base bytestring random ]; - jailbreak = true; homepage = "http://biohaskell.org/Libraries/Bio"; description = "A bioinformatics library"; license = "LGPL"; @@ -31387,7 +30338,6 @@ self: { strict text transformers unix unordered-containers Vec vector vector-algorithms vector-th-unbox ]; - jailbreak = true; homepage = "http://github.com/udo-stenzel/biohazard"; description = "bioinformatics support library"; license = stdenv.lib.licenses.bsd3; @@ -31396,30 +30346,31 @@ self: { "bioinformatics-toolkit" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring - , bytestring-lexing, clustering, colour, conduit + , bytestring-lexing, case-insensitive, clustering, colour, conduit , conduit-combinators, containers, data-default-class - , double-conversion, hexpat, http-conduit, IntervalMap, matrices - , mtl, optparse-applicative, palette, parallel, primitive, random - , samtools, shelly, split, statistics, tasty, tasty-golden - , tasty-hunit, text, transformers, unordered-containers, vector - , vector-algorithms, word8 + , double-conversion, hexpat, http-conduit, IntervalMap + , math-functions, matrices, mtl, optparse-applicative, palette + , parallel, primitive, random, samtools, shelly, split, statistics + , tasty, tasty-golden, tasty-hunit, text, transformers + , unordered-containers, vector, vector-algorithms, word8 }: mkDerivation { pname = "bioinformatics-toolkit"; - version = "0.2.2"; - sha256 = "df424767fad8d8df0cf70581fc2b478fcbba30bbde71545d9bdce44ec8c2989e"; + version = "0.2.3"; + sha256 = "e83249daa14c7d71319fc167288f791ba3045d43a5fbe9f43ef64eaa918ff2f9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring bytestring-lexing - clustering colour conduit-combinators containers data-default-class - double-conversion hexpat http-conduit IntervalMap matrices mtl - palette parallel primitive samtools split statistics text - transformers unordered-containers vector vector-algorithms word8 + case-insensitive clustering colour conduit-combinators containers + data-default-class double-conversion hexpat http-conduit + IntervalMap math-functions matrices mtl palette parallel primitive + samtools split statistics text transformers unordered-containers + vector vector-algorithms word8 ]; executableHaskellDepends = [ - base bytestring clustering data-default-class optparse-applicative - shelly split text + base bytestring clustering data-default-class double-conversion + optparse-applicative shelly split text ]; testHaskellDepends = [ base bytestring conduit conduit-combinators data-default-class @@ -31431,21 +30382,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "biophd_0_0_4" = callPackage - ({ mkDerivation, base, binary, biocore, bytestring, parsec, text }: - mkDerivation { - pname = "biophd"; - version = "0.0.4"; - sha256 = "a31005a449218e3f383ede0a177c48ef8c7ec21ae7bc5d122bd6eb6a9e1bfb82"; - libraryHaskellDepends = [ - base binary biocore bytestring parsec text - ]; - homepage = "https://patch-tag.com/r/dfornika/biophd/home"; - description = "Library for reading phd sequence files"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "biophd" = callPackage ({ mkDerivation, base, binary, biocore, bytestring, parsec, text , time, time-locale-compat @@ -31516,7 +30452,6 @@ self: { base biocore bytestring conduit containers hspec HUnit QuickCheck transformers zlib-conduit ]; - jailbreak = true; description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -31547,11 +30482,10 @@ self: { ({ mkDerivation, base, directory, doctest, filepath, numeric-qq }: mkDerivation { pname = "bit-array"; - version = "0.1.1"; - sha256 = "0c3ce1c19f6830a083b39590a8e9015b1fb430f4fb97dc5349c21c03eec72c14"; + version = "0.1.2"; + sha256 = "1607bc652aea885589414071dd290657296bbec21c235f4f1f2889715bc87e3c"; libraryHaskellDepends = [ base numeric-qq ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/bit-array"; description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types"; license = stdenv.lib.licenses.mit; @@ -31607,7 +30541,6 @@ self: { base base58string bitcoin-script bitcoin-tx bytestring hspec http-client lens text wreq ]; - doCheck = false; homepage = "http://www.leonmergen.com/opensource.html"; description = "Provides access to the RPC API of Bitcoin Core"; license = stdenv.lib.licenses.mit; @@ -31630,7 +30563,6 @@ self: { base bitcoin-api bitcoin-tx bytestring conduit hspec http-client lens text wreq ]; - doCheck = false; homepage = "http://www.leonmergen.com/opensource.html"; description = "Higher level constructs on top of the bitcoin-api package"; license = stdenv.lib.licenses.mit; @@ -31658,23 +30590,48 @@ self: { "bitcoin-payment-channel" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base58string - , base64-bytestring, binary, bytestring, cereal, errors - , haskoin-core, hexstring, QuickCheck, scientific, text, time + , base64-bytestring, bytestring, cereal, errors, haskoin-core + , hexstring, QuickCheck, scientific, text, time }: mkDerivation { pname = "bitcoin-payment-channel"; - version = "0.2.2.0"; - sha256 = "cc0d19904ea5363453765c702b5f1e6f1ac99a2a90d8d17223d94d610dee3806"; + version = "0.3.0.1"; + sha256 = "97bc6dc75c72735f28c84ef90734f2e31bde8693f9c88e216f8a66d3f95ae8c8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring binary - bytestring cereal errors haskoin-core hexstring scientific text + aeson base base16-bytestring base64-bytestring bytestring cereal + errors haskoin-core hexstring scientific text time + ]; + executableHaskellDepends = [ + aeson base base16-bytestring base58string base64-bytestring + bytestring cereal haskoin-core hexstring QuickCheck text time + ]; + homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; + description = "Library for working with Bitcoin payment channels"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "bitcoin-payment-channel_0_4_0_1" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring + , bytestring, cereal, errors, haskoin-core, hexstring, QuickCheck + , scientific, string-conversions, text, time + }: + mkDerivation { + pname = "bitcoin-payment-channel"; + version = "0.4.0.1"; + sha256 = "98f5f1bd94d6c828404f5fdda6976cffb226bcbfd8321d73e7eb0367c6442f62"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring base64-bytestring bytestring cereal + errors haskoin-core hexstring scientific string-conversions text time ]; executableHaskellDepends = [ - aeson base base16-bytestring base58string base64-bytestring binary - bytestring cereal haskoin-core hexstring QuickCheck text time + aeson base base16-bytestring base64-bytestring bytestring cereal + haskoin-core hexstring QuickCheck string-conversions text time ]; homepage = "https://github.com/runeksvendsen/bitcoin-payment-channel"; description = "Library for working with Bitcoin payment channels"; @@ -31701,7 +30658,6 @@ self: { HUnit mtl network QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text unix unordered-containers watchdog ]; - jailbreak = true; description = "Library to communicate with the Satoshi Bitcoin daemon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -31774,7 +30730,6 @@ self: { executableHaskellDepends = [ base Bitly directory filepath regexpr ]; - jailbreak = true; homepage = "http://bitbucket.org/jetxee/hs-bitly/"; description = "A command line tool to access bit.ly URL shortener."; license = stdenv.lib.licenses.bsd3; @@ -31823,24 +30778,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "bits_0_4" = callPackage - ({ mkDerivation, base, bytes, directory, doctest, filepath, mtl - , transformers - }: - mkDerivation { - pname = "bits"; - version = "0.4"; - sha256 = "e626310d69e0808586a9c7cc965a0c2eb3413d643271e523fef8037fc8f4458b"; - libraryHaskellDepends = [ base bytes mtl transformers ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/analytics/bits"; - description = "Various bit twiddling and bitwise serialization primitives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bits" = callPackage ({ mkDerivation, base, bytes, directory, doctest, filepath, mtl , transformers @@ -31901,7 +30838,6 @@ self: { sha256 = "32b7f730be27810519f1ea32bdb82e25c187373dd407cdf0cbb629be6fa00f22"; libraryHaskellDepends = [ base bytestring conduit mtl ]; testHaskellDepends = [ base bytestring conduit hspec HUnit mtl ]; - jailbreak = true; description = "Bitstream support for Conduit"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -31930,7 +30866,6 @@ self: { libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; librarySystemDepends = [ gmp ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; description = "A space-efficient set data structure"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -31950,11 +30885,10 @@ self: { base bindings-DSL bindings-glib bindings-gobject ]; executablePkgconfigDepends = [ gtk2 pango ]; - jailbreak = true; description = "Proof-of-concept tool for writing using binary choices"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome) pango;}; + }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs.gnome2) pango;}; "bitstream" = callPackage ({ mkDerivation, base, base-unicode-symbols, bytestring, QuickCheck @@ -31970,7 +30904,6 @@ self: { testHaskellDepends = [ base base-unicode-symbols bytestring QuickCheck vector ]; - jailbreak = true; homepage = "https://github.com/phonohawk/bitstream"; description = "Fast, packed, strict and lazy bit streams with stream fusion"; license = stdenv.lib.licenses.publicDomain; @@ -32017,7 +30950,6 @@ self: { aeson base bencoding bytestring cereal directory filepath hspec network QuickCheck quickcheck-instances text time ]; - jailbreak = true; homepage = "https://github.com/cobit/bittorrent"; description = "Bittorrent protocol implementation"; license = stdenv.lib.licenses.bsd3; @@ -32110,7 +31042,6 @@ self: { aws base bytestring directory filepath HDBC HDBC-sqlite3 hslogger http-conduit MissingH pureMD5 random strict text unix utf8-string ]; - jailbreak = true; homepage = "https://github.com/ingesson/bkr"; description = "Backup utility for backing up to cloud storage services (S3 only right now)"; license = stdenv.lib.licenses.bsd3; @@ -32185,25 +31116,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "blake2_0_1_0" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, hlint - , QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "blake2"; - version = "0.1.0"; - sha256 = "d4cdb38b973125fdd80a12f335ec536dc5c5d1dfd5611c9ebe46c3bf78841ce5"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ - base base16-bytestring bytestring hlint QuickCheck tasty - tasty-quickcheck - ]; - homepage = "https://github.com/centromere/blake2"; - description = "A library providing BLAKE2"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blake2" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, hlint , QuickCheck, tasty, tasty-quickcheck @@ -32229,7 +31141,6 @@ self: { version = "0.5"; sha256 = "0fa8de7d3748d23b1a5fd0e52856458d1eb962b170deeb5f5281332c93db6396"; libraryHaskellDepends = [ base bytestring text vector ]; - jailbreak = true; homepage = "https://github.com/killerswan/Haskell-BLAKE"; description = "The BLAKE SHA-3 candidate hashes, in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -32249,7 +31160,6 @@ self: { executableHaskellDepends = [ base blakesum bytestring haskell98 text vector ]; - jailbreak = true; homepage = "https://github.com/killerswan/Haskell-BLAKE"; description = "The BLAKE SHA-3 candidate hashes, in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -32277,7 +31187,6 @@ self: { testHaskellDepends = [ base containers directory process shake stm text time unix vector ]; - doCheck = false; homepage = "https://github.com/ku-fpg/blank-canvas/wiki"; description = "HTML5 Canvas Graphics Library"; license = stdenv.lib.licenses.bsd3; @@ -32291,7 +31200,6 @@ self: { version = "0.7.6"; sha256 = "912e904b8ae923520c3ac4707abb28322a96009daf9ec88baffe5ebd049fcee0"; libraryHaskellDepends = [ base ieee QuickCheck storable-complex ]; - jailbreak = true; homepage = "http://github.com/patperry/blas"; description = "Bindings to the BLAS library"; license = stdenv.lib.licenses.bsd3; @@ -32340,10 +31248,10 @@ self: { executableHaskellDepends = [ base blaze-html dates directory HaTeX process split tagsoup text ]; - jailbreak = true; homepage = "https://github.com/2016rshah/BlaTeX"; description = "Blog in LaTeX"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze" = callPackage @@ -32415,10 +31323,10 @@ self: { base blaze-builder bytestring bytestring-builder enumerator streaming-commons transformers ]; - jailbreak = true; homepage = "https://github.com/meiersi/blaze-builder-enumerator"; description = "Enumeratees for the incremental conversion of builders to bytestrings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-from-html" = callPackage @@ -32437,29 +31345,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blaze-html_0_8_1_1" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring - , containers, HUnit, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-html"; - version = "0.8.1.1"; - sha256 = "f8d2e39764b318f5dde33288f9f11a125ac51552c48b981e2b8068002728dcb6"; - libraryHaskellDepends = [ - base blaze-builder blaze-markup bytestring text - ]; - testHaskellDepends = [ - base blaze-builder blaze-markup bytestring containers HUnit - QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast HTML combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "blaze-html" = callPackage ({ mkDerivation, base, blaze-builder, blaze-markup, bytestring , containers, HUnit, QuickCheck, test-framework @@ -32506,7 +31391,6 @@ self: { version = "0.1.0.0"; sha256 = "6f9ed6e2d77b6a5e2d812ba56b7380cc8cf4e8067f406663f9b49db8b92f7c85"; libraryHaskellDepends = [ base blaze-html bytestring hexpat text ]; - jailbreak = true; homepage = "https://github.com/jaspervdj/blaze-html-hexpat"; description = "A hexpat backend for blaze-html"; license = stdenv.lib.licenses.bsd3; @@ -32546,29 +31430,9 @@ self: { aeson base doctest QuickCheck scientific tasty tasty-quickcheck text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/philopon/blaze-json"; description = "tiny library for encoding json"; license = stdenv.lib.licenses.mit; - }) {}; - - "blaze-markup_0_7_0_3" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.7.0.3"; - sha256 = "3e69a0e88dde5a6a3c8b4204d847a545f7872025a2ac4554cd5df2861aa41b20"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - ]; - homepage = "http://jaspervdj.be/blaze"; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -32651,7 +31515,6 @@ self: { base blaze-builder bytestring ghc-prim integer-gmp old-locale text time vector ]; - jailbreak = true; homepage = "http://github.com/mailrank/blaze-textual"; description = "Fast rendering of common datatypes (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -32699,7 +31562,6 @@ self: { base bliplib bytestring containers filepath language-python mtl old-time parseargs pretty ]; - jailbreak = true; homepage = "https://github.com/bjpop/blip"; description = "Python to bytecode compiler"; license = stdenv.lib.licenses.bsd3; @@ -32717,10 +31579,10 @@ self: { libraryHaskellDepends = [ base binary bytestring containers mtl pretty utf8-string ]; - jailbreak = true; homepage = "https://github.com/bjpop/blip"; description = "Support code for Blip"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blockhash" = callPackage @@ -32802,7 +31664,6 @@ self: { QuickCheck quickcheck-properties semigroups text time unordered-containers vector ]; - doCheck = false; homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -32832,7 +31693,6 @@ self: { QuickCheck quickcheck-properties semigroups text time unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/bitemyapp/bloodhound"; description = "ElasticSearch client library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -32950,10 +31810,10 @@ self: { executableHaskellDepends = [ base blubber-server bytestring cereal containers gloss network unix ]; - jailbreak = true; homepage = "https://secure.plaimi.net/games/blubber.html"; description = "The blubber client; connects to the blubber server"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blubber-server" = callPackage @@ -32972,10 +31832,10 @@ self: { base Cabal cereal containers data-default-class network pandoc process random scotty text transformers unix ]; - jailbreak = true; homepage = "https://secure.plaimi.net/games/blubber.html"; description = "The blubber server, serves blubber clients"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bluetile" = callPackage @@ -33010,9 +31870,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gtk ]; - jailbreak = true; description = "Utilities for Bluetile"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blunt" = callPackage @@ -33032,23 +31892,9 @@ self: { wl-pprint-text ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://blunt.herokuapp.com"; description = "Convert between pointfree and pointful expressions"; license = stdenv.lib.licenses.mit; - }) {}; - - "bmp_1_2_5_2" = callPackage - ({ mkDerivation, base, binary, bytestring }: - mkDerivation { - pname = "bmp"; - version = "1.2.5.2"; - sha256 = "bdd8681204d79176a974100958a020bb65471752ae7819e5fad7856abd700839"; - libraryHaskellDepends = [ base binary bytestring ]; - jailbreak = true; - homepage = "http://code.ouroborus.net/bmp"; - description = "Read and write uncompressed BMP image files"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -33116,8 +31962,8 @@ self: { }: mkDerivation { pname = "bond"; - version = "0.5.0.0"; - sha256 = "3720a7004ebe8b1334bbc1c2fe240f20a49fbb1ca9003a5f7257dad5ed2ba3ab"; + version = "0.6.0.0"; + sha256 = "1b6437cda224d2c1250ff83fa9af1c4e9b7890613a6de7b658672f9dc35cee0a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33133,7 +31979,6 @@ self: { filepath HUnit monad-loops parsec pretty QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck text ]; - jailbreak = true; homepage = "https://github.com/Microsoft/bond"; description = "Bond schema compiler and code generator"; license = stdenv.lib.licenses.mit; @@ -33148,8 +31993,8 @@ self: { }: mkDerivation { pname = "bond-haskell"; - version = "0.1.4.0"; - sha256 = "5590a50af8e143df9b0fd9dcee284fde9f051a8684dd45f3c769ce1d54f10419"; + version = "0.1.4.1"; + sha256 = "914e2dd778f817536ad36708983a57517356b4d8c44368544c9ae5e73ef8e900"; libraryHaskellDepends = [ aeson array base binary bond-haskell-compiler bytestring containers deepseq extra hashable mtl scientific text unordered-containers @@ -33172,8 +32017,8 @@ self: { }: mkDerivation { pname = "bond-haskell-compiler"; - version = "0.1.4.0"; - sha256 = "729134e6f72594997ddf4f96c237d9ac9ab8e6c6fc5a8098c1cf17623d6de266"; + version = "0.1.4.1"; + sha256 = "f48b794e2b9096a0f7335bc8ab6264a841fd35d369929105011d16e574684aac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33195,8 +32040,8 @@ self: { }: mkDerivation { pname = "bookkeeper"; - version = "0.2.2.0"; - sha256 = "713c92318b14a7592a83ccc7fc575ee709c73ccd9c93e9e418bca8c2a1a5b219"; + version = "0.2.3"; + sha256 = "7aa2a2a42ed03eee2eccc96ed63cfa3b090f55dd432936dc801cd331b684f5b6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -33215,6 +32060,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "bookkeeper-permissions" = callPackage + ({ mkDerivation, base, bookkeeper, type-level-sets }: + mkDerivation { + pname = "bookkeeper-permissions"; + version = "0.1.0.0"; + sha256 = "66ea36897fd62e23eaf4de657e12c43067d86f86b441ecb819c4216889fc7cb4"; + libraryHaskellDepends = [ base bookkeeper type-level-sets ]; + homepage = "https://github.com/pkamenarsky/bookkeeper-permissions"; + description = "Permissions for bookkeeper records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bool-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -33227,6 +32085,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "boolean-like" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, containers + , semigroups, text, vector + }: + mkDerivation { + pname = "boolean-like"; + version = "0.1.1.0"; + sha256 = "6ca47b21a6d98161edfd94f4d5a19daacc13d229b87a0c107e868ff0259658b8"; + libraryHaskellDepends = [ + attoparsec base bytestring containers semigroups text vector + ]; + homepage = "http://github.com/Shou/boolean-like"; + description = "Logical combinatory operations dealing with datatypes representing booleans by their constructors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "boolean-list" = callPackage ({ mkDerivation, base, bytestring, HUnit }: mkDerivation { @@ -33234,10 +32108,10 @@ self: { version = "0.1.0.0"; sha256 = "774f3f3313a8909505834e647b744fa53178b6a4eee5cf55b5207da5e6d7217b"; libraryHaskellDepends = [ base bytestring HUnit ]; - jailbreak = true; homepage = "http://xy30.com"; description = "convert numbers to binary coded lists"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "boolean-normal-forms" = callPackage @@ -33351,7 +32225,6 @@ self: { base containers data-accessor data-accessor-template font-opengl-basic4x6 GLFW-b MonadRandom mtl OpenGL ]; - jailbreak = true; description = "Boomshine clone"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -33384,7 +32257,6 @@ self: { transformers unordered-containers vaultaire-common vector zeromq4-haskell ]; - jailbreak = true; homepage = "https://github.com/anchor/borel-core"; description = "Metering System for OpenStack metrics provided by Vaultaire"; license = stdenv.lib.licenses.bsd3; @@ -33395,8 +32267,8 @@ self: { ({ mkDerivation, base, gtk, transformers, X11 }: mkDerivation { pname = "boring-window-switcher"; - version = "0.1.0.0"; - sha256 = "8f09a9dca17f7b9275adb05a1e45e0a2571f25c5654566ccaf18dc792322737c"; + version = "0.1.0.1"; + sha256 = "4d966b56d3a6badb666c8947df23557db9544e469514d0a5b68934c644f5645b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base gtk transformers X11 ]; @@ -33463,8 +32335,6 @@ self: { testHaskellDepends = [ base directory doctest filepath prelude-extras transformers vector ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/ekmett/bound/"; description = "Making de Bruijn Succ Less"; license = stdenv.lib.licenses.bsd3; @@ -33647,9 +32517,9 @@ self: { version = "1.0.1"; sha256 = "28e0cff1cc4f96aa19ebaac3caad4ca6851e89cd26bd48c4de4f611cbcf95166"; libraryHaskellDepends = [ base mtl transformers ]; - jailbreak = true; description = "Break from a loop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "breakout" = callPackage @@ -33706,25 +32576,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "brick_0_4_1" = callPackage - ({ mkDerivation, base, containers, contravariant, data-default - , deepseq, lens, template-haskell, text, text-zipper, transformers - , vector, vty - }: - mkDerivation { - pname = "brick"; - version = "0.4.1"; - sha256 = "bea0df7fdcb476fc955f7301e77bfb8845008ab0e36cab2c2dcc1cf679a4595d"; - libraryHaskellDepends = [ - base containers contravariant data-default deepseq lens - template-haskell text text-zipper transformers vector vty - ]; - homepage = "https://github.com/jtdaugherty/brick/"; - description = "A declarative terminal user interface library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "brick" = callPackage ({ mkDerivation, base, containers, contravariant, data-default , deepseq, microlens, microlens-mtl, microlens-th, template-haskell @@ -33732,8 +32583,8 @@ self: { }: mkDerivation { pname = "brick"; - version = "0.8"; - sha256 = "f730fd999e070700d90d36aadf8716aaf7d86094900f204f06f6593b5e5b1382"; + version = "0.11"; + sha256 = "783192383bf8c2887a5b99aca4c8ec48a6ba91f3ee11591a7d8d98734eead2a5"; libraryHaskellDepends = [ base containers contravariant data-default deepseq microlens microlens-mtl microlens-th template-haskell text text-zipper @@ -33760,7 +32611,6 @@ self: { executableHaskellDepends = [ base binary cmdargs containers directory filepath text ]; - jailbreak = true; description = "Simple part of speech tagger"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -33785,9 +32635,9 @@ self: { version = "0.4.1.0"; sha256 = "90c782cdb5693684da773bb6f34ea9922afd8ce3148f99c9bd7d6897138d9620"; libraryHaskellDepends = [ base containers stm time ]; - jailbreak = true; description = "Small library for interactive functional programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "broker-haskell" = callPackage @@ -33799,7 +32649,6 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ broker ]; testHaskellDepends = [ base bytestring hspec ]; - jailbreak = true; homepage = "https://github.com/capn-freako/broker-haskell"; description = "Haskell bindings to Broker, Bro's messaging library"; license = stdenv.lib.licenses.bsd3; @@ -33847,9 +32696,9 @@ self: { version = "0.0.8.1"; sha256 = "9b9f8d160c7d813224946f194f82bf38a2299b6eb9d643f590ed7616a226877e"; libraryHaskellDepends = [ base bson ghc-prim text ]; - jailbreak = true; description = "Generic functionality for BSON"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bson-generics" = callPackage @@ -33859,7 +32708,6 @@ self: { version = "0.0.1"; sha256 = "b7bf01e812043d15091baf5855f99e996a1bd8e81407cdbf33bd81e9627d2e0e"; libraryHaskellDepends = [ base bson ghc-prim ]; - jailbreak = true; description = "Generics functionality for BSON"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -33939,7 +32787,6 @@ self: { array base base64-bytestring bytestring cereal containers directory filepath hashable mtl QuickCheck random snappy stm time unix ]; - jailbreak = true; homepage = "https://github.com/brinchj/btree-concurrent"; description = "A backend agnostic, concurrent BTree"; license = "LGPL"; @@ -34031,7 +32878,6 @@ self: { base monad-primitive mwc-random mwc-random-monad primitive transformers ]; - jailbreak = true; homepage = "https://github.com/derekelkins/buffon"; description = "An implementation of Buffon machines"; license = stdenv.lib.licenses.bsd2; @@ -34052,10 +32898,10 @@ self: { data-default http-conduit http-types iso8601-time resourcet text time transformers unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/sethfowler/hsbugzilla"; description = "A Haskell interface to the Bugzilla native REST API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buildable" = callPackage @@ -34065,9 +32911,9 @@ self: { version = "0.1.0.3"; sha256 = "fdbe2c5a274998a7d2f881361b30accdff5386bb471c78244c135533457d3bcb"; libraryHaskellDepends = [ base bytestring containers dlist text ]; - jailbreak = true; description = "Typeclass for builders of linear data structures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "buildbox" = callPackage @@ -34097,7 +32943,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base buildbox parseargs ]; - jailbreak = true; homepage = "http://code.ouroborus.net/buildbox"; description = "Tools for working with buildbox benchmark result files"; license = stdenv.lib.licenses.bsd3; @@ -34137,7 +32982,6 @@ self: { mtl old-time process text time transformers unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/JPMoresmau/BuildWrapper"; description = "A library and an executable that provide an easy API for a Haskell IDE"; license = stdenv.lib.licenses.bsd3; @@ -34187,10 +33031,10 @@ self: { sha256 = "953742286dddadd2bd54e13a72916044e1c1a7acada5a5e5d12759c29ac4f9dd"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://parsci.com/"; description = "Burst detection algorithms"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bus-pirate" = callPackage @@ -34220,7 +33064,6 @@ self: { base binary bytestring containers dataenc mtl old-locale parsec pretty time ]; - jailbreak = true; homepage = "http://vis.renci.org/jeff/buster"; description = "Almost but not quite entirely unlike FRP"; license = stdenv.lib.licenses.bsd3; @@ -34305,7 +33148,6 @@ self: { base bytestring gl-capture GLUT OpenGLRaw OpenGLRaw21 repa repa-devil ]; - jailbreak = true; homepage = "http://code.mathr.co.uk/butterflies"; description = "butterfly tilings"; license = stdenv.lib.licenses.gpl3; @@ -34336,10 +33178,10 @@ self: { ansi-terminal base colour containers exceptions haskeline mtl terminfo-hs text transformers ]; - jailbreak = true; homepage = "http://github.com/pjones/byline"; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytable" = callPackage @@ -34435,7 +33277,6 @@ self: { QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/haskell/bytestring"; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; @@ -34450,22 +33291,9 @@ self: { sha256 = "248378d6a7b75e8b9cbadcb3793ddcb17bd1ef7b36ffce02dc99ff11ef49c92b"; libraryHaskellDepends = [ base bytestring cryptohash QuickCheck ]; testHaskellDepends = [ base bytestring cryptohash QuickCheck ]; - jailbreak = true; homepage = "https://github.com/tsuraan/bytestring-arbitrary"; description = "Arbitrary instances for ByteStrings"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "bytestring-builder_0_10_6_0_0" = callPackage - ({ mkDerivation, base, bytestring, deepseq }: - mkDerivation { - pname = "bytestring-builder"; - version = "0.10.6.0.0"; - sha256 = "9c439987d11150ad3f73158ad3be1f9d1f70572cd2cf8fdf585765403f116fd6"; - libraryHaskellDepends = [ base bytestring deepseq ]; - doHaddock = false; - description = "The new bytestring builder, packaged outside of GHC"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -34490,7 +33318,6 @@ self: { revision = "1"; editedCabalFile = "e3aa2813d237dcd0a12bfd27293d8bf592cdf13bfdc01a4b609f34df238d0417"; libraryHaskellDepends = [ base bytestring utf8-string ]; - jailbreak = true; description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -34573,7 +33400,6 @@ self: { base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - doCheck = false; homepage = "http://hub.darcs.net/ganesh/bytestring-handle"; description = "ByteString-backed Handles"; license = stdenv.lib.licenses.bsd3; @@ -34635,14 +33461,15 @@ self: { ({ mkDerivation, base, bytestring, terminal-progress-bar, time }: mkDerivation { pname = "bytestring-progress"; - version = "1.0.6"; - sha256 = "0dd48b6ea4c5bb6398af04b877259e6ec3b0994aa7760a01e552e7db0121dede"; + version = "1.0.7"; + sha256 = "97b0950b6dff0154aa463f1e2921dc560478e1156e482bd5bde8a62bd3f83730"; libraryHaskellDepends = [ base bytestring terminal-progress-bar time ]; homepage = "http://github.com/acw/bytestring-progress"; description = "A library for tracking the consumption of a lazy ByteString"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-read" = callPackage @@ -34659,10 +33486,10 @@ self: { testHaskellDepends = [ base bytestring doctest tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/philopon/bytestring-read"; description = "fast ByteString to number converting library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bytestring-rematch" = callPackage @@ -34674,7 +33501,6 @@ self: { libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring hspec HUnit rematch ]; doHaddock = false; - jailbreak = true; homepage = "github.com/tcrayford/rematch"; description = "Rematch support for ByteString"; license = stdenv.lib.licenses.mit; @@ -34711,28 +33537,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring-tree-builder_0_2_7" = callPackage - ({ mkDerivation, base, base-prelude, bytestring, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck, tasty-smallcheck, text - }: - mkDerivation { - pname = "bytestring-tree-builder"; - version = "0.2.7"; - sha256 = "1d62f411de750723b3b72bc3b60e288b3d2b52c0e982cff332544e2a7fe7a003"; - libraryHaskellDepends = [ - base base-prelude bytestring semigroups text - ]; - testHaskellDepends = [ - base-prelude bytestring QuickCheck quickcheck-instances tasty - tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - homepage = "https://github.com/nikita-volkov/bytestring-tree-builder"; - description = "A very efficient ByteString builder implementation based on the binary tree"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "bytestring-tree-builder" = callPackage ({ mkDerivation, base, base-prelude, bytestring , quickcheck-instances, semigroups, tasty, tasty-hunit @@ -34843,9 +33647,9 @@ self: { version = "0.3.1"; sha256 = "fc9a30c237a4c0c077871a59dc0cb47634ea66271e115bc25ef1dc6c441b1212"; libraryHaskellDepends = [ base language-c ]; - jailbreak = true; description = "A higher level DSL on top of language-c"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "c-io" = callPackage @@ -34908,6 +33712,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "c2ats" = callPackage + ({ mkDerivation, base, containers, HUnit, language-c, pretty + , regex-posix, test-framework, test-framework-hunit + , test-framework-th + }: + mkDerivation { + pname = "c2ats"; + version = "0.1.0.1"; + sha256 = "fd0b1a15d6545948ed719d77d3cd5cab528e3de2ff1dce371871114fb47c226f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers language-c pretty regex-posix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit test-framework-th + ]; + homepage = "https://github.com/metasepi/c2ats#readme"; + description = "Translate C code into ATS"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "c2hs" = callPackage ({ mkDerivation, array, base, bytestring, containers, directory , dlist, filepath, HUnit, language-c, pretty, process, shelly @@ -34985,7 +33812,6 @@ self: { editedCabalFile = "3aaac7f6716c93dec3f62f807a2ab25217f419fa30f566a3d9c4ad939e075bb6"; libraryHaskellDepends = [ base youProbablyWantCapitalCabal ]; doHaddock = false; - jailbreak = true; description = "placeholder for Cabal package, you want the upper case Cabal"; license = stdenv.lib.licenses.bsd2; broken = true; @@ -35004,10 +33830,10 @@ self: { executableHaskellDepends = [ base Cabal directory filepath HTTP optparse-applicative ]; - jailbreak = true; homepage = "https://github.com/joelteon/cabal-audit.git"; description = "Check how up-to-date your .cabal dependencies are."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-bounds" = callPackage @@ -35064,7 +33890,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal optparse-applicative ]; - jailbreak = true; homepage = "https://github.com/benarmston/cabal-constraints"; description = "Repeatable builds for cabalized Haskell projects"; license = stdenv.lib.licenses.mit; @@ -35101,8 +33926,8 @@ self: { }: mkDerivation { pname = "cabal-debian"; - version = "4.32.5"; - sha256 = "7e78c2ed2fbb2ea57bef4eb4a8b8b1a1b8b741097132759eb28353124711d24e"; + version = "4.33"; + sha256 = "ae69fd45365f670b3d36274884b1a7d1b1ec0429f7775ee79d5d813d82e93193"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35115,14 +33940,10 @@ self: { executableHaskellDepends = [ base Cabal debian lens mtl pretty Unixutils ]; - testHaskellDepends = [ - base Cabal containers debian Diff directory filepath hsemail HUnit - lens pretty process text - ]; - doCheck = false; homepage = "https://github.com/ddssff/cabal-debian"; description = "Create a Debianization for a Cabal package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-dependency-licenses" = callPackage @@ -35158,7 +33979,6 @@ self: { zlib ]; executableToolDepends = [ cabal-install ]; - jailbreak = true; homepage = "http://github.com/creswick/cabal-dev"; description = "Manage sandboxed Haskell build environments"; license = stdenv.lib.licenses.bsd3; @@ -35200,7 +34020,6 @@ self: { version = "0.1.0.1"; sha256 = "0e71145e966f450737f1598e20964e9453f64b69f6459a9dfa4a015e7ea57d8e"; libraryHaskellDepends = [ base Cabal ghc transformers ]; - jailbreak = true; homepage = "http://github.com/bgamari/cabal-ghc-dynflags"; description = "Conveniently configure GHC's dynamic flags for use with Cabal projects"; license = stdenv.lib.licenses.bsd3; @@ -35244,38 +34063,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cabal-helper_0_6_3_1" = callPackage - ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory - , extra, filepath, ghc-prim, mtl, process, template-haskell - , temporary, transformers, unix, utf8-string - }: - mkDerivation { - pname = "cabal-helper"; - version = "0.6.3.1"; - sha256 = "c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe"; - revision = "1"; - editedCabalFile = "63136d3d9e1dc39c8fd90687c031727aa7c8c5f38dcf2b26a3b652a44b4d8041"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal directory filepath ghc-prim mtl process transformers - ]; - executableHaskellDepends = [ - base bytestring Cabal directory filepath ghc-prim process - template-haskell temporary transformers utf8-string - ]; - testHaskellDepends = [ - base bytestring Cabal directory extra filepath ghc-prim mtl process - template-haskell temporary transformers unix utf8-string - ]; - testToolDepends = [ cabal-install ]; - jailbreak = true; - doCheck = false; - description = "Simple interface to some of Cabal's configuration state used by ghc-mod"; - license = stdenv.lib.licenses.agpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cabal-helper" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory , extra, filepath, ghc-prim, mtl, process, template-haskell @@ -35320,46 +34107,10 @@ self: { executableHaskellDepends = [ base Cabal filepath optparse-applicative ]; - jailbreak = true; homepage = "https://github.com/barrucadu/cabal-info"; description = "Read information from cabal files"; license = stdenv.lib.licenses.mit; - }) {}; - - "cabal-install_1_22_9_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers - , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl - , network, network-uri, pretty, process, QuickCheck, random - , regex-posix, stm, test-framework, test-framework-hunit - , test-framework-quickcheck2, time, unix, zlib - }: - mkDerivation { - pname = "cabal-install"; - version = "1.22.9.0"; - sha256 = "874035e5730263653c7aa459f270efbffc06da92ea0c828e09ebc04400e94940"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bytestring Cabal containers directory filepath HTTP mtl - network network-uri pretty process random stm time unix zlib - ]; - testHaskellDepends = [ - array base bytestring Cabal containers directory - extensible-exceptions filepath HTTP HUnit mtl network network-uri - pretty process QuickCheck regex-posix stm test-framework - test-framework-hunit test-framework-quickcheck2 time unix zlib - ]; - jailbreak = true; - doCheck = false; - postInstall = '' - mkdir $out/etc - mv bash-completion $out/etc/bash_completion.d - ''; - homepage = "http://www.haskell.org/cabal/"; - description = "The command-line interface for Cabal and Hackage"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; "cabal-install" = callPackage @@ -35436,7 +34187,6 @@ self: { array base Cabal containers directory filepath HTTP network old-time pretty process random time unix zlib ]; - jailbreak = true; homepage = "http://www.haskell.org/cabal/"; description = "Temporary version of cabal-install for ghc-7.2"; license = stdenv.lib.licenses.bsd3; @@ -35458,7 +34208,6 @@ self: { array base Cabal containers directory filepath HTTP network old-time pretty process random time unix zlib ]; - jailbreak = true; homepage = "http://www.haskell.org/cabal/"; description = "Temporary version of cabal-install for ghc-7.4"; license = stdenv.lib.licenses.bsd3; @@ -35503,10 +34252,10 @@ self: { base Cabal containers directory filepath HUnit process temporary test-framework test-framework-hunit text ]; - jailbreak = true; homepage = "http://github.com/danfran/cabal-macosx"; description = "Cabal support for creating Mac OSX application bundles"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-meta" = callPackage @@ -35561,10 +34310,10 @@ self: { executableHaskellDepends = [ base bytestring containers directory HTTP process tar ]; - jailbreak = true; homepage = "http://github.com/snoyberg/cabal-nirvana"; description = "Avoid Cabal dependency hell by constraining to known good versions. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-progdeps" = callPackage @@ -35576,9 +34325,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Cabal directory filepath ]; - jailbreak = true; description = "Show dependencies of program being built in current directory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabal-query" = callPackage @@ -35593,32 +34342,12 @@ self: { base bytestring Cabal derive ghc MissingH mtl tar template-haskell uniplate ]; - jailbreak = true; homepage = "http://github.com/explicitcall/cabal-query"; description = "Helpers for quering .cabal files or hackageDB's 00-index.tar"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cabal-rpm_0_9_11" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, old-locale - , process, time, unix - }: - mkDerivation { - pname = "cabal-rpm"; - version = "0.9.11"; - sha256 = "ba5c748e84cfda23dee92d9381b34f013bf2840452bebe53d3f0c2e1bd31d581"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal directory filepath old-locale process time unix - ]; - homepage = "https://github.com/juhp/cabal-rpm"; - description = "RPM packaging tool for Haskell Cabal-based packages"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cabal-rpm" = callPackage ({ mkDerivation, base, Cabal, directory, filepath, old-locale , process, time, unix @@ -35708,8 +34437,8 @@ self: { }: mkDerivation { pname = "cabal-src"; - version = "0.3.0.1"; - sha256 = "80effd26be00526fa876b6ab9c64e1b7f3e576f9064175d15ff689a7a0fa8a4c"; + version = "0.3.0.2"; + sha256 = "49616c6e93f0e6df7204f97c7903b52c62b76b29368c697fd65af79be66bede6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -35801,7 +34530,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath HTTP network ]; - jailbreak = true; description = "Command-line tool for uploading packages to Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -35838,7 +34566,6 @@ self: { executableHaskellDepends = [ base Cabal hsemail hxt parsec process ]; - jailbreak = true; homepage = "http://gregheartsfield.com/cabal2doap/"; description = "Cabal to Description-of-a-Project (DOAP)"; license = stdenv.lib.licenses.bsd3; @@ -35883,13 +34610,13 @@ self: { ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal , containers, deepseq, directory, distribution-nixpkgs, filepath , hackage-db, language-nix, lens, monad-par, monad-par-extras, mtl - , optparse-applicative, pretty, process, SHA, split, stackage-types - , text, time, transformers, utf8-string, yaml + , optparse-applicative, pretty, process, SHA, split, text, time + , transformers, utf8-string, yaml }: mkDerivation { pname = "cabal2nix"; - version = "2.0.1"; - sha256 = "f271eb8de00952c01a4860846fa0c6f9cad3e91378a073c0b7416eb6a51ca230"; + version = "2.0.2"; + sha256 = "f0c61d4674bbc9ba82d306adbb9fb39527aa73309fdea088489940fe39b02867"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35902,8 +34629,7 @@ self: { aeson ansi-wl-pprint base bytestring Cabal containers deepseq directory distribution-nixpkgs filepath hackage-db language-nix lens monad-par monad-par-extras mtl optparse-applicative pretty - process SHA split stackage-types text time transformers utf8-string - yaml + process SHA split text time transformers utf8-string yaml ]; homepage = "https://github.com/nixos/cabal2nix#readme"; description = "Convert Cabal files into Nix build instructions"; @@ -35945,10 +34671,10 @@ self: { executableHaskellDepends = [ base Cabal containers directory MissingH ]; - jailbreak = true; homepage = "http://github.com/creswick/cabal-query"; description = "A simple tool to query cabal files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cabalg" = callPackage @@ -36090,9 +34816,9 @@ self: { isExecutable = true; libraryHaskellDepends = [ base stm time ]; executableHaskellDepends = [ base stm time ]; - jailbreak = true; description = "A simple library to cache a single IO action with timeout"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cached-traversable" = callPackage @@ -36110,27 +34836,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cacophony_0_6_0" = callPackage - ({ mkDerivation, async, base, bytestring, cryptonite, deepseq, free - , hlint, lens, memory, mtl, QuickCheck, tasty, tasty-quickcheck - }: - mkDerivation { - pname = "cacophony"; - version = "0.6.0"; - sha256 = "2a1b2cf962fbf2743efb36439428b89882add585a4877436533b9fc755d98a9c"; - libraryHaskellDepends = [ - base bytestring cryptonite deepseq free lens memory mtl - ]; - testHaskellDepends = [ - async base bytestring hlint mtl QuickCheck tasty tasty-quickcheck - ]; - doCheck = false; - homepage = "https://github.com/centromere/cacophony"; - description = "A library implementing the Noise protocol"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cacophony" = callPackage ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring , cryptonite, deepseq, directory, exceptions, free, hlint, lens @@ -36192,31 +34897,11 @@ self: { mtl optparse-applicative process protocol-buffers protocol-buffers-descriptor template-haskell temporary text ]; - jailbreak = true; homepage = "https://github.com/ajtulloch/caffegraph/"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cairo_0_13_1_1" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, gtk2hs-buildtools - , mtl, text, utf8-string - }: - mkDerivation { - pname = "cairo"; - version = "0.13.1.1"; - sha256 = "58ae22451e7812a88531eaf91ae1250c277f48d0a88d1cae2438bd76f79e89f6"; - libraryHaskellDepends = [ - array base bytestring mtl text utf8-string - ]; - libraryPkgconfigDepends = [ cairo ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Cairo library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) cairo;}; - "cairo" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo , gtk2hs-buildtools, mtl, text, utf8-string @@ -36292,7 +34977,6 @@ self: { haskell-src-meta language-javascript mime-types monadloc mtl optparse-applicative parsec process syb template-haskell text ]; - jailbreak = true; homepage = "https://github.com/grwlf/cake3"; description = "Third cake the Makefile EDSL"; license = stdenv.lib.licenses.bsd3; @@ -36341,7 +35025,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cal3d cal3d-opengl OpenGL SDL ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Cal3d_animation"; description = "Examples for the Cal3d animation library"; license = "GPL"; @@ -36355,7 +35038,6 @@ self: { version = "0.1"; sha256 = "c269646464707fe10e53722053588cf703fe777b738b7dbcb008f056380fca0a"; libraryHaskellDepends = [ base cal3d OpenGL ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Cal3d_animation"; description = "OpenGL rendering for the Cal3D animation library"; license = "LGPL"; @@ -36382,8 +35064,8 @@ self: { }: mkDerivation { pname = "calculator"; - version = "0.4.1.1"; - sha256 = "9601f78d63c42c7382990d33ca475a947f8d8317d6dbf47819345693fdb4442d"; + version = "0.4.1.2"; + sha256 = "a96befbbc0d91c7f141a99f44f5eda56651383481b16bea0356758b8f1dfd21d"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -36393,10 +35075,10 @@ self: { testHaskellDepends = [ base containers gtk parsec plot-gtk-ui QuickCheck ]; - jailbreak = true; homepage = "https://github.com/sumitsahrawat/calculator"; description = "A calculator repl, with variables, functions & Mathematica like dynamic plots"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "caldims" = callPackage @@ -36472,7 +35154,6 @@ self: { OpenGL OpenGLRaw random template-haskell text transformers vector WAVE ]; - jailbreak = true; homepage = "https://github.com/fumieval/call"; description = "The call game engine"; license = stdenv.lib.licenses.bsd3; @@ -36499,6 +35180,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "call-stack" = callPackage + ({ mkDerivation, base, nanospec }: + mkDerivation { + pname = "call-stack"; + version = "0.1.0"; + sha256 = "f25f5e0992a39371079cc25c2a14b5abb872fa7d868a32753aac3a258b83b1e2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base nanospec ]; + homepage = "https://github.com/sol/call-stack#readme"; + description = "Use GHC call-stacks in a backward compatible way"; + license = stdenv.lib.licenses.mit; + }) {}; + "camfort" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim @@ -36526,11 +35220,42 @@ self: { array base bytestring containers directory filepath fortran-src hmatrix hspec mtl QuickCheck uniplate ]; - doCheck = false; description = "CamFort - Cambridge Fortran infrastructure"; license = stdenv.lib.licenses.asl20; }) {}; + "camfort_0_901" = callPackage + ({ mkDerivation, alex, array, base, bytestring, containers + , directory, fgl, filepath, fortran-src, GenericPretty, ghc-prim + , happy, hmatrix, hspec, matrix, mtl, QuickCheck, syb, syz, text + , transformers, uniplate, vector + }: + mkDerivation { + pname = "camfort"; + version = "0.901"; + sha256 = "2aaf96c527f649e209b9fbe46e6d31cd4707b9d2aa514b4dfac55422bdf4992c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring containers directory fgl filepath fortran-src + GenericPretty ghc-prim hmatrix matrix mtl syb syz text transformers + uniplate vector + ]; + libraryToolDepends = [ alex happy ]; + executableHaskellDepends = [ + array base bytestring containers directory fgl filepath fortran-src + GenericPretty ghc-prim hmatrix matrix mtl QuickCheck syb syz text + transformers uniplate vector + ]; + testHaskellDepends = [ + array base bytestring containers directory filepath fortran-src + hmatrix hspec mtl QuickCheck text uniplate + ]; + description = "CamFort - Cambridge Fortran infrastructure"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "camh" = callPackage ({ mkDerivation, base, bytestring, Imlib, terminfo }: mkDerivation { @@ -36559,7 +35284,6 @@ self: { http-enumerator http-types mtl old-locale process text time transformers unordered-containers url ]; - jailbreak = true; homepage = "http://github.com/michaelxavier/Campfire"; description = "Haskell implementation of the Campfire API"; license = stdenv.lib.licenses.bsd3; @@ -36573,10 +35297,10 @@ self: { version = "1.0.0.3"; sha256 = "8e43893518f47e86cc859546534b2bb886c2f89bea3af5ab5cd33f043669e935"; libraryHaskellDepends = [ base deepseq directory filepath ]; - jailbreak = true; homepage = "http://github.com/nominolo/canonical-filepath"; description = "Abstract data type for canonical file paths"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-config" = callPackage @@ -36596,13 +35320,12 @@ self: { }: mkDerivation { pname = "canteven-http"; - version = "0.1.1.1"; - sha256 = "584a33ae1543afab727d6f22d3895432df3c8bea9e23e5e9c69dd93e5c4e7690"; + version = "0.1.1.2"; + sha256 = "378a453137fa9d1d1ad8f4771c02bb74b5a634624d437fbec00356a153f4b874"; libraryHaskellDepends = [ base bytestring canteven-log exceptions http-types monad-logger text time transformers uuid wai ]; - jailbreak = true; homepage = "https://github.com/SumAll/canteven-http"; description = "Utilities for HTTP programming"; license = stdenv.lib.licenses.mit; @@ -36615,9 +35338,9 @@ self: { version = "0.1.0.0"; sha256 = "b7a750e3cf9c1aa7bac89c631714546aea477f3b5a5672dd3df7bb1e2513e168"; libraryHaskellDepends = [ aeson base ]; - jailbreak = true; description = "data types to describe HTTP services"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "canteven-log" = callPackage @@ -36627,13 +35350,12 @@ self: { }: mkDerivation { pname = "canteven-log"; - version = "1.0.0.0"; - sha256 = "67d58599b7ed949606208aab1c17d333d4793a911405e349c710db4267d2e098"; + version = "2.0.0.1"; + sha256 = "11cd21b4912b5ddd32515f8a0097fff5fc6642371647269a200d3063cf7452c9"; libraryHaskellDepends = [ aeson base bytestring directory fast-logger filepath monad-logger template-haskell text time transformers yaml ]; - jailbreak = true; homepage = "https://github.com/SumAll/haskell-canteven-log"; description = "A canteven way of setting up logging for your program"; license = stdenv.lib.licenses.asl20; @@ -36650,7 +35372,6 @@ self: { testHaskellDepends = [ base Cabal old-locale time timezone-series tz ]; - jailbreak = true; description = "Date / time parsing utilities that try to guess the date / time format"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -36691,7 +35412,6 @@ self: { base bytestring Cabal containers directory filepath hspec hxt hxt-xpath parsec QuickCheck split ]; - jailbreak = true; homepage = "https://github.com/klangner/cantor"; description = "Application for analysis of java source code"; license = stdenv.lib.licenses.bsd3; @@ -36779,7 +35499,6 @@ self: { explicit-exception happstack-server non-empty spreadsheet text transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/car-pool/"; description = "Simple web-server for organizing car-pooling for an event"; license = stdenv.lib.licenses.bsd3; @@ -36804,7 +35523,6 @@ self: { base containers HUnit linear sdl2 test-framework test-framework-hunit test-framework-quickcheck2 transformers ]; - jailbreak = true; homepage = "https://github.com/Noeda/caramia/"; description = "High-level OpenGL bindings"; license = stdenv.lib.licenses.mit; @@ -36830,39 +35548,23 @@ self: { }) {}; "carettah" = callPackage - ({ mkDerivation, base, cairo, directory, filepath, gtk, hcwiid - , highlighting-kate, mtl, pandoc, pango, process, text, time + ({ mkDerivation, base, cairo, directory, filepath, gtk + , gtk2hs-buildtools, hcwiid, highlighting-kate, mtl, pandoc, pango + , process, text, time }: mkDerivation { pname = "carettah"; - version = "0.4.2"; - sha256 = "e698dc362f8f6c3fb62bfaecbd56484faa4d2ff84e5fabe8747312970d91f35b"; + version = "0.5.1"; + sha256 = "aabf95661b42aac4a3cefdf352c3de545e822f2bb6d8d7609f1033c34cc41f4c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base cairo directory filepath gtk hcwiid highlighting-kate mtl - pandoc pango process text time + base cairo directory filepath gtk gtk2hs-buildtools hcwiid + highlighting-kate mtl pandoc pango process text time ]; homepage = "https://github.com/master-q/carettah"; description = "A presentation tool written with Haskell"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "carray_0_1_6_4" = callPackage - ({ mkDerivation, array, base, binary, bytestring, ix-shapable - , QuickCheck, syb - }: - mkDerivation { - pname = "carray"; - version = "0.1.6.4"; - sha256 = "52964f076e8f03051f2af5e5cd6e450860dd1623ed67549a9f12f318d6c00c50"; - libraryHaskellDepends = [ - array base binary bytestring ix-shapable QuickCheck syb - ]; - testHaskellDepends = [ array base ix-shapable QuickCheck ]; - description = "A C-compatible array library"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -36882,27 +35584,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cartel_0_16_0_0" = callPackage - ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck - , random, tasty, tasty-quickcheck, tasty-th, time, transformers - }: - mkDerivation { - pname = "cartel"; - version = "0.16.0.0"; - sha256 = "67594fa408d74553038b677b650863f457309d69d968b01f4dda3bdf46a8b6b3"; - libraryHaskellDepends = [ - base directory filepath time transformers - ]; - testHaskellDepends = [ - base directory filepath multiarg QuickCheck random tasty - tasty-quickcheck tasty-th time transformers - ]; - homepage = "http://www.github.com/massysett/cartel"; - description = "Specify Cabal files in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cartel" = callPackage ({ mkDerivation, base, directory, filepath, multiarg , optparse-applicative, pretty-show, process, QuickCheck, random @@ -36987,7 +35668,6 @@ self: { base casadi-bindings-core casadi-bindings-internal vector ]; libraryPkgconfigDepends = [ casadi_control ]; - jailbreak = true; description = "low level bindings to casadi-control"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -37070,7 +35750,6 @@ self: { base blaze-builder bytestring colour containers lens mtl text utf8-string web-routes ]; - jailbreak = true; description = "DSL for HTML CSS (Cascading Style Sheets)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -37146,11 +35825,10 @@ self: { testHaskellDepends = [ base HTF HUnit loch-th placeholders QuickCheck text ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/nikita-volkov/cases"; description = "A converter for spinal, snake and camel cases"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cash" = callPackage @@ -37164,7 +35842,6 @@ self: { libraryHaskellDepends = [ base deepseq haskell98 HaXml network parallel pretty ]; - jailbreak = true; homepage = "http://www.cs.st-andrews.ac.uk/~hwloidl/SCIEnce/SymGrid-Par/CASH/"; description = "the Computer Algebra SHell"; license = stdenv.lib.licenses.bsd3; @@ -37206,6 +35883,7 @@ self: { homepage = "https://github.com/tonymorris/casr-logbook"; description = "CASR 61.345 Pilot Personal Logbook"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook-html" = callPackage @@ -37223,10 +35901,10 @@ self: { testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/tonymorris/casr-logbook-html"; description = "CASR 61.345 Pilot Personal Logbook HTML output"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook-meta" = callPackage @@ -37265,6 +35943,7 @@ self: { homepage = "https://github.com/tonymorris/casr-logbook-meta-html"; description = "Meta-information about entries in a CASR 61.345 logbook (casr-logbook) HTML output"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook-reports" = callPackage @@ -37305,6 +35984,7 @@ self: { homepage = "https://github.com/tonymorris/casr-logbook-reports-html"; description = "CASR 61.345 logbook reports HTML output"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook-reports-meta" = callPackage @@ -37347,6 +36027,7 @@ self: { homepage = "https://github.com/tonymorris/casr-logbook-reports-meta-html"; description = "HTML output for reports on meta-information about entries in a CASR 61.345 logbook"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casr-logbook-types" = callPackage @@ -37380,9 +36061,9 @@ self: { MonadCatchIO-transformers mtl network resource-pool stm text time uuid ]; - jailbreak = true; description = "Haskell client for Cassandra's CQL protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cassandra-thrift" = callPackage @@ -37392,7 +36073,6 @@ self: { version = "0.8.5.1"; sha256 = "8c77b9c1f82a41e496201b42217984e7ca610897646953bc65dc59311e88b542"; libraryHaskellDepends = [ base bytestring containers Thrift ]; - jailbreak = true; homepage = "http://cassandra.apache.org/"; description = "thrift bindings to the cassandra database"; license = "unknown"; @@ -37454,7 +36134,6 @@ self: { containers mtl text ]; testHaskellDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "https://github.com/domdere/cassava-conduit"; description = "Conduit interface for cassava package"; license = stdenv.lib.licenses.bsd3; @@ -37469,8 +36148,8 @@ self: { pname = "cassava-megaparsec"; version = "0.1.0"; sha256 = "8d77229766aec5e9e31e145138be981cca791699a3d66010619604827c590702"; - revision = "2"; - editedCabalFile = "bc6342181a72157c5f8900ef98a8226e5826b93b75ecd34aedc1c0e8b589a93a"; + revision = "3"; + editedCabalFile = "1be19f40219b8f6a9e91dc3bfe8905a3ccc920f56dbf82c14f74d05c4c7378c9"; libraryHaskellDepends = [ base bytestring cassava containers megaparsec unordered-containers vector @@ -37537,7 +36216,6 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text Thrift time ]; - jailbreak = true; homepage = "http://github.com/ozataman/cassy"; description = "A high level driver for the Cassandra datastore"; license = stdenv.lib.licenses.bsd3; @@ -37558,10 +36236,10 @@ self: { base containers optparse-applicative shelly system-fileio system-filepath text ]; - jailbreak = true; homepage = "https://github.com/erochest/castle"; description = "A tool to manage shared cabal-install sandboxes"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "casui" = callPackage @@ -37586,7 +36264,6 @@ self: { version = "0.5.1.0"; sha256 = "782ea7852cbc3f092cb00ac48b5aeec4121fcde5b58718744d85f141416e18d2"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; homepage = "https://github.com/frerich/catamorphism"; description = "A package exposing a helper function for generating catamorphisms"; license = stdenv.lib.licenses.bsd3; @@ -37600,10 +36277,10 @@ self: { version = "0.2.0.2"; sha256 = "3dbb21228ea97426b266ffd3930f75e9e553fd7290b7bd8d6dfd488ff7ccdb15"; libraryHaskellDepends = [ base mtl transformers ]; - jailbreak = true; homepage = "http://github.com/sonyandy/catch-fd"; description = "MonadThrow and MonadCatch, using functional dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "categorical-algebra" = callPackage @@ -37677,9 +36354,9 @@ self: { version = "0.1.0.1"; sha256 = "20dcb78f02c43f1dab7a7a4cb250404221dc46bbfe1075a3a200e72b77078701"; libraryHaskellDepends = [ base categories ]; - jailbreak = true; description = "Traced monoidal categories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cautious-file" = callPackage @@ -37693,28 +36370,29 @@ self: { libraryHaskellDepends = [ base bytestring directory filepath unix ]; - doCheck = false; description = "Ways to write a file cautiously, to reduce the chances of problems such as data loss due to crashes or power failures"; license = stdenv.lib.licenses.bsd3; }) {}; "cayley-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, exceptions - , http-client, http-conduit, lens, lens-aeson, mtl, text + , hspec, http-client, http-conduit, lens, lens-aeson, mtl, text , transformers, unordered-containers, vector }: mkDerivation { pname = "cayley-client"; - version = "0.1.5.1"; - sha256 = "3a2eab27b2aa711141d43248a5505154945e8563d846e1db3379f486b140563c"; + version = "0.2.0.0"; + sha256 = "f42cff8dd066f219c8dca8e43cd2b6e29265d9064c8751873d22db7888e761fb"; libraryHaskellDepends = [ aeson attoparsec base bytestring exceptions http-client http-conduit lens lens-aeson mtl text transformers unordered-containers vector ]; + testHaskellDepends = [ aeson base hspec unordered-containers ]; homepage = "https://github.com/MichelBoucey/cayley-client"; description = "A Haskell client for the Cayley graph database"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cayley-dickson" = callPackage @@ -37738,18 +36416,19 @@ self: { }: mkDerivation { pname = "cblrepo"; - version = "0.21.0"; - sha256 = "a69470286432b822b2aca531c147794b3e8a5a2702cf9f2170aeda9e4058549f"; + version = "0.23.0"; + sha256 = "bbb17315e0618e121f8c339a4758d41a0a4b9d7b594168978fdc13d7fff93281"; isLibrary = false; isExecutable = true; + setupHaskellDepends = [ base Cabal ]; executableHaskellDepends = [ aeson ansi-wl-pprint base bytestring Cabal containers directory filepath mtl optparse-applicative process safe stringsearch tar text transformers unix Unixutils utf8-string vector zlib ]; - jailbreak = true; description = "Tool to maintain a database of CABAL packages and their dependencies"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cci" = callPackage @@ -37778,10 +36457,10 @@ self: { version = "0.0.0"; sha256 = "0776e3c546363b07b579dc5bc37334f68f804a1bfbd0a32333d0b63fb5a9f6a1"; libraryHaskellDepends = [ base bytestring ]; - jailbreak = true; homepage = "http://tomahawkins.org"; description = "A Haskell implementation of the CCNx network protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cctools-workqueue" = callPackage @@ -37815,7 +36494,6 @@ self: { libraryHaskellDepends = [ base bytestring containers mtl parsec utf8-string ]; - jailbreak = true; description = "Convenient Chinese phrase & character lookup"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -37870,9 +36548,9 @@ self: { libraryHaskellDepends = [ base cairo glib gtk mtl ]; libraryPkgconfigDepends = [ gtk2 ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; description = "Cairo-based CellRenderer"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {gtk2 = pkgs.gnome2.gtk;}; "cerberus" = callPackage @@ -37904,27 +36582,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cereal_0_5_2_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, ghc-prim - , QuickCheck, test-framework, test-framework-quickcheck2 - }: - mkDerivation { - pname = "cereal"; - version = "0.5.2.0"; - sha256 = "b50e77ad340d672d0f2c53ce526a088ecdf74f1ed34f6bb2f95deab725dd2b14"; - libraryHaskellDepends = [ - array base bytestring containers ghc-prim - ]; - testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 - ]; - homepage = "https://github.com/GaloisInc/cereal"; - description = "A binary serialization library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cereal" = callPackage ({ mkDerivation, array, base, bytestring, containers, ghc-prim , QuickCheck, test-framework, test-framework-quickcheck2 @@ -37971,9 +36628,9 @@ self: { version = "0.1.1"; sha256 = "8b3ba3942d518a46e172e36cce0e7bc226b788c62ab8e5d86f3c6f2c7278b412"; libraryHaskellDepends = [ base cereal ghc-prim ]; - jailbreak = true; description = "Automatic deriving of Serialize using GHC.Generics"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cereal-enumerator" = callPackage @@ -37995,7 +36652,6 @@ self: { version = "0.1"; sha256 = "5af05b446448b04ecc457a3627d5daf82362aa216f0789fcc044aef4e31722bf"; libraryHaskellDepends = [ array base cereal ]; - jailbreak = true; homepage = "http://github.com/jystic/cereal-ieee754"; description = "Floating point support for the 'cereal' serialization library"; license = stdenv.lib.licenses.bsd3; @@ -38101,7 +36757,6 @@ self: { asn1-data base bytestring containers crypto-pubkey-types cryptohash directory filepath mtl pem process time ]; - jailbreak = true; homepage = "http://github.com/vincenthz/hs-certificate"; description = "Certificates and Key Reader/Writer"; license = stdenv.lib.licenses.bsd3; @@ -38200,9 +36855,9 @@ self: { hashable mtl parallel parsec process split text unordered-containers utf8-string void ]; - jailbreak = true; description = "Parser for categorial grammars"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cgen" = callPackage @@ -38312,10 +36967,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "chalk"; - version = "0.1.0.1"; - sha256 = "be7bc5016333d20771b30fb8375af438f92eb1d2c4af7bf6beac702e42b93835"; + version = "0.1.0.2"; + sha256 = "f24e9f7990a72ffcdc2b5a6613780b04c319bdc4151794b8afc3675bf3f8dec7"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/joom/chalk"; description = "Terminal string styling"; license = stdenv.lib.licenses.mit; @@ -38348,7 +37002,6 @@ self: { version = "0.1"; sha256 = "023e840acca9f6c7d171c3f29b92aa7cd889e3fd20e0cf8d06ed21694eb876bf"; libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ]; - jailbreak = true; homepage = "http://ittc.ku.edu/~andygill/chalkboard.php"; description = "OpenGL based viewer for chalkboard rendered images"; license = stdenv.lib.licenses.bsd3; @@ -38412,7 +37065,6 @@ self: { base configurator containers filepath heist lens mtl QuickCheck random snap snap-core snap-extras snap-server text xmlhtml ]; - jailbreak = true; homepage = "https://github.com/soostone/charade"; description = "Rapid prototyping websites with Snap and Heist"; license = stdenv.lib.licenses.bsd3; @@ -38442,10 +37094,10 @@ self: { version = "1.0"; sha256 = "f7d8e6a38572ed4e0789279ff9726a7a2b192e3f8c099cc54484c47acd1660f0"; libraryHaskellDepends = [ base bytestring ]; - jailbreak = true; homepage = "http://www.github.com/batterseapower/charsetdetect"; description = "Character set detection using Mozilla's Universal Character Set Detector"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "charsetdetect-ae" = callPackage @@ -38467,9 +37119,35 @@ self: { version = "1.1"; sha256 = "08900a6889b97a75cbcd94fc5ccc817dc63f5d30739ab2738611499d9841db69"; libraryHaskellDepends = [ base Chart ]; - jailbreak = true; description = "Easily render histograms with Chart"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "chart-unit" = callPackage + ({ mkDerivation, base, colour, containers, data-default, diagrams + , diagrams-core, diagrams-lib, diagrams-rasterific, diagrams-svg + , foldl, lens, primitive, protolude, random-fu, text + }: + mkDerivation { + pname = "chart-unit"; + version = "0.1.0.0"; + sha256 = "623d5e89b846bacc55a659e1e976da6c5c9de686ae5b088d5b9660dc082d5e8e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base colour containers data-default diagrams diagrams-core + diagrams-lib diagrams-rasterific diagrams-svg foldl lens primitive + protolude text + ]; + executableHaskellDepends = [ + base containers diagrams diagrams-core diagrams-lib + diagrams-rasterific diagrams-svg foldl lens primitive protolude + random-fu text + ]; + homepage = "https://github.com/tonyday567/chart-unit"; + description = "A set of native haskell charts"; + license = stdenv.lib.licenses.bsd3; }) {}; "chaselev-deque" = callPackage @@ -38524,7 +37202,6 @@ self: { quickcheck-instances tasty tasty-ant-xml tasty-hunit tasty-quickcheck text tokenize unordered-containers ]; - jailbreak = true; homepage = "http://github.com/creswick/chatter"; description = "A library of simple NLP algorithms"; license = stdenv.lib.licenses.bsd3; @@ -38544,7 +37221,6 @@ self: { ansi-terminal base chatty-utils directory mtl process random setenv template-haskell text time transformers unix ]; - jailbreak = true; homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Some monad transformers and typeclasses for abstraction of global dependencies"; license = stdenv.lib.licenses.agpl3; @@ -38558,7 +37234,6 @@ self: { version = "0.6.2.1"; sha256 = "820f5d1f6b7cc52430ee835ce0f7779b41987a6b492bee2466b957c03780c301"; libraryHaskellDepends = [ base chatty transformers ]; - jailbreak = true; homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Provides some classes and types for dealing with text, using the fundaments of Chatty"; license = stdenv.lib.licenses.agpl3; @@ -38572,10 +37247,10 @@ self: { version = "0.7.3.3"; sha256 = "e966e3c04e31cba118a4dd5a3a695976b4e5aa03cafa8031c7305c1587ebf8ad"; libraryHaskellDepends = [ base mtl text transformers ]; - jailbreak = true; homepage = "http://doomanddarkness.eu/pub/chatty"; description = "Some utilities every serious chatty-based application may need"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cheapskate" = callPackage @@ -38653,6 +37328,7 @@ self: { homepage = "http://github.com/yamadapc/cheapskate-terminal#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "check-email" = callPackage @@ -38681,7 +37357,6 @@ self: { base Cabal containers explicit-exception filepath haskell-src-exts non-empty transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Import_modules_properly"; description = "Check whether module and package imports conform to the PVP"; license = stdenv.lib.licenses.bsd3; @@ -38704,8 +37379,8 @@ self: { ({ mkDerivation, array, base, QuickCheck, random }: mkDerivation { pname = "checkers"; - version = "0.4.5"; - sha256 = "7963cf60f9fda15ea022351f75f8e5e8636f79b163ee4ad05e893f74e5112d91"; + version = "0.4.6"; + sha256 = "2adc9cd2bfcc5c7bf8dbcf79160344757392a29b55ca131cda48e60168df970f"; libraryHaskellDepends = [ array base QuickCheck random ]; description = "Check properties on standard classes and data structures"; license = stdenv.lib.licenses.bsd3; @@ -38735,7 +37410,6 @@ self: { version = "0.2.1"; sha256 = "00f423ea3ef78f24ba2d9077db267fa9d30e47fa1b80ebafcaf2d5879214d400"; libraryHaskellDepends = [ base chell HUnit ]; - jailbreak = true; homepage = "https://john-millikin.com/software/chell/"; description = "HUnit support for the Chell testing library"; license = stdenv.lib.licenses.mit; @@ -38781,12 +37455,30 @@ self: { base bifunctors bytestring cereal locators mtl network network-uri protobuf text unordered-containers vaultaire-common zeromq4-haskell ]; - jailbreak = true; description = "Query interface for Chevalier"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "chitauri" = callPackage + ({ mkDerivation, base, digits, either-unwrap, generic-trie + , haskeline, parsec + }: + mkDerivation { + pname = "chitauri"; + version = "0.1.0.1"; + sha256 = "ebb349aa92c3c2e9d326f42b6d47769aaa57b9ea21b77ade24326be86f8d2445"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base digits either-unwrap generic-trie haskeline parsec + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/marcusbuffett/chitauri"; + description = "Helper for the Major System"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "chorale" = callPackage ({ mkDerivation, base, containers, HUnit, ieee754, QuickCheck, safe , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -38849,7 +37541,6 @@ self: { version = "1.0.0"; sha256 = "9fac30f3d042fe29f0848ea438822a3801a6ee760e76233ffbc3a60a13ed24f4"; libraryHaskellDepends = [ base chp chp-plus mtl ]; - jailbreak = true; homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/"; description = "MTL class instances for the CHP library"; license = stdenv.lib.licenses.bsd3; @@ -38885,7 +37576,6 @@ self: { libraryHaskellDepends = [ base containers deepseq mtl pretty TypeCompose ]; - jailbreak = true; homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/"; description = "A mirror implementation of chp that generates a specification of the program"; license = stdenv.lib.licenses.bsd3; @@ -38899,7 +37589,6 @@ self: { version = "1.0.0"; sha256 = "43603e90ffb74b8eefec05ff3ea95cb42fe2d2371a8584a10bdad62e2f669034"; libraryHaskellDepends = [ base chp chp-plus transformers ]; - jailbreak = true; homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/"; description = "Transformers instances for the CHP library"; license = stdenv.lib.licenses.bsd3; @@ -38915,9 +37604,9 @@ self: { libraryHaskellDepends = [ base deepseq ghc-prim thyme vector-space ]; - jailbreak = true; description = "measure timings of data evaluation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chronos" = callPackage @@ -38973,34 +37662,12 @@ self: { parsec text transformers ]; testHaskellDepends = [ base HUnit text transformers unix ]; - jailbreak = true; homepage = "http://github.com/marcotmarcot/chuchu"; description = "Behaviour Driven Development like Cucumber for Haskell"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "chunked-data_0_2_0" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , mono-traversable, semigroups, text, transformers, vector - }: - mkDerivation { - pname = "chunked-data"; - version = "0.2.0"; - sha256 = "9aa0f3c81f9b0d7c1dde206501415f01638f20eebfbe1386dfd802bcc1bab272"; - revision = "3"; - editedCabalFile = "8fd1f0e3423794b4389c4741ad6a48297197b96153e002c822c0ea9a5e96a108"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers mono-traversable - semigroups text transformers vector - ]; - jailbreak = true; - homepage = "https://github.com/fpco/chunked-data"; - description = "Typeclasses for dealing with various chunked data representations"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "chunked-data" = callPackage ({ mkDerivation, base, bytestring, containers, semigroups, text , transformers, vector @@ -39041,9 +37708,9 @@ self: { libraryHaskellDepends = [ base binary bytestring text ]; executableHaskellDepends = [ base binary bytestring text ]; testHaskellDepends = [ base binary bytestring HUnit text ]; - jailbreak = true; description = "Human-readable storage of text/binary objects"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "church-list" = callPackage @@ -39065,7 +37732,6 @@ self: { version = "0.1.1"; sha256 = "5f11907c80d6c83a8851d0e156ca3439a375a8696e368c41956370837d935939"; libraryHaskellDepends = [ base bytestring language-c ]; - jailbreak = true; homepage = "http://tomahawkins.org"; description = "An interface to CIL"; license = stdenv.lib.licenses.bsd3; @@ -39120,21 +37786,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cipher-aes128_0_7_0_1" = callPackage - ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: - mkDerivation { - pname = "cipher-aes128"; - version = "0.7.0.1"; - sha256 = "18aecff826ca46e188062b972dfbda7360f6f73e2ffe45aa15bdc676debb7662"; - libraryHaskellDepends = [ - base bytestring cereal crypto-api tagged - ]; - homepage = "https://github.com/TomMD/cipher-aes128"; - description = "AES and common modes using AES-NI when available"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cipher-aes128" = callPackage ({ mkDerivation, base, bytestring, cereal, crypto-api, tagged }: mkDerivation { @@ -39350,7 +38001,6 @@ self: { HTTP json mtl network network-uri old-locale pandoc-types parsec syb time utf8-string ]; - jailbreak = true; homepage = "http://istitutocolli.org/repos/citeproc-hs/"; description = "A Citation Style Language implementation in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -39428,9 +38078,9 @@ self: { base containers dsp optparse-applicative plailude pretty-tree safe split ]; - jailbreak = true; description = "Simple CLI RPN calculator"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clafer" = callPackage @@ -39523,35 +38173,37 @@ self: { "clang-pure" = callPackage ({ mkDerivation, base, bytestring, clang, containers, contravariant - , inline-c, stm, template-haskell, vector + , inline-c, microlens, microlens-contra, singletons, stm + , template-haskell, vector }: mkDerivation { pname = "clang-pure"; - version = "0.1.0.1"; - sha256 = "9beb6dd2d0a21a4057a0372d5fc9da2984ffc455bd24ed3c93c7b4ba7ec20900"; + version = "0.2.0.1"; + sha256 = "27c81214e72d9a4c6e701fc05d2adc5cb0732cc07c4fb715a6bf2f9d904058ee"; libraryHaskellDepends = [ - base bytestring containers contravariant inline-c stm - template-haskell vector + base bytestring containers contravariant inline-c microlens + microlens-contra singletons stm template-haskell vector ]; librarySystemDepends = [ clang ]; description = "Pure C++ code analysis with libclang"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (self.llvmPackages) clang;}; "clanki" = callPackage ({ mkDerivation, base, bytestring, directory, safe, strict, time }: mkDerivation { pname = "clanki"; - version = "1.2.6"; - sha256 = "97cbfea975eb7a49f86ca5cbad2ece1818fd8dee47740f934c9a0d33ffdfb3a0"; + version = "1.2.7"; + sha256 = "f28d13ff92d1bf4a556009c207f39c9c8e12573930f93941121efc5e329e2576"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring directory safe strict time ]; - jailbreak = true; description = "Command-line spaced-repetition software"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clarifai" = callPackage @@ -39567,9 +38219,9 @@ self: { aeson base bytestring containers easy-file HTTP http-client lens lens-aeson scientific text unordered-containers vector wreq ]; - jailbreak = true; description = "API Client for the Clarifai API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash" = callPackage @@ -39587,41 +38239,12 @@ self: { filepath ghc haskell98 pretty prettyclass template-haskell tfp th-lift time transformers utility-ht vhdl ]; - jailbreak = true; homepage = "http://clash.ewi.utwente.nl/"; description = "CAES Language for Synchronous Hardware (CLaSH)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-ghc_0_6_21" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib - , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl - , containers, deepseq, directory, filepath, ghc, ghc-typelits-extra - , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl - , process, text, time, transformers, unbound-generics, unix - , unordered-containers - }: - mkDerivation { - pname = "clash-ghc"; - version = "0.6.21"; - sha256 = "46be5b228391132b4bb1b21ed1ab599d14bd89efcd808e3fc20e8d553170cf22"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base bifunctors bytestring clash-lib clash-prelude - clash-systemverilog clash-verilog clash-vhdl containers deepseq - directory filepath ghc ghc-typelits-extra ghc-typelits-natnormalise - hashable haskeline lens mtl process text time transformers - unbound-generics unix unordered-containers - ]; - jailbreak = true; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-ghc" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl @@ -39645,37 +38268,12 @@ self: { hashable haskeline lens mtl process text time transformers unbound-generics unix unordered-containers ]; - jailbreak = true; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-lib_0_6_19" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude - , concurrent-supply, containers, deepseq, directory, errors, fgl - , filepath, ghc, hashable, integer-gmp, lens, mtl, pretty, process - , template-haskell, text, time, transformers, unbound-generics - , unordered-containers, uu-parsinglib, wl-pprint-text - }: - mkDerivation { - pname = "clash-lib"; - version = "0.6.19"; - sha256 = "71faa79c1241b2f121aa3e4247949c7fb7640cc36cf46099f4f8bcf70721ca44"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring clash-prelude concurrent-supply - containers deepseq directory errors fgl filepath ghc hashable - integer-gmp lens mtl pretty process template-haskell text time - transformers unbound-generics unordered-containers uu-parsinglib - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-lib" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude , concurrent-supply, containers, deepseq, directory, errors, fgl @@ -39697,27 +38295,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-prelude_0_10_10" = callPackage - ({ mkDerivation, array, base, data-default, doctest, ghc-prim - , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens - , QuickCheck, reflection, singletons, template-haskell - }: - mkDerivation { - pname = "clash-prelude"; - version = "0.10.10"; - sha256 = "64577debc8c970919268374eb0b422a4b8152422df3683ce3b665cc1cfa94d9c"; - libraryHaskellDepends = [ - array base data-default ghc-prim ghc-typelits-extra - ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection - singletons template-haskell - ]; - testHaskellDepends = [ base doctest ]; - jailbreak = true; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39737,10 +38314,10 @@ self: { singletons template-haskell ]; testHaskellDepends = [ base doctest ]; - doCheck = false; homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -39750,30 +38327,11 @@ self: { version = "0.1.2.1"; sha256 = "1c1c0e373578e15b04b92bdf2b857192bd855005ce3e2f7436b4572a1ee5c5ba"; libraryHaskellDepends = [ base clash-prelude QuickCheck ]; - jailbreak = true; description = "QuickCheck instances for various types in the CλaSH Prelude"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "clash-systemverilog_0_6_7" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-systemverilog"; - version = "0.6.7"; - sha256 = "377e57de5f09852b6c2059fc8d114d01b48005f270265092e98251d3c9c4d92b"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "clash-systemverilog" = callPackage ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl , text, unordered-containers, wl-pprint-text @@ -39789,23 +38347,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - SystemVerilog backend"; license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-verilog_0_6_7" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-verilog"; - version = "0.6.7"; - sha256 = "1794d45c04ce52c6488f970a465861785948e2ffa2ca275678efdb75902945ab"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - Verilog backend"; - license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39824,23 +38365,6 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - Verilog backend"; license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-vhdl_0_6_15" = callPackage - ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl - , text, unordered-containers, wl-pprint-text - }: - mkDerivation { - pname = "clash-vhdl"; - version = "0.6.15"; - sha256 = "9472699b6d62804093a2dea8b49da573b750c326963ff9dc4cf1ef2bfde521a8"; - libraryHaskellDepends = [ - base clash-lib clash-prelude fgl lens mtl text unordered-containers - wl-pprint-text - ]; - homepage = "http://www.clash-lang.org/"; - description = "CAES Language for Synchronous Hardware - VHDL backend"; - license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39859,6 +38383,7 @@ self: { homepage = "http://www.clash-lang.org/"; description = "CAES Language for Synchronous Hardware - VHDL backend"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "classify" = callPackage @@ -39883,36 +38408,8 @@ self: { libraryHaskellDepends = [ base lifted-base monad-control parallel resourcet transformers ]; - jailbreak = true; description = "Fork of the monad-parallel package using monad-control"; license = stdenv.lib.licenses.gpl3; - }) {}; - - "classy-prelude_0_12_8" = callPackage - ({ mkDerivation, base, basic-prelude, bifunctors, bytestring - , chunked-data, containers, dlist, enclosed-exceptions, exceptions - , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl - , mutable-containers, primitive, QuickCheck, semigroups, stm, text - , time, time-locale-compat, transformers, transformers-base - , unordered-containers, vector, vector-instances - }: - mkDerivation { - pname = "classy-prelude"; - version = "0.12.8"; - sha256 = "afa89959a687d74b851a2a3fce1b2d397cc40041ff5223ec9317bd723d47ca7f"; - libraryHaskellDepends = [ - base basic-prelude bifunctors bytestring chunked-data containers - dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base - mono-traversable mtl mutable-containers primitive semigroups stm - text time time-locale-compat transformers transformers-base - unordered-containers vector vector-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck transformers unordered-containers - ]; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "A typeclass-based Prelude"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39927,8 +38424,8 @@ self: { }: mkDerivation { pname = "classy-prelude"; - version = "1.0.0.1"; - sha256 = "3df8f7120fa540415fd83d7ddc43b9fc088cc1cefc97bc08ca32c711b636c47e"; + version = "1.0.0.2"; + sha256 = "a4fa52c6b571df5cc98c1cebf97b41085104a17b2e23c2221cd2061ec7a9c262"; libraryHaskellDepends = [ async base basic-prelude bifunctors bytestring chunked-data containers deepseq dlist exceptions ghc-prim hashable lifted-async @@ -39944,28 +38441,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "A typeclass-based Prelude"; license = stdenv.lib.licenses.mit; - }) {}; - - "classy-prelude-conduit_0_12_8" = callPackage - ({ mkDerivation, base, bytestring, classy-prelude, conduit - , conduit-combinators, hspec, monad-control, QuickCheck, resourcet - , transformers, void - }: - mkDerivation { - pname = "classy-prelude-conduit"; - version = "0.12.8"; - sha256 = "5ba261f04339ea8533abbe760257f9108433c9183c644e87bca5ba637ed1663d"; - libraryHaskellDepends = [ - base bytestring classy-prelude conduit conduit-combinators - monad-control resourcet transformers void - ]; - testHaskellDepends = [ - base bytestring conduit hspec QuickCheck transformers - ]; - jailbreak = true; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "conduit instances for classy-prelude"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -39988,26 +38463,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "classy-prelude together with conduit functions"; license = stdenv.lib.licenses.mit; - }) {}; - - "classy-prelude-yesod_0_12_8" = callPackage - ({ mkDerivation, aeson, base, classy-prelude - , classy-prelude-conduit, data-default, http-conduit, http-types - , persistent, yesod, yesod-newsfeed, yesod-static - }: - mkDerivation { - pname = "classy-prelude-yesod"; - version = "0.12.8"; - sha256 = "fa2c5c8407b0b7e10abeb360d237eec9e629cb34098dc1e84a23baf106f85f5e"; - libraryHaskellDepends = [ - aeson base classy-prelude classy-prelude-conduit data-default - http-conduit http-types persistent yesod yesod-newsfeed - yesod-static - ]; - jailbreak = true; - homepage = "https://github.com/snoyberg/classy-prelude"; - description = "Provide a classy prelude including common Yesod functionality"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -40028,27 +38483,6 @@ self: { homepage = "https://github.com/snoyberg/mono-traversable"; description = "Provide a classy prelude including common Yesod functionality"; license = stdenv.lib.licenses.mit; - }) {}; - - "clay_0_10_1" = callPackage - ({ mkDerivation, base, HUnit, mtl, test-framework - , test-framework-hunit, text - }: - mkDerivation { - pname = "clay"; - version = "0.10.1"; - sha256 = "3bb820281b8824055f5a087273f6578ccd5b6f6575891ec88933d9ebdf920a54"; - revision = "1"; - editedCabalFile = "8ecb3c320c9470f2bf250552d7fac738520d90d28e8e90b11922d1c4940a0263"; - libraryHaskellDepends = [ base mtl text ]; - testHaskellDepends = [ - base HUnit mtl test-framework test-framework-hunit text - ]; - jailbreak = true; - doCheck = false; - homepage = "http://fvisser.nl/clay"; - description = "CSS preprocessor as embedded Haskell"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -40079,8 +38513,8 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.23.18"; - sha256 = "48e6a3093b6c9830f9830952833d95bc1a6de742ffb38f8873b0963f8cf7ebce"; + version = "0.23.19.2"; + sha256 = "1453a56daccb669931ef6c1a1e6311abc6fef28341c9c75de0fcc34e03e4fb84"; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -40096,6 +38530,7 @@ self: { homepage = "http://www.clckwrks.com/"; description = "A secure, reliable content management system (CMS) and blogging platform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "clckwrks-cli" = callPackage @@ -40114,6 +38549,7 @@ self: { homepage = "http://www.clckwrks.com/"; description = "a command-line interface for adminstrating some aspects of clckwrks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-dot-com" = callPackage @@ -40133,10 +38569,10 @@ self: { text web-plugins ]; executableToolDepends = [ hsx2hs ]; - jailbreak = true; homepage = "http://www.clckwrks.com/"; description = "clckwrks.com"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-bugs" = callPackage @@ -40159,7 +38595,6 @@ self: { web-routes web-routes-th ]; libraryToolDepends = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "bug tracking plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -40184,10 +38619,10 @@ self: { safecopy text web-plugins web-routes web-routes-th ]; libraryToolDepends = [ hsx2hs ]; - jailbreak = true; homepage = "http://clckwrks.com/"; description = "ircbot plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-plugin-media" = callPackage @@ -40211,30 +38646,6 @@ self: { homepage = "http://clckwrks.com/"; description = "media plugin for clckwrks"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "clckwrks-plugin-page_0_4_3_3" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks - , containers, directory, filepath, happstack-hsp, happstack-server - , hsp, hsx2hs, ixset, mtl, old-locale, random, reform - , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell - , text, time, time-locale-compat, uuid, web-plugins, web-routes - , web-routes-happstack, web-routes-th - }: - mkDerivation { - pname = "clckwrks-plugin-page"; - version = "0.4.3.3"; - sha256 = "cae111456424fe22eae06a3a0ef1d417d9373b4d09809920a678664b89d7e161"; - libraryHaskellDepends = [ - acid-state aeson attoparsec base clckwrks containers directory - filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl - old-locale random reform reform-happstack reform-hsp safecopy - tagsoup template-haskell text time time-locale-compat uuid - web-plugins web-routes web-routes-happstack web-routes-th - ]; - homepage = "http://www.clckwrks.com/"; - description = "support for CMS/Blogging in clckwrks"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -40248,8 +38659,8 @@ self: { }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.4"; - sha256 = "8c2667447c59c57d02a911ea858d9b9ea73dfc87a9aba3a11389c67a423b60e7"; + version = "0.4.3.5"; + sha256 = "fb52a13751c322fde387786e93fdd41e4bb5a6019136fd8daa9d622d15e5d498"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -40261,6 +38672,7 @@ self: { homepage = "http://www.clckwrks.com/"; description = "support for CMS/Blogging in clckwrks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-theme-bootstrap" = callPackage @@ -40278,6 +38690,7 @@ self: { homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-theme-clckwrks" = callPackage @@ -40286,8 +38699,8 @@ self: { }: mkDerivation { pname = "clckwrks-theme-clckwrks"; - version = "0.5.2"; - sha256 = "53182128e49924132191d6d607e7088f92367a10ab31d38b5e4a1d8a2471ed1c"; + version = "0.5.2.1"; + sha256 = "67ea142d0d66357957589bfa29148398799b1771452dd706b9f73a75ced6f392"; libraryHaskellDepends = [ base clckwrks containers happstack-authenticate hsp hsx2hs mtl text web-plugins @@ -40295,6 +38708,7 @@ self: { homepage = "http://www.clckwrks.com/"; description = "simple bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clckwrks-theme-geo-bootstrap" = callPackage @@ -40304,7 +38718,6 @@ self: { version = "0.1.1"; sha256 = "f3a816c8ef4259d1931789814c39ef6411d2aa80bf97e568b1008cdfe099b1e3"; libraryHaskellDepends = [ base clckwrks hsp text ]; - jailbreak = true; homepage = "http://divshot.github.com/geo-bootstrap/"; description = "geo bootstrap based template for clckwrks"; license = stdenv.lib.licenses.bsd3; @@ -40370,10 +38783,10 @@ self: { base highlighting-kate optparse-applicative process terminfo wl-pprint-extras wl-pprint-terminfo ]; - jailbreak = true; homepage = "https://github.com/tanakh/cless"; description = "Colorized LESS"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clevercss" = callPackage @@ -40423,7 +38836,6 @@ self: { base containers GLFW Hipmunk MonadRandom mtl OpenGL random StateVar transformers ]; - jailbreak = true; description = "Toy game (tetris on billiard board). Hipmunk in action."; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -40480,7 +38892,6 @@ self: { testHaskellDepends = [ base hspec nats numeric-prelude QuickCheck ]; - jailbreak = true; homepage = "http://github.com/spacekitteh/haskell-clifford"; description = "A Clifford algebra library"; license = stdenv.lib.licenses.bsd3; @@ -40494,10 +38905,10 @@ self: { version = "0.1.1"; sha256 = "6814350ec951b207741ab17a8a5011e2ff1fa0691b97fe3c897bd21c8f381162"; libraryHaskellDepends = [ base process ]; - jailbreak = true; homepage = "https://github.com/Raynes/clippard"; description = "A simple Haskell library for copying text to the clipboard in a cross-platform way"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clipper" = callPackage @@ -40545,10 +38956,10 @@ self: { version = "0.1.0.0"; sha256 = "eddf07964751b51550c5197f39cc772418b0fa7d2ad6cf762af589ce9bd973cb"; libraryHaskellDepends = [ base base-unicode-symbols peano ]; - jailbreak = true; homepage = "https://github.com/strake/clist.hs"; description = "Counted list"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloben" = callPackage @@ -40577,12 +38988,23 @@ self: { sha256 = "886601978898d3a91412fef895e864576a7125d661e1f8abc49a2a08840e691f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/corsis/clock"; description = "High-resolution clock functions: monotonic, realtime, cputime"; license = stdenv.lib.licenses.bsd3; }) {}; + "clock-extras" = callPackage + ({ mkDerivation, base, clock, hspec }: + mkDerivation { + pname = "clock-extras"; + version = "0.1.0.2"; + sha256 = "a9ed097aa9d48b53c6a555bc5f67e347249b08e2252dd4fc998fb4ab42edda59"; + libraryHaskellDepends = [ base clock ]; + testHaskellDepends = [ base hspec ]; + description = "A couple functions that probably should be in the 'clock' package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "clocked" = callPackage ({ mkDerivation, base, clock, containers, MonadCatchIO-transformers , QtCore, transformers @@ -40633,7 +39055,6 @@ self: { aeson base bytestring directory github optparse-applicative process system-fileio system-filepath text transformers ]; - jailbreak = true; homepage = "https://github.com/silky/clone-all"; description = "Clone all github repositories from a given user"; license = stdenv.lib.licenses.mit; @@ -40647,10 +39068,10 @@ self: { version = "0.1.0.0"; sha256 = "8ecb1fa2557e86907512f65e4fdbd37ca772186d7421888a7801c82bf9a42cfd"; libraryHaskellDepends = [ base hashable unordered-containers ]; - jailbreak = true; homepage = "http://github.com/tel/closure"; description = "Depth- and breadth-first set closures"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cloud-haskell" = callPackage @@ -40791,9 +39212,9 @@ self: { base binary hierarchical-clustering matrices mwc-random Rlang-QQ split tasty tasty-hunit tasty-quickcheck vector ]; - doCheck = false; description = "High performance clustering algorithms"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clustertools" = callPackage @@ -40831,7 +39252,7 @@ self: { description = "Bindings to the Clutter animation library"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs) clutter; inherit (pkgs.gnome2) pango;}; "cmaes" = callPackage ({ mkDerivation, base, doctest, doctest-prop, mtl, process, random @@ -40895,8 +39316,8 @@ self: { }: mkDerivation { pname = "cmark-sections"; - version = "0.1.0.0"; - sha256 = "17ce46b79d6261357d390bac6a62da8de76d2e264e4fef6dc5d65dddc6689f06"; + version = "0.1.0.1"; + sha256 = "4df6ea052023b545da67a38311b69c751e1372515799b6ff88163b12f38ddf00"; libraryHaskellDepends = [ base base-prelude cmark containers microlens split text ]; @@ -40953,10 +39374,10 @@ self: { testHaskellDepends = [ base hspec hspec-laws HUnit QuickCheck quickcheck-instances text ]; - jailbreak = true; homepage = "https://github.com/geraud/cmd-item"; description = "Library to compose and reuse command line fragments"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cmdargs" = callPackage @@ -40989,7 +39410,6 @@ self: { base bytestring cmdargs directory filepath http-types process text transformers wai wai-handler-launch ]; - jailbreak = true; homepage = "http://community.haskell.org/~ndm/cmdargs/"; description = "Helper to enter cmdargs command lines using a web browser"; license = stdenv.lib.licenses.bsd3; @@ -41024,7 +39444,6 @@ self: { base containers directory filepath HUnit parsec pretty process test-framework test-framework-hunit transformers ]; - jailbreak = true; homepage = "http://github.com/eli-frey/cmdtheline"; description = "Declarative command-line option parsing and documentation library"; license = stdenv.lib.licenses.mit; @@ -41135,6 +39554,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "code-page" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "code-page"; + version = "0.1"; + sha256 = "543968422a3bbccdeddb1fe7258ef28ed7fb87c839da817c4d7935a9a2f20653"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/RyanGlScott/code-page"; + description = "Windows code page library for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "codec" = callPackage ({ mkDerivation, aeson, base, binary, binary-bits, bytestring , data-default-class, mtl, template-haskell, text, transformers @@ -41152,7 +39584,6 @@ self: { aeson base binary binary-bits bytestring data-default-class mtl template-haskell text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/chpatrick/codec"; description = "First-class record construction and bidirectional serialization"; license = stdenv.lib.licenses.bsd3; @@ -41246,7 +39677,6 @@ self: { revision = "3"; editedCabalFile = "6f9d1a534fa6ff720347aa10521a99456aa4b9e2a95b45f71cadb06074277c86"; libraryHaskellDepends = [ base curl mtl network tagsoup ]; - jailbreak = true; homepage = "http://github.com/chrisdone/codepad"; description = "Submit and retrieve paste output from CodePad.org."; license = stdenv.lib.licenses.bsd3; @@ -41265,34 +39695,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "codex_0_4_0_10" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash - , directory, either, filepath, hackage-db, http-client, lens - , machines, machines-directory, MissingH, monad-loops, network - , process, tar, text, transformers, wreq, yaml, zlib - }: - mkDerivation { - pname = "codex"; - version = "0.4.0.10"; - sha256 = "1dd23ef2991b14e6c212b91b86ef2c14de86ece126ab7bcf4ed926d1413ad812"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers cryptohash directory either - filepath hackage-db http-client lens machines machines-directory - process tar text transformers wreq yaml zlib - ]; - executableHaskellDepends = [ - base bytestring Cabal directory either filepath hackage-db MissingH - monad-loops network process transformers wreq yaml - ]; - jailbreak = true; - homepage = "http://github.com/aloiscochard/codex"; - description = "A ctags file generator for cabal project dependencies"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "codex" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash , directory, either, filepath, hackage-db, http-client, lens @@ -41301,8 +39703,8 @@ self: { }: mkDerivation { pname = "codex"; - version = "0.5.0.0"; - sha256 = "f516ed2f3751d3938e526aa61fb94a3553fbe6b6ffe76ed49fd442587e849984"; + version = "0.5.0.2"; + sha256 = "491064e6cf6b1afc6be30b061f6876b1d9da1ecc769fc74f485853b5bab8d907"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41314,7 +39716,6 @@ self: { base bytestring Cabal directory either filepath hackage-db MissingH monad-loops network process transformers wreq yaml ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/codex"; description = "A ctags file generator for cabal project dependencies"; license = stdenv.lib.licenses.asl20; @@ -41456,7 +39857,6 @@ self: { base bytestring cereal cmdargs containers fclabels ghc-prim ListZipper monad-atom mtl nlp-scores split swift-lda text vector ]; - jailbreak = true; homepage = "https://bitbucket.org/gchrupala/colada"; description = "Colada implements incremental word class class induction using online LDA"; license = stdenv.lib.licenses.bsd3; @@ -41476,9 +39876,9 @@ self: { aeson base conceit network network-simple pipes pipes-aeson pipes-attoparsec pipes-network text transformers ]; - jailbreak = true; description = "Rudimentary JSON-RPC 2.0 client over raw TCP."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collada-output" = callPackage @@ -41494,7 +39894,6 @@ self: { libraryHaskellDepends = [ base collada-types containers SVGPath time vector xml ]; - jailbreak = true; description = "Generate animated 3d objects in COLLADA"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -41511,7 +39910,6 @@ self: { libraryHaskellDepends = [ base containers enumerable OpenGL tuple tuple-gen vector ]; - jailbreak = true; description = "Data exchange between graphic applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -41526,10 +39924,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/mwotton/collapse"; description = "utility for collapsing adjacent writes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collection-json" = callPackage @@ -41539,10 +39937,10 @@ self: { version = "0.1.0.0"; sha256 = "8ca99eb2c0a6cb48d7982ba1316d4ef411a38ec9490c3b231e99001dd251f7db"; libraryHaskellDepends = [ aeson base bytestring text ]; - jailbreak = true; homepage = "https://github.com/danchoi/collection-json.hs"; description = "Collection+JSON hypermedia type tools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "collections" = callPackage @@ -41554,7 +39952,6 @@ self: { libraryHaskellDepends = [ array base bytestring containers QuickCheck ]; - jailbreak = true; description = "Useful standard collections types and related functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -41681,6 +40078,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "colour-space" = callPackage + ({ mkDerivation, base, colour, JuicyPixels, manifolds, semigroups + , vector-space + }: + mkDerivation { + pname = "colour-space"; + version = "0.1.0.0"; + sha256 = "4b26cee762f9e673f3e461c25622942e80b7676950f768ce607f90ebc6ae6b48"; + libraryHaskellDepends = [ + base colour JuicyPixels manifolds semigroups vector-space + ]; + homepage = "https://github.com/leftaroundabout/colour-space"; + description = "Instances of the manifold-classes for colour types"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "coltrane" = callPackage ({ mkDerivation, base, bytestring, HTTP, http-types, HUnit, mtl , regex-compat, text, wai, wai-extra, warp @@ -41693,7 +40107,6 @@ self: { base bytestring HTTP http-types HUnit mtl regex-compat text wai wai-extra warp ]; - jailbreak = true; homepage = "https://github.com/wellecks/coltrane"; description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra"; license = stdenv.lib.licenses.bsd3; @@ -41769,7 +40182,6 @@ self: { base bytestring cereal containers directory lens mtl template-haskell th-lift trifecta void ]; - jailbreak = true; homepage = "https://github.com/fumieval/combinator-interactive"; description = "SKI Combinator interpreter"; license = stdenv.lib.licenses.bsd3; @@ -41816,7 +40228,6 @@ self: { libraryHaskellDepends = [ base containers template-haskell vector vector-space ]; - jailbreak = true; homepage = "https://github.com/JohnLato/combobuffer"; description = "Various buffer implementations"; license = stdenv.lib.licenses.bsd3; @@ -41837,7 +40248,6 @@ self: { testHaskellDepends = [ base containers QuickCheck transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/comfort-graph"; description = "Graph structure with type parameters for nodes and edges"; license = stdenv.lib.licenses.bsd3; @@ -41882,10 +40292,10 @@ self: { libraryHaskellDepends = [ base containers mtl transformers ]; executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/jsdw/hs-commander"; description = "pattern matching against string based commands"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "commodities" = callPackage @@ -41906,7 +40316,6 @@ self: { base containers directory doctest filepath hspec hspec-expectations lens QuickCheck semigroups thyme transformers ]; - jailbreak = true; description = "Library for working with commoditized amounts and price histories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -41965,27 +40374,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "comonad_4_2_7_2" = callPackage - ({ mkDerivation, base, containers, contravariant, directory - , distributive, doctest, filepath, semigroups, tagged, transformers - , transformers-compat - }: - mkDerivation { - pname = "comonad"; - version = "4.2.7.2"; - sha256 = "b762261ef545a16881b66409398752e249a8e654a34088c66d9fabf9ba5a3b2b"; - libraryHaskellDepends = [ - base containers contravariant distributive semigroups tagged - transformers transformers-compat - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - homepage = "http://github.com/ekmett/comonad/"; - description = "Comonads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "comonad" = callPackage ({ mkDerivation, base, containers, contravariant, directory , distributive, doctest, filepath, semigroups, tagged, transformers @@ -42017,7 +40405,6 @@ self: { array base comonad containers distributive semigroupoids transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/comonad-extras/"; description = "Exotic comonad transformers"; license = stdenv.lib.licenses.bsd3; @@ -42031,7 +40418,6 @@ self: { version = "0.1.2"; sha256 = "5ebdd4677d4b1de6246c4c6045c39fdf24b043b28f0b4733d7cada9b91984a86"; libraryHaskellDepends = [ base category-extras random ]; - jailbreak = true; description = "Comonadic interface for random values"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -42089,7 +40475,6 @@ self: { base binary bytestring compact deepseq directory filepath network unix ]; - jailbreak = true; description = "Socket functions for compact normal form"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -42104,7 +40489,6 @@ self: { revision = "1"; editedCabalFile = "12c9508bf68b6da11d38adb71248376aeb23eaf7cd6ae1b4571c83d748079c0d"; libraryHaskellDepends = [ base bytestring ]; - jailbreak = true; homepage = "http://twan.home.fmf.nl/compact-string/"; description = "Fast, packed and strict strings with Unicode support, based on bytestrings"; license = stdenv.lib.licenses.bsd3; @@ -42179,7 +40563,6 @@ self: { revision = "1"; editedCabalFile = "f8bda15b8d1d1e56f64c37f39ac8ba1c7bf860c291adad3698041eee68146130"; libraryHaskellDepends = [ base compdata containers projection ]; - jailbreak = true; description = "Tree automata on Compositional Data Types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42202,7 +40585,6 @@ self: { test-framework-hunit test-framework-quickcheck2 unordered-containers vector ]; - jailbreak = true; description = "Compositional Data Types on DAGs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42247,10 +40629,10 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/compensated/"; description = "Compensated floating-point arithmetic"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "competition" = callPackage @@ -42260,10 +40642,10 @@ self: { version = "0.2.0.0"; sha256 = "f68f78e6d4f68912ec01e24da4e3641cfe55aeafbfc666318aa9a3a8bc59861d"; libraryHaskellDepends = [ base filepath parsec ]; - jailbreak = true; homepage = "github.com/yanatan16/haskell-competition"; description = "Helpers and runners for code competitions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compilation" = callPackage @@ -42315,7 +40697,6 @@ self: { base Chart colour data-accessor hstats parallel pretty time transformers ]; - jailbreak = true; description = "Empirical algorithmic complexity"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42329,9 +40710,9 @@ self: { sha256 = "f76dbb87f336da695e921f7f65913e1a5cbe7db06898d678c2310356ae9727af"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec QuickCheck ]; - jailbreak = true; description = "More intuitive, left-to-right function composition"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compose-trans" = callPackage @@ -42375,11 +40756,10 @@ self: { sha256 = "67d26787ad5e35d1840b5e1bd325bb12815bd151faa0f6e13aaeb55e63af9bd6"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/liamoc/composition-tree"; description = "Composition trees for arbitrary monoids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compound-types" = callPackage @@ -42409,10 +40789,10 @@ self: { base comonad containers fingertree hashable keys pointed reducers semigroupoids semigroups unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ekmett/compressed/"; description = "Compressed containers and reducers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "compression" = callPackage @@ -42439,7 +40819,6 @@ self: { libraryHaskellDepends = [ base compdata mtl template-haskell th-expand-syns transformers ]; - jailbreak = true; description = "Strategy combinators for compositional data types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -42458,7 +40837,6 @@ self: { base compdata containers deepseq deepseq-generics ghc-prim lens template-haskell th-expand-syns ]; - jailbreak = true; homepage = "https://github.com/jkoppel/comptrans"; description = "Automatically converting ASTs into compositional data types"; license = stdenv.lib.licenses.bsd3; @@ -42478,7 +40856,6 @@ self: { algebra base containers equational-reasoning heaps lens monad-loops monomorphic peggy singletons sized-vector tagged type-natural ]; - jailbreak = true; homepage = "https://github.com/konn/computational-algebra"; description = "Well-kinded computational algebra library, currently supporting Groebner basis"; license = stdenv.lib.licenses.bsd3; @@ -42551,7 +40928,6 @@ self: { monad-codec monad-ox sgd tagset-positional temporary text text-binary transformers vector vector-binary zlib ]; - jailbreak = true; homepage = "http://zil.ipipan.waw.pl/Concraft"; description = "Morphological disambiguation based on constrained CRFs"; license = stdenv.lib.licenses.bsd3; @@ -42574,7 +40950,6 @@ self: { lazy-io moan network sgd split tagset-positional text ]; executableHaskellDepends = [ cmdargs ]; - jailbreak = true; homepage = "https://github.com/vjeranc/concraft-hr"; description = "Part-of-speech tagger for Croatian"; license = stdenv.lib.licenses.bsd3; @@ -42597,7 +40972,6 @@ self: { network process sgd split tagset-positional text transformers ]; executableHaskellDepends = [ cmdargs ]; - jailbreak = true; homepage = "http://zil.ipipan.waw.pl/Concraft"; description = "Morphological tagger for Polish"; license = stdenv.lib.licenses.bsd3; @@ -42637,12 +41011,30 @@ self: { base binary hashable QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "Binary and Hashable instances for TypeRep"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "concurrency" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.0.0.0"; + sha256 = "541f9e730c18464ec8399214097a5fb62cfce319baa3495bf3349e0f4d9cf19d"; + revision = "1"; + editedCabalFile = "3de0faeb048451ba463026c4d88e9cedf21470c4568a044be0b4bff460ad1c90"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + homepage = "https://github.com/barrucadu/dejafu"; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = stdenv.lib.licenses.mit; + }) {}; + "concurrent-barrier" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -42691,8 +41083,6 @@ self: { async base HUnit random stm test-framework test-framework-hunit unbounded-delays ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/basvandijk/concurrent-extra"; description = "Extra concurrency primitives"; license = stdenv.lib.licenses.bsd3; @@ -42718,23 +41108,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "concurrent-output_1_7_6" = callPackage - ({ mkDerivation, ansi-terminal, async, base, directory, exceptions - , process, stm, terminal-size, text, transformers, unix - }: - mkDerivation { - pname = "concurrent-output"; - version = "1.7.6"; - sha256 = "ca3668dad7999dd1366582bff46ef3a50ba8ce9a775a812883094db92adac6a5"; - libraryHaskellDepends = [ - ansi-terminal async base directory exceptions process stm - terminal-size text transformers unix - ]; - description = "Ungarble output from several threads or commands"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "concurrent-output" = callPackage ({ mkDerivation, ansi-terminal, async, base, directory, exceptions , process, stm, terminal-size, text, transformers, unix @@ -42792,7 +41165,6 @@ self: { version = "0.6.0.0"; sha256 = "e6071814c277106cb13b458a7161dd42269e9a7c2419b17992a1908a7fb3342d"; libraryHaskellDepends = [ base exceptions mtl stm transformers ]; - jailbreak = true; homepage = "https://github.com/joelteon/concurrent-state"; description = "MTL-like library using TVars"; license = stdenv.lib.licenses.mit; @@ -42866,7 +41238,6 @@ self: { testHaskellDepends = [ base binary Cabal containers glider-nlp HUnit text ]; - jailbreak = true; homepage = "https://github.com/klangner/Condor"; description = "Information retrieval library"; license = stdenv.lib.licenses.bsd3; @@ -42922,7 +41293,6 @@ self: { base conductive-base conductive-song containers directory filepath hosc hsc3 random ]; - jailbreak = true; homepage = "http://www.renickbell.net/doku.php?id=conductive-hsc3"; description = "a library with examples of using Conductive with hsc3"; license = stdenv.lib.licenses.gpl3; @@ -42941,41 +41311,18 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "conduit_1_2_6_6" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, mtl, QuickCheck, resourcet, safe, transformers - , transformers-base - }: - mkDerivation { - pname = "conduit"; - version = "1.2.6.6"; - sha256 = "958fe8636ef49b947493fd23ea1522d51e82e6acc87cb9e5038398e25fa5d188"; - libraryHaskellDepends = [ - base exceptions lifted-base mmorph mtl resourcet transformers - transformers-base - ]; - testHaskellDepends = [ - base containers exceptions hspec mtl QuickCheck resourcet safe - transformers - ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Streaming data processing library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, mtl, QuickCheck, resourcet, safe, transformers - , transformers-base + , mmorph, monad-control, mtl, QuickCheck, resourcet, safe + , transformers, transformers-base }: mkDerivation { pname = "conduit"; - version = "1.2.7"; - sha256 = "36b21db556cf81d3080edd50f417ce5dd8391f32cf2f8078b48110cfd6ed3be5"; + version = "1.2.8"; + sha256 = "80d5df4c70adf2b7e87138c55fba25e05be30eaef0c9a7926d97ae0c0cdb17fb"; libraryHaskellDepends = [ - base exceptions lifted-base mmorph mtl resourcet transformers - transformers-base + base exceptions lifted-base mmorph monad-control mtl resourcet + transformers transformers-base ]; testHaskellDepends = [ base containers exceptions hspec mtl QuickCheck resourcet safe @@ -43061,35 +41408,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "conduit-combinators_1_0_4" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; - version = "1.0.4"; - sha256 = "75a90da15f7bd70748ebb3a3612d50896e421d8fdbaa4879e8aabfbeaf4dc7de"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-combinators" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , bytestring, chunked-data, conduit, conduit-extra, containers @@ -43100,8 +41418,8 @@ self: { }: mkDerivation { pname = "conduit-combinators"; - version = "1.0.5"; - sha256 = "b6e65bcfec9a9b57e268a7a16f067af500f1e8b8f7dad9b96e9aad7bf603c6cd"; + version = "1.0.8.1"; + sha256 = "cf347790f173dce64ebf7ef1b364686fee2d890bfa38caa9145494a5909a7637"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring chunked-data conduit conduit-extra filepath monad-control mono-traversable @@ -43118,35 +41436,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "conduit-combinators_1_0_6" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, chunked-data, conduit, conduit-extra, containers - , directory, filepath, hspec, monad-control, mono-traversable, mtl - , mwc-random, primitive, QuickCheck, resourcet, safe, silently - , text, transformers, transformers-base, unix, unix-compat, vector - , void - }: - mkDerivation { - pname = "conduit-combinators"; - version = "1.0.6"; - sha256 = "215c5b29fbeb0177ac7b80f67be9f3c7eaa2a231b9fcb25916ab1ceda007a2fa"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit conduit-extra filepath monad-control mono-traversable - mwc-random primitive resourcet text transformers transformers-base - unix unix-compat vector void - ]; - testHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring chunked-data - conduit containers directory filepath hspec mono-traversable mtl - mwc-random QuickCheck safe silently text transformers vector - ]; - homepage = "https://github.com/snoyberg/mono-traversable"; - description = "Commonly used conduit functions, for both chunked and unchunked data"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-connection" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, HUnit , network, resourcet, test-framework, test-framework-hunit @@ -43154,8 +41443,8 @@ self: { }: mkDerivation { pname = "conduit-connection"; - version = "0.1.0.1"; - sha256 = "c4020f9f2aba7baedeb7dceb9ac092e2aefaa7480d57eb38595800da911671fc"; + version = "0.1.0.3"; + sha256 = "798eb9c87a37f8f8a15a8edc6674f975dad38ed8c19acf52b6439f88c280439a"; libraryHaskellDepends = [ base bytestring conduit connection resourcet transformers ]; @@ -43163,7 +41452,6 @@ self: { base bytestring conduit connection HUnit network resourcet test-framework test-framework-hunit transformers ]; - jailbreak = true; homepage = "https://github.com/sdroege/conduit-connection"; description = "Conduit source and sink for Network.Connection."; license = stdenv.lib.licenses.bsd3; @@ -43178,8 +41466,8 @@ self: { }: mkDerivation { pname = "conduit-extra"; - version = "1.1.13.2"; - sha256 = "9fccd20c45b017c5b5b12a933b1cedd9088f27375c6b7bb2dadce9db92d51b81"; + version = "1.1.13.3"; + sha256 = "c2efc890925ca9adcff7006b6155804b4a3712940f70b3e3be8b1e9be7c56c48"; libraryHaskellDepends = [ async attoparsec base blaze-builder bytestring conduit directory exceptions filepath monad-control network primitive process @@ -43277,27 +41565,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "conduit-parse_0_1_1_1" = callPackage - ({ mkDerivation, base, conduit, dlist, exceptions, hlint, mtl - , parsers, resourcet, tasty, tasty-hunit, text, transformers - }: - mkDerivation { - pname = "conduit-parse"; - version = "0.1.1.1"; - sha256 = "4366a66f5980bd328730c5d44b99f67d7081e5ef76b554bc8284942bf9977f4a"; - libraryHaskellDepends = [ - base conduit dlist exceptions mtl parsers text transformers - ]; - testHaskellDepends = [ - base conduit exceptions hlint mtl parsers resourcet tasty - tasty-hunit - ]; - homepage = "https://github.com/k0ral/conduit-parse"; - description = "Parsing framework based on conduit"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "conduit-parse" = callPackage ({ mkDerivation, base, conduit, dlist, hlint, mtl, parsers , resourcet, safe, safe-exceptions, tasty, tasty-hunit, text @@ -43332,7 +41599,6 @@ self: { testHaskellDepends = [ base bytestring conduit hspec transformers void ]; - jailbreak = true; homepage = "http://github.com/A1kmm/conduit-resumablesink"; description = "Allows conduit to resume sinks to feed multiple sources into it"; license = stdenv.lib.licenses.bsd3; @@ -43371,9 +41637,9 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit test-framework-th ]; - jailbreak = true; description = "Parser for Haskell-based configuration files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conffmt" = callPackage @@ -43480,9 +41746,9 @@ self: { pretty-show QuickCheck scientific string-conversions unordered-containers vector ]; - jailbreak = true; description = "parser for config files, shell variables, command line args"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "configuration" = callPackage @@ -43508,8 +41774,8 @@ self: { }: mkDerivation { pname = "configuration-tools"; - version = "0.2.14"; - sha256 = "c54c40d72423207f63c7108ea6076612a179c0c35d7e10e540858ba92946f9fb"; + version = "0.2.15"; + sha256 = "8231a7a893add8ae78ccb2b25e0fa98b0c0fd7d7a5f6e2e88d3711e93576121e"; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base-unicode-symbols base64-bytestring bytestring Cabal case-insensitive connection @@ -43594,9 +41860,9 @@ self: { version = "0.1.0.0"; sha256 = "1b853725f02a7e72f3d00f4e3c5c66280a7864a4626f27beeb41ad5bfc9a44de"; libraryHaskellDepends = [ array base containers ]; - jailbreak = true; description = "Decidable congruence relations for Haskell: up to you whether this is a joke"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "conjugateGradient" = callPackage @@ -43641,28 +41907,9 @@ self: { isExecutable = true; libraryHaskellDepends = [ base text ]; executableHaskellDepends = [ base text ]; - jailbreak = true; homepage = "https://github.com/tattsun/conlogger"; description = "A logger for a concurrent program"; license = stdenv.lib.licenses.mit; - }) {}; - - "connection_0_2_5" = callPackage - ({ mkDerivation, base, byteable, bytestring, containers - , data-default-class, network, socks, tls, x509, x509-store - , x509-system, x509-validation - }: - mkDerivation { - pname = "connection"; - version = "0.2.5"; - sha256 = "8895d4427985202ac439b884deb4b5675ccba3d9498fce3687f1542b4ba21124"; - libraryHaskellDepends = [ - base byteable bytestring containers data-default-class network - socks tls x509 x509-store x509-system x509-validation - ]; - homepage = "http://github.com/vincenthz/hs-connection"; - description = "Simple and easy network connections API"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -43733,9 +41980,9 @@ self: { ansi-terminal ansi-wl-pprint base containers directory haskeline parsec parsec-extra split transformers unix utility-ht ]; - jailbreak = true; description = "Interpret the command line and settings in a config file as commands and options"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "const-math-ghc-plugin" = callPackage @@ -43756,8 +42003,8 @@ self: { ({ mkDerivation, base, tagged, void }: mkDerivation { pname = "constrained-categories"; - version = "0.2.5.1"; - sha256 = "660941f0cfc79793a2102a8638802f5df009a8cc155ca3194c76e3902feaede8"; + version = "0.3.0.1"; + sha256 = "a21cb119f0eda4631e89e3b1d8210bc623ea12e721f5c415d8ada410081aea7d"; libraryHaskellDepends = [ base tagged void ]; homepage = "https://github.com/leftaroundabout/constrained-categories"; description = "Constrained clones of the category-theory type classes, using ConstraintKinds"; @@ -43793,8 +42040,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "constraint-classes"; - version = "0.2.0"; - sha256 = "7cc34540b60d0e1a89230d1ea65ea05af49524e102915aa3b3d908158b134580"; + version = "0.3.0"; + sha256 = "369f8b61d20c1f83e6460768a8316b029c32f61c4bfe38e2538c9c075802e8f2"; libraryHaskellDepends = [ base ]; homepage = "http://github.com/guaraqe/constraint-classes#readme"; description = "Prelude classes using ConstraintKinds"; @@ -43840,7 +42087,6 @@ self: { version = "0.3.0"; sha256 = "3dfc28bb02704074d4ebb0e75d1b0e0701b6b840eb686e0ee47ff082e7064b9d"; libraryHaskellDepends = [ base QuickCheck type-level ]; - jailbreak = true; description = "A library of constructive algebra"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43864,10 +42110,37 @@ self: { testHaskellDepends = [ base http-client HUnit network tasty tasty-hunit text transformers ]; - doCheck = false; homepage = "https://github.com/alphaHeavy/consul-haskell"; description = "A consul client for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "consul-haskell_0_4" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring + , connection, either, exceptions, http-client, http-client-tls + , http-types, HUnit, lifted-async, lifted-base, monad-control + , network, random, retry, stm, tasty, tasty-hunit, text + , transformers, unordered-containers, uuid, vector + }: + mkDerivation { + pname = "consul-haskell"; + version = "0.4"; + sha256 = "f81c503aae87cb38659848d1d797eb1e7ffbf9c2b72836e30f2e5b05267c9bda"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring connection either + exceptions http-client http-client-tls http-types lifted-async + lifted-base monad-control network retry stm text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base http-client HUnit network random tasty tasty-hunit text + transformers uuid + ]; + homepage = "https://github.com/alphaHeavy/consul-haskell"; + description = "A consul client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "consumers" = callPackage @@ -43905,7 +42178,6 @@ self: { lens-utils mtl template-haskell text transformers transformers-base typelevel vector ]; - jailbreak = true; homepage = "https://github.com/wdanilo/containers"; description = "Containers abstraction and utilities"; license = stdenv.lib.licenses.asl20; @@ -43944,7 +42216,6 @@ self: { revision = "2"; editedCabalFile = "4cdf787be0b51ffe34f02055117470f87d03c2f6567cd53d908b048c5fc970c8"; libraryHaskellDepends = [ array base deepseq ]; - jailbreak = true; description = "Assorted concrete container types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -43983,10 +42254,10 @@ self: { executableHaskellDepends = [ base bytestring containers criterion deepseq ghc-prim random ]; - jailbreak = true; homepage = "http://git.auryn.cz/haskell/containers-benchmark/"; description = "Extensive benchmark suite for containers package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "containers-deepseq" = callPackage @@ -44045,7 +42316,6 @@ self: { libraryHaskellDepends = [ base classy-prelude mtl unordered-containers ]; - jailbreak = true; homepage = "http://github.com/thinkpad20/context-stack"; description = "An abstraction of a stack and stack-based monadic context"; license = stdenv.lib.licenses.mit; @@ -44064,7 +42334,6 @@ self: { base bifunctors monad-control mtl semigroupoids transformers transformers-base ]; - jailbreak = true; description = "Monads with suspension and arbitrary-spot reentry"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -44094,6 +42363,7 @@ self: { base bytestring cereal containers mtl nanomsg-haskell time ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "continuum-client" = callPackage @@ -44108,6 +42378,7 @@ self: { base bytestring cereal containers mtl nanomsg-haskell time ]; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "contravariant" = callPackage @@ -44126,23 +42397,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "contravariant-extras_0_3_2" = callPackage - ({ mkDerivation, base-prelude, contravariant, template-haskell - , tuple-th - }: - mkDerivation { - pname = "contravariant-extras"; - version = "0.3.2"; - sha256 = "9fd92b6d240f9492c0474ce5261751ed9f01b6fd4292f0bbfc482e19d9012505"; - libraryHaskellDepends = [ - base-prelude contravariant template-haskell tuple-th - ]; - homepage = "https://github.com/nikita-volkov/contravariant-extras"; - description = "Extras for the \"contravariant\" package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "contravariant-extras" = callPackage ({ mkDerivation, base-prelude, contravariant, template-haskell , tuple-th @@ -44190,7 +42444,6 @@ self: { version = "0.3.0.1"; sha256 = "bac8217c9980bccfce3381ea6a28eb0e117d9aaf99f2cc3c2e5ffad5f6111690"; libraryHaskellDepends = [ attempt base transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/control-monad-attempt"; description = "Monad transformer for attempt. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -44228,6 +42481,7 @@ self: { homepage = "http://pepeiborra.github.com/control-monad-exception"; description = "Monads-fd instances for the EMT exceptions monad transformer"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "control-monad-exception-monadstf" = callPackage @@ -44266,7 +42520,6 @@ self: { version = "0.7.0.1"; sha256 = "78524bf400bcd382bada63479e5d32be627199d9f6ec2d780ca84317162760bc"; libraryHaskellDepends = [ base failure transformers ]; - jailbreak = true; homepage = "http://github.com/pepeiborra/control-monad-failure"; description = "A class for monads which can fail with an error. (deprecated)"; license = stdenv.lib.licenses.publicDomain; @@ -44280,7 +42533,6 @@ self: { version = "0.7.1"; sha256 = "12d9b9cd2cc0f9a5f51145511e3c86a4a4c9b1ab0915d17742670c8077413149"; libraryHaskellDepends = [ base failure mtl ]; - jailbreak = true; homepage = "http://github.com/pepeiborra/control-monad-failure"; description = "A class for monads which can fail with an error for mtl 1 (deprecated)"; license = stdenv.lib.licenses.publicDomain; @@ -44391,7 +42643,6 @@ self: { version = "0.1.1"; sha256 = "262a527d696e3252ee000e528936b2a64990a7e19277e61c8917f715eed4bb2c"; libraryHaskellDepends = [ base contstuff transformers ]; - jailbreak = true; description = "Deprecated interface between contstuff 0.7.0 and the transformers package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -44509,7 +42760,6 @@ self: { ascii base base-unicode-symbols blaze-builder bytestring convertible-text failure text ]; - jailbreak = true; homepage = "https://github.com/phonohawk/convertible-ascii"; description = "convertible instances for ascii"; license = stdenv.lib.licenses.publicDomain; @@ -44746,10 +42996,10 @@ self: { semigroups text ]; testHaskellDepends = [ base hlint ]; - jailbreak = true; homepage = "https://github.com/relrod/copr-hs"; description = "Haskell interface to the Fedora Copr system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "core" = callPackage @@ -44836,10 +43086,10 @@ self: { version = "0.1.1"; sha256 = "e7429de12e84f6cbde0d23069ebcd22954fc94cd5a1e12b95235f05dfc854be6"; libraryHaskellDepends = [ base enumerator monad-coroutine ]; - jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/coroutine-enumerator"; description = "Bridge between the monad-coroutine and enumerator packages"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "coroutine-iteratee" = callPackage @@ -44849,7 +43099,6 @@ self: { version = "0.1.1"; sha256 = "8d838a6295c45459324342e7bc455075ec2e014eab31629e27e3b3cb27c991f9"; libraryHaskellDepends = [ base iteratee monad-coroutine ]; - jailbreak = true; homepage = "http://trac.haskell.org/SCC/wiki/coroutine-iteratee"; description = "Bridge between the monad-coroutine and iteratee packages"; license = "GPL"; @@ -44881,7 +43130,6 @@ self: { aeson attoparsec base bytestring hint random text transformers vector ]; - jailbreak = true; description = "A CouchDB view server for Haskell"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -44940,7 +43188,6 @@ self: { test-framework-hunit text transformers transformers-base unordered-containers ]; - jailbreak = true; homepage = "https://github.com/akaspin/couchdb-conduit"; description = "Couch DB client library using http-conduit and aeson"; license = stdenv.lib.licenses.bsd3; @@ -44970,7 +43217,6 @@ self: { test-framework-quickcheck2 text transformers unordered-containers utf8-string vector ]; - jailbreak = true; homepage = "http://bitbucket.org/wuzzeb/couchdb-enumerator"; description = "Couch DB client library using http-enumerator and aeson"; license = stdenv.lib.licenses.bsd3; @@ -45005,6 +43251,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "countable-inflections" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hspec, pcre-light + , QuickCheck, text + }: + mkDerivation { + pname = "countable-inflections"; + version = "0.1.0"; + sha256 = "24bb1f350cfbab09c8de1ededab28f138038d04c86e3614d8dc8514f8c8f1db9"; + libraryHaskellDepends = [ + base bytestring exceptions pcre-light text + ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + homepage = "https://github.com/tippenein/countable-inflections"; + description = "Countable Text Inflections"; + license = stdenv.lib.licenses.mit; + }) {}; + "counter" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -45012,10 +43275,10 @@ self: { version = "0.1.0.1"; sha256 = "5fcde1f42a49b8376319db7a8e986c727e8c67c3766fa6f958f82c032f19cf5d"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "https://github.com/wei2912/counter"; description = "An object frequency counter"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "country-codes" = callPackage @@ -45031,32 +43294,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "courier_0_1_1_3" = callPackage - ({ mkDerivation, async, base, bytestring, cereal, containers - , directory, hslogger, HUnit, network, stm, test-framework - , test-framework-hunit, text, uuid - }: - mkDerivation { - pname = "courier"; - version = "0.1.1.3"; - sha256 = "0cf44b62c2b134a7bf9aa779ef2b04d91f4b44a46273bb478ecdcbd9d1198e83"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring cereal containers hslogger network stm text - uuid - ]; - executableHaskellDepends = [ base cereal ]; - testHaskellDepends = [ - async base cereal containers directory hslogger HUnit network stm - test-framework test-framework-hunit - ]; - homepage = "http://github.com/hargettp/courier"; - description = "A message-passing library for simplifying network applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "courier" = callPackage ({ mkDerivation, async, base, bytestring, cereal, containers , directory, hslogger, HUnit, network, stm, test-framework @@ -45096,7 +43333,6 @@ self: { aeson base bytestring directory filepath old-locale optparse-applicative process stm text time unix ]; - jailbreak = true; homepage = "http://hub.darcs.net/thoferon/court"; description = "Simple and flexible CI system"; license = stdenv.lib.licenses.bsd3; @@ -45111,10 +43347,10 @@ self: { sha256 = "d9b7499e5f806d4f841b52230faa752de383fa4e4129054d52ebabb4f7e782da"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; - jailbreak = true; homepage = "https://github.com/nicodelpiano/coverage"; description = "Exhaustivity Checking Library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cpio-conduit" = callPackage @@ -45139,15 +43375,16 @@ self: { }) {}; "cplex-hs" = callPackage - ({ mkDerivation, base, containers, cplex, mtl, primitive - , transformers, vector + ({ mkDerivation, base, containers, cplex, hashable, mtl, primitive + , transformers, unordered-containers, vector }: mkDerivation { pname = "cplex-hs"; - version = "0.2.0.2"; - sha256 = "5f6de007fa0b2548d40fdb18cb44b37b8f02cc7cbe631e74ba20ab1aec811554"; + version = "0.4.0.4"; + sha256 = "2c9e5f8719d53ffb0121a2c88e5bb43a627a54de3ce3028713c0f8426ba175eb"; libraryHaskellDepends = [ - base containers mtl primitive transformers vector + base containers hashable mtl primitive transformers + unordered-containers vector ]; librarySystemDepends = [ cplex ]; homepage = "https://github.com/stefan-j/cplex-haskell"; @@ -45168,34 +43405,12 @@ self: { base bytestring containers process template-haskell ]; testHaskellDepends = [ base process QuickCheck ]; - jailbreak = true; homepage = "https://github.com/nicta/cplusplus-th"; description = "C++ Foreign Import Generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cpphs_1_20_1" = callPackage - ({ mkDerivation, base, directory, old-locale, old-time, polyparse - }: - mkDerivation { - pname = "cpphs"; - version = "1.20.1"; - sha256 = "bd6eab851ec39ed5c5e4b0eb0b956f5892a36dedabcdf127a1ffa84c8e4f6017"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - executableHaskellDepends = [ - base directory old-locale old-time polyparse - ]; - homepage = "http://projects.haskell.org/cpphs/"; - description = "A liberalised re-implementation of cpp, the C pre-processor"; - license = "LGPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cpphs" = callPackage ({ mkDerivation, base, directory, old-locale, old-time, polyparse }: @@ -45246,10 +43461,10 @@ self: { base cprng-aes crypto-random crypto-random-effect extensible-effects ]; - jailbreak = true; homepage = "https://github.com/ibotty/crypto-random-effect"; description = "Run random effect using cprng-aes, a crypto pseudo number generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cpsa" = callPackage @@ -45293,10 +43508,9 @@ self: { ({ mkDerivation, attoparsec, base, bytestring, deepseq }: mkDerivation { pname = "cpuinfo"; - version = "0.1.0.0"; - sha256 = "31dda274cd488fcdb295617aa2ed754ee697ad653edef5cf7fba56cb8e942623"; + version = "0.1.0.1"; + sha256 = "d1b3e3992cc0c82edfb21f30e1684bb66e6a3cb23a26b777a079702362d05655"; libraryHaskellDepends = [ attoparsec base bytestring deepseq ]; - jailbreak = true; homepage = "https://github.com/TravisWhitaker/cpuinfo"; description = "Haskell Library for Checking CPU Information"; license = stdenv.lib.licenses.mit; @@ -45331,30 +43545,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {inherit (pkgs) python34;}; - "cql_3_0_7" = callPackage - ({ mkDerivation, base, bytestring, cereal, Decimal, iproute - , network, QuickCheck, tasty, tasty-quickcheck, template-haskell - , text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "cql"; - version = "3.0.7"; - sha256 = "54f8535ac3fe7abeb31557ec560f8135941346fc1ec8eb7922a9e0eda10fea76"; - libraryHaskellDepends = [ - base bytestring cereal Decimal iproute network template-haskell - text time transformers uuid vector - ]; - testHaskellDepends = [ - base bytestring cereal Decimal iproute network QuickCheck tasty - tasty-quickcheck text time uuid - ]; - jailbreak = true; - homepage = "https://github.com/twittner/cql/"; - description = "Cassandra CQL binary protocol"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cql" = callPackage ({ mkDerivation, base, bytestring, cereal, Decimal, iproute , network, QuickCheck, tasty, tasty-quickcheck, template-haskell @@ -45362,8 +43552,8 @@ self: { }: mkDerivation { pname = "cql"; - version = "3.1.0"; - sha256 = "0639f54c5c1e1a96b27203691aa0b37d59c4309aac1f75c20864d41ad86f4c53"; + version = "3.1.1"; + sha256 = "45b0d9599dfb6b5df02eb17e18d45cef8abd7e175d4eb7f99ab94f9d50866da3"; libraryHaskellDepends = [ base bytestring cereal Decimal iproute network template-haskell text time transformers uuid vector @@ -45378,30 +43568,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "cql-io_0_15_2" = callPackage - ({ mkDerivation, async, auto-update, base, bytestring, containers - , cql, cryptohash, data-default-class, exceptions, hashable - , HsOpenSSL, iproute, lens, monad-control, mtl, mwc-random, network - , retry, semigroups, stm, text, time, tinylog, transformers - , transformers-base, uuid, vector - }: - mkDerivation { - pname = "cql-io"; - version = "0.15.2"; - sha256 = "cba9bdaae9056151a413760e5d9dea10604a7ef90867fd2c834ddc1a5b6d5669"; - libraryHaskellDepends = [ - async auto-update base bytestring containers cql cryptohash - data-default-class exceptions hashable HsOpenSSL iproute lens - monad-control mtl mwc-random network retry semigroups stm text time - tinylog transformers transformers-base uuid vector - ]; - jailbreak = true; - homepage = "https://github.com/twittner/cql-io/"; - description = "Cassandra CQL client"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cql-io" = callPackage ({ mkDerivation, async, auto-update, base, bytestring, containers , cql, cryptohash, data-default-class, exceptions, hashable @@ -45449,9 +43615,9 @@ self: { base bytestring containers deepseq io-streams transformers uuid-types ]; - jailbreak = true; description = "Command-Query Responsibility Segregation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs-example" = callPackage @@ -45471,9 +43637,9 @@ self: { cqrs-core cqrs-memory deepseq io-streams random scotty stm text transformers uuid-types wai-extra wai-middleware-static warp ]; - jailbreak = true; description = "Example for cqrs package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs-memory" = callPackage @@ -45490,6 +43656,7 @@ self: { testHaskellDepends = [ base cqrs-core cqrs-testkit hspec random ]; description = "Memory backend for the cqrs package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs-postgresql" = callPackage @@ -45511,7 +43678,6 @@ self: { base bytestring cqrs-core cqrs-testkit hspec io-streams pg-harness-client postgresql-libpq random resource-pool uuid-types ]; - jailbreak = true; description = "PostgreSQL backend for the cqrs package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -45533,7 +43699,6 @@ self: { base bytestring conduit cqrs-test direct-sqlite hspec pool-conduit text transformers ]; - jailbreak = true; description = "SQLite3 backend for the cqrs package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -45551,7 +43716,6 @@ self: { base bytestring conduit cqrs-types hspec HUnit pool-conduit stm transformers ]; - jailbreak = true; description = "Command-Query Responsibility Segregation Test Support"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -45570,9 +43734,9 @@ self: { base bytestring containers cqrs-core deepseq hspec HUnit io-streams lifted-base random transformers uuid-types ]; - jailbreak = true; description = "Command-Query Responsibility Segregation Test Support"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "cqrs-types" = callPackage @@ -45635,6 +43799,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "craft" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base + , bytestring, conduit, conduit-combinators, conduit-extra + , containers, cryptonite, derive, directory, exceptions + , fast-logger, filepath, formatting, free, hspec, hspec-megaparsec + , ini, lens, lifted-base, megaparsec, memory, MissingH + , monad-logger, mtl, path, path-io, process, process-extras + , pureMD5, QuickCheck, random, split, streaming-commons + , template-haskell, text, transformers, unix, unordered-containers + , versions, wreq, yaml + }: + mkDerivation { + pname = "craft"; + version = "0.0.0.1"; + sha256 = "34cb8c42afa115c0c834af170cb7c51a15fa8819e24bd310c1288a8ad6eb6ad3"; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal async base bytestring conduit + conduit-combinators conduit-extra containers cryptonite derive + directory exceptions fast-logger filepath formatting free ini lens + lifted-base megaparsec memory MissingH monad-logger mtl path + path-io process process-extras pureMD5 QuickCheck random split + streaming-commons template-haskell text transformers unix + unordered-containers versions wreq yaml + ]; + testHaskellDepends = [ + base hspec hspec-megaparsec megaparsec QuickCheck + ]; + description = "A UNIX configuration management library in Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "craftwerk" = callPackage ({ mkDerivation, base, colour, mtl, vector-space }: mkDerivation { @@ -45642,7 +43838,6 @@ self: { version = "0.1"; sha256 = "a39d24c7e05469883f35d642c393c04a8bca6d03d1bd41905fd5a981ddb00200"; libraryHaskellDepends = [ base colour mtl vector-space ]; - jailbreak = true; homepage = "http://mahrz.github.com/craftwerk.html"; description = "2D graphics library with integrated TikZ output"; license = stdenv.lib.licenses.mit; @@ -45656,7 +43851,6 @@ self: { version = "0.1"; sha256 = "9f54fb8a2c38242f449649fc7912d9e0719fef76a736ea0a3a33912de841369a"; libraryHaskellDepends = [ base cairo craftwerk mtl ]; - jailbreak = true; homepage = "http://mahrz.github.com/craftwerk.html"; description = "Cairo backend for Craftwerk"; license = stdenv.lib.licenses.mit; @@ -45674,7 +43868,6 @@ self: { libraryHaskellDepends = [ base cairo containers craftwerk craftwerk-cairo gtk mtl ]; - jailbreak = true; homepage = "http://mahrz.github.com/craftwerk.html"; description = "Gtk UI for Craftwerk"; license = stdenv.lib.licenses.mit; @@ -45692,9 +43885,9 @@ self: { libraryHaskellDepends = [ base bytestring directory HTTP network-uri split tagsoup time ]; - jailbreak = true; description = "Simulation user crawl paths"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "craze" = callPackage @@ -45792,7 +43985,6 @@ self: { MonadRandom mtl QuickCheck temporary test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/mhwombat/creatur"; description = "Framework for artificial life experiments"; license = stdenv.lib.licenses.bsd3; @@ -45862,7 +44054,6 @@ self: { array base binary containers data-lens logfloat monad-codec parallel random sgd vector vector-binary vector-th-unbox ]; - jailbreak = true; homepage = "https://github.com/kawu/crf-chain1"; description = "First-order, linear-chain conditional random fields"; license = stdenv.lib.licenses.bsd3; @@ -45901,7 +44092,6 @@ self: { array base binary comonad-transformers containers data-lens logfloat monad-codec parallel sgd vector vector-binary ]; - jailbreak = true; homepage = "https://github.com/kawu/crf-chain2-generic"; description = "Second-order, generic, constrained, linear conditional random fields"; license = stdenv.lib.licenses.bsd3; @@ -45921,7 +44111,6 @@ self: { array base binary comonad containers data-lens logfloat monad-codec parallel sgd vector vector-binary vector-th-unbox ]; - jailbreak = true; homepage = "https://github.com/kawu/crf-chain2-tiers"; description = "Second-order, tiered, constrained, linear conditional random fields"; license = stdenv.lib.licenses.bsd3; @@ -46004,7 +44193,6 @@ self: { string-conversions system-fileio system-filepath text th-printf transformers transformers-base vector ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/criterion-plus"; description = "Enhancement of the \"criterion\" benchmarking library"; license = stdenv.lib.licenses.mit; @@ -46024,10 +44212,10 @@ self: { executableHaskellDepends = [ aeson base blaze-html blaze-markup bytestring containers filepath ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/criterion-to-html"; description = "Convert criterion output to HTML reports"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crockford" = callPackage @@ -46099,7 +44287,6 @@ self: { attoparsec base cron derive hspec hspec-expectations QuickCheck text time transformers ]; - jailbreak = true; homepage = "http://github.com/michaelxavier/cron"; description = "Cron datatypes and Attoparsec parser"; license = stdenv.lib.licenses.mit; @@ -46134,7 +44321,6 @@ self: { base bytestring directory filelock filepath process SHA text time transformers unix ]; - jailbreak = true; description = "A runghc replacement with transparent caching"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -46242,7 +44428,6 @@ self: { microlens-th modular-arithmetic QuickCheck random random-shuffle text transformers ]; - jailbreak = true; homepage = "https://github.com/fosskers/crypto-classical"; description = "An educational tool for studying classical cryptography schemes"; license = stdenv.lib.licenses.bsd3; @@ -46266,10 +44451,10 @@ self: { base bytestring cereal conduit conduit-extra crypto-api cryptocipher cryptohash-cryptoapi hspec skein transformers ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/crypto-conduit"; description = "Conduit interface for cryptographic operations (from crypto-api)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "crypto-enigma" = callPackage @@ -46284,7 +44469,6 @@ self: { editedCabalFile = "4cc74c0744e15e1149d7419e47232db6f0bf53a56360f35d71665b180c2f2a53"; libraryHaskellDepends = [ base containers MissingH mtl split ]; testHaskellDepends = [ base HUnit QuickCheck ]; - jailbreak = true; homepage = "https://github.com/orome/crypto-enigma-hs"; description = "An Enigma machine simulator with display"; license = stdenv.lib.licenses.bsd3; @@ -46331,7 +44515,6 @@ self: { base byteable bytestring crypto-random tasty tasty-hunit tasty-quickcheck vector ]; - doCheck = false; homepage = "https://github.com/vincenthz/hs-crypto-numbers"; description = "Cryptographic numbers: functions and algorithms"; license = stdenv.lib.licenses.bsd3; @@ -46355,7 +44538,6 @@ self: { crypto-random cryptohash tasty tasty-hunit tasty-kat tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/vincenthz/hs-crypto-pubkey"; description = "Public Key cryptography"; license = stdenv.lib.licenses.bsd3; @@ -46435,10 +44617,25 @@ self: { base bytestring crypto-random extensible-effects securemem transformers ]; - jailbreak = true; homepage = "https://github.com/ibotty/crypto-random-effect"; description = "A random effect using crypto-random"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "crypto-simple" = callPackage + ({ mkDerivation, base, bytestring, cryptonite, hspec, QuickCheck }: + mkDerivation { + pname = "crypto-simple"; + version = "0.1.0.0"; + sha256 = "a90f3e2643bbeee1849581df44e8705c296d590cc8e25e0b6bf5bebc9fe62e6e"; + libraryHaskellDepends = [ base bytestring cryptonite ]; + testHaskellDepends = [ + base bytestring cryptonite hspec QuickCheck + ]; + homepage = "https://github.com/Risto-Stevcev/haskell-crypto-simple#readme"; + description = "A simple high level encryption interface based on cryptonite"; + license = stdenv.lib.licenses.mit; }) {}; "crypto-totp" = callPackage @@ -46580,41 +44777,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptol_2_3_0" = callPackage - ({ mkDerivation, alex, ansi-terminal, array, async, base - , base-compat, bytestring, containers, deepseq, deepseq-generics - , directory, filepath, generic-trie, gitrev, GraphSCC, happy - , haskeline, heredoc, monad-control, monadLib, old-time, presburger - , pretty, process, QuickCheck, random, sbv, simple-smt, smtLib, syb - , template-haskell, text, tf-random, transformers - , transformers-base, utf8-string - }: - mkDerivation { - pname = "cryptol"; - version = "2.3.0"; - sha256 = "403577bb14a3ebb5683b2221d9b424ff53b8e8faddb64b27f47a6b00414138ce"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base base-compat bytestring containers deepseq - deepseq-generics directory filepath generic-trie gitrev GraphSCC - heredoc monad-control monadLib old-time presburger pretty process - QuickCheck random sbv simple-smt smtLib syb template-haskell text - tf-random transformers transformers-base utf8-string - ]; - libraryToolDepends = [ alex happy ]; - executableHaskellDepends = [ - ansi-terminal base base-compat containers deepseq directory - filepath haskeline monad-control monadLib process random sbv - tf-random transformers - ]; - jailbreak = true; - homepage = "http://www.cryptol.net/"; - description = "Cryptol: The Language of Cryptography"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cryptol" = callPackage ({ mkDerivation, alex, ansi-terminal, array, async, base , base-compat, bytestring, containers, deepseq, directory, filepath @@ -46647,28 +44809,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "cryptonite_0_15" = callPackage - ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim - , integer-gmp, memory, tasty, tasty-hunit, tasty-kat - , tasty-quickcheck - }: - mkDerivation { - pname = "cryptonite"; - version = "0.15"; - sha256 = "aed8fac2bbb87705e1836a27179f85169c559b95d39199aad974d795917ac403"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-prim integer-gmp memory - ]; - testHaskellDepends = [ - base byteable bytestring memory tasty tasty-hunit tasty-kat - tasty-quickcheck - ]; - homepage = "https://github.com/haskell-crypto/cryptonite"; - description = "Cryptography Primitives sink"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "cryptonite" = callPackage ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim , integer-gmp, memory, tasty, tasty-hunit, tasty-kat @@ -46690,6 +44830,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cryptonite_0_20" = callPackage + ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim + , integer-gmp, memory, tasty, tasty-hunit, tasty-kat + , tasty-quickcheck + }: + mkDerivation { + pname = "cryptonite"; + version = "0.20"; + sha256 = "261bfac4e032f24658a31d8c34abd0c0f64f9de07be69ad43a9139a7c0b5c354"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim integer-gmp memory + ]; + testHaskellDepends = [ + base byteable bytestring memory tasty tasty-hunit tasty-kat + tasty-quickcheck + ]; + homepage = "https://github.com/haskell-crypto/cryptonite"; + description = "Cryptography Primitives sink"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cryptonite-conduit" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra , cryptonite, resourcet, transformers @@ -46713,8 +44875,8 @@ self: { }: mkDerivation { pname = "cryptonite-openssl"; - version = "0.1"; - sha256 = "0a06b7903b069d17203f4d485033bcc7334c4cbdb478b43cbd321083de133964"; + version = "0.2"; + sha256 = "bbf6787c33edb287359fc48802512ab2d5c95b02bd6c1a759d7f9bc157703fcb"; libraryHaskellDepends = [ base bytestring memory ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ @@ -46742,7 +44904,6 @@ self: { old-locale pipes-attoparsec pipes-http text time transformers unordered-containers vector ]; - jailbreak = true; description = "Bindings for Cryptsy cryptocurrency exchange API"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -46936,20 +45097,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "css-text_0_1_2_1" = callPackage - ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: - mkDerivation { - pname = "css-text"; - version = "0.1.2.1"; - sha256 = "dc0291da7ec756e4dda9dfadef303c78750eca63d07a5ad21dc4a3079cb021f6"; - libraryHaskellDepends = [ attoparsec base text ]; - testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; - homepage = "http://www.yesodweb.com/"; - description = "CSS parser and renderer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "css-text" = callPackage ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }: mkDerivation { @@ -46958,7 +45105,6 @@ self: { sha256 = "dff564ac08587950dab4fedf07c357d9907099f60c87bf465d648a8965e61987"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec QuickCheck text ]; - doCheck = false; homepage = "http://www.yesodweb.com/"; description = "CSS parser and renderer"; license = stdenv.lib.licenses.mit; @@ -46996,7 +45142,6 @@ self: { base bytestring containers directory HUnit mtl primitive test-framework test-framework-hunit text transformers vector ]; - jailbreak = true; homepage = "http://github.com/ozataman/csv-conduit"; description = "A flexible, fast, conduit-based CSV parser library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -47090,7 +45235,6 @@ self: { version = "0.27.0.0"; sha256 = "f580a4810dc5cad1525886831444e7540975700b2d6ff99e140673fa0978196b"; libraryHaskellDepends = [ array base ]; - jailbreak = true; description = "packaging of Manuel Chakravarty's CTK Light for Hackage"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47106,7 +45250,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ array base chatty-text chatty-utils ]; executableHaskellDepends = [ array base chatty-text chatty-utils ]; - jailbreak = true; homepage = "http://doomanddarkness.eu/pub/ctpl"; description = "A programming language for text modification"; license = stdenv.lib.licenses.gpl3; @@ -47208,7 +45351,6 @@ self: { ]; librarySystemDepends = [ cublas cusparse ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; homepage = "https://github.com/bmsherman/cublas"; description = "FFI bindings to the CUDA CUBLAS and CUSPARSE libraries"; license = stdenv.lib.licenses.bsd3; @@ -47230,16 +45372,18 @@ self: { }) {}; "cuda" = callPackage - ({ mkDerivation, base, bytestring, c2hs, pretty, template-haskell + ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath + , pretty, template-haskell }: mkDerivation { pname = "cuda"; - version = "0.7.0.0"; - sha256 = "b51b6da7f1aad9c1c2abacb6c45cc5efbd7fc7ddb4c1245de12bf7b0b0777ba6"; + version = "0.7.5.0"; + sha256 = "125ce9d7d8e782272ed0a00b0a15ee2273477c4a9f1aa34e86220f2ab4573e6b"; revision = "1"; - editedCabalFile = "1ff19bb4645ce9ba77b84189c8b6e44fb635d1c8b3a5c7560c8633ee2005f37e"; + editedCabalFile = "9abe02e16497b7969918e53356b456f650ca1d11927fc9f37980c2da9141dee1"; isLibrary = true; isExecutable = true; + setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base bytestring template-haskell ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base pretty ]; @@ -47259,7 +45403,6 @@ self: { libraryHaskellDepends = [ array base mtl transformers ]; librarySystemDepends = [ cudd dddmp epd mtr st util ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; homepage = "https://github.com/adamwalker/haskell_cudd"; description = "Bindings to the CUDD binary decision diagrams library"; license = stdenv.lib.licenses.bsd3; @@ -47346,10 +45489,10 @@ self: { libraryHaskellDepends = [ aeson base http-conduit text unordered-containers ]; - jailbreak = true; homepage = "http://tuomas56.github.io/currency-convert"; description = "Typesafe currency conversion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "current-locale" = callPackage @@ -47401,6 +45544,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "curryrs" = callPackage + ({ mkDerivation, base, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "curryrs"; + version = "0.1.0.0"; + sha256 = "428b80a547271ac00a78a78c457ff827085514e80ff89286d83bb3d4cf3aae42"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base tasty tasty-hunit ]; + homepage = "https://github.com/mgattozzi/curryrs#readme"; + description = "Easy to use FFI Bridge for using Rust in Haskell"; + license = "unknown"; + }) {}; + "cursedcsv" = callPackage ({ mkDerivation, base, bytestring, csv-enumerator, enumerator , hscurses, mtl, natural-sort, parseargs, regex-tdfa, safe, unix @@ -47433,10 +45589,10 @@ self: { base bytestring crypto-api DRBG HUnit QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/acw/curve25519"; description = "Fast implementations of the curve25519 elliptic curve primitives"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "curves" = callPackage @@ -47462,7 +45618,6 @@ self: { version = "0.2.2.0"; sha256 = "c67edf7134d4f45d3d6306fcd253d96d84391c21a676a3c18af6cf74e8bc9302"; libraryHaskellDepends = [ base basic-prelude monad-loops ]; - jailbreak = true; homepage = "https://github.com/ajnsit/custom-prelude"; description = "An enhanced prelude, serving as a foundation for my projects"; license = "GPL"; @@ -47515,7 +45670,6 @@ self: { http-conduit http-types resourcet text transformers transformers-base unordered-containers vector ]; - jailbreak = true; description = "Haskell bindings for the neo4j \"cypher\" query language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47581,10 +45735,10 @@ self: { version = "0.1.0.0"; sha256 = "028f9b7933013bdd0ca90fcea6747295307a41ab2136cd6fd8d125ad9fdb3d73"; libraryHaskellDepends = [ base mtl random text ]; - jailbreak = true; homepage = "https://github.com/nebuta/d3js-haskell"; description = "Declarative visualization on a web browser with DSL approach"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "daemonize-doublefork" = callPackage @@ -47729,58 +45883,12 @@ self: { base containers explicit-exception multiarg old-locale parsec prednote rainbow text time transformers ]; - jailbreak = true; homepage = "http://massysett.github.com/dapi"; description = "Prints a series of dates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "darcs_2_12_0" = callPackage - ({ mkDerivation, array, async, attoparsec, base, base16-bytestring - , binary, bytestring, cmdargs, containers, cryptohash, curl - , data-ordlist, directory, fgl, filepath, FindBin, graphviz - , hashable, haskeline, html, HTTP, HUnit, mmap, mtl, network - , network-uri, old-time, parsec, process, QuickCheck, random - , regex-applicative, regex-compat-tdfa, sandi, shelly, split, tar - , terminfo, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, transformers - , transformers-compat, unix, unix-compat, utf8-string, vector - , zip-archive, zlib - }: - mkDerivation { - pname = "darcs"; - version = "2.12.0"; - sha256 = "17318d1b49ca4b1aa00a4bffc2ab30a448e7440ce1945eed9bf382d77582308d"; - configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async attoparsec base base16-bytestring binary bytestring - containers cryptohash data-ordlist directory fgl filepath graphviz - hashable haskeline html HTTP mmap mtl network network-uri old-time - parsec process random regex-applicative regex-compat-tdfa sandi tar - terminfo text time transformers transformers-compat unix - unix-compat utf8-string vector zip-archive zlib - ]; - librarySystemDepends = [ curl ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - array base bytestring cmdargs containers directory filepath FindBin - HUnit mtl QuickCheck shelly split test-framework - test-framework-hunit test-framework-quickcheck2 text zip-archive - ]; - doCheck = false; - postInstall = '' - mkdir -p $out/etc/bash_completion.d - mv contrib/darcs_completion $out/etc/bash_completion.d/darcs - ''; - homepage = "http://darcs.net/"; - description = "a distributed, interactive, smart revision control system"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) curl;}; - "darcs" = callPackage ({ mkDerivation, array, async, attoparsec, base, base16-bytestring , binary, bytestring, cmdargs, containers, cryptohash, curl @@ -47795,8 +45903,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.12.2"; - sha256 = "20b2eb292854c89036bae74330e71f1f3b253a369610916ddcc44f0d49f38bdd"; + version = "2.12.4"; + sha256 = "48e836a482bd2fcfe0be499fe4f255925ce50bdcf5ce8023bb9aa359288fdc49"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -47843,7 +45951,6 @@ self: { SHA split statistics strict tabular tar time utf8-string uvector zlib ]; - jailbreak = true; homepage = "http://wiki.darcs.net/Development/Benchmarks"; description = "Comparative benchmark suite for darcs"; license = stdenv.lib.licenses.bsd3; @@ -47940,7 +46047,6 @@ self: { attoparsec base bytestring cmdlib containers darcs datetime directory filepath hashed-storage mtl old-time utf8-string ]; - jailbreak = true; description = "Import/export git fast-import streams to/from darcs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47960,7 +46066,6 @@ self: { base bytestring containers directory old-locale old-time process time ]; - jailbreak = true; description = "Generate graphs of darcs repository activity"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47978,7 +46083,6 @@ self: { executableHaskellDepends = [ base containers directory HaXml mtl process ]; - jailbreak = true; homepage = "http://wiki.darcs.net/RelatedSoftware/DarcsMonitor"; description = "Darcs repository monitor (sends email)"; license = "GPL"; @@ -48010,7 +46114,6 @@ self: { executableHaskellDepends = [ base containers darcs graph-wrapper string-conversions ]; - jailbreak = true; description = "Outputs dependencies of darcs patches in dot format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -48039,7 +46142,6 @@ self: { pureMD5 random redis safe SHA snap-core snap-server split ssh system-uuid text time utf8-string webdriver xhtml xml ]; - jailbreak = true; homepage = "http://hackage.haskell.org/package/darcsden"; description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch)."; license = "GPL"; @@ -48089,7 +46191,6 @@ self: { executableHaskellDepends = [ base bytestring darkplaces-text directory mtl optparse-applicative ]; - jailbreak = true; homepage = "https://github.com/bacher09/darkplaces-demo"; description = "Utility and parser for DarkPlaces demo files"; license = stdenv.lib.licenses.gpl2; @@ -48108,10 +46209,10 @@ self: { base byteable bytestring cryptohash network time ]; testHaskellDepends = [ base bytestring hspec hspec-core ]; - jailbreak = true; homepage = "https://github.com/bacher09/darkplaces-rcon"; description = "Darkplaces rcon client library"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "darkplaces-rcon-util" = callPackage @@ -48139,10 +46240,10 @@ self: { base bytestring darkplaces-rcon darkplaces-text hspec hspec-core text ]; - jailbreak = true; homepage = "https://github.com/bacher09/darkplaces-rcon"; description = "Darplaces rcon utility"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "darkplaces-text" = callPackage @@ -48179,7 +46280,6 @@ self: { haddock-api optparse-applicative parsec pipes sqlite-simple tagsoup text transformers ]; - jailbreak = true; homepage = "http://www.github.com/jfeltz/dash-haskell"; description = "Convert package Haddock to Dash docsets (IDE docs)"; license = stdenv.lib.licenses.lgpl3; @@ -48205,9 +46305,9 @@ self: { version = "0.0.1"; sha256 = "1185f90348212ae07cb77a0f5a5e90f8366d0107d3607ab467c4674972e53e50"; libraryHaskellDepends = [ base data-accessor monadLib ]; - jailbreak = true; description = "Accessor functions for monadLib's monads"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-accessor-monads-fd" = callPackage @@ -48219,10 +46319,10 @@ self: { libraryHaskellDepends = [ base data-accessor monads-fd transformers ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Use Accessor to access state in monads-fd State monad class"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-accessor-monads-tf" = callPackage @@ -48234,10 +46334,10 @@ self: { libraryHaskellDepends = [ base data-accessor monads-tf transformers ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Record_access"; description = "Use Accessor to access state in monads-tf State monad type family"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-accessor-mtl" = callPackage @@ -48298,10 +46398,10 @@ self: { version = "1.1"; sha256 = "1d85ee03627495104cd73e8f4fc2459f3ff2e873a46cbd0db9708c6168ae25d1"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/wdanilo/data-base"; description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-binary-ieee754" = callPackage @@ -48409,9 +46509,9 @@ self: { version = "0.3.0.0"; sha256 = "bb4e206a60521ec22dc9420c5ae96c282a1906399edcbed1a96abf5bf025b666"; libraryHaskellDepends = [ base stm ]; - jailbreak = true; description = "A Library for directional queues"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-construction" = callPackage @@ -48421,10 +46521,10 @@ self: { version = "1.1"; sha256 = "e8e55864def9f07c65137535d4494b694203e724e450494f89b502751d92b341"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/wdanilo/data-construction"; description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-cycle" = callPackage @@ -48442,25 +46542,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "data-default_0_5_3" = callPackage - ({ mkDerivation, base, data-default-class - , data-default-instances-base, data-default-instances-containers - , data-default-instances-dlist, data-default-instances-old-locale - }: - mkDerivation { - pname = "data-default"; - version = "0.5.3"; - sha256 = "ec5470f41bf6dc60d65953fc8788823ffff85fd59564a8bf9ea3c69928a83034"; - libraryHaskellDepends = [ - base data-default-class data-default-instances-base - data-default-instances-containers data-default-instances-dlist - data-default-instances-old-locale - ]; - description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default" = callPackage ({ mkDerivation, base, data-default-class , data-default-instances-containers, data-default-instances-dlist @@ -48478,18 +46559,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-default-class_0_0_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "data-default-class"; - version = "0.0.1"; - sha256 = "adc8ee80a6f0e5903339a2b8685220b32bc3e23856d3c12186cc464ae5c88f31"; - libraryHaskellDepends = [ base ]; - description = "A class for types with a default value"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default-class" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -48524,10 +46593,10 @@ self: { data-default-instances-unordered-containers data-default-instances-vector ]; - jailbreak = true; homepage = "https://github.com/trskop/data-default-extra"; description = "A class for types with a default value"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-generics" = callPackage @@ -48551,18 +46620,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "data-default-instances-base_0_1_0" = callPackage - ({ mkDerivation, base, data-default-class }: - mkDerivation { - pname = "data-default-instances-base"; - version = "0.1.0"; - sha256 = "9e00bc5dc8da3c53a2cb26c3c55d1ffea8272538aec678f65b7c238da09c4636"; - libraryHaskellDepends = [ base data-default-class ]; - description = "Default instances for types in base"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "data-default-instances-base" = callPackage ({ mkDerivation, base, data-default-class }: mkDerivation { @@ -48581,10 +46638,10 @@ self: { version = "0.0.1"; sha256 = "4c431278d0dc1054fd531281db70d8615f88d9b2a29924aba2567fb3cf647220"; libraryHaskellDepends = [ base bytestring data-default-class ]; - jailbreak = true; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-case-insensitive" = callPackage @@ -48594,10 +46651,10 @@ self: { version = "0.0.1"; sha256 = "430135708ad9d0730a4c3a3d1eb574bdc6f07547a5a9c5f30202e1e786070ab4"; libraryHaskellDepends = [ case-insensitive data-default-class ]; - jailbreak = true; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instance for CI type from case-insensitive package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-containers" = callPackage @@ -48633,10 +46690,10 @@ self: { libraryHaskellDepends = [ base data-default-class data-default-instances-base ]; - jailbreak = true; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for types in newer versions of base package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-old-locale" = callPackage @@ -48657,10 +46714,10 @@ self: { version = "0.0.1"; sha256 = "db5d4c46cf36ce5956ffd0affe0f2c48e1c000b9bd61821d3e6c1b0171060cdf"; libraryHaskellDepends = [ base data-default-class text ]; - jailbreak = true; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for (lazy and strict) Text and Text Builder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-unordered-containers" = callPackage @@ -48672,10 +46729,10 @@ self: { libraryHaskellDepends = [ data-default-class unordered-containers ]; - jailbreak = true; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for unordered-containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-default-instances-vector" = callPackage @@ -48685,10 +46742,10 @@ self: { version = "0.0.1"; sha256 = "9ac84473a3af8b0c5e795ea5f84a34a0c18c3b2d5e17ce428206203f9d794666"; libraryHaskellDepends = [ data-default-class vector ]; - jailbreak = true; homepage = "https://github.com/trskop/data-default-extra"; description = "Default instances for types defined in vector package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-dispersal" = callPackage @@ -48745,7 +46802,6 @@ self: { base containers directory errors haskell-src-exts hlint hspec HUnit QuickCheck safe text transformers unix ]; - jailbreak = true; homepage = "https://github.com/jcristovao/data-easy"; description = "Consistent set of utility functions for Maybe, Either, List and Monoids"; license = stdenv.lib.licenses.bsd3; @@ -48784,10 +46840,10 @@ self: { base bytestring cereal containers directory executable-path hashable utf8-string ]; - jailbreak = true; homepage = "https://github.com/valderman/data-embed"; description = "Embed files and other binary blobs inside executables without Template Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-endian" = callPackage @@ -48839,10 +46895,10 @@ self: { libraryHaskellDepends = [ base bifunctors ghc-prim semigroups split template-haskell ]; - jailbreak = true; homepage = "https://github.com/maxpow4h/data-filepath"; description = "A type safe file path data structure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-files-gen" = callPackage @@ -48877,7 +46933,6 @@ self: { base lazysmallcheck prelude-safeenum QuickCheck reflection smallcheck tagged ]; - jailbreak = true; homepage = "http://code.haskell.org/~wren/"; description = "Finite totally ordered sets"; license = stdenv.lib.licenses.bsd3; @@ -48892,10 +46947,10 @@ self: { sha256 = "e6e6e7c30c69cfe5ec67f0763c880d28e37d05c336e9b5c76c53e549c71a129f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "https://github.com/seagull-kamome/data-fin-simple"; description = "Simple integral finite set"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fix" = callPackage @@ -48941,9 +46996,9 @@ self: { version = "1.0.0.0"; sha256 = "82aba0f5410728a2fdfe2888960f218453b42f4f73eb018493536fb158fefb79"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "An efficient data type for sets of flags"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fresh" = callPackage @@ -49069,10 +47124,10 @@ self: { libraryHaskellDepends = [ base containers data-fix IfElse mtl transformers ]; - jailbreak = true; homepage = "https://github.com/kwf/data-kiln"; description = "Sculpt mutable recursive data with reference equality; bake it using a data kiln into an immutable lazy structure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-layer" = callPackage @@ -49082,7 +47137,6 @@ self: { version = "1.0.4"; sha256 = "3c11be8dc0da7f4cb080023e2d0ae9f58ad202e193c6f1aea015b7b7873a936d"; libraryHaskellDepends = [ base convert data-construction lens ]; - jailbreak = true; homepage = "https://github.com/wdanilo/layer"; description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead."; license = stdenv.lib.licenses.asl20; @@ -49139,7 +47193,6 @@ self: { sha256 = "a1186fa7823dab18ec0c6c8593e2dae10f791db007d41095f32af07399933f3b"; libraryHaskellDepends = [ base data-lens ixset ]; testHaskellDepends = [ QuickCheck ]; - jailbreak = true; homepage = "https://github.com/dag/data-lens-ixset"; description = "A Lens for IxSet"; license = stdenv.lib.licenses.bsd3; @@ -49189,10 +47242,10 @@ self: { version = "0.0.1.2"; sha256 = "6ed634f52207a9add10882ab03f17abfea5d91e310a0ec3f54197163bf980412"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "http://github.com/jhickner/data-map-multikey"; description = "Data.Map with multiple, unique keys"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-memocombinators" = callPackage @@ -49209,17 +47262,20 @@ self: { "data-msgpack" = callPackage ({ mkDerivation, base, binary, bytestring, containers - , data-binary-ieee754, deepseq, hashable, hspec, QuickCheck, text - , unordered-containers + , data-binary-ieee754, deepseq, groom, hashable, hspec, QuickCheck + , text, unordered-containers }: mkDerivation { pname = "data-msgpack"; - version = "0.0.2"; - sha256 = "59c591a565e0429f6de70d1d8e14c7588547bdff443f0769835f4a534e0690ee"; + version = "0.0.4"; + sha256 = "77e894dd366c77352cc52787546ff0419831b312f4b6b86e864e2e2e5b1e33af"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base binary bytestring containers data-binary-ieee754 deepseq hashable QuickCheck text unordered-containers ]; + executableHaskellDepends = [ base bytestring groom ]; testHaskellDepends = [ base bytestring containers hashable hspec QuickCheck text unordered-containers @@ -49249,7 +47305,6 @@ self: { version = "0.1.2"; sha256 = "1540be01a754638b1f45d2d386e9ec68fc7dad83da83a67c34c7ff0e209bfdfb"; libraryHaskellDepends = [ base semigroups ]; - jailbreak = true; homepage = "http://github.com/glehel/data-nat"; description = "data Nat = Zero | Succ Nat"; license = stdenv.lib.licenses.bsd3; @@ -49263,10 +47318,10 @@ self: { version = "0.3.1.9"; sha256 = "14250ab80e6a1c235efcda2ad8c61194dfdee9dec1a31c3c844656c4e710157d"; libraryHaskellDepends = [ base bytestring failure text time ]; - jailbreak = true; homepage = "http://github.com/snoyberg/data-object/tree/master"; description = "Represent hierachichal structures, called objects in JSON. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-object-json" = callPackage @@ -49281,7 +47336,6 @@ self: { base bytestring bytestring-trie convertible-text data-object failure JSONb text ]; - jailbreak = true; homepage = "http://github.com/snoyberg/data-object-json/tree/master"; description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -49300,7 +47354,6 @@ self: { base bytestring conduit containers convertible-text data-object failure text transformers yaml ]; - jailbreak = true; homepage = "http://github.com/snoyberg/data-object-yaml"; description = "Serialize data to and from Yaml files (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -49349,9 +47402,9 @@ self: { version = "0.2.4.1"; sha256 = "0c06aae83e1e41883927fbaa008964acd7d6b005a0f7e44c95fa5062943e0f83"; libraryHaskellDepends = [ base deepseq mtl parallel pretty time ]; - jailbreak = true; description = "Prettyprint and compare Data values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-quotientref" = callPackage @@ -49429,10 +47482,10 @@ self: { version = "1.0"; sha256 = "4939d7b8a7debb9a98cad8f468e07dcc7cd6424fdfd51dc4da74a35ff6536492"; libraryHaskellDepends = [ base generic-deriving lens ]; - jailbreak = true; homepage = "https://github.com/wdanilo/data-repr"; description = "Alternative to Show data printing utility"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-result" = callPackage @@ -49442,7 +47495,6 @@ self: { version = "1.0"; sha256 = "b266c0184e55ed2fe7af03cf837a2666c6c3265b5de9d5f7416926f981bf0605"; libraryHaskellDepends = [ base poly-control prologue ]; - jailbreak = true; homepage = "https://github.com/wdanilo/data-result"; description = "Data types for returning results distinguishable by types"; license = stdenv.lib.licenses.asl20; @@ -49456,10 +47508,10 @@ self: { version = "0.1.0.1"; sha256 = "81ce8fb0d8bf1172f3869e67b5911b358bef10880011be1935d130bdf7b8788d"; libraryHaskellDepends = [ base bytestring containers text vector ]; - jailbreak = true; homepage = "https://github.com/jxv/data-rev"; description = "A typeclass for reversing order of contents"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-rope" = callPackage @@ -49481,7 +47533,6 @@ self: { version = "1.0"; sha256 = "4e2824b8d23d5eafce4c5f86a90fb58d97f461b45a287006f37cf8f2bd09fb05"; libraryHaskellDepends = [ base lens typelevel ]; - jailbreak = true; homepage = "https://github.com/wdanilo/rtuple"; description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes."; license = stdenv.lib.licenses.asl20; @@ -49527,10 +47578,10 @@ self: { version = "20090215.0"; sha256 = "330fdfbcfcf5fb8211a8bf7e8bfafb14c8f4efb535c1edc464df2eb9a227df40"; libraryHaskellDepends = [ base vector-space ]; - jailbreak = true; homepage = "http://code.haskell.org/data-spacepart"; description = "Deprecated. Now called \"spacepart\". Space partitioning data structures."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-store" = callPackage @@ -49549,7 +47600,6 @@ self: { base cereal containers deepseq lens QuickCheck safecopy test-framework test-framework-quickcheck2 transformers vector ]; - jailbreak = true; homepage = "https://github.com/Palmik/data-store"; description = "Type safe, in-memory dictionary with multidimensional keys"; license = stdenv.lib.licenses.bsd3; @@ -49745,10 +47795,10 @@ self: { version = "0.0.1"; sha256 = "a73d412476ae3a21f78051df671262b105f62a00c7b2947070a89c6b883a17ab"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "http://dbs.informatik.uni-halle.de/Lehre/LP09/"; description = "Demonstrate how a database can be implemented the functional way"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "datadog" = callPackage @@ -49764,7 +47814,6 @@ self: { aeson auto-update base buffer-builder bytestring lens lifted-base monad-control network old-locale text time transformers-base ]; - jailbreak = true; homepage = "https://github.com/iand675/datadog"; description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming."; license = stdenv.lib.licenses.mit; @@ -49778,10 +47827,10 @@ self: { version = "0.14.0.7"; sha256 = "f9d370a1ac1b9cd3c66abd13ad351270d020a21fcd774f49dae6cfa9f8a98ff3"; libraryHaskellDepends = [ array base containers ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Library/Data_encoding"; description = "Data encoding library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dataflow" = callPackage @@ -49831,7 +47880,6 @@ self: { base containers hashable HUnit test-framework test-framework-hunit text ]; - jailbreak = true; description = "An implementation of datalog in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -49913,10 +47961,10 @@ self: { base HUnit old-locale old-time QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 time ]; - jailbreak = true; homepage = "http://github.com/stackbuilders/datetime"; description = "Utilities to make Data.Time.* easier to use"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "datetime-sb" = callPackage @@ -49933,10 +47981,10 @@ self: { base HUnit old-locale old-time QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 time ]; - jailbreak = true; homepage = "http://github.com/stackbuilders/datetime"; description = "Utilities to make Data.Time.* easier to use."; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dawdle" = callPackage @@ -49949,10 +47997,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base parsec pretty text time ]; executableHaskellDepends = [ base filepath parsec pretty text ]; - jailbreak = true; homepage = "https://github.com/arnons1/dawdle"; description = "Generates DDL suggestions based on a CSV file"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dawg" = callPackage @@ -49971,29 +48019,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dawg-ord_0_5_0_1" = callPackage - ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers - , vector - }: - mkDerivation { - pname = "dawg-ord"; - version = "0.5.0.1"; - sha256 = "febbe3a465f67931bf1a96069680c862b8cd9a423013f85e21204832626a5dee"; - libraryHaskellDepends = [ - base containers mtl transformers vector - ]; - testHaskellDepends = [ - base containers HUnit mtl smallcheck tasty tasty-hunit - tasty-quickcheck tasty-smallcheck - ]; - jailbreak = true; - homepage = "https://github.com/kawu/dawg-ord"; - description = "Directed acyclic word graphs"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dawg-ord" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, smallcheck, tasty , tasty-hunit, tasty-quickcheck, tasty-smallcheck, transformers @@ -50023,9 +48048,9 @@ self: { sha256 = "8c45177c9f36943a7aa332534d7e120b5c1a50f8d628d6d56ef49cd21ca08ad8"; libraryHaskellDepends = [ base postgresql-simple text ]; testHaskellDepends = [ base hspec postgresql-simple text ]; - jailbreak = true; description = "Clean database tables automatically around hspec tests"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbf" = callPackage @@ -50106,7 +48131,6 @@ self: { HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl mysql mysql-simple process split template-haskell text time yaml-light ]; - doCheck = false; description = "An implementation of relational database \"migrations\""; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50148,7 +48172,6 @@ self: { libraryHaskellDepends = [ base containers dbus-core monads-tf text transformers ]; - jailbreak = true; homepage = "http://john-millikin.com/software/haskell-dbus/"; description = "Monadic and object-oriented interfaces to DBus"; license = stdenv.lib.licenses.gpl3; @@ -50168,7 +48191,6 @@ self: { base binary bytestring containers data-binary-ieee754 libxml-sax network parsec text unix vector xml-types ]; - jailbreak = true; homepage = "https://john-millikin.com/software/dbus-core/"; description = "Low-level D-Bus protocol implementation"; license = stdenv.lib.licenses.gpl3; @@ -50187,9 +48209,9 @@ self: { base containers dbus parsec template-haskell ]; testHaskellDepends = [ base containers dbus QuickCheck ]; - jailbreak = true; description = "Quasi-quoter for DBus functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dbus-th" = callPackage @@ -50223,9 +48245,9 @@ self: { executableHaskellDepends = [ base cmdargs containers dbus dbus-th template-haskell ]; - jailbreak = true; description = "Generate bindings for DBus calls by using DBus introspection and dbus-th"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dclabel" = callPackage @@ -50241,7 +48263,6 @@ self: { base bytestring cereal containers QuickCheck quickcheck-instances test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50280,10 +48301,10 @@ self: { libraryHaskellDepends = [ base containers deepseq parsec transformers wl-pprint ]; - jailbreak = true; homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler common utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-build" = callPackage @@ -50361,7 +48382,6 @@ self: { libraryHaskellDepends = [ array base containers ddc-base ddc-core deepseq mtl transformers ]; - jailbreak = true; homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler semantic evaluator for the core language"; license = stdenv.lib.licenses.mit; @@ -50481,10 +48501,10 @@ self: { version = "0.4.1.3"; sha256 = "6e68e8ae8ea7f7ff507d238541536959298068e62985e4305d3df5457fb77a5d"; libraryHaskellDepends = [ base containers ddc-base directory ]; - jailbreak = true; homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler user interface support"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ddc-source-tetra" = callPackage @@ -50541,7 +48561,6 @@ self: { executableHaskellDepends = [ base buildbox containers directory filepath process random stm ]; - jailbreak = true; homepage = "http://disciple.ouroborus.net"; description = "Disciplined Disciple Compiler test driver and buildbot"; license = stdenv.lib.licenses.mit; @@ -50562,7 +48581,6 @@ self: { base containers ddc-base ddc-core ddc-core-eval ddc-core-simpl haskeline haskell-src-exts ]; - jailbreak = true; homepage = "http://disciple.ouroborus.net"; description = "Disciple Core language interactive interpreter"; license = stdenv.lib.licenses.mit; @@ -50622,8 +48640,8 @@ self: { }: mkDerivation { pname = "debian"; - version = "3.89"; - sha256 = "ec0da528635c8438f26f29a60f12c3ff606ec696ab641cf40b56b1d5ec92401c"; + version = "3.91.1"; + sha256 = "0624b718aec8e1d28fdf4d471c1236a66099555ac22858dbe49a7ee00f9b25e6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -50656,26 +48674,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "debian-build_0_9_2_0" = callPackage - ({ mkDerivation, base, Cabal, directory, filepath, process, split - , transformers - }: - mkDerivation { - pname = "debian-build"; - version = "0.9.2.0"; - sha256 = "7d911ef9300a073f8e0db17c3480790a8c6da712ed8141c65098fc7ca99da750"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base Cabal directory filepath process split transformers - ]; - executableHaskellDepends = [ base filepath transformers ]; - homepage = "http://twitter.com/khibino/"; - description = "Debian package build sequence tools"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "debian-build" = callPackage ({ mkDerivation, base, directory, filepath, process, split , transformers @@ -50726,7 +48724,6 @@ self: { version = "0.1.0.0"; sha256 = "7bccd3aa39b5bc4dcfa359bbad9565d75ee4720d5f08596adf30de960513d7ba"; libraryHaskellDepends = [ base comonad-transformers ]; - jailbreak = true; description = "The categorical dual of transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50788,7 +48785,6 @@ self: { version = "0.0.1.1"; sha256 = "8719937a665bd8b59e186419b6a5e3b8c57fb277562fb18f2b68b44e28cbb37c"; libraryHaskellDepends = [ base binary bytestring conduit ]; - jailbreak = true; homepage = "https://github.com/hansonkd/decoder-conduit"; description = "Conduit for decoding ByteStrings using Data.Binary.Get"; license = stdenv.lib.licenses.bsd3; @@ -50812,7 +48808,6 @@ self: { haskell-src-exts-qq hmk mtl parsec process Stream stringtable-atom wl-pprint ]; - jailbreak = true; homepage = "http://www.lix.polytechnique.fr/dedukti"; description = "A type-checker for the λΠ-modulo calculus"; license = "GPL"; @@ -50859,7 +48854,6 @@ self: { accelerate base mtl QuickCheck repa repa-algorithms test-framework test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/ajtulloch/deeplearning-hs"; description = "Deep Learning in Haskell"; license = stdenv.lib.licenses.mit; @@ -50873,7 +48867,6 @@ self: { version = "1.3.0.1"; sha256 = "9792d2aff7c65c1e3a9d720ba7fe109eb6aea50a51477ffafd2b5f9e8d9a1f19"; libraryHaskellDepends = [ array base ]; - jailbreak = true; description = "Deep evaluation of data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -50915,34 +48908,12 @@ self: { base cpphs deepseq deepseq-generics generics-sop ghc-prim HUnit parallel random syb template-haskell ]; - jailbreak = true; homepage = "http://fremissant.net/deepseq-bounded"; description = "Bounded deepseq, including support for generic deriving"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deepseq-generics_0_1_1_2" = callPackage - ({ mkDerivation, base, deepseq, ghc-prim, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "deepseq-generics"; - version = "0.1.1.2"; - sha256 = "839e1d6ead4c45faa4165f0e82aa8a9d1df7a7c1118bfb1787e8268bfa8bfb06"; - revision = "1"; - editedCabalFile = "3f52867fe9267876504d8ce20c77dcfb2ac6613af8c915017859b6022d3cc9fd"; - libraryHaskellDepends = [ base deepseq ghc-prim ]; - testHaskellDepends = [ - base deepseq ghc-prim HUnit test-framework test-framework-hunit - ]; - jailbreak = true; - homepage = "https://github.com/hvr/deepseq-generics"; - description = "GHC.Generics-based Control.DeepSeq.rnf implementation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "deepseq-generics" = callPackage ({ mkDerivation, base, deepseq, ghc-prim, HUnit, test-framework , test-framework-hunit @@ -50980,7 +48951,6 @@ self: { sha256 = "c5a4b8e6173163cdf5cee22e21267507161cb2222bfcff855822dcfc2244938b"; libraryHaskellDepends = [ base deepseq template-haskell ]; testHaskellDepends = [ base deepseq template-haskell ]; - jailbreak = true; description = "Template Haskell based deriver for optimised NFData instances"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -51023,7 +48993,6 @@ self: { array base bytestring containers deepseq ghc-prim GLURaw OpenGL OpenGLRaw primitive vector ]; - jailbreak = true; homepage = "http://coiffier.net/projects/definitive-framework.html"; description = "The base modules of the Definitive framework"; license = "unknown"; @@ -51046,7 +49015,6 @@ self: { definitive-reactive directory filepath old-locale primitive time unix vector ]; - jailbreak = true; homepage = "http://coiffier.net/projects/definitive-framework.html"; description = "A library that enable you to interact with the filesystem in a definitive way"; license = "unknown"; @@ -51071,7 +49039,6 @@ self: { JuicyPixels mtl primitive stb-truetype transformers utf8-string vector zlib ]; - jailbreak = true; homepage = "http://coiffier.net/projects/definitive-framework.html"; description = "A definitive package allowing you to open windows, read image files and render text to be displayed or saved"; license = "unknown"; @@ -51091,7 +49058,6 @@ self: { array base bytestring containers cpu deepseq definitive-base ghc-prim GLURaw OpenGL OpenGLRaw primitive utf8-string vector ]; - jailbreak = true; homepage = "http://coiffier.net/projects/definitive-framework.html"; description = "A parser combinator library for the Definitive framework"; license = "unknown"; @@ -51112,7 +49078,6 @@ self: { array base bytestring clock containers deepseq definitive-base primitive vector ]; - jailbreak = true; homepage = "http://coiffier.net/projects/definitive-framework.html"; description = "A simple Reactive library"; license = "unknown"; @@ -51134,7 +49099,6 @@ self: { alsa-core alsa-pcm array base bytestring clock containers deepseq definitive-base primitive sample-frame storable-record vector ]; - jailbreak = true; homepage = "http://coiffier.net/projects/definitive-framework.html"; description = "A definitive package to handle sound and play it back"; license = "unknown"; @@ -51152,28 +49116,27 @@ self: { libraryHaskellDepends = [ array base containers exceptions mtl parsec text transformers ]; - jailbreak = true; homepage = "http://github.com/YoEight/deiko-config"; description = "Small and typesafe configuration library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dejafu" = callPackage - ({ mkDerivation, array, atomic-primops, base, containers, deepseq - , dpor, exceptions, monad-control, monad-loops, mtl, semigroups - , stm, template-haskell, transformers, transformers-base + ({ mkDerivation, base, concurrency, containers, deepseq, dpor + , exceptions, monad-loops, mtl, ref-fd, semigroups, transformers + , transformers-base }: mkDerivation { pname = "dejafu"; - version = "0.3.2.1"; - sha256 = "cf3ed66e7b3cf9b45f42227d45cc6136f36b1a06744de1fba2b3aebe84d0777f"; + version = "0.4.0.0"; + sha256 = "876c92c590cce573cb600a1bb575b42ed2c2fb332c59803c5f0667a675df80d4"; libraryHaskellDepends = [ - array atomic-primops base containers deepseq dpor exceptions - monad-control monad-loops mtl semigroups stm template-haskell - transformers transformers-base + base concurrency containers deepseq dpor exceptions monad-loops mtl + ref-fd semigroups transformers transformers-base ]; homepage = "https://github.com/barrucadu/dejafu"; - description = "Overloadable primitives for testable, potentially non-deterministic, concurrency"; + description = "Systematic testing for Haskell concurrency"; license = stdenv.lib.licenses.mit; }) {}; @@ -51185,7 +49148,6 @@ self: { sha256 = "44baa0f9c38fb3d606904873334aa3ab3721c73e48756fe916e7490e765943d0"; libraryHaskellDepends = [ base bytestring parsec transformers ]; librarySystemDepends = [ mpdec ]; - jailbreak = true; homepage = "https://github.com/massysett/deka"; description = "Decimal floating point arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -51208,7 +49170,6 @@ self: { transformers ]; testHaskellDepends = [ base bytestring deka QuickCheck quickpull ]; - jailbreak = true; homepage = "https://github.com/massysett/deka"; description = "Tests for deka, decimal floating point arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -51311,7 +49272,6 @@ self: { base directory optparse-applicative process sodium ]; testHaskellDepends = [ base directory filepath hspec ]; - jailbreak = true; homepage = "https://github.com/kryoxide/delta"; description = "A library for detecting file changes"; license = stdenv.lib.licenses.lgpl3; @@ -51375,7 +49335,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; executableHaskellDepends = [ base directory filepath ]; - jailbreak = true; homepage = "http://protempore.net/denominate/"; description = "Functions supporting bulk file and directory name normalization"; license = stdenv.lib.licenses.bsd3; @@ -51406,19 +49365,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dependent-map_0_2_2_0" = callPackage - ({ mkDerivation, base, containers, dependent-sum }: - mkDerivation { - pname = "dependent-map"; - version = "0.2.2.0"; - sha256 = "f4d79312f2a584de265339f5a2ca0bfbd1d6383fb24560ca9148f7559727871f"; - libraryHaskellDepends = [ base containers dependent-sum ]; - homepage = "https://github.com/mokus0/dependent-map"; - description = "Dependent finite maps (partial dependent products)"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dependent-map" = callPackage ({ mkDerivation, base, containers, dependent-sum }: mkDerivation { @@ -51438,7 +49384,6 @@ self: { version = "1.0.1"; sha256 = "093aa20845a345c1d44e3d0258eadd6f8c38e3596cd6486be64879d0b60e7467"; libraryHaskellDepends = [ base lens mtl prologue ]; - jailbreak = true; homepage = "https://github.com/wdanilo/dependent-state"; description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types."; license = stdenv.lib.licenses.asl20; @@ -51574,7 +49519,6 @@ self: { libraryHaskellDepends = [ applicative-extras base labeled-tree mtl ]; - jailbreak = true; description = "Typeset Derivation Trees via MetaPost"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -51608,7 +49552,6 @@ self: { version = "0.1.1"; sha256 = "99bf95f72fdb5a3f6777432ac9e3d408ed24ba1718ed723eeb6fadb1a490ef2d"; libraryHaskellDepends = [ base instant-generics template-haskell ]; - jailbreak = true; homepage = "http://github.com/konn/derive-IG"; description = "Macro to derive instances for Instant-Generics using Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -51622,10 +49565,10 @@ self: { version = "0.1.1.0"; sha256 = "5777fdf3313a2a2c39d03690069c12f5554bf6c941097fa0cd1956d693f5f023"; libraryHaskellDepends = [ base data-default ]; - jailbreak = true; homepage = "https://github.com/mgoszcz2/derive-enumerable"; description = "Generic instances for enumerating complex data types"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "derive-gadt" = callPackage @@ -51645,7 +49588,6 @@ self: { executableHaskellDepends = [ base haskell-src-exts haskell-src-meta template-haskell ]; - jailbreak = true; description = "Instance deriving for (a subset of) GADTs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -51662,13 +49604,39 @@ self: { libraryHaskellDepends = [ base semigroups template-haskell ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base semigroups ]; - jailbreak = true; homepage = "https://github.com/sboosali/derive-monoid#readme"; description = "derive Semigroup/Monoid/IsList"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "derive-storable" = callPackage + ({ mkDerivation, base, hspec, QuickCheck }: + mkDerivation { + pname = "derive-storable"; + version = "0.1.0.3"; + sha256 = "64e1101e32e58421efc4eeaef4e1da4449b52e525793d6cde3da892c6662729e"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://www.github.com/mkloczko/derive-storable/"; + description = "Derive Storable instances with help of GHC.Generics."; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "derive-storable-plugin" = callPackage + ({ mkDerivation, base, derive-storable, ghc, ghci }: + mkDerivation { + pname = "derive-storable-plugin"; + version = "0.1.0.2"; + sha256 = "d9b080fb359169b2edd8e32cef46681666204673bd460e24dcd6bfb13ec8abcd"; + libraryHaskellDepends = [ base derive-storable ghc ghci ]; + homepage = "https://www.github.com/mkloczko/derive-storable-plugin/"; + description = "GHC core plugin supporting the derive-storable package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "derive-topdown" = callPackage ({ mkDerivation, base, derive, mtl, template-haskell , template-haskell-util @@ -51693,36 +49661,12 @@ self: { version = "0.2.1"; sha256 = "ccca249c26c02501cc1566b9b95fa697ec5146a9ce499ada8a5fe5022b3a8385"; libraryHaskellDepends = [ array base containers template-haskell ]; - jailbreak = true; homepage = "http://github.com/baldo/derive-trie"; description = "Automatic derivation of Trie implementations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "deriving-compat_0_2" = callPackage - ({ mkDerivation, base, base-compat, base-orphans, containers - , ghc-prim, hspec, QuickCheck, template-haskell, transformers - , transformers-compat - }: - mkDerivation { - pname = "deriving-compat"; - version = "0.2"; - sha256 = "763bb09a78ad4ffa00b30a3655bd01a7f2b816ebec8571c7cf059d481998b42a"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - testHaskellDepends = [ - base base-compat base-orphans hspec QuickCheck transformers - transformers-compat - ]; - jailbreak = true; - homepage = "https://github.com/haskell-compat/deriving-compat"; - description = "Backports of GHC deriving extensions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "deriving-compat" = callPackage ({ mkDerivation, base, base-compat, base-orphans, containers , ghc-boot-th, ghc-prim, hspec, QuickCheck, template-haskell @@ -51730,8 +49674,8 @@ self: { }: mkDerivation { pname = "deriving-compat"; - version = "0.3.2"; - sha256 = "2a89646d707202e6010155bc224aa3791032e05d433fa8629fc7dfccaf3d5888"; + version = "0.3.3"; + sha256 = "b977e5f819c84443a355521579712a0cf138d5102d383e823381576a87898c21"; libraryHaskellDepends = [ base containers ghc-boot-th ghc-prim template-haskell transformers transformers-compat @@ -51840,10 +49784,10 @@ self: { sha256 = "3adffba07d4fdca79909331ec0029e09cf7895cadada5613f3e359d777c8bcc1"; libraryHaskellDepends = [ base mtl ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; homepage = "https://github.com/TGOlson/deterministic-game-engine"; description = "Simple deterministic game engine"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "detrospector" = callPackage @@ -51873,9 +49817,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring utf8-string ]; - jailbreak = true; description = "Get rid of unicode (utf-8) symbols in Haskell sources"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "devil" = callPackage @@ -51951,7 +49895,6 @@ self: { sha256 = "c615817f03ffc8794af3409143708c32d95b05516dc1548cc8af65ae9c772eaf"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base Cabal QuickCheck ]; - jailbreak = true; homepage = "https://github.com/musically-ut/haskell-dgim"; description = "Implementation of DGIM algorithm"; license = stdenv.lib.licenses.mit; @@ -51965,7 +49908,6 @@ self: { version = "0.2"; sha256 = "dddee01c6e6079e0ca62c1e34278b2bc78ce17c0c737b23ca5730c0f71a71d80"; libraryHaskellDepends = [ base HTTP mtl network split ]; - jailbreak = true; homepage = "http://www.dmwit.com/dgs"; description = "Haskell front-end for DGS' bot interface"; license = stdenv.lib.licenses.bsd3; @@ -51996,6 +49938,7 @@ self: { ]; description = "An EDSL for teaching Haskell with diagrams - functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams" = callPackage @@ -52027,36 +49970,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-builder_0_7_2_3" = callPackage - ({ mkDerivation, base, base-orphans, bytestring, cmdargs - , diagrams-cairo, diagrams-lib, diagrams-postscript - , diagrams-rasterific, diagrams-svg, directory, exceptions - , filepath, hashable, haskell-src-exts, hint, JuicyPixels, lens - , lucid-svg, mtl, split, transformers - }: - mkDerivation { - pname = "diagrams-builder"; - version = "0.7.2.3"; - sha256 = "4763a1e795311335dfec6b8f49deaca3b31a6f3d2bec5168a82f849df4b39029"; - configureFlags = [ "-fcairo" "-fps" "-frasterific" "-fsvg" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-orphans cmdargs diagrams-lib directory exceptions - filepath hashable haskell-src-exts hint lens mtl split transformers - ]; - executableHaskellDepends = [ - base bytestring cmdargs diagrams-cairo diagrams-lib - diagrams-postscript diagrams-rasterific diagrams-svg directory - filepath JuicyPixels lens lucid-svg - ]; - jailbreak = true; - homepage = "http://projects.haskell.org/diagrams"; - description = "hint-based build service for the diagrams graphics EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-builder" = callPackage ({ mkDerivation, base, base-orphans, bytestring, cmdargs , diagrams-cairo, diagrams-lib, diagrams-postscript @@ -52085,28 +49998,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-cairo_1_3_1" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, colour, containers - , data-default-class, diagrams-core, diagrams-lib, filepath - , hashable, JuicyPixels, lens, mtl, optparse-applicative, pango - , split, statestack, transformers, unix, vector - }: - mkDerivation { - pname = "diagrams-cairo"; - version = "1.3.1"; - sha256 = "0c3949f07592ffae838f81ea76fb88639dfbf64a3002a563101330accbadc485"; - libraryHaskellDepends = [ - array base bytestring cairo colour containers data-default-class - diagrams-core diagrams-lib filepath hashable JuicyPixels lens mtl - optparse-applicative pango split statestack transformers unix - vector - ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Cairo backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-cairo" = callPackage ({ mkDerivation, array, base, bytestring, cairo, colour, containers , data-default-class, diagrams-core, diagrams-lib, filepath @@ -52144,33 +50035,12 @@ self: { optparse-applicative pango split statestack transformers unix vector ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-canvas_1_3_0_5" = callPackage - ({ mkDerivation, base, blank-canvas, cmdargs, containers - , data-default-class, diagrams-core, diagrams-lib, lens, mtl - , NumInstances, optparse-applicative, statestack, text - }: - mkDerivation { - pname = "diagrams-canvas"; - version = "1.3.0.5"; - sha256 = "624a99f868ff7fbfed123b6c3ddc0a2369d48b472bf7c5ac9cc5c3a38f755de9"; - libraryHaskellDepends = [ - base blank-canvas cmdargs containers data-default-class - diagrams-core diagrams-lib lens mtl NumInstances - optparse-applicative statestack text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-canvas" = callPackage ({ mkDerivation, base, blank-canvas, cmdargs, containers , data-default-class, diagrams-core, diagrams-lib, lens, mtl @@ -52205,41 +50075,12 @@ self: { diagrams-core diagrams-lib lens mtl NumInstances optparse-applicative statestack text ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "HTML5 canvas backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "diagrams-contrib_1_3_0_11" = callPackage - ({ mkDerivation, base, circle-packing, colour, containers - , data-default, data-default-class, diagrams-core, diagrams-lib - , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom - , mtl, parsec, QuickCheck, random, semigroups, split - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text - }: - mkDerivation { - pname = "diagrams-contrib"; - version = "1.3.0.11"; - sha256 = "076523498a93223d65758e5d89435df362cf488c940048818fde8f8fbee0a6d5"; - libraryHaskellDepends = [ - base circle-packing colour containers data-default - data-default-class diagrams-core diagrams-lib diagrams-solve - force-layout lens linear MonadRandom mtl parsec random semigroups - split text - ]; - testHaskellDepends = [ - base containers diagrams-lib HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Collection of user contributions to diagrams EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-contrib" = callPackage ({ mkDerivation, base, circle-packing, colour, containers , data-default, data-default-class, diagrams-core, diagrams-lib @@ -52344,7 +50185,6 @@ self: { base containers haskell-src-exts lens parsec QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Preprocessor for embedding diagrams in Haddock documentation"; license = stdenv.lib.licenses.bsd3; @@ -52363,29 +50203,9 @@ self: { base colour containers diagrams-core diagrams-lib hsqml lens text transformers ]; - jailbreak = true; homepage = "https://github.com/marcinmrotek/diagrams-hsqml"; description = "HsQML (Qt5) backend for Diagrams"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-html5_1_3_0_6" = callPackage - ({ mkDerivation, base, cmdargs, containers, data-default-class - , diagrams-core, diagrams-lib, lens, mtl, NumInstances - , optparse-applicative, split, statestack, static-canvas, text - }: - mkDerivation { - pname = "diagrams-html5"; - version = "1.3.0.6"; - sha256 = "92d980c07aa22df32b898ec43c00ed2c5405c6e6d29b6fb152d420d82a4c171d"; - libraryHaskellDepends = [ - base cmdargs containers data-default-class diagrams-core - diagrams-lib lens mtl NumInstances optparse-applicative split - statestack static-canvas text - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "HTML5 canvas backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -52408,35 +50228,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-lib_1_3_1_3" = callPackage - ({ mkDerivation, active, adjunctions, array, base, colour - , containers, data-default-class, diagrams-core, diagrams-solve - , directory, distributive, dual-tree, exceptions, filepath - , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens - , linear, monoid-extras, mtl, optparse-applicative, process - , semigroups, tagged, tasty, tasty-hunit, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "diagrams-lib"; - version = "1.3.1.3"; - sha256 = "0bf7e87e0d60af17ebf57d9d770cadc447da8db38b9f54114dd30e25a68d79e8"; - revision = "2"; - editedCabalFile = "f2c86b960dc6a1d416cd78be2e086f0e9b09b493463c1f00b60fa6e1494a01ae"; - libraryHaskellDepends = [ - active adjunctions array base colour containers data-default-class - diagrams-core diagrams-solve directory distributive dual-tree - exceptions filepath fingertree fsnotify hashable intervals - JuicyPixels lens linear monoid-extras mtl optparse-applicative - process semigroups tagged text transformers unordered-containers - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Embedded domain-specific language for declarative graphics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-lib" = callPackage ({ mkDerivation, active, adjunctions, array, base, colour , containers, data-default-class, diagrams-core, diagrams-solve @@ -52482,9 +50273,9 @@ self: { base diagrams-builder diagrams-cairo diagrams-lib directory filepath linear optparse-applicative pandoc-types ]; - jailbreak = true; description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-pdf" = callPackage @@ -52500,7 +50291,6 @@ self: { base cmdargs colour diagrams-core diagrams-lib filepath HPDF lens monoid-extras mtl semigroups split vector-space ]; - jailbreak = true; homepage = "http://www.alpheccar.org"; description = "PDF backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -52522,7 +50312,6 @@ self: { diagrams-lib directory filepath hashable JuicyPixels mtl optparse-applicative process split texrunner time vector zlib ]; - jailbreak = true; homepage = "http://github.com/cchalmers/diagrams-pgf"; description = "PGF backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -52558,30 +50347,9 @@ self: { libraryHaskellDepends = [ array base colour diagrams-core diagrams-lib ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/diagrams-qrcode"; description = "Draw QR codes to SVG, PNG, PDF or PS files"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-rasterific_1_3_1_7" = callPackage - ({ mkDerivation, base, bytestring, containers, data-default-class - , diagrams-core, diagrams-lib, filepath, FontyFruity, hashable - , JuicyPixels, lens, mtl, optparse-applicative, Rasterific, split - , unix - }: - mkDerivation { - pname = "diagrams-rasterific"; - version = "1.3.1.7"; - sha256 = "3568aab7c5dbf557f5c1a49f5d3c0dcc1b74dcc173e31b5c2f59b9f1c9795646"; - libraryHaskellDepends = [ - base bytestring containers data-default-class diagrams-core - diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl - optparse-applicative Rasterific split unix - ]; - homepage = "http://projects.haskell.org/diagrams/"; - description = "Rasterific backend for diagrams"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -52622,7 +50390,6 @@ self: { diagrams-lib filepath FontyFruity hashable JuicyPixels lens mtl optparse-applicative Rasterific split unix ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "Rasterific backend for diagrams"; license = stdenv.lib.licenses.bsd3; @@ -52642,7 +50409,6 @@ self: { base colour containers diagrams-core diagrams-lib lens monoid-extras mtl reflex reflex-dom reflex-dom-contrib ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "reflex backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -52658,10 +50424,10 @@ self: { libraryHaskellDepends = [ base data-default-class diagrams-lib lens ]; - jailbreak = true; homepage = "https://github.com/timjb/rubiks-cube"; description = "Library for drawing the Rubik's Cube"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-solve" = callPackage @@ -52676,30 +50442,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "diagrams-svg_1_3_1_10" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, colour - , containers, diagrams-core, diagrams-lib, directory, filepath - , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl - , old-time, optparse-applicative, process, semigroups, split, text - , time - }: - mkDerivation { - pname = "diagrams-svg"; - version = "1.3.1.10"; - sha256 = "a8293856f359d7d9656bb0b5ca5c97cc13b6ab18eaa71ed30112038cfe0a39a7"; - libraryHaskellDepends = [ - base base64-bytestring bytestring colour containers diagrams-core - diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg - monoid-extras mtl old-time optparse-applicative process semigroups - split text time - ]; - jailbreak = true; - homepage = "http://projects.haskell.org/diagrams/"; - description = "SVG backend for diagrams drawing EDSL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "diagrams-svg" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, colour , containers, diagrams-core, diagrams-lib, directory, filepath @@ -52739,7 +50481,6 @@ self: { monoid-extras mtl old-time optparse-applicative process semigroups split svg-builder text time ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -52755,7 +50496,6 @@ self: { libraryHaskellDepends = [ base diagrams-core diagrams-lib dlist mtl ]; - jailbreak = true; homepage = "http://projects.haskell.org/diagrams"; description = "TikZ backend for diagrams drawing EDSL"; license = stdenv.lib.licenses.bsd3; @@ -52776,6 +50516,7 @@ self: { homepage = "https://github.com/spinda/diagrams-wx#readme"; description = "Backend for rendering diagrams in wxWidgets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dialog" = callPackage @@ -52795,6 +50536,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dib" = callPackage + ({ mkDerivation, base, bytestring, cereal, containers, digest + , directory, filepath, mtl, process, text, time + }: + mkDerivation { + pname = "dib"; + version = "0.5.0"; + sha256 = "2f4a58c4a97c55bed558fee3be61886e05d55cd560f13d98f5cdce4d8ddbe294"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal containers digest directory filepath mtl + process text time + ]; + executableHaskellDepends = [ + base containers directory filepath mtl time + ]; + description = "A simple, forward build system"; + license = stdenv.lib.licenses.mit; + }) {}; + "dice" = callPackage ({ mkDerivation, base, parsec, random-fu, transformers }: mkDerivation { @@ -52837,10 +50599,27 @@ self: { libraryHaskellDepends = [ base binary bytestring pretty safe time ]; - jailbreak = true; homepage = "http://github.com/dicomgrid/dicom-haskell-library/"; description = "A library for reading and writing DICOM files in the Explicit VR Little Endian transfer syntax"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "dictionaries" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring, containers + , data-default, directory, exceptions, filepath, text, time, zlib + }: + mkDerivation { + pname = "dictionaries"; + version = "0.1.0.0"; + sha256 = "28b3ba1e9ad52ccf4f333861e22830da77ad915622fa1ffca87cff6e9716c0ab"; + libraryHaskellDepends = [ + attoparsec base binary bytestring containers data-default directory + exceptions filepath text time zlib + ]; + description = "Tools to handle StarDict dictionaries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dictionary-sharing" = callPackage @@ -52908,9 +50687,9 @@ self: { sha256 = "55513091b52d114f0a49d85f6ea75fea52415243913f3781d7c5340c7987bc45"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; - jailbreak = true; description = "A parser for diff file formats"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diff3" = callPackage @@ -52981,27 +50760,30 @@ self: { }) {}; "difftodo" = callPackage - ({ mkDerivation, base, bytestring, diff-parse, highlighting-kate - , optparse-applicative, protolude, tasty, tasty-hunit, text + ({ mkDerivation, base, bytestring, diff-parse, highlighter2 + , optparse-applicative, pretty-show, process, protolude, tasty + , tasty-hunit, text }: mkDerivation { pname = "difftodo"; - version = "0.1.0"; - sha256 = "ab1c892daec3ecee50d16f8353e6da6195d3da86e1bca0ab8f3cb908a9746066"; + version = "0.2.0"; + sha256 = "bdb2c473e15455ae2af37623283bb78fd6cf52491d86eb9a04b1241011fab899"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base diff-parse highlighting-kate protolude text + base bytestring diff-parse highlighter2 protolude text ]; executableHaskellDepends = [ - base optparse-applicative protolude text + base bytestring optparse-applicative process protolude text ]; testHaskellDepends = [ - base bytestring highlighting-kate protolude tasty tasty-hunit text + base bytestring highlighter2 pretty-show protolude tasty + tasty-hunit text ]; homepage = "https://github.com/jml/difftodo#readme"; description = "Generate todo lists from source code"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digamma" = callPackage @@ -53070,36 +50852,11 @@ self: { base digestive-functors digestive-functors-lucid http-types lucid lucid-foundation text ]; - jailbreak = true; description = "Speed up form designing using digestive functors and foundation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors_0_8_0_1" = callPackage - ({ mkDerivation, base, bytestring, containers, HUnit, mtl - , old-locale, QuickCheck, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time - }: - mkDerivation { - pname = "digestive-functors"; - version = "0.8.0.1"; - sha256 = "ae3d5cb376c0065a59313424c408f3a81a1d4a1839214d1a60764e3708abf3c6"; - libraryHaskellDepends = [ - base bytestring containers mtl old-locale text time - ]; - testHaskellDepends = [ - base bytestring containers HUnit mtl old-locale QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 text - time - ]; - jailbreak = true; - homepage = "http://github.com/jaspervdj/digestive-functors"; - description = "A practical formlet library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "digestive-functors" = callPackage ({ mkDerivation, base, bytestring, containers, HUnit, mtl , old-locale, QuickCheck, test-framework, test-framework-hunit @@ -53117,10 +50874,10 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "A practical formlet library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-aeson" = callPackage @@ -53140,10 +50897,10 @@ self: { aeson base bytestring digestive-functors HUnit mtl scientific tasty tasty-hunit text ]; - jailbreak = true; homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-blaze" = callPackage @@ -53177,6 +50934,7 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Happstack backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-heist" = callPackage @@ -53190,7 +50948,6 @@ self: { libraryHaskellDepends = [ base blaze-builder digestive-functors heist mtl text xmlhtml ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Heist frontend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; @@ -53205,26 +50962,12 @@ self: { sha256 = "ac7d4e7e5eaa21079cb596ba8ff5c59c7dd3bd3df99a7b0ff56ab4996767c102"; libraryHaskellDepends = [ base digestive-functors hsp hsx text ]; libraryToolDepends = [ trhsx ]; - jailbreak = true; homepage = "http://src.seereason.com/digestive-functors-hsp"; description = "HSP support for digestive-functors"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "digestive-functors-lucid_0_0_0_3" = callPackage - ({ mkDerivation, base, digestive-functors, lucid, text }: - mkDerivation { - pname = "digestive-functors-lucid"; - version = "0.0.0.3"; - sha256 = "15fa8c7a0fb6e8d230cfe9d008101cd72d7eecbcbd1231f0c9982c20a0a73bb9"; - libraryHaskellDepends = [ base digestive-functors lucid text ]; - homepage = "http://github.com/jaspervdj/digestive-functors"; - description = "Lucid frontend for the digestive-functors library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "digestive-functors-lucid" = callPackage ({ mkDerivation, base, digestive-functors, lucid, text }: mkDerivation { @@ -53255,6 +50998,7 @@ self: { homepage = "https://github.com/mmartin/digestive-functors-scotty"; description = "Scotty backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digestive-functors-snap" = callPackage @@ -53272,21 +51016,22 @@ self: { homepage = "http://github.com/jaspervdj/digestive-functors"; description = "Snap backend for the digestive-functors library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "digit" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, lens, parsec - , parsers, QuickCheck, semigroups, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, lens, papa + , parsec, parsers, QuickCheck, semigroups, template-haskell }: mkDerivation { pname = "digit"; - version = "0.2.8"; - sha256 = "d0dd0056edc862542d8ae07cf5e8ffd48b62e3f9d08ca035dfc737885d6684dd"; + version = "0.2.9"; + sha256 = "2fa2ac71a50a23c289f1fd4962836984d7766f9dcce5fb33eeb26b22ff8715f9"; libraryHaskellDepends = [ - base lens parsec parsers semigroups template-haskell + base lens papa parsers semigroups template-haskell ]; testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + base directory doctest filepath parsec QuickCheck template-haskell ]; homepage = "https://github.com/NICTA/digit"; description = "A data-type representing digits 0-9 and other combinations"; @@ -53306,21 +51051,9 @@ self: { transformers ]; testHaskellDepends = [ base doctest hspec ]; - jailbreak = true; homepage = "https://github.com/KazumaSATO/digitalocean-kzs"; description = "digitalocean api for haskell"; license = stdenv.lib.licenses.mit; - }) {}; - - "digits_0_2" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "digits"; - version = "0.2"; - sha256 = "f40437896a7866b210cdb45bfe025d65391ebf9980ea7a92206d6320e79949a3"; - libraryHaskellDepends = [ base QuickCheck ]; - description = "Converts integers to lists of digits and back"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -53341,8 +51074,8 @@ self: { }: mkDerivation { pname = "dimensional"; - version = "1.0.1.2"; - sha256 = "45943c0d8989a5ce8a440e40a28b4bffa84170b5c8cfaa9af27d4ce0afc599cb"; + version = "1.0.1.3"; + sha256 = "3bc566a59227115325caec0ea00a35e025e5ea471a3ab531cf595e5365aa93a7"; libraryHaskellDepends = [ base deepseq exact-pi numtype-dk vector ]; @@ -53359,10 +51092,10 @@ self: { version = "2014.0.0.0"; sha256 = "45a4eac9e27997493f2bcb2977098ede8443c6eda263a447125446e203a7cae3"; libraryHaskellDepends = [ base dimensional numtype-dk ]; - jailbreak = true; homepage = "https://github.com/dmcclean/dimensional-codata"; description = "CODATA Recommended Physical Constants with Dimensional Types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dimensional-tf" = callPackage @@ -53396,7 +51129,6 @@ self: { strict-concurrency template-haskell text transformers unordered-containers wai wai-eventsource wai-extra warp web-css ]; - jailbreak = true; description = "Dingo is a Rich Internet Application platform based on the Warp web server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -53417,7 +51149,6 @@ self: { aeson base blaze-html bytestring dingo-core dingo-widgets fclabels shakespeare-js template-haskell text transformers ]; - jailbreak = true; description = "Dingo Example"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -53437,7 +51168,6 @@ self: { file-embed shakespeare-js template-haskell text transformers unordered-containers ]; - jailbreak = true; description = "Dingo Widgets"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -53468,10 +51198,10 @@ self: { libraryHaskellDepends = [ base containers HUnit parsec transformers TypeNat ]; - jailbreak = true; homepage = "https://github.com/avieth/diplomacy"; description = "The board game Diplomacy, spoken in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diplomacy-server" = callPackage @@ -53493,7 +51223,6 @@ self: { rest-core rest-wai stm Stream text transformers transformers-compat TypeNat wai warp warp-tls ]; - jailbreak = true; homepage = "https://github.com/avieth/diplomacy-server"; description = "Play Diplomacy over HTTP"; license = stdenv.lib.licenses.bsd3; @@ -53536,7 +51265,6 @@ self: { libraryHaskellDepends = [ base bytestring containers mtl network utf8-string ]; - jailbreak = true; homepage = "http://dankna.com/software/"; description = "Native implementation of the FastCGI protocol"; license = stdenv.lib.licenses.bsd3; @@ -53557,7 +51285,6 @@ self: { monad-control mtl network old-locale SafeSemaphore time transformers-base unix utf8-string ]; - jailbreak = true; homepage = "http://ireneknapp.com/software/"; description = "Native webserver that acts as a library"; license = stdenv.lib.licenses.bsd3; @@ -53601,7 +51328,6 @@ self: { testHaskellDepends = [ base base16-bytestring bytestring directory HUnit temporary text ]; - doCheck = false; homepage = "https://github.com/IreneKnapp/direct-sqlite"; description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; license = stdenv.lib.licenses.bsd3; @@ -53619,7 +51345,6 @@ self: { base bytestring containers deepseq hashable parallel QuickCheck unordered-containers vector ]; - jailbreak = true; description = "Finite directed cubical complexes and associated algorithms"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -53676,20 +51401,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "directory-tree_0_12_0" = callPackage - ({ mkDerivation, base, directory, filepath, process }: - mkDerivation { - pname = "directory-tree"; - version = "0.12.0"; - sha256 = "ff09c6e66a5038f905ea423700d60e538286c12b83fecda70b2932ee4eb5b3c5"; - libraryHaskellDepends = [ base directory filepath ]; - testHaskellDepends = [ base directory filepath process ]; - homepage = "http://brandon.si/code/directory-tree-module-released/"; - description = "A simple directory-like tree datatype, with useful IO functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "directory-tree" = callPackage ({ mkDerivation, base, directory, filepath, process }: mkDerivation { @@ -53765,7 +51476,6 @@ self: { aeson api-builder base bytestring Cabal hspec text time transformers ]; - jailbreak = true; homepage = "http://github.com/accraze/discogs-haskell"; description = "Client for Discogs REST API"; license = stdenv.lib.licenses.mit; @@ -53779,10 +51489,10 @@ self: { version = "0.1"; sha256 = "4d88f65d97f04b11e03082e20a4b3044920f644a7babd2b1de689a9575746b7a"; libraryHaskellDepends = [ base time ]; - jailbreak = true; homepage = "https://github.com/kallisti-dev/discordian-calendar"; description = "library for handling Discordian calendar dates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "discount" = callPackage @@ -53900,8 +51610,8 @@ self: { }: mkDerivation { pname = "distributed-closure"; - version = "0.3.1.0"; - sha256 = "eb7894b3394662ddc86e249bfe424033674597e3b952e117f1c9a7f554543fa3"; + version = "0.3.3.0"; + sha256 = "bc675fd3b93c7e51a923969220821ea1676c639ff9fd4e742bd864e90f2e368f"; libraryHaskellDepends = [ base binary bytestring constraints syb template-haskell ]; @@ -53926,7 +51636,6 @@ self: { distributed-static exceptions hashable mtl network-transport random rank1dynamic stm syb template-haskell time transformers ]; - doCheck = false; homepage = "http://haskell-distributed.github.com/"; description = "Cloud Haskell: Erlang-style concurrency in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -53955,10 +51664,10 @@ self: { network-transport network-transport-tcp rematch stm test-framework test-framework-hunit transformers ]; - jailbreak = true; homepage = "http://github.com/haskell-distributed/distributed-process-async"; description = "Cloud Haskell Async API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-azure" = callPackage @@ -53977,7 +51686,6 @@ self: { libssh2 mtl network-transport network-transport-tcp pureMD5 rank1dynamic transformers unix ]; - jailbreak = true; homepage = "http://github.com/haskell-distributed/distributed-process"; description = "Microsoft Azure backend for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; @@ -54011,11 +51719,10 @@ self: { network-transport network-transport-tcp rematch stm test-framework test-framework-hunit transformers ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-client-server"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-ekg" = callPackage @@ -54064,8 +51771,6 @@ self: { QuickCheck rematch stm test-framework test-framework-hunit test-framework-quickcheck2 time transformers unordered-containers ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-execution"; description = "Execution Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -54099,11 +51804,10 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 time transformers unordered-containers ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-extras"; description = "Cloud Haskell Extras"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-lifted" = callPackage @@ -54192,7 +51896,6 @@ self: { QuickCheck rematch stm test-framework test-framework-hunit test-framework-quickcheck2 time transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/haskell-distributed/distributed-process-platform"; description = "The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; @@ -54227,10 +51930,10 @@ self: { stm test-framework test-framework-hunit time transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/haskell-distributed/distributed-process-registry"; description = "Cloud Haskell Extended Process Registry"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-simplelocalnet" = callPackage @@ -54242,15 +51945,17 @@ self: { pname = "distributed-process-simplelocalnet"; version = "0.2.3.2"; sha256 = "c3351cf8a782dda756689b3747ede1e3879dcb913a07065eb4ec0052a963825f"; + revision = "1"; + editedCabalFile = "6cc30bffb992a3af6027e6563720ab3b6a994037066125ffde7024081b58c8e7"; libraryHaskellDepends = [ base binary bytestring containers data-accessor distributed-process network network-multicast network-transport network-transport-tcp transformers ]; - jailbreak = true; homepage = "http://haskell-distributed.github.com"; description = "Simple zero-configuration backend for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-supervisor" = callPackage @@ -54281,11 +51986,10 @@ self: { rematch stm test-framework test-framework-hunit time transformers unordered-containers ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-supervisor"; description = "Supervisors for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-task" = callPackage @@ -54320,11 +52024,10 @@ self: { QuickCheck rematch stm test-framework test-framework-hunit test-framework-quickcheck2 time transformers unordered-containers ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/haskell-distributed/distributed-process-task"; description = "Task Framework for The Cloud Haskell Application Platform"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "distributed-process-tests" = callPackage @@ -54371,7 +52074,6 @@ self: { lifted-base monad-control network network-transport network-transport-tcp transformers ]; - jailbreak = true; homepage = "https://github.com/jeremyjh/distributed-process-zookeeper"; description = "A Zookeeper back-end for Cloud Haskell"; license = stdenv.lib.licenses.bsd3; @@ -54442,7 +52144,6 @@ self: { base Chart Chart-cairo colour containers data-default-class distribution lens ]; - jailbreak = true; homepage = "https://github.com/redelmann/haskell-distribution-plot"; description = "Easily plot distributions from the distribution package.."; license = stdenv.lib.licenses.asl20; @@ -54524,7 +52225,6 @@ self: { patches-vector servant servant-blaze servant-docs shakespeare text time vector ]; - jailbreak = true; homepage = "https://github.com/liamoc/dixi"; description = "A wiki implemented with a firm theoretical foundation"; license = stdenv.lib.licenses.bsd3; @@ -54542,10 +52242,10 @@ self: { base hmidi hspec lens mtl QuickCheck random ]; testHaskellDepends = [ base hspec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/reedrosenbluth/Djembe"; description = "Hit drums with haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "djinn" = callPackage @@ -54599,27 +52299,12 @@ self: { libraryHaskellDepends = [ base containers logict template-haskell ]; - jailbreak = true; homepage = "http://gitorious.org/djinn-th"; description = "Generate executable Haskell code from a type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "dlist_0_7_1_2" = callPackage - ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: - mkDerivation { - pname = "dlist"; - version = "0.7.1.2"; - sha256 = "332d21f16fd30d2534b6ab96c98830a14266d8f368cff21f6a47469fb3493783"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ base Cabal QuickCheck ]; - homepage = "https://github.com/spl/dlist"; - description = "Difference lists"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dlist" = callPackage ({ mkDerivation, base, Cabal, deepseq, QuickCheck }: mkDerivation { @@ -54628,8 +52313,6 @@ self: { sha256 = "77397ecfb9a7cbfac15226cbe09ec156a3deb6e21c7af948bc8ab459e88641b1"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base Cabal QuickCheck ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/spl/dlist"; description = "Difference lists"; license = stdenv.lib.licenses.bsd3; @@ -54647,31 +52330,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dns_2_0_4" = callPackage - ({ mkDerivation, attoparsec, base, binary, blaze-builder - , bytestring, conduit, conduit-extra, containers, doctest, hspec - , iproute, mtl, network, random, resourcet, safe, word8 - }: - mkDerivation { - pname = "dns"; - version = "2.0.4"; - sha256 = "2b4fc61f4ccb440aa2b8403bff1ba00a87782e46b4261d34e6c1a5a1f1c71d6d"; - libraryHaskellDepends = [ - attoparsec base binary blaze-builder bytestring conduit - conduit-extra containers iproute mtl network random resourcet safe - ]; - testHaskellDepends = [ - attoparsec base binary blaze-builder bytestring conduit - conduit-extra containers doctest hspec iproute mtl network random - resourcet safe word8 - ]; - doCheck = false; - testTarget = "spec"; - description = "DNS library in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dns" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , bytestring-builder, conduit, conduit-extra, containers, doctest @@ -54679,8 +52337,8 @@ self: { }: mkDerivation { pname = "dns"; - version = "2.0.5"; - sha256 = "b2de8a536e96db022aaa2d368689e8cad7cbd1c8bfb1cc7c56b517e5633a8879"; + version = "2.0.6"; + sha256 = "148342aaca67c4c6f4a7c15bc50eb13d7f145943277e6f55c1a455208531c0f2"; libraryHaskellDepends = [ attoparsec base binary bytestring bytestring-builder conduit conduit-extra containers iproute mtl network random resourcet safe @@ -54690,7 +52348,6 @@ self: { conduit-extra containers doctest hspec iproute mtl network random resourcet safe word8 ]; - doCheck = false; testTarget = "spec"; description = "DNS library in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -54710,7 +52367,6 @@ self: { base bytestring containers contstuff dns iproute time ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "Caching DNS resolver library and mass DNS resolver utility"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -54736,22 +52392,22 @@ self: { sha256 = "56cc66b4ba20bc2f554d9153c63706713fb3eba4c6b5944106d176c643f6de3d"; libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ dns_sd ]; - jailbreak = true; homepage = "https://github.com/maxpow4h/dnssd"; description = "DNS service discovery bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {dns_sd = null;}; "do-list" = callPackage - ({ mkDerivation, base, dlist, hspec }: + ({ mkDerivation, base, hspec }: mkDerivation { pname = "do-list"; - version = "0.9.0"; - sha256 = "f7f0af10c6e0f817afba7939e070671b232f152adf2f9d72b6656d4b9417dfef"; - libraryHaskellDepends = [ base dlist ]; + version = "1.0.1"; + sha256 = "b377193461b0ad7a81f9e66bcf10f8838b6f1e39f4a5de3b2e2f45c749c5b694"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; - homepage = "https://github.com/tserduke/do-list"; - description = "List construction with do notation"; + homepage = "https://github.com/tserduke/do-list#readme"; + description = "Do notation for free"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -54775,7 +52431,6 @@ self: { sqlite tagchup text time transformers unix xhtml-combinators xml xml-basic ]; - jailbreak = true; homepage = "https://github.com/j3h/doc-review"; description = "Document review Web application, like http://book.realworldhaskell.org/"; license = stdenv.lib.licenses.bsd3; @@ -54860,8 +52515,8 @@ self: { }: mkDerivation { pname = "dockercook"; - version = "0.5.0.0"; - sha256 = "fbb9373444c64cc1e16659f4d16edb60f80db4c6254e7e24feca16ad20f7c4fb"; + version = "0.5.0.3"; + sha256 = "ba1e45921535e8fb4767c53e77ac48b3e99c0501acb0efb99ed100b6f3cae032"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -54877,7 +52532,6 @@ self: { optparse-applicative process text unordered-containers ]; testHaskellDepends = [ base HTF text vector ]; - jailbreak = true; homepage = "https://github.com/factisresearch/dockercook"; description = "A build tool for multiple docker image layers"; license = stdenv.lib.licenses.mit; @@ -54916,6 +52570,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "doctemplates" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, hspec, parsec, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "doctemplates"; + version = "0.1.0.2"; + sha256 = "b752f52350daaa9bcf261a1f1af5852f75572093c3d0cdeb4822282fb3a18a6b"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers parsec + scientific text unordered-containers vector + ]; + testHaskellDepends = [ aeson base hspec text ]; + homepage = "https://github.com/jgm/doctemplates#readme"; + description = "Pandoc-style document templates"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "doctest" = callPackage ({ mkDerivation, base, base-compat, deepseq, directory, filepath , ghc, ghc-paths, hspec, HUnit, process, QuickCheck, setenv @@ -54937,7 +52610,6 @@ self: { HUnit process QuickCheck setenv silently stringbuilder syb transformers with-location ]; - doCheck = false; homepage = "https://github.com/sol/doctest#readme"; description = "Test interactive Haskell examples"; license = stdenv.lib.licenses.mit; @@ -54987,7 +52659,6 @@ self: { ]; testHaskellDepends = [ base doctest ]; doHaddock = false; - jailbreak = true; homepage = "http://github.com/relrod/doctest-discover-noaeson"; description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)"; license = stdenv.lib.licenses.publicDomain; @@ -55002,7 +52673,6 @@ self: { sha256 = "4ab056cc370c320536976ce3c1648098ee60d7d60b9e770e556f013d0ad6aeaa"; libraryHaskellDepends = [ base HUnit QuickCheck ]; testHaskellDepends = [ base doctest HUnit QuickCheck ]; - doCheck = false; description = "Allow QuickCheck-style property testing within doctest"; license = stdenv.lib.licenses.mit; }) {}; @@ -55124,10 +52794,10 @@ self: { base hscolour hspec lens mtl random random-extras random-fu transformers ]; - jailbreak = true; homepage = "http://github.com/egonschiele/dominion"; description = "A simulator for the board game Dominion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "domplate" = callPackage @@ -55142,10 +52812,10 @@ self: { base bytestring containers tagsoup text unordered-containers vector yaml ]; - jailbreak = true; homepage = "https://github.com/valderman/domplate"; description = "A simple templating library using HTML5 as its template language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dot" = callPackage @@ -55182,10 +52852,10 @@ self: { attoparsec base bytestring HUnit tasty tasty-hunit turtle unordered-containers ]; - jailbreak = true; homepage = "https://github.com/pjrt/Dot-Linker#readme"; description = "Initial project template from stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dot2graphml" = callPackage @@ -55202,28 +52872,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dotenv_0_3_0_1" = callPackage - ({ mkDerivation, base, base-compat, hspec, megaparsec - , optparse-applicative, process, text - }: - mkDerivation { - pname = "dotenv"; - version = "0.3.0.1"; - sha256 = "b83a38f54c0be717bbc86016517a3f1ac0e1d43e6bf1ac9cb318081e9673bb2c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base base-compat megaparsec text ]; - executableHaskellDepends = [ - base base-compat megaparsec optparse-applicative process text - ]; - testHaskellDepends = [ base base-compat hspec megaparsec text ]; - jailbreak = true; - homepage = "https://github.com/stackbuilders/dotenv-hs"; - description = "Loads environment variables from dotenv files"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dotenv" = callPackage ({ mkDerivation, base, base-compat, hspec, megaparsec , optparse-applicative, process, text @@ -55383,10 +53031,10 @@ self: { revision = "1"; editedCabalFile = "7e6df1d4f39879e9b031c8ff5e2f6fd5be3729cc40f7515e117ac0b47ed3f675"; libraryHaskellDepends = [ base bytestring curl feed tagsoup xml ]; - jailbreak = true; homepage = "http://code.haskell.org/~dons/code/download-curl"; description = "High-level file download based on URLs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "download-media-content" = callPackage @@ -55402,7 +53050,6 @@ self: { executableHaskellDepends = [ base bytestring filepath http-enumerator tagsoup text ]; - jailbreak = true; homepage = "http://github.com/jaspervdj/download-media-content"; description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)"; license = stdenv.lib.licenses.bsd3; @@ -55416,7 +53063,6 @@ self: { version = "0.1.0.0"; sha256 = "3448b747cb22e61f7939a56a3f238e72ed702d1d49899fa9dc787935a4ef1b6b"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/siddhanathan/dozenal"; description = "A Haskell library for using Dozenal (Duodecimal - Base 12) numbers"; license = stdenv.lib.licenses.gpl3; @@ -55438,10 +53084,10 @@ self: { aeson base bytestring data-default-class http-client http-types reflection scientific text transformers ]; - jailbreak = true; homepage = "https://github.com/philopon/dozens-hs"; description = "dozens api library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dph-base" = callPackage @@ -55453,7 +53099,6 @@ self: { libraryHaskellDepends = [ array base ghc-prim pretty random vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell common config and debugging functions"; license = stdenv.lib.licenses.bsd3; @@ -55474,7 +53119,6 @@ self: { base containers dph-base dph-lifted-vseg dph-prim-par HUnit old-time parseargs random vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell example programs"; license = stdenv.lib.licenses.bsd3; @@ -55493,7 +53137,6 @@ self: { array base containers dph-base dph-prim-par ghc pretty random template-haskell vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell common definitions used by other dph-lifted packages"; license = stdenv.lib.licenses.bsd3; @@ -55511,7 +53154,6 @@ self: { libraryHaskellDepends = [ array base dph-base dph-prim-par ghc random template-haskell vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell lifted array combinators. (deprecated version)"; license = stdenv.lib.licenses.bsd3; @@ -55530,7 +53172,6 @@ self: { array base containers dph-base dph-lifted-base dph-prim-par ghc pretty random template-haskell vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell lifted array combinators"; license = stdenv.lib.licenses.bsd3; @@ -55556,7 +53197,6 @@ self: { version = "0.7.0.1"; sha256 = "12c112d93d6705a5f21ec890f0c2ce248058f904e767237a3d2d1846fd1ba09e"; libraryHaskellDepends = [ base dph-base random vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell segmented arrays. (abstract interface)"; license = stdenv.lib.licenses.bsd3; @@ -55575,7 +53215,6 @@ self: { base dph-base dph-prim-interface dph-prim-seq old-time random vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell segmented arrays. (production version)"; license = stdenv.lib.licenses.bsd3; @@ -55593,7 +53232,6 @@ self: { libraryHaskellDepends = [ base dph-base dph-prim-interface ghc-prim primitive random vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell"; description = "Data Parallel Haskell segmented arrays. (sequential implementation)"; license = stdenv.lib.licenses.bsd3; @@ -55632,21 +53270,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) dpkg; libdpkg = null;}; - "dpor_0_1_0_1" = callPackage - ({ mkDerivation, base, containers, deepseq, random, semigroups }: - mkDerivation { - pname = "dpor"; - version = "0.1.0.1"; - sha256 = "6000f43abf889e08e49bb5966592ad6119393277c2d528a18e5a2602119d6308"; - libraryHaskellDepends = [ - base containers deepseq random semigroups - ]; - homepage = "https://github.com/barrucadu/dejafu"; - description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "dpor" = callPackage ({ mkDerivation, base, containers, deepseq, random, semigroups }: mkDerivation { @@ -55723,7 +53346,6 @@ self: { aeson base bytestring HTTP old-locale optparse-applicative time unordered-containers vector ]; - jailbreak = true; description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -55762,10 +53384,10 @@ self: { testHaskellDepends = [ base drifter either postgresql-simple tasty tasty-hunit text ]; - doCheck = false; homepage = "http://github.com/michaelxavier/drifter-postgresql"; description = "PostgreSQL support for the drifter schema migration tool"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "drmaa" = callPackage @@ -55798,7 +53420,6 @@ self: { pem resourcet template-haskell time tls tls-extra transformers urlencoded utf8-string ]; - jailbreak = true; homepage = "http://github.com/cakoose/dropbox-sdk-haskell"; description = "A library to access the Dropbox HTTP API"; license = stdenv.lib.licenses.mit; @@ -55819,7 +53440,6 @@ self: { base containers directory filepath haskell98 process regex-posix time ]; - jailbreak = true; description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -55881,7 +53501,6 @@ self: { attoparsec base bytestring containers entropy hslogger mwc-random parallel primitive repa strict transformers vector ]; - jailbreak = true; description = "DSMC library for rarefied gas dynamics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -55901,7 +53520,6 @@ self: { base bytestring cmdargs ConfigFile dsmc gloss gloss-raster hslogger mtl repa strict transformers vector ]; - jailbreak = true; description = "DSMC toolkit for rarefied gas dynamics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -55914,10 +53532,10 @@ self: { version = "0.3.0.0"; sha256 = "2d81d82fae1094ca89e098e94f28f8a196e7186d68f612fba92ad3808192f896"; libraryHaskellDepends = [ base parsec ]; - jailbreak = true; homepage = "https://github.com/lcycon/hs-dson"; description = "Haskell DogeScript Object Notation Parser"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dson-parsec" = callPackage @@ -55927,10 +53545,10 @@ self: { version = "0.4.1.1"; sha256 = "3ea53b41913dd9e0cc44c4000afb5377e7da78fd314363b5d6f77c0677fad4fd"; libraryHaskellDepends = [ base parsec ]; - jailbreak = true; homepage = "https://github.com/alvare/dson-parsec"; description = "DSON parser"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dsp" = callPackage @@ -55955,7 +53573,6 @@ self: { version = "0.4.0.4"; sha256 = "152b48970e4b4fdb0cf0c5ef53cda1e76dd82ea89e948a03eef020ed600bfe97"; libraryHaskellDepends = [ base base-unicode-symbols dlist ]; - jailbreak = true; homepage = "https://github.com/basvandijk/dstring"; description = "Difference strings"; license = stdenv.lib.licenses.bsd3; @@ -55978,9 +53595,9 @@ self: { ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base bytestring ]; - jailbreak = true; description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dtd" = callPackage @@ -55998,7 +53615,6 @@ self: { lifted-base monad-control network resourcet text transformers uri-conduit xml-catalog xml-conduit xml-types ]; - jailbreak = true; homepage = "http://github.com/snoyberg/xml"; description = "Parse and render DTD files (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -56138,7 +53754,6 @@ self: { testHaskellDepends = [ base HUnit MissingH QuickCheck tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; description = "Frontend development build tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -56211,9 +53826,9 @@ self: { version = "0.3.1"; sha256 = "8328acb050181a69e64aadcf102001554967da2e06aef56d41dad29d2b53e636"; libraryHaskellDepends = [ base bytestring filepath transformers ]; - jailbreak = true; description = "Read/write DVI and TFM file"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dvorak" = callPackage @@ -56270,9 +53885,9 @@ self: { transformers ]; executableHaskellDepends = [ base containers dwarf-el ]; - jailbreak = true; description = "High-level wrapper around the dwarf library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dx9base" = callPackage @@ -56357,8 +53972,8 @@ self: { ({ mkDerivation, base, containers, template-haskell, unix }: mkDerivation { pname = "dynamic-linker-template"; - version = "0.1.0.4"; - sha256 = "f865165fccac573099181bb1fd5f834c261894a2a7c2f8bd9bfa1645ee446d10"; + version = "0.1.1.0"; + sha256 = "1f9b2cb753c8cf649c08ca46a81d8e7dbf46d8be0a9962ced9c679530a3ef3a9"; libraryHaskellDepends = [ base containers template-haskell unix ]; homepage = "http://github.com/hsyl20/dynamic-linker-template"; description = "Automatically derive dynamic linking methods from a data type"; @@ -56389,10 +54004,10 @@ self: { version = "0.1.0.4"; sha256 = "a36fc29ba4b91d52beb1f2df6ba8a837c6f112ef31358b20f5d0056f20d788a6"; libraryHaskellDepends = [ base primitive vector ]; - jailbreak = true; homepage = "https://github.com/AndrasKovacs/dynamic-mvector"; description = "A wrapper around MVector that enables pushing, popping and extending"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dynamic-object" = callPackage @@ -56415,21 +54030,23 @@ self: { }) {}; "dynamic-plot" = callPackage - ({ mkDerivation, async, base, colour, constrained-categories + ({ mkDerivation, base, colour, colour-space, constrained-categories , containers, data-default, deepseq, diagrams-cairo, diagrams-core - , diagrams-gtk, diagrams-lib, glib, gtk, lens, manifolds, MemoTrie - , MonadRandom, mtl, process, random, semigroups, tagged, time - , transformers, vector, vector-space + , diagrams-gtk, diagrams-lib, free-vector-spaces, glib, gtk, lens + , linearmap-category, manifolds, MemoTrie, MonadRandom, mtl + , process, random, semigroups, tagged, time, transformers, vector + , vector-space }: mkDerivation { pname = "dynamic-plot"; - version = "0.1.3.0"; - sha256 = "e6fcb68028ffb4148b7cd00fd87a5bb34a4be3f8995669ad136b37dc24747588"; + version = "0.2.0.0"; + sha256 = "4a5e2d6105139bd8756d3b1d1d2fbffcf36cb435e02973efa9066123cbd3e528"; libraryHaskellDepends = [ - async base colour constrained-categories containers data-default - deepseq diagrams-cairo diagrams-core diagrams-gtk diagrams-lib glib - gtk lens manifolds MemoTrie MonadRandom mtl process random - semigroups tagged time transformers vector vector-space + base colour colour-space constrained-categories containers + data-default deepseq diagrams-cairo diagrams-core diagrams-gtk + diagrams-lib free-vector-spaces glib gtk lens linearmap-category + manifolds MemoTrie MonadRandom mtl process random semigroups tagged + time transformers vector vector-space ]; homepage = "https://github.com/leftaroundabout/dynamic-plot"; description = "Interactive diagram windows"; @@ -56528,9 +54145,9 @@ self: { version = "0.1.0.1"; sha256 = "ee7d3dab776e190aa16c9403580597e5128ca7f32837a0dd5d75b377bd42b6ba"; libraryHaskellDepends = [ base bytestring transformers ]; - jailbreak = true; description = "Bindings to the dywapitchtrack pitch tracking library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "dzen-utils" = callPackage @@ -56553,9 +54170,9 @@ self: { revision = "1"; editedCabalFile = "2bf99bcdc9b979fbe9394e8b77bd1fa9b713da8e04981939cb0ae41b0b2a1963"; libraryHaskellDepends = [ base bytestring network ]; - jailbreak = true; description = "Socket operations with timeouts"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "easy-api" = callPackage @@ -56569,7 +54186,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring either http-conduit mtl resourcet text ]; - jailbreak = true; homepage = "http://github.com/sanetracker/easy-api"; description = "Utility code for building HTTP API bindings more quickly"; license = stdenv.lib.licenses.mit; @@ -56617,7 +54233,6 @@ self: { libraryHaskellDepends = [ base mtl parsec text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/thinkpad20/easyjson"; description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use"; license = stdenv.lib.licenses.mit; @@ -56660,9 +54275,9 @@ self: { version = "0.1.0"; sha256 = "13978e3478583df04499345586b124eb1ec200ec219d71b9532ee7ee86a17764"; libraryHaskellDepends = [ base time ]; - jailbreak = true; description = "Time in ebeats"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ebnf-bff" = callPackage @@ -56679,7 +54294,6 @@ self: { executableHaskellDepends = [ aeson base bytestring cond directory parsec ]; - jailbreak = true; description = "Parser combinators & EBNF, BFFs!"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -56770,7 +54384,6 @@ self: { base containers data-default lens parsec safe transformers ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/fabianbergmark/ECMA-262"; description = "A ECMA-262 interpreter library"; license = stdenv.lib.licenses.bsd2; @@ -56791,7 +54404,6 @@ self: { base bytestring digest directory process vcd ]; executableSystemDepends = [ canlib ]; - jailbreak = true; description = "Tools for automotive ECU development"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -56811,7 +54423,6 @@ self: { testHaskellDepends = [ base bytestring directory doctest filepath hlint QuickCheck ]; - doCheck = false; homepage = "http://thoughtpolice.github.com/hs-ed25519"; description = "Ed25519 cryptographic signatures"; license = stdenv.lib.licenses.mit; @@ -56848,31 +54459,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ede_0_2_8_4" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors - , bytestring, comonad, directory, filepath, free, lens, mtl - , parsers, scientific, semigroups, tasty, tasty-golden, text - , text-format, text-manipulate, trifecta, unordered-containers - , vector - }: - mkDerivation { - pname = "ede"; - version = "0.2.8.4"; - sha256 = "f7fda7bc2d28b87fe7042adfca9fa9f7484c546142ad649dcae1d2ad4af5ae72"; - libraryHaskellDepends = [ - aeson ansi-wl-pprint base bifunctors bytestring comonad directory - filepath free lens mtl parsers scientific semigroups text - text-format text-manipulate trifecta unordered-containers vector - ]; - testHaskellDepends = [ - aeson base bifunctors bytestring directory tasty tasty-golden text - ]; - homepage = "http://github.com/brendanhay/ede"; - description = "Templating language with similar syntax and features to Liquid or Jinja2"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ede" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bifunctors , bytestring, comonad, directory, filepath, free, lens, mtl @@ -56904,7 +54490,6 @@ self: { version = "1.2.0.0"; sha256 = "b2532f00ead8fe8198c6208d72da43b4a5366ecaa8ad2828f359704dd3d26af1"; libraryHaskellDepends = [ base containers deepseq parallel ]; - jailbreak = true; homepage = "http://www.mathematik.uni-marburg.de/~eden"; description = "Semi-explicit parallel programming library"; license = stdenv.lib.licenses.bsd3; @@ -56957,7 +54542,6 @@ self: { executableHaskellDepends = [ ALUT base cmdtheline containers gloss OpenAL random wraparound ]; - jailbreak = true; homepage = "https://qlfiles.net/the-ql-files/the-edge/"; description = "Top view space combat arcade game"; license = stdenv.lib.licenses.gpl3; @@ -57044,7 +54628,6 @@ self: { version = "1.0.0.2"; sha256 = "b17b208bb6fd39d62a90091640b39270fd0d24cd9bcc6f47f3a8f511d2025f96"; libraryHaskellDepends = [ base text vty vty-ui ]; - jailbreak = true; homepage = "https://github.com/maxpow4h/editable"; description = "Interactive editors for Generics"; license = stdenv.lib.licenses.bsd2; @@ -57058,7 +54641,6 @@ self: { version = "0.2.1.1"; sha256 = "9fb64f89a38ad847de7d3537e9dff75d8fcebd12fc789a175cc892a0e4873f80"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://code.haskell.org/editline"; description = "Bindings to the editline library (libedit)"; license = stdenv.lib.licenses.bsd3; @@ -57123,16 +54705,13 @@ self: { }) {}; "effect-monad" = callPackage - ({ mkDerivation, base, ghc-prim, type-level-sets }: + ({ mkDerivation, base, type-level-sets }: mkDerivation { pname = "effect-monad"; - version = "0.6.1"; - sha256 = "884b7f1b26767329051ca846ad20cef871decd992f63c2d7d50475b163d3724d"; - revision = "2"; - editedCabalFile = "5cb34f683ee8c60c89647fd5a283cbe4b640a596cf2608a937a0819503e3b3ea"; - libraryHaskellDepends = [ base ghc-prim type-level-sets ]; - jailbreak = true; - description = "Embeds effect systems into Haskell using parameteric effect monads"; + version = "0.7.0.0"; + sha256 = "de9dbb8ee23595510e3674f090a1e066308f64174ef03dd99a5c75070d825416"; + libraryHaskellDepends = [ base type-level-sets ]; + description = "Embeds effect systems into Haskell using graded monads"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -57153,7 +54732,6 @@ self: { base Cabal ghc-prim hashtables HUnit mtl QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://pleiad.cl/EffectiveAspects"; description = "A monadic embedding of aspect oriented programming"; license = "unknown"; @@ -57176,7 +54754,6 @@ self: { base Cabal ghc-prim hashtables HUnit mzv QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://pleiad.cl/EffectiveAspects"; description = "A monadic embedding of aspect oriented programming, using \"Monads, Zippers and Views\" instead of mtl"; license = "unknown"; @@ -57214,10 +54791,10 @@ self: { version = "0.3.0.1"; sha256 = "2e6a4a183d3626ab2509e7e80461efaeeb7327fa41fe3883f7e4163e9bec9365"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; homepage = "https://github.com/YellPika/effin"; description = "A Typeable-free implementation of extensible effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "egison" = callPackage @@ -57340,7 +54917,6 @@ self: { base bytestring containers mtl transformers ]; librarySystemDepends = [ eibclient ]; - jailbreak = true; description = "EIBd Client"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -57414,8 +54990,8 @@ self: { }: mkDerivation { pname = "ekg"; - version = "0.4.0.10"; - sha256 = "bbae5b230a5fed82010d012c64fa75f3cf7a31335401df3872d79f3f786d6e90"; + version = "0.4.0.11"; + sha256 = "8cd041f6b7da4f57df1795d619f9140a071ed2adb6ed5ade1c3e899957edb603"; libraryHaskellDepends = [ aeson base bytestring ekg-core ekg-json filepath network snap-core snap-server text time transformers unordered-containers @@ -57423,6 +54999,7 @@ self: { homepage = "https://github.com/tibbe/ekg"; description = "Remote monitoring of processes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-bosun" = callPackage @@ -57455,10 +55032,31 @@ self: { base ekg-core network network-carbon text time unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/ocharles/ekg-carbon"; description = "An EKG backend to send statistics to Carbon (part of Graphite monitoring tools)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "ekg-cloudwatch" = callPackage + ({ mkDerivation, amazonka, amazonka-cloudwatch, base, ekg-core + , hspec, lens, text, time, unordered-containers + }: + mkDerivation { + pname = "ekg-cloudwatch"; + version = "0.0.1.4"; + sha256 = "7e086bce6889e5355f15694ab9158ef584aed6060017428fc67e78b302cbe600"; + libraryHaskellDepends = [ + amazonka amazonka-cloudwatch base ekg-core lens text time + unordered-containers + ]; + testHaskellDepends = [ + amazonka amazonka-cloudwatch base ekg-core hspec lens text time + unordered-containers + ]; + homepage = "https://github.com/sellerlabs/ekg-cloudwatch#readme"; + description = "An ekg backend for Amazon Cloudwatch"; + license = stdenv.lib.licenses.bsd3; }) {}; "ekg-core" = callPackage @@ -57482,10 +55080,8 @@ self: { }: mkDerivation { pname = "ekg-json"; - version = "0.1.0.2"; - sha256 = "6236904ae6410eca5c0fb77a076dc6dab926178768e554fd6050544658eec7d8"; - revision = "1"; - editedCabalFile = "6e9eafd4bf78bee8fe55eca517a4a8ea0af2cb11cd418538f84edf4d4fdcde39"; + version = "0.1.0.3"; + sha256 = "3c97d423ac85903d0fed400845c29ccd39f1ca80666b09659a0238983b743317"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -57506,10 +55102,10 @@ self: { aeson base bytestring directory ekg-core fast-logger filepath text time unix unordered-containers ]; - jailbreak = true; homepage = "https://github.com/ixmatus/ekg-log"; description = "Push metrics to a log file"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-push" = callPackage @@ -57523,10 +55119,10 @@ self: { libraryHaskellDepends = [ base bytestring ekg-core text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/adarqui/ekg-push"; description = "Small framework to push metric deltas to a broadcast channel using the ekg-core library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ekg-rrd" = callPackage @@ -57545,31 +55141,12 @@ self: { base ekg-core HUnit test-framework test-framework-hunit text time unordered-containers ]; - jailbreak = true; homepage = "https://bitbucket.org/davecturner/ekg-rrd"; description = "Passes ekg statistics to rrdtool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ekg-statsd_0_2_0_4" = callPackage - ({ mkDerivation, base, bytestring, ekg-core, network, text, time - , unordered-containers - }: - mkDerivation { - pname = "ekg-statsd"; - version = "0.2.0.4"; - sha256 = "ebeddf7dd3427268a35b0dad5f716d9009b676326742b7dd005970d9ab6267f7"; - libraryHaskellDepends = [ - base bytestring ekg-core network text time unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/tibbe/ekg-statsd"; - description = "Push metrics to statsd"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ekg-statsd" = callPackage ({ mkDerivation, base, bytestring, ekg-core, network, text, time , unordered-containers @@ -57645,7 +55222,6 @@ self: { version = "0.2.3"; sha256 = "82b7050b33c3e4710d6afb99122c271592e72892a23d21de4191a559604ba0d4"; libraryHaskellDepends = [ base extensible transformers ]; - jailbreak = true; homepage = "https://github.com/fumieval/elevator"; description = "Immediately lifts to a desired level"; license = stdenv.lib.licenses.bsd3; @@ -57709,7 +55285,6 @@ self: { base bytestring containers elm-compiler elm-core-sources file-embed template-haskell ]; - jailbreak = true; homepage = "http://github.com/JoeyEremondi/elm-build-lib"; description = "Compile Elm code to JS within Haskell"; license = stdenv.lib.licenses.bsd3; @@ -57749,7 +55324,6 @@ self: { test-framework-quickcheck2 text transformers union-find unordered-containers ]; - jailbreak = true; homepage = "http://elm-lang.org"; description = "Values to help with elm-package, elm-make, and elm-lang.org."; license = stdenv.lib.licenses.bsd3; @@ -57772,21 +55346,21 @@ self: { }) {}; "elm-export" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, hspec - , hspec-core, mtl, QuickCheck, quickcheck-instances, text, time + ({ mkDerivation, base, bytestring, containers, directory + , formatting, hspec, hspec-core, mtl, QuickCheck + , quickcheck-instances, text, time }: mkDerivation { pname = "elm-export"; - version = "0.4.0.1"; - sha256 = "9aa94c4d0ed01a6f6344778eee2e87b6489fc9ddd1de87154acb2be67fb7b79e"; + version = "0.4.1.1"; + sha256 = "91e01639707349bf27a8aa9fffa8f30206fc1f50e269d6220403ec585a54e263"; libraryHaskellDepends = [ - base bytestring containers directory mtl text time + base bytestring containers directory formatting mtl text time ]; testHaskellDepends = [ base bytestring containers hspec hspec-core QuickCheck quickcheck-instances text time ]; - jailbreak = true; homepage = "http://github.com/krisajenkins/elm-export"; description = "A library to generate Elm types from Haskell source"; license = "unknown"; @@ -57814,7 +55388,6 @@ self: { directory Elm filepath HTTP http-client http-client-tls http-types mtl network optparse-applicative process vector ]; - jailbreak = true; homepage = "http://github.com/elm-lang/elm-get"; description = "Tool for sharing and using Elm libraries"; license = stdenv.lib.licenses.bsd3; @@ -57842,8 +55415,8 @@ self: { }: mkDerivation { pname = "elm-init"; - version = "1.0.4"; - sha256 = "39f8ec1e64c1a5025f4568ff59b52470e846d777f3cd343176b7a25d672989d3"; + version = "1.0.5"; + sha256 = "29badb1eb03e5960da6f0d89cb7ba8211ca18dc687840c72c3cce9bef1b11270"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -57870,7 +55443,6 @@ self: { containers directory elm-compiler elm-package filepath mtl optparse-applicative text ]; - jailbreak = true; homepage = "http://elm-lang.org"; description = "A build tool for Elm projects"; license = stdenv.lib.licenses.bsd3; @@ -57901,7 +55473,6 @@ self: { http-types mtl network optparse-applicative pretty process text time unordered-containers vector zip-archive ]; - jailbreak = true; homepage = "http://github.com/elm-lang/elm-package"; description = "Package manager for Elm libraries"; license = stdenv.lib.licenses.bsd3; @@ -57988,7 +55559,6 @@ self: { libraryHaskellDepends = [ base blaze-markup Elm shakespeare-js text yesod-core ]; - jailbreak = true; homepage = "http://elm-lang.org"; description = "The Elm language Yesod compatibility module"; license = stdenv.lib.licenses.bsd3; @@ -58023,10 +55593,10 @@ self: { base MonadRandom proctest QuickCheck random tasty tasty-quickcheck tasty-th ]; - jailbreak = true; homepage = "https://www.github.com/sgillespie/elocrypt"; description = "Generate easy-to-remember, hard-to-guess passwords"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "emacs-keys" = callPackage @@ -58043,7 +55613,6 @@ self: { testHaskellDepends = [ base doctest tasty tasty-hspec tasty-quickcheck xkbcommon ]; - jailbreak = true; homepage = "https://github.com/cocreature/emacs-keys"; description = "library to parse emacs style keybinding into the modifiers and the chars"; license = stdenv.lib.licenses.isc; @@ -58062,7 +55631,6 @@ self: { array base bytestring encoding HaskellNet hsemail old-locale old-time parsec process time ]; - jailbreak = true; description = "Sending eMail in Haskell made easy"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58101,7 +55669,6 @@ self: { libraryHaskellDepends = [ aeson attoparsec base bytestring containers HTTP network ]; - jailbreak = true; description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58157,9 +55724,9 @@ self: { base bytestring cmdargs directory dns doctest email-validate HUnit parallel-io pcre-light tasty tasty-hunit ]; - jailbreak = true; description = "Perform basic syntax and deliverability checks on email addresses"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "emailaddress" = callPackage @@ -58201,7 +55768,6 @@ self: { mtl QuickCheck strptime tasty tasty-hunit tasty-quickcheck text text-icu time word8 ]; - jailbreak = true; description = "An email parser that will parse everything"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58266,7 +55832,6 @@ self: { sha256 = "e1167e176cccf02db57c9bfc2725747b4cdea0fbb04accc31998636e56e6ec32"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit QuickCheck syb ]; - jailbreak = true; homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM"; description = "Extensible and Modular Generics for the Masses"; license = stdenv.lib.licenses.bsd3; @@ -58335,10 +55900,10 @@ self: { array base binary bytestring containers extensible-exceptions ghc-prim HaXml mtl regex-compat ]; - jailbreak = true; homepage = "http://code.haskell.org/encoding/"; description = "A library for various character encodings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "encoding-io" = callPackage @@ -58387,10 +55952,10 @@ self: { free monad-loops mwc-random stm stm-delay text transformers unordered-containers vector websockets ]; - jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-growler" = callPackage @@ -58408,7 +55973,6 @@ self: { pipes-attoparsec pipes-wai socket-io text transformers unordered-containers wai wai-websockets websockets ]; - jailbreak = true; homepage = "http://github.com/iand675/growler"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -58428,7 +55992,6 @@ self: { MonadCatchIO-transformers snap-core unordered-containers websockets websockets-snap ]; - jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58448,9 +56011,9 @@ self: { transformers transformers-compat unordered-containers wai wai-websockets websockets ]; - jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engine-io-yesod" = callPackage @@ -58466,8 +56029,8 @@ self: { base bytestring conduit conduit-extra engine-io http-types text unordered-containers wai wai-websockets websockets yesod-core ]; - jailbreak = true; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "engineering-units" = callPackage @@ -58519,7 +56082,6 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "https://github.com/sboosali/enumerate"; description = "enumerate all the values in a finite type (automatically)"; license = stdenv.lib.licenses.mit; @@ -58592,7 +56154,6 @@ self: { version = "0.5.1.0"; sha256 = "acd941d794803ab684bc96fcfcd83807e324945ef35447b5afab08c460fd04bb"; libraryHaskellDepends = [ base enummapset-th ]; - jailbreak = true; homepage = "https://github.com/liyang/enumfun"; description = "Finitely represented /total/ EnumMaps"; license = stdenv.lib.licenses.bsd3; @@ -58616,7 +56177,6 @@ self: { base cereal containers deepseq hspec hspec-expectations HUnit lens QuickCheck safecopy semigroups ]; - jailbreak = true; description = "Map of maps using Enum types as keys"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58685,7 +56245,6 @@ self: { bytestring containers http-types mtl network old-locale text time transformers ]; - jailbreak = true; homepage = "http://github.com/tel/env-parser"; description = "Pull configuration information from the ENV"; license = stdenv.lib.licenses.mit; @@ -58735,29 +56294,6 @@ self: { base bytestring hspec mtl QuickCheck quickcheck-instances text time transformers ]; - jailbreak = true; - description = "An environmentally friendly way to deal with environment variables"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "envy_1_1_0_0" = callPackage - ({ mkDerivation, base, bytestring, containers, hspec, mtl - , QuickCheck, quickcheck-instances, text, time, transformers - }: - mkDerivation { - pname = "envy"; - version = "1.1.0.0"; - sha256 = "27a2496640ea74ceab5a23a3fe8ef325bfb23d64a851f5dfc18b7c3411beca99"; - revision = "1"; - editedCabalFile = "a3922d3ddac9dd572059abbc0a9af991467cf10c93d6fc579c53faa5d3d22c2e"; - libraryHaskellDepends = [ - base bytestring containers mtl text time transformers - ]; - testHaskellDepends = [ - base bytestring hspec mtl QuickCheck quickcheck-instances text time - transformers - ]; - jailbreak = true; description = "An environmentally friendly way to deal with environment variables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -58770,10 +56306,10 @@ self: { version = "2.0.12.4"; sha256 = "1d6a8cd92ffb55b93d52af99c2f5f07c358c67bb2c7e47a813eec1493f2affca"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://epanet.de/developer/haskell.html"; description = "Haskell binding for EPANET"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epass" = callPackage @@ -58783,10 +56319,10 @@ self: { version = "0.2.1"; sha256 = "d58fa2162973e885523ce55a3ccd811eee255fcc27663510ee4913f66fbce569"; libraryHaskellDepends = [ base stm time ]; - jailbreak = true; homepage = "http://github.com/baldo/epass"; description = "Baisc, Erlang-like message passing supporting sockets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "epic" = callPackage @@ -58855,12 +56391,15 @@ self: { }: mkDerivation { pname = "epub-metadata"; - version = "4.3"; - sha256 = "d33be727a9e75fbbba889cd7fe6f502005d809c60720a2544b13bbadbdab853f"; + version = "4.4"; + sha256 = "ca4f9ff02676a1abcbe5433deb655747a11f28e8f4dfcb4b94d7a073ab50bb62"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring containers directory filepath hxt mtl regex-compat zip-archive ]; + executableHaskellDepends = [ base mtl ]; testHaskellDepends = [ base bytestring directory filepath HUnit hxt mtl regex-compat zip-archive @@ -58938,10 +56477,10 @@ self: { base bytestring explicit-exception filemanip transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/equal-files/"; description = "Shell command for finding equal files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "equational-reasoning" = callPackage @@ -58994,10 +56533,10 @@ self: { executableHaskellDepends = [ base bytestring containers graphviz parsec text ]; - jailbreak = true; homepage = "https://github.com/BurntSushi/erd"; description = "An entity-relationship diagram generator from a plain text description"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "erf" = callPackage @@ -59047,7 +56586,6 @@ self: { version = "0.6.0.0"; sha256 = "3c53decd098d5da2ae5bdc1fcdf1c4268ea3ccca7466e92f28518281b160205b"; libraryHaskellDepends = [ aeson base bytestring containers text ]; - jailbreak = true; description = "A text censorship library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59066,7 +56604,6 @@ self: { executableHaskellDepends = [ aeson aeson-pretty base bytestring containers eros text ]; - jailbreak = true; description = "DEPRECATED in favor of eros-http"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59086,7 +56623,6 @@ self: { aeson base blaze-html bytestring eros http-types markdown text wai warp ]; - jailbreak = true; description = "JSON HTTP interface to Eros"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59122,10 +56658,10 @@ self: { version = "0.1.0.0"; sha256 = "3ab057e6686e4d3f3e40266fefba2a314cff087db29e9274c4036447a14b6567"; libraryHaskellDepends = [ base either mtl transformers ]; - jailbreak = true; homepage = "https://github.com/echatav/error-continuations"; description = "Error Continuations"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "error-list" = callPackage @@ -59135,10 +56671,10 @@ self: { version = "0.1.0.3"; sha256 = "3248165acff3927d9e7f9aee206a146e285a9a17a7cd574b10a540f298be194c"; libraryHaskellDepends = [ base mtl text text-render ]; - jailbreak = true; homepage = "http://github.com/thinkpad20/error-list"; description = "A useful type for collecting error messages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "error-loc" = callPackage @@ -59148,10 +56684,10 @@ self: { version = "0.1.0.0"; sha256 = "a52e905a87edc15a1788e38de53f600c1c4f744e3bb08ac7f3a25c7746610732"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; homepage = "https://github.com/joelteon/error-loc"; description = "An error replacement with call-site metadata"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "error-location" = callPackage @@ -59177,7 +56713,6 @@ self: { libraryHaskellDepends = [ ansi-wl-pprint base containers either-unwrap InfixApplicative mtl ]; - jailbreak = true; homepage = "http://github.com/gcross/error-message"; description = "Composable error messages"; license = stdenv.lib.licenses.bsd3; @@ -59191,10 +56726,10 @@ self: { version = "0.0.1.1"; sha256 = "68d133f2211d9be2f66f7529d1d2251ec13f12f9ccdd5f1c96be53f09cf3e193"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://github.com/pmlodawski/error-util"; description = "Set of utils and operators for error handling"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "errorcall-eq-instance" = callPackage @@ -59224,6 +56759,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ersaconcat" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, HTTP + , network-uri, process, QuickCheck, tagsoup, template-haskell + }: + mkDerivation { + pname = "ersaconcat"; + version = "0.0.1"; + sha256 = "7652c59b606769366babbff4b657cd8422ddb3f4aeb62afcc8ed0ce1a3ec139f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base directory filepath HTTP network-uri process tagsoup + ]; + executableHaskellDepends = [ + base directory filepath HTTP network-uri process tagsoup + ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/tonymorris/ersaconcat"; + description = "A script to concatenate AIP ERSA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ersatz" = callPackage ({ mkDerivation, array, base, bytestring, containers, data-default , directory, doctest, filepath, lens, mtl, parsec, process @@ -59243,7 +56802,6 @@ self: { array base containers lens mtl parsec ]; testHaskellDepends = [ base directory doctest filepath ]; - doCheck = false; homepage = "http://github.com/ekmett/ersatz"; description = "A monad for expressing SAT or QSAT problems using observable sharing"; license = stdenv.lib.licenses.bsd3; @@ -59262,7 +56820,6 @@ self: { libraryHaskellDepends = [ array base containers ersatz toysolver transformers ]; - jailbreak = true; homepage = "https://github.com/msakai/ersatz-toysat"; description = "toysat driver as backend for ersatz"; license = stdenv.lib.licenses.bsd3; @@ -59287,10 +56844,27 @@ self: { executableHaskellDepends = [ aeson attoparsec base bytestring yaml ]; - jailbreak = true; homepage = "https://bitbucket.org/kayo/ert"; description = "Easy Runtime Templates"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "escape-artist" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck, silently + , text + }: + mkDerivation { + pname = "escape-artist"; + version = "1.0.0"; + sha256 = "50bd3a9b1e8773abff8d2a863c014978a74f3d4cd17a0c14cd8f4fdfb5740c7e"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base bytestring hspec QuickCheck silently text + ]; + homepage = "https://github.com/EarthCitizen/escape-artist#readme"; + description = "ANSI Escape Sequence Text Decoration Made Easy"; + license = stdenv.lib.licenses.bsd3; }) {}; "esotericbot" = callPackage @@ -59312,7 +56886,6 @@ self: { stream-fusion tuple unix ]; doHaddock = false; - jailbreak = true; homepage = "http://www.killersmurf.com/projects/esotericbot"; description = "Esotericbot is a sophisticated, lightweight IRC bot"; license = stdenv.lib.licenses.bsd3; @@ -59340,7 +56913,6 @@ self: { persistent persistent-sqlite persistent-template QuickCheck resourcet text transformers ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/esqueleto"; description = "Type-safe EDSL for SQL queries on persistent backends"; license = stdenv.lib.licenses.bsd3; @@ -59354,10 +56926,10 @@ self: { version = "0.1.0.0"; sha256 = "98ad5094a53857d5817e3e0b8e9b5572cfe80a6b3d139c5a0d863d9377d2b95f"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/michaelochurch/ess"; description = "The type-level S combinator in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "estimator" = callPackage @@ -59387,7 +56959,6 @@ self: { base binary containers deepseq list-tries MonadRandom mtl pretty prettyclass QuickCheck text ]; - jailbreak = true; description = "Tool for managing probability estimation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59404,7 +56975,6 @@ self: { executableHaskellDepends = [ base bio bytestring containers random ]; - jailbreak = true; homepage = "http://blog.malde.org/"; description = "Repeats from ESTs"; license = "GPL"; @@ -59425,7 +56995,6 @@ self: { aeson base bytestring http-conduit text time ]; testHaskellDepends = [ async base hspec MonadRandom mtl text ]; - doCheck = false; description = "Client for etcd, a highly-available key value store"; license = "unknown"; }) {}; @@ -59574,7 +57143,6 @@ self: { base directory hlint hspec process regex-posix xml ]; testToolDepends = [ happy ]; - jailbreak = true; homepage = "https://github.com/decomputed/euler"; description = "Mathematics utilities for Haskell"; license = stdenv.lib.licenses.mit; @@ -59613,7 +57181,6 @@ self: { base bytestring conduit containers failure hexpat http-conduit http-types monad-control mtl time ]; - jailbreak = true; description = "Free foreign exchange/currency feed from the European Central Bank"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -59693,6 +57260,22 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "event-transformer" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "event-transformer"; + version = "0.1.0.0"; + sha256 = "98eabb7332a88d39fcf8c208bb9890c692e49601674112c117d6eb8d4085436e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base transformers ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/schell/event-transformer#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "eventloop" = callPackage ({ mkDerivation, aeson, base, bytestring, concurrent-utilities , deepseq, network, stm, suspend, text, timers, websockets @@ -59732,33 +57315,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "eventstore_0_12_0_0" = callPackage - ({ mkDerivation, aeson, array, async, base, bytestring, cereal - , containers, dns, dotnet-timespan, http-client, network, protobuf - , random, semigroups, stm, tasty, tasty-hunit, text, time - , unordered-containers, uuid - }: - mkDerivation { - pname = "eventstore"; - version = "0.12.0.0"; - sha256 = "c88c65239fd37b4ede7e291ac714384f89aaff6235d65bd41cdbc7421554fda5"; - libraryHaskellDepends = [ - aeson array async base bytestring cereal containers dns - dotnet-timespan http-client network protobuf random semigroups stm - text time unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base dotnet-timespan stm tasty tasty-hunit text time - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/YoEight/eventstore"; - description = "EventStore TCP Client"; - license = stdenv.lib.licenses.bsd3; - platforms = [ "x86_64-darwin" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "eventstore" = callPackage ({ mkDerivation, aeson, array, async, base, bytestring, cereal , connection, containers, dns, dotnet-timespan, http-client @@ -59778,33 +57334,32 @@ self: { aeson base connection dotnet-timespan stm tasty tasty-hunit text time ]; - doCheck = false; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "eventstore_0_13_1_3" = callPackage - ({ mkDerivation, aeson, array, async, base, bytestring, cereal + "eventstore_0_13_1_7" = callPackage + ({ mkDerivation, aeson, array, base, cereal, classy-prelude , connection, containers, dns, dotnet-timespan, http-client , protobuf, random, semigroups, stm, tasty, tasty-hunit, text, time , unordered-containers, uuid }: mkDerivation { pname = "eventstore"; - version = "0.13.1.3"; - sha256 = "027dda722c410a7b528537c4f296040b90c16cf91d95362356e608c672de6b2a"; + version = "0.13.1.7"; + sha256 = "a0c6ea5e91f56dc8027bb34825c1382c31cd26ac291c5a7c988bec0681c5e8d8"; libraryHaskellDepends = [ - aeson array async base bytestring cereal connection containers dns - dotnet-timespan http-client protobuf random semigroups stm text - time unordered-containers uuid + aeson array base cereal classy-prelude connection containers dns + dotnet-timespan http-client protobuf random semigroups stm time + unordered-containers uuid ]; testHaskellDepends = [ - aeson base connection dotnet-timespan stm tasty tasty-hunit text - time + aeson base classy-prelude connection dotnet-timespan stm tasty + tasty-hunit text time uuid ]; - jailbreak = true; homepage = "http://github.com/YoEight/eventstore"; description = "EventStore TCP Client"; license = stdenv.lib.licenses.bsd3; @@ -59856,10 +57411,10 @@ self: { libraryHaskellDepends = [ base exceptions hashable stm time transformers vector ]; - jailbreak = true; homepage = "https://github.com/kim/ex-pool"; description = "Another fork of resource-pool, with a MonadIO and MonadCatch constraint"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exact-combinatorics" = callPackage @@ -59900,7 +57455,6 @@ self: { base checkers directory doctest filepath groups QuickCheck random tasty tasty-hunit tasty-quickcheck tasty-th ]; - jailbreak = true; homepage = "http://github.com/expipiplus1/exact-real"; description = "Exact real arithmetic"; license = stdenv.lib.licenses.mit; @@ -59914,7 +57468,6 @@ self: { version = "0.0.0.2"; sha256 = "8c899c08ce4cc7b3d599d1938ddfb12c03ac7b6088ed24a4ae1f62f1eb1d67d2"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; homepage = "yet"; description = "Exception type hierarchy with TemplateHaskell"; license = stdenv.lib.licenses.bsd3; @@ -59944,10 +57497,10 @@ self: { libraryHaskellDepends = [ base exception-transformers monads-fd transformers ]; - jailbreak = true; homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "Exception monad transformer instances for monads-fd classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-monads-tf" = callPackage @@ -59961,9 +57514,9 @@ self: { libraryHaskellDepends = [ base exception-transformers monads-tf transformers ]; - jailbreak = true; description = "Exception monad transformer instances for monads-tf classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exception-mtl" = callPackage @@ -60041,10 +57594,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base directory process text ]; - jailbreak = true; homepage = "https://github.com/wapxmas/execs#readme"; description = "Tool to run stack exec prj-exe more easy"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "executable-hash" = callPackage @@ -60090,7 +57643,6 @@ self: { libraryHaskellDepends = [ base generics-sop template-haskell transformers ]; - jailbreak = true; homepage = "http://github.com/ocharles/exhaustive"; description = "Compile time checks that a computation considers producing data through all possible constructors"; license = stdenv.lib.licenses.bsd3; @@ -60116,9 +57668,9 @@ self: { http-types optparse-applicative pcre-light ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; description = "Exheres generator for cabal packages"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exif" = callPackage @@ -60138,10 +57690,9 @@ self: { ({ mkDerivation, base, constraints, singletons }: mkDerivation { pname = "exinst"; - version = "0.1.1"; - sha256 = "ed8e30b2671102878767f275304e10d584b6e6e2e42fb179b5514b54dfc67147"; + version = "0.1.2"; + sha256 = "61f1ad1d9ea25e7ff6edca9ac4b01681e6ab5d0af577c1c07c78afdac1ef5cfa"; libraryHaskellDepends = [ base constraints singletons ]; - jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -60152,12 +57703,11 @@ self: { ({ mkDerivation, aeson, base, constraints, exinst, singletons }: mkDerivation { pname = "exinst-aeson"; - version = "0.1.0.1"; - sha256 = "bc916d6b4c3e6617b1b82e895b8a373f9ee1f2bf7c9b22efb43e8fb616995162"; + version = "0.1.0.2"; + sha256 = "da509d6ab2c73c22cf718c3b08dcf2327b42abb0f5d0273d38ae4c530f737fa1"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; - jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `aeson` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -60168,12 +57718,11 @@ self: { ({ mkDerivation, base, bytes, constraints, exinst, singletons }: mkDerivation { pname = "exinst-bytes"; - version = "0.1.0.1"; - sha256 = "5dc66779093560fce4d5c4722615dab2d330d5c29bca4937981b009a391a8e67"; + version = "0.1.0.2"; + sha256 = "cc830f4af107b32738f83ef87eb1f77f08453758645bd0519d734beb311dec29"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; - jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `bytes` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -60184,10 +57733,9 @@ self: { ({ mkDerivation, base, constraints, deepseq, exinst }: mkDerivation { pname = "exinst-deepseq"; - version = "0.1"; - sha256 = "ea7e155a3a09064f65c39cd5e4323a64b8bf8dc4aa32de33b3495207315c361d"; + version = "0.1.0.1"; + sha256 = "078e2bb2f7759555976305fcabae776e7ae331f21a9ac3e5d563f923198f3799"; libraryHaskellDepends = [ base constraints deepseq exinst ]; - jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `deepseq` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -60198,12 +57746,11 @@ self: { ({ mkDerivation, base, constraints, exinst, hashable, singletons }: mkDerivation { pname = "exinst-hashable"; - version = "0.1.0.1"; - sha256 = "7e76bd3604659dcb861a269362e1311bfe26ac92d5b88d6d6aa8253136c9ba68"; + version = "0.1.0.2"; + sha256 = "3a3051b1a0ccdd13317dcf190944609604f6ce5004a7b05d8327b7202a90ee65"; libraryHaskellDepends = [ base constraints exinst hashable singletons ]; - jailbreak = true; homepage = "https://github.com/k0001/exinst"; description = "Derive instances for the `hashable` library for your existential types"; license = stdenv.lib.licenses.bsd3; @@ -60220,7 +57767,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base lens QuickCheck template-haskell ]; executableHaskellDepends = [ base lens ]; - jailbreak = true; homepage = "https://bitbucket.org/cipher2048/existential/wiki/Home"; description = "A library for existential types"; license = stdenv.lib.licenses.mit; @@ -60234,7 +57780,6 @@ self: { version = "0.2"; sha256 = "fe69c878ed93c8e5aade799c458edaca06b16c4548512ee8b4a0e32a8f13fbb8"; libraryHaskellDepends = [ base contravariant ]; - jailbreak = true; homepage = "http://github.com/glehel/exists"; description = "Existential datatypes holding evidence of constraints"; license = stdenv.lib.licenses.bsd3; @@ -60263,6 +57808,7 @@ self: { homepage = "http://code.mathr.co.uk/exp-extended"; description = "floating point with extended exponent range"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "exp-pairs" = callPackage @@ -60286,6 +57832,28 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "exp-pairs_0_1_5_2" = callPackage + ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix + , QuickCheck, random, smallcheck, tasty, tasty-hunit + , tasty-quickcheck, tasty-smallcheck, wl-pprint + }: + mkDerivation { + pname = "exp-pairs"; + version = "0.1.5.2"; + sha256 = "8dadc2dc4b4f666c9fe70068634a1eb07598943d6ace86560878ed8ec0aeac9d"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim wl-pprint + ]; + testHaskellDepends = [ + base matrix QuickCheck random smallcheck tasty tasty-hunit + tasty-quickcheck tasty-smallcheck + ]; + homepage = "https://github.com/Bodigrim/exp-pairs"; + description = "Linear programming over exponent pairs"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "expand" = callPackage ({ mkDerivation, AspectAG, base, HList, murder, uu-parsinglib }: mkDerivation { @@ -60295,7 +57863,6 @@ self: { libraryHaskellDepends = [ AspectAG base HList murder uu-parsinglib ]; - jailbreak = true; description = "Extensible Pandoc"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -60312,33 +57879,12 @@ self: { libraryHaskellDepends = [ base bytestring enumerator hexpat text transformers xml-types ]; - jailbreak = true; homepage = "http://john-millikin.com/software/expat-enumerator/"; description = "Enumerator-based API for Expat"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "expiring-cache-map_0_0_5_4" = callPackage - ({ mkDerivation, base, bytestring, containers, hashable, time - , unordered-containers - }: - mkDerivation { - pname = "expiring-cache-map"; - version = "0.0.5.4"; - sha256 = "088ec3c56e23825f8709b185a97c8e3e485f2775d7299c58e62fc5992e4e7d71"; - libraryHaskellDepends = [ - base containers hashable unordered-containers - ]; - testHaskellDepends = [ - base bytestring containers hashable time unordered-containers - ]; - homepage = "https://github.com/elblake/expiring-cache-map"; - description = "General purpose simple caching"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "expiring-cache-map" = callPackage ({ mkDerivation, base, bytestring, containers, hashable, time , unordered-containers @@ -60380,7 +57926,6 @@ self: { executableHaskellDepends = [ ansi-wl-pprint base haskell-src-exts ]; - jailbreak = true; homepage = "https://github.com/joelteon/explain"; description = "Show how expressions are parsed"; license = stdenv.lib.licenses.mit; @@ -60394,10 +57939,10 @@ self: { version = "0.1.0.0"; sha256 = "9ed4750f815408ee8d43185ba57f964e5bd093e8373b81621da5c3fde99a403c"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/jwaldmann/haskell-explicit-determinant"; description = "explicit computation of determinant of small matrices"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "explicit-exception" = callPackage @@ -60419,10 +57964,10 @@ self: { version = "0.6.0.5"; sha256 = "ed376a5af54934624af64bae2d2233d56366f2fe838c3e4ef537aa68fc0f3f47"; libraryHaskellDepends = [ base base-unicode-symbols tagged ]; - jailbreak = true; homepage = "https://github.com/basvandijk/explicit-iomodes/"; description = "File handles with explicit IOModes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "explicit-iomodes-bytestring" = callPackage @@ -60432,10 +57977,10 @@ self: { version = "0.2.0.2"; sha256 = "129ac02fbe52ca948a0d9bdcfbda20e9b5fc30b48924a847fea83fd1e6a36d40"; libraryHaskellDepends = [ base bytestring explicit-iomodes ]; - jailbreak = true; homepage = "https://github.com/basvandijk/explicit-iomodes-bytestring/"; description = "Extends explicit-iomodes with ByteString operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "explicit-iomodes-text" = callPackage @@ -60445,10 +57990,10 @@ self: { version = "0.1.0.8"; sha256 = "cf576820f38d549ddd7870bbcdbad6b5aba1c89e1fcdf29643970719142fde8a"; libraryHaskellDepends = [ base explicit-iomodes text ]; - jailbreak = true; homepage = "https://github.com/basvandijk/explicit-iomodes-text/"; description = "Extends explicit-iomodes with Text operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "explicit-sharing" = callPackage @@ -60460,7 +58005,6 @@ self: { libraryHaskellDepends = [ base containers derive mtl template-haskell ]; - jailbreak = true; homepage = "http://sebfisch.github.com/explicit-sharing"; description = "Explicit Sharing of Monadic Effects"; license = stdenv.lib.licenses.publicDomain; @@ -60498,7 +58042,6 @@ self: { array base ChasingBottoms deepseq ghc-prim HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; description = "A distribution of the 'containers' package, with all modules exposed"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -60563,7 +58106,6 @@ self: { version = "0.2.0"; sha256 = "e2e016c10bf167fe47277b8fedf3ad6c524c507dffabe7ebd8e5d1aff1fee9b5"; libraryHaskellDepends = [ base constraints ghc-prim tagged ]; - jailbreak = true; homepage = "github.com/ian-mi/extended-categories"; description = "Extended Categories"; license = stdenv.lib.licenses.bsd3; @@ -60619,7 +58161,6 @@ self: { libraryHaskellDepends = [ base data-lens hashable template-haskell unordered-containers ]; - jailbreak = true; description = "Sums/products/lists/trees which can be extended in other modules"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -60704,7 +58245,6 @@ self: { testHaskellDepends = [ base clock directory filepath QuickCheck time unix ]; - jailbreak = true; homepage = "https://github.com/ndmitchell/extra#readme"; description = "Extra functions I use"; license = stdenv.lib.licenses.bsd3; @@ -60746,10 +58286,10 @@ self: { base bytestring bytestring-mmap directory elf filepath optparse-applicative ]; - jailbreak = true; homepage = "https://github.com/Peaker/extractelf"; description = "Extract an ELF's metadata and sections into files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -60771,7 +58311,6 @@ self: { random resourcet string-conversions text time unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/ez-couch"; description = "A high level static library for working with CouchDB"; license = stdenv.lib.licenses.mit; @@ -60785,7 +58324,6 @@ self: { version = "0.0.2.0"; sha256 = "0374e69df55022c99b537eebcd156bbed3ecea53285910eaf5fd5d9c4553ef2a"; libraryHaskellDepends = [ base free ]; - jailbreak = true; homepage = "http://github.com/haskell-faceted/haskell-faceted"; description = "Faceted computation for dynamic information flow security"; license = stdenv.lib.licenses.asl20; @@ -60793,23 +58331,25 @@ self: { }) {}; "factory" = callPackage - ({ mkDerivation, array, base, Cabal, containers, deepseq, parallel - , primes, QuickCheck, random, toolshed + ({ mkDerivation, array, base, Cabal, containers, data-default + , deepseq, parallel, primes, QuickCheck, random, toolshed }: mkDerivation { pname = "factory"; - version = "0.2.1.2"; - sha256 = "0d8d4c53c948e1e577a2813c6c512bb25615dfad790839414705b53ed5b402bd"; + version = "0.2.2.1"; + sha256 = "609110e81f03977ae089b8b5237339543d0023c8f02f5c16415ed79b4f9ca597"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers deepseq parallel primes random toolshed + array base containers data-default deepseq parallel primes random + toolshed ]; executableHaskellDepends = [ - array base Cabal containers deepseq random toolshed + array base Cabal containers data-default deepseq random toolshed ]; testHaskellDepends = [ - array base containers deepseq primes QuickCheck random toolshed + array base containers data-default deepseq primes QuickCheck random + toolshed ]; homepage = "http://functionalley.eu/Factory/factory.html"; description = "Rational arithmetic in an irrational world"; @@ -60849,21 +58389,37 @@ self: { }) {}; "fadno-braids" = callPackage - ({ mkDerivation, base, containers, diagrams, diagrams-lib - , diagrams-rasterific, lens, transformers-compat + ({ mkDerivation, base, containers, data-default, diagrams + , diagrams-lib, diagrams-rasterific, lens, random + , transformers-compat }: mkDerivation { pname = "fadno-braids"; - version = "0.0.2"; - sha256 = "1d874bef4fa5c693e3b5aac15f239a2d4862b7c342ea96fe24c476d1511644a9"; + version = "0.0.5"; + sha256 = "97f99926a2481fc9a0964b35b377ee206623d087b36a842fcbf66541890d39d8"; libraryHaskellDepends = [ - base containers diagrams diagrams-lib diagrams-rasterific lens - transformers-compat + base containers data-default diagrams diagrams-lib + diagrams-rasterific lens random transformers-compat ]; - jailbreak = true; homepage = "http://github.com/slpopejoy/"; description = "Braid representations in Haskell"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "fadno-xml" = callPackage + ({ mkDerivation, base, containers, Decimal, lens, mtl, parsec, xml + }: + mkDerivation { + pname = "fadno-xml"; + version = "1.0.3"; + sha256 = "714e0e438827c4fee58fdced7cd018490f37705e830da428f77d58fa8268cccf"; + libraryHaskellDepends = [ + base containers Decimal lens mtl parsec xml + ]; + homepage = "http://github.com/slpopejoy/fadno-xml"; + description = "XML/XSD combinators/schemas/codegen"; + license = stdenv.lib.licenses.bsd2; }) {}; "fail" = callPackage @@ -60937,10 +58493,10 @@ self: { sha256 = "3ce6a7298e92c836272d71fb9f604cb37d2c90a2394720c6b67c1b6f21063c54"; libraryHaskellDepends = [ base base-prelude split X11 ]; librarySystemDepends = [ libXtst ]; - jailbreak = true; homepage = "http://github.com/aelve/fake-type"; description = "A crossplatform library to simulate keyboard input"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libXtst;}; "faker" = callPackage @@ -60988,7 +58544,6 @@ self: { executableHaskellDepends = [ base containers haskell98 SDL SDL-mixer SDL-ttf ]; - jailbreak = true; homepage = "http://bencode.blogspot.com/2009/03/falling-blocks-tetris-clone-in-haskell.html"; description = "A fun falling blocks game"; license = "GPL"; @@ -61007,7 +58562,6 @@ self: { base binary containers hashable intervals lens tables text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/Taneb/family-tree"; description = "A family tree library for the Haskell programming language"; license = stdenv.lib.licenses.bsd3; @@ -61067,13 +58621,14 @@ self: { }: mkDerivation { pname = "fast-logger"; - version = "2.4.6"; - sha256 = "d45640acb40bf9b6f81cbe63e3587b6e59d9ec24a15401e52bdc7969b6f2cfd1"; + version = "2.4.7"; + sha256 = "201b07d898da91472aa86662399feb093a7379bc04315f8e84db52fbf3464a38"; libraryHaskellDepends = [ array auto-update base bytestring bytestring-builder directory easy-file filepath text unix unix-time ]; testHaskellDepends = [ base bytestring directory hspec ]; + homepage = "https://github.com/kazu-yamamoto/logger"; description = "A fast logging system"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -61170,7 +58725,6 @@ self: { version = "0.2.0.0"; sha256 = "958d6da0e807f2294cff0b10c395eb0b734eea3d6ef1fc1d5da33dc4617619db"; libraryHaskellDepends = [ base hmatrix vector ]; - jailbreak = true; homepage = "https://github.com/cscherrer/fastbayes"; description = "Bayesian modeling algorithms accelerated for particular model structures"; license = stdenv.lib.licenses.mit; @@ -61208,9 +58762,9 @@ self: { base base-prelude bytestring edit-distance file-embed hspec QuickCheck ]; - jailbreak = true; description = "find nearest neighbours by edit-distance"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fastirc" = callPackage @@ -61240,10 +58794,10 @@ self: { libraryHaskellDepends = [ base bytestring cassava hxt network-uri text ]; - jailbreak = true; homepage = "https://github.com/guiltydolphin/fathead-util"; description = "Utilities for working with DuckDuckHack's FatHead Instant Answers"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fault-tree" = callPackage @@ -61290,7 +58844,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "fay_0_23_1_15" = callPackage + "fay_0_23_1_16" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , data-default, data-lens-light, directory, filepath, ghc-paths , haskell-src-exts, language-ecmascript, mtl, mtl-compat @@ -61301,8 +58855,8 @@ self: { }: mkDerivation { pname = "fay"; - version = "0.23.1.15"; - sha256 = "d8a1912c8359877e8d9cfec4c07275d21167cb03e607f7dd8190d201d967af59"; + version = "0.23.1.16"; + sha256 = "c46ef8cb7980bcf62ef7ccc9897e9c4246e6bec8cafc06d49ebe1d5bcd618a64"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -61314,7 +58868,6 @@ self: { utf8-string vector ]; executableHaskellDepends = [ base mtl optparse-applicative split ]; - jailbreak = true; homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = stdenv.lib.licenses.bsd3; @@ -61381,7 +58934,6 @@ self: { version = "0.2.0"; sha256 = "b1fef2c647e7c067fbaffb33094c13c7c7a94c4cf0b1fbdefb4c1ee691b2f2d7"; libraryHaskellDepends = [ fay-base fay-jquery ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Clientside HTML generation for fay"; license = stdenv.lib.licenses.bsd3; @@ -61460,8 +59012,6 @@ self: { http-conduit HUnit lifted-base monad-control QuickCheck resourcet text time transformers ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/prowdsponsor/fb"; description = "Bindings to Facebook's API"; license = stdenv.lib.licenses.bsd3; @@ -61474,10 +59024,10 @@ self: { version = "0.3.6"; sha256 = "9a24e190b70fd3bcd5a70813e50872398217b24d39da76b175cbcbbd693580c6"; libraryHaskellDepends = [ base cereal fb persistent text time ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/fb-persistent"; description = "Provides Persistent instances to Facebook types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fbmessenger-api" = callPackage @@ -61506,6 +59056,7 @@ self: { homepage = "https://github.com/mseri/fbmessenger-api-hs#fbmessenger-api"; description = "High-level bindings to Facebook Messenger Platform API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fca" = callPackage @@ -61520,9 +59071,9 @@ self: { base bytestring containers cryptohash hashable text unordered-containers ]; - jailbreak = true; description = "Algo for Formal Concept Analysis"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fcache" = callPackage @@ -61570,7 +59121,6 @@ self: { version = "0.1"; sha256 = "bd18cb1a282478e11d084c3d60fcac139c5e68e0c80801e5206146aed2b47afb"; libraryHaskellDepends = [ base cgi HaXml xhtml ]; - jailbreak = true; homepage = "http://peteg.org/"; description = "Server-Side Integration for FCKeditor"; license = stdenv.lib.licenses.bsd3; @@ -61582,8 +59132,8 @@ self: { }: mkDerivation { pname = "fclabels"; - version = "2.0.3"; - sha256 = "b43e4dcc9000be435145b13b97e0997ec1fb8291ec0af8f18cf2a2b696d9ce43"; + version = "2.0.3.1"; + sha256 = "b993e35fd89945669c8b3cd95fa9dee618eb6a5256f8909ccbdc8ec713f75c8b"; libraryHaskellDepends = [ base mtl template-haskell transformers ]; testHaskellDepends = [ base HUnit mtl template-haskell transformers @@ -61600,9 +59150,9 @@ self: { version = "0.2.1"; sha256 = "6de42ff53b6ae613cd49c5e9c6a0157201876c97c66baea75c565a7e737725c8"; libraryHaskellDepends = [ base fclabels monadLib ]; - jailbreak = true; description = "MonadLib monadic interface for the \"fclabels\" package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fdo-notify" = callPackage @@ -61681,10 +59231,10 @@ self: { aeson base bytestring containers hlint HsOpenSSL hspec http-streams io-streams lens text ]; - jailbreak = true; homepage = "https://github.com/relrod/fedora-packages-hs"; description = "Haskell interface to the Fedora Packages webapp API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed" = callPackage @@ -61695,8 +59245,8 @@ self: { pname = "feed"; version = "0.3.11.1"; sha256 = "ed04d0fc120a4b1b47c7675d395afbb419506431bc6f8e0f2c382c73a4afc983"; - revision = "2"; - editedCabalFile = "a59224b7f2b31906c2decebe084684888ce6319e04645791378e385741e36e28"; + revision = "3"; + editedCabalFile = "0baffc9bcab66296a904d211d4254f625811dc28eda4f1be0692cc2b219a6bdd"; libraryHaskellDepends = [ base old-locale old-time time time-locale-compat utf8-string xml ]; @@ -61722,7 +59272,6 @@ self: { executableHaskellDepends = [ base directory feed old-locale old-time time xml ]; - jailbreak = true; homepage = "http://www.syntaxpolice.org/darcs_repos/feed-cli"; description = "A simple command line interface for creating and updating feeds like RSS"; license = stdenv.lib.licenses.bsd3; @@ -61759,10 +59308,10 @@ self: { base bytestring conduit connection http-conduit http-types hxt network-uri text transformers ]; - jailbreak = true; homepage = "https://github.com/danchoi/feed-crawl"; description = "Utility for fetching feeds with redirect info and HTML link detection"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "feed-gipeda" = callPackage @@ -61822,7 +59371,6 @@ self: { cryptohash feed iso639 lens naver-translate network-uri raw-strings-qq scotty text transformers wai warp wreq xml ]; - jailbreak = true; homepage = "https://github.com/dahlia/feed-translator"; description = "Translate syndication feeds"; license = stdenv.lib.licenses.agpl3; @@ -61887,7 +59435,6 @@ self: { base bytestring Cabal feldspar-language mtl process QuickCheck tasty tasty-golden tasty-quickcheck ]; - jailbreak = true; homepage = "http://feldspar.github.com"; description = "Compiler for the Feldspar language"; license = stdenv.lib.licenses.bsd3; @@ -61913,7 +59460,6 @@ self: { base bytestring QuickCheck random tasty tasty-golden tasty-quickcheck tasty-th utf8-string ]; - jailbreak = true; homepage = "http://feldspar.github.com"; description = "A functional embedded language for DSP and parallelism"; license = stdenv.lib.licenses.bsd3; @@ -61933,7 +59479,6 @@ self: { base base-compat feldspar-compiler feldspar-compiler-shim feldspar-language imperative-edsl mainland-pretty monadic-edsl-priv ]; - jailbreak = true; homepage = "https://github.com/markus-git/feldspar-signal"; description = "Signal Processing extension for Feldspar"; license = stdenv.lib.licenses.bsd3; @@ -62036,9 +59581,9 @@ self: { errors filepath hashable HStringTemplate lens mtl process pureMD5 split template-haskell transformers unordered-containers ]; - jailbreak = true; description = "automatic C++ binding generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fficxx-runtime" = callPackage @@ -62085,31 +59630,12 @@ self: { executableHaskellDepends = [ base bytestring haskell98 hs-ffmpeg SDL stm ]; - jailbreak = true; homepage = "http://patch-tag.com/r/VasylPasternak/ffmpeg-tutorials"; description = "Tutorials on ffmpeg usage to play video/audio"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "fft_0_1_8_3" = callPackage - ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable - , QuickCheck, storable-complex, syb, transformers - }: - mkDerivation { - pname = "fft"; - version = "0.1.8.3"; - sha256 = "73f450978f2b1f2d6d549aa5a81aaeeadfe153bd8f3ce935690b149a036a3896"; - libraryHaskellDepends = [ - array base carray ix-shapable storable-complex syb transformers - ]; - libraryPkgconfigDepends = [ fftw fftwFloat ]; - testHaskellDepends = [ base carray QuickCheck storable-complex ]; - description = "Bindings to the FFTW library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;}; - "fft" = callPackage ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable , QuickCheck, storable-complex, syb, transformers @@ -62208,7 +59734,6 @@ self: { containers directory filepath hslogger mtl old-locale old-time process regex-compat statistics syb tabular time vector ]; - jailbreak = true; homepage = "http://github.com/dmpots/fibon/wiki"; description = "Tools for running and analyzing Haskell benchmarks"; license = stdenv.lib.licenses.bsd3; @@ -62267,7 +59792,6 @@ self: { sha256 = "47eec77d3f34a55e8a0cab809d9181b36d80c4058ca22b5f128827306de1b4d6"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; - jailbreak = true; description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components"; license = stdenv.lib.licenses.bsd2; hydraPlatforms = stdenv.lib.platforms.none; @@ -62294,10 +59818,10 @@ self: { libraryHaskellDepends = [ base bytestring clock directory zip-archive ]; - jailbreak = true; homepage = "https://github.com/joelwilliamson/file-collection"; description = "Provide a uniform interface over file archives and directories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "file-command-qq" = callPackage @@ -62311,10 +59835,10 @@ self: { libraryHaskellDepends = [ base parsec process system-filepath template-haskell text ]; - jailbreak = true; homepage = "https://github.com/jfischoff/file-command-qq"; description = "Quasiquoter for system commands involving filepaths"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "file-embed" = callPackage @@ -62366,37 +59890,12 @@ self: { transformers ]; testHaskellDepends = [ base lifted-base process ]; - jailbreak = true; homepage = "https://github.com/gregwebs/FileLocation.hs"; description = "common functions that show file location information"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "file-modules_0_1_2_3" = callPackage - ({ mkDerivation, async, base, directory, filepath, haskell-src-exts - , MissingH, regex-compat, regex-pcre - }: - mkDerivation { - pname = "file-modules"; - version = "0.1.2.3"; - sha256 = "e932a7087e2de523a2c9bebc4070623e6d87520ea31439377be0b1c0845b8c95"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base directory filepath haskell-src-exts MissingH - regex-compat regex-pcre - ]; - executableHaskellDepends = [ - async base directory filepath haskell-src-exts MissingH - regex-compat regex-pcre - ]; - homepage = "https://github.com/yamadapc/stack-run-auto"; - description = "Takes a Haskell source-code file and outputs its modules"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "file-modules" = callPackage ({ mkDerivation, async, base, directory, filepath, haskell-src-exts , MissingH, regex-compat, regex-pcre @@ -62458,10 +59957,10 @@ self: { testHaskellDepends = [ base directory either mtl tasty tasty-hunit text time transformers ]; - jailbreak = true; homepage = "https://github.com/bgwines/filediff"; description = "Diffing and patching module"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filelock" = callPackage @@ -62492,6 +59991,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fileneglect" = callPackage + ({ mkDerivation, base, hinotify, stm }: + mkDerivation { + pname = "fileneglect"; + version = "0.0.0.1"; + sha256 = "659cc5d7b6fa5949bc6a8a28d2c830f1d3386c78cf82ae95034b2d66309500e8"; + libraryHaskellDepends = [ base hinotify stm ]; + description = "Block thread until a file stops being modified"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "filepath_1_4_1_0" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -62513,9 +60023,9 @@ self: { version = "0.1.0.0"; sha256 = "977bff7e3cb4876c67b98a4685fe734ee8000986ad8d68e2e9bb40eb94152b23"; libraryHaskellDepends = [ base base-io-access filepath ]; - jailbreak = true; description = "IO Access for filepath"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "filepather" = callPackage @@ -62572,7 +60082,6 @@ self: { base blaze-builder bytestring conduit hspec QuickCheck text transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/conduit"; description = "Use system-filepath data types with conduits. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -62620,10 +60129,10 @@ self: { version = "0.1.0.5"; sha256 = "6d2a75d6b69f8d0f538e680923e9f68c17ee6feaed505a2d86d9baae4784ce7e"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/strake/filtrable.hs"; description = "Class of filtrable containers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "final" = callPackage @@ -62738,22 +60247,20 @@ self: { }) {}; "finite-field" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, HUnit, primes - , QuickCheck, template-haskell, test-framework - , test-framework-hunit, test-framework-quickcheck2 - , test-framework-th, type-level-numbers + ({ mkDerivation, base, containers, deepseq, hashable, primes + , QuickCheck, singletons, tasty, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell }: mkDerivation { pname = "finite-field"; - version = "0.8.0"; - sha256 = "d15294156f47de63f76c9e9a1b1eaaa9cbcac0bd174b6c5b2fa49075dbc18b72"; + version = "0.9.0"; + sha256 = "8318c793c43cb30c8bf7f6fbea19e7d3e94cc1e81d849f821655efc3322ed408"; libraryHaskellDepends = [ - base deepseq hashable template-haskell type-level-numbers + base deepseq hashable singletons template-haskell ]; testHaskellDepends = [ - base containers HUnit primes QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 test-framework-th - type-level-numbers + base containers deepseq hashable primes QuickCheck singletons tasty + tasty-hunit tasty-quickcheck tasty-th ]; description = "Finite Fields"; license = stdenv.lib.licenses.bsd3; @@ -62779,10 +60286,10 @@ self: { sha256 = "f25888d5530a969c40555d3f947d1f5b2254afe33787a040a32663b3e7d3f9da"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "https://github.com/markandrus/first-and-last"; description = "First and Last generalized to return up to n values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "first-class-patterns" = callPackage @@ -62817,19 +60324,21 @@ self: { }) {}; "fishfood" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, factory, mtl - , QuickCheck, toolshed + ({ mkDerivation, base, Cabal, containers, data-default, directory + , factory, mtl, QuickCheck, toolshed }: mkDerivation { pname = "fishfood"; - version = "0.0.1.5"; - sha256 = "58fa4da2e7437ba36be2027a9bcd73cc9aceb180599b59b65a771ac3d9155271"; + version = "0.0.1.6"; + sha256 = "45cca62a88480b05249d206b4090f310531da036477600843675565f32b3de05"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal containers directory factory mtl toolshed + base Cabal containers data-default directory factory mtl toolshed + ]; + executableHaskellDepends = [ + base Cabal data-default mtl toolshed ]; - executableHaskellDepends = [ base Cabal mtl toolshed ]; testHaskellDepends = [ base Cabal containers mtl QuickCheck toolshed ]; @@ -62854,7 +60363,6 @@ self: { attoparsec base bytestring containers hspec hspec-attoparsec mtl QuickCheck text ]; - jailbreak = true; description = "FIT file decoder"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -62878,8 +60386,8 @@ self: { ({ mkDerivation, base, cmdargs, leancheck, template-haskell }: mkDerivation { pname = "fitspec"; - version = "0.3.1"; - sha256 = "f22aa02f95b2b7d67a7c9b32303a75be139302a99c74524de1538a26f31411fb"; + version = "0.4.0"; + sha256 = "73dae591138ff5390be2b7f373a4f3bed89d4d39d26ac665f5f8cf5326aad5da"; libraryHaskellDepends = [ base cmdargs leancheck template-haskell ]; @@ -62903,9 +60411,9 @@ self: { base containers cpphs directory filepath haskell-src-exts process split text uniplate ]; - jailbreak = true; description = "Program to manage the imports of a haskell module"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fix-parser-simple" = callPackage @@ -62975,7 +60483,6 @@ self: { version = "0.5.0.1"; sha256 = "6af24469e8795e077bd8db05c03712c52b50a06239ff80f12a9691adc4e80f04"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Binary fixed-point arithmetic"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -62988,7 +60495,6 @@ self: { version = "0.5.0.1"; sha256 = "03218312eadee2d9dcaae738bd19a01f88655cfd40dd75c322e9c4d008b13509"; libraryHaskellDepends = [ base fixed-point vector ]; - jailbreak = true; description = "Unbox instances for the fixed-point package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -63001,7 +60507,6 @@ self: { version = "0.5.0.1"; sha256 = "bd9d36f931bfbc6243cd83cc73c3f57aa24a29b8c52ce17869fce6e1f14b6281"; libraryHaskellDepends = [ base fixed-point vector-space ]; - jailbreak = true; description = "vector-space instances for the fixed-point package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -63018,7 +60523,6 @@ self: { libraryHaskellDepends = [ base hmpfr integer-gmp reflection tagged template-haskell ]; - jailbreak = true; homepage = "http://github.com/ekmett/fixed-precision"; description = "Fixed Precision Arithmetic"; license = stdenv.lib.licenses.bsd3; @@ -63032,7 +60536,6 @@ self: { version = "0.3.1.1"; sha256 = "f00a020ce3792737089cd7d544e0b35728c8c4d6f3b815fb6929742cb680656d"; libraryHaskellDepends = [ array base tagged ]; - jailbreak = true; description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -63050,6 +60553,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fixed-vector_0_9_0_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, filemanip, primitive }: + mkDerivation { + pname = "fixed-vector"; + version = "0.9.0.0"; + sha256 = "2cb64bfaa4c916c681c9a8240bb6edfad4878742003c3d099e770c592e8d4c87"; + libraryHaskellDepends = [ base deepseq primitive ]; + testHaskellDepends = [ base doctest filemanip primitive ]; + description = "Generic vectors with statically known size"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fixed-vector-binary" = callPackage ({ mkDerivation, base, binary, fixed-vector, tasty , tasty-quickcheck @@ -63133,8 +60649,8 @@ self: { }: mkDerivation { pname = "fixfile"; - version = "0.5.0.0"; - sha256 = "ebac16bee38bc0fd05790429d40b1c4a0089b82a53da45d2e74d226c4bdf8d65"; + version = "0.6.0.0"; + sha256 = "37183ade31510ba1c3801adf5df112f7ef6291b478934d0c51839510e536888c"; libraryHaskellDepends = [ array base binary bytestring containers directory filepath hashable hashtables lens mtl temporary vector @@ -63217,9 +60733,9 @@ self: { version = "0.1.0.1"; sha256 = "97bca955036b0ae3d33757fdcbb44421f9cd5a49ee0ed0b6ade07f168f543d99"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Functional Fizz/Buzz"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fizzbuzz" = callPackage @@ -63258,10 +60774,10 @@ self: { version = "0.0.5.1"; sha256 = "1d358cd572792b31ad714e8a799fd90bca098f47822d6afe83419c6b59f06e82"; libraryHaskellDepends = [ base template-haskell text ]; - jailbreak = true; homepage = "https://charmander.me/flamethrower/"; description = "A template engine for HTML"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flamingra" = callPackage @@ -63287,10 +60803,10 @@ self: { version = "0.1.0.0"; sha256 = "98ee27978642f7f07e48d7d7567e0cd1dc531a4a6e0e515e3f5cd343e6c9be4f"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "https://github.com/AndrasKovacs/flat-maybe"; description = "Strict Maybe without space and indirection overhead"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flat-mcmc" = callPackage @@ -63348,10 +60864,10 @@ self: { version = "0.1.0.3"; sha256 = "14a9f39943ff1a7491177d579b572f0e1f1c051a4b1ded767840978c4a06339d"; libraryHaskellDepends = [ base bytestring unix-time ]; - jailbreak = true; homepage = "https://github.com/tattsun/flexible-time"; description = "simple extension of Data.UnixTime."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flexible-unlit" = callPackage @@ -63375,7 +60891,6 @@ self: { version = "0.1.0"; sha256 = "6a35de47b8f31d4fa605b96d06c374cc25a4e0d26c31ad8138939c11074f746f"; libraryHaskellDepends = [ base data-type mtl QuickCheck ]; - jailbreak = true; description = "Flexible wrappers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -63390,7 +60905,6 @@ self: { libraryHaskellDepends = [ base data-type flexiwrap mtl smallcheck ]; - jailbreak = true; description = "SmallCheck (Serial) instances for flexiwrap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -63440,7 +60954,6 @@ self: { executableHaskellDepends = [ array base containers haskell98 parsec ]; - jailbreak = true; homepage = "http://www.cs.york.ac.uk/fp/reduceron/"; description = "f-lite compiler, interpreter and libraries"; license = stdenv.lib.licenses.bsd3; @@ -63535,7 +61048,6 @@ self: { sha256 = "f1964913c5bbd81748610c2f66a7aa9750b25953e6940c0933b25d4b2f1b1f62"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest QuickCheck template-haskell ]; - doCheck = false; homepage = "https://github.com/tfausak/flow#readme"; description = "Write more understandable Haskell"; license = stdenv.lib.licenses.mit; @@ -63588,10 +61100,10 @@ self: { lens lens-action mtl network pipes pipes-aeson pipes-http pipes-parse template-haskell text unordered-containers uuid ]; - jailbreak = true; homepage = "https://github.com/brewtown/hs-flowdock"; description = "Flowdock client library for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "flowdock-api" = callPackage @@ -63655,7 +61167,6 @@ self: { http-client http-client-tls lens semigroups tagged tasty tasty-quickcheck text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/futurice/haskell-flowdock-rest#readme"; description = "Flowdock REST API"; license = stdenv.lib.licenses.bsd3; @@ -63675,7 +61186,6 @@ self: { executableHaskellDepends = [ array base binary bio bytestring cmdargs containers mtl random ]; - jailbreak = true; homepage = "http://biohaskell.org/Applications/Flower"; description = "Analyze 454 flowgrams (.SFF files)"; license = "GPL"; @@ -63717,15 +61227,15 @@ self: { "fltkhs" = callPackage ({ mkDerivation, base, bytestring, c2hs, directory, filepath, mtl - , parsec + , parsec, text }: mkDerivation { pname = "fltkhs"; - version = "0.4.0.9"; - sha256 = "37e34bda2f8f3bb78f4d2e1e2539e02fdd6ae0ee0613f3fab38c1a13fe7b7fb1"; + version = "0.5.0.0"; + sha256 = "95590b3e27edd3b79a33dd872a5c7a3d6f4a436db63eea7fe282066e1319f506"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring ]; + libraryHaskellDepends = [ base bytestring text ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base directory filepath mtl parsec ]; homepage = "http://github.com/deech/fltkhs"; @@ -63843,10 +61353,10 @@ self: { sha256 = "9a1848452f73e9b48b0fbf16c12f5db9eee30c8b8901ed5538599701f5c127a3"; libraryHaskellDepends = [ base bindings-DSL containers directory ]; librarySystemDepends = [ fluidsynth ]; - jailbreak = true; homepage = "https://github.com/MostAwesomeDude/hsfluidsynth"; description = "Haskell bindings to FluidSynth"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) fluidsynth;}; "fmark" = callPackage @@ -63861,10 +61371,10 @@ self: { executableHaskellDepends = [ base directory filepath mtl process Unixutils ]; - jailbreak = true; homepage = "http://github.com/jabolopes/fmark"; description = "A Friendly Markup language without syntax"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fmlist" = callPackage @@ -63939,8 +61449,8 @@ self: { }: mkDerivation { pname = "fold-debounce"; - version = "0.2.0.2"; - sha256 = "971be718a834d0a18fb3b36b20faf2efbaadb8dd3a600c879909aca1e36778d2"; + version = "0.2.0.3"; + sha256 = "ca5eaa3ea7eea742c961df63249920021824a949c879053ff34bdeef4fb7a7af"; libraryHaskellDepends = [ base data-default-class stm stm-delay time ]; @@ -63956,8 +61466,8 @@ self: { }: mkDerivation { pname = "fold-debounce-conduit"; - version = "0.1.0.2"; - sha256 = "33853bcf36dd89e8a51fdaeb6d78fffd6b3a5fb853f7b0f4f7add8e65ff07b50"; + version = "0.1.0.4"; + sha256 = "fb1e937a3e1a78982df53d62ad55c1cd2b79f5ac9c18c56df436435829efa7cc"; libraryHaskellDepends = [ base conduit fold-debounce resourcet stm transformers transformers-base @@ -64009,6 +61519,27 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "foldl-statistics" = callPackage + ({ mkDerivation, base, foldl, math-functions, profunctors + , quickcheck-instances, semigroups, statistics, tasty + , tasty-quickcheck, vector + }: + mkDerivation { + pname = "foldl-statistics"; + version = "0.1.4.0"; + sha256 = "0d800d6202b6411207154f1c7d1be8f77fef7e332ccaf3c486db972c935cf414"; + libraryHaskellDepends = [ + base foldl math-functions profunctors semigroups + ]; + testHaskellDepends = [ + base foldl profunctors quickcheck-instances statistics tasty + tasty-quickcheck vector + ]; + homepage = "http://github.com/Data61/foldl-statistics#readme"; + description = "Statistical functions from the statistics package implemented as Folds"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "foldl-transduce" = callPackage ({ mkDerivation, base, bifunctors, bytestring, comonad, containers , doctest, foldl, free, monoid-subclasses, profunctors @@ -64116,7 +61647,6 @@ self: { sha256 = "63791467c24e9092d9ec5b295a4702f0ef9e89f01d75bae941aff4ffe3223eaa"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ foma ]; - jailbreak = true; homepage = "http://github.com/joom/foma.hs"; description = "Simple Haskell bindings for Foma"; license = stdenv.lib.licenses.mit; @@ -64133,7 +61663,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base OpenGL ]; executableHaskellDepends = [ base GLFW-b OpenGL ]; - jailbreak = true; description = "Basic4x6 font for OpenGL"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -64184,7 +61713,6 @@ self: { base comonad comonad-transformers containers contravariant transformers ]; - jailbreak = true; description = "Functor, Monad, MonadPlus, etc for free"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -64206,7 +61734,6 @@ self: { base control-monad-loop hashable hashtables hspec primitive transformers vector ]; - jailbreak = true; homepage = "http://github.com/minpou/forbidden-fruit"; description = "A library accelerates imperative style programming"; license = stdenv.lib.licenses.bsd3; @@ -64285,10 +61812,10 @@ self: { revision = "1"; editedCabalFile = "f9c906434533279cfa8e2897c6eed6ed9c279f373efc5180bda76b704601fa1c"; libraryHaskellDepends = [ base stm transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/foreign-var/"; description = "Encapsulating mutatable state in external libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forger" = callPackage @@ -64301,10 +61828,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/sfischer13/haskell-forger"; description = "Library for generating fake placeholder data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "forkable-monad" = callPackage @@ -64314,10 +61841,10 @@ self: { version = "0.1.1"; sha256 = "3084b8c019ca55774a20380023f81ca151bf0c2bffddc919a07321c74697ac5b"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://code.google.com/p/forkable-monad/"; description = "An implementation of forkIO for monad stacks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "formal" = callPackage @@ -64337,7 +61864,6 @@ self: { indents interpolatedstring-perl6 jmacro MissingH mtl network pandoc parsec process text transformers urlencoded wl-pprint-text ]; - jailbreak = true; description = "A statically typed, functional programming language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -64351,7 +61877,6 @@ self: { sha256 = "f0d6174b92f9394ca8a87435daa397d3cd5a5641d2d8d0a61c111617215869ef"; libraryHaskellDepends = [ haskell2010 parsec ]; testHaskellDepends = [ haskell2010 parsec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/bytbox/hs-format"; description = "Rendering from and scanning to format strings"; license = stdenv.lib.licenses.mit; @@ -64371,7 +61896,6 @@ self: { executableHaskellDepends = [ base data-concurrent-queue old-locale stm text time ]; - jailbreak = true; description = "A utility for writing the date to dzen2"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -64393,10 +61917,10 @@ self: { base bytestring data-default-class double-conversion hspec HUnit lens old-locale QuickCheck text time ]; - jailbreak = true; homepage = "https://github.com/Soostone/formattable"; description = "Business-quality formatting of numbers, dates, and other things"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "formatting" = callPackage @@ -64433,7 +61957,6 @@ self: { interpolatedstring-perl6 jmacro MissingH mtl network pandoc parsec process text urlencoded utf8-string zlib ]; - jailbreak = true; homepage = "http://texodus.github.com/forml"; description = "A statically typed, functional programming language"; license = stdenv.lib.licenses.mit; @@ -64452,7 +61975,6 @@ self: { applicative-extras base blaze-html bytestring haskell98 syb transformers xhtml ]; - jailbreak = true; homepage = "http://github.com/chriseidhof/formlets/tree/master"; description = "Formlets implemented in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -64506,21 +62028,20 @@ self: { version = "0.1.0.0"; sha256 = "e385e0be9de25f5a37cf94408c38ebfd7e79f50c6fcd16214b89b26e3b8bacc2"; libraryHaskellDepends = [ array-forth base free mtl ]; - jailbreak = true; description = "A simple eDSL for generating arrayForth code"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fortran-src" = callPackage - ({ mkDerivation, alex, array, base, bytestring, containers, derive + ({ mkDerivation, alex, array, base, bytestring, containers , directory, fgl, filepath, GenericPretty, happy, hspec, mtl , pretty, text, uniplate }: mkDerivation { pname = "fortran-src"; - version = "0.1.0.3"; - sha256 = "c3c3a2de98e4d08c23907092311f69869577850842cfb1b5fce53176cfb4a06e"; + version = "0.1.0.4"; + sha256 = "4e20fae7ff4448a98cb3e2a16ff66514d3510b82d58f4c7bc998ff24c2ac5708"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -64533,7 +62054,7 @@ self: { uniplate ]; testHaskellDepends = [ - array base bytestring containers derive directory fgl filepath + array base bytestring containers directory fgl filepath GenericPretty hspec mtl pretty text uniplate ]; description = "Parser and anlyses for Fortran standards 66, 77, 90"; @@ -64555,10 +62076,10 @@ self: { testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/tonymorris/foscam-directory"; description = "Foscam File format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foscam-filename" = callPackage @@ -64576,10 +62097,10 @@ self: { testHaskellDepends = [ base directory doctest filepath parsec QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/tonymorris/foscam-filename"; description = "Foscam File format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "foscam-sort" = callPackage @@ -64604,7 +62125,6 @@ self: { testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/tonymorris/foscam-sort"; description = "Foscam File format"; license = stdenv.lib.licenses.bsd3; @@ -64759,10 +62279,10 @@ self: { QuickCheck regex-compat test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/jrp2014/fptest"; description = "IEEE754r floating point conformance tests"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fquery" = callPackage @@ -64803,9 +62323,9 @@ self: { sha256 = "3dbca177023352014cb5c61205a9a90a640a75a0557935126800e25f38f2424a"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base integer-gmp QuickCheck ]; - jailbreak = true; description = "A collection of useful fractal curve encoders"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fraction" = callPackage @@ -64854,7 +62374,6 @@ self: { utf8-string ]; executableHaskellDepends = [ pretty ]; - jailbreak = true; description = "A simple web framework"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -64867,7 +62386,6 @@ self: { version = "0.1"; sha256 = "ef149e015bd45d73ddf30ba17b82e7cdf18114d541bdc870f5d39bf67a62c173"; libraryHaskellDepends = [ base frame pandoc ]; - jailbreak = true; description = "A markdown to Frame GUI writer for Pandoc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -64912,8 +62430,8 @@ self: { }: mkDerivation { pname = "freddy"; - version = "0.1.0.0"; - sha256 = "5513ee3231f1b5cb407d13dd8ea153f2737b25f0270eb12b304ffee56cda275a"; + version = "0.1.2.0"; + sha256 = "c2644b80d5d4592b4703cd404828ff8a5e4a1e62638eb9d305d4127f8934b951"; libraryHaskellDepends = [ amqp base broadcast-chan bytestring data-default random text uuid ]; @@ -64954,10 +62472,10 @@ self: { version = "0.1.0.1"; sha256 = "9ff2ee86c7a56f0c080e32394a82be129cb0b198fb9327b265a0735161e751b1"; libraryHaskellDepends = [ base type-aligned ]; - jailbreak = true; homepage = "https://github.com/srijs/haskell-free-concurrent"; description = "Free monads suitable for concurrent computation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-functors" = callPackage @@ -64972,7 +62490,6 @@ self: { algebraic-classes base comonad constraints template-haskell transformers void ]; - jailbreak = true; homepage = "https://github.com/sjoerdvisscher/free-functors"; description = "Free functors, adjoint to functors that forget class constraints"; license = stdenv.lib.licenses.bsd3; @@ -64983,20 +62500,19 @@ self: { ({ mkDerivation, array, base, boundingboxes, colors, containers , control-bool, directory, filepath, free, freetype2, GLFW-b , hashable, JuicyPixels, JuicyPixels-util, lens, linear, mtl - , OpenGL, OpenGLRaw, random, reflection, template-haskell + , OpenGL, OpenGLRaw, random, reflection, StateVar, template-haskell , transformers, vector, void }: mkDerivation { pname = "free-game"; - version = "1.1.81"; - sha256 = "d7ef4867a906db76e2342a2c27012d8d1b6f6d86fd409b974c8cad0cce4c14fd"; + version = "1.1.90"; + sha256 = "645706706f3afe39d55d8f7405e1186a71952bc96023d3272ddf4bd992bcebc5"; libraryHaskellDepends = [ array base boundingboxes colors containers control-bool directory filepath free freetype2 GLFW-b hashable JuicyPixels JuicyPixels-util lens linear mtl OpenGL OpenGLRaw random reflection - template-haskell transformers vector void + StateVar template-haskell transformers vector void ]; - jailbreak = true; homepage = "https://github.com/fumieval/free-game"; description = "Create games for free"; license = stdenv.lib.licenses.bsd3; @@ -65015,10 +62531,10 @@ self: { base bytestring free http-client http-types mtl QuickCheck text time transformers ]; - jailbreak = true; homepage = "https://github.com/aaronlevin/free-http"; description = "An HTTP Client based on Free Monads"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-operational" = callPackage @@ -65032,7 +62548,6 @@ self: { libraryHaskellDepends = [ base comonad-transformers free kan-extensions mtl transformers ]; - jailbreak = true; description = "Operational Applicative, Alternative, Monad and MonadPlus from free types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -65086,7 +62601,6 @@ self: { array base bytestring containers free-theorems haskell-src mtl old-locale old-time parsec pretty syb utf8-string xhtml ]; - jailbreak = true; description = "Taming Selective Strictness"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -65131,15 +62645,19 @@ self: { }) {}; "free-vector-spaces" = callPackage - ({ mkDerivation, base, lens, linear, MemoTrie, vector-space }: + ({ mkDerivation, base, lens, linear, MemoTrie, vector, vector-space + }: mkDerivation { pname = "free-vector-spaces"; - version = "0.1.0.0"; - sha256 = "9b8d239b900d47869d019fb67c36f369e9ca53a8e95cdad14d00486e7992dbbc"; - libraryHaskellDepends = [ base lens linear MemoTrie vector-space ]; + version = "0.1.1.0"; + sha256 = "fa4066b3cb1e6e58ca471e953154acaca9f978cfc81d3987552da79c4805f1b4"; + libraryHaskellDepends = [ + base lens linear MemoTrie vector vector-space + ]; homepage = "https://github.com/leftaroundabout/free-vector-spaces"; description = "Instantiate the classes from the vector-space package with types from linear"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "free-vl" = callPackage @@ -65232,7 +62750,6 @@ self: { executableHaskellDepends = [ array base cpphs directory mtl parallel pretty random syb ]; - jailbreak = true; homepage = "http://fremissant.net/freesect"; description = "A Haskell syntax extension for generalised sections"; license = stdenv.lib.licenses.bsd3; @@ -65272,10 +62789,10 @@ self: { libraryHaskellDepends = [ base boundingboxes bytestring freetype2 linear ]; - jailbreak = true; homepage = "https://github.com/capsjac/freetype-simple"; description = "Single line text rendering for OpenGL ES"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "freetype2" = callPackage @@ -65289,6 +62806,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "french-cards" = callPackage + ({ mkDerivation, base, hspec, HUnit }: + mkDerivation { + pname = "french-cards"; + version = "0.1.1"; + sha256 = "5c70660593be3ecf1af9a9a30a41498f36aa45bd69825bf7b3793187d7576fd3"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec HUnit ]; + homepage = "https://github.com/tserduke/french-cards#readme"; + description = "French Playing Cards"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fresco-binding" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, messagepack , text, unix @@ -65331,10 +62861,10 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/RaphaelJ/friday"; description = "A functional image processing library for Haskell"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friday-devil" = callPackage @@ -65349,10 +62879,10 @@ self: { base bytestring convertible deepseq friday transformers vector ]; librarySystemDepends = [ libdevil ]; - jailbreak = true; homepage = "https://github.com/RaphaelJ/friday-devil"; description = "Uses the DevIL C library to read and write images from and to files and memory buffers"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libdevil;}; "friday-juicypixels" = callPackage @@ -65382,10 +62912,10 @@ self: { libraryHaskellDepends = [ base base-compat carray fft friday vector ]; - jailbreak = true; homepage = "https://github.com/axman6/friday-scale-dct#readme"; description = "Scale Friday images with DCT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "friendly-time" = callPackage @@ -65412,6 +62942,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "from-sum" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "from-sum"; + version = "0.1.0.0"; + sha256 = "cfc80660a6986b2a2dc07605a26a6bc3b010b9aecfbeb4a852e671106b37475c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + homepage = "https://github.com/cdepillabout/from-sum"; + description = "Canonical fromMaybeM and fromEitherM functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "frontmatter" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec, QuickCheck , text, yaml @@ -65570,7 +63113,6 @@ self: { async base directory filepath tasty tasty-hunit temporary-rc unix-compat ]; - doCheck = false; homepage = "https://github.com/haskell-fswatch/hfsnotify"; description = "Cross platform library for file change notification"; license = stdenv.lib.licenses.bsd3; @@ -65623,10 +63165,10 @@ self: { version = "0.1.2"; sha256 = "e8665aace36bdc631cd9abed10164a12eb332194c4cfeaee92d6858644229d1e"; libraryHaskellDepends = [ base directory filepath ]; - jailbreak = true; homepage = "https://github.com/Raynes/fsutils"; description = "File system utilities for Haskell that are missing from built in libraries"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fswatcher" = callPackage @@ -65676,7 +63218,6 @@ self: { base byteorder bytestring conduit MissingH network transformers utf8-string ]; - jailbreak = true; homepage = "https://github.com/litherum/ftp-conduit"; description = "FTP client package with conduit interface based off http-conduit"; license = stdenv.lib.licenses.bsd3; @@ -65724,7 +63265,6 @@ self: { executableHaskellDepends = [ base containers free-theorems mtl pretty Shellac Shellac-readline ]; - jailbreak = true; description = "Shell interface to the FreeTheorems library"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -65766,7 +63306,6 @@ self: { testHaskellDepends = [ array base containers QuickCheck tasty tasty-quickcheck text vector ]; - jailbreak = true; description = "In-memory full text search engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -65787,7 +63326,6 @@ self: { testHaskellDepends = [ base HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; homepage = "http://hub.darcs.net/kowey/fullstop"; description = "Simple sentence segmenter"; license = stdenv.lib.licenses.bsd3; @@ -65818,7 +63356,6 @@ self: { settings tagsoup text time time-interval time-units transformers unordered-containers utf8-string vcs-web-hook-parse ]; - jailbreak = true; homepage = "https://notabug.org/fr33domlover/funbot"; description = "IRC bot for fun, learning, creativity and collaboration"; license = stdenv.lib.licenses.publicDomain; @@ -65909,10 +63446,10 @@ self: { executableHaskellDepends = [ base bv containers directory mtl multiset parsec split text vector ]; - jailbreak = true; homepage = "http://plancomps.org"; description = "A modular interpreter for executing funcons"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "function-combine" = callPackage @@ -65934,10 +63471,10 @@ self: { version = "0.1"; sha256 = "fcf9b3a1c69f80ccaa8ed89cd37bdfdba158ad21225e5d32e2cf529fbba9be37"; libraryHaskellDepends = [ base numeric-prelude ]; - jailbreak = true; homepage = "github.com/kreuzschlitzschraubenzieher/function-instances-algebra"; description = "Instances of the Algebra.* classes for functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "functional-arrow" = callPackage @@ -65947,7 +63484,6 @@ self: { version = "0.0"; sha256 = "ba64e0b2ccddd40f9a386b7f067d2ed7740b324fdd73141633cae8572aee49d1"; libraryHaskellDepends = [ base HList ]; - jailbreak = true; description = "Combinators that allow for a more functional/monadic style of Arrow programming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -66024,7 +63560,6 @@ self: { version = "1.1"; sha256 = "a054cbd84686777774b9e2c36c1b5ceaf8ca415a9755e922ff52137eb9ac36ba"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "https://github.com/wdanilo/functor-utils"; description = "Collection of functor utilities, providing handy operators, like generalization of (.)."; license = stdenv.lib.licenses.asl20; @@ -66068,7 +63603,6 @@ self: { executableHaskellDepends = [ base bytestring directory filepath haskell98 HFuse unix ]; - jailbreak = true; homepage = "http://github.com/nathanwiegand/funion"; description = "A unioning file-system using HFuse"; license = stdenv.lib.licenses.bsd3; @@ -66095,9 +63629,9 @@ self: { version = "0.1"; sha256 = "dc2b226bbb72a65a5281e86d766b3f26b0b1a898d08cd53f0c6cb98a9ecb747d"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; description = "A generalization of pattern matching"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "funsat" = callPackage @@ -66117,7 +63651,6 @@ self: { array base bimap bitset containers fgl mtl parse-dimacs pretty QuickCheck random time ]; - jailbreak = true; homepage = "http://github.com/dbueno/funsat"; description = "A modern DPLL-style SAT solver"; license = stdenv.lib.licenses.bsd3; @@ -66134,7 +63667,6 @@ self: { sha256 = "95a8c2a5ee98fa16a548ec55a42c5a7dde2fce688df74cf884a777db654a486f"; libraryHaskellDepends = [ base pipes-safe transformers void ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "https://github.com/jwiegley/fusion"; description = "Effectful streaming library based on shortcut fusion techniques"; license = stdenv.lib.licenses.bsd3; @@ -66150,9 +63682,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring network unix ]; - jailbreak = true; description = "Simple IP-over-UDP tunnel using TUNTAP"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "future" = callPackage @@ -66227,10 +63759,10 @@ self: { base containers HUnit mtl QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 time ]; - jailbreak = true; homepage = "https://github.com/tlaitinen/fuzzy-timings"; description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fuzzytime" = callPackage @@ -66261,7 +63793,6 @@ self: { libraryHaskellDepends = [ base hashable transformers unordered-containers vect vector Yampa ]; - jailbreak = true; homepage = "https://github.com/ziocroc/FWGL"; description = "Game engine"; license = stdenv.lib.licenses.bsd3; @@ -66280,7 +63811,6 @@ self: { base fwgl gl GLFW-b hashable JuicyPixels transformers unordered-containers vect vector ]; - jailbreak = true; homepage = "https://github.com/ziocroc/FWGL"; description = "FWGL GLFW backend"; license = stdenv.lib.licenses.bsd3; @@ -66298,7 +63828,6 @@ self: { libraryHaskellDepends = [ base fwgl ghcjs-base hashable unordered-containers vect ]; - jailbreak = true; homepage = "https://github.com/ziocroc/FWGL"; description = "FWGL GHCJS backend"; license = stdenv.lib.licenses.bsd3; @@ -66346,10 +63875,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base hscurses random text ]; - jailbreak = true; homepage = "http://github.com/marcusbuffett/game-of-life"; description = "Conway's Game of Life"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "game-probability" = callPackage @@ -66359,9 +63888,9 @@ self: { version = "1.1"; sha256 = "736e9eff22a455286adb2906076f1e52a93370e86528463c9fe93c010e4c82f2"; libraryHaskellDepends = [ base containers probability random ]; - jailbreak = true; description = "Simple probability library for dice rolls, card games and similar"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "game-tree" = callPackage @@ -66426,10 +63955,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base haskeline transformers ]; executableHaskellDepends = [ base haskeline transformers ]; - jailbreak = true; homepage = "http://hub.darcs.net/mekeor/Garepinoh/text/README.md"; description = "reverse prefix notation calculator and calculation library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "garsia-wachs" = callPackage @@ -66545,7 +64074,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GNOME configuration database system"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) GConf;}; + }) {inherit (pkgs.gnome2) GConf;}; "gd" = callPackage ({ mkDerivation, base, bytestring, expat, fontconfig, freetype, gd @@ -66609,7 +64138,6 @@ self: { testHaskellDepends = [ base containers gdiff mtl template-haskell th-expand-syns uniplate ]; - jailbreak = true; homepage = "https://github.com/jfischoff/gdiff-th"; description = "Generate gdiff GADTs and Instances"; license = stdenv.lib.licenses.bsd3; @@ -66622,15 +64150,14 @@ self: { }: mkDerivation { pname = "gdo"; - version = "0.1.0"; - sha256 = "762ef322a3702b0ae67cdfa80b56088ab988b3067fcf11255ec434d74152b0fc"; + version = "0.1.2"; + sha256 = "0a4612e13b97de8950ff87779a98ca837ed5de78baf9754d465b648edcc44018"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers cryptohash directory filepath process transformers ]; - jailbreak = true; description = "recursive atomic build system"; license = stdenv.lib.licenses.gpl3; }) {}; @@ -66732,7 +64259,6 @@ self: { array base bitmap bitmap-opengl containers FTGL lens linear OpenGL random SDL SDL-image stb-image transformers ]; - jailbreak = true; homepage = "http://corbinsimpson.com/"; description = "A simple library of helpers for SDL+GL games"; license = "GPL"; @@ -66767,7 +64293,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ attoparsec base text ]; executableHaskellDepends = [ attoparsec base text ]; - jailbreak = true; homepage = "https://github.com/womfoo/gender"; description = "Identify a persons gender by their first name"; license = stdenv.lib.licenses.lgpl21; @@ -66824,7 +64349,6 @@ self: { version = "1.0.3"; sha256 = "587041fb4c32efa99463e1faafcef0d0311944525f0afffd6e124b0845efa144"; libraryHaskellDepends = [ base mtl random ]; - jailbreak = true; homepage = "http://liamoc.net/pdf/Generator.pdf"; description = "Actually useful monadic random value generators"; license = stdenv.lib.licenses.bsd3; @@ -66875,9 +64399,9 @@ self: { version = "1.0.1"; sha256 = "49c00e6cbe0d54fe72db40fedd92978833e78f5a0d0e26eb192194c14cd1ddc0"; libraryHaskellDepends = [ base binary bytestring ghc-prim ]; - jailbreak = true; description = "Generic Data.Binary derivation using GHC generics."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "generic-church" = callPackage @@ -66925,14 +64449,17 @@ self: { }) {}; "generic-deriving" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: + ({ mkDerivation, base, containers, ghc-prim, hspec + , template-haskell + }: mkDerivation { pname = "generic-deriving"; - version = "1.11"; - sha256 = "16d40544e4dad85af78d93158e9b6a39b35c88ca10a455cfc861a4282556240d"; + version = "1.11.1"; + sha256 = "b38d427f990f3080108c565a81284217290a47be63bab7bf59036ece2e2cb0e9"; libraryHaskellDepends = [ base containers ghc-prim template-haskell ]; + testHaskellDepends = [ base hspec template-haskell ]; homepage = "https://github.com/dreixel/generic-deriving"; description = "Generic programming library for generalised deriving"; license = stdenv.lib.licenses.bsd3; @@ -66965,7 +64492,6 @@ self: { generic-deriving hlint mtl nats parallel semigroups simple-reflect split text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/jfischoff/generic-maybe"; description = "A generic version of Data.Maybe"; license = stdenv.lib.licenses.bsd3; @@ -66986,7 +64512,6 @@ self: { testHaskellDepends = [ base bytestring containers tasty tasty-hunit text vector ]; - jailbreak = true; homepage = "https://github.com/tanakh/generic-pretty"; description = "Pretty printing for Generic value"; license = stdenv.lib.licenses.mit; @@ -67043,7 +64568,6 @@ self: { sha256 = "b23bfe5f0b889e4dd1706260ebd4c312719ecc82e2c995df89a3902c8678cf04"; libraryHaskellDepends = [ base ghc-prim ]; testHaskellDepends = [ base ghc-prim hspec QuickCheck ]; - jailbreak = true; description = "Generic implementation of Storable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67142,6 +64666,8 @@ self: { pname = "generics-sop-lens"; version = "0.1.2.0"; sha256 = "bafd04f0238e19d73da60ae018c1c82cb3e4be49990c61a6049dec2dafff40f6"; + revision = "1"; + editedCabalFile = "6ea2756e5e916c6a7d24f7d261bb0bf27925b8d8dd30332df4a053160596afcc"; libraryHaskellDepends = [ base generics-sop lens ]; homepage = "https://github.com/phadej/generics-sop-lens#readme"; description = "Lenses for types in generics-sop"; @@ -67190,7 +64716,6 @@ self: { hslogger json mtl process text transformers wx wxcore yaml-light ]; executableHaskellDepends = [ base GenI ]; - jailbreak = true; homepage = "http://projects.haskell.org/GenI"; description = "GenI graphical user interface"; license = "GPL"; @@ -67215,7 +64740,6 @@ self: { executableHaskellDepends = [ base bytestring cmdargs directory filepath GenI json text ]; - jailbreak = true; homepage = "http://kowey.github.io/GenI"; description = "Companion tools for use with the GenI surface realiser"; license = stdenv.lib.licenses.gpl2; @@ -67236,7 +64760,6 @@ self: { base binary containers GenI haskell98 HaXml HUnit mtl parsec QuickCheck utf8-string ]; - jailbreak = true; homepage = "http://wiki.loria.fr/wiki/GenI"; description = "Conversion utility for the GenI generator"; license = "GPL"; @@ -67264,7 +64787,6 @@ self: { version = "0.6.0.5"; sha256 = "ec6bb3509d4882f6382166735c6dcd87faae60bd58eb70cd7190503c8bf39c05"; libraryHaskellDepends = [ base mtl template-haskell ]; - jailbreak = true; description = "Use Template Haskell to generate Uniplate-like functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67299,7 +64821,6 @@ self: { executableHaskellDepends = [ base GenI snap-core snap-server text ]; - jailbreak = true; description = "Simple HTTP server for GenI results"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -67312,10 +64833,10 @@ self: { version = "0.1.0.2"; sha256 = "f9de4698dc4a96d5619791becb2f322ec5de3a6c5f64cff82f9d3bae09142ba9"; libraryHaskellDepends = [ base MonadRandom syb syz ]; - jailbreak = true; homepage = "http://github.com/jsnajder/genprog"; description = "Genetic programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gentlemark" = callPackage @@ -67326,18 +64847,18 @@ self: { sha256 = "b5daab4564d06ce09f77cd5c9c586f3a2293abb0e6ee91500b11f3ae4ad469b1"; libraryHaskellDepends = [ base parsec transformers ]; testHaskellDepends = [ base HUnit parsec transformers ]; - jailbreak = true; homepage = "http://github.com/andriyp/gentlemark"; description = "Gentle markup language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity" = callPackage ({ mkDerivation, base, hspec, QuickCheck, validity }: mkDerivation { pname = "genvalidity"; - version = "0.2.0.2"; - sha256 = "039cb76d733452b664c701a068e65ac86a3731a8dd33bc9192623d1e88bdf288"; + version = "0.2.0.4"; + sha256 = "dca8c978f6bedb08199042fa7001dc94143cc69bb3bfc0d4dc90346a19ca8e57"; libraryHaskellDepends = [ base QuickCheck validity ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -67347,14 +64868,14 @@ self: { "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, genvalidity, QuickCheck - , validity + , validity, validity-containers }: mkDerivation { pname = "genvalidity-containers"; - version = "0.1.0.1"; - sha256 = "1193630423059f558d99e20f14e60daabb664539e25ca7c92ebca3f776dd94c2"; + version = "0.1.0.2"; + sha256 = "f26522673e67c3780662bbce48734a4e955d6fbc5dd7e8c701866180cbf7b8bb"; libraryHaskellDepends = [ - base containers genvalidity QuickCheck validity + base containers genvalidity QuickCheck validity validity-containers ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "GenValidity support for containers"; @@ -67363,29 +64884,32 @@ self: { }) {}; "genvalidity-hspec" = callPackage - ({ mkDerivation, base, genvalidity, hspec, QuickCheck, validity }: + ({ mkDerivation, base, doctest, genvalidity, hspec, QuickCheck + , validity + }: mkDerivation { pname = "genvalidity-hspec"; - version = "0.2.0.4"; - sha256 = "848014573766b08edbb3a5ab043a60ed0fdbe8370b4cfac6a48ef8102cc4d2d2"; + version = "0.2.0.5"; + sha256 = "af4b3a7db29bc9cfe9f10de84256350de91a67d6d3676c8fb269dddf32bce62b"; libraryHaskellDepends = [ base genvalidity hspec QuickCheck validity ]; + testHaskellDepends = [ base doctest ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Standard spec's for GenValidity instances"; license = stdenv.lib.licenses.mit; }) {}; "genvalidity-text" = callPackage - ({ mkDerivation, base, genvalidity, hspec, QuickCheck, text - , validity + ({ mkDerivation, array, base, genvalidity, hspec, QuickCheck, text + , validity, validity-text }: mkDerivation { pname = "genvalidity-text"; - version = "0.1.0.0"; - sha256 = "faca82b1d58fb2cd40575f0743c2579def715e697eebbaba7fc75c6b73b28c4e"; + version = "0.1.0.1"; + sha256 = "1906c0df7b65355f38ce1c13b1e1094a5f9d6da2c4c432ceee74523154814b54"; libraryHaskellDepends = [ - base genvalidity QuickCheck text validity + array base genvalidity QuickCheck text validity validity-text ]; testHaskellDepends = [ base genvalidity hspec QuickCheck text ]; homepage = "https://github.com/NorfairKing/validity#readme"; @@ -67514,8 +65038,8 @@ self: { }: mkDerivation { pname = "geoip2"; - version = "0.2.0.1"; - sha256 = "aea9398ead56cc14ac7e99adacd199918b23fdc633c9adf0837bdcfb9eef72e8"; + version = "0.2.1.1"; + sha256 = "74d432e6abbfb82187272a3e35505cdc0714c4dc2b5c3fac730cb4450e32cd0e"; libraryHaskellDepends = [ base bytestring cereal containers iproute mmap reinterpret-cast text @@ -67541,10 +65065,10 @@ self: { base bytestring directory doctest filepath hlint QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/domdere/hs-geojson"; description = "A thin GeoJSON Layer above the aeson library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geojson-types" = callPackage @@ -67554,10 +65078,10 @@ self: { version = "0.1.3"; sha256 = "92f43434853cbe65289baa875088e6055df827b7a79fb952f1ad9e55e3ce6c82"; libraryHaskellDepends = [ aeson base bson bytestring lens text ]; - jailbreak = true; homepage = "https://github.com/alios/geojson-types/"; description = "GeoJSON data types including JSON/BSON conversion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "geolite-csv" = callPackage @@ -67588,7 +65112,6 @@ self: { sha256 = "239ff6b5c7a389022657dd92172fb5ae397c74dc4b0aae15e42cd2b3d3d1543f"; libraryHaskellDepends = [ base ieee754 linear QuickCheck ]; testHaskellDepends = [ base ieee754 linear QuickCheck ]; - jailbreak = true; description = "package for geometry in euklidean 2d space"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67708,6 +65231,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "gh-pocket-knife" = callPackage + ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit + , QuickCheck, resourcet + }: + mkDerivation { + pname = "gh-pocket-knife"; + version = "0.1.0.0"; + sha256 = "b84246f29e756be1ec851f1ee3be710de6366dda4fd4c972afbfc77cbed1a6bf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring http-conduit resourcet + ]; + executableHaskellDepends = [ aeson base bytestring ]; + testHaskellDepends = [ base hspec QuickCheck ]; + homepage = "https://github.com/pbrisbin/gh-pocket-knife#readme"; + description = "Script helpers for interacting with GitHub"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-boot_8_0_1" = callPackage ({ mkDerivation, base, binary, bytestring, directory, filepath , ghc-boot-th @@ -67790,8 +65333,8 @@ self: { }: mkDerivation { pname = "ghc-dump-tree"; - version = "0.2.0.1"; - sha256 = "784a983d6d887f5d36b6169a7d1bdd41800699ef79f74e3806c081ce1e2074a8"; + version = "0.2.0.2"; + sha256 = "a89a52e448926eab7ecd97ba7081b858486bcaf487cd800403c3e2a0a76a9cc3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -67814,7 +65357,6 @@ self: { version = "0.1"; sha256 = "552a865f2fb4c11a52b44124690771a155f13f8997025c710f0370f797e5842b"; libraryHaskellDepends = [ base ghc ]; - jailbreak = true; description = "Explicitly prevent sharing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67840,7 +65382,6 @@ self: { testHaskellDepends = [ array base binary bytestring containers mtl ]; - doCheck = false; description = "Library and tool for parsing .eventlog files from GHC"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -67852,8 +65393,8 @@ self: { }: mkDerivation { pname = "ghc-events-analyze"; - version = "0.2.2"; - sha256 = "0cbcf66eae454ea672bec6f23b97b295fe9a7312c33f7e6b0272c270a7e8e0f3"; + version = "0.2.4"; + sha256 = "6161f5491a34252289c8265c7c48c5a70c1e2a69ffbfe64800cfdc3a8d3d4dd9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -67861,9 +65402,9 @@ self: { mtl optparse-applicative parsec SVGFonts template-haskell th-lift transformers ]; - jailbreak = true; description = "Analyze and visualize event logs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghc-events-parallel" = callPackage @@ -67885,34 +65426,11 @@ self: { testHaskellDepends = [ array base binary bytestring containers transformers ]; - jailbreak = true; description = "Library and tool for parsing .eventlog files from parallel GHC"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ghc-exactprint_0_5_1_1" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filemanip - , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently - , syb - }: - mkDerivation { - pname = "ghc-exactprint"; - version = "0.5.1.1"; - sha256 = "ab88a158b659641a1a940b1ebeaeefe8d41e53f1da2bee139914bbad21f15d8a"; - libraryHaskellDepends = [ - base bytestring containers directory filepath free ghc ghc-boot - ghc-paths mtl syb - ]; - testHaskellDepends = [ - base containers directory filemanip filepath ghc ghc-boot ghc-paths - HUnit mtl silently syb - ]; - description = "ExactPrint for GHC"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-exactprint" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filemanip , filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl, silently @@ -67955,7 +65473,6 @@ self: { version = "0.1.0.0"; sha256 = "f0905739f35dbf7fa133f6f96cc2f421f2a0dd2714b4a7ecf5dc15c481aac408"; libraryHaskellDepends = [ base ghc ]; - jailbreak = true; homepage = "https://github.com/alanz/ghc-generic-instances"; description = "Derived instances of GHC.Generic of the GHC AST"; license = stdenv.lib.licenses.publicDomain; @@ -68009,8 +65526,6 @@ self: { monad-journal mtl optparse-applicative parsec process process-streaming safe syb transformers ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/carlohamalainen/ghc-imported-from"; description = "Find the Haddock documentation for a symbol"; license = stdenv.lib.licenses.bsd3; @@ -68042,42 +65557,8 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec process ]; - jailbreak = true; description = "Generate a bash completion from the GHC manpage"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "ghc-mod_5_5_0_0" = callPackage - ({ mkDerivation, base, binary, bytestring, cabal-helper, containers - , deepseq, directory, djinn-ghc, doctest, extra, fclabels, filepath - , ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec - , monad-control, monad-journal, mtl, old-time, optparse-applicative - , pipes, pretty, process, safe, split, syb, temporary, text, time - , transformers, transformers-base - }: - mkDerivation { - pname = "ghc-mod"; - version = "5.5.0.0"; - sha256 = "d05be8f3541e875cd4ebefb28968cfc095fc323e49328f2e40581f6f5de70d31"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base binary bytestring cabal-helper containers deepseq directory - djinn-ghc extra fclabels filepath ghc ghc-paths ghc-syb-utils - haskell-src-exts hlint monad-control monad-journal mtl old-time - pipes pretty process safe split syb temporary text time - transformers transformers-base - ]; - executableHaskellDepends = [ - base binary deepseq directory fclabels filepath ghc monad-control - mtl old-time optparse-applicative pretty process split time - ]; - testHaskellDepends = [ base doctest hspec ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; - description = "Happy Haskell Programming"; - license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -68113,7 +65594,6 @@ self: { mtl old-time optparse-applicative pretty process split time ]; testHaskellDepends = [ base doctest hspec ]; - doCheck = false; homepage = "http://www.mew.org/~kazu/proj/ghc-mod/"; description = "Happy Haskell Programming"; license = stdenv.lib.licenses.agpl3; @@ -68152,7 +65632,6 @@ self: { base bin-package-db Cabal directory filepath ghc ghc-paths process transformers unix ]; - jailbreak = true; homepage = "https://github.com/ranjitjhala/ghc-options.git"; description = "Utilities for extracting GHC options needed to compile a given Haskell target"; license = stdenv.lib.licenses.mit; @@ -68193,7 +65672,6 @@ self: { sha256 = "494e9df73942c5e77e01c331eaee94438c15c711d78f48c1d1c4d8977ffb5152"; libraryHaskellDepends = [ base ghc ]; libraryToolDepends = [ cpphs happy ]; - jailbreak = true; homepage = "https://github.com/gibiansky/IHaskell"; description = "Haskell source parser from GHC"; license = stdenv.lib.licenses.mit; @@ -68224,7 +65702,6 @@ self: { executableHaskellDepends = [ base Cabal cmdargs filepath parsec process split ]; - jailbreak = true; description = "Simple utility to fix BROKEN package dependencies for cabal-install"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -68318,7 +65795,6 @@ self: { transformers-compat ]; executableHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://github.com/pmlodawski/ghc-session"; description = "Simplified GHC API"; license = stdenv.lib.licenses.mit; @@ -68362,7 +65838,6 @@ self: { version = "0.2.0.0"; sha256 = "0052bd2ee4d92fbb010bebc7bcfd533a0b78437f1fb0834288ce979c103d9d67"; libraryHaskellDepends = [ base ghc ]; - jailbreak = true; homepage = "http://github.com/nominolo/ghc-syb"; description = "Data and Typeable instances for the GHC API"; license = stdenv.lib.licenses.bsd3; @@ -68411,45 +65886,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-typelits-extra_0_1_3" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra - , ghc-typelits-natnormalise, integer-gmp, tasty, tasty-hunit - , transformers - }: - mkDerivation { - pname = "ghc-typelits-extra"; - version = "0.1.3"; - sha256 = "65c81dd6deca863a313ef121950753797d58affbcf1edb7627559c4ec1411fd7"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp transformers - ]; - testHaskellDepends = [ - base ghc-typelits-natnormalise tasty tasty-hunit - ]; - homepage = "http://www.clash-lang.org/"; - description = "Additional type-level operations on GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-typelits-extra" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra , ghc-typelits-knownnat, ghc-typelits-natnormalise, integer-gmp - , singletons, tasty, tasty-hunit, transformers + , singletons, tasty, tasty-hunit, template-haskell, transformers }: mkDerivation { pname = "ghc-typelits-extra"; - version = "0.2"; - sha256 = "7ea3126b4dcf8de6dacd4654bbed1eb019cd088a70f79434d34193d93fac2c17"; - revision = "1"; - editedCabalFile = "52861a8d689da7f12990a870c6f3c0a219e9b2946570733710e21841947afdbc"; + version = "0.2.1"; + sha256 = "bc76eccd4686d12e77ada1b08c8bb087d46d102acedf37c502391a5da01d55f8"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ghc-typelits-knownnat ghc-typelits-natnormalise integer-gmp singletons transformers ]; testHaskellDepends = [ base ghc-typelits-knownnat ghc-typelits-natnormalise tasty - tasty-hunit + tasty-hunit template-haskell ]; homepage = "http://www.clash-lang.org/"; description = "Additional type-level operations on GHC.TypeLits.Nat"; @@ -68463,8 +65915,8 @@ self: { }: mkDerivation { pname = "ghc-typelits-knownnat"; - version = "0.2.1"; - sha256 = "5c4e3f8be0fe29e523c1129cea98a18d46950ea53178b57fd06ae3b0057271ee"; + version = "0.2.2"; + sha256 = "5236eda806fd52ec51a9a10666129d1c66e20c45e4167008f1b7442a25353f12"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ghc-typelits-natnormalise singletons template-haskell transformers @@ -68477,36 +65929,18 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "ghc-typelits-natnormalise_0_4_6" = callPackage - ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit - }: - mkDerivation { - pname = "ghc-typelits-natnormalise"; - version = "0.4.6"; - sha256 = "24cf8f937c88a6c3a489af8a4f2e23ee8f994eb4e5fa7fecb6942cee71bd160e"; - libraryHaskellDepends = [ - base ghc ghc-tcplugins-extra integer-gmp - ]; - testHaskellDepends = [ base tasty tasty-hunit ]; - homepage = "http://www.clash-lang.org/"; - description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghc-typelits-natnormalise" = callPackage ({ mkDerivation, base, ghc, ghc-tcplugins-extra, integer-gmp, tasty - , tasty-hunit + , tasty-hunit, template-haskell }: mkDerivation { pname = "ghc-typelits-natnormalise"; - version = "0.5"; - sha256 = "3ac6b6c46b41dba1cf06f9dc3a6180939401a318612f81087241dd7bc7e755f5"; + version = "0.5.1"; + sha256 = "999459e94b1b577d5ad591390f56b2b29ccf6c1244d1c2d09ffae11524629b4c"; libraryHaskellDepends = [ base ghc ghc-tcplugins-extra integer-gmp ]; - testHaskellDepends = [ base tasty tasty-hunit ]; + testHaskellDepends = [ base tasty tasty-hunit template-haskell ]; homepage = "http://www.clash-lang.org/"; description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat"; license = stdenv.lib.licenses.bsd2; @@ -68542,7 +65976,6 @@ self: { base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl svgcairo text transformers xdot ]; - jailbreak = true; homepage = "http://felsin9.de/nnis/ghc-vis"; description = "Live visualization of data structures in GHCi"; license = stdenv.lib.licenses.bsd3; @@ -68573,7 +66006,6 @@ self: { version = "0.1.1"; sha256 = "3cec737a321ff8b7c8f16c00847dc14296a654bbc3b9c3dfdc6a902666a99eca"; libraryHaskellDepends = [ base cairo colour diagrams gtk ]; - jailbreak = true; description = "Display simple diagrams from ghci"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -68593,7 +66025,6 @@ self: { array base bytestring directory filepath ghc ghc-paths haskeline mtl process unix ]; - jailbreak = true; homepage = "http://code.haskell.org/~judah/ghci-haskeline"; description = "An implementation of ghci using the Haskeline line-input library"; license = stdenv.lib.licenses.bsd3; @@ -68620,7 +66051,6 @@ self: { version = "0.1.0.0"; sha256 = "7fccf7e97b1a6fe6823d3beb7e366c3142b5a6b863e8a95080659aac3f0b8f1a"; libraryHaskellDepends = [ base ghc MissingH ]; - jailbreak = true; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for interactively evaluating Haskell code"; license = stdenv.lib.licenses.mit; @@ -68644,7 +66074,6 @@ self: { array base bytestring containers directory filepath ghc ghc-paths haskeline process syb time transformers unix ]; - jailbreak = true; homepage = "https://github.com/chrisdone/ghci-ng"; description = "Next generation GHCi"; license = stdenv.lib.licenses.bsd3; @@ -68663,36 +66092,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ghcid_0_6_4" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.6.4"; - sha256 = "fc43077955f9e53519b028364da0ec8bbea467b739b89ed7b2fa234a4a4b71db"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base cmdargs directory extra filepath process terminal-size time - unix - ]; - executableHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process terminal-size time unix - ]; - testHaskellDepends = [ - ansi-terminal base cmdargs containers directory extra filepath - fsnotify process tasty tasty-hunit terminal-size time unix - ]; - doCheck = false; - homepage = "https://github.com/ndmitchell/ghcid#readme"; - description = "GHCi based bare bones IDE"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghcid" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit @@ -68716,7 +66115,6 @@ self: { ansi-terminal base cmdargs containers directory extra filepath fsnotify process tasty tasty-hunit terminal-size time unix ]; - doCheck = false; homepage = "https://github.com/ndmitchell/ghcid#readme"; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; @@ -68746,32 +66144,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ghcjs-dom_0_2_4_0" = callPackage - ({ mkDerivation, base, glib, gtk3, text, transformers, webkitgtk3 - }: - mkDerivation { - pname = "ghcjs-dom"; - version = "0.2.4.0"; - sha256 = "986db6b770c348d7a28368309a648626455d55e7a5705a849fd5a2981eb868a6"; - libraryHaskellDepends = [ - base glib gtk3 text transformers webkitgtk3 - ]; - description = "DOM library that supports both GHCJS and WebKitGTK"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ghcjs-dom" = callPackage ({ mkDerivation, base, ghcjs-dom-jsaddle, text, transformers }: mkDerivation { pname = "ghcjs-dom"; - version = "0.3.1.0"; - sha256 = "74a02471ecc57f3de7e4e85f34630daa663aee2b358522833c305eca81f9c32a"; + version = "0.4.1.0"; + sha256 = "aa3c9e44ae5ff47b224c8624ea8131cfb02d54f8d7d98935e649a8011f3593c8"; libraryHaskellDepends = [ base ghcjs-dom-jsaddle text transformers ]; doHaddock = false; - description = "DOM library that supports both GHCJS and WebKitGTK"; + description = "DOM library that supports both GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -68780,12 +66163,11 @@ self: { ({ mkDerivation, base, ghcjs-dom, mtl }: mkDerivation { pname = "ghcjs-dom-hello"; - version = "2.0.0.0"; - sha256 = "34bd62641aa6913d04baeb1ab347f6f867080e001f7cacfb841a5f14abf46fe7"; + version = "3.0.0.0"; + sha256 = "1cf743f986fe9cd97951efb6182ebf6e5d7b6c920cb92354c11ebea86273b7e5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ghcjs-dom mtl ]; - jailbreak = true; homepage = "https://github.com/ghcjs/ghcjs-dom-hello"; description = "GHCJS DOM Hello World, an example package"; license = stdenv.lib.licenses.mit; @@ -68796,11 +66178,11 @@ self: { ({ mkDerivation, jsaddle-dom }: mkDerivation { pname = "ghcjs-dom-jsaddle"; - version = "0.3.1.0"; - sha256 = "82ab76c520ad821755c6343d66977cdf7ac728be888717621a03fd999ccaf02e"; + version = "0.4.1.0"; + sha256 = "e9906ab7606eb22dbb7e48147e1602f0bb62787f3baacda79550d3e9225c14d8"; libraryHaskellDepends = [ jsaddle-dom ]; doHaddock = false; - description = "DOM library that supports both GHCJS and WebKitGTK using jsaddle"; + description = "DOM library that supports both GHCJS and GHC using jsaddle"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -68809,8 +66191,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "ghcjs-dom-jsffi"; - version = "0.3.1.0"; - sha256 = "afa04fa73727c0cfe2c80b88cc25d96555021465b022533b328e2ddab00680fc"; + version = "0.4.1.0"; + sha256 = "5cf3d984c17817d0104d7792003d14fd21978571a7b3c977edbd266c8a68c1fe"; isLibrary = false; isExecutable = false; description = "DOM library using JSFFI and GHCJS"; @@ -68838,8 +66220,8 @@ self: { }: mkDerivation { pname = "ghcjs-hplay"; - version = "0.3.4"; - sha256 = "7a3b5d91883912b0f768129cde6a89ed71ab0d3a94749fcf8b9d9197959541f8"; + version = "0.3.4.2"; + sha256 = "c3d9e5108b4792fc6fd9ef079cb4f4a6e9a21195e68f5b0d53d43ad7f79149d5"; libraryHaskellDepends = [ base containers ghcjs-perch mtl transformers transient transient-universe @@ -68897,7 +66279,6 @@ self: { file-embed hint mtl text time unix unordered-containers vector wai wai-websockets warp websockets yesod yesod-static ]; - jailbreak = true; homepage = "http://github.com/shapr/ghclive/"; description = "Interactive Haskell interpreter in a browser"; license = stdenv.lib.licenses.bsd3; @@ -69284,8 +66665,8 @@ self: { "gi-gst" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gobjectIntrospection, gstreamer, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gstreamer, haskell-gi, haskell-gi-base, text + , transformers }: mkDerivation { pname = "gi-gst"; @@ -69296,20 +66677,18 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi-base text transformers ]; - librarySystemDepends = [ gobjectIntrospection ]; libraryPkgconfigDepends = [ gstreamer ]; doHaddock = false; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "GStreamer bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gst_all_1) gstreamer;}; + }) {inherit (pkgs.gst_all_1) gstreamer;}; "gi-gstaudio" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstaudio"; @@ -69320,18 +66699,20 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; 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; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gstbase" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gst_plugins_base, haskell-gi, haskell-gi-base - , text, transformers + , gi-gobject, gi-gst, gobjectIntrospection, gst_plugins_base + , haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstbase"; @@ -69342,18 +66723,20 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; 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; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gstvideo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gi-gst, gi-gstbase, gst_plugins_base, haskell-gi - , haskell-gi-base, text, transformers + , gi-gobject, gi-gst, gi-gstbase, gobjectIntrospection + , gst_plugins_base, haskell-gi, haskell-gi-base, text, transformers }: mkDerivation { pname = "gi-gstvideo"; @@ -69364,13 +66747,15 @@ self: { base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase haskell-gi-base text transformers ]; + librarySystemDepends = [ gobjectIntrospection ]; 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; - }) {gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; + }) {inherit (pkgs) gobjectIntrospection; + gst_plugins_base = pkgs.gst_all_1.gst-plugins-base;}; "gi-gtk" = callPackage ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo @@ -69432,7 +66817,6 @@ self: { base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gtk haskell-gi-base mtl text transformers ]; - jailbreak = true; homepage = "https://github.com/haskell-gi/gi-gtk-hs"; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; @@ -69483,7 +66867,7 @@ self: { description = "GtkSource bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "gi-javascriptcore" = callPackage ({ mkDerivation, base, bytestring, containers, haskell-gi @@ -69550,9 +66934,9 @@ self: { }) {inherit (pkgs) libnotify;}; "gi-pango" = callPackage - ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject - , gobjectIntrospection, haskell-gi, haskell-gi-base, pango, text - , transformers + ({ mkDerivation, base, bytestring, cairo, containers, gi-glib + , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base + , pango, text, transformers }: mkDerivation { pname = "gi-pango"; @@ -69562,20 +66946,24 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gobjectIntrospection pango ]; + libraryPkgconfigDepends = [ cairo gobjectIntrospection 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)" + ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; + inherit (pkgs.gnome2) pango;}; "gi-pango_1_0_6" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib - , gi-gobject, gobjectIntrospection, haskell-gi, haskell-gi-base - , pango, text, transformers + ({ mkDerivation, base, bytestring, Cabal, cairo, containers + , gi-glib, gi-gobject, gobjectIntrospection, haskell-gi + , haskell-gi-base, pango, text, transformers }: mkDerivation { pname = "gi-pango"; @@ -69586,15 +66974,19 @@ self: { base bytestring containers gi-glib gi-gobject haskell-gi-base text transformers ]; - libraryPkgconfigDepends = [ gobjectIntrospection pango ]; + libraryPkgconfigDepends = [ cairo gobjectIntrospection 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)" + ''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Pango bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gobjectIntrospection; - inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs) cairo; inherit (pkgs) gobjectIntrospection; + inherit (pkgs.gnome2) pango;}; "gi-pangocairo" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -69616,7 +67008,7 @@ self: { description = "PangoCairo bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome2) pango;}; "gi-poppler" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo @@ -69658,7 +67050,7 @@ self: { homepage = "https://github.com/haskell-gi/haskell-gi"; description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "gi-soup_2_4_6" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-gio @@ -69680,7 +67072,7 @@ self: { description = "Libsoup bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "gi-vte" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk @@ -69702,7 +67094,7 @@ self: { description = "Vte bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome2) vte;}; "gi-webkit" = callPackage ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo @@ -69769,7 +67161,6 @@ self: { ]; libraryPkgconfigDepends = [ webkit2gtk webkitgtk ]; doHaddock = false; - jailbreak = true; preConfigure = ''export HASKELL_GI_GIR_SEARCH_PATH=${webkitgtk}/share/gir-1.0''; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2 bindings"; @@ -69793,7 +67184,6 @@ self: { ]; libraryPkgconfigDepends = [ webkit2gtk-web-extension ]; doHaddock = false; - jailbreak = true; homepage = "https://github.com/haskell-gi/haskell-gi"; description = "WebKit2-WebExtension bindings"; license = stdenv.lib.licenses.lgpl21; @@ -69841,8 +67231,8 @@ self: { }: mkDerivation { pname = "ginger"; - version = "0.3.2.0"; - sha256 = "23485cfcab2af0bc010991183ac57fe1a922010581aa51dd70261241b241f87a"; + version = "0.3.5.0"; + sha256 = "8a410a6b65ad7753cc6fc4dba17258a0e818451aa42130b29e335bb6989495fe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69888,25 +67278,6 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) openssl;}; - "gio_0_13_1_1" = callPackage - ({ mkDerivation, array, base, bytestring, containers, glib - , gtk2hs-buildtools, mtl, system-glib - }: - mkDerivation { - pname = "gio"; - version = "0.13.1.1"; - sha256 = "d04d9b87b43bf12c5917ea561da403f80fe955adf735785ea8afa0915478113b"; - libraryHaskellDepends = [ - array base bytestring containers glib mtl - ]; - libraryPkgconfigDepends = [ system-glib ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to GIO"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {system-glib = pkgs.glib;}; - "gio" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers, glib , gtk2hs-buildtools, mtl, system-glib @@ -69925,29 +67296,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {system-glib = pkgs.glib;}; - "gipeda_0_2_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, cassava, containers - , directory, extra, filepath, gitlib, gitlib-libgit2, scientific - , shake, split, tagged, text, unordered-containers, vector, yaml - }: - mkDerivation { - pname = "gipeda"; - version = "0.2.0.1"; - sha256 = "8b2e6d06a7392b5ce4956a97aa6102213b790e575516c74feeaed371e0f7e12e"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring cassava containers directory extra filepath - gitlib gitlib-libgit2 scientific shake split tagged text - unordered-containers vector yaml - ]; - jailbreak = true; - homepage = "https://github.com/nomeata/gipeda"; - description = "Git Performance Dashboard"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gipeda" = callPackage ({ mkDerivation, aeson, base, bytestring, cassava , concurrent-output, containers, directory, extra, file-embed @@ -69993,6 +67341,32 @@ self: { homepage = "http://github.com/passy/giphy-api#readme"; description = "Giphy HTTP API wrapper and CLI search tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "giphy-api_0_5_0_0" = callPackage + ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers + , directory, hspec, http-api-data, http-client, http-client-tls + , lens, microlens, microlens-th, mtl, network-uri, servant + , servant-client, text, transformers + }: + mkDerivation { + pname = "giphy-api"; + version = "0.5.0.0"; + sha256 = "12ad1a1080348dfd4033d4c97e5b2a7c3d3da8d342c78c520a5d51396474b16e"; + libraryHaskellDepends = [ + aeson base containers http-api-data http-client http-client-tls + microlens microlens-th mtl network-uri servant servant-client text + transformers + ]; + testHaskellDepends = [ + aeson base basic-prelude bytestring containers directory hspec lens + network-uri text + ]; + homepage = "http://github.com/passy/giphy-api#readme"; + description = "Giphy HTTP API wrapper and CLI search tool"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gist" = callPackage @@ -70008,7 +67382,6 @@ self: { executableHaskellDepends = [ aeson base bytestring conduit http-conduit text ]; - jailbreak = true; homepage = "http://github.com/simonmichael/gist"; description = "A reliable command-line client for gist.github.com"; license = stdenv.lib.licenses.gpl3; @@ -70059,75 +67432,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "git-annex_6_20160511" = callPackage - ({ mkDerivation, aeson, async, aws, base, blaze-builder - , bloomfilter, bup, byteable, bytestring, case-insensitive - , clientsession, concurrent-output, conduit, conduit-extra - , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus - , directory, disk-free-space, dlist, dns, edit-distance, esqueleto - , exceptions, fdo-notify, feed, filepath, git, gnupg, gnutls - , hinotify, hslogger, http-client, http-conduit, http-types, IfElse - , json, lsof, magic, MissingH, monad-control, monad-logger - , mountpoints, mtl, network, network-info, network-multicast - , network-protocol-xmpp, network-uri, old-locale, openssh - , optparse-applicative, path-pieces, perl, persistent - , persistent-sqlite, persistent-template, process, QuickCheck - , random, regex-tdfa, resourcet, rsync, SafeSemaphore, sandi - , securemem, shakespeare, stm, tasty, tasty-hunit, tasty-quickcheck - , tasty-rerun, template-haskell, text, time, torrent, transformers - , unix, unix-compat, utf8-string, uuid, wai, wai-extra, warp - , warp-tls, wget, which, xml-types, yesod, yesod-core - , yesod-default, yesod-form, yesod-static - }: - mkDerivation { - pname = "git-annex"; - version = "6.20160511"; - sha256 = "85fc8853166fe57d91dc2776d5df4acb5911a91815f8aa12881928a1afe8ba01"; - configureFlags = [ - "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" - "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" - "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp" - "-fwebapp-secure" "-fwebdav" "-fxmpp" - ]; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson async aws base blaze-builder bloomfilter byteable bytestring - case-insensitive clientsession concurrent-output conduit - conduit-extra containers crypto-api cryptonite data-default DAV - dbus directory disk-free-space dlist dns edit-distance esqueleto - exceptions fdo-notify feed filepath gnutls hinotify hslogger - http-client http-conduit http-types IfElse json magic MissingH - monad-control monad-logger mountpoints mtl network network-info - network-multicast network-protocol-xmpp network-uri old-locale - optparse-applicative path-pieces persistent persistent-sqlite - persistent-template process QuickCheck random regex-tdfa resourcet - SafeSemaphore sandi securemem shakespeare stm tasty tasty-hunit - tasty-quickcheck tasty-rerun template-haskell text time torrent - transformers unix unix-compat utf8-string uuid wai wai-extra warp - warp-tls xml-types yesod yesod-core yesod-default yesod-form - yesod-static - ]; - executableSystemDepends = [ - bup curl git gnupg lsof openssh perl rsync wget which - ]; - jailbreak = true; - preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; - postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; - installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; - checkPhase = "./git-annex test"; - enableSharedExecutables = false; - homepage = "http://git-annex.branchable.com/"; - description = "manage files with git, without checking their contents into git"; - license = stdenv.lib.licenses.gpl3; - platforms = [ "i686-linux" "x86_64-linux" ]; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; - inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; - inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; - inherit (pkgs) which;}; - "git-annex" = callPackage ({ mkDerivation, aeson, async, aws, base, blaze-builder , bloomfilter, bup, byteable, bytestring, Cabal, case-insensitive @@ -70150,8 +67454,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "6.20160907"; - sha256 = "6714156245c35647d7ac4b9b0c786c74584aa5ecef2fc0aa32044a3a6e722ef7"; + version = "6.20161012"; + sha256 = "38dab20236f36780278d49a345fb8850305e994d6c83ff010b4d9fd04cd85cdc"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -70184,7 +67488,6 @@ self: { executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which ]; - jailbreak = true; preConfigure = "export HOME=$TEMPDIR; patchShebangs ."; postBuild = "ln -sf dist/build/git-annex/git-annex git-annex"; installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install"; @@ -70213,7 +67516,6 @@ self: { executableHaskellDepends = [ base directory filepath optparse-applicative parsec pretty process ]; - jailbreak = true; homepage = "https://github.com/dougalstanton/git-checklist"; description = "Maintain per-branch checklists in Git"; license = "GPL"; @@ -70264,6 +67566,8 @@ self: { pname = "git-fmt"; version = "0.4.1.0"; sha256 = "a9c10f79f92b6a1650f4eac002542a35dda0048ed68d670602e97615b879e97d"; + revision = "1"; + editedCabalFile = "96d1979715bb9d13c2ac5a2698a47c58c755cf6177bd84178fd646efc16f7fa9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -70330,10 +67634,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base base-compat process ]; - jailbreak = true; homepage = "https://github.com/Peaker/git-jump"; description = "Move a git branch"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-monitor" = callPackage @@ -70373,6 +67677,7 @@ self: { homepage = "http://www.mew.org/~kazu/"; description = "Git object and its parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-repair" = callPackage @@ -70414,10 +67719,10 @@ self: { transformers ]; executableHaskellDepends = [ base Cabal ]; - jailbreak = true; homepage = "github.com/aloiscochard/git-sanity"; description = "A sanity checker for your git history"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "git-vogue" = callPackage @@ -70446,10 +67751,10 @@ self: { base containers directory filepath hspec process temporary ]; testToolDepends = [ git ]; - jailbreak = true; homepage = "https://github.com/christian-marie/git-vogue"; description = "A framework for pre-commit checks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitHUD" = callPackage @@ -70505,7 +67810,6 @@ self: { aeson aeson-lens base bytestring foldl lens mtl optparse-applicative sqlite-simple system-filepath text turtle wreq ]; - jailbreak = true; homepage = "https://github.com/mattyhall/gitdo"; description = "Create Github issues out of TODO comments in code"; license = stdenv.lib.licenses.mit; @@ -70539,38 +67843,11 @@ self: { aeson-compat base base-compat file-embed hspec unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/phadej/github"; description = "Access to the GitHub API, v3"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "github-backup_1_20160522" = callPackage - ({ mkDerivation, base, bytestring, containers, directory - , exceptions, filepath, git, github, hslogger, IfElse, MissingH - , mtl, network, network-uri, optparse-applicative, pretty-show - , process, text, transformers, unix, unix-compat, utf8-string - , vector - }: - mkDerivation { - pname = "github-backup"; - version = "1.20160522"; - sha256 = "da5f7c8458321e039f8634cce7ce539bf5c0464e9487072ab79a68fa074d5aa8"; - isLibrary = false; - isExecutable = true; - setupHaskellDepends = [ base hslogger MissingH ]; - executableHaskellDepends = [ - base bytestring containers directory exceptions filepath github - hslogger IfElse MissingH mtl network network-uri - optparse-applicative pretty-show process text transformers unix - unix-compat utf8-string vector - ]; - executableToolDepends = [ git ]; - homepage = "https://github.com/joeyh/github-backup"; - description = "backs up everything github knows about a repository, to the repository"; - license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) git;}; + }) {}; "github-backup" = callPackage ({ mkDerivation, base, bytestring, containers, directory @@ -70663,7 +67940,6 @@ self: { version = "0.1.0"; sha256 = "458940e4566ef14b14d6700e2fd581e99f115b6f6ce31d085b293cac7e0eefb4"; libraryHaskellDepends = [ base basic-prelude github text ]; - jailbreak = true; homepage = "https://github.com/greenrd/github-utils"; description = "Useful functions that use the GitHub API"; license = stdenv.lib.licenses.bsd3; @@ -70698,9 +67974,9 @@ self: { base bytestring case-insensitive github-types github-webhook-handler snap-core uuid ]; - jailbreak = true; description = "GitHub WebHook Handler implementation for Snap"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitignore" = callPackage @@ -70751,10 +68027,10 @@ self: { base bytestring directory filepath hslogger HTTP mtl network network-uri syb url utf8-string ]; - jailbreak = true; homepage = "http://gitit.net"; description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitlib" = callPackage @@ -70946,29 +68222,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "gitson_0_5_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , doctest, errors, filepath, flock, Glob, hspec, monad-control - , process, transformers - }: - mkDerivation { - pname = "gitson"; - version = "0.5.1"; - sha256 = "5efabd7b86a7866bb5179a298bccf3492b814e4c69d1b8073c63b1c1e615b29c"; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring directory errors filepath flock - monad-control process transformers - ]; - testHaskellDepends = [ - aeson base directory doctest Glob hspec process transformers - ]; - doCheck = false; - homepage = "https://github.com/myfreeweb/gitson"; - description = "A document store library for Git + JSON"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gitson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , conduit-combinators, conduit-extra, directory, doctest, errors @@ -70987,10 +68240,10 @@ self: { testHaskellDepends = [ aeson base directory doctest Glob hspec process transformers ]; - doCheck = false; homepage = "https://github.com/myfreeweb/gitson"; description = "A document store library for Git + JSON"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gitter" = callPackage @@ -71004,9 +68257,9 @@ self: { libraryHaskellDepends = [ aeson base bytestring exceptions lens lens-aeson mtl text wreq ]; - jailbreak = true; description = "Gitter.im API client"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "givegif" = callPackage @@ -71035,6 +68288,7 @@ self: { homepage = "http://github.com/passy/givegif#readme"; description = "CLI Giphy search tool with previews in iTerm 2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gl" = callPackage @@ -71094,12 +68348,11 @@ self: { libraryHaskellDepends = [ base glib gtk ]; libraryPkgconfigDepends = [ libglade ]; libraryToolDepends = [ gtk2hs-buildtools ]; - jailbreak = true; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the glade library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libglade;}; + }) {inherit (pkgs.gnome2) libglade;}; "gladexml-accessor" = callPackage ({ mkDerivation, base, glade, HaXml, template-haskell }: @@ -71150,10 +68403,10 @@ self: { executableHaskellDepends = [ base containers GLFW-b lens mtl OpenGL ]; - jailbreak = true; homepage = "zyghost.com"; description = "An OpenGL micro framework"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glasso" = callPackage @@ -71169,25 +68422,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "glib_0_13_2_2" = callPackage - ({ mkDerivation, base, bytestring, containers, glib - , gtk2hs-buildtools, text, utf8-string - }: - mkDerivation { - pname = "glib"; - version = "0.13.2.2"; - sha256 = "16bc6710ac195778e514c6ba1da3b22a057854d4db0929b4835172ec42e0497f"; - libraryHaskellDepends = [ - base bytestring containers text utf8-string - ]; - libraryPkgconfigDepends = [ glib ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GLIB library for Gtk2Hs"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) glib;}; - "glib" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, glib , gtk2hs-buildtools, text, utf8-string @@ -71218,21 +68452,19 @@ self: { base containers data-default deepseq lens parallel statistics ]; testHaskellDepends = [ base data-default hspec lens QuickCheck ]; - jailbreak = true; description = "Glicko-2 implementation in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glider-nlp" = callPackage - ({ mkDerivation, base, Cabal, containers, HUnit, text }: + ({ mkDerivation, base, Cabal, containers, hspec, text }: mkDerivation { pname = "glider-nlp"; - version = "0.1"; - sha256 = "cba1bce586c0bf71c9e4a7111928c7fa92060474cf68c5dac84b693de423c0c4"; + version = "0.4"; + sha256 = "84b8d06e47dcbfba91bcbfe22caee05e9e1db034a03ebde4d4d6054fb30d5588"; libraryHaskellDepends = [ base containers text ]; - testHaskellDepends = [ base Cabal containers HUnit text ]; - jailbreak = true; + testHaskellDepends = [ base Cabal containers hspec text ]; homepage = "https://github.com/klangner/glider-nlp"; description = "Natural Language Processing library"; license = stdenv.lib.licenses.bsd3; @@ -71254,31 +68486,34 @@ self: { "glirc" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, Cabal - , config-value, connection, containers, data-default-class, deepseq - , directory, filepath, gitrev, hashable, HUnit, irc-core, lens - , network, process, regex-tdfa, regex-tdfa-text, socks, split, stm - , text, time, tls, transformers, unix, unordered-containers, vector - , vty, x509, x509-store, x509-system + , config-value, containers, data-default-class, directory, filepath + , gitrev, hashable, hookup, HsOpenSSL, HUnit, irc-core + , kan-extensions, lens, memory, network, process, regex-tdfa, socks + , split, stm, text, time, transformers, unix, unordered-containers + , vector, vty }: mkDerivation { pname = "glirc"; - version = "2.15"; - sha256 = "1179f60fc18d4ad3f15241a810f5063f5da1aece2d2b50d8cd04c3af2f562457"; + version = "2.20.1"; + sha256 = "1ddfb3fea3ccb962abacdd5556116ba0799a836201a757fb185abc641800f08d"; isLibrary = true; isExecutable = true; - setupHaskellDepends = [ base Cabal ]; + setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ - async attoparsec base bytestring config-value connection containers - data-default-class deepseq directory filepath gitrev hashable - irc-core lens network process regex-tdfa regex-tdfa-text socks - split stm text time tls transformers unix unordered-containers - vector vty x509 x509-store x509-system + async attoparsec base bytestring config-value containers + data-default-class directory filepath gitrev hashable hookup + HsOpenSSL irc-core kan-extensions lens memory network process + regex-tdfa socks split stm text time transformers unix + unordered-containers vector vty + ]; + executableHaskellDepends = [ + base data-default-class lens text vty ]; - executableHaskellDepends = [ base lens text ]; testHaskellDepends = [ base HUnit ]; homepage = "https://github.com/glguy/irc-core"; description = "Console IRC client"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gll" = callPackage @@ -71287,14 +68522,14 @@ self: { }: mkDerivation { pname = "gll"; - version = "0.3.0.9"; - sha256 = "4c5657403588a489d1a97ee2e85e9ed5e41e029a299918b59778f1e65dfde0e2"; + version = "0.4.0.2"; + sha256 = "89ee909a9120d6fa34f718079fca0e07f18ce20be93573caafa506ee72ec7818"; libraryHaskellDepends = [ array base containers pretty regex-applicative text TypeCompose ]; - jailbreak = true; description = "GLL parser with simple combinator interface"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "global" = callPackage @@ -71356,7 +68591,6 @@ self: { version = "1.0.1.1"; sha256 = "f7ef3f7f9aa26f4f13590785939c321d3a4c33ec9fc35ca2c724846fb081703b"; libraryHaskellDepends = [ base containers stm ]; - jailbreak = true; description = "Namespaced, global, and top-level mutable variables without unsafePerformIO"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71381,7 +68615,6 @@ self: { random time ]; doHaddock = false; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Glome"; description = "ray tracer"; license = "GPL"; @@ -71399,7 +68632,6 @@ self: { libraryHaskellDepends = [ base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL ]; - jailbreak = true; homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; license = stdenv.lib.licenses.mit; @@ -71431,7 +68663,6 @@ self: { revision = "1"; editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff"; libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; - jailbreak = true; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71458,7 +68689,6 @@ self: { revision = "1"; editedCabalFile = "232cec279cb20afd92056320c24d3d3041199b014981492ddbbe57eeff312a5a"; libraryHaskellDepends = [ base gloss reactive-banana ]; - jailbreak = true; homepage = "https://github.com/Twey/gloss-banana"; description = "An Interface for gloss in terms of a reactive-banana Behavior"; license = stdenv.lib.licenses.gpl3; @@ -71557,7 +68787,6 @@ self: { libraryHaskellDepends = [ accelerate accelerate-cuda base gloss gloss-accelerate ]; - jailbreak = true; description = "Parallel rendering of raster images using Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71583,7 +68812,6 @@ self: { version = "0.1.0.0"; sha256 = "eaa725c9ddafd54386ea2f4875376d1990b45b879c3dd0801409d81bd6c7f279"; libraryHaskellDepends = [ base gloss sodium ]; - jailbreak = true; homepage = "https://github.com/Twey/gloss-sodium"; description = "A Sodium interface to the Gloss drawing package"; license = stdenv.lib.licenses.agpl3; @@ -71591,12 +68819,13 @@ self: { }) {}; "glpk-hs" = callPackage - ({ mkDerivation, array, base, containers, deepseq, glpk, mtl }: + ({ mkDerivation, array, base, containers, deepseq, gasp, glpk, mtl + }: mkDerivation { pname = "glpk-hs"; - version = "0.3.5"; - sha256 = "5714be0c2eacc1500438838fabf9535cfd94afc3007ced040c9225003caba0db"; - libraryHaskellDepends = [ array base containers deepseq mtl ]; + version = "0.5"; + sha256 = "a36ed027a55343864388f6c301279a2fb3ec06e7929f369e386120db7d2c99e9"; + libraryHaskellDepends = [ array base containers deepseq gasp mtl ]; librarySystemDepends = [ glpk ]; description = "Comprehensive GLPK linear programming bindings"; license = stdenv.lib.licenses.bsd3; @@ -71627,9 +68856,9 @@ self: { QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; - jailbreak = true; description = "Make better services"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-common" = callPackage @@ -71639,8 +68868,8 @@ self: { }: mkDerivation { pname = "glue-common"; - version = "0.4.6"; - sha256 = "bca26c14be41205c86082e303885bd2c031634dbb7b31336ab71f37efc4f654b"; + version = "0.4.8"; + sha256 = "93e860fbbff04561621cd923081b111602a900dd2eb9306e1c77dc26b63b1912"; libraryHaskellDepends = [ base hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71650,9 +68879,9 @@ self: { QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; - jailbreak = true; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-core" = callPackage @@ -71663,8 +68892,8 @@ self: { }: mkDerivation { pname = "glue-core"; - version = "0.4.6"; - sha256 = "d4cecdff03ee9d1b30a804a17a186b2fc1ad84bde59031285cd21e9f550db1ff"; + version = "0.4.8"; + sha256 = "145a86d1ef7c2a8c0dd10b258a6b93497986ae3789fe79b1389ecb02ab5b8178"; libraryHaskellDepends = [ base glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71674,9 +68903,9 @@ self: { monad-control QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; - jailbreak = true; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-ekg" = callPackage @@ -71687,8 +68916,8 @@ self: { }: mkDerivation { pname = "glue-ekg"; - version = "0.4.6"; - sha256 = "c22a6f59bf4e3eddcdfd00500eaef16a9065113b52f97252c1270fdd29e1ad27"; + version = "0.4.8"; + sha256 = "9612eb9054420ae4f467b167356f1cbe1ed43ad2f62726810dbdd012c38a4501"; libraryHaskellDepends = [ base ekg-core glue-common hashable lifted-base monad-control text time transformers transformers-base unordered-containers @@ -71698,9 +68927,9 @@ self: { monad-control QuickCheck quickcheck-instances text time transformers transformers-base unordered-containers ]; - jailbreak = true; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "glue-example" = callPackage @@ -71710,8 +68939,8 @@ self: { }: mkDerivation { pname = "glue-example"; - version = "0.4.6"; - sha256 = "595d107c5153ed6ac93b2b0f27fb154e76975f05c6780b78ffa2618cc395dc62"; + version = "0.4.8"; + sha256 = "3e75fea965b3d83e57c1ade5354811a96707111b912840b5c7c46c2d02ae330a"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -71721,6 +68950,7 @@ self: { ]; description = "Make better services and clients"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gluturtle" = callPackage @@ -71734,6 +68964,7 @@ self: { ]; description = "turtle like LOGO with glut"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gmap" = callPackage @@ -71766,7 +68997,6 @@ self: { ad array base gtk gtkglext mtl OpenGL OpenGLRaw parsec priority-queue qd reflection Vec ]; - jailbreak = true; description = "Mandelbrot Set explorer using GTK"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -71803,7 +69033,7 @@ self: { description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gnome_keyring;}; + }) {inherit (pkgs.gnome2) gnome_keyring;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs @@ -71818,12 +69048,11 @@ self: { ]; libraryPkgconfigDepends = [ gnome_vfs gnome_vfs_module ]; libraryToolDepends = [ gtk2hs-buildtools ]; - jailbreak = true; homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the GNOME Virtual File System library"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;}; + }) {inherit (pkgs.gnome2) gnome_vfs; gnome_vfs_module = null;}; "gnss-converters" = callPackage ({ mkDerivation, base, basic-prelude, binary-conduit, bytestring @@ -71941,7 +69170,6 @@ self: { data-default-class gtk lens ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "Core imports for Geometric Optimization Libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -71977,7 +69205,6 @@ self: { mwc-random-monad statistics vector ]; executableHaskellDepends = [ base goal-core goal-geometry vector ]; - jailbreak = true; description = "Manifolds of probability distributions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -72002,7 +69229,6 @@ self: { base directory goal-core goal-geometry goal-probability hmatrix mtl vector ]; - jailbreak = true; description = "Mealy based simulation tools"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -73255,7 +70481,6 @@ self: { version = "0.1.0.0"; sha256 = "f224cc55134f260e9b5edd908f4534a41a2c47a63388c9b34022d58fe95e545a"; libraryHaskellDepends = [ base renderable transformers varying ]; - jailbreak = true; description = "Graphical user interfaces that are renderable, change over time and eventually produce a value"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -73311,6 +70536,7 @@ self: { ]; description = "Google Drive API access"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-html5-slide" = callPackage @@ -73327,7 +70553,6 @@ self: { base blaze-html cmdargs data-default hamlet pandoc shakespeare-css syb text time ]; - jailbreak = true; description = "Google HTML5 Slide generator"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -73364,9 +70589,9 @@ self: { testHaskellDepends = [ base bytestring hspec http-conduit http-types load-env ]; - jailbreak = true; description = "Google OAuth2 token negotiation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-oauth2-jwt" = callPackage @@ -73375,14 +70600,15 @@ self: { }: mkDerivation { pname = "google-oauth2-jwt"; - version = "0.1.1.1"; - sha256 = "dfd2bbee86c1965e8fb06a9933f090464c2432a2e5e0daaefa5093fd37084d12"; + version = "0.1.2.0"; + sha256 = "894d233d8253a69643aaeb2f230dbe6984cac4cdaf45c939835a523fadca66bf"; libraryHaskellDepends = [ base base64-bytestring bytestring HsOpenSSL RSA text unix-time ]; homepage = "https://github.com/MichelBoucey/google-oauth2-jwt"; description = "Get a signed JWT for Google Service Accounts"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "google-search" = callPackage @@ -73411,6 +70637,7 @@ self: { ]; description = "Google Translate API bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "googleplus" = callPackage @@ -73426,7 +70653,6 @@ self: { aeson attoparsec base bytestring containers enumerator haskell98 http-enumerator http-types mtl text time timerep transformers url ]; - jailbreak = true; homepage = "http://github.com/michaelxavier/GooglePlus"; description = "Haskell implementation of the Google+ API v1"; license = stdenv.lib.licenses.bsd3; @@ -73447,10 +70673,10 @@ self: { base bytestring HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "https://github.com/lornap/googlepolyline"; description = "Google Polyline Encoder/Decoder"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gopherbot" = callPackage @@ -73711,6 +70937,7 @@ self: { homepage = "http://github.com/tgolson/gpio"; description = "Haskell GPIO interface, designed specifically for the RaspberryPi"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gpolyline" = callPackage @@ -73762,7 +70989,6 @@ self: { filepath gd gps GPX hsmagick html http-enumerator process random tar time xsd ]; - jailbreak = true; homepage = "https://github.com/robstewart57/Gps2HtmlReport"; description = "GPS to HTML Summary Report"; license = stdenv.lib.licenses.bsd3; @@ -73781,7 +71007,6 @@ self: { attoparsec base conduit filepath monad-control old-locale text time void xml-conduit xml-types ]; - jailbreak = true; description = "Read GPX files using conduits"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -73799,9 +71024,9 @@ self: { testHaskellDepends = [ base directory filepath hspec network process stm unix ]; - jailbreak = true; description = "Library to write graceful shutdown / upgrade service"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grammar-combinators" = callPackage @@ -73852,7 +71077,6 @@ self: { libraryHaskellDepends = [ arrows base containers fingertree semigroups TypeCompose ]; - jailbreak = true; homepage = "http://grapefruit-project.org/"; description = "Functional Reactive Programming core"; license = stdenv.lib.licenses.bsd3; @@ -73902,7 +71126,6 @@ self: { base colour containers fraction glib grapefruit-frp grapefruit-records grapefruit-ui gtk ]; - jailbreak = true; homepage = "http://grapefruit-project.org/"; description = "GTK+-based backend for declarative user interface programming"; license = stdenv.lib.licenses.bsd3; @@ -73975,10 +71198,10 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols containers mtl ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Monadic graph rewriting of hypergraphs with ports and multiedges"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-cl" = callPackage @@ -73995,7 +71218,6 @@ self: { base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL parsec ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Interactive graph rewriting system implementing various well-known combinators"; license = stdenv.lib.licenses.bsd3; @@ -74014,10 +71236,10 @@ self: { AC-Vector base base-unicode-symbols containers GLUT graph-rewriting graph-rewriting-layout OpenGL ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "OpenGL interface for interactive port graph rewriting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-lambdascope" = callPackage @@ -74036,10 +71258,10 @@ self: { graph-rewriting-layout graph-rewriting-strategies IndentParser OpenGL parsec ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-layout" = callPackage @@ -74053,10 +71275,10 @@ self: { libraryHaskellDepends = [ AC-Vector base base-unicode-symbols graph-rewriting ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Force-directed node placement intended for incremental graph drawing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-ski" = callPackage @@ -74073,10 +71295,10 @@ self: { base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL parsec ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-strategies" = callPackage @@ -74090,10 +71312,10 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols containers graph-rewriting ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluation strategies for port-graph rewriting systems"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-trs" = callPackage @@ -74112,10 +71334,10 @@ self: { graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL uu-parsinglib ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-rewriting-ww" = callPackage @@ -74133,10 +71355,10 @@ self: { base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl graph-rewriting-layout IndentParser OpenGL parsec ]; - jailbreak = true; homepage = "http://rochel.info/#graph-rewriting"; description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graph-serialize" = callPackage @@ -74162,7 +71384,6 @@ self: { libraryHaskellDepends = [ base containers fgl mtl parsec syb template-haskell ]; - jailbreak = true; homepage = "http://github.com/konn/graph-utils/"; description = "A simple wrapper & quasi quoter for fgl"; license = stdenv.lib.licenses.bsd3; @@ -74215,7 +71436,6 @@ self: { base containers mtl QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/tel/graphbuilder"; description = "A declarative, monadic graph construction language for small graphs"; license = stdenv.lib.licenses.mit; @@ -74234,10 +71454,10 @@ self: { base bifunctors containers hashable lens-family lens-family-core mtl transformers ]; - jailbreak = true; homepage = "https://github.com/5outh/graphene"; description = "A minimal Graph Theory library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphics-drawingcombinators" = callPackage @@ -74251,10 +71471,10 @@ self: { libraryHaskellDepends = [ base bitmap bitmap-opengl FTGL OpenGL stb-image ]; - jailbreak = true; homepage = "http://github.com/luqui/graphics-drawingcombinators"; description = "A functional interface to 2D drawing in OpenGL"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graphics-formats-collada" = callPackage @@ -74268,7 +71488,6 @@ self: { libraryHaskellDepends = [ base bitmap-opengl containers hxt OpenGL stb-image transformers ]; - jailbreak = true; homepage = "http://github.com/luqui/collada"; description = "Load 3D geometry in the COLLADA format"; license = stdenv.lib.licenses.bsd3; @@ -74389,7 +71608,6 @@ self: { testHaskellDepends = [ base containers fgl fgl-arbitrary filepath QuickCheck text ]; - doCheck = false; homepage = "http://projects.haskell.org/graphviz/"; description = "Bindings to Graphviz for graph visualisation"; license = stdenv.lib.licenses.bsd3; @@ -74462,10 +71680,10 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/mhwombat/gray-extended"; description = "Gray encoding schemes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "graylog" = callPackage @@ -74485,10 +71703,10 @@ self: { aeson aeson-casing base bytestring file-embed network scientific tasty tasty-hunit text time vector ]; - doCheck = false; homepage = "https://github.com/AndrewRademacher/haskell-graylog"; description = "Support for graylog output"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "greencard" = callPackage @@ -74684,7 +71902,6 @@ self: { containers monad-control monad-logger mtl scientific text time transformers transformers-base ]; - jailbreak = true; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; @@ -74729,7 +71946,6 @@ self: { base bytestring cmdargs containers groundhog groundhog-sqlite groundhog-th mtl ]; - jailbreak = true; homepage = "http://github.com/lykahb/groundhog"; description = "Type-safe datatype-database mapping library"; license = stdenv.lib.licenses.bsd3; @@ -74749,7 +71965,6 @@ self: { base bytestring containers groundhog monad-control monad-logger mysql mysql-simple resource-pool text time transformers ]; - jailbreak = true; description = "MySQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74772,7 +71987,6 @@ self: { monad-control monad-logger postgresql-libpq postgresql-simple resource-pool text time transformers ]; - jailbreak = true; description = "PostgreSQL backend for the groundhog library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -74825,10 +72039,10 @@ self: { testHaskellDepends = [ base Cabal containers hspec hspec-expectations QuickCheck ]; - jailbreak = true; homepage = "https://github.com/ulikoehler/group-with"; description = "Classify objects by key-generating function, like SQL GROUP BY"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grouped-list" = callPackage @@ -74899,7 +72113,6 @@ self: { regex-compat text transformers transformers-base unordered-containers vector wai wai-extra warp ]; - jailbreak = true; homepage = "http://github.com/iand675/growler"; description = "A revised version of the scotty library that attempts to be simpler and more performant"; license = stdenv.lib.licenses.mit; @@ -74922,7 +72135,6 @@ self: { base bytestring containers directory filepath FTGL gtk gtkglext mtl old-locale OpenGL OpenGLRaw parallel qd qd-vec ruff time Vec ]; - jailbreak = true; description = "fractal explorer GUI using the ruff library"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -74942,7 +72154,6 @@ self: { base containers data-memocombinators filepath gruff qd qd-vec random ruff Vec ]; - jailbreak = true; description = "Mandelbrot Set examples using ruff and gruff"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -74979,7 +72190,6 @@ self: { version = "0.5.0"; sha256 = "d2adccfe625d3cb5046ae5bb3c7a23d23697d1fc2c6a717df75f75aba2881c2e"; libraryHaskellDepends = [ base vector ]; - jailbreak = true; homepage = "http://github.com/patperry/hs-gsl-random"; description = "Bindings the the GSL random number generation facilities"; license = stdenv.lib.licenses.bsd3; @@ -75012,7 +72222,6 @@ self: { executableHaskellDepends = [ base containers mtl parsec permute sindre text X11 ]; - jailbreak = true; homepage = "http://sigkill.dk/programs/gsmenu"; description = "A visual generic menu"; license = stdenv.lib.licenses.bsd3; @@ -75071,26 +72280,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gtk_0_14_2" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, containers, gio - , glib, gtk2, gtk2hs-buildtools, mtl, pango, text - }: - mkDerivation { - pname = "gtk"; - version = "0.14.2"; - sha256 = "58f780c51fe2f3e25939a048bbe7d0b880e6aeb412df2648438f926a2b7b7eb5"; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk2 ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - doHaddock = false; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {gtk2 = pkgs.gnome2.gtk;}; - "gtk" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2, gtk2hs-buildtools, mtl, pango, text @@ -75104,7 +72293,6 @@ self: { array base bytestring cairo containers gio glib mtl pango text ]; libraryPkgconfigDepends = [ gtk2 ]; - doHaddock = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ graphical user interface library"; license = stdenv.lib.licenses.lgpl21; @@ -75183,7 +72371,6 @@ self: { array base containers glib gtk haskell98 mtl ]; libraryPkgconfigDepends = [ gtk2 ]; - jailbreak = true; homepage = "http://www.haskell.org/gtk2hs/"; description = "GTK+ Serialized event"; license = stdenv.lib.licenses.lgpl21; @@ -75221,7 +72408,6 @@ self: { version = "0.2.0"; sha256 = "d83594e48c60f2e088d590976990823631f2df9ee55a94f17c8c17581898c37d"; libraryHaskellDepends = [ base containers gtk ]; - jailbreak = true; description = "Convenient Gtk canvas with mouse and keyboard input"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -75240,27 +72426,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {gtk2 = pkgs.gnome2.gtk; inherit (pkgs) x11;}; - "gtk2hs-buildtools_0_13_0_5" = callPackage - ({ mkDerivation, alex, array, base, containers, directory, filepath - , happy, hashtables, pretty, process, random - }: - mkDerivation { - pname = "gtk2hs-buildtools"; - version = "0.13.0.5"; - sha256 = "d95811a505ec10e4c82f3ca81c06b317eb9d345e73b6eda7aeaebd1e868f0a93"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - array base containers directory filepath hashtables pretty process - random - ]; - executableToolDepends = [ alex happy ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Tools to build the Gtk2Hs suite of User Interface libraries"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "gtk2hs-buildtools" = callPackage ({ mkDerivation, alex, array, base, Cabal, containers, directory , filepath, happy, hashtables, pretty, process, random @@ -75395,10 +72560,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base glib gtk3 transformers ]; - jailbreak = true; homepage = "http://www.haskell.org/hello/"; description = "Gtk2Hs Hello World, an example package"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gtk2hs-rpn" = callPackage @@ -75408,32 +72573,11 @@ self: { version = "0.2.1"; sha256 = "716794f2a620e942b4f50daeae68515fb879a7e3338cb9cd671891054c9b9107"; libraryHaskellDepends = [ base cairo glib gtk mtl ]; - jailbreak = true; description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "gtk3_0_14_2" = callPackage - ({ mkDerivation, array, base, bytestring, cairo, containers, gio - , glib, gtk2hs-buildtools, gtk3, mtl, pango, text - }: - mkDerivation { - pname = "gtk3"; - version = "0.14.2"; - sha256 = "da198906bf3807e61c6d3c85c8537f424d9073d517d511d38197c569a1cb3d1d"; - libraryHaskellDepends = [ - array base bytestring cairo containers gio glib mtl pango text - ]; - libraryPkgconfigDepends = [ gtk3 ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - doHaddock = false; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Gtk+ 3 graphical user interface library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gtk3;}; - "gtk3" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gio, glib, gtk2hs-buildtools, gtk3, mtl, pango, text @@ -75447,7 +72591,6 @@ self: { array base bytestring cairo containers gio glib mtl pango text ]; libraryPkgconfigDepends = [ gtk3 ]; - doHaddock = false; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Gtk+ 3 graphical user interface library"; license = stdenv.lib.licenses.lgpl21; @@ -75481,12 +72624,11 @@ self: { libraryHaskellDepends = [ base glib gtk pango ]; libraryPkgconfigDepends = [ gtkglext ]; libraryToolDepends = [ gtk2hs-buildtools ]; - jailbreak = true; homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GTK+ OpenGL Extension"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtkglext;}; + }) {inherit (pkgs.gnome2) gtkglext;}; "gtkimageview" = callPackage ({ mkDerivation, array, base, containers, glib, gtk @@ -75501,7 +72643,6 @@ self: { ]; libraryPkgconfigDepends = [ gtkimageview ]; libraryToolDepends = [ gtk2hs-buildtools ]; - jailbreak = true; homepage = "http://www.haskell.org/gtk2hs/"; description = "Binding to the GtkImageView library"; license = stdenv.lib.licenses.lgpl21; @@ -75543,26 +72684,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) gtksourceview;}; - - "gtksourceview3_0_13_2_1" = callPackage - ({ mkDerivation, array, base, containers, glib, gtk2hs-buildtools - , gtk3, gtksourceview, mtl, text - }: - mkDerivation { - pname = "gtksourceview3"; - version = "0.13.2.1"; - sha256 = "61542fc063d948a0487c0fe784f8154d4a9ca66df3e29bbff0047843bb006ceb"; - libraryHaskellDepends = [ - array base containers glib gtk3 mtl text - ]; - libraryPkgconfigDepends = [ gtksourceview ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the GtkSourceView library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "gtksourceview3" = callPackage ({ mkDerivation, array, base, Cabal, containers, glib @@ -75580,7 +72702,7 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the GtkSourceView library"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) gtksourceview;}; + }) {inherit (pkgs.gnome2) gtksourceview;}; "guarded-rewriting" = callPackage ({ mkDerivation, base, instant-generics }: @@ -75630,10 +72752,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cairo containers filepath gtk ]; - jailbreak = true; homepage = "http://code.mathr.co.uk/gulcii"; description = "graphical untyped lambda calculus interactive interpreter"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "gutenberg-fibonaccis" = callPackage @@ -75657,9 +72779,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base extra GiveYouAHead ]; - jailbreak = true; description = "A binary version of GiveYouAHead"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "h-booru" = callPackage @@ -75703,7 +72825,6 @@ self: { base bindings-gpgme bytestring either HUnit QuickCheck tasty tasty-hunit tasty-quickcheck time transformers unix ]; - jailbreak = true; homepage = "https://github.com/rethab/h-gpgme"; description = "High Level Binding for GnuPG Made Easy (gpgme)"; license = stdenv.lib.licenses.mit; @@ -75804,7 +72925,6 @@ self: { libraryHaskellDepends = [ base monads-tf transformers vector ]; librarySystemDepends = [ csound64 libsndfile ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; description = "interface to CSound API"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -75869,7 +72989,6 @@ self: { array base bytestring cmdargs containers data-dword directory filepath hooplext mtl parsec pretty template-haskell transformers ]; - jailbreak = true; description = "A library for analyzing and transforming LLVM (3.5) assembly codes"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -75894,78 +73013,38 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hOpenPGP_2_4_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib - , conduit, conduit-extra, containers, crypto-cipher-types - , cryptonite, data-default-class, errors, hashable - , incremental-parser, ixset-typed, lens, memory, monad-loops - , nettle, network, network-uri, newtype, openpgp-asciiarmor - , QuickCheck, quickcheck-instances, resourcet, securemem - , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text - , time, time-locale-compat, transformers, unordered-containers - , wl-pprint-extras, zlib - }: - mkDerivation { - pname = "hOpenPGP"; - version = "2.4.4"; - sha256 = "6d137b38a2a60f711fd34612849f34a1731271c6a2cc83aa57c37cfea1f5a806"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bifunctors binary - binary-conduit byteable bytestring bzlib conduit conduit-extra - containers crypto-cipher-types cryptonite data-default-class errors - hashable incremental-parser ixset-typed lens memory monad-loops - nettle network network-uri newtype openpgp-asciiarmor resourcet - securemem semigroups split text time time-locale-compat - transformers unordered-containers wl-pprint-extras zlib - ]; - testHaskellDepends = [ - aeson attoparsec base bifunctors binary binary-conduit byteable - bytestring bzlib conduit conduit-extra containers - crypto-cipher-types cryptonite data-default-class errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype QuickCheck quickcheck-instances - resourcet securemem semigroups split tasty tasty-hunit - tasty-quickcheck text time time-locale-compat transformers - unordered-containers wl-pprint-extras zlib - ]; - homepage = "http://floss.scru.org/hOpenPGP/"; - description = "native Haskell implementation of OpenPGP (RFC4880)"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hOpenPGP" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib - , conduit, conduit-extra, containers, crypto-cipher-types - , cryptonite, data-default-class, errors, hashable - , incremental-parser, ixset-typed, lens, memory, monad-loops - , nettle, network, network-uri, newtype, openpgp-asciiarmor - , QuickCheck, quickcheck-instances, resourcet, securemem - , semigroups, split, tasty, tasty-hunit, tasty-quickcheck, text - , time, time-locale-compat, transformers, unordered-containers - , wl-pprint-extras, zlib + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , base64-bytestring, bifunctors, binary, binary-conduit, byteable + , bytestring, bzlib, conduit, conduit-extra, containers + , crypto-cipher-types, cryptonite, data-default-class, errors + , hashable, incremental-parser, ixset-typed, lens, memory + , monad-loops, nettle, network, network-uri, newtype + , openpgp-asciiarmor, QuickCheck, quickcheck-instances, resourcet + , securemem, semigroups, split, tasty, tasty-hunit + , tasty-quickcheck, text, time, time-locale-compat, transformers + , unordered-containers, wl-pprint-extras, zlib }: mkDerivation { pname = "hOpenPGP"; - version = "2.5.1"; - sha256 = "6b590806d05485dea63095f91f7c201d578b3bd7de86eee672f141eb9efd08ce"; + version = "2.5.5"; + sha256 = "1801efa965085572197253eb77bfaf2fc2a20c18d93c43c436d506237871ad54"; libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bifunctors binary + aeson attoparsec base base16-bytestring base64-bytestring + bifunctors binary binary-conduit byteable bytestring bzlib conduit + conduit-extra containers crypto-cipher-types cryptonite + data-default-class errors hashable incremental-parser ixset-typed + lens memory monad-loops nettle network network-uri newtype + openpgp-asciiarmor resourcet securemem semigroups split text time + time-locale-compat transformers unordered-containers + wl-pprint-extras zlib + ]; + testHaskellDepends = [ + aeson attoparsec base base16-bytestring bifunctors binary binary-conduit byteable bytestring bzlib conduit conduit-extra containers crypto-cipher-types cryptonite data-default-class errors hashable incremental-parser ixset-typed lens memory monad-loops - nettle network network-uri newtype openpgp-asciiarmor resourcet - securemem semigroups split text time time-locale-compat - transformers unordered-containers wl-pprint-extras zlib - ]; - testHaskellDepends = [ - aeson attoparsec base bifunctors binary binary-conduit byteable - bytestring bzlib conduit conduit-extra containers - crypto-cipher-types cryptonite data-default-class errors hashable - incremental-parser ixset-typed lens memory monad-loops nettle - network network-uri newtype QuickCheck quickcheck-instances + nettle network network-uri newtype QuickCheck quickcheck-instances resourcet securemem semigroups split tasty tasty-hunit tasty-quickcheck text time time-locale-compat transformers unordered-containers wl-pprint-extras zlib @@ -76032,10 +73111,10 @@ self: { libraryHaskellDepends = [ aeson base bytestring http-conduit network text ]; - jailbreak = true; homepage = "tot"; description = "Pushover.net API functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hR" = callPackage @@ -76080,6 +73159,7 @@ self: { homepage = "http://gregheartsfield.com/hS3/"; description = "Interface to Amazon's Simple Storage Service (S3)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hScraper" = callPackage @@ -76094,9 +73174,9 @@ self: { base bytestring directory HTTP http-conduit http-types parsec process regex-compat text transformers ]; - jailbreak = true; description = "A Haskell library to scrape and crawl web-pages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hSimpleDB" = callPackage @@ -76111,7 +73191,6 @@ self: { base bytestring Crypto dataenc HTTP hxt network old-locale old-time utf8-string ]; - jailbreak = true; description = "Interface to Amazon's SimpleDB service"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -76125,7 +73204,6 @@ self: { sha256 = "37261526551aa558b33a382a2b90d26a52437a5717918fe4e32fadcb33b58916"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/mgajda/hTalos"; description = "Parser, print and manipulate structures in PDB file format"; license = stdenv.lib.licenses.bsd3; @@ -76189,7 +73267,6 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/mhwombat/haar"; description = "Haar wavelet transforms"; license = stdenv.lib.licenses.bsd3; @@ -76314,10 +73391,10 @@ self: { version = "0.2.0.2"; sha256 = "5d5c3b94664fc81638cd512382adf4f0a52583e2ce39de32864aad4692dea85e"; libraryHaskellDepends = [ base bytestring hack ]; - jailbreak = true; homepage = "http://github.com/snoyberg/hack-handler-cgi/tree/master"; description = "Hack handler using CGI protocol. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hack-handler-epoll" = callPackage @@ -76367,7 +73444,6 @@ self: { sha256 = "d92ad8b7846aaabe596c3d2e34af2761555adcde44937837c0c8e394c780540b"; libraryHaskellDepends = [ base bytestring hack hack-handler-cgi ]; librarySystemDepends = [ fcgi ]; - jailbreak = true; homepage = "http://github.com/snoyberg/hack-handler-fastcgi/tree/master"; description = "Hack handler direct to fastcgi (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -76435,7 +73511,6 @@ self: { libraryHaskellDepends = [ base bytestring failure hack network web-encodings ]; - jailbreak = true; homepage = "http://github.com/snoyberg/hack-handler-simpleserver/tree/master"; description = "A simplistic HTTP server handler for Hack. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -76562,7 +73637,6 @@ self: { base bytestring cgi containers data-default enumerator hack2 happstack-server mtl network ]; - jailbreak = true; homepage = "https://github.com/nfjinjing/hack2-handler-happstack-server"; description = "Hack2 Happstack server handler"; license = stdenv.lib.licenses.bsd3; @@ -76732,6 +73806,7 @@ self: { homepage = "http://code.haskell.org/~dons/code/hackage-plot"; description = "Generate cumulative graphs of hackage uploads"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-processing" = callPackage @@ -76790,10 +73865,10 @@ self: { base bytestring Cabal directory filepath hackage-security network network-uri optparse-applicative tar time unix zlib ]; - jailbreak = true; homepage = "https://github.com/well-typed/hackage-security"; description = "Utility to manage secure file-based package repositories"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hackage-security" = callPackage @@ -76874,7 +73949,6 @@ self: { HTTP network process random tar text unix unordered-containers vector xml zlib ]; - jailbreak = true; description = "The Hackage web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -77063,7 +74137,6 @@ self: { base containers monad-control mtl resourcet stm stm-chans transformers-base ]; - jailbreak = true; homepage = "https://github.com/Forkk/hactor"; description = "Lightweight Erlang-style actors for Haskell"; license = stdenv.lib.licenses.mit; @@ -77077,10 +74150,10 @@ self: { version = "0.0.3.1"; sha256 = "403651a53a264f6b89ccbd093f73529b7198eb15158c79db97deda97f6a0ac5b"; libraryHaskellDepends = [ base stm ]; - jailbreak = true; homepage = "https://github.com/treep/hactors"; description = "Practical actors for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haddock_2_16_1" = callPackage @@ -77095,7 +74168,6 @@ self: { isExecutable = true; executableHaskellDepends = [ base haddock-api ]; testHaskellDepends = [ base Cabal directory filepath process ]; - jailbreak = true; doCheck = false; preCheck = "unset GHC_PACKAGE_PATH"; homepage = "http://www.haskell.org/haddock/"; @@ -77134,7 +74206,6 @@ self: { array base bytestring Cabal containers deepseq directory filepath ghc ghc-paths haddock-library xhtml ]; - jailbreak = true; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; @@ -77154,7 +74225,6 @@ self: { array base bytestring Cabal containers deepseq directory filepath ghc ghc-paths haddock-library xhtml ]; - jailbreak = true; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; @@ -77193,7 +74263,6 @@ self: { executableHaskellDepends = [ array base Cabal containers directory filepath ghc ghc-paths pretty ]; - jailbreak = true; homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; license = stdenv.lib.licenses.bsd3; @@ -77212,7 +74281,6 @@ self: { testHaskellDepends = [ base base-compat bytestring deepseq hspec QuickCheck transformers ]; - jailbreak = true; homepage = "http://www.haskell.org/haddock/"; description = "Library exposing some functionality of Haddock"; license = stdenv.lib.licenses.bsd3; @@ -77252,32 +74320,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddocset_0_4_1" = callPackage - ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory - , exceptions, filepath, ghc, haddock-api, http-types, mtl - , optparse-applicative, process, resourcet, sqlite-simple, tagsoup - , text, transformers - }: - mkDerivation { - pname = "haddocset"; - version = "0.4.1"; - sha256 = "b2e17cb5fc695b28cb036e524e1f58fce30953cf4f3de6fdac88e61142ae9c3e"; - revision = "1"; - editedCabalFile = "8d1369b8ba3da5fcb6661f5fc34ec23de02b79c96ed268f0db946a9ff8b5951b"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal conduit conduit-extra directory exceptions filepath ghc - haddock-api http-types mtl optparse-applicative process resourcet - sqlite-simple tagsoup text transformers - ]; - jailbreak = true; - homepage = "https://github.com/philopon/haddocset"; - description = "Generate docset of Dash by Haddock haskell documentation tool"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haddocset" = callPackage ({ mkDerivation, base, Cabal, conduit, conduit-extra, directory , exceptions, filepath, ghc, haddock-api, http-types, mtl @@ -77313,10 +74355,10 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring text vector ]; librarySystemDepends = [ snappy ]; testHaskellDepends = [ base bytestring filepath text vector ]; - jailbreak = true; homepage = "http://github.com/jystic/hadoop-formats"; description = "Read/write file formats commonly used by Hadoop"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) snappy;}; "hadoop-rpc" = callPackage @@ -77362,10 +74404,10 @@ self: { attoparsec base bytestring hadoop-rpc tasty tasty-hunit tasty-quickcheck vector ]; - jailbreak = true; homepage = "http://github.com/jystic/hadoop-tools"; description = "Fast command line tools for working with Hadoop"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haeredes" = callPackage @@ -77454,8 +74496,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.1.0.0"; - sha256 = "cb67c5869e5c389808379e681cdd8549ccc2842dba082ed2dbd18bed4a1f7bb8"; + version = "0.2.0.0"; + sha256 = "139200be3876156fc26fff1fe0e7ca94b8807e1e13004329800204763ee9f728"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -77464,7 +74506,6 @@ self: { aeson base data-default doctest filepath process-extras tasty tasty-hunit tasty-th text ]; - jailbreak = true; description = "A typed template engine, subset of jinja2"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -77477,8 +74518,8 @@ self: { }: mkDerivation { pname = "hailgun"; - version = "0.4.1.0"; - sha256 = "9700d1718e92ffb55b457ed21bc21731fefe71990d21bc36b92bb6a5e08c869b"; + version = "0.4.1.1"; + sha256 = "d584d2bfec3eb94088452bb0611a4f8aea255bba4b3bf861ff3aeb888b5d4d03"; libraryHaskellDepends = [ aeson base bytestring email-validate exceptions filepath http-client http-client-tls http-types tagsoup text time @@ -77499,9 +74540,9 @@ self: { executableHaskellDepends = [ base bytestring configurator hailgun text ]; - jailbreak = true; description = "A program to send emails throught the Mailgun api"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hails" = callPackage @@ -77541,7 +74582,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text time unix wai wai-test ]; - jailbreak = true; description = "Multi-app web platform framework"; license = stdenv.lib.licenses.mit; broken = true; @@ -77561,7 +74601,6 @@ self: { base bson bytestring containers ghc-paths hails iterIO iterio-server mongoDB mtl ]; - jailbreak = true; description = "Dynamic launcher of Hails applications"; license = stdenv.lib.licenses.gpl2; }) {}; @@ -77587,7 +74626,6 @@ self: { testHaskellDepends = [ base hspec http-types mtl persistent scotty time wai wai-extra ]; - jailbreak = true; homepage = "https://github.com/tfausak/hairy"; description = "A JSON REST API"; license = stdenv.lib.licenses.mit; @@ -77618,7 +74656,6 @@ self: { statistics test-framework test-framework-hunit test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "http://indiana.edu/~ppaml/"; description = "A probabilistic programming embedded DSL"; license = stdenv.lib.licenses.bsd3; @@ -77649,7 +74686,6 @@ self: { version = "0.1"; sha256 = "a425893886961e8cdbf54a23be4186307a05558bfab9709703769b60d5b7b5b5"; libraryHaskellDepends = [ base HTTP network ]; - jailbreak = true; homepage = "https://code.reaktor42.de/projects/hakismet"; description = "Akismet spam protection library"; license = stdenv.lib.licenses.mit; @@ -77668,9 +74704,9 @@ self: { base haskell-src-meta parsec template-haskell text transformers ]; testHaskellDepends = [ base QuickCheck ]; - jailbreak = true; description = "A mako-like quasi-quoter template library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll" = callPackage @@ -77713,6 +74749,7 @@ self: { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) utillinux;}; "hakyll-R" = callPackage @@ -77725,7 +74762,6 @@ self: { libraryHaskellDepends = [ base directory filepath hakyll pandoc process ]; - jailbreak = true; description = "A package allowing to write Hakyll blog posts in Rmd"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -77743,10 +74779,10 @@ self: { Agda base containers directory filepath hakyll mtl pandoc transformers xhtml ]; - jailbreak = true; homepage = "https://github.com/bitonic/hakyll-agda"; description = "Wrapper to integrate literate Agda files with Hakyll"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-blaze-templates" = callPackage @@ -77756,7 +74792,6 @@ self: { version = "0.1.1.0"; sha256 = "32dc93abc20b115b36c97ce92496994d911e59c87d98ce7c9ddd0b4d711eb485"; libraryHaskellDepends = [ base blaze-html blaze-markup hakyll ]; - jailbreak = true; description = "Blaze templates for Hakyll"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -77772,7 +74807,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base hakyll pandoc ]; executableHaskellDepends = [ base directory filepath hakyll ]; - jailbreak = true; homepage = "http://jaspervdj.be/hakyll"; description = "Extra modules for the hakyll website compiler"; license = stdenv.lib.licenses.bsd3; @@ -77811,10 +74845,10 @@ self: { base bytestring directory hakyll process temporary ]; executableHaskellDepends = [ base hakyll ]; - jailbreak = true; homepage = "https://github.com/narrative/hakyll-contrib-elm#readme"; description = "Compile Elm code for inclusion in Hakyll static site"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-contrib-hyphenation" = callPackage @@ -77824,10 +74858,10 @@ self: { version = "0.1.0.3"; sha256 = "55c9e6a0c47ceb36eb439578ab013c8effa91b585deb932631f13d1777d46b56"; libraryHaskellDepends = [ base hakyll hyphenation split tagsoup ]; - jailbreak = true; homepage = "https://bitbucket.org/rvlm/hakyll-contrib-hyphenation"; description = "automatic hyphenation for Hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-contrib-links" = callPackage @@ -77845,7 +74879,6 @@ self: { testHaskellDepends = [ base binary QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "A hakyll library that helps maintain a separate links database"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -77871,6 +74904,7 @@ self: { homepage = "http://github.com/Minoru/hakyll-convert"; description = "Convert from other blog engines to Hakyll"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-elm" = callPackage @@ -77883,7 +74917,6 @@ self: { libraryHaskellDepends = [ base blaze-html blaze-markup Elm hakyll mtl ]; - jailbreak = true; homepage = "https://github.com/maxsnew/hakyll-elm"; description = "Hakyll wrapper for the Elm compiler"; license = stdenv.lib.licenses.bsd3; @@ -77902,6 +74935,7 @@ self: { homepage = "https://gitlab.com/aergus/hakyll-filestore"; description = "FileStore utilities for Hakyll"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-ogmarkup" = callPackage @@ -77911,27 +74945,27 @@ self: { version = "1.0"; sha256 = "eee4e2f63409f209f77903cc18c86a68529b46e4af7eaa2497af849a4588ce24"; libraryHaskellDepends = [ base hakyll ogmarkup ]; - jailbreak = true; homepage = "https://github.com/ogma-project/hakyll-ogmarkup#readme"; description = "Integrate ogmarkup document with Hakyll"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-sass" = callPackage - ({ mkDerivation, base, data-default-class, filepath, hakyll, hsass + ({ mkDerivation, aeson-pretty, base, data-default-class, filepath + , hakyll, hsass }: mkDerivation { pname = "hakyll-sass"; - version = "0.2.0"; - sha256 = "1c0b131f3a581aafde543fc9c3211d75c6f17f6b25d0e32cf6032f4c3377dbc5"; - revision = "1"; - editedCabalFile = "afdc3b9e76e09fc1aaf7f9cceb780a2e062ec56aab20659804b8f35d3bb85bb5"; + version = "0.2.1"; + sha256 = "859f91a9fe1d0f4a0bc75c1cd49bf2246aca8d45381f9405068d8588d6533039"; libraryHaskellDepends = [ - base data-default-class filepath hakyll hsass + aeson-pretty base data-default-class filepath hakyll hsass ]; homepage = "https://github.com/meoblast001/hakyll-sass"; description = "Hakyll SASS compiler over hsass"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hakyll-shakespeare" = callPackage @@ -77942,11 +74976,14 @@ self: { pname = "hakyll-shakespeare"; version = "0.1.0.0.2"; sha256 = "ebaa9c1cf33b3c59e91f7000ae4fc320f8b7d6c47c3a0088da9604c91dc9d0ad"; + revision = "1"; + editedCabalFile = "8e81f615162a066f96dff257a9efea27478c87cd345bb708d1cdd4ba565c838d"; libraryHaskellDepends = [ base blaze-html containers hakyll shakespeare text ]; description = "Hakyll Hamlet compiler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "halberd" = callPackage @@ -77973,7 +75010,6 @@ self: { haskell-src-exts HUnit mtl split tagged test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/haskell-suite/halberd/"; description = "A tool to generate missing import statements for Haskell modules"; license = stdenv.lib.licenses.bsd3; @@ -78011,7 +75047,6 @@ self: { array base bytestring cereal containers directory filepath fingertree HFuse mtl QuickCheck random time unix ]; - jailbreak = true; description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -78024,7 +75059,6 @@ self: { version = "2.4.1"; sha256 = "ab2d561f56c31bf0dffc77902414987fd4fd3bcb5e690a5491358f00ab71deaa"; libraryHaskellDepends = [ base directory HaXml pandoc ]; - jailbreak = true; homepage = "http://github.com/peti/halipeto"; description = "Haskell Static Web Page Generator"; license = "GPL"; @@ -78047,7 +75081,6 @@ self: { base bin-package-db directory filepath fsnotify ghc ghc-paths process transformers ]; - jailbreak = true; homepage = "https://github.com/lukexi/halive"; description = "A live recompiler"; license = stdenv.lib.licenses.bsd2; @@ -78077,7 +75110,6 @@ self: { base containers grid HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/timjb/halma"; description = "Library implementing Halma rules"; license = stdenv.lib.licenses.mit; @@ -78135,12 +75167,36 @@ self: { base bytestring containers directory filepath Glob preprocessor-tools ]; - jailbreak = true; description = "Haskell macro preprocessor"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hamsql" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory, doctemplates + , file-embed, filepath, frontmatter, groom, network-uri + , optparse-applicative, postgresql-simple, text, transformers + , unordered-containers, yaml + }: + mkDerivation { + pname = "hamsql"; + version = "0.8.0.0"; + sha256 = "fd12ea140ecf7f175ba1896c2aa53bba66cbfb93d8033dfa8432f0381062983b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring directory doctemplates file-embed filepath + frontmatter groom network-uri optparse-applicative + postgresql-simple text transformers unordered-containers yaml + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://git.hemio.de/hemio/hamsql"; + description = "HamSql"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hamtmap" = callPackage ({ mkDerivation, array, base, deepseq, hashable }: mkDerivation { @@ -78169,7 +75225,6 @@ self: { process ]; executableHaskellDepends = [ filepath ]; - jailbreak = true; homepage = "https://troglodita.di.uminho.pt/svn/musica/work/HaMusic"; description = "Library to handle abstract music"; license = stdenv.lib.licenses.bsd3; @@ -78281,7 +75336,6 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit tasty-th ]; - jailbreak = true; homepage = "https://github.com/utdemir/handsy"; description = "A DSL to describe common shell operations and interpeters for running them locally and remotely"; license = stdenv.lib.licenses.bsd3; @@ -78341,7 +75395,6 @@ self: { lens-aeson process scotty text transformers unix-time wai-extra wai-middleware-static yaml ]; - jailbreak = true; description = "Simple Continuous Integration/Deployment System"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -78367,6 +75420,7 @@ self: { ]; description = "Network Stack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hans-pcap" = callPackage @@ -78376,7 +75430,6 @@ self: { version = "0.1.0.2"; sha256 = "1a119ed589eb8da99a741b6a8e67927897cd1b543ee8cd54728f50a39308f283"; libraryHaskellDepends = [ base bytestring hans pcap ]; - jailbreak = true; homepage = "https://github.com/tolysz/hans-pcap"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; @@ -78390,7 +75443,6 @@ self: { version = "0.1.0.0"; sha256 = "0bd42928994193ca980944eb74baacc439851fe12365556ab141248fa2be5a1e"; libraryHaskellDepends = [ base bytestring hans pfq ]; - jailbreak = true; homepage = "https://github.com/tolysz/hans-pfq"; description = "Driver for real ethernet devices for HaNS"; license = stdenv.lib.licenses.bsd3; @@ -78451,7 +75503,6 @@ self: { ]; libraryPkgconfigDepends = [ appindicator ]; libraryToolDepends = [ gtk2hs-buildtools ]; - jailbreak = true; description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -78465,7 +75516,6 @@ self: { sha256 = "225156270dc7cb2bb399aee76c9273a62683d8835c7045027a7906a3cf010326"; libraryHaskellDepends = [ base glib gtk3 ]; libraryPkgconfigDepends = [ appindicator ]; - jailbreak = true; homepage = "https://github.com/mlacorte/happindicator3"; description = "Binding to the appindicator library"; license = stdenv.lib.licenses.lgpl21; @@ -78537,7 +75587,6 @@ self: { HStringTemplateHelpers HTTP mtl old-time parsec pretty pureMD5 safe syb ]; - jailbreak = true; description = "A Happstack Tutorial that is its own web 2.0-type demo."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -78551,10 +75600,10 @@ self: { sha256 = "d9d4f581718d4f0fedd5d1f41ce127a6e651545a9398619c0bee3debb377d5b5"; libraryHaskellDepends = [ base happstack-server ]; doHaddock = false; - jailbreak = true; homepage = "http://happstack.com"; description = "The haskell application server stack + code generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-auth" = callPackage @@ -78571,43 +75620,12 @@ self: { happstack-ixset happstack-server happstack-state mtl old-time random ]; - jailbreak = true; homepage = "http://n-sch.de/happstack-auth"; description = "A Happstack Authentication Suite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "happstack-authenticate_2_3_4_3" = callPackage - ({ mkDerivation, acid-state, aeson, authenticate, base - , base64-bytestring, boomerang, bytestring, containers - , data-default, email-validate, filepath, happstack-hsp - , happstack-jmacro, happstack-server, hsp, hsx-jmacro, hsx2hs - , http-conduit, http-types, ixset-typed, jmacro, jwt, lens - , mime-mail, mtl, pwstore-purehaskell, random, safecopy - , shakespeare, text, time, unordered-containers, userid, web-routes - , web-routes-boomerang, web-routes-happstack, web-routes-hsp - , web-routes-th - }: - mkDerivation { - pname = "happstack-authenticate"; - version = "2.3.4.3"; - sha256 = "6029d43f6cf78e68cd88c28a8c9aefacfc6062cc4f7e798a72302ac43abecc30"; - libraryHaskellDepends = [ - acid-state aeson authenticate base base64-bytestring boomerang - bytestring containers data-default email-validate filepath - happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro - hsx2hs http-conduit http-types ixset-typed jmacro jwt lens - mime-mail mtl pwstore-purehaskell random safecopy shakespeare text - time unordered-containers userid web-routes web-routes-boomerang - web-routes-happstack web-routes-hsp web-routes-th - ]; - homepage = "http://www.happstack.com/"; - description = "Happstack Authentication Library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "happstack-authenticate" = callPackage ({ mkDerivation, acid-state, aeson, authenticate, base , base64-bytestring, boomerang, bytestring, containers @@ -78621,8 +75639,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.3.4.4"; - sha256 = "7c48c45dd4e67101fa098b9cdd5b2e11853da0253cfefe2e9f1a773e13094a59"; + version = "2.3.4.5"; + sha256 = "65553a742d47f7209e0f42234c2e6f790a98f68386eea108a42b9c3a46fc4cd2"; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang bytestring containers data-default email-validate filepath @@ -78668,7 +75686,6 @@ self: { happstack-server happstack-state happstack-util HTTP mtl network old-time syb unix ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web related tools and services"; license = stdenv.lib.licenses.bsd3; @@ -78690,7 +75707,6 @@ self: { base binary bytestring containers mtl pretty syb syb-with-class syb-with-class-instances-text template-haskell text time ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Happstack data manipulation libraries"; license = stdenv.lib.licenses.bsd3; @@ -78768,7 +75784,6 @@ self: { libraryHaskellDepends = [ aeson base fay happstack-fay-ajax happstack-server mtl ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for using Fay with Happstack"; license = stdenv.lib.licenses.bsd3; @@ -78782,10 +75797,10 @@ self: { version = "0.2.0"; sha256 = "92c8511adda63943e40e19c87ef5ceb7f6ff194ec2ed26cbc3db59eeebdeb37d"; libraryHaskellDepends = [ fay-base fay-jquery ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for using Fay with Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-foundation" = callPackage @@ -78815,10 +75830,10 @@ self: { version = "7.0.4"; sha256 = "2a11133ff0e8ffecc5f3ae51dcfdef1210c37bca221933f54d8bae8fbd7f22d0"; libraryHaskellDepends = [ base happstack-server shakespeare text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for Hamlet HTML templates in Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-heist" = callPackage @@ -78833,7 +75848,6 @@ self: { base blaze-builder bytestring either filepath happstack-server heist mtl text ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for using Heist templates in Happstack"; license = stdenv.lib.licenses.bsd3; @@ -78859,7 +75873,6 @@ self: { MissingH mtl network old-time parsec PBKDF2 pureMD5 random safe syb text utf8-string ]; - jailbreak = true; homepage = "http://patch-tag.com/r/tphyahoo/HAppSHelpers/home"; description = "Convenience functions for Happstack"; license = stdenv.lib.licenses.bsd3; @@ -78872,8 +75885,8 @@ self: { }: mkDerivation { pname = "happstack-hsp"; - version = "7.3.7"; - sha256 = "fe82bc53c2738a9f502f6c42500e690d04dbf3dd9811ba4140b3d8cdf6adb1f7"; + version = "7.3.7.1"; + sha256 = "bbc884e4a5ca78faf08e17799c1d037622e377915ece889674004e0e54109617"; libraryHaskellDepends = [ base bytestring happstack-server harp hsp hsx2hs mtl syb text utf8-string @@ -78894,10 +75907,10 @@ self: { libraryHaskellDepends = [ base bytestring happstack-server hslogger HStringTemplate mtl ]; - jailbreak = true; homepage = "http://www.happstack.com/"; description = "Support for using HStringTemplate in Happstack"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-ixset" = callPackage @@ -78912,7 +75925,6 @@ self: { base containers happstack-data happstack-util mtl syb syb-with-class template-haskell ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; @@ -78978,7 +75990,6 @@ self: { libraryHaskellDepends = [ base happstack-server mtl plugins-auto template-haskell th-lift ]; - jailbreak = true; homepage = "http://happstack.com"; description = "The haskell application server stack + reload"; license = stdenv.lib.licenses.bsd3; @@ -79031,6 +76042,7 @@ self: { homepage = "http://www.happstack.com/"; description = "extend happstack-server with https:// support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; "happstack-server-tls-cryptonite" = callPackage @@ -79046,9 +76058,9 @@ self: { base bytestring cryptonite data-default-class extensible-exceptions happstack-server hslogger network sendfile time tls unix ]; - jailbreak = true; description = "Extend happstack-server with native HTTPS support (TLS/SSL)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happstack-state" = callPackage @@ -79065,7 +76077,6 @@ self: { filepath happstack-data happstack-util hslogger mtl old-time random stm syb template-haskell unix ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Event-based distributed state"; license = stdenv.lib.licenses.bsd3; @@ -79104,7 +76115,6 @@ self: { hslogger mtl network old-locale old-time parsec process random template-haskell time unix unix-compat ]; - jailbreak = true; homepage = "http://happstack.com"; description = "Web framework"; license = stdenv.lib.licenses.bsd3; @@ -79127,7 +76137,6 @@ self: { template-haskell text web-routes web-routes-boomerang web-routes-happstack web-routes-th ]; - jailbreak = true; homepage = "http://hub.darcs.net/dag/yui/browse/happstack-yui"; description = "Utilities for using YUI3 with Happstack"; license = stdenv.lib.licenses.bsd3; @@ -79146,7 +76155,6 @@ self: { isExecutable = true; executableHaskellDepends = [ array base containers mtl ]; testHaskellDepends = [ base process ]; - doCheck = false; homepage = "http://www.haskell.org/happy/"; description = "Happy is a parser generator for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -79164,9 +76172,9 @@ self: { array base containers haskell-src-meta mtl template-haskell ]; libraryToolDepends = [ happy ]; - jailbreak = true; description = "Quasi-quoter for Happy parsers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "happybara" = callPackage @@ -79181,7 +76189,6 @@ self: { aeson base filepath http-types lifted-base monad-control mtl text time transformers transformers-base ]; - jailbreak = true; homepage = "https://github.com/cstrahan/happybara"; description = "Acceptance test framework for web applications"; license = stdenv.lib.licenses.mit; @@ -79203,7 +76210,6 @@ self: { filepath happybara http-types lifted-base monad-control mtl network process text time transformers transformers-base vector word8 ]; - jailbreak = true; homepage = "https://github.com/cstrahan/happybara/happybara-webkit"; description = "WebKit Happybara driver"; license = stdenv.lib.licenses.mit; @@ -79217,7 +76223,6 @@ self: { version = "0.0.1"; sha256 = "11ea82ca95bd880e62585a81107964a28e1523c7eb9da9fdc322bc5dd38b096e"; libraryHaskellDepends = [ base directory filepath process ]; - jailbreak = true; homepage = "https://github.com/cstrahan/happybara/happybara-webkit-server"; description = "WebKit Server binary for Happybara (taken from capybara-webkit)"; license = stdenv.lib.licenses.mit; @@ -79254,10 +76259,10 @@ self: { libraryHaskellDepends = [ aeson base bytestring directory filepath text ]; - jailbreak = true; homepage = "https://github.com/freizl/har"; description = "HAR spec in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "harchive" = callPackage @@ -79292,7 +76297,6 @@ self: { array base bytestring constraints containers language-vhdl mtl operational-alacarte pretty syntactic ]; - jailbreak = true; homepage = "https://github.com/markus-git/hardware-edsl"; description = "Deep embedding of hardware descriptions with code generation"; license = stdenv.lib.licenses.bsd3; @@ -79356,9 +76360,9 @@ self: { base bindings-DSL monad-control resourcet transformers ]; libraryPkgconfigDepends = [ groonga ]; - jailbreak = true; description = "Low level bindings for Groonga"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) groonga;}; "haroonga-httpd" = callPackage @@ -79375,7 +76379,6 @@ self: { base directory haroonga http-types old-locale optparse-applicative scotty text time transformers wai-extra ]; - jailbreak = true; description = "Yet another Groonga http server"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -79469,7 +76472,6 @@ self: { libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base numbers ]; testHaskellDepends = [ HUnit ]; - jailbreak = true; homepage = "http://darcsden.com/mekeor/hascal"; description = "A minimalistic but extensible and precise calculator"; license = "GPL"; @@ -79484,8 +76486,8 @@ self: { }: mkDerivation { pname = "hascar"; - version = "0.2.0.2"; - sha256 = "3ad50a9349ea6e9df26cb452adf56fd059eea4ed2a254d15b6fd1ab63e345c42"; + version = "0.2.1.0"; + sha256 = "1a09890e2b3d0955a966a1b7e84995957b44fab8c34c1afaabe7213610d244e1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -79541,7 +76543,6 @@ self: { base bytestring hascat-lib hascat-setup hascat-system HaXml haxr html HTTP network unix ]; - jailbreak = true; description = "Hascat Web Server"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -79560,7 +76561,6 @@ self: { base bytestring containers directory haskell98 HaXml html HTTP mtl network old-locale old-time parsec plugins xhtml ]; - jailbreak = true; description = "Hascat Package"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -79600,7 +76600,6 @@ self: { base bytestring containers hascat-lib HaXml HTTP mtl network old-time parsec plugins unix ]; - jailbreak = true; description = "Hascat System Package"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -79620,7 +76619,6 @@ self: { lens transformers ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/analytics/hash/"; description = "Hashing tools"; license = stdenv.lib.licenses.bsd3; @@ -79679,7 +76677,6 @@ self: { base ghc-prim hashable QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/wowus/hashable-generics"; description = "Automatically generates Hashable instances with GHC.Generics."; license = stdenv.lib.licenses.bsd3; @@ -79795,10 +76792,10 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/mkscrg/hashring"; description = "Efficient consistent hashing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hashtables" = callPackage @@ -79825,10 +76822,10 @@ self: { libraryHaskellDepends = [ base hashable hashtables loch-th placeholders ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/hashtables-plus"; description = "Extensions for a \"hashtables\" library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hasim" = callPackage @@ -79936,7 +76933,6 @@ self: { base freenect hcwiid IfElse MissingH mtl SDL SDL-image SDL-mixer SDL-ttf transformers vector Yampa ]; - jailbreak = true; homepage = "http://github.com/ivanperez-keera/haskanoid"; description = "A breakout game written in Yampa using SDL"; license = "unknown"; @@ -79977,10 +76973,10 @@ self: { aeson base bytestring connection containers hspec http-conduit http-types monads-tf stm text wai warp ]; - jailbreak = true; homepage = "https://github.com/jonplussed/haskbot-core"; description = "Easily-extensible chatbot for Slack messaging service"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskdeep" = callPackage @@ -80003,10 +76999,10 @@ self: { optparse-applicative regex-tdfa regex-tdfa-text resourcet text time transformers unix-compat ]; - jailbreak = true; homepage = "https://github.com/maurotrb/haskdeep"; description = "Computes and audits file hashes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskdogs" = callPackage @@ -80074,7 +77070,6 @@ self: { version = "0.6.2"; sha256 = "d4d55f005b13e98a83273e8a7648a2a54e638b36c31639bff38c09febac0ed75"; libraryHaskellDepends = [ base haskeline mtl ]; - jailbreak = true; homepage = "http://community.haskell.org/~aslatter/code/haskeline-class"; description = "Class interface for working with Haskeline"; license = stdenv.lib.licenses.bsd3; @@ -80164,7 +77159,6 @@ self: { testHaskellDepends = [ base bytestring mtl QuickCheck tasty tasty-quickcheck tasty-th ]; - jailbreak = true; description = "BrainFuck interpreter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -80199,9 +77193,9 @@ self: { version = "0.1.0.2"; sha256 = "674eb2c80b5b88ca9f571b5d025620508b4d1f164878a512dac3f680fd24e9c7"; libraryHaskellDepends = [ base process ]; - jailbreak = true; description = "Simple CoffeeScript API"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-compression" = callPackage @@ -80221,6 +77215,7 @@ self: { ]; homepage = "codekinder.com"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-course-preludes" = callPackage @@ -80230,7 +77225,6 @@ self: { version = "0.0.0.4"; sha256 = "567eaa088b72851edf306ade995cafade1ec6e47ff81c32d66f96bcdba821be4"; libraryHaskellDepends = [ base deepseq ]; - jailbreak = true; description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -80322,7 +77316,6 @@ self: { base containers directory-tree doctest filemanip filepath hlint tasty tasty-hunit ]; - jailbreak = true; homepage = "https://github.com/evolutics/haskell-formatter"; description = "Haskell source code formatter"; license = stdenv.lib.licenses.gpl3; @@ -80351,7 +77344,6 @@ self: { lifted-base monad-control network network-conduit process-conduit system-filepath text transformers transformers-base unix ]; - jailbreak = true; homepage = "https://github.com/yihuang/haskell-ftp"; description = "A Haskell ftp server with configurable backend"; license = stdenv.lib.licenses.bsd3; @@ -80376,34 +77368,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haskell-gi_0_17_4" = callPackage - ({ mkDerivation, base, bytestring, Cabal, containers, directory - , file-embed, filepath, glib, gobjectIntrospection, haskell-gi-base - , mtl, pretty-show, process, safe, text, transformers, xdg-basedir - , xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.17.4"; - sha256 = "e3c306c877f3b28e66f49b1187671233d4a3e15d0d0ed7931213624b67fb733b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring Cabal containers directory file-embed filepath - haskell-gi-base mtl pretty-show process safe text transformers - xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobjectIntrospection ]; - executableHaskellDepends = [ - base containers directory filepath haskell-gi-base pretty-show text - ]; - jailbreak = true; - 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" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, glib, gobjectIntrospection, haskell-gi-base, mtl @@ -80430,12 +77394,25 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib; inherit (pkgs) gobjectIntrospection;}; - "haskell-gi-base_0_17" = callPackage + "haskell-gi-base" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.17"; - sha256 = "fba8d755d1772cd0e01f7e8e7ac939d5bde9646d6493516c561484853ff77b76"; + version = "0.18.4"; + sha256 = "45fb9bd2b65668d09f0643c3e4e0629df27610dfb501049c4a4b14a5edba8e16"; + 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; + }) {inherit (pkgs) glib;}; + + "haskell-gi-base_0_19" = callPackage + ({ mkDerivation, base, bytestring, containers, glib, text }: + mkDerivation { + pname = "haskell-gi-base"; + version = "0.19"; + sha256 = "ff3241d123a03e486ea0b6cb10b36262bfcd90411ac19859aa5c08f60dfe2af9"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; homepage = "https://github.com/haskell-gi/haskell-gi-base"; @@ -80444,19 +77421,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib;}; - "haskell-gi-base" = callPackage - ({ mkDerivation, base, bytestring, containers, glib, text }: - mkDerivation { - pname = "haskell-gi-base"; - version = "0.18.2"; - sha256 = "245b17ab5769fc413f7d10b24ca57efb97962dc7debd6188d3a879454077daa1"; - 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; - }) {inherit (pkgs) glib;}; - "haskell-google-trends" = callPackage ({ mkDerivation, base, bytestring, haskell-fake-user-agent, lens , regex-base, regex-posix, tagsoup, text, wreq @@ -80516,9 +77480,9 @@ self: { base classy-prelude ghc graphviz process text transformers ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "create haskell import graph for graphviz"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-in-space" = callPackage @@ -80558,21 +77522,9 @@ self: { base either network-uri QuickCheck servant servant-client split transformers ]; - jailbreak = true; homepage = "https://github.com/soundcloud/haskell-kubernetes"; description = "Haskell bindings to the Kubernetes API (via swagger-codegen)"; license = stdenv.lib.licenses.mit; - }) {}; - - "haskell-lexer_1_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "haskell-lexer"; - version = "1.0"; - sha256 = "86d0c4071295c8613eb965768cb61a0c8422fc0c429a49c7a93e93a72b185b86"; - libraryHaskellDepends = [ base ]; - description = "A fully compliant Haskell 98 lexer"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -80607,7 +77559,6 @@ self: { version = "0.1"; sha256 = "9bd1ddbdff533479d69fb5a94a018aea93a5578c2be70446595f87f6b41172ad"; libraryHaskellDepends = [ base ghc-prim integer-gmp ]; - jailbreak = true; homepage = "http://github.com/comius/haskell-mpfr"; description = "Correctly-rounded arbitrary-precision floating-point arithmetic"; license = "LGPL"; @@ -80650,10 +77601,10 @@ self: { base containers filemanip filepath haskell-src-exts mtl pretty-show tasty tasty-golden traverse-with-class ]; - doCheck = false; homepage = "http://documentup.com/haskell-suite/haskell-names"; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-names_0_8_0" = callPackage @@ -80674,7 +77625,6 @@ self: { base containers filemanip filepath haskell-src-exts mtl pretty-show tasty tasty-golden traverse-with-class ]; - jailbreak = true; homepage = "http://documentup.com/haskell-suite/haskell-names"; description = "Name resolution library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -80692,8 +77642,8 @@ self: { }: mkDerivation { pname = "haskell-neo4j-client"; - version = "0.3.2.2"; - sha256 = "4ed871df5e235170863d6890af6c3d241e2672b335b199b05504b635a409d9b1"; + version = "0.3.2.4"; + sha256 = "30eea529b6d8bd4b887cec7a6b210dd80223d97811bb26042b0c1ccfc8c381c2"; libraryHaskellDepends = [ aeson base bytestring containers data-default hashable HTTP http-client http-client-tls http-conduit http-types lifted-base mtl @@ -80708,10 +77658,10 @@ self: { text transformers transformers-base transformers-compat unordered-containers vector ]; - doCheck = false; homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client"; description = "A Haskell neo4j client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-openflow" = callPackage @@ -80749,6 +77699,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "haskell-packages_0_5" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , deepseq, directory, filepath, haskell-src-exts, hse-cpp, mtl + , optparse-applicative, tagged, transformers, transformers-compat + }: + mkDerivation { + pname = "haskell-packages"; + version = "0.5"; + sha256 = "c61f282e6425ba506e5bd288462e63ec14c13d28b1d1d6e9e989198acbffd02c"; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers deepseq directory filepath + haskell-src-exts hse-cpp mtl optparse-applicative tagged + transformers transformers-compat + ]; + homepage = "http://documentup.com/haskell-suite/haskell-packages"; + description = "Haskell suite library for package management and integration with Cabal"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-pdf-presenter" = callPackage ({ mkDerivation, base, bytestring, cairo, containers, directory , filepath, glib, gtk, old-locale, poppler, template-haskell, time @@ -80764,7 +77734,6 @@ self: { base bytestring cairo containers directory filepath glib gtk old-locale poppler template-haskell time zlib ]; - jailbreak = true; homepage = "http://michaeldadams.org/projects/haskell-pdf-presenter/"; description = "Tool for presenting PDF-based presentations"; license = stdenv.lib.licenses.gpl3; @@ -80795,7 +77764,6 @@ self: { zlib ]; executableToolDepends = [ alex happy ]; - jailbreak = true; homepage = "http://code.haskell.org/~dons/code/haskell-platform-test"; description = "A test system for the Haskell Platform environment"; license = stdenv.lib.licenses.bsd3; @@ -80819,7 +77787,6 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/potomak/haskell-player"; description = "A terminal music player based on afplay"; license = stdenv.lib.licenses.bsd3; @@ -80884,10 +77851,10 @@ self: { sha256 = "ea4d6469f7f3b661ee08f74f53291f9361bd53bef5a6e645c5a96b8d3b345d23"; libraryHaskellDepends = [ base directory process ]; testHaskellDepends = [ base directory hspec process ]; - jailbreak = true; homepage = "https://github.com/yamadapc/haskell-read-editor"; description = "Opens a temporary file on the system's EDITOR and returns the resulting edits"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-reflect" = callPackage @@ -80914,7 +77881,6 @@ self: { version = "0.1.0.1"; sha256 = "e6c357a23888313d9f2cfab4e72805a2d91507378063ec861b22b56e5f60a80d"; libraryHaskellDepends = [ base syb ]; - jailbreak = true; description = "A DSL for expressing natural deduction rules in Haskell"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -80986,6 +77952,7 @@ self: { base containers directory filepath mtl pretty-show smallcheck tasty tasty-golden tasty-smallcheck ]; + doCheck = false; homepage = "https://github.com/haskell-suite/haskell-src-exts"; description = "Manipulating Haskell source: abstract syntax, lexer, parser, and pretty-printer"; license = stdenv.lib.licenses.bsd3; @@ -81001,7 +77968,6 @@ self: { libraryHaskellDepends = [ base haskell-src-exts lens template-haskell ]; - jailbreak = true; homepage = "https://github.com/DanielWaterworth/haskell-src-exts-prisms"; description = "Prisms with newtype wrappers for haskell-src-exts"; license = stdenv.lib.licenses.bsd3; @@ -81031,7 +77997,6 @@ self: { version = "1.18.0.1.1"; sha256 = "f331ae82547ebc4ee1dfce9265e101117ff6951682d0eea79c03a2994b9c061b"; libraryHaskellDepends = [ base haskell-src-exts ]; - jailbreak = true; homepage = "https://github.com/int-e/haskell-src-exts-simple"; description = "A simplified view on the haskell-src-exts AST"; license = stdenv.lib.licenses.mit; @@ -81053,6 +78018,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-meta_0_7_0" = callPackage + ({ mkDerivation, base, haskell-src-exts, pretty, syb + , template-haskell, th-orphans + }: + mkDerivation { + pname = "haskell-src-meta"; + version = "0.7.0"; + sha256 = "2a6735cc3379171a722f2a1df15dc67f216a404db4396b05f5e06ac82ab89856"; + libraryHaskellDepends = [ + base haskell-src-exts pretty syb template-haskell th-orphans + ]; + description = "Parse source to template-haskell abstract syntax"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haskell-src-meta-mwotton" = callPackage ({ mkDerivation, base, containers, ghc-prim, haskell-src-exts , pretty, syb, template-haskell @@ -81065,7 +78046,6 @@ self: { base containers ghc-prim haskell-src-exts pretty syb template-haskell ]; - jailbreak = true; description = "Parse source to template-haskell abstract syntax"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -81090,7 +78070,6 @@ self: { ghc-prim ghc-syb-utils haskell-src-exts hspec HUnit monoid-extras mtl pretty QuickCheck rosezipper semigroups syb uniplate ]; - jailbreak = true; homepage = "https://github.com/alanz/haskell-token-utils"; description = "Utilities to tie up tokens to an AST"; license = stdenv.lib.licenses.publicDomain; @@ -81103,8 +78082,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast"; - version = "0.1.3.0"; - sha256 = "af93c177b3abd37fd5a5891417745d3ff2d0068877a720fd7b8a6b8ec1503919"; + version = "0.2.0.0"; + sha256 = "146c5b9501b6ee3d48085531afdca768f25448771ab1f35565dd336b22e3421b"; libraryHaskellDepends = [ base ghc mtl references template-haskell uniplate ]; @@ -81121,8 +78100,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast-fromghc"; - version = "0.1.3.0"; - sha256 = "4e58dabaf0ebaa645cdee231db480f7e83d7399808f91fdacd5b1bc6ca60e6c9"; + version = "0.2.0.0"; + sha256 = "f603ff60149bea2a85c2fa0c6d83acb3545c365ab26dadb2eafe5012d889ede6"; libraryHaskellDepends = [ base bytestring containers ghc haskell-tools-ast mtl references safe split template-haskell uniplate @@ -81139,8 +78118,8 @@ self: { }: mkDerivation { pname = "haskell-tools-ast-gen"; - version = "0.1.3.0"; - sha256 = "e46579666308e844f9df962ec8dadcf0051fec170283eafa3dc087331d3862e5"; + version = "0.2.0.0"; + sha256 = "734e462a7af5cfe15560c77bde51e7111bf771621f5fb02c01bb8e26dba93170"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl references @@ -81152,16 +78131,15 @@ self: { }) {}; "haskell-tools-ast-trf" = callPackage - ({ mkDerivation, base, containers, ghc, haskell-tools-ast, MissingH - , mtl, references, uniplate + ({ mkDerivation, base, containers, ghc, haskell-tools-ast, mtl + , references, uniplate }: mkDerivation { pname = "haskell-tools-ast-trf"; - version = "0.1.3.0"; - sha256 = "7b9de75660f093456d6f58cc6e4831db4aa5caa66deb3b4d084bed1dffa2b843"; + version = "0.2.0.0"; + sha256 = "4dfc8d6a80c392c82063b720723634780af9a53535928274c863ab4c66353677"; libraryHaskellDepends = [ - base containers ghc haskell-tools-ast MissingH mtl references - uniplate + base containers ghc haskell-tools-ast mtl references uniplate ]; homepage = "https://github.com/nboldi/haskell-tools"; description = "Conversions on Haskell-Tools AST to prepare for refactorings"; @@ -81169,14 +78147,60 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haskell-tools-cli" = callPackage + ({ mkDerivation, base, containers, directory, ghc, ghc-paths + , haskell-tools-ast, haskell-tools-prettyprint + , haskell-tools-refactor, mtl, references, split + }: + mkDerivation { + pname = "haskell-tools-cli"; + version = "0.2.0.0"; + sha256 = "fb59c74aae296cf598e7dd19634aa57037966e4a3cace373ed6abd449229f44d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory ghc ghc-paths haskell-tools-ast + haskell-tools-prettyprint haskell-tools-refactor mtl references + split + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "Command-line frontend for Haskell-tools Refact"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "haskell-tools-demo" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-ast-fromghc, haskell-tools-ast-trf + , haskell-tools-prettyprint, haskell-tools-refactor, http-types + , mtl, references, transformers, wai, wai-websockets, warp + , websockets + }: + mkDerivation { + pname = "haskell-tools-demo"; + version = "0.2.0.0"; + sha256 = "2c70c5dc92fd4ce296a6035a7a4d2471cbc372a4dcf5735590082cbd9e926dd4"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring containers directory filepath ghc ghc-paths + haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-trf + haskell-tools-prettyprint haskell-tools-refactor http-types mtl + references transformers wai wai-websockets warp websockets + ]; + homepage = "https://github.com/haskell-tools/haskell-tools"; + description = "A web-based demo for Haskell-tools Refactor"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "haskell-tools-prettyprint" = callPackage ({ mkDerivation, base, containers, ghc, haskell-tools-ast , haskell-tools-ast-trf, mtl, references, split }: mkDerivation { pname = "haskell-tools-prettyprint"; - version = "0.1.3.0"; - sha256 = "0163779686402c6592dc969d4caeb680b4e6a2957149281e1240ff16695041ac"; + version = "0.2.0.0"; + sha256 = "ae846bb46ae3c42de8393eb1341b66d654f3a672f3ec7fc0bac3c24d0dbdd76e"; libraryHaskellDepends = [ base containers ghc haskell-tools-ast haskell-tools-ast-trf mtl references split @@ -81188,21 +78212,28 @@ self: { }) {}; "haskell-tools-refactor" = callPackage - ({ mkDerivation, base, containers, directory, either, filepath, ghc - , ghc-paths, haskell-tools-ast, haskell-tools-ast-fromghc - , haskell-tools-ast-gen, haskell-tools-ast-trf - , haskell-tools-prettyprint, mtl, references, split - , template-haskell, time, transformers, uniplate + ({ mkDerivation, base, Cabal, containers, directory, either + , filepath, ghc, ghc-paths, haskell-tools-ast + , haskell-tools-ast-fromghc, haskell-tools-ast-gen + , haskell-tools-ast-trf, haskell-tools-prettyprint, HUnit, mtl + , polyparse, references, split, template-haskell, time + , transformers, uniplate }: mkDerivation { pname = "haskell-tools-refactor"; - version = "0.1.3.0"; - sha256 = "a8a527a9a9b036f7dd7b761817c5844ac6750e3959bc46377ca5f26808e326a4"; + version = "0.2.0.0"; + sha256 = "1572b88c516512d5d5cb2c94f25ef90cc17dac8db121f374551f4eabc9979723"; libraryHaskellDepends = [ - base containers directory either filepath ghc ghc-paths + base Cabal containers directory filepath ghc ghc-paths haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen haskell-tools-ast-trf haskell-tools-prettyprint mtl references - split template-haskell time transformers uniplate + split template-haskell transformers uniplate + ]; + testHaskellDepends = [ + base Cabal containers directory either filepath ghc ghc-paths + haskell-tools-ast haskell-tools-ast-fromghc haskell-tools-ast-gen + haskell-tools-ast-trf haskell-tools-prettyprint HUnit mtl polyparse + references split template-haskell time transformers uniplate ]; homepage = "https://github.com/haskell-tools/haskell-tools"; description = "Refactoring Tool for Haskell"; @@ -81239,7 +78270,6 @@ self: { pretty-hex QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 time x509 ]; - jailbreak = true; homepage = "http://github.com/GaloisInc/haskell-tor"; description = "A Haskell Tor Node"; license = stdenv.lib.licenses.bsd3; @@ -81268,9 +78298,9 @@ self: { version = "0.1.0.0"; sha256 = "687028547acd68f1d6c2fe71b25883c3ecdb89dd3364e71e57b419a6ec18653b"; libraryHaskellDepends = [ base process ]; - jailbreak = true; description = "Simple TypeScript API"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskell-tyrant" = callPackage @@ -81329,7 +78359,6 @@ self: { version = "1.1.2.0"; sha256 = "957ccb3008bcfd099e72b0fee1649de9ab30eb40e74b41aa573c9685c0da0ae8"; libraryHaskellDepends = [ array base ghc-prim ]; - jailbreak = true; homepage = "http://www.haskell.org/onlinereport/haskell2010/"; description = "Compatibility with Haskell 2010"; license = stdenv.lib.licenses.bsd3; @@ -81347,7 +78376,6 @@ self: { libraryHaskellDepends = [ array base directory old-locale old-time process time ]; - jailbreak = true; homepage = "http://www.haskell.org/definition/"; description = "Compatibility with Haskell 98"; license = stdenv.lib.licenses.bsd3; @@ -81365,10 +78393,10 @@ self: { libraryHaskellDepends = [ array base directory old-locale old-time process time ]; - jailbreak = true; homepage = "http://www.haskell.org/definition/"; description = "Compatibility with Haskell 98"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskelldb" = callPackage @@ -81482,7 +78510,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base haskell98 haskelldb mtl plugins ]; executableHaskellDepends = [ haskelldb ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the dynamically loaded drivers"; license = stdenv.lib.licenses.bsd3; @@ -81502,7 +78529,6 @@ self: { libraryHaskellDepends = [ base containers directory haskelldb mtl old-time ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "An experimental HaskellDB back-end in pure Haskell (no SQL)"; license = stdenv.lib.licenses.bsd3; @@ -81539,7 +78565,6 @@ self: { libraryHaskellDepends = [ base haskelldb haskelldb-hdbc HDBC HDBC-mysql mtl ]; - jailbreak = true; description = "HaskellDB support for the HDBC MySQL driver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -81610,7 +78635,6 @@ self: { version = "1.0.0"; sha256 = "a0d365607c04a2310a14eb9367067ad0e418da3d09d1a90fd70cdf207ac42a48"; libraryHaskellDepends = [ base haskelldb hsql mtl old-time ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for HSQL"; license = stdenv.lib.licenses.bsd3; @@ -81630,7 +78654,6 @@ self: { libraryHaskellDepends = [ base haskelldb haskelldb-hsql hsql hsql-mysql mtl ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL MySQL driver"; license = stdenv.lib.licenses.bsd3; @@ -81650,7 +78673,6 @@ self: { libraryHaskellDepends = [ base haskelldb haskelldb-hsql hsql hsql-odbc mtl ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL ODBC driver"; license = stdenv.lib.licenses.bsd3; @@ -81670,7 +78692,6 @@ self: { libraryHaskellDepends = [ base haskelldb haskelldb-hsql hsql hsql-oracle mtl ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL Oracle driver"; license = stdenv.lib.licenses.bsd3; @@ -81690,7 +78711,6 @@ self: { libraryHaskellDepends = [ base haskelldb haskelldb-hsql hsql hsql-postgresql mtl ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL PostgreSQL driver"; license = stdenv.lib.licenses.bsd3; @@ -81710,7 +78730,6 @@ self: { libraryHaskellDepends = [ base haskelldb haskelldb-hsql hsql hsql-sqlite mtl ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL SQLite driver"; license = stdenv.lib.licenses.bsd3; @@ -81730,7 +78749,6 @@ self: { libraryHaskellDepends = [ base haskelldb haskelldb-hsql hsql hsql-sqlite3 mtl ]; - jailbreak = true; homepage = "https://github.com/m4dc4p/haskelldb"; description = "HaskellDB support for the HSQL SQLite3 driver"; license = stdenv.lib.licenses.bsd3; @@ -81744,7 +78762,6 @@ self: { version = "2.1.0"; sha256 = "cbabcf99fe125bf4064b5fc89d42f1dc860c69eab750975d9898268fc1df908b"; libraryHaskellDepends = [ base haskelldb mtl template-haskell ]; - jailbreak = true; homepage = "http://trac.haskell.org/haskelldb-th"; description = "Template Haskell utilities for HaskellDB"; license = stdenv.lib.licenses.bsd3; @@ -81782,7 +78799,6 @@ self: { semigroups test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://www.github.com/happy0/haskellscrabble"; description = "A scrabble library capturing the core game logic of scrabble"; license = stdenv.lib.licenses.gpl3; @@ -81802,10 +78818,10 @@ self: { executableHaskellDepends = [ base cryptohash directory either filepath mtl process text ]; - jailbreak = true; homepage = "http://github.com/seanparsons/haskellscript/"; description = "Command line tool for running Haskell scripts with a hashbang"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskelm" = callPackage @@ -81842,17 +78858,16 @@ self: { }) {}; "haskelzinc" = callPackage - ({ mkDerivation, base, containers, filepath, parsec, pretty + ({ mkDerivation, base, containers, filepath, parsec3, pretty , process }: mkDerivation { pname = "haskelzinc"; - version = "0.1.0.1"; - sha256 = "82d828d7fd75f58db210169a167f24856aaa88fb7ac7e7cae16a1a46a0e56146"; + version = "0.2.0.3"; + sha256 = "a7248945f8c53b1a0f36e1c184c236fcb2bea27c970fc0453bcc0e88be767a72"; libraryHaskellDepends = [ - base containers filepath parsec pretty process + base containers filepath parsec3 pretty process ]; - jailbreak = true; description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -81882,7 +78897,6 @@ self: { aeson base bytestring http-conduit http-types network old-locale text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/Raynes/haskheap"; description = "Haskell bindings to refheap"; license = stdenv.lib.licenses.mit; @@ -81903,7 +78917,6 @@ self: { parsec pretty safecopy shelly template-haskell text text-show th-lift unordered-containers ]; - jailbreak = true; homepage = "http://haskhol.org"; description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving"; license = stdenv.lib.licenses.bsd3; @@ -81949,7 +78962,6 @@ self: { haskell-src-exts HaTeX hint parsec process text transformers ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://daniel-diaz.github.io/projects/haskintex"; description = "Haskell Evaluation inside of LaTeX code"; license = stdenv.lib.licenses.bsd3; @@ -81968,9 +78980,9 @@ self: { aeson base bytestring containers http-streams io-streams time vector ]; - jailbreak = true; description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haskoin" = callPackage @@ -81992,7 +79004,6 @@ self: { deepseq either HUnit json-rpc mtl pbkdf QuickCheck split test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "http://github.com/haskoin/haskoin"; description = "Implementation of the Bitcoin protocol"; license = stdenv.lib.licenses.publicDomain; @@ -82000,38 +79011,6 @@ self: { }) {}; "haskoin-core" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable - , bytestring, conduit, containers, cryptohash, deepseq, either - , entropy, HUnit, largeword, mtl, murmur3, network, pbkdf - , QuickCheck, safe, scientific, secp256k1, split - , string-conversions, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, time, unordered-containers - , vector - }: - mkDerivation { - pname = "haskoin-core"; - version = "0.3.1"; - sha256 = "3257afb81053b70a4740fb483653ce23bf6d7824d2eafc4f6747dfaf2aa9f32b"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary byteable bytestring conduit - containers cryptohash deepseq either entropy largeword mtl murmur3 - network pbkdf QuickCheck secp256k1 split string-conversions text - time vector - ]; - testHaskellDepends = [ - aeson base binary bytestring containers HUnit largeword mtl - QuickCheck safe scientific secp256k1 split string-conversions - test-framework test-framework-hunit test-framework-quickcheck2 text - unordered-containers vector - ]; - doCheck = false; - homepage = "http://github.com/haskoin/haskoin"; - description = "Implementation of the core Bitcoin protocol features"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "haskoin-core_0_4_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable , bytestring, cereal, conduit, containers, cryptohash, deepseq , either, entropy, HUnit, largeword, mtl, murmur3, network, pbkdf @@ -82080,7 +79059,6 @@ self: { HUnit mtl QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/plaprade/haskoin-crypto"; description = "Implementation of Bitcoin cryptographic primitives"; license = stdenv.lib.licenses.publicDomain; @@ -82115,7 +79093,6 @@ self: { persistent-sqlite QuickCheck resourcet test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/haskoin/haskoin"; description = "Implementation of a Bitoin node"; license = stdenv.lib.licenses.publicDomain; @@ -82138,7 +79115,6 @@ self: { base binary bytestring haskoin-crypto haskoin-util HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/plaprade/haskoin-protocol"; description = "Implementation of the Bitcoin network protocol messages"; license = stdenv.lib.licenses.publicDomain; @@ -82163,7 +79139,6 @@ self: { HUnit mtl QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/plaprade/haskoin-script"; description = "Implementation of Bitcoin script parsing and evaluation"; license = stdenv.lib.licenses.publicDomain; @@ -82186,7 +79161,6 @@ self: { base binary bytestring containers either HUnit mtl QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/plaprade/haskoin-util"; description = "Utility functions for the Network.Haskoin project"; license = stdenv.lib.licenses.publicDomain; @@ -82228,7 +79202,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text unordered-containers ]; - jailbreak = true; homepage = "http://github.com/haskoin/haskoin"; description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support"; license = stdenv.lib.licenses.publicDomain; @@ -82305,7 +79278,6 @@ self: { base bytestring data-accessor event-list HUnit midi non-negative process QuickCheck random transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Haskore"; description = "The Haskore Computer Music System"; license = "GPL"; @@ -82325,7 +79297,6 @@ self: { base bytestring data-accessor directory event-list haskore midi non-negative old-time process transformers unix utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Haskore/"; description = "Routines for realtime playback of Haskore songs"; license = "GPL"; @@ -82349,7 +79320,6 @@ self: { haskore-realtime hosc hsc3 non-negative opensoundcontrol-ht process random supercollider-ht transformers unix utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskore back-end for SuperCollider"; license = "GPL"; @@ -82363,13 +79333,12 @@ self: { }: mkDerivation { pname = "haskore-synthesizer"; - version = "0.0.3.2"; - sha256 = "071de904ab39fd812a25395b51fbb6991dc5e22a3b9d2213067a884c0e08f705"; + version = "0.0.3.3"; + sha256 = "64ddc8bf5a6b5c7f7f0986aada8016c8a09ca21ef3e3320565006bea53a3a4ee"; libraryHaskellDepends = [ base data-accessor event-list haskore non-negative numeric-prelude random synthesizer-core synthesizer-filter utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Music rendering coded in Haskell"; license = "GPL"; @@ -82394,16 +79363,14 @@ self: { }: mkDerivation { pname = "hasktags"; - version = "0.69.2"; - sha256 = "92c7742ff50527dd5ff45cf65c2009f364b06e17bdc4e41874a75bbf0c1f75fc"; + version = "0.69.2.1"; + sha256 = "9d369830ac5e146f7b2a2ed584eec732b0da85af00ed7b91a72e208f6ef5144a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring directory filepath json unix utf8-string ]; - executableHaskellDepends = [ - base bytestring directory filepath HUnit json unix utf8-string - ]; + executableHaskellDepends = [ base directory filepath unix ]; testHaskellDepends = [ base bytestring directory filepath HUnit json unix utf8-string ]; @@ -82472,37 +79439,6 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) aspell;}; - "hasql_0_19_14" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring - , bytestring-tree-builder, contravariant, contravariant-extras - , data-default-class, dlist, either, hashable, hashtables, loch-th - , mtl, placeholders, postgresql-binary, postgresql-libpq - , profunctors, QuickCheck, quickcheck-instances, rebase, scientific - , semigroups, tasty, tasty-hunit, tasty-quickcheck - , tasty-smallcheck, text, time, transformers, uuid, vector - }: - mkDerivation { - pname = "hasql"; - version = "0.19.14"; - sha256 = "e30cfa9d2d037927937ffabf489acef88412f30e3b122de6324e09503c957a35"; - libraryHaskellDepends = [ - aeson attoparsec base base-prelude bytestring - bytestring-tree-builder contravariant contravariant-extras - data-default-class dlist either hashable hashtables loch-th mtl - placeholders postgresql-binary postgresql-libpq profunctors - scientific semigroups text time transformers uuid vector - ]; - testHaskellDepends = [ - data-default-class QuickCheck quickcheck-instances rebase tasty - tasty-hunit tasty-quickcheck tasty-smallcheck - ]; - doCheck = false; - homepage = "https://github.com/nikita-volkov/hasql"; - description = "A very efficient PostgreSQL driver and a flexible mapping API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hasql" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , bytestring-tree-builder, contravariant, contravariant-extras @@ -82514,8 +79450,8 @@ self: { }: mkDerivation { pname = "hasql"; - version = "0.19.15"; - sha256 = "cbcec81cdd852325dddf3b9cbf830b94f63d4037adf5b9b84ac683384614b4e3"; + version = "0.19.15.2"; + sha256 = "b025bd613d23444f18f1196ca51fb2bdbb4b10bf779c1db85685eeb755c8bb34"; libraryHaskellDepends = [ aeson attoparsec base base-prelude bytestring bytestring-tree-builder contravariant contravariant-extras @@ -82527,9 +79463,8 @@ self: { data-default-class QuickCheck quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; - doCheck = false; homepage = "https://github.com/nikita-volkov/hasql"; - description = "A very efficient PostgreSQL driver and a flexible mapping API"; + description = "An efficient PostgreSQL driver and a flexible mapping API"; license = stdenv.lib.licenses.mit; }) {}; @@ -82544,7 +79479,6 @@ self: { libraryHaskellDepends = [ base-prelude bytestring either free list-t text transformers vector ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/hasql-backend"; description = "API for backends of \"hasql\""; license = stdenv.lib.licenses.mit; @@ -82570,7 +79504,6 @@ self: { generics-eot Glob hasql hspec process QuickCheck quickcheck-instances string-qq text time vector yaml ]; - jailbreak = true; homepage = "http://github.com/turingjump/hasql-class#readme"; description = "Encodable and Decodable classes for hasql"; license = stdenv.lib.licenses.bsd3; @@ -82672,7 +79605,6 @@ self: { old-locale postgresql-binary QuickCheck quickcheck-instances scientific text time vector ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/hasql-postgres"; description = "A \"PostgreSQL\" backend for the \"hasql\" library"; license = stdenv.lib.licenses.mit; @@ -82689,7 +79621,6 @@ self: { libraryHaskellDepends = [ base-prelude hasql-postgres optparse-applicative ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/hasql-postgres-options"; description = "An \"optparse-applicative\" parser for \"hasql-postgres\""; license = stdenv.lib.licenses.mit; @@ -82755,8 +79686,6 @@ self: { testHaskellDepends = [ base bytestring directory HUnit mtl syb text ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/lymar/hastache"; description = "Haskell implementation of Mustache templates"; license = stdenv.lib.licenses.bsd3; @@ -82788,9 +79717,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base curl filepath mtl ]; - jailbreak = true; description = "A universal pastebin tool, written in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haste-compiler" = callPackage @@ -82809,7 +79738,6 @@ self: { filepath ghc ghc-paths ghc-prim monads-tf network network-uri process random shellmate transformers utf8-string websockets ]; - jailbreak = true; homepage = "http://haste-lang.org/"; description = "Haskell To ECMAScript compiler"; license = stdenv.lib.licenses.bsd3; @@ -82841,7 +79769,6 @@ self: { libraryHaskellDepends = [ base containers directory filepath haste-lib ]; - jailbreak = true; homepage = "http://github.com/ajnsit/haste-markup"; description = "A port of blaze-markup and blaze-html to Haste"; license = stdenv.lib.licenses.mit; @@ -82924,7 +79851,6 @@ self: { base bytestring containers directory filepath haskeline haskell-src-exts polyparse process ]; - jailbreak = true; homepage = "http://projects.haskell.org/hat/"; description = "The Haskell tracer, generating and viewing Haskell execution traces"; license = "unknown"; @@ -82979,8 +79905,8 @@ self: { }: mkDerivation { pname = "hats"; - version = "0.1.0.0"; - sha256 = "58f6f63fd02049fedd7e2c474ffcb01f1d0ba8129477550afffb7167ca7841c8"; + version = "0.1.0.1"; + sha256 = "687c20c67e79522cf286bc61c15e9434acdb9743183cb7cd296b82af856eb830"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -83042,7 +79968,6 @@ self: { base basic-prelude containers errors mtl random-shuffle tasty tasty-hunit tasty-quickcheck text ]; - jailbreak = true; description = "Implementation of the rules of Love Letter"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -83071,29 +79996,27 @@ self: { }) {}; "haxl" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , directory, exceptions, filepath, hashable, HUnit, pretty, text - , time, unordered-containers, vector + ({ mkDerivation, aeson, base, binary, bytestring, containers + , deepseq, directory, exceptions, filepath, ghc-prim, hashable + , HUnit, pretty, test-framework, test-framework-hunit, text, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "haxl"; - version = "0.3.1.0"; - sha256 = "fba961b0f3a9a9b6f7cf6ac24689d48fb8404d79ec86a36c2784f3f45d06669a"; - revision = "2"; - editedCabalFile = "f3a1523824d97b8e261e17491fb91230fc77c903444211f8303d89eacb2065d1"; + version = "0.4.0.1"; + sha256 = "15bc6c2ed641b3c1f1e8f8cfc377fe5ae8ec3e1f4a8eb03be8e154f981cfd6a3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base bytestring containers deepseq directory exceptions - filepath hashable HUnit pretty text time unordered-containers - vector + aeson base binary bytestring containers deepseq directory + exceptions filepath ghc-prim hashable HUnit pretty text time + transformers unordered-containers vector ]; executableHaskellDepends = [ base hashable time ]; testHaskellDepends = [ - aeson base bytestring containers hashable HUnit text - unordered-containers + aeson base binary bytestring containers deepseq filepath hashable + HUnit test-framework test-framework-hunit text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/facebook/Haxl"; description = "A Haskell library for efficient, concurrent, and concise data access"; license = stdenv.lib.licenses.bsd3; @@ -83138,7 +80061,6 @@ self: { http-client-tls http-conduit resourcet text time transformers unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/facebook/Haxl"; description = "An example Haxl data source for accessing the Facebook Graph API"; license = stdenv.lib.licenses.bsd3; @@ -83165,35 +80087,12 @@ self: { mtl optparse-applicative parsec split template-haskell transformers utf8-string zlib ]; - jailbreak = true; homepage = "https://github.com/joelteon/haxparse"; description = "Readable HaxBall replays"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "haxr_3000_11_1_6" = callPackage - ({ mkDerivation, array, base, base-compat, base64-bytestring - , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams - , http-types, io-streams, mtl, mtl-compat, network, network-uri - , old-locale, old-time, template-haskell, time, utf8-string - }: - mkDerivation { - pname = "haxr"; - version = "3000.11.1.6"; - sha256 = "25b758d83061f35e90a07ad296f827762b61639a5eb81e60326a9de96d63351d"; - libraryHaskellDepends = [ - array base base-compat base64-bytestring blaze-builder bytestring - HaXml HsOpenSSL http-streams http-types io-streams mtl mtl-compat - network network-uri old-locale old-time template-haskell time - utf8-string - ]; - homepage = "http://www.haskell.org/haskellwiki/HaXR"; - description = "XML-RPC client and server library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "haxr" = callPackage ({ mkDerivation, array, base, base-compat, base64-bytestring , blaze-builder, bytestring, HaXml, HsOpenSSL, http-streams @@ -83213,6 +80112,7 @@ self: { homepage = "http://www.haskell.org/haskellwiki/HaXR"; description = "XML-RPC client and server library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "haxr-th" = callPackage @@ -83222,7 +80122,6 @@ self: { version = "3000.5"; sha256 = "2e6aef7e357aefaf3cb559c12ebb0196692d5c1095dc98889279ccc24e262fc0"; libraryHaskellDepends = [ base haxr template-haskell ]; - jailbreak = true; homepage = "http://www.haskell.org/haxr/"; description = "Automatic deriving of XML-RPC structs for Haskell records"; license = stdenv.lib.licenses.bsd3; @@ -83241,10 +80140,10 @@ self: { base bytestring data-default-class hostname HTTP http-server mtl url ]; - jailbreak = true; homepage = "http://github.com/achudnov/haxy"; description = "A simple HTTP proxy server library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hayland" = callPackage @@ -83263,7 +80162,6 @@ self: { librarySystemDepends = [ mesa wayland ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base process xml ]; - jailbreak = true; description = "Haskell bindings for the C Wayland library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -83283,7 +80181,6 @@ self: { aeson base bytestring http-conduit http-types optparse-applicative pandoc url ]; - jailbreak = true; homepage = "https://github.com/Gonzih/hayoo-cli"; description = "Hayoo CLI"; license = stdenv.lib.licenses.mit; @@ -83348,7 +80245,6 @@ self: { executableHaskellDepends = [ base directory ghc ghc-mod ghc-paths libhbb ]; - jailbreak = true; homepage = "https://bitbucket.org/bhris/hbb"; description = "Haskell Busy Bee, a backend for text editors"; license = stdenv.lib.licenses.lgpl21; @@ -83415,7 +80311,6 @@ self: { libraryHaskellDepends = [ base primitive storable-complex vector ]; librarySystemDepends = [ blas liblapack ]; testHaskellDepends = [ base HUnit tasty tasty-hunit vector ]; - jailbreak = true; homepage = "http://github.com/wellposed/hblas/"; description = "Human friendly BLAS and Lapack bindings for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -83437,7 +80332,6 @@ self: { aeson base blaze-markup bytestring cereal containers deepseq hashable path-pieces safecopy text unordered-containers uuid vector ]; - jailbreak = true; description = "A mutable vector that provides indexation on the datatype fields it stores"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -83521,10 +80415,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring language-c ]; - jailbreak = true; homepage = "http://tomahawkins.org"; description = "A toy C compiler"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcg-minus" = callPackage @@ -83602,10 +80496,10 @@ self: { stm tagged tasty temporary text transformers transformers-base ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/bennofs/hcltest/"; description = "A testing library for command line applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcoap" = callPackage @@ -83626,10 +80520,10 @@ self: { testHaskellDepends = [ async base bytestring HUnit network QuickCheck random ]; - jailbreak = true; homepage = "https://github.com/lulf/hcoap"; description = "CoAP implementation for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hcron" = callPackage @@ -83644,7 +80538,6 @@ self: { base bytestring containers directory mtl old-locale pretty process random stm time ]; - jailbreak = true; homepage = "http://github.com/tbh/hcron"; description = "A simple job scheduler, which just runs some IO action at a given time"; license = stdenv.lib.licenses.bsd3; @@ -83684,24 +80577,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {bluetooth = null; inherit (pkgs) cwiid;}; - "hdaemonize_0_5_0_2" = callPackage - ({ mkDerivation, base, extensible-exceptions, filepath, hsyslog - , mtl, unix - }: - mkDerivation { - pname = "hdaemonize"; - version = "0.5.0.2"; - sha256 = "55cd4ff1dd4ca4fd00f450db3964639c5cc5e98f33f1b3d45c8c3f2d485953ae"; - libraryHaskellDepends = [ - base extensible-exceptions filepath hsyslog mtl unix - ]; - jailbreak = true; - homepage = "http://github.com/greydot/hdaemonize"; - description = "Library to handle the details of writing daemons for UNIX"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hdaemonize" = callPackage ({ mkDerivation, base, bytestring, extensible-exceptions, filepath , hsyslog, mtl, unix @@ -83747,10 +80622,10 @@ self: { aeson base convertible HDBC scientific text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/danchoi/hdbc-aeson"; description = "Deserialize from HDBC rows to FromJSON instances"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdbc-postgresql-hstore" = callPackage @@ -83760,10 +80635,10 @@ self: { version = "0.0.1.1"; sha256 = "92ab052490fd6f205c65aa9601cf0a6d61ef5450441a978cb6046ef570d59f0c"; libraryHaskellDepends = [ attoparsec base containers HDBC text ]; - jailbreak = true; homepage = "http://bitbucket.com/dpwiz/hdbc-postgresql-hstore"; description = "Manipulate data in PostgreSQL \"hstore\" columns"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hdbc-tuple" = callPackage @@ -83800,7 +80675,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time uuid ]; - jailbreak = true; homepage = "https://github.com/s9gf4ult/hdbi"; description = "Haskell Database Independent interface"; license = stdenv.lib.licenses.bsd3; @@ -83852,7 +80726,6 @@ self: { quickcheck-instances safe test-framework test-framework-hunit test-framework-quickcheck2 text time uuid ]; - jailbreak = true; homepage = "https://github.com/s9gf4ult/hdbi-postgresql"; description = "PostgreSQL driver for hdbi"; license = stdenv.lib.licenses.bsd3; @@ -83895,34 +80768,12 @@ self: { quickcheck-assertions quickcheck-instances stm test-framework test-framework-hunit test-framework-quickcheck2 text time uuid ]; - jailbreak = true; homepage = "https://github.com/s9gf4ult/hdbi-tests"; description = "test suite for testing HDBI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hdevtools_0_1_3_2" = callPackage - ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc - , ghc-boot, ghc-paths, network, process, syb, time, transformers - , unix - }: - mkDerivation { - pname = "hdevtools"; - version = "0.1.3.2"; - sha256 = "f35932f3846badcd06a98beb62533bce20518b2ba52c0898ba120d46b32f9c48"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base Cabal cmdargs directory filepath ghc ghc-boot ghc-paths - network process syb time transformers unix - ]; - homepage = "https://github.com/hdevtools/hdevtools/"; - description = "Persistent GHC powered background server for FAST haskell development tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hdevtools" = callPackage ({ mkDerivation, base, Cabal, cmdargs, directory, filepath, ghc , ghc-boot, ghc-paths, network, process, syb, time, transformers @@ -84014,7 +80865,6 @@ self: { sha256 = "c0dfe335a447ecb0d611a8f7bcaa11cf7b9b639cd1eca2f7e558be53a6bed37c"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ markdown ]; - jailbreak = true; homepage = "https://github.com/jamwt/hdiscount"; description = "Haskell bindings to the Discount markdown library"; license = stdenv.lib.licenses.bsd3; @@ -84069,8 +80919,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.0.0"; - sha256 = "57c422f7f86029436595d19f102aa64da499fc23f9f60801070a1650bde19c37"; + version = "0.5.0.1"; + sha256 = "6d4e53adcfc7375736ce47beb07e0ab3c6ec96300ce91edbae1fbd009bfff0db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84109,7 +80959,6 @@ self: { network-info network-multicast network-transport network-transport-tcp random template-haskell time ]; - jailbreak = true; homepage = "https://github.com/PatrickMaier/HdpH"; description = "Haskell distributed parallel Haskell"; license = stdenv.lib.licenses.bsd3; @@ -84127,7 +80976,6 @@ self: { libraryHaskellDepends = [ array base bytestring cereal containers deepseq template-haskell ]; - jailbreak = true; homepage = "https://github.com/PatrickMaier/HdpH"; description = "Explicit closures in Haskell distributed parallel Haskell"; license = stdenv.lib.licenses.bsd3; @@ -84168,10 +81016,10 @@ self: { aeson aeson-pretty base bytestring directory filepath haskeline time ]; - jailbreak = true; homepage = "https://github.com/aka-bash0r/headergen"; description = "Creates a header for a haskell source file"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heap" = callPackage @@ -84194,11 +81042,10 @@ self: { sha256 = "04e358d3e6d8ca7786749b6d3945e18159506f8b21ca48b1913c771dcaae1537"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/ekmett/heaps/"; description = "Asymptotically optimal Brodal/Okasaki heaps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "heapsort" = callPackage @@ -84259,33 +81106,9 @@ self: { base blaze-html dates directory pandoc pandoc-types process split tagsoup ]; - jailbreak = true; homepage = "https://github.com/2016rshah/heckle"; description = "Jekyll in Haskell (feat. LaTeX)"; license = stdenv.lib.licenses.mit; - }) {}; - - "hedis_0_6_10" = callPackage - ({ mkDerivation, attoparsec, base, BoundedChan, bytestring - , bytestring-lexing, HUnit, mtl, network, resource-pool - , test-framework, test-framework-hunit, time, vector - }: - mkDerivation { - pname = "hedis"; - version = "0.6.10"; - sha256 = "31974bfd8e891a4b54a444dcc86dfdac83875e0c3c5933648884230db72a895d"; - libraryHaskellDepends = [ - attoparsec base BoundedChan bytestring bytestring-lexing mtl - network resource-pool time vector - ]; - testHaskellDepends = [ - base bytestring HUnit mtl test-framework test-framework-hunit time - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/informatikr/hedis"; - description = "Client library for the Redis datastore: supports full command set, pipelining"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84297,8 +81120,8 @@ self: { }: mkDerivation { pname = "hedis"; - version = "0.9.3"; - sha256 = "2d3748fe7c88b3b7341e6fdd3632c4594b01e7c5fe7c395ea5fc74235e1f92d0"; + version = "0.9.4"; + sha256 = "15935228da585669041395cac32c8e570ea4efa122b0ae9f71fa1a0c129f70d1"; libraryHaskellDepends = [ async base bytestring bytestring-lexing deepseq mtl network resource-pool scanner stm text time unordered-containers vector @@ -84307,7 +81130,6 @@ self: { async base bytestring HUnit mtl slave-thread stm test-framework test-framework-hunit text time ]; - doCheck = false; homepage = "https://github.com/informatikr/hedis"; description = "Client library for the Redis datastore: supports full command set, pipelining"; license = stdenv.lib.licenses.bsd3; @@ -84379,10 +81201,10 @@ self: { base binary bytestring hedis HUnit lifted-base string-conversions test-framework test-framework-hunit transformers ]; - jailbreak = true; homepage = "https://github.com/akaspin/hedis-pile"; description = "Caching mandatory data with Redis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-simple" = callPackage @@ -84392,10 +81214,10 @@ self: { version = "0.1.0.0"; sha256 = "5b9dbfa52f334c5a8b9a6a42251d3bb8a6d21e6e5660628cc48a95f1f0cd07b7"; libraryHaskellDepends = [ base bytestring either hedis mtl ]; - jailbreak = true; homepage = "http://github.com/sanetracker/hedis-simple"; description = "A simplified API for hedis"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedis-tags" = callPackage @@ -84411,10 +81233,10 @@ self: { base bytestring hedis HUnit lifted-base test-framework test-framework-hunit transformers ]; - jailbreak = true; homepage = "https://github.com/akaspin/hedis-tags"; description = "Tags for hedis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hedn" = callPackage @@ -84455,33 +81277,9 @@ self: { base bytestring directory filepath http-conduit process transformers ]; - jailbreak = true; homepage = "https://github.com/khanage/heineken"; description = "An extensible build helper for haskell, in the vein of leiningen"; license = stdenv.lib.licenses.asl20; - }) {}; - - "heist_0_14_1_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html - , bytestring, containers, directory, directory-tree, dlist, either - , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl - , process, random, text, time, transformers, unordered-containers - , vector, xmlhtml - }: - mkDerivation { - pname = "heist"; - version = "0.14.1.4"; - sha256 = "debf008e68310d7e494560ebf7226693e5bc6820be39b6dae91f965805cf5fc9"; - libraryHaskellDepends = [ - aeson attoparsec base blaze-builder blaze-html bytestring - containers directory directory-tree dlist either filepath hashable - map-syntax MonadCatchIO-transformers mtl process random text time - transformers unordered-containers vector xmlhtml - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "An Haskell template system supporting both HTML5 and XML"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -84578,7 +81376,6 @@ self: { librarySystemDepends = [ newrelic-collector-client newrelic-common newrelic-transaction ]; - jailbreak = true; homepage = "https://github.com/philopon/helics"; description = "New Relic® agent SDK wrapper for Haskell"; license = stdenv.lib.licenses.mit; @@ -84597,7 +81394,6 @@ self: { libraryHaskellDepends = [ base bytestring data-default-class helics vault wai ]; - jailbreak = true; homepage = "https://github.com/philopon/helics"; description = "New Relic® agent SDK wrapper for wai"; license = stdenv.lib.licenses.mit; @@ -84677,7 +81473,6 @@ self: { testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json text wai ]; - jailbreak = true; homepage = "https://ajnsit.github.io/helix/"; description = "Web development micro framework for haskell with typesafe URLs"; license = stdenv.lib.licenses.mit; @@ -84771,24 +81566,23 @@ self: { }) {}; "helm" = callPackage - ({ mkDerivation, base, cairo, containers, cpu, elerea, filepath - , HUnit, mtl, pango, random, sdl2, test-framework - , test-framework-hunit, test-framework-quickcheck2, text, time - , transformers + ({ mkDerivation, base, cairo, containers, elerea, hspec, linear + , mtl, pango, random, sdl2, stm, text, transformers }: mkDerivation { pname = "helm"; - version = "0.7.1"; - sha256 = "eff90ae15a7af236bc0f431686409869c6a5881e6978bee523f29329b0e95513"; + version = "1.0.0"; + sha256 = "2db4102c179de11b62551c2e73477773fb603c5749dda0caac53bf038bef630c"; + revision = "1"; + editedCabalFile = "d302a857ec4bfaf720ba5f2345fe2cc3df5d61d920173172ca092671340f700f"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base cairo containers cpu elerea filepath mtl pango random sdl2 - text time transformers + base cairo containers elerea linear mtl pango sdl2 stm text + transformers ]; - testHaskellDepends = [ - base cairo containers elerea HUnit sdl2 test-framework - test-framework-hunit test-framework-quickcheck2 time - ]; - jailbreak = true; + executableHaskellDepends = [ base linear random ]; + testHaskellDepends = [ base hspec ]; homepage = "http://github.com/switchface/helm"; description = "A functionally reactive game engine"; license = stdenv.lib.licenses.mit; @@ -84888,7 +81682,6 @@ self: { base bitset exceptions mtl QuickCheck tasty tasty-quickcheck transformers uuid ]; - jailbreak = true; homepage = "https://github.com/selectel/hen"; description = "Haskell bindings to Xen hypervisor interface"; license = stdenv.lib.licenses.mit; @@ -85008,7 +81801,6 @@ self: { base bytestring doctest parsec template-haskell text ]; testHaskellDepends = [ base bytestring doctest text ]; - jailbreak = true; homepage = "http://github.com/cutsea110/heredoc.git"; description = "heredocument"; license = stdenv.lib.licenses.bsd3; @@ -85052,7 +81844,6 @@ self: { base directory filepath ghc ghc-paths process tasty tasty-golden temporary ]; - jailbreak = true; description = "Haskell Equational Reasoning Model-to-Implementation Tunnel"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85211,7 +82002,6 @@ self: { executableHaskellDepends = [ base filepath haskell-src HDBC HDBC-postgresql hssqlppp parsec ]; - jailbreak = true; description = "Haskell's embedded SQL"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -85340,10 +82130,10 @@ self: { version = "0.2.0.0"; sha256 = "14d344b138c1858d314df98f3b6676e75f7af523aad4ed9c8bac9264f42e5bab"; libraryHaskellDepends = [ base binary bytestring filepath ]; - jailbreak = true; homepage = "http://www.github.com/hansroland/hexif"; description = "Reading Exif data form a JPEG file with Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat" = callPackage @@ -85376,7 +82166,6 @@ self: { base bytestring containers extensible-exceptions hexpat iteratee List parallel transformers ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Hexpat/"; description = "Chunked XML parsing using iteratees"; license = stdenv.lib.licenses.bsd3; @@ -85394,10 +82183,10 @@ self: { libraryHaskellDepends = [ base bytestring deepseq hexpat hexpat-tagsoup lens ]; - jailbreak = true; homepage = "https://github.com/tel/hexpat-lens"; description = "Lenses for Hexpat"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexpat-pickle" = callPackage @@ -85456,10 +82245,10 @@ self: { libraryHaskellDepends = [ base data-ref either mtl parsec transformers ]; - jailbreak = true; homepage = "https://github.com/Zankoku-Okuno/hexpr/"; description = "A framework for symbolic, homoiconic languages"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hexquote" = callPackage @@ -85499,8 +82288,8 @@ self: { ({ mkDerivation, base, containers, text, unordered-containers }: mkDerivation { pname = "hext"; - version = "0.1.0.3"; - sha256 = "76e2cd8d655fead634401f65d698f2ef03617dae2bd2a6287e9f461f11861588"; + version = "0.1.0.4"; + sha256 = "a2e76f7f25853d5533dcec2819c6c1e267d53828088498861be3d493ee6b1451"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85572,7 +82361,6 @@ self: { base bytestring haskeline iteratee MissingH MonadCatchIO-transformers network transformers ]; - jailbreak = true; description = "Flash debugger"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -85588,7 +82376,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base eprocess mtl ]; executableHaskellDepends = [ wx wxcore ]; - jailbreak = true; homepage = "http://github.com/elbrujohalcon/hfiar"; description = "Four in a Row in Haskell!!"; license = stdenv.lib.licenses.bsd3; @@ -85617,8 +82404,8 @@ self: { }: mkDerivation { pname = "hfmt"; - version = "0.0.2.2"; - sha256 = "36610511a051f13e8b604f090eff467ff88bf40d2edc809d99d7246b9ac22d5f"; + version = "0.0.2.3"; + sha256 = "22ced71f926ecece0ab3b33fdfabd004fb1812eaab1f2234280e012cbf2aba98"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -85677,10 +82464,10 @@ self: { version = "1.0.2"; sha256 = "34810fc4760503f9fbb929134dced7f4274d4167351636d5dd531950bbac1c13"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/nornagon/hfov"; description = "Field-of-view calculation for low-resolution 2D raster grids"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hfractal" = callPackage @@ -85792,10 +82579,10 @@ self: { base directory HUnit process template-haskell temporary test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/copton/hgdbmi"; description = "GDB Machine Interface: program-driven control of GDB"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgearman" = callPackage @@ -85811,9 +82598,9 @@ self: { base binary bytestring monad-control mtl network resource-pool transformers transformers-base unordered-containers ]; - jailbreak = true; description = "A Gearman client for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgen" = callPackage @@ -85827,10 +82614,10 @@ self: { executableHaskellDepends = [ base directory filepath hylolib mtl random ]; - jailbreak = true; homepage = "http://www.glyc.dc.uba.ar/intohylo/hgen.php"; description = "Random generation of modal and hybrid logic formulas"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgeometric" = callPackage @@ -85867,7 +82654,6 @@ self: { array base bytestring containers data-clist doctest Frames hspec lens linear random semigroups vector vinyl ]; - jailbreak = true; homepage = "https://fstaals.net/software/hgeometry"; description = "Geometric Algorithms, Data structures, and Data types"; license = stdenv.lib.licenses.bsd3; @@ -85924,7 +82710,6 @@ self: { http-enumerator text ]; executableHaskellDepends = [ base cmdargs directory ]; - jailbreak = true; homepage = "https://github.com/noteed/hgithub"; description = "Haskell bindings to the GitHub API"; license = stdenv.lib.licenses.bsd3; @@ -85942,7 +82727,6 @@ self: { executableHaskellDepends = [ array base HGL HTam random utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/hgl-example/"; description = "Various animations generated using HGL"; license = "GPL"; @@ -85988,9 +82772,9 @@ self: { version = "0.1.0.0"; sha256 = "8ed7f3298557486c934aa8cc2f20166e1b6a6e620df9bb6e4e4ab3e2505cde48"; libraryHaskellDepends = [ base bytestring network ]; - jailbreak = true; description = "Gopher server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hgrev" = callPackage @@ -86021,7 +82805,6 @@ self: { librarySystemDepends = [ grib_api ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base directory hspec ]; - jailbreak = true; homepage = "https://github.com/mjakob/hgrib"; description = "Unofficial bindings for GRIB API"; license = stdenv.lib.licenses.gpl3; @@ -86036,7 +82819,6 @@ self: { sha256 = "f5868e6f1f34f5448c4865f286ba06b186a47fc61894d20707dedb2b9214b65e"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ harp ]; - jailbreak = true; homepage = "http://www.harphttp.org"; description = "Binding to libharp"; license = stdenv.lib.licenses.bsd3; @@ -86050,8 +82832,8 @@ self: { }: mkDerivation { pname = "hi"; - version = "1.2.0.0"; - sha256 = "091e82568ffada19e196eeead484f4764399288b0ba5f9729abd1ec4ee918399"; + version = "1.2.0.1"; + sha256 = "c2758df75bec2f971d85f4f681d56c42f28adb013058e445851cbc94a209828e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86069,10 +82851,10 @@ self: { HUnit optparse-applicative parsec process silently split template temporary text time ]; - jailbreak = true; - homepage = "https://github.com/fujimura/hi"; + homepage = "https://github.com/fujimura/hi.git#readme"; description = "Generate scaffold for cabal project"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hi3status" = callPackage @@ -86091,9 +82873,9 @@ self: { regex-pcre-builtin text time transformers vector ]; executableHaskellDepends = [ base dbus process ]; - jailbreak = true; description = "Status line for i3bar"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hiccup" = callPackage @@ -86159,7 +82941,8 @@ self: { homepage = "https://github.com/vahokif/haskell-hidapi"; description = "Haskell bindings to HIDAPI"; license = stdenv.lib.licenses.mit; - }) {inherit (pkgs) systemd;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {systemd = null;}; "hieraclus" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, multiset }: @@ -86201,7 +82984,6 @@ self: { base diagrams-cairo diagrams-lib hierarchical-clustering hspec HUnit ]; - jailbreak = true; description = "Draw diagrams of dendrograms made by hierarchical-clustering"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -86239,10 +83021,10 @@ self: { base directory doctest filepath hspec hspec-expectations mtl pipes semigroups transformers ]; - jailbreak = true; homepage = "https://github.com/jwiegley/hierarchy"; description = "Pipes-based library for predicated traversal of generated trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hiernotify" = callPackage @@ -86388,8 +83170,8 @@ self: { }: mkDerivation { pname = "highlighting-kate"; - version = "0.6.2.1"; - sha256 = "62af544964cb9d019baf1c81e28f8a747800c581787812a3b374e2f0a4209135"; + version = "0.6.3"; + sha256 = "71dab85c49b038053b90062ed882e486233cbaa2b762d017224d06482075840d"; configureFlags = [ "-fpcre-light" ]; libraryHaskellDepends = [ base blaze-html bytestring containers mtl parsec pcre-light @@ -86436,7 +83218,6 @@ self: { base directory glib gtk haskell98 mozembed old-time parallel process unix ]; - jailbreak = true; homepage = "http://www.haskell.org/himerge"; description = "Haskell Graphical User Interface for Emerge"; license = "GPL"; @@ -86459,7 +83240,6 @@ self: { executableHaskellDepends = [ base bytestring directory gtk HTTP http-conduit network temporary ]; - jailbreak = true; homepage = "http://github.com/Fuuzetsu/himg"; description = "Simple gtk2hs image viewer. Point it at an image and fire away."; license = stdenv.lib.licenses.gpl3; @@ -86483,7 +83263,6 @@ self: { NetSNMP network old-time protobuf regex-posix stm text type-level unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/pyr/himpy"; description = "multithreaded snmp poller for riemann"; license = stdenv.lib.licenses.mit; @@ -86511,7 +83290,6 @@ self: { testHaskellDepends = [ base directory haskell-src-exts hspec monad-loops mtl text ]; - doCheck = false; homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -86542,7 +83320,6 @@ self: { base bytestring deepseq Diff directory exceptions haskell-src-exts hspec monad-loops mtl utf8-string ]; - jailbreak = true; homepage = "http://www.github.com/chrisdone/hindent"; description = "Extensible Haskell pretty printer"; license = stdenv.lib.licenses.bsd3; @@ -86561,9 +83338,9 @@ self: { base containers data-fix mtl transformers ]; testHaskellDepends = [ base containers hspec ]; - jailbreak = true; description = "Template for Hindley-Milner based languages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinduce-associations-apriori" = callPackage @@ -86686,10 +83463,10 @@ self: { base bifunctors QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/joneshf/hinquire"; description = "Generate armet style query strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinstaller" = callPackage @@ -86709,28 +83486,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hint_0_5_2" = callPackage - ({ mkDerivation, base, directory, exceptions, extensible-exceptions - , filepath, ghc, ghc-paths, HUnit, mtl, random, unix - }: - mkDerivation { - pname = "hint"; - version = "0.5.2"; - sha256 = "b988ddf97c01dcfe21d3db97e4de94f8a9eeed645cc89ed0471f977b1fa22c0f"; - libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-paths mtl random unix - ]; - testHaskellDepends = [ - base directory exceptions extensible-exceptions filepath HUnit - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/mvdan/hint"; - description = "Runtime Haskell interpreter (GHC API wrapper)"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hint" = callPackage ({ mkDerivation, base, directory, exceptions, extensible-exceptions , filepath, ghc, ghc-paths, HUnit, mtl, random, unix @@ -86760,9 +83515,9 @@ self: { libraryHaskellDepends = [ base eprocess exceptions hint monad-loops mtl ]; - jailbreak = true; description = "A server process that runs hint"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hinvaders" = callPackage @@ -86806,7 +83561,6 @@ self: { base bytestring Chart Chart-cairo colour deepseq filepath JuicyPixels netpbm primitive process repa temporary vector ]; - jailbreak = true; homepage = "https://github.com/lehins/hip"; description = "Haskell Image Processing (HIP) Library"; license = stdenv.lib.licenses.bsd3; @@ -86833,7 +83587,6 @@ self: { unordered-containers utf8-string wai wai-lens webcrank webcrank-wai wreq ]; - jailbreak = true; homepage = "https://github.com/purefn/hipbot"; description = "A library for building HipChat Bots"; license = stdenv.lib.licenses.bsd3; @@ -86926,7 +83679,6 @@ self: { numeric-extras random statistics text text-format vector vector-space ]; - jailbreak = true; homepage = "https://people.ksp.sk/~ivan/hirt"; description = "Calculates IRT 2PL and 3PL models"; license = stdenv.lib.licenses.bsd3; @@ -86944,7 +83696,6 @@ self: { libraryHaskellDepends = [ base bytestring conduit http-conduit http-types text time ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/hissmetrics"; description = "Unofficial API bindings to KISSmetrics"; license = stdenv.lib.licenses.bsd3; @@ -86970,7 +83721,6 @@ self: { aeson-pretty base bytestring cmdargs containers hist-pl-dawg hist-pl-fusion hist-pl-lexicon hist-pl-lmf pipes polimorf ]; - jailbreak = true; homepage = "https://github.com/kawu/hist-pl/tree/master/umbrella"; description = "Umbrella package for the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; @@ -87022,10 +83772,10 @@ self: { base binary containers dawg directory filepath hist-pl-dawg hist-pl-types pipes text transformers ]; - jailbreak = true; homepage = "https://github.com/kawu/hist-pl/tree/master/lexicon"; description = "A binary representation of the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hist-pl-lmf" = callPackage @@ -87035,7 +83785,6 @@ self: { version = "0.1.0"; sha256 = "75f33f9ff5c5fd29d37f11eeacbc0d6ff7a58879ee70b6190f13bde84af8db90"; libraryHaskellDepends = [ base hist-pl-types polysoup text ]; - jailbreak = true; homepage = "https://github.com/kawu/hist-pl/tree/master/lmf"; description = "LMF parsing for the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; @@ -87061,10 +83810,10 @@ self: { version = "0.1.0"; sha256 = "3bd142adc913d4c3dfe095abe6ff48722fab5e8c7e23c2c7045771d683542344"; libraryHaskellDepends = [ base binary text text-binary ]; - jailbreak = true; homepage = "https://github.com/kawu/hist-pl/tree/master/types"; description = "Types in the historical dictionary of Polish"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "histogram-fill" = callPackage @@ -87120,7 +83869,6 @@ self: { executableHaskellDepends = [ base containers directory filepath process regex-compat regex-posix ]; - jailbreak = true; description = "Extract the interesting bits from shell history"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -87177,10 +83925,10 @@ self: { aeson base bytestring HUnit test-framework test-framework-hunit text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/seagreen/hjcase"; description = "Jcase library for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hjpath" = callPackage @@ -87214,29 +83962,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hjsmin_0_2_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers - , language-javascript, optparse-applicative, text - }: - mkDerivation { - pname = "hjsmin"; - version = "0.2.0.1"; - sha256 = "333e13cfd2b00f0ebeddf08aa9f0ed5ca689dcc21224cd0d9e6416e50fe1acae"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers language-javascript text - ]; - executableHaskellDepends = [ - base blaze-builder bytestring containers language-javascript - optparse-applicative text - ]; - homepage = "http://github.com/erikd/hjsmin"; - description = "Haskell implementation of a javascript minifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hjsmin" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers , language-javascript, optparse-applicative, text @@ -87282,19 +84007,19 @@ self: { }) {}; "hjsonpointer" = callPackage - ({ mkDerivation, aeson, base, hspec, http-types, HUnit, QuickCheck - , text, unordered-containers, vector + ({ mkDerivation, aeson, base, hspec, http-types, QuickCheck, text + , unordered-containers, vector }: mkDerivation { pname = "hjsonpointer"; - version = "1.0.0.0"; - sha256 = "0ba6ab283e9d465de61c1d171e7c78c78c5e06b061c125a63e2eee0201a01739"; + version = "1.0.0.1"; + sha256 = "e438e501f48cadbe7352cf0fc93b5fb744c99acba465f7280afdb0d3c504713f"; libraryHaskellDepends = [ aeson base QuickCheck text unordered-containers vector ]; testHaskellDepends = [ - aeson base hspec http-types HUnit QuickCheck text - unordered-containers vector + aeson base hspec http-types QuickCheck text unordered-containers + vector ]; homepage = "https://github.com/seagreen/hjsonpointer"; description = "JSON Pointer library"; @@ -87328,6 +84053,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hjsonschema_1_2_0_1" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, containers + , directory, file-embed, filepath, hjsonpointer, hspec, http-client + , http-types, pcre-heavy, profunctors, QuickCheck, scientific + , semigroups, text, unordered-containers, vector, wai-app-static + , warp + }: + mkDerivation { + pname = "hjsonschema"; + version = "1.2.0.1"; + sha256 = "85df5af566ed80b814b5b1757dee2acbde8f0c979747b34d28094552dcf5a960"; + libraryHaskellDepends = [ + aeson base bytestring containers file-embed filepath hjsonpointer + http-client http-types pcre-heavy profunctors QuickCheck scientific + semigroups text unordered-containers vector + ]; + testHaskellDepends = [ + aeson async base bytestring directory filepath hjsonpointer hspec + profunctors 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 { @@ -87394,7 +84146,6 @@ self: { executableHaskellDepends = [ array base bytestring bytestring-csv containers haskell98 parallel ]; - jailbreak = true; homepage = "http://membres-liglab.imag.fr/termier/HLCM/hlcm.html"; description = "Fast algorithm for mining closed frequent itemsets"; license = stdenv.lib.licenses.bsd3; @@ -87419,51 +84170,9 @@ self: { aeson base containers data-default mtl text unordered-containers websockets ]; - jailbreak = true; homepage = "https://bitbucket.org/functionally/hleap"; description = "Web Socket interface to Leap Motion controller"; license = stdenv.lib.licenses.mit; - }) {}; - - "hledger_0_27" = callPackage - ({ mkDerivation, base, base-compat, cmdargs, containers, csv - , directory, filepath, haskeline, hledger-lib, HUnit, mtl - , mtl-compat, old-time, parsec, pretty-show, process, regex-tdfa - , safe, shakespeare, split, tabular, terminfo, test-framework - , test-framework-hunit, text, time, unordered-containers - , utf8-string, wizards - }: - mkDerivation { - pname = "hledger"; - version = "0.27"; - sha256 = "0aecdf586a46c24d6d67659157d1edbfc0d78afb50ea7cfbec1a01bf86b792b0"; - revision = "2"; - editedCabalFile = "11f159f1c15ef44a6989491ab9fb921163fdf6107ef5f2dd6046ee143a42909a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - executableHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo text time unordered-containers utf8-string wizards - ]; - testHaskellDepends = [ - base base-compat cmdargs containers csv directory filepath - haskeline hledger-lib HUnit mtl mtl-compat old-time parsec - pretty-show process regex-tdfa safe shakespeare split tabular - terminfo test-framework test-framework-hunit text time - unordered-containers utf8-string wizards - ]; - jailbreak = true; - homepage = "http://hledger.org"; - description = "Command-line interface for the hledger accounting tool"; - license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -87519,7 +84228,6 @@ self: { base Chart cmdargs colour containers hledger hledger-lib HUnit safe time ]; - jailbreak = true; homepage = "http://hledger.org"; description = "A pie chart image generator for the hledger accounting tool"; license = "GPL"; @@ -87575,37 +84283,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hledger-lib_0_27" = callPackage - ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring - , cmdargs, containers, csv, Decimal, deepseq, directory, filepath - , HUnit, mtl, mtl-compat, old-time, parsec, pretty-show, regex-tdfa - , safe, split, test-framework, test-framework-hunit, time - , transformers, uglymemo, utf8-string - }: - mkDerivation { - pname = "hledger-lib"; - version = "0.27"; - sha256 = "77c47900106e65411743097cd0855b5484e1439b0de4c5ee6d2a0c5748672606"; - revision = "3"; - editedCabalFile = "6b734f07bdc0e658c035d982fdbb6fc2e8cf27b76fdf52485c230f146e51feb1"; - libraryHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split time transformers - uglymemo utf8-string - ]; - testHaskellDepends = [ - array base base-compat blaze-markup bytestring cmdargs containers - csv Decimal deepseq directory filepath HUnit mtl mtl-compat - old-time parsec pretty-show regex-tdfa safe split test-framework - test-framework-hunit time transformers uglymemo utf8-string - ]; - homepage = "http://hledger.org"; - description = "Core data types, parsers and functionality for the hledger accounting tools"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hledger-lib" = callPackage ({ mkDerivation, array, base, base-compat, blaze-markup, bytestring , cmdargs, containers, csv, Decimal, deepseq, directory, filepath @@ -87634,31 +84311,6 @@ self: { license = "GPL"; }) {}; - "hledger-ui_0_27_4" = callPackage - ({ mkDerivation, base, base-compat, brick, cmdargs, containers - , data-default, filepath, hledger, hledger-lib, HUnit, lens - , pretty-show, safe, split, time, transformers, vector, vty - }: - mkDerivation { - pname = "hledger-ui"; - version = "0.27.4"; - sha256 = "c99544721f630fb561f5f44e9b0295db991b59a6222b66f38696fef90fec377d"; - revision = "1"; - editedCabalFile = "81550a378ff933ffa25d68417b3d62f895197c7b36b363a0e95fb25bf35dbdcd"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - base base-compat brick cmdargs containers data-default filepath - hledger hledger-lib HUnit lens pretty-show safe split time - transformers vector vty - ]; - jailbreak = true; - homepage = "http://hledger.org"; - description = "Curses-style user interface for the hledger accounting tool"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hledger-ui" = callPackage ({ mkDerivation, base, base-compat, brick, cmdargs, containers , data-default, filepath, hledger, hledger-lib, HUnit, lens @@ -87675,7 +84327,6 @@ self: { hledger hledger-lib HUnit lens pretty-show safe split time transformers vector vty ]; - jailbreak = true; homepage = "http://hledger.org"; description = "Curses-style user interface for the hledger accounting tool"; license = "GPL"; @@ -87695,7 +84346,6 @@ self: { executableHaskellDepends = [ base cmdargs hledger hledger-lib HUnit safe time vty ]; - jailbreak = true; homepage = "http://hledger.org"; description = "A curses-style console interface for the hledger accounting tool"; license = "GPL"; @@ -87741,10 +84391,10 @@ self: { wai-extra wai-handler-launch warp yaml yesod yesod-core yesod-form yesod-static yesod-test ]; - jailbreak = true; homepage = "http://hledger.org"; description = "Web interface for the hledger accounting tool"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hlibBladeRF" = callPackage @@ -87757,10 +84407,10 @@ self: { libraryHaskellDepends = [ base bindings-DSL bytestring ]; libraryPkgconfigDepends = [ libbladeRF ]; testHaskellDepends = [ base hlint ]; - jailbreak = true; homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF"; description = "Haskell binding to libBladeRF SDR library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libbladeRF;}; "hlibev" = callPackage @@ -87858,7 +84508,6 @@ self: { uniplate ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/ndmitchell/hlint#readme"; description = "Source code suggestions"; license = stdenv.lib.licenses.bsd3; @@ -87997,7 +84646,6 @@ self: { sha256 = "cb3b825d4eef1813bd1bdf43199c200d254f0d7ad78ff1ad6b0ce3752ed33b32"; libraryHaskellDepends = [ base hmatrix transformers ]; librarySystemDepends = [ liblapack ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/hmatrix-banded/"; description = "HMatrix interface to LAPACK functions for banded matrices"; license = stdenv.lib.licenses.bsd3; @@ -88096,7 +84744,6 @@ self: { sha256 = "fd11ea7d5dca8e703a5b0b80832883f27d2dd3941d19171b0f05a163d68b31fb"; libraryHaskellDepends = [ base hmatrix vector ]; librarySystemDepends = [ QuadProgpp ]; - jailbreak = true; description = "Bindings to the QuadProg++ quadratic programming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88106,8 +84753,8 @@ self: { ({ mkDerivation, base, hmatrix, repa, vector }: mkDerivation { pname = "hmatrix-repa"; - version = "0.1.2.1"; - sha256 = "48298694cb8da0f830022576b7fc7dd08bad0c39e98ed00bff828d40e914a077"; + version = "0.1.2.2"; + sha256 = "51c3a46800aea072258b05047cb0c6f24999bbb626268ce32809c5872e0e71be"; libraryHaskellDepends = [ base hmatrix repa vector ]; homepage = "http://code.haskell.org/hmatrix-repa"; description = "Adaptors for interoperability between hmatrix and repa"; @@ -88139,7 +84786,6 @@ self: { libraryHaskellDepends = [ array base haskell-src-meta hmatrix parsec template-haskell tfp ]; - jailbreak = true; homepage = "http://code.haskell.org/hmatrix-static/"; description = "hmatrix with vector and matrix sizes encoded in types"; license = "GPL"; @@ -88170,7 +84816,6 @@ self: { libraryHaskellDepends = [ base haskell-src-exts haskell-src-meta hmatrix template-haskell ]; - jailbreak = true; homepage = "http://github.com/reinerp/hmatrix-syntax"; description = "MATLAB-like syntax for hmatrix vectors and matrices"; license = stdenv.lib.licenses.gpl3; @@ -88225,7 +84870,6 @@ self: { array base bytestring bytestring-lexing delimited-text gnuplot hmatrix hmeap hosc hsc3 parsec ]; - jailbreak = true; homepage = "http://slavepianos.org/rd/?t=hmeap-utils"; description = "Haskell Meapsoft Parser Utilities"; license = "GPL"; @@ -88256,7 +84900,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base MissingH process ]; - jailbreak = true; description = "CLI fuzzy finder and launcher"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88325,7 +84968,6 @@ self: { array base containers explicit-exception hmatrix lazy-csv non-empty random semigroups transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/hmm-hmatrix"; description = "Hidden Markov Models using HMatrix primitives"; license = stdenv.lib.licenses.bsd3; @@ -88418,7 +85060,6 @@ self: { base containers haskeline mtl parsec QuickCheck regex-compat syb text ]; - jailbreak = true; description = "Interpreter for the MUMPS langugae"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -88449,7 +85090,6 @@ self: { vector ]; testSystemDepends = [ netcdf ]; - jailbreak = true; homepage = "https://github.com/ian-ross/hnetcdf"; description = "Haskell NetCDF library"; license = stdenv.lib.licenses.bsd3; @@ -88458,21 +85098,21 @@ self: { "hnix" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, data-fix - , parsers, tasty, tasty-hunit, tasty-th, text, transformers - , trifecta, unordered-containers + , deepseq, deriving-compat, parsers, semigroups, tasty, tasty-hunit + , tasty-th, text, transformers, trifecta, unordered-containers }: mkDerivation { pname = "hnix"; - version = "0.2.1"; - sha256 = "2a1a0fbb24288ff74b4380ca792bfd7b369c4970e20c158ef0afe547bde120f8"; + version = "0.3.3"; + sha256 = "8c14d3e86b3b2a0e9834ade0f2c3595a96b27d1cc114873887a84f6ed8bee44f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-wl-pprint base containers data-fix parsers text transformers - trifecta unordered-containers + ansi-wl-pprint base containers data-fix deepseq deriving-compat + parsers semigroups text transformers trifecta unordered-containers ]; executableHaskellDepends = [ - ansi-wl-pprint base containers data-fix + ansi-wl-pprint base containers data-fix deepseq ]; testHaskellDepends = [ base containers data-fix tasty tasty-hunit tasty-th text @@ -88563,19 +85203,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hoauth2_0_5_5_0" = callPackage + "hoauth2_0_5_6_0" = callPackage ({ mkDerivation, aeson, base, bytestring, http-conduit, http-types , text, unordered-containers }: mkDerivation { pname = "hoauth2"; - version = "0.5.5.0"; - sha256 = "77efb0b5c6436de7c63e4e40f402d7328f7a4aff60102a44ed3bf60fe3527e1d"; + version = "0.5.6.0"; + sha256 = "e678e9d0029b354f255b9796dddac5de0c9894261e54591b0435685a787e2dad"; libraryHaskellDepends = [ aeson base bytestring http-conduit http-types text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/freizl/hoauth2"; description = "Haskell OAuth2 authentication client"; license = stdenv.lib.licenses.bsd3; @@ -88604,7 +85243,6 @@ self: { testHaskellDepends = [ base containers gtk3 gtksourceview3 hspec mtl text ]; - jailbreak = true; homepage = "http://svalaskevicius.github.io/hob/"; description = "A source code editor aiming for the convenience of use"; license = stdenv.lib.licenses.gpl3; @@ -88624,7 +85262,6 @@ self: { executableHaskellDepends = [ base filemanip filepath fsnotify system-filepath text ]; - jailbreak = true; homepage = "http://github.com/jhickner/hobbes"; description = "A small file watcher for OSX"; license = stdenv.lib.licenses.bsd3; @@ -88665,8 +85302,27 @@ self: { libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; testSystemDepends = [ ocilib ]; - doHaddock = false; - doCheck = false; + homepage = "https://github.com/fpinsight/hocilib"; + description = "FFI binding to OCILIB"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {ocilib = null;}; + + "hocilib_0_2_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, containers, inline-c + , ocilib, tasty, tasty-hunit, template-haskell + }: + mkDerivation { + pname = "hocilib"; + version = "0.2.0"; + sha256 = "7c29cc84e7ac320cd1ddfb9d387d19c7c03fea3eedfb41713115d0e94aeafb78"; + libraryHaskellDepends = [ + base bytestring containers inline-c template-haskell + ]; + librarySystemDepends = [ ocilib ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + testSystemDepends = [ ocilib ]; homepage = "https://github.com/fpinsight/hocilib"; description = "FFI binding to OCILIB"; license = stdenv.lib.licenses.bsd3; @@ -88699,7 +85355,6 @@ self: { version = "1.0"; sha256 = "6defa97fe708cda43b87eff95fe86473f6413e97e70c75383fd694dd726b9af6"; libraryHaskellDepends = [ base mtl star-to-star template-haskell ]; - jailbreak = true; description = "defining @mtl@-ready monads as * -> * fixed-points"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -88718,7 +85373,6 @@ self: { executableHaskellDepends = [ base cmdargs filepath irc network old-locale time unix ]; - jailbreak = true; description = "Simple IRC logger bot"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88787,7 +85441,6 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ OIS ]; executableHaskellDepends = [ base X11 ]; - jailbreak = true; description = "OIS bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -88813,9 +85466,9 @@ self: { version = "0.1.0.0"; sha256 = "99e415c95ae946bce74ada24304271b9c87b9ec341266adad40535fda3a158c8"; libraryHaskellDepends = [ base random safe ]; - jailbreak = true; description = "An engine for Texas hold'em Poker"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hole" = callPackage @@ -88911,7 +85564,6 @@ self: { libraryHaskellDepends = [ array base DirectSound haskell98 hommage ]; - jailbreak = true; homepage = "substitut-fuer-feinmotorik/projects/haskellommage"; description = "DirectSound extension (Windows) for the Hommage sound library"; license = "GPL"; @@ -88970,7 +85622,6 @@ self: { ]; executableToolDepends = [ happy ]; testHaskellDepends = [ base haskell-src-exts uniplate ]; - jailbreak = true; homepage = "https://github.com/mgajda/homplexity"; description = "Haskell code quality tool"; license = stdenv.lib.licenses.bsd3; @@ -89020,7 +85671,6 @@ self: { aeson base bytestring Cabal directory filepath hoogle monad-loops mtl process yaml ]; - jailbreak = true; homepage = "http://github.com/gilligan/hoobuddy"; description = "Simple tool for fetching and merging hoogle data"; license = stdenv.lib.licenses.mit; @@ -89078,7 +85728,6 @@ self: { executableHaskellDepends = [ array astar base containers hfov monad-loops mtl ncurses random ]; - jailbreak = true; description = "A small, toy roguelike"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -89292,7 +85941,7 @@ self: { transformers uniplate unix vector vector-algorithms wai warp ]; testHaskellDepends = [ base directory filepath process temporary ]; - doCheck = false; + testTarget = "--test-option=--no-net"; homepage = "http://www.haskell.org/hoogle/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; @@ -89303,32 +85952,35 @@ self: { ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot - , js-jquery, mmap, network, network-uri, old-locale, process - , QuickCheck, resourcet, tar, template-haskell, text, time - , transformers, uniplate, utf8-string, vector, wai, wai-logger - , warp, warp-tls, zlib + , js-jquery, mmap, network, network-uri, network-uri-flag + , old-locale, process, QuickCheck, resourcet, tar, template-haskell + , text, time, transformers, uniplate, utf8-string, vector, wai + , wai-logger, warp, warp-tls, zlib }: mkDerivation { pname = "hoogle"; version = "5.0.1"; sha256 = "7aea6d779e14574f78f4506949f96a020ac1f8273b84f418094197366cc3112e"; + revision = "1"; + editedCabalFile = "f4c60280f4b1981d841303c3ee7902cc5c35779eef469f521aa6e590450f5b21"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base binary bytestring cmdargs conduit conduit-extra connection containers deepseq directory extra filepath haskell-src-exts http-conduit http-types js-flot js-jquery mmap - network network-uri old-locale process QuickCheck resourcet tar - template-haskell text time transformers uniplate utf8-string vector - wai wai-logger warp warp-tls zlib + network network-uri network-uri-flag old-locale process QuickCheck + resourcet tar template-haskell text time transformers uniplate + utf8-string vector wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; + testTarget = "--test-option=--no-net"; homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; }) {}; - "hoogle_5_0_3" = callPackage + "hoogle_5_0_4" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, cmdargs, conduit , conduit-extra, connection, containers, deepseq, directory, extra , filepath, haskell-src-exts, http-conduit, http-types, js-flot @@ -89339,8 +85991,8 @@ self: { }: mkDerivation { pname = "hoogle"; - version = "5.0.3"; - sha256 = "76bda66fd5be7d0ad79da1c512a4e60caf3be15d988a40e8274f16cd7df3815b"; + version = "5.0.4"; + sha256 = "7ae3b649d435afa178241ade97f3eef3d8519ddd86f4a97d23b7aa5a88c9a665"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -89352,7 +86004,7 @@ self: { wai wai-logger warp warp-tls zlib ]; executableHaskellDepends = [ base ]; - jailbreak = true; + testTarget = "--test-option=--no-net"; homepage = "http://hoogle.haskell.org/"; description = "Haskell API Search"; license = stdenv.lib.licenses.bsd3; @@ -89374,7 +86026,6 @@ self: { base bytestring Cabal containers directory errors filepath hoogle optparse-applicative process temporary transformers ]; - jailbreak = true; homepage = "http://github.com/bgamari/hoogle-index"; description = "Easily generate Hoogle indices for installed packages"; license = stdenv.lib.licenses.bsd3; @@ -89388,12 +86039,30 @@ self: { version = "0.1.1.0"; sha256 = "ab685c202841e2d35d225b151786133309af38694818ac7aefc84e44ebc58d3f"; libraryHaskellDepends = [ base directory process text ]; - jailbreak = true; homepage = "https://github.com/ibotty/hooks-dir"; description = "run executables in a directory as hooks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hookup" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, HsOpenSSL-x509-system + , network, openssl, socks, template-haskell + }: + mkDerivation { + pname = "hookup"; + version = "0.1.0.0"; + sha256 = "0b321b470cb66f8b0d1611cbe26ec6d0c8904f984456bd2fbe292fb2efd8a580"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL HsOpenSSL-x509-system network socks + template-haskell + ]; + librarySystemDepends = [ openssl ]; + homepage = "https://github.com/glguy/irc-core"; + description = "Abstraction over creating network connections with SOCKS5 and TLS"; + license = stdenv.lib.licenses.isc; + }) {inherit (pkgs) openssl;}; + "hoopl_3_10_2_1" = callPackage ({ mkDerivation, base, containers, filepath, mtl, parsec , test-framework, test-framework-hunit @@ -89432,7 +86101,6 @@ self: { network-multicast old-locale old-time process regex-compat snap-core snap-server text time transformers unix xml ]; - jailbreak = true; homepage = "https://bitbucket.org/pvdbrand/hoovie"; description = "Haskell Media Server"; license = stdenv.lib.licenses.bsd3; @@ -89451,7 +86119,6 @@ self: { libraryPkgconfigDepends = [ opencc ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base QuickCheck ]; - jailbreak = true; homepage = "https://github.com/MnO2/hopencc"; description = "Haskell binding to libopencc"; license = stdenv.lib.licenses.bsd3; @@ -89479,37 +86146,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {OpenCL = null;}; - "hopenpgp-tools_0_18" = callPackage - ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec - , base, base16-bytestring, binary, binary-conduit, bytestring - , conduit, conduit-extra, containers, crypto-pubkey, cryptohash - , directory, errors, fgl, graphviz, happy, hOpenPGP, ixset-typed - , lens, monad-loops, openpgp-asciiarmor, optparse-applicative - , resourcet, text, time, time-locale-compat, transformers - , unordered-containers, wl-pprint-extras, wl-pprint-terminfo, yaml - }: - mkDerivation { - pname = "hopenpgp-tools"; - version = "0.18"; - sha256 = "e13fa9cbf0f725f026e781c8d4d83b05a5b4bd126d276085152adc0a88c93f76"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson ansi-wl-pprint array attoparsec base base16-bytestring binary - binary-conduit bytestring conduit conduit-extra containers - crypto-pubkey cryptohash directory errors fgl graphviz hOpenPGP - ixset-typed lens monad-loops openpgp-asciiarmor - optparse-applicative resourcet text time time-locale-compat - transformers unordered-containers wl-pprint-extras - wl-pprint-terminfo yaml - ]; - executableToolDepends = [ alex happy ]; - homepage = "http://floss.scru.org/hopenpgp-tools"; - description = "hOpenPGP-based command-line tools"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hopenpgp-tools" = callPackage ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec , base, base16-bytestring, binary, binary-conduit, bytestring @@ -89522,8 +86158,8 @@ self: { }: mkDerivation { pname = "hopenpgp-tools"; - version = "0.19.2"; - sha256 = "6bcc067bfc2b54c0c47ea7169f3741ec8f64abee9bd8c398191a0b35520fa39c"; + version = "0.19.4"; + sha256 = "e656cd989833c6d318d5c44931ef5a8cd98bb0ebb4bab70a2d2f701091d0abd8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -89619,10 +86255,10 @@ self: { sha256 = "c3af486ae287728d01662cc13f552a80a9cc3274c9a20f58c5a37ecbd49ea5e7"; libraryHaskellDepends = [ base bytestring zlib ]; testHaskellDepends = [ base bytestring hspec QuickCheck zlib ]; - jailbreak = true; homepage = "https://github.com/ananthakumaran/hopfli"; description = "zlib compatible compression using Zopfli Compression Algorithm"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hoppy-docs" = callPackage @@ -89630,12 +86266,11 @@ self: { }: mkDerivation { pname = "hoppy-docs"; - version = "0.2.0"; - sha256 = "232b8bb781b6599228b3222ecb74478ad957ce97ce659e29b9d685e7e0343ab4"; + version = "0.2.1"; + sha256 = "213baa6a2a53f9b0efec11affcdf0ddb24e86a462a333f7a9d81df829f4d55a0"; libraryHaskellDepends = [ base haskell-src hoppy-generator hoppy-runtime ]; - jailbreak = true; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Documentation"; license = stdenv.lib.licenses.agpl3; @@ -89648,12 +86283,11 @@ self: { }: mkDerivation { pname = "hoppy-generator"; - version = "0.2.0"; - sha256 = "fa30639c66be9e3fb976602c13d6d89fc9945d7af7f21f1377d15a8e1549ac2b"; + version = "0.2.1"; + sha256 = "b03dacf5d0b85b859d01c8cb29045092ad64cb983ec162d37f87ecabc9d052ba"; libraryHaskellDepends = [ base containers directory filepath haskell-src mtl ]; - jailbreak = true; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Code generator"; license = stdenv.lib.licenses.agpl3; @@ -89664,10 +86298,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hoppy-runtime"; - version = "0.2.0"; - sha256 = "b0f451727c8fa175bce3b8d4d7af04d52b17a25a9bcab5f33d039daa6463b51d"; + version = "0.2.1"; + sha256 = "f4969d7cd352399d2f76739cf4ab75e23b1ff491437400ca2e3bc4bbe4505392"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Runtime support"; license = stdenv.lib.licenses.asl20; @@ -89678,12 +86311,11 @@ self: { ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }: mkDerivation { pname = "hoppy-std"; - version = "0.2.0"; - sha256 = "00f374c6a1539ff67b2e673c6e43d1ff7dd8b88e8534741b3991254886bea3ab"; + version = "0.2.1"; + sha256 = "13eee9e5d2f993d8486f2c9125c109d89ba5d6ec13b3165e7f733b04e8c677cc"; libraryHaskellDepends = [ base filepath haskell-src hoppy-generator ]; - jailbreak = true; homepage = "http://khumba.net/projects/hoppy"; description = "C++ FFI generator - Standard library bindings"; license = stdenv.lib.licenses.asl20; @@ -89745,10 +86377,10 @@ self: { version = "0.1.1"; sha256 = "a4793eac44e445ef4ecb8ef3de1c4308c91ba7368051737fcbec65da413ca2e3"; libraryHaskellDepends = [ AC-Angle base time ]; - jailbreak = true; homepage = "https://github.com/intractable/horizon"; description = "Sunrise and sunset UTC approximations from latitude and longitude coordinates"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hosc" = callPackage @@ -89805,7 +86437,6 @@ self: { base bytestring cgi haskeline hosc hosc-json hsc3 json text transformers utf8-string websockets www-minus ]; - jailbreak = true; homepage = "http://rd.slavepianos.org/?t=hosc-utils"; description = "Haskell Open Sound Control Utilities"; license = "GPL"; @@ -89847,7 +86478,6 @@ self: { executableHaskellDepends = [ attoparsec base bytestring data-default dns iproute network ]; - jailbreak = true; homepage = "https://github.com/yihuang/hosts-server"; description = "An dns server which is extremely easy to config"; license = stdenv.lib.licenses.gpl3; @@ -89880,7 +86510,6 @@ self: { version = "0.1.9.13"; sha256 = "1ba28b05a598b4e1212c78c63dd2e064444030aeb169fc8854d85dcff723c1b0"; libraryHaskellDepends = [ base plugins ]; - jailbreak = true; homepage = "https://github.com/mikeplus64/hotswap"; description = "Simple code hotswapping"; license = stdenv.lib.licenses.bsd3; @@ -90148,7 +86777,6 @@ self: { executableHaskellDepends = [ aeson base cmdargs filepath hpaco-lib strict utf8-string yaml ]; - jailbreak = true; homepage = "https://bitbucket.org/tdammers/hpaco"; description = "Modular template compiler"; license = stdenv.lib.licenses.bsd3; @@ -90168,7 +86796,6 @@ self: { aeson base bytestring containers data-variant file-embed filepath mtl parsec safe split strict transformers ]; - jailbreak = true; homepage = "https://bitbucket.org/tdammers/hpaco"; description = "Modular template compiler library"; license = stdenv.lib.licenses.bsd3; @@ -90191,7 +86818,6 @@ self: { filepath FindBin haskell-src-exts hint hint-server monad-loops mtl process time wx wxcore ]; - jailbreak = true; homepage = "http://haskell.hpage.com"; description = "A scrapbook for Haskell developers"; license = stdenv.lib.licenses.bsd3; @@ -90234,7 +86860,6 @@ self: { old-locale postgresql-simple process safe snap-app snap-core snap-server text time transformers utf8-string ]; - jailbreak = true; homepage = "http://hpaste.org/"; description = "Haskell paste web site"; license = "GPL"; @@ -90256,7 +86881,6 @@ self: { base bytestring directory filepath http-conduit http-types lifted-base network optparse-applicative process safe utf8-string ]; - jailbreak = true; homepage = "http://github.com/parcs/hpasteit"; description = "A command-line client for hpaste.org"; license = stdenv.lib.licenses.bsd3; @@ -90299,33 +86923,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hpc-coveralls_1_0_4" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs - , containers, curl, directory, directory-tree, hpc, HUnit, process - , pureMD5, regex-posix, retry, safe, split, transformers - }: - mkDerivation { - pname = "hpc-coveralls"; - version = "1.0.4"; - sha256 = "32f3f4104044a8ec16efe0a0846baf6eba48672eb9302e6dd9463e94b522fe00"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring Cabal cmdargs containers curl directory - directory-tree hpc process pureMD5 retry safe split transformers - ]; - executableHaskellDepends = [ - aeson async base bytestring Cabal cmdargs containers curl directory - directory-tree hpc process pureMD5 regex-posix retry safe split - transformers - ]; - testHaskellDepends = [ base HUnit ]; - homepage = "https://github.com/guillaume-nargeot/hpc-coveralls"; - description = "Coveralls.io support for Haskell."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process @@ -90394,10 +86991,10 @@ self: { attoparsec base binary bytestring containers directory file-embed parsec text utf8-string zlib ]; - jailbreak = true; homepage = "https://github.com/k16shikano/hpdft"; description = "A tool for looking through PDF file using Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpio" = callPackage @@ -90478,7 +87075,6 @@ self: { base ConfigFile directory filepath HaXml HDBC HDBC-sqlite3 hslogger MissingH mtl network old-time parsec process unix ]; - jailbreak = true; homepage = "http://software.complete.org/hpodder"; description = "Podcast Aggregator (downloader)"; license = "GPL"; @@ -90504,22 +87100,27 @@ self: { "hpqtypes" = callPackage ({ mkDerivation, aeson, base, bytestring, containers - , data-default-class, exceptions, lifted-base, monad-control, mtl - , postgresql, resource-pool, text, text-show, time, transformers - , transformers-base, vector + , data-default-class, exceptions, HUnit, lifted-base, monad-control + , mtl, postgresql, QuickCheck, random, resource-pool, scientific + , test-framework, test-framework-hunit, text, text-show, time + , transformers, transformers-base, unordered-containers, vector }: mkDerivation { pname = "hpqtypes"; - version = "1.5.1"; - sha256 = "82fb016dac6830ab8229f2b5e501ea36299c370cddbb7102b8c2837a25028f12"; - revision = "1"; - editedCabalFile = "aa5935930b36b798869a4071e1d390ee1f84f754652a16708e21abbdb3ce0989"; + version = "1.5.1.1"; + sha256 = "b99c214d7cc83573f5bf295837b42a13a4057dc9cab701b25798086f0d54795a"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class exceptions lifted-base monad-control mtl resource-pool text text-show time transformers transformers-base vector ]; librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ + aeson base bytestring exceptions HUnit lifted-base monad-control + mtl QuickCheck random scientific test-framework + test-framework-hunit text text-show time transformers-base + unordered-containers vector + ]; homepage = "https://github.com/scrive/hpqtypes"; description = "Haskell bindings to libpqtypes"; license = stdenv.lib.licenses.bsd3; @@ -90546,36 +87147,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hprotoc_2_2_0" = callPackage - ({ mkDerivation, alex, array, base, binary, bytestring, containers - , directory, filepath, haskell-src-exts, mtl, parsec - , protocol-buffers, protocol-buffers-descriptor, utf8-string - }: - mkDerivation { - pname = "hprotoc"; - version = "2.2.0"; - sha256 = "12461b7b11b90486f7b40cd21d3839f089695341e090eeac3a6fb85e715b50be"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ - array base binary bytestring containers directory filepath - haskell-src-exts mtl parsec protocol-buffers - protocol-buffers-descriptor utf8-string - ]; - executableToolDepends = [ alex ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hprotoc" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , directory, filepath, haskell-src-exts, mtl, parsec @@ -90628,7 +87199,6 @@ self: { protocol-buffers-fork utf8-string ]; executableToolDepends = [ alex ]; - jailbreak = true; homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/"; description = "Parse Google Protocol Buffer specifications"; license = stdenv.lib.licenses.bsd3; @@ -90657,7 +87227,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base cairo gtk hps ]; executableHaskellDepends = [ base cairo gtk hps random ]; - jailbreak = true; homepage = "http://slavepianos.org/rd/?t=hps-cairo"; description = "Cairo rendering for the haskell postscript library"; license = "GPL"; @@ -90671,10 +87240,10 @@ self: { version = "0.1.0.0"; sha256 = "cc21a972364cb294bffe0365014a79fd490369984412044c00d19d4976f63e70"; libraryHaskellDepends = [ base vector ]; - jailbreak = true; homepage = "http://stathacking.com/hps-kmeans"; description = "A nice implementation of the k-Means algorithm"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpuz" = callPackage @@ -90700,10 +87269,10 @@ self: { libraryHaskellDepends = [ aeson base bytestring process process-extras ]; - jailbreak = true; homepage = "https://github.com/davidlazar/hpygments"; description = "Highlight source code using Pygments"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hpylos" = callPackage @@ -90825,10 +87394,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "http://github.com/Raynes/Hricket"; description = "A Cricket scoring application"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hruby" = callPackage @@ -90837,8 +87406,8 @@ self: { }: mkDerivation { pname = "hruby"; - version = "0.3.4.1"; - sha256 = "97407042cf3dc2a7c9310c4040a5ab599e03709ad70cc5d2bcfcf866a6120be6"; + version = "0.3.4.2"; + sha256 = "4e7afc76770d5a9f887f574c8ce69d8c23a39b9df369d7ca263fd88c73b59a28"; libraryHaskellDepends = [ aeson attoparsec base bytestring scientific stm text unordered-containers vector @@ -90893,10 +87462,10 @@ self: { tasty-quickcheck ]; testSystemDepends = [ libb2 ]; - jailbreak = true; homepage = "https://github.com/tsuraan/hs-blake2"; description = "A cryptohash-inspired library for blake2"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libb2;}; "hs-captcha" = callPackage @@ -90958,6 +87527,37 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hs-di" = callPackage + ({ mkDerivation, base, compose-ltr, containers, deepseq + , foreign-store, ghcid, haskell-src-meta, hspec, hspec-core + , hspec-expectations, HUnit, interpolate, interpolatedstring-perl6 + , MissingH, neat-interpolation, QuickCheck, regex-tdfa + , template-haskell, text, time + }: + mkDerivation { + pname = "hs-di"; + version = "0.3.0"; + sha256 = "aaa77e275f54f912cb134de6bdf6981df797207df45dd318dbb30aade4668bde"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base compose-ltr containers haskell-src-meta template-haskell + ]; + executableHaskellDepends = [ + base compose-ltr containers haskell-src-meta template-haskell time + ]; + testHaskellDepends = [ + base compose-ltr deepseq foreign-store ghcid haskell-src-meta hspec + hspec-core hspec-expectations HUnit interpolate + interpolatedstring-perl6 MissingH neat-interpolation QuickCheck + regex-tdfa template-haskell text time + ]; + homepage = "https://github.com/Wizek/hs-di#readme"; + description = "Dependency Injection library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-dotnet" = callPackage ({ mkDerivation, base, ghc-prim, ole32, oleaut32 }: mkDerivation { @@ -90978,8 +87578,8 @@ self: { }: mkDerivation { pname = "hs-duktape"; - version = "0.1.2"; - sha256 = "a735c4fd945bda52c72c2c82fbef3239c02d1897fc9ccc917f2b82917644dd23"; + version = "0.1.3"; + sha256 = "7c7a1b80b066c1436509d19a1e688ce506a31e30481100878411f89b5be33719"; libraryHaskellDepends = [ aeson base bytestring text transformers unordered-containers vector ]; @@ -91004,9 +87604,9 @@ self: { libraryHaskellDepends = [ base bytestring containers mtl text time xml-conduit zip-archive ]; - jailbreak = true; description = "HS-Excelx provides basic read-only access to Excel 2007 and 2010 documents in XLSX format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-ffmpeg" = callPackage @@ -91016,7 +87616,6 @@ self: { version = "0.3.4"; sha256 = "a1607f5db460afca8c8d5af25eb50da15b29f7d6ad63f7ecd3daac3b5a6ea248"; libraryHaskellDepends = [ base bytestring haskell98 ]; - jailbreak = true; homepage = "http://patch-tag.com/r/VasylPasternak/hs-ffmpeg"; description = "Bindings to FFMPEG library"; license = stdenv.lib.licenses.bsd3; @@ -91080,9 +87679,9 @@ self: { libraryHaskellDepends = [ base containers directory filepath parsec process ]; - jailbreak = true; description = "Haskell wrapper around the GIZA++ toolkit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-inspector" = callPackage @@ -91153,7 +87752,6 @@ self: { diagrams-svg HUnit mtl parsec parsec-numbers QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://deepakjois.github.com/hs-logo"; description = "Logo interpreter written in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -91183,7 +87781,7 @@ self: { ]; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;}; + }) {mesos = null; inherit (pkgs) protobuf;}; "hs-nombre-generator" = callPackage ({ mkDerivation, base, HandsomeSoup, hxt, random }: @@ -91194,7 +87792,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HandsomeSoup hxt random ]; - jailbreak = true; description = "Name generator"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -91240,10 +87837,10 @@ self: { revision = "1"; editedCabalFile = "9337acf593d6f7e1d54f81886cb3736001a127e3b75ba01bd97a99d77565f784"; libraryHaskellDepends = [ base data-default-class text ]; - jailbreak = true; homepage = "https://github.com/trskop/hs-pkg-config"; description = "Create pkg-config configuration files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-pkpass" = callPackage @@ -91262,7 +87859,6 @@ self: { system-filepath text time transformers unordered-containers uuid zip-archive ]; - jailbreak = true; homepage = "https://github.com/tazjin/hs-pkpass"; description = "A library for Passbook pass creation & signing"; license = stdenv.lib.licenses.bsd3; @@ -91291,9 +87887,9 @@ self: { version = "0.1.0"; sha256 = "6bf143a1d791e34af15c80210073465446dbf1f453ff5d414833452f1dd4a767"; libraryHaskellDepends = [ array base regex-base regex-posix ]; - jailbreak = true; description = "Easy to use Regex"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-scrape" = callPackage @@ -91312,10 +87908,10 @@ self: { testHaskellDepends = [ base containers hspec tasty tasty-hunit xml-conduit ]; - jailbreak = true; homepage = "https://github.com/codygman/hs-scrape/"; description = "Simple and easy web scraping and automation in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hs-twitter" = callPackage @@ -91377,7 +87973,6 @@ self: { testHaskellDepends = [ base bytestring containers filepath tasty tasty-hunit temporary ]; - jailbreak = true; homepage = "https://github.com/bitc/hs-watchman"; description = "Client library for Facebook's Watchman tool"; license = stdenv.lib.licenses.mit; @@ -91400,7 +87995,6 @@ self: { base doctest Glob hlint hspec HUnit process QuickCheck random regex-compat ]; - jailbreak = true; homepage = "https://github.com/tfausak/hs2048"; description = "A 2048 clone in Haskell"; license = stdenv.lib.licenses.mit; @@ -91438,7 +88032,6 @@ self: { executableHaskellDepends = [ base directory haskell-src haskell-src-exts haskell98 split ]; - jailbreak = true; homepage = "http://www.github.com/finnsson/hs2graphviz"; description = "Generate graphviz-code from Haskell-code"; license = "unknown"; @@ -91470,7 +88063,6 @@ self: { libraryHaskellDepends = [ base bindings-sqlite3 bytestring mtl utf8-string ]; - jailbreak = true; description = "Sqlite3 bindings"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -91484,7 +88076,6 @@ self: { sha256 = "379faf489cf541d64ec6938d04e8449046bbf168c2c48d748980a53b99a7b57f"; libraryHaskellDepends = [ array base bytestring dlist mtl ]; librarySystemDepends = [ xenctrl ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/HsXenCtrl"; description = "FFI bindings to the Xen Control library"; license = stdenv.lib.licenses.bsd3; @@ -91521,9 +88112,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base Hclip HTTP process unix ]; - jailbreak = true; description = "(ab)Use Google Translate as a speech synthesiser"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsb2hs" = callPackage @@ -91580,9 +88171,9 @@ self: { base bytestring containers directory HUnit test-framework test-framework-hunit text time ]; - jailbreak = true; description = "Launch and gather data from Haskell and non-Haskell benchmarks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsbencher-codespeed" = callPackage @@ -91599,9 +88190,9 @@ self: { hsbencher HTTP http-conduit http-types json mtl network resourcet time ]; - jailbreak = true; description = "Backend for uploading benchmark data to CodeSpeed"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsbencher-fusion" = callPackage @@ -91623,7 +88214,6 @@ self: { base bytestring containers criterion csv handa-gdata hsbencher mtl split statistics text ]; - jailbreak = true; description = "Backend for uploading benchmark data to Google Fusion Tables"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -91685,7 +88275,6 @@ self: { version = "0.14"; sha256 = "3ad66f4f8d17dda98ab3cdf762aa3930aeaf82fba2db70d78bc74fada5abc2b8"; libraryHaskellDepends = [ base cairo gtk hosc hsc3 split ]; - jailbreak = true; homepage = "http://rd.slavepianos.org/?t=hsc3-cairo"; description = "haskell supercollider cairo drawing"; license = "GPL"; @@ -91773,7 +88362,6 @@ self: { random-shuffle sc3-rdu she split ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://rd.slavepianos.org/t/hsc3-graphs"; description = "Haskell SuperCollider Graphs"; license = "GPL"; @@ -91864,7 +88452,6 @@ self: { version = "0.14.1"; sha256 = "d4dd8e94f65c8caf3e437f6c49a345048c14138c6b070018a815c440f2260155"; libraryHaskellDepends = [ base hsc3 ]; - jailbreak = true; homepage = "http://rd.slavepianos.org/?t=hsc3-rec"; description = "Haskell SuperCollider Record Variants"; license = "GPL"; @@ -91949,7 +88536,6 @@ self: { version = "0.14"; sha256 = "d28f7fa55216e4d0199b9d8d008627d866fb95300ef88530fc1882d04fc7dc4f"; libraryHaskellDepends = [ base hsc3 ]; - jailbreak = true; homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe"; description = "Unsafe Haskell SuperCollider"; license = "GPL"; @@ -91999,7 +88585,6 @@ self: { base directory exceptions filepath hspec mtl QuickCheck regex-compat temporary text transformers unix ]; - jailbreak = true; homepage = "https://github.com/yamadapc/hscaffold#readme"; description = "Very simple file/directory structure scaffolding writer monad EDSL"; license = stdenv.lib.licenses.mit; @@ -92016,7 +88601,6 @@ self: { sha256 = "6c796c6f8a379559b8e089fc2193b8de2edd0a76dba270b06fa2417002e3962a"; libraryHaskellDepends = [ array base time unix ]; librarySystemDepends = [ camwire_1394 dc1394_control raw1394 ]; - jailbreak = true; description = "Haskell bindings to IIDC1394 cameras, via Camwire"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -92034,7 +88618,6 @@ self: { base bytestring cassandra-thrift containers mtl network old-time Thrift ]; - jailbreak = true; homepage = "https://github.com/necrobious/hscassandra"; description = "cassandra database interface"; license = stdenv.lib.licenses.bsd3; @@ -92051,10 +88634,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ aeson base bytestring ghc-prim HTTP ]; executableHaskellDepends = [ aeson base bytestring ghc-prim HTTP ]; - jailbreak = true; homepage = "https://bitbucket.org/sebasmagri/hscd"; description = "Command line client and library for SoundCloud.com"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsclock" = callPackage @@ -92190,10 +88773,8 @@ self: { }: mkDerivation { pname = "hsdev"; - version = "0.2.0.0"; - sha256 = "da36361df0f56f5e217da972cd4a9e2a0f3321be684c365f9d599fb635f7b02e"; - revision = "1"; - editedCabalFile = "80d4e37bb93542afb3b7bf1496862fde3f1aef17e2d569f9c290fb7c861040ae"; + version = "0.2.1.0"; + sha256 = "8d89f4cf2e67c2e55a94068538818e297efa07429a26b4009eff5d04724e7794"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -92216,11 +88797,10 @@ self: { aeson aeson-lens async base containers data-default deepseq directory filepath hformat hspec lens mtl text ]; - doHaddock = false; - doCheck = false; homepage = "https://github.com/mvoidex/hsdev"; description = "Haskell development library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdif" = callPackage @@ -92230,10 +88810,10 @@ self: { version = "0.14"; sha256 = "b54676cfaaf943ad1a1dcf605524e57568caf47e26768c0325cedf8abed1b5f3"; libraryHaskellDepends = [ base bytestring hosc ]; - jailbreak = true; homepage = "http://rd.slavepianos.org/?t=hsdif"; description = "Haskell SDIF"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsdip" = callPackage @@ -92295,6 +88875,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hse-cpp_0_2" = callPackage + ({ mkDerivation, base, cpphs, haskell-src-exts }: + mkDerivation { + pname = "hse-cpp"; + version = "0.2"; + sha256 = "eeb0168c00bf5dd2975faf3f5915035c73b40063b1f315ce3fd58f66a6ae4b4c"; + libraryHaskellDepends = [ base cpphs haskell-src-exts ]; + description = "Preprocess+parse haskell code"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsebaysdk" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, http-types , text, time, transformers, unordered-containers @@ -92333,10 +88925,10 @@ self: { version = "1.3.2"; sha256 = "9afc3dda1ad6b6a04f3851b40dc82b165bdd27400bbdfc4f2fd21fb5b4bda00d"; libraryHaskellDepends = [ base mtl old-time parsec ]; - jailbreak = true; homepage = "http://patch-tag.com/r/hsemail-ns/home"; description = "Internet Message Parsers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsenv" = callPackage @@ -92354,10 +88946,10 @@ self: { base bytestring Cabal directory file-embed filepath http-streams io-streams mtl process safe split unix ]; - jailbreak = true; homepage = "https://github.com/tmhedberg/hsenv"; description = "Virtual Haskell Environment builder"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hserv" = callPackage @@ -92393,8 +88985,8 @@ self: { }: mkDerivation { pname = "hsexif"; - version = "0.6.0.8"; - sha256 = "ad7644484993252ae6eec48e7d9b583ac0f311737068a35ea43781adc61c7590"; + version = "0.6.0.9"; + sha256 = "411c9ff2fc0a0c4bbb28691085887a0f7ebffd2d2c589df763b1104135adc404"; libraryHaskellDepends = [ base binary bytestring containers iconv text time ]; @@ -92430,10 +89022,10 @@ self: { executableHaskellDepends = [ base hdaemonize hslogger network process ]; - jailbreak = true; homepage = "https://github.com/Yuras/hsfcsh"; description = "Incremental builder for flash"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsfilt" = callPackage @@ -92445,9 +89037,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ghc ]; - jailbreak = true; description = "Z-decoder"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsgnutls" = callPackage @@ -92577,7 +89169,6 @@ self: { testHaskellDepends = [ base filepath haskell-src-exts tasty tasty-golden ]; - jailbreak = true; description = "A command line program for extending the import list of a Haskell source file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -92589,18 +89180,31 @@ self: { }: mkDerivation { pname = "hsini"; - version = "0.4.2"; - sha256 = "b98aa37900b03403bf8bcb40d300ef539a8dc50476a219e8f19c41ff057379fe"; + version = "0.5.0"; + sha256 = "d1c2075b6d35c2139db86ba6c514b8855f97f03acfde121cd6a9065ba5ebb499"; libraryHaskellDepends = [ base bytestring containers mtl parsec ]; testHaskellDepends = [ base bytestring containers HUnit mtl parsec QuickCheck tasty tasty-hunit tasty-quickcheck tasty-th ]; - jailbreak = true; description = "Package for user configuration files (INI)"; license = stdenv.lib.licenses.bsd3; }) {}; + "hsinstall" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "hsinstall"; + version = "1.4"; + sha256 = "d0be47492395a079e447bcebd54f63522b6f957c51bee9f78b5d4cddaa548869"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + description = "Install Haskell software"; + license = stdenv.lib.licenses.isc; + }) {}; + "hskeleton" = callPackage ({ mkDerivation, base, Cabal }: mkDerivation { @@ -92689,7 +89293,6 @@ self: { executableHaskellDepends = [ attoparsec base hslogger optparse-applicative text text-icu time ]; - jailbreak = true; homepage = "http://github.com/prophet-on-that/hslogger-reader"; description = "Parsing hslogger-produced logs"; license = stdenv.lib.licenses.bsd3; @@ -92743,10 +89346,10 @@ self: { testHaskellDepends = [ base conduit hspec QuickCheck split stm transformers ]; - jailbreak = true; homepage = "https://github.com/bartavelle/hslogstash"; description = "A library to work with, or as, a logstash server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hslua" = callPackage @@ -92926,10 +89529,10 @@ self: { hostname hslogger mtl network pipes pipes-attoparsec pipes-network stm stm-chans text ]; - jailbreak = true; homepage = "https://github.com/gamelost/hsnsq"; description = "Haskell NSQ client"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsntp" = callPackage @@ -92969,7 +89572,6 @@ self: { regex-posix test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/josercruz01/hsoptions"; description = "Haskell library that supports command-line flag processing"; license = stdenv.lib.licenses.asl20; @@ -93011,6 +89613,7 @@ self: { homepage = "http://www.jasani.org/search/label/hsparklines"; description = "Sparklines for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsparql" = callPackage @@ -93020,8 +89623,8 @@ self: { }: mkDerivation { pname = "hsparql"; - version = "0.2.8"; - sha256 = "fa843d3ed104a61c2750d333e851048e6677e0f0713c74117c2fb8def8eaa3fe"; + version = "0.2.9"; + sha256 = "283e50db41018e115147f533024d874cb878f42b466f59e1f97ce3735bfd13f0"; libraryHaskellDepends = [ base bytestring HTTP MissingH mtl network network-uri rdf4h text xml @@ -93062,6 +89665,8 @@ self: { pname = "hspec"; version = "2.2.3"; sha256 = "511e994ee86d85c610bf20a3eb8309e79816e984dc46f4d0f95bd7dc676f6210"; + revision = "1"; + editedCabalFile = "8e446bc3a3332ce9d5dc255a32682b735c8352b187e71f228f529e2fa79e6473"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations HUnit QuickCheck transformers @@ -93074,6 +89679,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec_2_3_1" = callPackage + ({ mkDerivation, base, call-stack, directory, hspec-core + , hspec-discover, hspec-expectations, hspec-meta, HUnit, QuickCheck + , stringbuilder, transformers + }: + mkDerivation { + pname = "hspec"; + version = "2.3.1"; + sha256 = "62b501f1150c40d65836bef9cafcd427390db9dc48c9a3aa7d4633ea6cc7b22c"; + libraryHaskellDepends = [ + base call-stack hspec-core hspec-discover hspec-expectations HUnit + QuickCheck transformers + ]; + testHaskellDepends = [ + base call-stack directory hspec-core hspec-discover + hspec-expectations hspec-meta HUnit QuickCheck stringbuilder + transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hspec , hspec-expectations, text @@ -93128,6 +89757,8 @@ self: { pname = "hspec-core"; version = "2.2.3"; sha256 = "01fa6959921ae0ed3de5e3f612451fe788800f9670c7f425a241f5f0dec99652"; + revision = "1"; + editedCabalFile = "9ff10012fa0457540d12846b875dd747a73a65aa8ba08876c473f42b7ac27c07"; libraryHaskellDepends = [ ansi-terminal async base deepseq hspec-expectations HUnit QuickCheck quickcheck-io random setenv tf-random time transformers @@ -93142,6 +89773,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-core_2_3_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq + , hspec-expectations, hspec-meta, HUnit, process, QuickCheck + , quickcheck-io, random, setenv, silently, tf-random, time + , transformers + }: + mkDerivation { + pname = "hspec-core"; + version = "2.3.1"; + sha256 = "3136a34ae0ff45aec4449b1aab90a9dbb61ae57d7adfa4ef567eb39728fd9008"; + libraryHaskellDepends = [ + ansi-terminal async base call-stack deepseq hspec-expectations + HUnit QuickCheck quickcheck-io random setenv tf-random time + transformers + ]; + testHaskellDepends = [ + ansi-terminal async base call-stack deepseq hspec-expectations + hspec-meta HUnit process QuickCheck quickcheck-io random setenv + silently tf-random time transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A Testing Framework for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-discover" = callPackage ({ mkDerivation, base, directory, filepath, hspec-meta }: mkDerivation { @@ -93158,6 +89815,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-discover_2_3_1" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta }: + mkDerivation { + pname = "hspec-discover"; + version = "2.3.1"; + sha256 = "3c8fa99104ca21a6aa247d4b9db9211b2cf800d48f61e6396c184aaff8d92d97"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath ]; + executableHaskellDepends = [ base directory filepath ]; + testHaskellDepends = [ base directory filepath hspec-meta ]; + homepage = "http://hspec.github.io/"; + description = "Automatically discover and run Hspec tests"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations" = callPackage ({ mkDerivation, base, HUnit }: mkDerivation { @@ -93170,6 +89844,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-expectations_0_8_0" = callPackage + ({ mkDerivation, base, call-stack, HUnit, nanospec }: + mkDerivation { + pname = "hspec-expectations"; + version = "0.8.0"; + sha256 = "e861250530897df93716a198b147f2cf90e02c34149bef3c41584ba0c90d4baa"; + libraryHaskellDepends = [ base call-stack HUnit ]; + testHaskellDepends = [ base call-stack HUnit nanospec ]; + homepage = "https://github.com/hspec/hspec-expectations#readme"; + description = "Catchy combinators for HUnit"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-expectations-lens" = callPackage ({ mkDerivation, base, hspec, hspec-expectations, HUnit, lens , silently @@ -93212,10 +89900,10 @@ self: { libraryHaskellDepends = [ base deepseq hspec-expectations wl-pprint-extras wl-pprint-terminfo ]; - jailbreak = true; homepage = "https://github.com/hspec/hspec-expectations#readme"; description = "hspec-expectations with pretty printing on failure"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-expectations-pretty-diff" = callPackage @@ -93230,10 +89918,10 @@ self: { ansi-terminal base Diff hscolour HUnit nicify-lib text ]; testHaskellDepends = [ aeson base hspec HUnit text ]; - doCheck = false; homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme"; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-experimental" = callPackage @@ -93244,7 +89932,6 @@ self: { sha256 = "f53c0653ab2ee17b249d691e2b8f5627f61f2788107782b0aa3d905c444feca4"; libraryHaskellDepends = [ base hspec HUnit QuickCheck ]; testHaskellDepends = [ base hspec-meta ]; - jailbreak = true; description = "An experimental DSL for testing on top of Hspec"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -93314,23 +90001,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-megaparsec_0_1_1" = callPackage - ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }: - mkDerivation { - pname = "hspec-megaparsec"; - version = "0.1.1"; - sha256 = "4ff4683bdff9a3b0ba8a6ee1adfce01f30f8515f9db487b062e5e00e5a2795c5"; - revision = "1"; - editedCabalFile = "b5268defe9e8230440bef693c63fb7a22e1ff53b39373a040fb511714056cfb8"; - libraryHaskellDepends = [ base hspec-expectations megaparsec ]; - testHaskellDepends = [ base hspec hspec-expectations megaparsec ]; - jailbreak = true; - homepage = "https://github.com/mrkkrp/hspec-megaparsec"; - description = "Utility functions for testing Megaparsec parsers with Hspec"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-megaparsec" = callPackage ({ mkDerivation, base, containers, hspec, hspec-expectations , megaparsec @@ -93339,6 +90009,8 @@ self: { pname = "hspec-megaparsec"; version = "0.2.1"; sha256 = "6474bc9a4d77cf68c4415bfa2d76da77ece418d6570429ca6c8b68eb7463de6b"; + revision = "1"; + editedCabalFile = "8d7144767ad65f8686ebcf3f6181e870a832dbc7613b53b13069ddf677ba86c9"; libraryHaskellDepends = [ base containers hspec-expectations megaparsec ]; @@ -93350,6 +90022,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hspec-megaparsec_0_3_0" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-expectations + , megaparsec + }: + mkDerivation { + pname = "hspec-megaparsec"; + version = "0.3.0"; + sha256 = "00baf799a21404108f2861ad42649a014c283dafcbc454875e1f50eb9af3d2ed"; + revision = "1"; + editedCabalFile = "2f5da90f1a6d9efbbcbec8e8570bcbf30749d620b911e6b1fe6f466653203768"; + libraryHaskellDepends = [ + base containers hspec-expectations megaparsec + ]; + testHaskellDepends = [ + base containers hspec hspec-expectations megaparsec + ]; + homepage = "https://github.com/mrkkrp/hspec-megaparsec"; + description = "Utility functions for testing Megaparsec parsers with Hspec"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-meta" = callPackage ({ mkDerivation, ansi-terminal, async, base, deepseq, directory , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io @@ -93371,6 +90065,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-meta_2_3_1" = callPackage + ({ mkDerivation, ansi-terminal, async, base, call-stack, deepseq + , directory, filepath, hspec-expectations, HUnit, QuickCheck + , quickcheck-io, random, setenv, time, transformers + }: + mkDerivation { + pname = "hspec-meta"; + version = "2.3.1"; + sha256 = "ec482dc49765d88de40064e02307f8d9dea3ba1caec38047869a7974f1487f95"; + revision = "1"; + editedCabalFile = "36a143859e8b1e1c8f07c5dc29b822a1676cd8e5d1b1ac85282bf8ddfc4394a4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal async base call-stack deepseq hspec-expectations + HUnit QuickCheck quickcheck-io random setenv time transformers + ]; + executableHaskellDepends = [ + ansi-terminal async base call-stack deepseq directory filepath + hspec-expectations HUnit QuickCheck quickcheck-io random setenv + time transformers + ]; + homepage = "http://hspec.github.io/"; + description = "A version of Hspec which is used to test Hspec itself"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-monad-control" = callPackage ({ mkDerivation, base, hspec-core, monad-control, transformers , transformers-base @@ -93382,9 +90104,9 @@ self: { libraryHaskellDepends = [ base hspec-core monad-control transformers transformers-base ]; - jailbreak = true; description = "Orphan instances of MonadBase and MonadBaseControl for SpecM"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hspec-server" = callPackage @@ -93446,7 +90168,6 @@ self: { filepath haskell-src-exts hspec language-dockerfile pretty process projectroot QuickCheck split strict ]; - jailbreak = true; homepage = "https://github.com/yamadapc/haskell-hspec-setup"; description = "Add an hspec test-suite in one command"; license = stdenv.lib.licenses.mit; @@ -93493,31 +90214,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-snap_0_4_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers - , digestive-functors, directory, HandsomeSoup, hspec, hspec-core - , hxt, lens, mtl, snap, snap-core, text, transformers - }: - mkDerivation { - pname = "hspec-snap"; - version = "0.4.0.1"; - sha256 = "42fead47290131c3072453aee3883b7c4a7a34d5dde989ca6e0b9df8b3e08d3a"; - libraryHaskellDepends = [ - aeson base bytestring containers digestive-functors HandsomeSoup - hspec hspec-core hxt lens mtl snap snap-core text transformers - ]; - testHaskellDepends = [ - aeson base bytestring containers digestive-functors directory - HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text - transformers - ]; - jailbreak = true; - homepage = "https://github.com/dbp/hspec-snap"; - description = "A library for testing with Hspec and the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hspec-snap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers , digestive-functors, directory, HandsomeSoup, hspec, hspec-core @@ -93634,6 +90330,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-wai_0_8_0" = callPackage + ({ mkDerivation, base, base-compat, bytestring, case-insensitive + , hspec, hspec-core, hspec-expectations, http-types, QuickCheck + , text, transformers, wai, wai-extra + }: + mkDerivation { + pname = "hspec-wai"; + version = "0.8.0"; + sha256 = "8b7ee2cf41bd29cc674da762a46b928557a4c42df564e2a9427b1526273a1141"; + libraryHaskellDepends = [ + base base-compat bytestring case-insensitive hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + testHaskellDepends = [ + base base-compat bytestring case-insensitive hspec hspec-core + hspec-expectations http-types QuickCheck text transformers wai + wai-extra + ]; + homepage = "https://github.com/hspec/hspec-wai#readme"; + description = "Experimental Hspec support for testing WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-wai-json" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring , case-insensitive, hspec, hspec-wai, template-haskell @@ -93652,21 +90373,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hspec-webdriver_1_1_0" = callPackage - ({ mkDerivation, base, data-default, hashable, hspec, hspec-core - , HUnit, lifted-base, stm, text, transformers, unordered-containers - , webdriver + "hspec-wai-json_0_8_0" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring + , case-insensitive, hspec, hspec-wai, template-haskell }: mkDerivation { - pname = "hspec-webdriver"; - version = "1.1.0"; - sha256 = "42c890d5f5c20f1e4eb7c21a5c33cab13adcc609e17f71495a136710186a6e69"; + pname = "hspec-wai-json"; + version = "0.8.0"; + sha256 = "4679308198b7b247094696da5524e50e1dbc92da49bdd44627c105ccdf6b86e8"; libraryHaskellDepends = [ - base data-default hashable hspec hspec-core HUnit lifted-base stm - text transformers unordered-containers webdriver + aeson aeson-qq base bytestring case-insensitive hspec-wai + template-haskell ]; - homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; - description = "Write end2end web application tests using webdriver and hspec"; + testHaskellDepends = [ base hspec hspec-wai ]; + homepage = "https://github.com/hspec/hspec-wai#readme"; + description = "Testing JSON APIs with hspec-wai"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -93753,7 +90474,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ array base bytestring vty ]; doHaddock = false; - jailbreak = true; description = "A terminal presentation tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -93782,6 +90502,7 @@ self: { ]; description = "The Haskell Stream Processor command line utility"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsql" = callPackage @@ -93875,7 +90596,6 @@ self: { sha256 = "fbab7cc84a7a8938438b35d3c59f75dedf5a66b46719f044a7c869e227f7dcec"; libraryHaskellDepends = [ base hsqml template-haskell text ]; libraryPkgconfigDepends = [ qt5 ]; - jailbreak = true; homepage = "https://github.com/marcinmrotek/hsqml-datamodel"; description = "HsQML (Qt5) data model"; license = stdenv.lib.licenses.bsd3; @@ -93893,7 +90613,6 @@ self: { libraryHaskellDepends = [ base exceptions hsqml-datamodel type-list vinyl ]; - jailbreak = true; homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl"; description = "HsQML DataModel instances for Vinyl Rec"; license = stdenv.lib.licenses.bsd3; @@ -93932,7 +90651,6 @@ self: { executableHaskellDepends = [ base containers hsqml sqlite-simple text transformers ]; - jailbreak = true; homepage = "http://www.gekkou.co.uk/software/hsqml/"; description = "Sticky notes example program implemented in HsQML"; license = stdenv.lib.licenses.bsd3; @@ -93966,7 +90684,6 @@ self: { executableHaskellDepends = [ base containers deepseq directory hsqml OddWord tagged ]; - jailbreak = true; homepage = "http://www.gekkou.co.uk/"; description = "HsQML-based implementation of Nine Men's Morris"; license = stdenv.lib.licenses.bsd3; @@ -93992,10 +90709,10 @@ self: { aeson base file-embed HUnit test-framework test-framework-hunit text ]; - jailbreak = true; homepage = "http://github.com/rasendubi/hsreadability"; description = "Access to the Readability API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsrelp" = callPackage @@ -94119,10 +90836,10 @@ self: { version = "0.3.0.1"; sha256 = "3045b303073165a1a90bb369cd530012b625e3b7e4e815c14af9b4beecfa19a8"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/haas/hstats"; description = "Statistical Computing in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hstatsd" = callPackage @@ -94150,7 +90867,6 @@ self: { executableHaskellDepends = [ base directory filepath ghc ghc-paths HUnit mtl QuickCheck random ]; - jailbreak = true; homepage = "http://bitbucket.org/dave4420/hstest/wiki/Home"; description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api"; license = stdenv.lib.licenses.bsd3; @@ -94195,12 +90911,35 @@ self: { base HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; description = "Distributed instant messaging over Tor"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hstox" = callPackage + ({ mkDerivation, async, base, base16-bytestring, binary + , binary-bits, bytestring, containers, data-msgpack, hspec + , integer-gmp, iproute, network, network-msgpack-rpc, process + , QuickCheck, saltine, tagged, text, transformers + }: + mkDerivation { + pname = "hstox"; + version = "0.0.1"; + sha256 = "6d62ca0a9f393f731f168457a1fd24ab6ea3a9fee721676323cc592c519a2e0a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base16-bytestring binary binary-bits bytestring containers + data-msgpack hspec integer-gmp iproute network network-msgpack-rpc + QuickCheck saltine tagged text transformers + ]; + executableHaskellDepends = [ base process ]; + testHaskellDepends = [ async base ]; + homepage = "http://hstox.github.io"; + description = "A Tox protocol implementation in Haskell"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "hstradeking" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, conduit, configurator, containers, hoauth @@ -94221,7 +90960,6 @@ self: { executableHaskellDepends = [ base bytestring conduit resourcet transformers ]; - jailbreak = true; description = "Tradeking API bindings for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -94240,7 +90978,6 @@ self: { executableHaskellDepends = [ base cmdargs directory filepath haskell-src-exts syb text vector ]; - jailbreak = true; description = "Checks Haskell source code for style compliance"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -94334,7 +91071,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base haskell-src-exts mtl utf8-string ]; - jailbreak = true; homepage = "http://patch-tag.com/r/nibro/hsx"; description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; license = stdenv.lib.licenses.bsd3; @@ -94387,6 +91123,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsx2hs_0_14_0" = callPackage + ({ mkDerivation, base, bytestring, haskell-src-exts + , haskell-src-meta, mtl, template-haskell, utf8-string + }: + mkDerivation { + pname = "hsx2hs"; + version = "0.14.0"; + sha256 = "987e6ce1eb612680dd3668a5f3347a6be9f6a78c54dbf5e3aabc0f8b4f991170"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring haskell-src-exts haskell-src-meta mtl + template-haskell utf8-string + ]; + homepage = "https://github.com/seereason/hsx2hs"; + description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsyscall" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -94400,21 +91156,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hsyslog_2_0" = callPackage - ({ mkDerivation, base, doctest }: - mkDerivation { - pname = "hsyslog"; - version = "2.0"; - sha256 = "f80e8cbab80388941588836e58dbb355898eb44f3f628867dc6b109b1f4a660b"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest ]; - homepage = "http://github.com/peti/hsyslog"; - description = "FFI interface to syslog(3) from POSIX.1-2001"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ peti ]; - }) {}; - "hsyslog" = callPackage ({ mkDerivation, base, bytestring, QuickCheck }: mkDerivation { @@ -94460,18 +91201,16 @@ self: { }) {com_err = null; zephyr = null;}; "htaglib" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, HUnit - , taglib, test-framework, test-framework-hunit, text + ({ mkDerivation, base, bytestring, directory, filepath, hspec + , taglib, text }: mkDerivation { pname = "htaglib"; - version = "1.0.3"; - sha256 = "b6e1a3d8e93c01fc626dea3a020b5ad4418eb8dede2210491eee43a85a99ea9b"; + version = "1.0.4"; + sha256 = "0b23c25f6ef721e193176fd2c4e491376235c5cb04dea0d75ebf721bd10b40a7"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ taglib ]; - testHaskellDepends = [ - base directory filepath HUnit test-framework test-framework-hunit - ]; + testHaskellDepends = [ base directory filepath hspec ]; homepage = "https://github.com/mrkkrp/htaglib"; description = "Bindings to TagLib, audio meta-data library"; license = stdenv.lib.licenses.bsd3; @@ -94505,9 +91244,21 @@ self: { executableHaskellDepends = [ base bytestring bzlib directory filepath old-locale tar time zlib ]; - jailbreak = true; description = "Command-line tar archive utility"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "htaut" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "htaut"; + version = "0.1.1.0"; + sha256 = "f4d07cc1fe6417b66dbc7faf44bb501398fe8fc2c2f904a1319b4c21187d6fa2"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/ailrun/htaut#readme"; + description = "Tautology Proving Logic in Haskell"; + license = stdenv.lib.licenses.bsd3; }) {}; "htestu" = callPackage @@ -94573,8 +91324,8 @@ self: { }: mkDerivation { pname = "html-conduit"; - version = "1.2.1"; - sha256 = "bb1c76947268fd5661918d02de73132b50f364d92f0d4e331ee0e0c87e0cff29"; + version = "1.2.1.1"; + sha256 = "98c27470cbf99b12ca9705216567fc8aafffb843cd9c37762e8607da153aa8a8"; libraryHaskellDepends = [ base bytestring conduit conduit-extra containers resourcet tagstream-conduit text transformers xml-conduit xml-types @@ -94665,7 +91416,6 @@ self: { version = "0.1.0.1"; sha256 = "fcd2f2e15cdb9e77c7d2fb8db77be393c66fc376e3e7f7d03759315a43c712cc"; libraryHaskellDepends = [ base lens mtl tagsoup transformers ]; - jailbreak = true; homepage = "http://github.com/kylcarte/html-rules/"; description = "Perform traversals of HTML structures using sets of rules"; license = stdenv.lib.licenses.bsd3; @@ -94688,7 +91438,6 @@ self: { testHaskellDepends = [ base base-prelude directory doctest filepath ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/html-tokenizer"; description = "An \"attoparsec\"-based HTML tokenizer"; license = stdenv.lib.licenses.mit; @@ -94903,22 +91652,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-api-data_0_3" = callPackage + "http-api-data_0_3_1" = callPackage ({ mkDerivation, base, bytestring, containers, directory, doctest - , filepath, hashable, hspec, HUnit, QuickCheck, text, time - , time-locale-compat, unordered-containers, uri-bytestring + , filepath, hashable, hspec, HUnit, QuickCheck + , quickcheck-instances, text, time, time-locale-compat + , unordered-containers, uri-bytestring, uuid, uuid-types }: mkDerivation { pname = "http-api-data"; - version = "0.3"; - sha256 = "380de358c67a8c894133e978e025171388e90333f2c5db10cd41f3224a35fd1f"; + version = "0.3.1"; + sha256 = "d5ab6897aae064ac8278fff3b4ce3289446990735f71798b4815cf0eb6ad94c7"; libraryHaskellDepends = [ base bytestring containers hashable text time time-locale-compat - unordered-containers uri-bytestring + unordered-containers uri-bytestring uuid-types ]; testHaskellDepends = [ base bytestring directory doctest filepath hspec HUnit QuickCheck - text time unordered-containers + quickcheck-instances text time unordered-containers uuid ]; homepage = "http://github.com/fizruk/http-api-data"; description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; @@ -94933,44 +91683,12 @@ self: { version = "0.1.1"; sha256 = "43e16753f5e4126aaec41aac67562e38151fc6de9c2b10eace35841e9d48888a"; libraryHaskellDepends = [ attoparsec base bytestring http-types ]; - jailbreak = true; homepage = "https://github.com/tlaitinen/http-attoparsec"; description = "Attoparsec parsers for http-types"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-client_0_4_31" = callPackage - ({ mkDerivation, array, async, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, exceptions, filepath - , ghc-prim, hspec, http-types, mime-types, monad-control, network - , network-uri, random, streaming-commons, text, time, transformers - , zlib - }: - mkDerivation { - pname = "http-client"; - version = "0.4.31"; - sha256 = "3f3693508bd4099159f183d6bb8432d6b7a654f1d7ddf9b167a3372a91463b74"; - libraryHaskellDepends = [ - array base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - exceptions filepath ghc-prim http-types mime-types network - network-uri random streaming-commons text time transformers - ]; - testHaskellDepends = [ - async base base64-bytestring blaze-builder bytestring - case-insensitive containers deepseq directory hspec http-types - monad-control network network-uri streaming-commons text time - transformers zlib - ]; - doCheck = false; - homepage = "https://github.com/snoyberg/http-client"; - description = "An HTTP client engine, intended as a base layer for more user-friendly packages"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-client" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie @@ -95001,7 +91719,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_5_3_1" = callPackage + "http-client_0_5_3_2" = callPackage ({ mkDerivation, array, async, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie , deepseq, directory, exceptions, filepath, ghc-prim, hspec @@ -95010,8 +91728,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.5.3.1"; - sha256 = "0d012a1278b2f2014f0198e38b658fb414e5dafd37388008198ac7a553f84d96"; + version = "0.5.3.2"; + sha256 = "cda16be6802d2b65b410090225e5143e4516527e4732b3664dd416297aef5292"; libraryHaskellDepends = [ array base base64-bytestring blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath @@ -95047,6 +91765,7 @@ self: { ]; description = "HTTP authorization (both basic and digest) done right"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-conduit" = callPackage @@ -95073,10 +91792,10 @@ self: { libraryHaskellDepends = [ base bytestring http-client http-types lens network ]; - jailbreak = true; homepage = "http://github.com/reinh/http-client-lens"; description = "Optics for http-client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-multipart" = callPackage @@ -95098,8 +91817,8 @@ self: { }: mkDerivation { pname = "http-client-openssl"; - version = "0.2.0.3"; - sha256 = "0f74d00124e67cfd9c67c042c6a5e0a0e74bff53839cd68e6f07bff3fab1b77d"; + version = "0.2.0.4"; + sha256 = "28dddd694ed91174c2544dd388d3550df5c79d5cc4be7e4b260a825ebde1afed"; libraryHaskellDepends = [ base HsOpenSSL http-client network ]; testHaskellDepends = [ base HsOpenSSL hspec http-client http-types @@ -95108,6 +91827,7 @@ self: { homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the OpenSSL library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-request-modifiers" = callPackage @@ -95122,7 +91842,6 @@ self: { base bytestring exceptions http-client http-media http-types network network-uri ]; - jailbreak = true; homepage = "https://github.com/spl/http-client-request-modifiers"; description = "Convenient monadic HTTP request modifiers"; license = stdenv.lib.licenses.bsd3; @@ -95157,9 +91876,9 @@ self: { base bytestring HsOpenSSL http-client http-client-openssl io-streams mtl transformers ]; - jailbreak = true; description = "http-client for io-streams supporting openssl"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-client-tls" = callPackage @@ -95170,6 +91889,8 @@ self: { pname = "http-client-tls"; version = "0.2.4.1"; sha256 = "8dc85884e15cd32f59a47e11861d78566c6ccb202e8d317403b784278f628ba3"; + revision = "1"; + editedCabalFile = "26f1b0cf1b449df4fce7c4531444ff06ccfacae528d20c5470461ecc4058f56c"; libraryHaskellDepends = [ base bytestring connection data-default-class http-client network tls @@ -95181,20 +91902,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client-tls_0_3_0" = callPackage - ({ mkDerivation, base, bytestring, connection, data-default-class - , hspec, http-client, http-types, network, tls + "http-client-tls_0_3_3" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, connection + , cryptonite, data-default-class, exceptions, hspec, http-client + , http-types, memory, network, tls, transformers }: mkDerivation { pname = "http-client-tls"; - version = "0.3.0"; - sha256 = "811b30a53156dc12e3eb34f8921778f081521ef388b7f4d7ce6c59d086cb3358"; + version = "0.3.3"; + sha256 = "ec1c676989aa7a53aa414d4bf2613573a8766dcf81db826365bdf20ce981a064"; libraryHaskellDepends = [ - base bytestring connection data-default-class http-client network - tls + base bytestring case-insensitive connection cryptonite + data-default-class exceptions http-client http-types memory network + tls transformers ]; testHaskellDepends = [ base hspec http-client http-types ]; - jailbreak = true; doCheck = false; homepage = "https://github.com/snoyberg/http-client"; description = "http-client backend using the connection package and tls library"; @@ -95250,7 +91972,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "http-conduit_2_2_0_1" = callPackage + "http-conduit_2_2_2_1" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, connection, cookie , data-default-class, exceptions, hspec, http-client @@ -95260,8 +91982,8 @@ self: { }: mkDerivation { pname = "http-conduit"; - version = "2.2.0.1"; - sha256 = "54e7d2a3346e45f3785dc14b98f534c931236db20a1ea20335893ada922558a7"; + version = "2.2.2.1"; + sha256 = "1ec7feb0ee0263559ccccc729e760990f4908cf1b1eeb2af221afeec34d23c57"; libraryHaskellDepends = [ aeson base bytestring conduit conduit-extra exceptions http-client http-client-tls http-types lifted-base monad-control mtl resourcet @@ -95274,7 +91996,6 @@ self: { streaming-commons temporary text time transformers utf8-string wai wai-conduit warp warp-tls ]; - jailbreak = true; doCheck = false; homepage = "http://www.yesodweb.com/book/http-conduit"; description = "HTTP client package with conduit interface and HTTPS support"; @@ -95304,7 +92025,6 @@ self: { http-conduit http-types HUnit lifted-base monad-control network resourcet text time transformers wai warp ]; - jailbreak = true; homepage = "https://github.com/exbb2/http-conduit-browser"; description = "Browser interface to the http-conduit package"; license = stdenv.lib.licenses.bsd3; @@ -95314,17 +92034,16 @@ self: { "http-conduit-downloader" = callPackage ({ mkDerivation, base, bytestring, conduit, connection , data-default, HsOpenSSL, http-client, http-conduit, http-types - , lifted-base, mtl, network, network-uri, old-locale, resourcet - , time, zlib + , lifted-base, mtl, network, network-uri, resourcet, time, zlib }: mkDerivation { pname = "http-conduit-downloader"; - version = "1.0.25"; - sha256 = "6ae6f5a6ac130225d2fae5f123ff89c547de3b549efe016c0464dd352b1b693c"; + version = "1.0.30"; + sha256 = "aaecfd7acae1a6d75fc0c9c115e897c3b5dbba52d210a991bd57334746e41cd4"; libraryHaskellDepends = [ base bytestring conduit connection data-default HsOpenSSL http-client http-conduit http-types lifted-base mtl network - network-uri old-locale resourcet time zlib + network-uri resourcet time zlib ]; homepage = "https://github.com/bazqux/http-conduit-downloader"; description = "HTTP downloader tailored for web-crawler needs"; @@ -95402,7 +92121,6 @@ self: { http-types monad-control network tls tls-extra transformers utf8-string zlib-enum ]; - jailbreak = true; homepage = "http://github.com/snoyberg/http-enumerator"; description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -95451,28 +92169,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-link-header_1_0_1" = callPackage - ({ mkDerivation, attoparsec, base, bytestring - , bytestring-conversion, errors, hspec, hspec-attoparsec - , network-uri, QuickCheck, text - }: - mkDerivation { - pname = "http-link-header"; - version = "1.0.1"; - sha256 = "908bb3356d3fe24615f5498c6dca1075f76f01e034838538a3c4b0ccc342e9b7"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion errors network-uri - text - ]; - testHaskellDepends = [ - base hspec hspec-attoparsec QuickCheck text - ]; - homepage = "https://github.com/myfreeweb/http-link-header"; - description = "A parser and writer for the HTTP Link header as specified in RFC 5988 \"Web Linking\""; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-link-header" = callPackage ({ mkDerivation, attoparsec, base, bytestring , bytestring-conversion, errors, hspec, hspec-attoparsec @@ -95549,6 +92245,80 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-pony" = callPackage + ({ mkDerivation, base, bytestring, network, pipes, pipes-network + , pipes-safe, transformers + }: + mkDerivation { + pname = "http-pony"; + version = "0.1.0.3"; + sha256 = "b65e845f84d98fd9fc774049f0c3aaa2e0183e875085d793cfa9b9705d1cd1fa"; + libraryHaskellDepends = [ + base bytestring network pipes pipes-network pipes-safe transformers + ]; + homepage = "https://github.com/nfjinjing/http-pony"; + description = "A type unsafe http library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "http-pony-serve-wai" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, bytestring + , case-insensitive, http-pony-transformer-http + , http-pony-transformer-startline, http-types, pipes + , pipes-bytestring, pipes-safe, transformers, wai + }: + mkDerivation { + pname = "http-pony-serve-wai"; + version = "0.1.0.4"; + sha256 = "c1e3a9a1ce94dd4e60e5bb9d673aa618c6d8edcbd1c340f7a9742eaf91eddc05"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring case-insensitive + http-pony-transformer-http http-pony-transformer-startline + http-types pipes pipes-bytestring pipes-safe transformers wai + ]; + homepage = "https://github.com/nfjinjing/http-pony-serve-wai"; + description = "Serve a WAI application with http-pony"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "http-pony-transformer-case-insensitive" = callPackage + ({ mkDerivation, base, case-insensitive, lens, profunctors }: + mkDerivation { + pname = "http-pony-transformer-case-insensitive"; + version = "0.1.0.1"; + sha256 = "6a2ebc104954c62b91444e1789f1672ee6bc1237ca3e1b0d86b43c3455881c1c"; + libraryHaskellDepends = [ base case-insensitive lens profunctors ]; + homepage = "https://github.com/nfjinjing/http-pony-transformer-case-insensitive"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "http-pony-transformer-http" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, pipes + , pipes-attoparsec, transformers + }: + mkDerivation { + pname = "http-pony-transformer-http"; + version = "0.1.0.0"; + sha256 = "645623db8c4bf92746358fbbc0cf4e7d19392565f4c019f9dc8d1df515efeba3"; + libraryHaskellDepends = [ + attoparsec base bytestring pipes pipes-attoparsec transformers + ]; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "http-pony-transformer-startline" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, http-types, lens }: + mkDerivation { + pname = "http-pony-transformer-startline"; + version = "0.1.0.0"; + sha256 = "a0aa55e3ce44b1256588c7c584622b3f6685dd2134f499532e2afd99ab034bb3"; + libraryHaskellDepends = [ + attoparsec base bytestring http-types lens + ]; + description = "transform HTTP startlines to tuples"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-proxy" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , bytestring-lexing, case-insensitive, conduit, conduit-extra @@ -95572,7 +92342,6 @@ self: { http-conduit http-types network QuickCheck random resourcet text vault wai wai-conduit warp warp-tls ]; - jailbreak = true; homepage = "https://github.com/erikd/http-proxy"; description = "A library for writing HTTP and HTTPS proxies"; license = stdenv.lib.licenses.bsd3; @@ -95616,34 +92385,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-reverse-proxy_0_4_3" = callPackage - ({ mkDerivation, async, base, blaze-builder, bytestring - , case-insensitive, conduit, conduit-extra, containers - , data-default-class, hspec, http-client, http-conduit, http-types - , lifted-base, monad-control, network, resourcet, streaming-commons - , text, transformers, wai, wai-logger, warp, word8 - }: - mkDerivation { - pname = "http-reverse-proxy"; - version = "0.4.3"; - sha256 = "4776b8bc59dfc889ce932223f07f236be89840c3c47cb91b7fd3fb47d1cddf45"; - libraryHaskellDepends = [ - async base blaze-builder bytestring case-insensitive conduit - conduit-extra containers data-default-class http-client http-types - lifted-base monad-control network resourcet streaming-commons text - transformers wai wai-logger word8 - ]; - testHaskellDepends = [ - base blaze-builder bytestring conduit conduit-extra hspec - http-conduit http-types lifted-base network resourcet - streaming-commons transformers wai warp - ]; - homepage = "https://github.com/fpco/http-reverse-proxy"; - description = "Reverse proxy HTTP requests, either over raw sockets or with WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-reverse-proxy" = callPackage ({ mkDerivation, async, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, containers @@ -95699,40 +92440,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http-streams_0_8_3_3" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations - , http-common, HUnit, io-streams, MonadCatchIO-transformers, mtl - , network, network-uri, openssl-streams, snap-core, snap-server - , system-fileio, system-filepath, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.3.3"; - sha256 = "3f4597936490ab1ca12af71578a7c6fe6c4aa9f3d0936de88c7f83475593e232"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory HsOpenSSL http-common io-streams mtl - network network-uri openssl-streams text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams - MonadCatchIO-transformers mtl network network-uri openssl-streams - snap-core snap-server system-fileio system-filepath text - transformers unordered-containers - ]; - jailbreak = true; - homepage = "http://research.operationaldynamics.com/projects/http-streams/"; - description = "An HTTP client using io-streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http-streams" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, blaze-builder, bytestring, case-insensitive @@ -95763,6 +92470,7 @@ self: { homepage = "http://research.operationaldynamics.com/projects/http-streams/"; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-test" = callPackage @@ -95833,37 +92541,12 @@ self: { version = "0.6.2.3"; sha256 = "dd9da1c130553752be306aaf03a413234f2bad3b953a5ec2ea6a46d4ef236fe9"; libraryHaskellDepends = [ base failure process transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/http-wget/tree/master"; description = "Provide a simple HTTP client interface by wrapping the wget command line tool. (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "http2_1_6_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring - , bytestring-builder, case-insensitive, containers, directory - , doctest, filepath, Glob, hex, hspec, psqueues, stm, text - , unordered-containers, vector, word8 - }: - mkDerivation { - pname = "http2"; - version = "1.6.1"; - sha256 = "0f69321514c5de49a0a796dcf40decc5781bcb4d53618f4e977be4eb05a88055"; - libraryHaskellDepends = [ - array base bytestring bytestring-builder case-insensitive - containers psqueues stm - ]; - testHaskellDepends = [ - aeson aeson-pretty array base bytestring bytestring-builder - case-insensitive containers directory doctest filepath Glob hex - hspec psqueues stm text unordered-containers vector word8 - ]; - description = "HTTP/2.0 library including frames and HPACK"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "http2" = callPackage ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring , bytestring-builder, case-insensitive, containers, directory @@ -95917,7 +92600,6 @@ self: { https-everywhere-rules-raw lens network pipes string-conversions taggy-lens text text-icu ]; - jailbreak = true; homepage = "https://github.com/fmap/https-everywhere-rules"; description = "High-level access to HTTPS Everywhere rulesets"; license = stdenv.lib.licenses.mit; @@ -95933,10 +92615,10 @@ self: { libraryHaskellDepends = [ base directory filepath functor-infix text ]; - jailbreak = true; homepage = "https://github.com/fmap/https-everywhere-rules-raw"; description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets."; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "httpspec" = callPackage @@ -95966,7 +92648,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ alsa-pcm base carray fft gloss ]; - jailbreak = true; description = "harmonic analyser and tuner for musical instruments"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -95981,10 +92662,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base OpenGL random SDL ]; - jailbreak = true; homepage = "http://tomahawkins.org"; description = "A two player abstract strategy game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hub" = callPackage @@ -96016,6 +92697,7 @@ self: { homepage = "http://ooxo.org/hubigraph/"; description = "A haskell wrap for Ubigraph"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hubris" = callPackage @@ -96038,7 +92720,6 @@ self: { mtl old-time process ]; executableSystemDepends = [ ruby ]; - jailbreak = true; description = "Support library for Hubris, the Ruby <=> Haskell bridge"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -96056,6 +92737,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "huff" = callPackage + ({ mkDerivation, alex, alex-tools, array, base, containers + , hashable, heaps, template-haskell, text, unordered-containers + }: + mkDerivation { + pname = "huff"; + version = "0.1.0.1"; + sha256 = "ff2e9051fb45d4694bf2e1a0a84452943856b043cf58cbcb1755ac424212ca3b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + alex-tools array base containers hashable heaps template-haskell + text unordered-containers + ]; + libraryToolDepends = [ alex ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/elliottt/huff"; + description = "A fast-foward-based planner"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "huffman" = callPackage ({ mkDerivation, base, containers, fingertree }: mkDerivation { @@ -96107,7 +92810,6 @@ self: { containers Crypto directory fastirc filepath ghc-prim monad-extras mtl network split strict text time unix utf8-string ]; - jailbreak = true; description = "IRC server written in Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -96145,7 +92847,6 @@ self: { network system-fileio system-filepath system-uuid text transformers unix unordered-containers wai warp ]; - jailbreak = true; description = "Haskell UPnP Media Server"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -96178,8 +92879,8 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "0.3.0.1"; - sha256 = "77fbda0fe00b5463fcc59fb3402169679294aab30fa8a57d57e667fefa64eb33"; + version = "0.3.0.2"; + sha256 = "eba6ff1b350a7b4a1e09abfc694d4c3ac47bbc36fea23439f512a763c531a7a3"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -96196,7 +92897,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base cairo gtk haskell98 HUnit ]; executableHaskellDepends = [ base cairo gtk haskell98 HUnit ]; - jailbreak = true; homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home"; description = "A GUI testrunner for HUnit"; license = stdenv.lib.licenses.publicDomain; @@ -96222,7 +92922,6 @@ self: { sha256 = "fa1512a6caa2f7fb70bf48a57835808517a2ac9082f2d6815b56398ba87145f6"; libraryHaskellDepends = [ base HUnit rematch ]; testHaskellDepends = [ base hspec HUnit rematch ]; - jailbreak = true; homepage = "github.com/tcrayford/rematch"; description = "HUnit support for rematch"; license = stdenv.lib.licenses.mit; @@ -96246,6 +92945,7 @@ self: { homepage = "http://github.com/skorpan/hunp/tree/master"; description = "Unpacker tool with DWIM"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunt-searchengine" = callPackage @@ -96273,7 +92973,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text time ]; - jailbreak = true; homepage = "http://github.com/hunt-framework/"; description = "A search and indexing engine"; license = stdenv.lib.licenses.mit; @@ -96299,7 +92998,6 @@ self: { http-types hunt-searchengine mtl scotty shakespeare-js text wai wai-extra wai-middleware-static warp ]; - jailbreak = true; homepage = "http://github.com/hunt-framework"; description = "A search and indexing engine server"; license = stdenv.lib.licenses.mit; @@ -96325,7 +93023,6 @@ self: { hunt-client hunt-searchengine mtl resourcet string-conversions text time transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/hunt-framework"; description = "A Command line Interface for the Hunt server"; license = stdenv.lib.licenses.mit; @@ -96343,7 +93040,6 @@ self: { executableHaskellDepends = [ array base bytestring containers kangaroo ]; - jailbreak = true; homepage = "http://code.google.com/p/copperbox/"; description = "Extract function names from Windows DLLs"; license = stdenv.lib.licenses.bsd3; @@ -96403,7 +93099,6 @@ self: { executableHaskellDepends = [ base containers mtl old-locale parsec readline time ]; - jailbreak = true; homepage = "http://github.com/markusle/husky/tree/master"; description = "A simple command line calculator"; license = "GPL"; @@ -96426,7 +93121,6 @@ self: { http-types network rainbow regex-compat text time transformers websockets wuss ]; - jailbreak = true; description = "A program for the button on Reddit"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -96441,10 +93135,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec parsec-numbers ]; - jailbreak = true; homepage = "https://github.com/steshaw/huttons-razor"; description = "Quick implemention of Hutton's Razor"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "huzzy" = callPackage @@ -96454,7 +93148,6 @@ self: { version = "0.1.5.5"; sha256 = "b751430f716caa7ff53ba78a484329224c1333e8f850d3cf84a77d6d011a1045"; libraryHaskellDepends = [ base easyplot ]; - jailbreak = true; description = "Fuzzy logic library with support for T1, IT2, GT2"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -96473,38 +93166,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hw-bits_0_0_0_6" = callPackage + "hw-bits" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap - , parsec, QuickCheck, resourcet, vector + , parsec, QuickCheck, resourcet, safe, vector }: mkDerivation { pname = "hw-bits"; - version = "0.0.0.6"; - sha256 = "8cfe76cdfe568fb392abe90e1f362c340d32729baa47c113d027657c85ef6c37"; + version = "0.1.0.1"; + sha256 = "7d20025de04db0e4639aded0ae6ad6b9252358a14626a1bfeb726dfbf084fd0e"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; + libraryHaskellDepends = [ + base bytestring hw-prim parsec safe vector + ]; executableHaskellDepends = [ base criterion mmap resourcet vector ]; - testHaskellDepends = [ base hspec QuickCheck vector ]; + testHaskellDepends = [ + base bytestring hspec hw-prim QuickCheck vector + ]; homepage = "http://github.com/haskell-works/hw-bits#readme"; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hw-bits" = callPackage + "hw-bits_0_2_0_2" = callPackage ({ mkDerivation, base, bytestring, criterion, hspec, hw-prim, mmap - , parsec, QuickCheck, resourcet, vector + , parsec, QuickCheck, resourcet, safe, vector }: mkDerivation { pname = "hw-bits"; - version = "0.1.0.0"; - sha256 = "cb691ceb9dace1f15f7f8299f0daea16971f06e65535395e19ca3385722c27d3"; + version = "0.2.0.2"; + sha256 = "32dd71a6265b6c7ab296dbf23eb865247f111a4e3bfba01ea18d8e5d7e169641"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring hw-prim parsec vector ]; + libraryHaskellDepends = [ + base bytestring hw-prim parsec safe vector + ]; executableHaskellDepends = [ base criterion mmap resourcet vector ]; @@ -96538,29 +93237,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "hw-diagnostics_0_0_0_2" = callPackage - ({ mkDerivation, base, hspec, QuickCheck }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.2"; - sha256 = "f90d28865ebd4fd0116270a47ed13f6b2a91255b8ec71c6d04a1cd5675237569"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-diagnostics" = callPackage ({ mkDerivation, base, hspec, QuickCheck }: mkDerivation { pname = "hw-diagnostics"; - version = "0.0.0.3"; - sha256 = "e69688c5cc40280cb0eaabb23ee36416fc794d88473e53fb8973359cc21fef43"; + version = "0.0.0.4"; + sha256 = "63c07c2c6b5e8d6bda8b50070594b0f31549ed7758384c122ae74016ca984c17"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base ]; @@ -96568,38 +93250,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; homepage = "http://github.com/haskell-works/hw-diagnostics#readme"; description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-json_0_0_0_2" = callPackage - ({ mkDerivation, array, attoparsec, base, bytestring, conduit - , containers, criterion, hspec, hw-bits, hw-conduit, hw-diagnostics - , hw-parser, hw-prim, hw-rankselect, mmap, mono-traversable, parsec - , QuickCheck, resourcet, text, transformers, vector, word8 - }: - mkDerivation { - pname = "hw-json"; - version = "0.0.0.2"; - sha256 = "b1205920d0b1ef4046a0d5ff4513d9d6b4ca952e080b7608b9de85b67d38b3fa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array attoparsec base bytestring conduit containers hw-bits - hw-conduit hw-parser hw-prim hw-rankselect mono-traversable - resourcet text vector word8 - ]; - executableHaskellDepends = [ - base bytestring conduit criterion hw-bits hw-conduit hw-diagnostics - hw-prim hw-rankselect mmap resourcet vector - ]; - testHaskellDepends = [ - attoparsec base bytestring conduit hspec hw-bits hw-conduit hw-prim - hw-rankselect mmap parsec QuickCheck resourcet transformers vector - ]; - homepage = "http://github.com/haskell-works/hw-json#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; + license = stdenv.lib.licenses.mit; }) {}; "hw-json" = callPackage @@ -96639,8 +93290,8 @@ self: { ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }: mkDerivation { pname = "hw-mquery"; - version = "0.1.0.0"; - sha256 = "7353d749e489c8cff4d5a9a923f3901453979642fcaa76e13617c67177149c83"; + version = "0.1.0.1"; + sha256 = "724aa5b0490b57a89fb71b7042a3770f7978a4c975aa3d1b671576b0e83e113d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ ansi-wl-pprint base dlist ]; @@ -96648,7 +93299,7 @@ self: { testHaskellDepends = [ base hspec QuickCheck ]; homepage = "http://github.com/haskell-works/hw-mquery#readme"; description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.mit; }) {}; "hw-parser" = callPackage @@ -96667,35 +93318,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-prim_0_0_0_10" = callPackage - ({ mkDerivation, base, bytestring, hspec, QuickCheck, random - , vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.0.0.10"; - sha256 = "641a1da0488664d12438f396f08577e02f9ca43b53a6f00e52085f63a5ab776e"; - revision = "1"; - editedCabalFile = "6d483e45f5a7b11173cfe33c92acfd22e54c715378d7bd56ccf509b9110ac6f4"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring random vector ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "http://github.com/haskell-works/hw-prim#readme"; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hw-prim" = callPackage ({ mkDerivation, base, bytestring, deepseq, hspec, QuickCheck , random, vector }: mkDerivation { pname = "hw-prim"; - version = "0.1.0.0"; - sha256 = "ff4212ac8f2f767c1eecfac2a65f02623a81e4daf38a71030419d6c01643018b"; + version = "0.1.0.3"; + sha256 = "f237844283733b85403e18d5243925946946395a2b7c2d731b7312f4a0293b84"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring deepseq random vector ]; @@ -96708,23 +93338,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-rankselect_0_0_0_2" = callPackage - ({ mkDerivation, base, hspec, hw-bits, hw-prim, QuickCheck, vector + "hw-prim_0_3_0_4" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck, random + , vector }: mkDerivation { - pname = "hw-rankselect"; - version = "0.0.0.2"; - sha256 = "ad79b1fca42093c3db8c7196ab144a2a618c22e4368cc5ccf0d548a15fdc186a"; + pname = "hw-prim"; + version = "0.3.0.4"; + sha256 = "7ca79714de0458c5506fc5b73a5c7a6702beed53a8cb484cd0287ae49d7ffb40"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base hw-bits hw-prim vector ]; + libraryHaskellDepends = [ base bytestring vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hspec hw-bits hw-prim QuickCheck vector + base bytestring hspec QuickCheck random vector ]; - homepage = "http://github.com/haskell-works/hw-rankselect#readme"; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.bsd3; + homepage = "http://github.com/haskell-works/hw-prim#readme"; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -96748,6 +93379,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "hw-string-parse" = callPackage + ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: + mkDerivation { + pname = "hw-string-parse"; + version = "0.0.0.2"; + sha256 = "2b915afcc3ef29a61b17e7a37c047059bf87eb0d22d0f970892292b959ed562e"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring hspec QuickCheck vector ]; + homepage = "http://github.com/haskell-works/hw-string-parse#readme"; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.mit; + }) {}; + "hw-succinct" = callPackage ({ mkDerivation, attoparsec, base, bytestring, conduit, containers , hw-bits, hw-conduit, hw-parser, hw-prim, hw-rankselect @@ -96781,9 +93425,9 @@ self: { base bytestring haskeline http-conduit http-types mtl regex-compat unix ]; - jailbreak = true; description = "Initial version of firewall Authentication for IITK network"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hweblib" = callPackage @@ -96820,10 +93464,10 @@ self: { aeson attoparsec base bytestring hedis hspec hspec-contrib HUnit text time uuid ]; - doCheck = false; homepage = "http://github.com/dbp/hworker"; description = "A reliable at-least-once job queue built on top of redis"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hworker-ses" = callPackage @@ -96841,6 +93485,7 @@ self: { homepage = "http://github.com/dbp/hworker-ses"; description = "Library for sending email with Amazon's SES and hworker"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hws" = callPackage @@ -96857,7 +93502,6 @@ self: { array base containers directory haskell98 html mtl network old-time regex-compat text unix ]; - jailbreak = true; description = "Simple Haskell Web Server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -96875,7 +93519,6 @@ self: { testHaskellDepends = [ base bytestring quickcheck-properties tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/srijs/hwsl2"; description = "Hashing with SL2"; license = stdenv.lib.licenses.mit; @@ -96935,7 +93578,6 @@ self: { base fclabels network network-protocol-xmpp text transformers xml-types ]; - jailbreak = true; description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -96962,7 +93604,6 @@ self: { xournal-render xournal-types ]; executableHaskellDepends = [ base cmdargs ]; - jailbreak = true; homepage = "http://ianwookim.org/hxournal"; description = "A pen notetaking program written in haskell"; license = stdenv.lib.licenses.bsd3; @@ -96999,7 +93640,6 @@ self: { libraryHaskellDepends = [ base binary bytestring bzlib deepseq haskell98 hxt ]; - jailbreak = true; homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "Serialisation and deserialisation of HXT XmlTrees"; license = "unknown"; @@ -97035,19 +93675,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hxt-css_0_1_0_2" = callPackage - ({ mkDerivation, base, hxt, parsec, split }: - mkDerivation { - pname = "hxt-css"; - version = "0.1.0.2"; - sha256 = "c3adfe73846b1274249835c142174dfc88167029be350761ec46cd97dc39c672"; - libraryHaskellDepends = [ base hxt parsec split ]; - homepage = "https://github.com/redneb/hxt-css"; - description = "CSS selectors for HXT"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hxt-css" = callPackage ({ mkDerivation, base, hxt, parsec, split }: mkDerivation { @@ -97108,7 +93735,6 @@ self: { base containers directory filepath haskell98 HTTP HUnit hxt network parsec process ]; - jailbreak = true; homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; description = "A collection of tools for processing XML with Haskell (Filter variant)"; license = "unknown"; @@ -97185,13 +93811,12 @@ self: { }: mkDerivation { pname = "hxt-tagsoup"; - version = "9.1.3"; - sha256 = "e7601d375af58c5a806002a61c1e077f60e70ab04e708fbbeb090e6e644ae4e6"; + version = "9.1.4"; + sha256 = "d77b290d63acf0ac8e5a07c5c69753f9984b97e0c9d2c0befadd7dd5b144b283"; libraryHaskellDepends = [ base hxt hxt-charproperties hxt-unicode tagsoup ]; - jailbreak = true; - homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html"; + homepage = "https://github.com/UweSchmidt/hxt"; description = "TagSoup parser for HXT"; license = "unknown"; }) {}; @@ -97246,7 +93871,6 @@ self: { version = "0.2.2"; sha256 = "619ae58bdb9bfed588dca6310671df4b41cc83ecd15b3d8bb7cded5d710d82c6"; libraryHaskellDepends = [ base bytestring encoding hxt mtl ]; - jailbreak = true; description = "Helper functions for HXT"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -97294,10 +93918,10 @@ self: { highlighting-kate mtl pandoc regex-pcre-builtin text unordered-containers ]; - jailbreak = true; homepage = "http://sourrust.github.io/hyakko/"; description = "Literate-style Documentation Generator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hybrid" = callPackage @@ -97338,7 +93962,6 @@ self: { libraryHaskellDepends = [ base hmatrix ]; librarySystemDepends = [ sixense_x64 ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/mruegenberg/hydra-hs"; description = "Haskell binding to the Sixense SDK for the Razer Hydra"; license = stdenv.lib.licenses.bsd3; @@ -97372,10 +93995,10 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th text time transformers unix ]; - jailbreak = true; homepage = "https://github.com/rrnewton/hydra-print"; description = "NCurses interface to view multiple ByteString streams in parallel"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hydrogen" = callPackage @@ -97390,10 +94013,10 @@ self: { base bytestring containers mtl pretty text ]; testHaskellDepends = [ base Cabal containers mtl QuickCheck ]; - jailbreak = true; homepage = "https://www.github.com/ktvoelker/hydrogen"; description = "An alternate Prelude"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hydrogen-cli" = callPackage @@ -97411,7 +94034,6 @@ self: { base hydrogen-cli-args hydrogen-data hydrogen-multimap hydrogen-parsing hydrogen-prelude hydrogen-syntax ]; - jailbreak = true; homepage = "https://scravy.de/hydrogen-cli/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.mit; @@ -97429,7 +94051,6 @@ self: { libraryHaskellDepends = [ base containers hydrogen-multimap hydrogen-prelude ]; - jailbreak = true; homepage = "https://scravy.de/hydrogen-cli-args/"; description = "Hydrogen Command Line Arguments Parser"; license = stdenv.lib.licenses.mit; @@ -97443,7 +94064,6 @@ self: { version = "0.14"; sha256 = "08410a47248787a5dee10ebea1415da2c7f0c2745f862b6af825c6acf4292435"; libraryHaskellDepends = [ base hydrogen-parsing hydrogen-prelude ]; - jailbreak = true; homepage = "https://scravy.de/hydrogen-data/"; description = "Hydrogen Data"; license = stdenv.lib.licenses.bsd3; @@ -97472,7 +94092,6 @@ self: { libraryHaskellDepends = [ base containers hydrogen-prelude parsec ]; - jailbreak = true; homepage = "https://scravy.de/hydrogen-parsing/"; description = "Hydrogen Parsing Utilities"; license = stdenv.lib.licenses.mit; @@ -97507,7 +94126,6 @@ self: { version = "0.17"; sha256 = "b08a86bfad3219398abe4065b7750c421bc6cfc532b3df97f1c6b03ec7ddbb41"; libraryHaskellDepends = [ base hydrogen-prelude parsec ]; - jailbreak = true; homepage = "http://scravy.de/hydrogen-prelude-parsec/"; description = "Hydrogen Prelude /w Parsec"; license = stdenv.lib.licenses.mit; @@ -97526,7 +94144,6 @@ self: { base containers hydrogen-parsing hydrogen-prelude nicify parsec uuid ]; - jailbreak = true; homepage = "https://scravy.de/hydrogen-syntax/"; description = "Hydrogen Syntax"; license = stdenv.lib.licenses.bsd3; @@ -97543,7 +94160,6 @@ self: { libraryHaskellDepends = [ base containers hydrogen-prelude parsec time ]; - jailbreak = true; homepage = "https://scravy.de/hydrogen-util/"; description = "Hydrogen Tools"; license = stdenv.lib.licenses.bsd3; @@ -97575,7 +94191,6 @@ self: { base bytestring containers directory extensible-exceptions filepath mtl network network-bytestring unix ]; - jailbreak = true; homepage = "http://github.com/tibbe/hyena"; description = "Simple web application server"; license = stdenv.lib.licenses.bsd3; @@ -97621,8 +94236,8 @@ self: { }: mkDerivation { pname = "hylolib"; - version = "1.5.1"; - sha256 = "890f96a9217842911d4a3ba5a9600810be72947e25f24b9e29ca8e3b7b306882"; + version = "1.5.2"; + sha256 = "6aa2533ab21c08b9d55036d67c6a10f6836f42dbeabe18673bfda28f764d7082"; libraryHaskellDepends = [ array base containers mtl pretty random uniplate ]; @@ -97639,10 +94254,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base hylolib mtl ]; - jailbreak = true; homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php"; description = "Tableau based theorem prover for hybrid logics"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyloutils" = callPackage @@ -97656,7 +94271,6 @@ self: { executableHaskellDepends = [ base containers hylolib mtl uniplate ]; - jailbreak = true; description = "Very small programs for hybrid logics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -97676,7 +94290,6 @@ self: { base bytestring bytestring-lexing extensible-exceptions mtl network pipes pretty ]; - jailbreak = true; description = "a fast, trustworthy HTTP(s) server built"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -97693,10 +94306,10 @@ self: { libraryHaskellDepends = [ adjunctions base distributive profunctors transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/hyperfunctions"; description = "Hyperfunctions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyperloglog" = callPackage @@ -97719,10 +94332,10 @@ self: { base directory doctest filepath generic-deriving semigroups simple-reflect ]; - jailbreak = true; homepage = "http://github.com/analytics/hyperloglog"; description = "An approximate streaming (constant space) unique object counter"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hyperloglogplus" = callPackage @@ -97754,7 +94367,6 @@ self: { libraryHaskellDepends = [ aeson attoparsec base bytestring http-enumerator http-types ]; - jailbreak = true; homepage = "https://github.com/mkscrg/hyperpublic-haskell"; description = "A thin wrapper for the Hyperpublic API"; license = stdenv.lib.licenses.publicDomain; @@ -97787,11 +94399,10 @@ self: { testHaskellDepends = [ base containers directory doctest filepath unordered-containers ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/ekmett/hyphenation"; description = "Configurable Knuth-Liang hyphenation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hypher" = callPackage @@ -97819,7 +94430,6 @@ self: { test-framework-quickcheck2 test-framework-th text transformers transformers-base unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/zoetic-community/hypher"; description = "A Haskell neo4j client"; license = stdenv.lib.licenses.mit; @@ -97883,10 +94493,10 @@ self: { http-client-tls http-types lens lens-aeson mtl raw-strings-qq scotty stm stm-conduit text transformers ]; - jailbreak = true; homepage = "https://github.com/yamadapc/hzulip"; description = "A haskell wrapper for the Zulip API"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "i18n" = callPackage @@ -97897,6 +94507,8 @@ self: { pname = "i18n"; version = "0.4.0.0"; sha256 = "7e0df375883fb3428b0cd20aac1163ea38de80fd3499ec3007979b36fe2f93fa"; + revision = "1"; + editedCabalFile = "af77b0f384e54fb72e7c4e757cff397ab4b6743c982c6f2349e2844aac8bb1eb"; libraryHaskellDepends = [ base containers directory filepath mtl parsec text transformers ]; @@ -97952,10 +94564,10 @@ self: { aeson base base64-bytestring bytestring conduit http-conduit monads-tf text transformers ]; - jailbreak = true; homepage = "http://github.com/tattsun/iap-verifier"; description = "A simple wrapper of In-App-Purchase receipt validate APIs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ib-api" = callPackage @@ -97970,10 +94582,10 @@ self: { executableHaskellDepends = [ attoparsec base bytestring network unix ]; - jailbreak = true; homepage = "https://github.com/rbermani/ib-api"; description = "An API for the Interactive Brokers Trading Workstation written in pure Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iban" = callPackage @@ -98077,8 +94689,6 @@ self: { regex-compat stm tagged tasty template-haskell temporary test-framework test-framework-hunit text unix utf8-string ]; - jailbreak = true; - doCheck = false; description = "An IDE backend library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -98104,7 +94714,6 @@ self: { pureMD5 tagged template-haskell temporary text transformers unix unix-compat ]; - jailbreak = true; description = "Shared library used be ide-backend and ide-backend-server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -98140,7 +94749,6 @@ self: { ide-backend-common mtl network process tar temporary text transformers unix unordered-containers zlib ]; - jailbreak = true; description = "An IDE backend server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -98176,7 +94784,6 @@ self: { executableHaskellDepends = [ base containers ideas parsec QuickCheck random ]; - jailbreak = true; homepage = "http://ideas.cs.uu.nl/www/"; description = "Interactive domain reasoner for logic and mathematics"; license = "GPL"; @@ -98191,10 +94798,10 @@ self: { sha256 = "402e120c269e1dccdbfef77f95672bf674a11462a4dfd497c514945a8b995ca2"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers hspec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/prophile/idempotent"; description = "Idempotent monoids"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "identicon" = callPackage @@ -98226,9 +94833,9 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "Numeric identifiers for values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "idiii" = callPackage @@ -98274,7 +94881,6 @@ self: { version = "0.0.1.0"; sha256 = "9f7e4a3605827fcb8cf28552ccb85fa8e8ea3b2dae04d66b31657a18f215a6dd"; libraryHaskellDepends = [ base punycode split ]; - jailbreak = true; description = "Converts Unicode hostnames into ASCII"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -98301,50 +94907,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "idris_0_11_2" = callPackage - ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal - , ansi-wl-pprint, 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, safe, split, 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.11.2"; - sha256 = "4120eec85e07dc9e96835fc5226f4d8044b2401c0c007987465d906db7773fad"; - configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson annotated-wl-pprint ansi-terminal ansi-wl-pprint 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 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 = [ - base directory filepath haskeline transformers - ]; - testHaskellDepends = [ - base containers directory filepath haskeline process time - transformers - ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.idris-lang.org/"; - description = "Functional Programming Language with Dependent Types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) gmp;}; - "idris" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal , ansi-wl-pprint, array, async, base, base64-bytestring, binary @@ -98359,8 +94921,8 @@ self: { }: mkDerivation { pname = "idris"; - version = "0.12.2"; - sha256 = "7df31d4eae5aabdd11b6940aeed89693f9c49f01826e7355bf80133da8947562"; + version = "0.12.3"; + sha256 = "3a9f3d5aeb032b1d987402cf4ca54a2fbfc7b02d852a629f528943a5fe5b59c6"; configureFlags = [ "-fcurses" "-fffi" "-fgmp" ]; isLibrary = true; isExecutable = true; @@ -98383,7 +94945,6 @@ self: { optparse-applicative process tagged tasty tasty-golden tasty-rerun time transformers ]; - doCheck = false; homepage = "http://www.idris-lang.org/"; description = "Functional Programming Language with Dependent Types"; license = stdenv.lib.licenses.bsd3; @@ -98456,7 +95017,6 @@ self: { sha256 = "cc01adb330a6bbe0574d1e437ac98d79c274b44225a89599e43c3aad66555d55"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://github.com/mikeizbicki/ifcxt"; description = "put if statements within type constraints"; license = stdenv.lib.licenses.bsd3; @@ -98470,10 +95030,10 @@ self: { version = "0.0.5"; sha256 = "26ec287bfa3039429d21af00f98b9a7723922dab71d721c54fc7cd9f464bc1e3"; libraryHaskellDepends = [ base binary bytestring ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/iff/"; description = "Constructing and dissecting IFF files"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ifscs" = callPackage @@ -98492,30 +95052,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ig_0_7" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , conduit, conduit-extra, crypto-api, cryptohash - , cryptohash-cryptoapi, data-default, http-conduit, http-types - , lifted-base, monad-control, resourcet, text, time, transformers - , transformers-base, unordered-containers - }: - mkDerivation { - pname = "ig"; - version = "0.7"; - sha256 = "31763aae55c9cfa47a8f3f8e04ba0b91adb4b6aa5f92e3401208205b873d5c55"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring conduit conduit-extra - crypto-api cryptohash cryptohash-cryptoapi data-default - http-conduit http-types lifted-base monad-control resourcet text - time transformers transformers-base unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/prowdsponsor/ig"; - description = "Bindings to Instagram's API"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ig" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, crypto-api, cryptohash @@ -98533,10 +95069,10 @@ self: { http-conduit http-types lifted-base monad-control resourcet text time transformers transformers-base unordered-containers ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/ig"; description = "Bindings to Instagram's API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ige-mac-integration" = callPackage @@ -98552,7 +95088,6 @@ self: { ]; libraryPkgconfigDepends = [ ige-mac-integration ]; libraryToolDepends = [ gtk2hs-buildtools ]; - jailbreak = true; homepage = "http://www.haskell.org/gtk2hs/"; description = "Bindings for the Gtk/OS X integration library"; license = stdenv.lib.licenses.lgpl21; @@ -98607,7 +95142,6 @@ self: { revision = "1"; editedCabalFile = "7d616cb461fb1406310675937e1e761f2d09757824dce8a92d235b7ef6ce1e4f"; libraryHaskellDepends = [ ad base polynomial ]; - jailbreak = true; homepage = "https://github.com/dmcclean/igrf"; description = "International Geomagnetic Reference Field"; license = stdenv.lib.licenses.bsd3; @@ -98648,8 +95182,6 @@ self: { strict system-argv0 text transformers unix unordered-containers utf8-string uuid vector ]; - jailbreak = true; - doCheck = false; homepage = "http://github.com/gibiansky/IHaskell"; description = "A Haskell backend kernel for the IPython project"; license = stdenv.lib.licenses.mit; @@ -98667,7 +95199,6 @@ self: { libraryHaskellDepends = [ aeson aeson-pretty base bytestring here ihaskell text ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Aeson"; license = stdenv.lib.licenses.mit; @@ -98681,7 +95212,6 @@ self: { version = "0.3.0.0"; sha256 = "1c1ee80276e7950370b8b3fe61fc6764e60fb41d1adab5028e74e865a0e964ed"; libraryHaskellDepends = [ base ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for basic types"; license = stdenv.lib.licenses.mit; @@ -98695,7 +95225,6 @@ self: { version = "0.3.0.0"; sha256 = "eba41d50a7d9af9fd9e1a9e0d1346ec77dd564866c673dcad905ea69c38f83c6"; libraryHaskellDepends = [ base blaze-html blaze-markup ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for blaze-html types"; license = stdenv.lib.licenses.mit; @@ -98714,7 +95243,6 @@ self: { base bytestring Chart Chart-cairo data-default-class directory ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for charts types"; license = stdenv.lib.licenses.mit; @@ -98733,7 +95261,6 @@ self: { active base bytestring diagrams diagrams-cairo diagrams-lib directory ihaskell text ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for diagram types"; license = stdenv.lib.licenses.mit; @@ -98747,7 +95274,6 @@ self: { version = "0.1.0.0"; sha256 = "800e5324e52abaa01e31f0123e4596e9df614684b01a5b91906d8c37d3866eb1"; libraryHaskellDepends = [ base classy-prelude ihaskell ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for basic types"; license = stdenv.lib.licenses.mit; @@ -98761,7 +95287,6 @@ self: { version = "0.2.1.0"; sha256 = "11999ba26d5d09a1f51f88907ca52dcbff9b7714e3f8b66d2bb150cd975a1525"; libraryHaskellDepends = [ base HaTeX ihaskell text ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for hatex"; license = stdenv.lib.licenses.mit; @@ -98797,7 +95322,6 @@ self: { libraryHaskellDepends = [ base bytestring directory ihaskell JuicyPixels ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell - IHaskellDisplay instances of the image types of the JuicyPixels package"; license = stdenv.lib.licenses.mit; @@ -98816,7 +95340,6 @@ self: { base base64-bytestring bytestring ihaskell ipython-kernel magic text utf8-string ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IHaskell display instances for bytestrings"; license = stdenv.lib.licenses.mit; @@ -98834,7 +95357,6 @@ self: { libraryHaskellDepends = [ aeson base here ihaskell parsec random text unordered-containers ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instances for Parsec"; license = stdenv.lib.licenses.mit; @@ -98848,7 +95370,6 @@ self: { version = "0.3.0.0"; sha256 = "0106697f8f81ea5fac13c1e8572aef3362cd00f6affbb8464c5b939d2c15179f"; libraryHaskellDepends = [ base bytestring ihaskell plot ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/ihaskell"; description = "IHaskell display instance for Plot (from plot package)"; license = stdenv.lib.licenses.mit; @@ -98886,7 +95407,6 @@ self: { aeson base containers ihaskell ipython-kernel scientific singletons text unix unordered-containers vector vinyl ]; - jailbreak = true; homepage = "http://www.github.com/gibiansky/IHaskell"; description = "IPython standard widgets for IHaskell"; license = stdenv.lib.licenses.mit; @@ -99057,7 +95577,6 @@ self: { rolling-queue stm stm-delay tasty tasty-hunit tasty-quickcheck text transformers word8 ]; - jailbreak = true; description = "An efficient IMAP client library, with SSL and streaming"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -99076,9 +95595,9 @@ self: { executableHaskellDepends = [ base bytestring directory HaskellNet HsOpenSSL network text ]; - jailbreak = true; description = "Downloads email from imap SSL servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "imbib" = callPackage @@ -99097,7 +95616,6 @@ self: { download-curl filepath glib gnomevfs gtk mtl parsec process split utf8-string ]; - jailbreak = true; description = "Minimalistic reference manager"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -99139,6 +95657,8 @@ self: { pname = "imm"; version = "1.0.1.0"; sha256 = "287a4815b43de90e89b27a356215e57d97c03ba4f929965b1a8ca5c4fe35658b"; + revision = "1"; + editedCabalFile = "b6f35aaba374bd580f6f40b4629047706562a9d677ff917a7b0dee1063817e25"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -99195,7 +95715,6 @@ self: { ascetic base compilation containers directory indents MissingH parsec richreports split staticanalysis text uxadt ]; - jailbreak = true; description = "Multi-platform parser analyzer and generator"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -99274,10 +95793,11 @@ self: { ({ mkDerivation, base, mtl, time, transformers }: mkDerivation { pname = "implicit-logging"; - version = "0.1.0.0"; - sha256 = "98032042eee95714c2f0e0c1a25a03f15e75223bacc85b9857b1d66d639805c0"; + version = "0.2.0.0"; + sha256 = "81b1c538b50963067410e7cbb6d60f42c0e90f068518d20505cc942e633ec3e3"; + revision = "1"; + editedCabalFile = "da2dc77f11f48a07772f4528408f90fad91d0c413d4bf855f14670df5765a60b"; libraryHaskellDepends = [ base mtl time transformers ]; - jailbreak = true; homepage = "https://github.com/revnull/implicit-logging"; description = "A logging framework built around implicit parameters"; license = stdenv.lib.licenses.lgpl3; @@ -99291,10 +95811,10 @@ self: { version = "0.2.1"; sha256 = "11d98bcb69c30abe29d229f2807e16381de2302a7473c53d2823b8cead0b40b5"; libraryHaskellDepends = [ base data-default-class ]; - jailbreak = true; homepage = "http://github.com/duairc/implicit-params"; description = "Named and unnamed implicit parameters with defaults"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "imports" = callPackage @@ -99305,10 +95825,10 @@ self: { sha256 = "8a423866bce4862f65926a67519f23c3262ea2f85f01104a5a2e03ee63f2dc61"; libraryHaskellDepends = [ base directory filepath mtl ]; testHaskellDepends = [ base directory filepath mtl ]; - jailbreak = true; homepage = "https://github.com/CindyLinz/Haskell-imports"; description = "Generate code for importing directories automatically"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "impossible" = callPackage @@ -99318,10 +95838,10 @@ self: { version = "1.0.0"; sha256 = "7f4f8d20bea5ee0c125218276d6e252d85c748808fc7f8ec5d6990aa84e277e2"; libraryHaskellDepends = [ base lens ]; - jailbreak = true; homepage = "https://github.com/wdanilo/impossible"; description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable."; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "improve" = callPackage @@ -99331,7 +95851,6 @@ self: { version = "0.4.0"; sha256 = "ea98772782c4faa11001ccf018d74203cb15fc86520d4ad6647118311f3d1c7d"; libraryHaskellDepends = [ base mtl yices ]; - jailbreak = true; homepage = "http://github.com/tomahawkins/improve/wiki/ImProve"; description = "An imperative, verifiable programming language for high assurance applications"; license = stdenv.lib.licenses.bsd3; @@ -99388,7 +95907,6 @@ self: { base containers directory filepath IndentParser mtl parsec presburger pretty ]; - jailbreak = true; homepage = "https://github.com/adamgundry/inch/"; description = "A type-checker for Haskell with integer constraints"; license = stdenv.lib.licenses.bsd3; @@ -99455,7 +95973,6 @@ self: { testHaskellDepends = [ base Cabal cabal-test-quickcheck containers QuickCheck ]; - jailbreak = true; description = "Package for doing incremental computations on maps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -99467,8 +95984,8 @@ self: { }: mkDerivation { pname = "incremental-parser"; - version = "0.2.4.1"; - sha256 = "1630a763db0808cfa4c1439365e21a53a378b38c2c02957539a9f75bb482b054"; + version = "0.2.5"; + sha256 = "7d0fd208e86d383ec00ceabc6c229d66ae35726862b003820df06e855ea87ac1"; libraryHaskellDepends = [ base monoid-subclasses ]; testHaskellDepends = [ base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck @@ -99505,7 +96022,6 @@ self: { base beamable bytestring containers ghc-prim QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "type classes for incremental updates to data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -99611,8 +96127,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "indexed"; - version = "0.1"; - sha256 = "2274650021b803c6e55828f18b27a08d7b7b95767c306804154dea5ba2bfa5b7"; + version = "0.1.3"; + sha256 = "ef84090ec6bf79e7dc6e9d570fc370c9eea6cd251d3c023979f6e1f8d3fbf5c2"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/reinerp/indexed"; description = "Haskell98 indexed functors, monads, comonads"; @@ -99641,10 +96157,10 @@ self: { version = "0.2"; sha256 = "b01fe384c942d57a62a6416f3a312e8436ce54a664421311b104f8f8a6982b9f"; libraryHaskellDepends = [ base bifunctors indexed mtl pointed ]; - jailbreak = true; homepage = "https://github.com/reinerp/indexed-extras"; description = "Indexed functors, monads and comonads that require extensions to Haskell98"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "indexed-free" = callPackage @@ -99718,7 +96234,6 @@ self: { sha256 = "19dca54b693752560022a8510d43fc651aebc6658ecbb66b0892f202d4afd221"; libraryHaskellDepends = [ array base deepseq vector ]; testHaskellDepends = [ array base deepseq QuickCheck text vector ]; - jailbreak = true; homepage = "https://github.com/RaminHAL9001/inf-interval"; description = "Non-contiguous interval data types with potentially infinite ranges"; license = stdenv.lib.licenses.gpl3; @@ -99738,7 +96253,6 @@ self: { executableHaskellDepends = [ ansi-wl-pprint base github optparse-applicative parsec process text ]; - jailbreak = true; homepage = "https://github.com/silky/infer-upstream"; description = "Find the repository from where a given repo was forked"; license = stdenv.lib.licenses.mit; @@ -99791,7 +96305,6 @@ self: { executableHaskellDepends = [ base binary Cabal filepath ghc irc plugins ]; - jailbreak = true; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -99887,10 +96400,10 @@ self: { pandoc persistent persistent-postgresql shakespeare text time time-locale-compat yesod yesod-auth yesod-core yesod-form ]; - jailbreak = true; homepage = "http://doomanddarkness.eu/pub/informative"; description = "A yesod subsite serving a wiki"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ini" = callPackage @@ -99968,34 +96481,9 @@ self: { version = "0.2.1.0"; sha256 = "b4b5722b50fb138d84b89bb183f447ba9579d4ed75fc663f207e70c17f1688c7"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/skypers/inject-function"; description = "Monadic functions with injected parameters"; license = stdenv.lib.licenses.gpl3; - }) {}; - - "inline-c_0_5_5_5" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring - , containers, cryptohash, directory, filepath, hashable, hspec, mtl - , parsec, parsers, QuickCheck, raw-strings-qq, regex-posix - , template-haskell, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "inline-c"; - version = "0.5.5.5"; - sha256 = "f3d142647eaa89b6fc4833fbb5722172ab950f6ef17f186659e947b1958c7230"; - libraryHaskellDepends = [ - ansi-wl-pprint base binary bytestring containers cryptohash - directory filepath hashable mtl parsec parsers QuickCheck - template-haskell transformers unordered-containers vector - ]; - testHaskellDepends = [ - ansi-wl-pprint base containers hashable hspec parsers QuickCheck - raw-strings-qq regex-posix template-haskell transformers - unordered-containers vector - ]; - description = "Write Haskell source files including C code inline. No FFI required."; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -100007,8 +96495,8 @@ self: { }: mkDerivation { pname = "inline-c"; - version = "0.5.5.7"; - sha256 = "b7a0561c37eed9441548baa8bf815bc3fb121504ff5ae4c8f2297ba80c7c54b9"; + version = "0.5.5.9"; + sha256 = "2e48cae75fe1e4fd9f7c0ab4e7a4cbb4dcb9d2e9075d40adc33ac9038297fe22"; libraryHaskellDepends = [ ansi-wl-pprint base binary bytestring containers cryptohash directory filepath hashable mtl parsec parsers QuickCheck @@ -100071,38 +96559,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {jvm = null;}; - "inline-r_0_8_0_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, c2hs, containers - , data-default-class, deepseq, directory, exceptions, filepath - , ieee754, mtl, pretty, primitive, process, quickcheck-assertions - , R, reflection, setenv, silently, singletons, strict, tasty - , tasty-expected-failure, tasty-golden, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, th-lift - , th-orphans, transformers, unix, vector - }: - mkDerivation { - pname = "inline-r"; - version = "0.8.0.1"; - sha256 = "4ce2363046cb3173e00e1f60fe666e539d88ab61a4a3d5eb06d550dba0f41e61"; - libraryHaskellDepends = [ - aeson base bytestring containers data-default-class deepseq - exceptions mtl pretty primitive process reflection setenv - singletons template-haskell text th-lift th-orphans transformers - unix vector - ]; - libraryPkgconfigDepends = [ R ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base bytestring directory filepath ieee754 mtl process - quickcheck-assertions silently singletons strict tasty - tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck - template-haskell temporary text unix vector - ]; - description = "Seamlessly call R from Haskell and vice versa. No FFI required."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) R;}; - "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, c2hs, containers , data-default-class, deepseq, directory, exceptions, filepath @@ -100144,7 +96600,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ aether base text ]; - jailbreak = true; description = "Console client for encyclopedias"; license = stdenv.lib.licenses.gpl3; broken = true; @@ -100159,8 +96614,8 @@ self: { pname = "insert-ordered-containers"; version = "0.1.0.1"; sha256 = "4905e5d128c19887a79b281150acb16cb3b043ab2c5a7788b0151ba7d46b900a"; - revision = "2"; - editedCabalFile = "45eb329a4ace69cd003e0eafa048cbdb3b34f17e0f835ff0f1e1bc6ac90b33dd"; + revision = "3"; + editedCabalFile = "c81fa69aa035ad468b45c812c16b80bc70020b05bf2d4a8298c90b4f772c98b1"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -100184,6 +96639,8 @@ self: { pname = "insert-ordered-containers"; version = "0.2.0.0"; sha256 = "0353fcf5c58e9ed3fe33ddc3f57bfb2faccaa4d61fbf832f7fc2bfbe2c30d02e"; + revision = "3"; + editedCabalFile = "66f19e15a4787bbad6c85303e5ae7ba0912d2db8b18b500e5e6e437156e53d2a"; libraryHaskellDepends = [ aeson base base-compat hashable lens semigroupoids semigroups text transformers unordered-containers @@ -100193,7 +96650,6 @@ self: { semigroups tasty tasty-quickcheck text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/phadej/insert-ordered-containers#readme"; description = "Associative containers retating insertion order for traversals"; license = stdenv.lib.licenses.bsd3; @@ -100207,10 +96663,10 @@ self: { version = "0.1.2"; sha256 = "e710388992f7cb45f4262a0f2c315242deddddfa07c2c8f6d7523cd19cf6e2d4"; libraryHaskellDepends = [ attoparsec base bytestring dlist ]; - jailbreak = true; homepage = "http://github.com/tel/inserts"; description = "Stupid simple bytestring templates"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inspection-proxy" = callPackage @@ -100230,6 +96686,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "inspector-wrecker" = callPackage + ({ mkDerivation, aeson, base, bytestring, case-insensitive + , connection, data-default, http-client, http-client-tls + , http-types, optparse-applicative, text, time, wrecker + }: + mkDerivation { + pname = "inspector-wrecker"; + version = "0.1.0.0"; + sha256 = "71bcfb62046ae519c66e8eefd71a77753512d06b2fa73e523bcdb3585fda42ed"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring case-insensitive connection data-default + http-client http-client-tls http-types optparse-applicative text + time wrecker + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/skedgeme/inspector-wrecker#readme"; + description = "Create benchmarks from the HAR files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "instance-control" = callPackage ({ mkDerivation, base, mtl, transformers }: mkDerivation { @@ -100254,7 +96734,6 @@ self: { testHaskellDepends = [ aeson base instant-generics tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/k0001/instant-aeson"; description = "Generic Aeson instances through instant-generics"; license = stdenv.lib.licenses.bsd3; @@ -100273,7 +96752,6 @@ self: { testHaskellDepends = [ base bytes instant-generics tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/k0001/instant-bytes"; description = "Generic Serial instances through instant-generics"; license = stdenv.lib.licenses.bsd3; @@ -100287,7 +96765,6 @@ self: { version = "0.2"; sha256 = "606ffaffb09ad1bb1d766499a589b16531e9a4c7978734a349975248a4e60e21"; libraryHaskellDepends = [ base deepseq instant-generics ]; - jailbreak = true; homepage = "https://github.com/k0001/instant-deepseq"; description = "Generic NFData instances through instant-generics"; license = stdenv.lib.licenses.bsd3; @@ -100314,7 +96791,6 @@ self: { version = "0.2"; sha256 = "8bf851b902126e91845e28cf6443d119ce675724c2e664562f8dd76664403a77"; libraryHaskellDepends = [ base hashable instant-generics ]; - jailbreak = true; homepage = "https://github.com/k0001/instant-hashable"; description = "Generic Hashable instances through instant-generics"; license = stdenv.lib.licenses.bsd3; @@ -100330,7 +96806,6 @@ self: { revision = "1"; editedCabalFile = "a0e15510d3e3eefaa18d20fbfce7a1840519e160e2a8a8b36c498a3664b9c037"; libraryHaskellDepends = [ base instant-generics mtl ]; - jailbreak = true; description = "Heterogenous Zipper in Instant Generics"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -100373,10 +96848,10 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/hvr/int-cast"; description = "Checked conversions between integral types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "integer-gmp_1_0_0_1" = callPackage @@ -100514,13 +96989,12 @@ self: { }: mkDerivation { pname = "interlude-l"; - version = "0.1.0.5"; - sha256 = "23243eb47b718de5e49c3b5db730b874607793a47cfe37efba1ea284b5cd5578"; + version = "0.1.0.7"; + sha256 = "0cef80ef63038b398438f8e3ab60760ef17fab380f5d8534d595237a07cb0bb7"; libraryHaskellDepends = [ aeson base exceptions lens monad-control MonadRandom mtl protolude string-conv text transformers witherable ]; - jailbreak = true; description = "Prelude replacement based on protolude"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -100554,7 +97028,6 @@ self: { executableHaskellDepends = [ base explicit-exception HPDF parsec process transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/internetmarke/"; description = "Shell command for constructing custom stamps for German Post"; license = "GPL"; @@ -100664,7 +97137,6 @@ self: { libraryHaskellDepends = [ base haskell-src-meta-mwotton template-haskell ]; - jailbreak = true; description = "DO NOT USE THIS. interpolatedstring-qq works now."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -100680,10 +97152,10 @@ self: { testHaskellDepends = [ array base containers QuickCheck utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/interpolation/"; description = "piecewise linear and cubic Hermite interpolation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "interruptible" = callPackage @@ -100766,6 +97238,47 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "introduction" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , exceptions, filepath, ghc-prim, lifted-base, monad-control, mtl + , path, path-io, safe, stm, string-conv, text, transformers + , transformers-base, validity, validity-containers + }: + mkDerivation { + pname = "introduction"; + version = "0.0.1.0"; + sha256 = "4a061e4d863526c583d95907b9be1e11e6fd1ccb757d360c4bd3c3fe0214cd3c"; + libraryHaskellDepends = [ + async base bytestring containers deepseq exceptions filepath + ghc-prim lifted-base monad-control mtl path path-io safe stm + string-conv text transformers transformers-base validity + validity-containers + ]; + homepage = "https://github.com/NorfairKing/introduction"; + description = "A prelude for safe new projects"; + license = stdenv.lib.licenses.mit; + }) {}; + + "introduction-test" = callPackage + ({ mkDerivation, base, bytestring, containers, filepath + , genvalidity, genvalidity-containers, genvalidity-hspec + , genvalidity-text, hspec, introduction, path, path-io, QuickCheck + , time + }: + mkDerivation { + pname = "introduction-test"; + version = "0.0.1.0"; + sha256 = "398191ff93488b86d4f58fb675403ccfe84c5eb50a06a16d8eec8033eb3f31bb"; + libraryHaskellDepends = [ + base bytestring containers filepath genvalidity + genvalidity-containers genvalidity-hspec genvalidity-text hspec + introduction path path-io QuickCheck time + ]; + homepage = "https://github.com/NorfairKing/introduction"; + description = "A prelude for the tests of safe new projects"; + license = stdenv.lib.licenses.mit; + }) {}; + "intset" = callPackage ({ mkDerivation, base, bits-extras, bytestring, deepseq }: mkDerivation { @@ -100779,28 +97292,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "invariant_0_3_1" = callPackage - ({ mkDerivation, array, base, bifunctors, containers, contravariant - , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar - , stm, tagged, template-haskell, transformers, transformers-compat - , unordered-containers - }: - mkDerivation { - pname = "invariant"; - version = "0.3.1"; - sha256 = "db88ce3955ba99cec99dd1da2d917ce26c204837a6779712dd55f79cc873fdff"; - libraryHaskellDepends = [ - array base bifunctors containers contravariant ghc-prim profunctors - semigroups StateVar stm tagged template-haskell transformers - transformers-compat unordered-containers - ]; - testHaskellDepends = [ base hspec QuickCheck ]; - homepage = "https://github.com/nfrisby/invariant-functors"; - description = "Haskell 98 invariant functors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "invariant" = callPackage ({ mkDerivation, array, base, bifunctors, comonad, containers , contravariant, ghc-prim, hspec, profunctors, QuickCheck @@ -101061,6 +97552,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ion" = callPackage + ({ mkDerivation, base, containers, ivory, ivory-backend-c, mtl }: + mkDerivation { + pname = "ion"; + version = "1.0.0.0"; + sha256 = "24a364e30e6baeb531c8f040d3cea6d368c6457cabe58a21fb98f21333b7cc0d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers ivory ivory-backend-c mtl + ]; + executableHaskellDepends = [ + base containers ivory ivory-backend-c mtl + ]; + homepage = "https://haskellembedded.github.io/"; + description = "EDSL for concurrent, realtime, embedded programming on top of Ivory"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ioref-stable" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -101080,10 +97591,10 @@ self: { version = "0.1.0.0"; sha256 = "a03b253219cb41b8e28c11d007295bab9e5cf5fa36814c23c082f46ac1d27edb"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/tattsun/iothread"; description = "run IOs in a single thread"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iotransaction" = callPackage @@ -101136,12 +97647,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ip2location" = callPackage + ({ mkDerivation, base, binary, bytestring, iproute }: + mkDerivation { + pname = "ip2location"; + version = "8.0.4"; + sha256 = "047e160706a8ab86a0800f9535a18af28e8257efa16e8ccac577d934bf293e3b"; + libraryHaskellDepends = [ base binary bytestring iproute ]; + homepage = "http://www.ip2location.com"; + description = "IP2Location Haskell package for IP geolocation"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "ip6addr" = callPackage ({ mkDerivation, base, cmdargs, IPv6Addr, text }: mkDerivation { pname = "ip6addr"; - version = "0.5.1.2"; - sha256 = "810dc63ee4dbd42705f6d2383841adc83bdc0f27a95499179b7bb5f50cce5462"; + version = "0.5.1.3"; + sha256 = "4edd17f9cf77b0e6ae59c9016d5dc72b3467959bd779264783a4fe7c02aa9340"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base cmdargs IPv6Addr text ]; @@ -101181,7 +97704,6 @@ self: { libraryHaskellDepends = [ base binary bytestring dlist mtl network network-bytestring stm ]; - jailbreak = true; description = "High level inter-process communication library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101215,7 +97737,6 @@ self: { ]; libraryPkgconfigDepends = [ ipopt nlopt ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; description = "haskell binding to ipopt and nlopt including automatic differentiation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101266,7 +97787,6 @@ self: { base containers mtl parsec safe utf8-string ]; executableHaskellDepends = [ base QuickCheck syb ]; - jailbreak = true; description = "iptables rules parser/printer library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -101292,7 +97812,6 @@ self: { network old-time pam parsec process random safe template-haskell time unix utf8-string ]; - jailbreak = true; homepage = "http://iptadmin.117.su"; description = "web-interface for iptables"; license = stdenv.lib.licenses.bsd3; @@ -101313,10 +97832,10 @@ self: { process SHA temporary text transformers unordered-containers uuid zeromq4-haskell ]; - jailbreak = true; homepage = "http://github.com/gibiansky/IHaskell"; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -101348,36 +97867,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "irc-client_0_3_0_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, data-default-class - , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time - , transformers - }: - mkDerivation { - pname = "irc-client"; - version = "0.3.0.0"; - sha256 = "ddc97ede9d741130d9ee0ff5128550ae9a5f6f4a04f4cb3b0d5c05c887314e0c"; - libraryHaskellDepends = [ - base bytestring conduit data-default-class irc-conduit irc-ctcp - old-locale stm stm-conduit text time transformers - ]; - homepage = "https://github.com/barrucadu/irc-client"; - description = "An IRC client library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "irc-client" = callPackage - ({ mkDerivation, base, bytestring, conduit, irc-conduit, irc-ctcp - , old-locale, stm, stm-conduit, text, time, transformers + ({ mkDerivation, base, bytestring, conduit, connection, irc-conduit + , irc-ctcp, network-conduit-tls, old-locale, stm, stm-conduit, text + , time, tls, transformers, x509, x509-store, x509-validation }: mkDerivation { pname = "irc-client"; - version = "0.4.3.0"; - sha256 = "e40fb8d41b6230a01820deed60e43fea525554cd900e9be3582a6371d69c2676"; + version = "0.4.4.0"; + sha256 = "b5299e0b5d47f32828b5bb0a23a872105f6c778b8a6c15cf4ce8a7691c69ab3a"; libraryHaskellDepends = [ - base bytestring conduit irc-conduit irc-ctcp old-locale stm - stm-conduit text time transformers + base bytestring conduit connection irc-conduit irc-ctcp + network-conduit-tls old-locale stm stm-conduit text time tls + transformers x509 x509-store x509-validation ]; homepage = "https://github.com/barrucadu/irc-client"; description = "An IRC client library"; @@ -101395,25 +97897,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "irc-conduit_0_1_2_0" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, conduit-extra - , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls - , transformers, x509-validation - }: - mkDerivation { - pname = "irc-conduit"; - version = "0.1.2.0"; - sha256 = "77aea49a8efdbd8dc405d8a9ed4afddb11c906136bd3c8ec3bd32e981d0a84d7"; - libraryHaskellDepends = [ - async base bytestring conduit conduit-extra connection irc irc-ctcp - network-conduit-tls text time tls transformers x509-validation - ]; - homepage = "https://github.com/barrucadu/irc-conduit"; - description = "Streaming IRC message library using conduits"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "irc-conduit" = callPackage ({ mkDerivation, async, base, bytestring, conduit, conduit-extra , connection, irc, irc-ctcp, network-conduit-tls, text, time, tls @@ -101421,8 +97904,8 @@ self: { }: mkDerivation { pname = "irc-conduit"; - version = "0.2.0.0"; - sha256 = "3c8956d695e7ea3a3a9764dd7128f6c9243e53d578a9ba39284757afbbbd7258"; + version = "0.2.1.0"; + sha256 = "c363a8096e15459c379cfb73e025c1102b4c6e367716c1408216977401b6445c"; libraryHaskellDepends = [ async base bytestring conduit conduit-extra connection irc irc-ctcp network-conduit-tls text time tls transformers x509-validation @@ -101438,13 +97921,13 @@ self: { }: mkDerivation { pname = "irc-core"; - version = "2.1.1.1"; - sha256 = "73f5a1ced86966659bad47f2e6a04419aac16319500cae4784361430751b808a"; + version = "2.2.0.0"; + sha256 = "2e491a8a9d3c0dbb3413c8bebc1e37d0636d2cb8367f4b257141f891107b4834"; libraryHaskellDepends = [ attoparsec base bytestring hashable memory primitive text time vector ]; - testHaskellDepends = [ base HUnit text ]; + testHaskellDepends = [ base hashable HUnit text ]; homepage = "https://github.com/glguy/irc-core"; description = "IRC core library for glirc"; license = stdenv.lib.licenses.isc; @@ -101462,31 +97945,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-dcc_1_2_1" = callPackage - ({ mkDerivation, attoparsec, base, binary, bytestring, errors - , hspec-attoparsec, io-streams, iproute, irc-ctcp, network, path - , tasty, tasty-hspec, transformers, utf8-string - }: - mkDerivation { - pname = "irc-dcc"; - version = "1.2.1"; - sha256 = "b348e0b921c27e2f29188b5604e0185cec9b0f0da36e24cad920ec1a33f5c512"; - revision = "1"; - editedCabalFile = "cf27bbf57c87862fc6c854c916815a72633983daf6405a77abe8979704a4e76b"; - libraryHaskellDepends = [ - attoparsec base binary bytestring errors io-streams iproute - irc-ctcp network path transformers utf8-string - ]; - testHaskellDepends = [ - attoparsec base binary bytestring hspec-attoparsec iproute irc-ctcp - network path tasty tasty-hspec utf8-string - ]; - homepage = "https://github.com/JanGe/irc-dcc"; - description = "A DCC message parsing and helper library for IRC clients"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "irc-dcc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, errors , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network @@ -101645,8 +98103,8 @@ self: { }: mkDerivation { pname = "iridium"; - version = "0.1.5.4"; - sha256 = "665c68ad724532fd65b1043e7152df8823bbcdb7e28c74ea4c0527cc017a3937"; + version = "0.1.5.5"; + sha256 = "161d533ebde52dd4854a8d8e46f1d4c506178a94672a61948f1f70ed6db1b726"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -101658,10 +98116,10 @@ self: { executableHaskellDepends = [ base extra multistate text transformers unordered-containers yaml ]; - jailbreak = true; homepage = "https://github.com/lspitzner/iridium"; - description = "Automated Testing and Package Uploading"; + description = "Automated Local Testing and Package Uploading"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iron-mq" = callPackage @@ -101671,10 +98129,10 @@ self: { version = "0.1.1.0"; sha256 = "9936b04b59c48f5e197c17b8a5f35a4637d0233b6483dbec09af9b18898a21fa"; libraryHaskellDepends = [ aeson base http-client lens text wreq ]; - jailbreak = true; homepage = "https://github.com/arnoblalam/iron_mq_haskell"; description = "Iron.IO message queueing client library"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ironforge" = callPackage @@ -101693,7 +98151,6 @@ self: { executableHaskellDepends = [ antisplice base chatty chatty-utils mtl transformers ]; - jailbreak = true; homepage = "http://doomanddarkness.eu/pub/antisplice"; description = "A technical demo for Antisplice"; license = stdenv.lib.licenses.bsd3; @@ -101740,7 +98197,6 @@ self: { version = "0.3.0.2"; sha256 = "a51da5092ea7cae41a16fa840609c19cc6c2a8b56e129168a3c5f731f24ac081"; libraryHaskellDepends = [ base vacuum ]; - jailbreak = true; description = "Check whether a value has been evaluated"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -101874,10 +98330,10 @@ self: { aeson base bytestring data-default ghc-prim http-conduit text unordered-containers uri vector ]; - jailbreak = true; homepage = "https://github.com/reinerp/isohunt"; description = "Bindings to the isoHunt torrent search API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "isotope" = callPackage @@ -101892,10 +98348,10 @@ self: { base containers megaparsec template-haskell th-lift ]; testHaskellDepends = [ base containers hspec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/Michaelt293/Element-isotopes/blob/master/README.md"; description = "Isotopic masses and relative abundances"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ispositive" = callPackage @@ -101942,7 +98398,6 @@ self: { base heap HUnit iteratee ListLike mtl statistics test-framework test-framework-hunit test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/JohnLato/iter-stats"; description = "iteratees for statistical processing"; license = stdenv.lib.licenses.bsd3; @@ -101963,7 +98418,6 @@ self: { ListLike mtl network old-locale process stringsearch time unix ]; librarySystemDepends = [ zlib ]; - jailbreak = true; homepage = "http://www.scs.stanford.edu/~dm/iterIO"; description = "Iteratee-based IO with pipe operators"; license = stdenv.lib.licenses.bsd3; @@ -102005,7 +98459,6 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 transformers transformers-base unix ]; - jailbreak = true; homepage = "http://www.tiresiaspress.us/haskell/iteratee"; description = "Iteratee-based I/O"; license = stdenv.lib.licenses.bsd3; @@ -102036,10 +98489,10 @@ self: { libraryHaskellDepends = [ base bytestring containers ListLike MonadCatchIO-mtl mtl unix ]; - jailbreak = true; homepage = "http://inmachina.net/~jwlato/haskell/iteratee"; description = "Iteratee-based I/O"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "iteratee-parsec" = callPackage @@ -102053,7 +98506,6 @@ self: { libraryHaskellDepends = [ base iteratee ListLike parsec reference transformers ]; - jailbreak = true; description = "Package allowing parsec parser initeratee"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -102068,7 +98520,6 @@ self: { libraryHaskellDepends = [ base iteratee stm stm-chans transformers ]; - jailbreak = true; homepage = "http://www.tiresiaspress.us/~jwlato/haskell/iteratee-stm"; description = "Concurrent iteratees using STM"; license = stdenv.lib.licenses.bsd3; @@ -102087,7 +98538,6 @@ self: { base bytestring filepath iterIO ListLike monadIO mtl network split transformers unix ]; - jailbreak = true; homepage = "https://github.com/alevy/iterio-server"; description = "Library for building servers with IterIO"; license = stdenv.lib.licenses.bsd3; @@ -102118,7 +98568,6 @@ self: { libraryHaskellDepends = [ base binary containers directory haskell98 mtl parsec ]; - jailbreak = true; homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/"; description = "Theorem proving library based on dependent type theory"; license = stdenv.lib.licenses.bsd3; @@ -102196,7 +98645,6 @@ self: { base ivory ivory-backend-c monadLib parsec template-haskell ]; executableHaskellDepends = [ base ivory ivory-backend-c ]; - jailbreak = true; homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; description = "Ivory bit-data support"; license = stdenv.lib.licenses.bsd3; @@ -102368,7 +98816,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base preprocessor-tools syb ]; - jailbreak = true; homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/"; description = "A preprocessor for expanding \"ixdo\" notation for indexed monads"; license = stdenv.lib.licenses.bsd3; @@ -102418,7 +98865,6 @@ self: { testHaskellDepends = [ base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; description = "Efficient relational queries on Haskell sets"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -102459,7 +98905,6 @@ self: { java-bridge-extras java-reflect mtl named-records split strict strings syb transformers ]; - jailbreak = true; description = "j2hs"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -102515,7 +98960,6 @@ self: { version = "0.1"; sha256 = "cdd9c064a88ec6a081ab7082f6827be4c9b2b3bdbb703c758dba0d57deabda0f"; libraryHaskellDepends = [ base hosc ]; - jailbreak = true; homepage = "http://www.renickbell.net/doku.php?id=jackminimix"; description = "control JackMiniMix"; license = stdenv.lib.licenses.gpl3; @@ -102547,9 +98991,9 @@ self: { libraryHaskellDepends = [ base containers directory monads-fd transformers ]; - jailbreak = true; description = "Jailed IO monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jailbreak-cabal" = callPackage @@ -102575,10 +99019,10 @@ self: { sha256 = "a01e8ade25f87e0c20c946b77be3a446e7ffa2870b601b001931ae837ef6b908"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/jalaali/jalaali-hs"; description = "Convert Jalaali and Gregorian calendar systems to each other"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jalla" = callPackage @@ -102679,7 +99123,6 @@ self: { version = "0.99"; sha256 = "fbc357580cb8ff22a98d0294e5e1f15dbec38c594b3178e3594ad35e20a85d72"; libraryHaskellDepends = [ base java-bridge transformers ]; - jailbreak = true; description = "Utilities for working with the java-bridge package"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -102719,7 +99162,6 @@ self: { version = "0.99"; sha256 = "8c0f0b24318054a73317aef3262791b11652b34f23f8288dd6104386d8c0aeed"; libraryHaskellDepends = [ base containers hx java-bridge ]; - jailbreak = true; description = "Tools for reflecting on Java classes"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -102798,10 +99240,10 @@ self: { libraryHaskellDepends = [ aeson base bytestring http-conduit text transformers ]; - jailbreak = true; homepage = "http://github.com/Herzult/jcdecaux-vls"; description = "JCDecaux self-service bicycles API client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jdi" = callPackage @@ -102818,10 +99260,10 @@ self: { base binary bytestring containers mtl network transformers ]; executableHaskellDepends = [ base mtl network ]; - jailbreak = true; homepage = "https://github.com/VictorDenisov/jdi"; description = "Implementation of Java Debug Interface"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jespresso" = callPackage @@ -102849,7 +99291,6 @@ self: { arrows base Diff directory filepath hxt tasty tasty-golden transformers ]; - jailbreak = true; homepage = "http://github.com/achudnov/jespresso"; description = "Extract all JavaScript from an HTML page and consolidate it in one script"; license = stdenv.lib.licenses.bsd3; @@ -102998,7 +99439,6 @@ self: { libraryHaskellDepends = [ base bytestring containers HTTP json mtl network old-locale time ]; - jailbreak = true; homepage = "http://rawr.mschade.me/jonathanscard/"; description = "An implementation of the Jonathan's Card API"; license = stdenv.lib.licenses.bsd3; @@ -103014,7 +99454,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base gtk ]; - jailbreak = true; description = "JP's own ray tracer"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -103030,8 +99469,8 @@ self: { }: mkDerivation { pname = "jose"; - version = "0.4.0.2"; - sha256 = "1fa4b9c2c6ab8eac146b38add7988617ddfef98650e0099b0ee9c76b6f41000d"; + version = "0.4.0.3"; + sha256 = "742b8037e5cc9c427789196bd425594c3fb17768fb584c8434548415aa5e0f0a"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bifunctors byteable bytestring cryptonite data-default-class lens memory mtl @@ -103050,26 +99489,56 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_5_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , byteable, bytestring, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances + , safe, tasty, tasty-hspec, tasty-quickcheck, template-haskell + , text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.5.0.0"; + sha256 = "cb2da4049b288be97e1a7530fbf0ff86cf98a3277b13cd84ba352519741b36ce"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring byteable bytestring + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe template-haskell text time + unordered-containers vector x509 + ]; + executableHaskellDepends = [ aeson base bytestring lens mtl ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring byteable bytestring + containers cryptonite hspec lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + homepage = "https://github.com/frasertweedale/hs-jose"; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, cereal - , containers, cryptonite, doctest, either, hspec, HUnit, memory - , mtl, QuickCheck, text, time, unordered-containers, vector + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , cryptonite, doctest, either, hspec, HUnit, memory, mtl + , QuickCheck, text, time, unordered-containers, vector }: mkDerivation { pname = "jose-jwt"; - version = "0.7"; - sha256 = "60d5bf047e6ba6081b4ca7a86fe78a371594aa9ed1fec808a8c3628b5b0eca62"; - revision = "1"; - editedCabalFile = "a43df539f6c66ff12808a8db58d83bf98356e79be1e52850791295f83c309b86"; + version = "0.7.3"; + sha256 = "b405c3c35936fe5a44e44416e4689207d94eff808b10b9bae60840c1ff11b9f4"; libraryHaskellDepends = [ aeson base bytestring cereal containers cryptonite either memory mtl text time unordered-containers vector ]; testHaskellDepends = [ - aeson aeson-qq base bytestring cryptonite doctest either hspec - HUnit memory mtl QuickCheck text unordered-containers vector + aeson base bytestring cryptonite doctest either hspec HUnit memory + mtl QuickCheck text unordered-containers vector ]; - doCheck = false; homepage = "http://github.com/tekul/jose-jwt"; description = "JSON Object Signing and Encryption Library"; license = stdenv.lib.licenses.bsd3; @@ -103112,27 +99581,12 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "js-jquery_1_12_4" = callPackage - ({ mkDerivation, base, HTTP }: - mkDerivation { - pname = "js-jquery"; - version = "1.12.4"; - sha256 = "6038b72113932bec21c89293fb5f7e23621d03e315596986d9feab34a159ffdb"; - 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; - }) {}; - "js-jquery" = callPackage ({ mkDerivation, base, HTTP }: mkDerivation { pname = "js-jquery"; - version = "3.1.0"; - sha256 = "a8db825d7740f18db4c3bad92db18e840913e1444f2d43e409dc5df691a7d3a2"; + version = "3.1.1"; + sha256 = "d72f67d72bd71d675bcdc75dd280c4a27d90784eb51c661a3da567e0186f2a04"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HTTP ]; doCheck = false; @@ -103141,80 +99595,55 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "jsaddle_0_3_0_3" = callPackage - ({ mkDerivation, base, doctest, glib, gtk3, lens, QuickCheck - , template-haskell, text, transformers, vector, webkitgtk3 - , webkitgtk3-javascriptcore - }: - mkDerivation { - pname = "jsaddle"; - version = "0.3.0.3"; - sha256 = "8dcb54c32c281409da90e7d155913bfae5da1a2f4c71b409f70290c5f5ba2c89"; - libraryHaskellDepends = [ - base glib gtk3 lens template-haskell text transformers webkitgtk3 - webkitgtk3-javascriptcore - ]; - testHaskellDepends = [ - base doctest glib gtk3 QuickCheck text vector webkitgtk3 - webkitgtk3-javascriptcore - ]; - jailbreak = true; - doCheck = false; - description = "High level interface for webkit-javascriptcore"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "jsaddle" = callPackage - ({ mkDerivation, base, doctest, gi-glib, gi-gtk, gi-javascriptcore - , gi-webkit, haskell-gi-base, lens, QuickCheck, template-haskell - , text, transformers, vector, webkitgtk3-javascriptcore + ({ mkDerivation, aeson, base, bytestring, containers, doctest + , filepath, http-types, lens, primitive, process, QuickCheck, stm + , template-haskell, text, time, transformers, vector, wai + , wai-app-static, wai-websockets, warp, websockets }: mkDerivation { pname = "jsaddle"; - version = "0.4.0.5"; - sha256 = "b1c77d083ae9ccb1eadde1b63599c29460c6623fe000061168e92f3b8f01a333"; + version = "0.5.1.0"; + sha256 = "b97d31c176d1862103cabd8fe948c059f04de5c4ca4e4404001625827a5a506c"; libraryHaskellDepends = [ - base gi-glib gi-gtk gi-javascriptcore gi-webkit haskell-gi-base - lens template-haskell text transformers webkitgtk3-javascriptcore + aeson base bytestring containers filepath http-types lens primitive + process stm template-haskell text time transformers wai + wai-app-static wai-websockets warp websockets ]; testHaskellDepends = [ - base doctest gi-glib gi-gtk gi-javascriptcore gi-webkit - haskell-gi-base QuickCheck text vector webkitgtk3-javascriptcore + base bytestring doctest filepath http-types process QuickCheck text + vector wai wai-app-static wai-websockets warp websockets ]; - description = "High level interface for webkit-javascriptcore"; + description = "Interface for JavaScript that works with GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-dom" = callPackage - ({ mkDerivation, base, base-compat, gi-glib, gi-gtk, gi-webkit - , haskell-gi-base, jsaddle, lens, text, transformers + ({ mkDerivation, base, base-compat, jsaddle, lens, text + , transformers }: mkDerivation { pname = "jsaddle-dom"; - version = "0.2.0.1"; - sha256 = "2cfdbf281e29c9b1e3ea2f4db59f80263309bad6f080ceb9cbf4072cfa3ff7f3"; + version = "0.4.1.0"; + sha256 = "c9038d2d124dfd330112470caee81a69b3918de186135f0c24525f4f81ec1b74"; libraryHaskellDepends = [ - base base-compat gi-glib gi-gtk gi-webkit haskell-gi-base jsaddle - lens text transformers + base base-compat jsaddle lens text transformers ]; - jailbreak = true; - description = "DOM library that uses jsaddle to support both GHCJS and WebKitGTK"; + description = "DOM library that uses jsaddle to support both GHCJS and GHC"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsaddle-hello" = callPackage - ({ mkDerivation, base, ghcjs-dom, jsaddle, lens }: + ({ mkDerivation, base, jsaddle, lens, text }: mkDerivation { pname = "jsaddle-hello"; - version = "1.0.0.0"; - sha256 = "b78158a85e4b8006c1b2fe738dec2ba011b9f67289c4f43d9494af5dc6956f1e"; + version = "2.0.0.0"; + sha256 = "941a047559384486151b6a1ec58a4cb5ad8663c636f2de9a70b739f52eeac0ae"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ base ghcjs-dom jsaddle lens ]; - jailbreak = true; + executableHaskellDepends = [ base jsaddle lens text ]; homepage = "https://github.com/ghcjs/jsaddle-hello"; description = "JSaddle Hello World, an example package"; license = stdenv.lib.licenses.mit; @@ -103233,7 +99662,6 @@ self: { base jmacro lens template-haskell text transformers webkitgtk3 webkitgtk3-javascriptcore ]; - jailbreak = true; description = "High level interface for webkit-javascriptcore"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -103246,7 +99674,6 @@ self: { version = "0.1"; sha256 = "f87901fc858e38c5c13f4870196cf511b365f869dedb678aa5f80050a0e066e4"; libraryHaskellDepends = [ base DOM mtl WebBits ]; - jailbreak = true; description = "Javascript Monadic Writer base package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -103284,7 +99711,6 @@ self: { aeson aeson-pretty base bytestring containers data-default hspec lens lens-aeson text unordered-containers url ]; - jailbreak = true; homepage = "https://github.com/toddmohney/json-api"; description = "Utilities for generating JSON-API payloads"; license = stdenv.lib.licenses.mit; @@ -103302,10 +99728,10 @@ self: { libraryHaskellDepends = [ aeson base indexed indexed-free lens lens-aeson text ]; - jailbreak = true; homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-ast" = callPackage @@ -103352,7 +99778,6 @@ self: { libraryHaskellDepends = [ base json-ast QuickCheck quickcheck-instances ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/json-ast-quickcheck"; description = "Compatibility layer for \"json-ast\" and \"QuickCheck\""; license = stdenv.lib.licenses.mit; @@ -103409,7 +99834,6 @@ self: { base bytestring bytestring-nums bytestring-trie bytestringparser-temporary containers utf8-string ]; - jailbreak = true; homepage = "http://github.com/jsnx/JSONb/"; description = "JSON parser that uses byte strings"; license = stdenv.lib.licenses.bsd3; @@ -103464,7 +99888,6 @@ self: { base blaze-builder blaze-builder-enumerator bytestring containers enumerator json-types text transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/json-enumerator"; description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -103535,6 +99958,7 @@ self: { homepage = "https://github.com/nikita-volkov/json-incremental-decoder"; description = "Incremental JSON parser with early termination and a declarative DSL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-litobj" = callPackage @@ -103545,10 +99969,10 @@ self: { sha256 = "4ac4bd3cc6a559d48445577763497f24b0fdd748bab81d241c1392abd8a41ce6"; libraryHaskellDepends = [ base json ]; testHaskellDepends = [ base hspec json QuickCheck ]; - jailbreak = true; homepage = "https://github.com/jonathankochems/json-litobj"; description = "Extends Text.JSON to handle literal JS objects."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-pointer" = callPackage @@ -103609,10 +100033,10 @@ self: { aeson base bytestring containers pureMD5 template-haskell ]; libraryPkgconfigDepends = [ python ]; - jailbreak = true; homepage = "http://stewart.guru"; description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) python;}; "json-qq" = callPackage @@ -103622,6 +100046,8 @@ self: { pname = "json-qq"; version = "0.4.1"; sha256 = "a61e1dcd911f8f24b1ae050d7728a19170a06b426b68d6d3c053424922d8ee66"; + revision = "1"; + editedCabalFile = "e070ffde0263105ed21f178ab669dcfeb9593302a2971b76d99bb0b5aac9f85b"; libraryHaskellDepends = [ base haskell-src-meta parsec template-haskell ]; @@ -103682,17 +100108,17 @@ self: { }) {}; "json-rpc-generic" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, dlist - , QuickCheck, quickcheck-simple, scientific, text, transformers - , unordered-containers, vector + ({ mkDerivation, aeson, aeson-generic-compat, base, bytestring + , containers, dlist, QuickCheck, quickcheck-simple, scientific + , text, transformers, unordered-containers, vector }: mkDerivation { pname = "json-rpc-generic"; - version = "0.2.1.1"; - sha256 = "5ba74a92cad226738161db4f5c7f216c4a6bb743665dc4341901e57f30c4cffd"; + version = "0.2.1.2"; + sha256 = "946b5f28b789c6a943601215a20e4a9f53ffbd12070cc1166ed89528cf1c0dda"; libraryHaskellDepends = [ - aeson base bytestring containers dlist scientific text transformers - unordered-containers vector + aeson aeson-generic-compat base bytestring containers dlist + scientific text transformers unordered-containers vector ]; testHaskellDepends = [ aeson base QuickCheck quickcheck-simple text @@ -103815,10 +100241,10 @@ self: { aeson attoparsec attoparsec-trans base bytestring scientific text transformers unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/srijs/haskell-json-togo"; description = "Effectful parsing of JSON documents"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "json-tools" = callPackage @@ -103920,7 +100346,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring old-locale text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/dpwright/jsonresume.hs"; description = "Parser and datatypes for the JSON Resume format"; license = stdenv.lib.licenses.bsd3; @@ -103943,9 +100368,9 @@ self: { testHaskellDepends = [ aeson base bytestring conduit conduit-extra hspec text ]; - jailbreak = true; description = "JSON-RPC 2.0 server over a Conduit."; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsonschema-gen" = callPackage @@ -103954,8 +100379,8 @@ self: { }: mkDerivation { pname = "jsonschema-gen"; - version = "0.3.0.1"; - sha256 = "4dec2d9f267920de58bc446e4c54ff56f42ff8002493aea5b5f64a188f320ca2"; + version = "0.4.0.0"; + sha256 = "c456517514189da2cc725819515e6f54f7f02bc5c9aecbe43759e9e38e42174f"; libraryHaskellDepends = [ aeson base bytestring containers scientific tagged text time unordered-containers vector @@ -103963,7 +100388,6 @@ self: { testHaskellDepends = [ aeson base bytestring containers process tagged text ]; - jailbreak = true; homepage = "https://github.com/yuga/jsonschema-gen"; description = "JSON Schema generator from Algebraic data type"; license = stdenv.lib.licenses.bsd3; @@ -103986,10 +100410,10 @@ self: { optparse-applicative scientific string-qq text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/danchoi/jsonsql"; description = "Interpolate JSON object values into SQL strings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jsontsv" = callPackage @@ -104008,10 +100432,10 @@ self: { optparse-applicative scientific string-qq text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/danchoi/jsontsv"; description = "JSON to TSV transformer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "jspath" = callPackage @@ -104078,8 +100502,8 @@ self: { }: mkDerivation { pname = "jukebox"; - version = "0.2.7"; - sha256 = "7b52f0890ed569f5962fbbb3fa9a340496711b4ca13fb4ab6bb843aea64828ab"; + version = "0.2.9"; + sha256 = "1f551eb113d97545ec3343a2e1e23dbf8ae1dfadef8d864d82e32cb664b54854"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -104186,7 +100610,6 @@ self: { scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th text time unordered-containers vector ]; - doCheck = false; homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; description = "JSON Web Token (JWT) decoding and encoding"; license = stdenv.lib.licenses.mit; @@ -104228,10 +100651,10 @@ self: { testHaskellDepends = [ base bytestring cereal hspec hspec-discover QuickCheck time ]; - jailbreak = true; homepage = "https://github.com/abhinav/kafka-client"; description = "Low-level Haskell client library for Apache Kafka 0.7."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kaleidoscope" = callPackage @@ -104252,33 +100675,12 @@ self: { transformers ]; doHaddock = false; - jailbreak = true; homepage = "https://github.com/sdiehl/kaleidoscope"; description = "Haskell Kaleidoscope tutorial"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "kan-extensions_4_2_3" = callPackage - ({ mkDerivation, adjunctions, array, base, comonad, containers - , contravariant, distributive, free, mtl, semigroupoids, tagged - , transformers - }: - mkDerivation { - pname = "kan-extensions"; - version = "4.2.3"; - sha256 = "334f0edbbf08ebf93c9f7db5473086dcababc6a72d75fa9d8e43237f9b5adc47"; - libraryHaskellDepends = [ - adjunctions array base comonad containers contravariant - distributive free mtl semigroupoids tagged transformers - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/kan-extensions/"; - description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "kan-extensions" = callPackage ({ mkDerivation, adjunctions, array, base, comonad, containers , contravariant, distributive, free, mtl, semigroupoids, tagged @@ -104304,7 +100706,6 @@ self: { version = "0.4.0"; sha256 = "dd8c9e43f2870cbe2b70c1b3b0d510b9bfdd8a05703cbcec78a2f50c5b38ebd0"; libraryHaskellDepends = [ array base ]; - jailbreak = true; homepage = "http://code.google.com/p/copperbox/"; description = "Binary parsing with random access"; license = stdenv.lib.licenses.bsd3; @@ -104320,10 +100721,10 @@ self: { libraryHaskellDepends = [ base bytestring containers microlens text ]; - jailbreak = true; homepage = "https://github.com/fosskers/nanq"; description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kansas-comet" = callPackage @@ -104362,7 +100763,6 @@ self: { directory dotgen filepath netlist netlist-to-vhdl process random sized-types strict template-haskell ]; - jailbreak = true; homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava"; description = "Kansas Lava is a hardware simulator and VHDL generator"; license = stdenv.lib.licenses.bsd3; @@ -104428,7 +100828,6 @@ self: { libraryHaskellDepends = [ base comonad containers minioperational mtl transformers ]; - jailbreak = true; homepage = "https://github.com/fumieval/karakuri"; description = "Good stateful automata"; license = stdenv.lib.licenses.bsd3; @@ -104453,38 +100852,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "katip_0_2_0_0" = callPackage - ({ mkDerivation, aeson, auto-update, base, bytestring, containers - , directory, either, exceptions, hostname, microlens, microlens-th - , monad-control, mtl, old-locale, quickcheck-instances - , regex-tdfa-rc, resourcet, string-conv, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, temporary, text, time - , time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unordered-containers - }: - mkDerivation { - pname = "katip"; - version = "0.2.0.0"; - sha256 = "bd947874e92da876603c1cbb3bc521e8f33cd08a59c2714d0e35e8dd15ad53b9"; - libraryHaskellDepends = [ - aeson auto-update base bytestring containers either exceptions - hostname microlens microlens-th monad-control mtl old-locale - resourcet string-conv template-haskell text time time-locale-compat - transformers transformers-base transformers-compat unix - unordered-containers - ]; - testHaskellDepends = [ - aeson base directory quickcheck-instances regex-tdfa-rc tasty - tasty-hunit tasty-quickcheck template-haskell temporary text time - unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/Soostone/katip"; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "katip" = callPackage ({ mkDerivation, aeson, auto-update, base, bytestring, containers , directory, either, exceptions, hostname, microlens, microlens-th @@ -104516,34 +100883,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "katip-elasticsearch_0_2_1_0" = callPackage - ({ mkDerivation, aeson, async, base, bloodhound, containers - , enclosed-exceptions, exceptions, http-client, http-types, katip - , lens, lens-aeson, quickcheck-instances, retry, scientific, stm - , stm-chans, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unordered-containers, uuid, vector - }: - mkDerivation { - pname = "katip-elasticsearch"; - version = "0.2.1.0"; - sha256 = "e00a3d10cf1b7ed9f2f4346c59a992bc5955d1da90d4cc93f9edacc56ccce984"; - libraryHaskellDepends = [ - aeson async base bloodhound enclosed-exceptions exceptions - http-client http-types katip retry scientific stm stm-chans text - time transformers unordered-containers uuid - ]; - testHaskellDepends = [ - aeson base bloodhound containers http-client http-types katip lens - lens-aeson quickcheck-instances scientific stm tasty tasty-hunit - tasty-quickcheck text time transformers unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - description = "ElasticSearch scribe for the Katip logging framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "katip-elasticsearch" = callPackage ({ mkDerivation, aeson, async, base, bloodhound, containers , enclosed-exceptions, exceptions, http-client, http-types, katip @@ -104587,7 +100926,6 @@ self: { ]; executableHaskellDepends = [ base bytestring mtl ]; testHaskellDepends = [ base bytestring directory mtl ]; - jailbreak = true; homepage = "https://github.com/davnils/katt"; description = "Client for the Kattis judge system"; license = stdenv.lib.licenses.bsd3; @@ -104618,6 +100956,7 @@ self: { homepage = "https://phabricator.chromabits.com/diffusion/KWAI/"; description = "Utilities for serving static sites and blogs with Wai/Warp"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kawhi" = callPackage @@ -104645,15 +100984,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "kawhi_0_2_0" = callPackage + "kawhi_0_2_1" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, http-client , http-conduit, http-types, mtl, safe, scientific, smallcheck , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text }: mkDerivation { pname = "kawhi"; - version = "0.2.0"; - sha256 = "cbabf52a49d6f323445d9db536382fb43471a8a1065671f9d5b2073c42d53871"; + version = "0.2.1"; + sha256 = "ad98cce9b302fae9fca60ba25f9256b5c4db7e3b8340225a8e3041f45af0f677"; libraryHaskellDepends = [ aeson base bytestring exceptions http-client http-conduit http-types mtl safe scientific text @@ -104663,7 +101002,6 @@ self: { scientific smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck text ]; - jailbreak = true; homepage = "https://github.com/hamsterdam/kawhi"; description = "stats.NBA.com library"; license = stdenv.lib.licenses.mit; @@ -104715,10 +101053,10 @@ self: { libraryHaskellDepends = [ base lens linear vector vector-algorithms ]; - jailbreak = true; homepage = "http://github.com/bgamari/kd-tree"; description = "A simple k-d tree implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kdesrc-build-extra" = callPackage @@ -104735,9 +101073,9 @@ self: { ansi-terminal base bytestring cmdargs directory MissingH parsec process ]; - jailbreak = true; description = "Build profiles for kdesrc-build"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kdt" = callPackage @@ -105120,50 +101458,11 @@ self: { directory filepath hslogger network optparse-applicative process text unix unordered-containers yaml ]; - jailbreak = true; description = "Multi-process orchestration for development and integration testing"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keter_1_4_3_1" = callPackage - ({ mkDerivation, aeson, array, async, attoparsec, base - , blaze-builder, bytestring, case-insensitive, conduit - , conduit-extra, containers, data-default, directory, filepath - , fsnotify, hspec, http-client, http-conduit, http-reverse-proxy - , http-types, HUnit, lifted-base, mtl, network, process, random - , regex-tdfa, stm, tar, template-haskell, text, time, transformers - , unix, unix-compat, unordered-containers, vector, wai - , wai-app-static, wai-extra, warp, warp-tls, yaml, zlib - }: - mkDerivation { - pname = "keter"; - version = "1.4.3.1"; - sha256 = "1111d0f97dc36e84c041f34176d652911a1e7b9c48943533835ac73ccf37582f"; - revision = "2"; - editedCabalFile = "aebe235523c4b1c4a4c3bf091ba46349881fcc3ca5d69d3304dc395542b82adb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson array async attoparsec base blaze-builder bytestring - case-insensitive conduit conduit-extra containers data-default - directory filepath fsnotify http-client http-conduit - http-reverse-proxy http-types lifted-base mtl network process - random regex-tdfa stm tar template-haskell text time transformers - unix unix-compat unordered-containers vector wai wai-app-static - wai-extra warp warp-tls yaml zlib - ]; - executableHaskellDepends = [ base data-default filepath ]; - testHaskellDepends = [ - base bytestring conduit hspec HUnit transformers unix - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Web application deployment manager, focusing on Haskell web frameworks"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "keter" = callPackage ({ mkDerivation, aeson, array, async, attoparsec, base , blaze-builder, bytestring, case-insensitive, conduit @@ -105219,21 +101518,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "keycode_0_2" = callPackage - ({ mkDerivation, base, containers, ghc-prim, template-haskell }: - mkDerivation { - pname = "keycode"; - version = "0.2"; - sha256 = "93f09542fa79993e46a263ff11c3a3c5368c00aa5a11e53bdccf7fbe885459ae"; - libraryHaskellDepends = [ - base containers ghc-prim template-haskell - ]; - homepage = "https://github.com/RyanGlScott/keycode"; - description = "Maps web browser keycodes to their corresponding keyboard keys"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "keycode" = callPackage ({ mkDerivation, base, containers, ghc-prim, template-haskell }: mkDerivation { @@ -105255,10 +101539,10 @@ self: { version = "0.3.0.0"; sha256 = "b85cbba508e47c61bc49a3651068f7a86285501bbe0af66d90bb2eb5c8b6a360"; libraryHaskellDepends = [ base containers vector ]; - jailbreak = true; homepage = "https://github.com/wyager/keyed"; description = "Generic indexing for many data structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "keyring" = callPackage @@ -105268,7 +101552,6 @@ self: { version = "0.1.0.4"; sha256 = "2ddbfe06b0cdbd888c5e2e420e698d746fd3f98ce9ba4f6cc3594f7db2f5f6c8"; libraryHaskellDepends = [ base udbus ]; - jailbreak = true; homepage = "https://github.com/lunaryorn/haskell-keyring"; description = "Keyring access"; license = stdenv.lib.licenses.mit; @@ -105296,32 +101579,36 @@ self: { }) {}; "keysafe" = callPackage - ({ mkDerivation, aeson, argon2, base, binary, bytestring - , containers, deepseq, directory, filepath, http-client, network - , optparse-applicative, process, raaz, random, readline + ({ mkDerivation, aeson, argon2, async, base, binary, bloomfilter + , bytestring, containers, crypto-random, deepseq, directory + , disk-free-space, exceptions, fast-logger, filepath, http-client + , lifted-base, MonadRandom, network, optparse-applicative, process + , raaz, random, random-shuffle, readline, SafeSemaphore , secret-sharing, servant, servant-client, servant-server, socks - , split, stm, text, time, transformers, unix, utf8-string, wai - , warp, zxcvbn-c + , split, stm, text, time, token-bucket, transformers + , unbounded-delays, unix, unix-compat, utf8-string, wai, warp + , zxcvbn-c }: mkDerivation { pname = "keysafe"; - version = "0.20160831"; - sha256 = "bee8f0cd5ff26505b5856185a02baa9b1ca8245b09d59ef7dcb9d0c5b42f8bd9"; + version = "0.20161006"; + sha256 = "ae5d4445467d7f381a2c8ecd2142d64c31f1697418c5892b2f0e50f1857e034e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base binary bytestring containers deepseq directory filepath - http-client network optparse-applicative process raaz random - readline secret-sharing servant servant-client servant-server socks - split stm text time transformers unix utf8-string wai warp zxcvbn-c + aeson argon2 async base binary bloomfilter bytestring containers + crypto-random deepseq directory disk-free-space exceptions + fast-logger filepath http-client lifted-base MonadRandom network + optparse-applicative process raaz random random-shuffle readline + SafeSemaphore secret-sharing servant servant-client servant-server + socks split stm text time token-bucket transformers + unbounded-delays unix unix-compat utf8-string wai warp zxcvbn-c ]; - executableSystemDepends = [ argon2 ]; - jailbreak = true; homepage = "https://joeyh.name/code/keysafe/"; description = "back up a secret key securely to the cloud"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {argon2 = null;}; + }) {}; "keystore" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-wl-pprint, api-tools @@ -105349,7 +101636,6 @@ self: { mtl optparse-applicative process raw-strings-qq setenv text unordered-containers ]; - jailbreak = true; homepage = "http://github.com/cdornan/keystore"; description = "Managing stores of secret things"; license = stdenv.lib.licenses.bsd3; @@ -105389,10 +101675,10 @@ self: { testHaskellDepends = [ base containers hspec parsec parseerror-eq ]; - jailbreak = true; homepage = "https://github.com/stackbuilders/keyword-args"; description = "Extract data from a keyword-args config file format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "khph" = callPackage @@ -105410,10 +101696,10 @@ self: { aeson base bytestring cmdargs containers directory filepath mtl parsec text transformers unix unordered-containers yaml ]; - jailbreak = true; homepage = "http://khumba.net/projects/khph"; description = "Command-line file tagging and organization tool"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kibro" = callPackage @@ -105443,7 +101729,6 @@ self: { base ieee754 lens-family parsec parsec-numbers pretty-compact QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/kasbah/haskell-kicad-data"; description = "Parser and writer for KiCad files"; license = stdenv.lib.licenses.mit; @@ -105463,7 +101748,6 @@ self: { base bytestring cassava hspec hspec-expectations string-qq text vector ]; - jailbreak = true; description = "Parses kat.ph torrent dumps"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -105586,16 +101870,16 @@ self: { "knead" = callPackage ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record - , storable-tuple, utility-ht + , storable-tuple, transformers, utility-ht }: mkDerivation { pname = "knead"; - version = "0.2"; - sha256 = "3a4b110042f0a6080ef36597fca2498daad8800bb054856aaa480885d6670803"; + version = "0.2.0.1"; + sha256 = "767515c8db0abff908d927354a027cb4f2cac929cb768302ba3900c050ad945c"; libraryHaskellDepends = [ - base llvm-extra llvm-tf storable-record storable-tuple utility-ht + base llvm-extra llvm-tf storable-record storable-tuple transformers + utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/knead/"; description = "Repa array processing using LLVM JIT"; license = stdenv.lib.licenses.bsd3; @@ -105606,12 +101890,11 @@ self: { ({ mkDerivation, base, knead, llvm-extra, llvm-tf, utility-ht }: mkDerivation { pname = "knead-arithmetic"; - version = "0.0"; - sha256 = "64ffb6727d9848a04f7287a4ee7954f9150af18b8bd1ac4b475ae15c540e7f3e"; + version = "0.0.0.1"; + sha256 = "7ed408c73d015d564af551611e9a28784afa6bd4d012a7a03b0fb44b0886b928"; libraryHaskellDepends = [ base knead llvm-extra llvm-tf utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/knead-arithmetic/"; description = "Linear algebra and interpolation using LLVM JIT"; license = stdenv.lib.licenses.bsd3; @@ -105644,7 +101927,6 @@ self: { array base containers data-default deepseq mtl parallel vector yap ]; executableHaskellDepends = [ base containers parallel ]; - jailbreak = true; description = "Khovanov homology computations"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -105664,6 +101946,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "kontra-config" = callPackage + ({ mkDerivation, base, bytestring, data-default, exceptions, text + , transformers-base, unjson, utf8-string, yaml + }: + mkDerivation { + pname = "kontra-config"; + version = "0.1"; + sha256 = "16b17e815e4c5060bda5b1db97c3d8a531e792fd1fdc9440e414af55812c2541"; + libraryHaskellDepends = [ + base bytestring data-default exceptions text transformers-base + unjson utf8-string yaml + ]; + homepage = "https://github.com/scrive/kontra-config"; + description = "JSON config file parsing based on unjson"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kontrakcja-templates" = callPackage ({ mkDerivation, base, bytestring, containers, directory, hslogger , HStringTemplate, html, HUnit, MissingH, mtl, old-time, parsec @@ -105683,7 +101983,6 @@ self: { mtl old-time string-templates syb test-framework test-framework-hunit test-framework-quickcheck2 time ]; - jailbreak = true; description = "Utilities for working with many HStringTemplate templates from files"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -105748,6 +102047,8 @@ self: { pname = "kraken"; version = "0.0.3"; sha256 = "4001e1c545155434985f7ca93b5d1bcc6a465c83c58d4bb41a60bbfe521b1e9d"; + revision = "1"; + editedCabalFile = "03085f9b1e839e82a6bfef3778f95f327c55bbd247727d0929b0758bd801a136"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -105798,10 +102099,10 @@ self: { sha256 = "aeefa9e99b0533239710f0f8c2786c48370f6deb424fa3a49e579b748fe0f2e8"; libraryHaskellDepends = [ base bytestring OpenGL ]; libraryPkgconfigDepends = [ egl glew ]; - jailbreak = true; homepage = "https://github.com/corngood/ktx"; description = "A binding for libktx from Khronos"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {egl = null; inherit (pkgs) glew;}; "kure" = callPackage @@ -105823,7 +102124,6 @@ self: { version = "0.1.3"; sha256 = "2b342a06b652e6b7bbafdcdc5e60128c7886d5f677652ad8dc4194ef42afcc2d"; libraryHaskellDepends = [ base kure template-haskell ]; - jailbreak = true; homepage = "http://ittc.ku.edu/~andygill/kure.php"; description = "Generator for Boilerplate KURE Combinators"; license = stdenv.lib.licenses.bsd3; @@ -105915,7 +102215,6 @@ self: { aeson base bytestring cmdlib containers directory hslogger mtl random split text transformers uuid ]; - jailbreak = true; homepage = "https://github.com/lucasdicioccio/laborantin-hs"; description = "an experiment management framework"; license = stdenv.lib.licenses.asl20; @@ -105939,7 +102238,6 @@ self: { base containers derive HTF HUnit lens monad-loops MonadRandom mtl parsec QuickCheck random safecopy template-haskell transformers ]; - jailbreak = true; homepage = "https://github.com/koterpillar/labyrinth"; description = "A complicated turn-based game"; license = stdenv.lib.licenses.mit; @@ -105975,7 +102273,6 @@ self: { vector wai wai-test wai-websockets warp websockets yesod yesod-static ]; - jailbreak = true; homepage = "https://github.com/koterpillar/labyrinth-server"; description = "A complicated turn-based game - Web server"; license = stdenv.lib.licenses.mit; @@ -105988,8 +102285,8 @@ self: { }: mkDerivation { pname = "lackey"; - version = "0.3.2"; - sha256 = "0da7478ee80d29eb96efaf8d3df9acc24f037b062c743a6c987765d00abf84e1"; + version = "0.4.1"; + sha256 = "940dcc73673241ea92044bc8f0af1c1b7004e4c09a8e0e018d018c521ae71347"; libraryHaskellDepends = [ base servant servant-foreign text ]; testHaskellDepends = [ base servant tasty tasty-hspec text ]; homepage = "https://github.com/tfausak/lackey#readme"; @@ -105997,23 +102294,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "lackey_0_4_0" = callPackage - ({ mkDerivation, base, servant, servant-foreign, tasty, tasty-hspec - , text - }: - mkDerivation { - pname = "lackey"; - version = "0.4.0"; - sha256 = "34fa0c06eac9c6039aa704e7f64bfd0ed058e36088bef338459b4118e21a7fbb"; - libraryHaskellDepends = [ base servant servant-foreign text ]; - testHaskellDepends = [ base servant tasty tasty-hspec text ]; - jailbreak = true; - homepage = "https://github.com/tfausak/lackey#readme"; - description = "Generate Ruby clients from Servant APIs"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lagrangian" = callPackage ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -106030,7 +102310,6 @@ self: { ad base hmatrix HUnit nonlinear-optimization test-framework test-framework-hunit test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "http://github.com/jfischoff/lagrangian"; description = "Solve Lagrange multiplier problems"; license = stdenv.lib.licenses.bsd3; @@ -106050,7 +102329,6 @@ self: { attoparsec base-prelude either record system-fileio system-filepath template-haskell text transformers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/laika"; description = "Minimalistic type-checked compile-time template engine"; license = stdenv.lib.licenses.mit; @@ -106091,9 +102369,9 @@ self: { version = "0.1"; sha256 = "2231d5a0563a722c2d3cc704edf203b73366c8006097a69cf44102a6030f9493"; libraryHaskellDepends = [ base GLUT mtl OpenGL time ]; - jailbreak = true; description = "Educational drawing canvas for FP explorers"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-devs" = callPackage @@ -106131,10 +102409,10 @@ self: { version = "0.9.0.0"; sha256 = "440852153cc682a7eb056b71713ea299329acbaeab8ecd5a422b89ebc831e976"; libraryHaskellDepends = [ base containers mtl read-bounded ]; - jailbreak = true; homepage = "https://github.com/thomaseding/lambda-options"; description = "A modern command-line parser for Haskell"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambda-placeholders" = callPackage @@ -106173,10 +102451,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base parsec ]; - jailbreak = true; homepage = "https://github.com/xkollar/lambda2js"; description = "Untyped Lambda calculus to JavaScript compiler"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdaBase" = callPackage @@ -106420,7 +102698,6 @@ self: { process random regex-compat regex-posix syb tagsoup unix utf8-string zlib ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Lambdabot"; description = "Utility libraries for the advanced IRC bot, Lambdabot"; license = "GPL"; @@ -106440,7 +102717,6 @@ self: { libraryHaskellDepends = [ base cmdargs containers dyre glade gtk mtl network webkit ]; - jailbreak = true; homepage = "http://github.com/baldo/lambdacat"; description = "Webkit Browser"; license = stdenv.lib.licenses.bsd3; @@ -106467,7 +102743,6 @@ self: { testHaskellDepends = [ base classy-prelude classy-prelude-yesod hspec yesod yesod-core ]; - jailbreak = true; homepage = "http://lambdacms.org"; description = "LambdaCms 'core' subsite for Yesod apps"; license = stdenv.lib.licenses.mit; @@ -106546,7 +102821,6 @@ self: { QuickCheck tasty tasty-quickcheck text time vect vector websockets wl-pprint ]; - jailbreak = true; homepage = "http://lambdacube3d.com"; description = "LambdaCube 3D is a DSL to program GPUs"; license = stdenv.lib.licenses.bsd3; @@ -106564,10 +102838,10 @@ self: { libraryHaskellDepends = [ base bytestring bytestring-trie containers mtl vector ]; - jailbreak = true; homepage = "http://lambdacube3d.wordpress.com/"; description = "LambdaCube 3D IR"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdacube-edsl" = callPackage @@ -106582,10 +102856,10 @@ self: { base bytestring bytestring-trie containers ghc-prim lambdacube-core mtl vector ]; - jailbreak = true; homepage = "http://lambdacube3d.wordpress.com/"; description = "LambdaCube 3D EDSL definition"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdacube-engine" = callPackage @@ -106638,10 +102912,10 @@ self: { base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw vector vector-algorithms ]; - jailbreak = true; homepage = "http://lambdacube3d.com"; description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdacube-ir" = callPackage @@ -106651,9 +102925,9 @@ self: { version = "0.3.0.0"; sha256 = "4a9c3f2193984bf36eb06d13db92de541c619502a89e956e1e3a2750a4b68dbc"; libraryHaskellDepends = [ aeson base containers mtl text vector ]; - jailbreak = true; description = "LambdaCube 3D intermediate representation of 3D graphics pipelines"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdacube-samples" = callPackage @@ -106672,7 +102946,6 @@ self: { lambdacube-edsl lambdacube-gl mtl OpenGLRaw stb-image time vect vector ]; - jailbreak = true; homepage = "http://lambdacube3d.wordpress.com/"; description = "Samples for LambdaCube 3D"; license = stdenv.lib.licenses.bsd3; @@ -106693,10 +102966,10 @@ self: { testHaskellDepends = [ base hspec QuickCheck quickcheck-text text ]; - jailbreak = true; homepage = "http://github.com/NorfairKing/lambdatex"; description = "Type-Safe LaTeX EDSL"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdatwit" = callPackage @@ -106720,7 +102993,6 @@ self: { network-uri resourcet safecopy text transformers transformers-base twitter-conduit twitter-types utf8-string ]; - jailbreak = true; homepage = "http://github.com/ashyisme/lambdatwit"; description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot."; license = stdenv.lib.licenses.mit; @@ -106738,6 +103010,7 @@ self: { ]; description = "Fpga bus core and serialization for RedPitaya"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lambdiff" = callPackage @@ -106753,7 +103026,6 @@ self: { executableHaskellDepends = [ attoparsec attoparsec-enumerator base bytestring enumerator gtk mtl ]; - jailbreak = true; homepage = "https://github.com/jamwt/lambdiff.git"; description = "Diff Viewer"; license = stdenv.lib.licenses.bsd3; @@ -106792,17 +103064,18 @@ self: { "language-bash" = callPackage ({ mkDerivation, base, parsec, pretty, process, QuickCheck, tasty - , tasty-quickcheck, transformers + , tasty-expected-failure, tasty-hunit, tasty-quickcheck + , transformers }: mkDerivation { pname = "language-bash"; - version = "0.6.1"; - sha256 = "7fb4fb293aec5f3c9b0e7ca2b99f895115d1bbe13f8dbfe02003560e3c063c8d"; + version = "0.6.2"; + sha256 = "63b3201611262cf8aad5b836b2bbe673a6b718bd1a05d16289e3adc790b08ce8"; libraryHaskellDepends = [ base parsec pretty transformers ]; testHaskellDepends = [ - base parsec process QuickCheck tasty tasty-quickcheck + base parsec process QuickCheck tasty tasty-expected-failure + tasty-hunit tasty-quickcheck ]; - jailbreak = true; homepage = "http://github.com/knrafto/language-bash/"; description = "Parsing and pretty-printing Bash shell scripts"; license = stdenv.lib.licenses.bsd3; @@ -106827,7 +103100,6 @@ self: { ansi-terminal base cmdargs containers lens mtl parsec pretty random stream-monad time transformers ]; - jailbreak = true; homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo"; description = "Interpreter and language infrastructure for Boogie"; license = stdenv.lib.licenses.bsd3; @@ -106878,39 +103150,12 @@ self: { array base containers filepath language-c-quote mainland-pretty template-haskell ]; - jailbreak = true; homepage = "https://github.com/mchakravarty/language-c-inline/"; description = "Inline C & Objective-C code in Haskell for language interoperability"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-c-quote_0_11_6_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.6.2"; - sha256 = "bcfe78f7debd225d8a24e369fa593a8670d6c6db782e753fd3aa4cb72130a1ce"; - 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-c-quote" = callPackage ({ mkDerivation, alex, array, base, bytestring, containers , exception-mtl, exception-transformers, filepath, happy @@ -106919,8 +103164,8 @@ self: { }: mkDerivation { pname = "language-c-quote"; - version = "0.11.6.3"; - sha256 = "1dea4102addfaa4744b7dc110f2e842a11511dc4da72814222be4a954a721a2b"; + version = "0.11.7"; + sha256 = "d35d3b22cc12ed6e7b1036401d394f0a55c9b278e807144f64d0eca41121a230"; libraryHaskellDepends = [ array base bytestring containers exception-mtl exception-transformers filepath haskell-src-meta mainland-pretty @@ -106940,10 +103185,9 @@ self: { ({ mkDerivation, base, bool-extras }: mkDerivation { pname = "language-cil"; - version = "0.2.2"; - sha256 = "caf1a739da2681f6fd5c2c6825081a2dc0cefe8f33957554ec8aaf51ec557e2c"; + version = "0.4.0"; + sha256 = "20c46cc14d63a752a6c20e71a58c590a4405bd158e1f5155edee273be177a084"; libraryHaskellDepends = [ base bool-extras ]; - jailbreak = true; homepage = "https://github.com/tomlokhorst/language-cil"; description = "Manipulating Common Intermediate Language AST"; license = stdenv.lib.licenses.bsd3; @@ -107046,8 +103290,8 @@ self: { pname = "language-ecmascript"; version = "0.17.1.0"; sha256 = "df1e3f0d3096d522f278c644d3efbedabee29e2babfdf9d497287550f017883e"; - revision = "1"; - editedCabalFile = "cc53ef169189e8475dadb6888489edd74490ce82880e44b131fe15e7b5f0236e"; + revision = "2"; + editedCabalFile = "c65730a251b7051a95c3ce313b16502830d2685fb7f88eabde1f323b388acd72"; libraryHaskellDepends = [ base containers data-default-class Diff mtl parsec QuickCheck template-haskell testing-feat uniplate wl-pprint @@ -107118,9 +103362,9 @@ self: { version = "0.2"; sha256 = "2e5366663d4f1487cceb93e3182a62949758f87f7b652074d53af2047f22d08b"; libraryHaskellDepends = [ base bifunctors parsers ]; - jailbreak = true; description = "Something similar to Dijkstra's guarded command language"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-glsl" = callPackage @@ -107149,7 +103393,6 @@ self: { version = "0.8"; sha256 = "6cffbe5f179a62b6afc17ce4f477f32751d52971a028e97e25789c5e4228a4dc"; libraryHaskellDepends = [ array base parsec utf8-string ]; - jailbreak = true; description = "A library for analysis and synthesis of Go code"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -107162,9 +103405,9 @@ self: { version = "0.1.2"; sha256 = "e08e6e05f45d03659d813caf03905a6ac314b83b39cd4d12b1ac8205039bb63d"; libraryHaskellDepends = [ base bytestring cereal containers ]; - jailbreak = true; description = "Guess at which language a text is written in using trigrams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-haskell-extract" = callPackage @@ -107283,6 +103526,7 @@ self: { homepage = "http://rel4tion.org/projects/language-kort/"; description = "Parser and serializer for the Kort information language"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "language-lua" = callPackage @@ -107398,7 +103642,6 @@ self: { process syb ]; libraryToolDepends = [ alex happy ]; - jailbreak = true; homepage = "http://www.tiresiaspress.us/haskell/language-objc"; description = "Analysis and generation of Objective C code"; license = stdenv.lib.licenses.bsd3; @@ -107436,57 +103679,12 @@ self: { base Cabal HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; description = "Pig parser in haskell"; license = stdenv.lib.licenses.mit; - }) {}; - - "language-puppet" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , base16-bytestring, bytestring, case-insensitive, containers - , cryptonite, directory, either, exceptions, filecache, formatting - , Glob, hashable, hruby, hslogger, hslua, 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.2"; - sha256 = "c093b8c4586c6d8b63aa02ed905c74f4238cae9c6d32b0140ba47fefff1cda48"; - 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 hslua 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-puppet_1_3_1" = callPackage + "language-puppet" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , base16-bytestring, bytestring, case-insensitive, containers , cryptonite, directory, either, exceptions, filecache, formatting @@ -107500,8 +103698,52 @@ self: { }: mkDerivation { pname = "language-puppet"; - version = "1.3.1"; - sha256 = "8aa7558b51825ba3e4b00c92a74f2d98b55430f2d7333501572f491554862ad2"; + version = "1.3.1.1"; + sha256 = "e2fba21b6adb148896819687062378022393fc6b237d0c65ddb7196bc86ddd12"; + 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 = [ "x86_64-linux" ]; + }) {}; + + "language-puppet_1_3_2_1" = 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.2.1"; + sha256 = "2540cebeae24f1ad783cd52cff87c55734fe631626f211c2f8579a1c5d4b1ac4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -107524,7 +103766,6 @@ self: { megaparsec mtl scientific strict-base-types temporary text transformers unix unordered-containers vector ]; - jailbreak = true; homepage = "http://lpuppet.banquise.net/"; description = "Tools to parse and evaluate the Puppet DSL"; license = stdenv.lib.licenses.bsd3; @@ -107591,7 +103832,6 @@ self: { base containers either indents llvm-general-pure mtl parsec pretty transformers ]; - jailbreak = true; homepage = "https://github.com/qux-lang/language-qux"; description = "Utilities for working with the Qux language"; license = stdenv.lib.licenses.bsd3; @@ -107608,7 +103848,6 @@ self: { libraryHaskellDepends = [ base directory filepath mtl parsec pcre-light ]; - jailbreak = true; homepage = "http://code.haskell.org/shsh/"; description = "A package for parsing shell scripts"; license = stdenv.lib.licenses.bsd3; @@ -107673,27 +103912,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "language-thrift_0_8_0_1" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover - , megaparsec, QuickCheck, text, transformers - }: - mkDerivation { - pname = "language-thrift"; - version = "0.8.0.1"; - sha256 = "defc67a406403425a6fcdb4fcdd735e2bc6309ec1a999debdf3139cd04e0bcb6"; - libraryHaskellDepends = [ - ansi-wl-pprint base megaparsec text transformers - ]; - testHaskellDepends = [ - ansi-wl-pprint base hspec hspec-discover megaparsec QuickCheck text - ]; - jailbreak = true; - homepage = "https://github.com/abhinav/language-thrift#readme"; - description = "Parser and pretty printer for the Thrift IDL format"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "language-thrift" = callPackage ({ mkDerivation, ansi-wl-pprint, base, containers, hspec , hspec-discover, megaparsec, QuickCheck, scientific, semigroups @@ -107716,6 +103934,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-thrift_0_10_0_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, containers, hspec + , hspec-discover, megaparsec, QuickCheck, scientific, semigroups + , text, transformers + }: + mkDerivation { + pname = "language-thrift"; + version = "0.10.0.0"; + sha256 = "29fd9968799a7feb1321ac3976aeb94cbc5fc39fd073abc5e192990138a3d378"; + libraryHaskellDepends = [ + ansi-wl-pprint base containers megaparsec scientific semigroups + text transformers + ]; + testHaskellDepends = [ + ansi-wl-pprint base containers hspec hspec-discover megaparsec + QuickCheck scientific semigroups text transformers + ]; + homepage = "https://github.com/abhinav/language-thrift#readme"; + description = "Parser and pretty printer for the Thrift IDL format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-typescript" = callPackage ({ mkDerivation, base, containers, parsec, pretty }: mkDerivation { @@ -107760,8 +104001,8 @@ self: { }: mkDerivation { pname = "large-hashable"; - version = "0.1.0.1"; - sha256 = "c9ef2847d8f91fd72b45922c3f8ca58bd07fc2aa3b8248f02e34f44c801a7072"; + version = "0.1.0.3"; + sha256 = "ece9da94f91dfb97f3507035f280fe89a9bed50cf1071aae1afbd5d288682d89"; libraryHaskellDepends = [ aeson base base16-bytestring bytes bytestring containers scientific strict template-haskell text time transformers unordered-containers @@ -107810,7 +104051,6 @@ self: { ansi-wl-pprint base cmdargs directory filepath haskell98 haxr HDBC HDBC-sqlite3 hsini HTTP mtl old-locale regex-compat tagsoup time ]; - jailbreak = true; description = "Tool to track security alerts on LWN"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -107842,7 +104082,6 @@ self: { pipes-attoparsec pipes-bytestring pipes-http text text-format transformers ]; - jailbreak = true; homepage = "https://github.com/passy/latest-npm-version"; description = "Find the latest version of a package on npm"; license = stdenv.lib.licenses.mit; @@ -107873,7 +104112,6 @@ self: { base hakyll latex-formulae-image latex-formulae-pandoc lrucache pandoc-types ]; - jailbreak = true; homepage = "https://github.com/liamoc/latex-formulae#readme"; description = "Use actual LaTeX to render formulae inside Hakyll pages"; license = stdenv.lib.licenses.bsd3; @@ -107892,7 +104130,6 @@ self: { base directory errors filepath JuicyPixels process temporary transformers ]; - jailbreak = true; homepage = "http://github.com/liamoc/latex-formulae#readme"; description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation"; license = stdenv.lib.licenses.bsd3; @@ -107984,7 +104221,6 @@ self: { version = "0.1"; sha256 = "ae553ef07a6117fe13d296abd7db21fee75453480440cba8e608a4d51fd7c8fa"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://github.com/duairc/layers"; description = "Modular type class machinery for monad transformer stacks"; license = stdenv.lib.licenses.bsd3; @@ -108060,6 +104296,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lazy-io-streams" = callPackage + ({ mkDerivation, base, bytestring, io-streams }: + mkDerivation { + pname = "lazy-io-streams"; + version = "0.1.0.0"; + sha256 = "beef343b717030f28fabb7e55bbf687d96769b16081ff8c0bd5bb73da3065d08"; + libraryHaskellDepends = [ base bytestring io-streams ]; + description = "Get lazy with your io-streams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lazy-search" = callPackage ({ mkDerivation, base, size-based }: mkDerivation { @@ -108221,7 +104468,6 @@ self: { base bytestring cmdargs containers filepath ]; testHaskellDepends = [ base HUnit ]; - jailbreak = true; homepage = "http://rampa.sk/static/ldif.html"; description = "The LDAP Data Interchange Format (LDIF) tools"; license = stdenv.lib.licenses.bsd3; @@ -108241,7 +104487,6 @@ self: { executableHaskellDepends = [ base blaze-html directory filepath pandoc split ]; - jailbreak = true; homepage = "https://github.com/skypers/leaf"; description = "A simple portfolio generator"; license = stdenv.lib.licenses.gpl3; @@ -108262,7 +104507,6 @@ self: { base cpphs deepseq-bounded deepseq-generics generics-sop random seqaid template-haskell ]; - jailbreak = true; homepage = "http://fremissant.net/leaky"; description = "Robust space leak, and its strictification"; license = stdenv.lib.licenses.bsd3; @@ -108273,8 +104517,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "leancheck"; - version = "0.5.0"; - sha256 = "191b704dd7bb74e6ee23aecad3a9f267867908f5594b809755273950d6d516b8"; + version = "0.6.0"; + sha256 = "15651a9e1bb9b20e805a012be57082c5e2c1f59dde51c25f9fb88299150853ed"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; homepage = "https://github.com/rudymatela/leancheck#readme"; @@ -108321,22 +104565,21 @@ self: { "learn-physics" = callPackage ({ mkDerivation, base, gloss, gnuplot, hmatrix, linear, not-gloss - , polynomial, spatial-math, vector-space + , spatial-math, vector-space }: mkDerivation { pname = "learn-physics"; - version = "0.6.0.1"; - sha256 = "c45787f96c1645a75063694d2fa71baf9a30c5568026ea7c54d5690fd25bc107"; + version = "0.6.0.2"; + sha256 = "0aa998b401ff2f4acbf611861e95e30340da594f4a4e8bbd6070bd30c9c5ccae"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base gloss gnuplot hmatrix linear not-gloss polynomial spatial-math + base gloss gnuplot hmatrix linear not-gloss spatial-math vector-space ]; executableHaskellDepends = [ base gloss gnuplot not-gloss spatial-math ]; - jailbreak = true; description = "Haskell code for learning physics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -108355,7 +104598,6 @@ self: { executableHaskellDepends = [ base gloss gnuplot learn-physics not-gloss spatial-math ]; - jailbreak = true; description = "examples for learn-physics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -108386,10 +104628,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "http://github.com/phaazon/leetify"; description = "Leetify text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "legion" = callPackage @@ -108402,8 +104644,8 @@ self: { }: mkDerivation { pname = "legion"; - version = "0.3.0.0"; - sha256 = "66549eb2e0f369f0056d5ba0b12dde5c7c58a98335eafeac7c8972505d9c6b89"; + version = "0.5.0.0"; + sha256 = "d9361ee7d554b7700d71ca13a258773513f5931ebfa5d7874cfbb45b6f794c44"; libraryHaskellDepends = [ aeson attoparsec base binary binary-conduit bytestring canteven-http canteven-log conduit conduit-extra containers @@ -108411,10 +104653,29 @@ self: { monad-logger network Ranged-sets scotty scotty-resource stm text time transformers unix uuid wai wai-extra warp ]; - jailbreak = true; - homepage = "https://github.com/taphu/legion"; + homepage = "https://github.com/owensmurray/legion#readme"; description = "Distributed, stateful, homogeneous microservice framework"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "legion-extra" = callPackage + ({ mkDerivation, aeson, base, bytestring, canteven-log, containers + , data-default-class, legion, network, safe, split, yaml + }: + mkDerivation { + pname = "legion-extra"; + version = "0.1.0.1"; + sha256 = "62687c1c0f6175338fe9bbfbb1c94befddf8f580baf7b603e11308a23e999f5d"; + libraryHaskellDepends = [ + aeson base bytestring canteven-log containers data-default-class + legion network safe split yaml + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/owensmurray/legion-extra#readme"; + description = "Extra non-essential utilities for building legion applications"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "leksah" = callPackage @@ -108456,7 +104717,6 @@ self: { leksah-server ltk monad-loops QuickCheck stm text transformers webkitgtk3 ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Haskell IDE written in Haskell"; license = "GPL"; @@ -108495,7 +104755,6 @@ self: { base conduit conduit-extra hslogger HUnit process resourcet transformers ]; - jailbreak = true; homepage = "http://leksah.org"; description = "Metadata collection for leksah"; license = "GPL"; @@ -108514,48 +104773,9 @@ self: { aeson base blaze-builder bytestring HsOpenSSL http-streams io-streams mtl scientific text vector ]; - jailbreak = true; homepage = "https://www.lendingclub.com/developers/lc-api.action"; description = "Bindings for the LendingClub marketplace API"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "lens_4_13" = callPackage - ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring - , comonad, containers, contravariant, deepseq, directory - , distributive, doctest, exceptions, filepath, free - , generic-deriving, ghc-prim, hashable, hlint, HUnit - , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck - , reflection, semigroupoids, semigroups, simple-reflect, tagged - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text, transformers - , transformers-compat, unordered-containers, vector, void - }: - mkDerivation { - pname = "lens"; - version = "4.13"; - sha256 = "3556e7bf69d13fca0e73c5e429c8d25a876931c24ae5aa1f4755acac67078f3c"; - revision = "1"; - editedCabalFile = "4e3ac486c3ffd2166eb8affe3b28e7cd86437031c7e3c72018377871b6c02a1f"; - libraryHaskellDepends = [ - array base base-orphans bifunctors bytestring comonad containers - contravariant distributive exceptions filepath free ghc-prim - hashable kan-extensions mtl parallel profunctors reflection - semigroupoids semigroups tagged template-haskell text transformers - transformers-compat unordered-containers vector void - ]; - testHaskellDepends = [ - base bytestring containers deepseq directory doctest filepath - generic-deriving hlint HUnit mtl nats parallel QuickCheck - semigroups simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/lens/"; - description = "Lenses, Folds and Traversals"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -108592,6 +104812,41 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "lens_4_15_1" = callPackage + ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring + , comonad, containers, contravariant, deepseq, directory + , distributive, doctest, exceptions, filepath, free + , generic-deriving, ghc-prim, hashable, hlint, HUnit + , kan-extensions, mtl, nats, parallel, profunctors, QuickCheck + , reflection, semigroupoids, semigroups, simple-reflect, tagged + , template-haskell, test-framework, test-framework-hunit + , test-framework-quickcheck2, test-framework-th, text, transformers + , transformers-compat, unordered-containers, vector, void + }: + mkDerivation { + pname = "lens"; + version = "4.15.1"; + sha256 = "5cfaa64cb1b9787193c2247a1ed1c248104ba5fadb91cec6432e648e41b1bea6"; + libraryHaskellDepends = [ + array base base-orphans bifunctors bytestring comonad containers + contravariant distributive exceptions filepath free ghc-prim + hashable kan-extensions mtl parallel profunctors reflection + semigroupoids semigroups tagged template-haskell text transformers + transformers-compat unordered-containers vector void + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory doctest filepath + generic-deriving hlint HUnit mtl nats parallel QuickCheck + semigroups simple-reflect test-framework test-framework-hunit + test-framework-quickcheck2 test-framework-th text transformers + unordered-containers vector + ]; + homepage = "http://github.com/ekmett/lens/"; + description = "Lenses, Folds and Traversals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "lens-action" = callPackage ({ mkDerivation, base, comonad, contravariant, directory, doctest , filepath, lens, mtl, profunctors, semigroupoids, semigroups @@ -108675,22 +104930,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lens-family-th_0_4_1_0" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "lens-family-th"; - version = "0.4.1.0"; - sha256 = "754fdc4c7c292b160a87974ec3690b755fb93f3877c8080d331cfa6ec4b39e20"; - revision = "2"; - editedCabalFile = "978c149edc250ed1c91c03be304b752415e93ab5eb76aacb194bbe94135c356a"; - libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; - homepage = "http://github.com/DanBurton/lens-family-th#readme"; - description = "Generate lens-family style lenses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lens-family-th" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -108728,10 +104967,10 @@ self: { version = "4.11"; sha256 = "3c0ccdd7cf33cc3c79a86bb51815ab1a402dbe4fdff317c3f05e15adcbb1e031"; libraryHaskellDepends = [ base lens QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/lens/"; description = "QuickCheck properties for lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-regex" = callPackage @@ -108790,10 +105029,10 @@ self: { version = "0.1.0.0"; sha256 = "5b3b2202bf61431de89ddd0dd57ba5282a80cebaa835fd0a03f499c80e5aaafb"; libraryHaskellDepends = [ base bytestring lens text ]; - jailbreak = true; homepage = "http://github.com/iand675/text-lens-encoding"; description = "Isomorphisms and prisms for text <=> bytestring conversions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-time" = callPackage @@ -108803,9 +105042,9 @@ self: { version = "0.1.0.0"; sha256 = "ea17516a6fd2830112570dd574e0d6ce53f7a887832323ff60fe28894d4b37c3"; libraryHaskellDepends = [ base lens time ]; - jailbreak = true; description = "lens for Data.Time"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-tutorial" = callPackage @@ -108816,9 +105055,9 @@ self: { sha256 = "66494550d66d4c62ea56d0184d118e302d3f1f12505c5c7c0a00e098e77272ab"; libraryHaskellDepends = [ base lens ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; description = "Tutorial for the lens library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lens-utils" = callPackage @@ -108828,10 +105067,10 @@ self: { version = "1.2"; sha256 = "2baa0afaf1cfd406335b940c9fc375ab5bbd0bb1f26fb8eca613b901e04d59fb"; libraryHaskellDepends = [ base lens ]; - jailbreak = true; homepage = "https://github.com/wdanilo/lens-utils"; description = "Collection of missing lens utilities"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenses" = callPackage @@ -108855,39 +105094,12 @@ self: { sha256 = "76919a922e1fbfa2c20f99356f4d65584fcb27a2043f6bdd6b28859d311c4436"; libraryHaskellDepends = [ base monad-control mtl transformers ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/LGtk"; description = "References which can be joined and on which lenses can be applied"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "lentil_0_1_12_0" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip - , filepath, hspec, natural-sort, optparse-applicative, parsec - , regex-tdfa - }: - mkDerivation { - pname = "lentil"; - version = "0.1.12.0"; - sha256 = "a49c806f024ba30197a85f043c84d8ad1ca5aaca3b6d96ebb8727a4e438380fb"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath natural-sort - optparse-applicative parsec regex-tdfa - ]; - testHaskellDepends = [ - ansi-wl-pprint base csv directory filemanip filepath hspec - natural-sort optparse-applicative parsec regex-tdfa - ]; - jailbreak = true; - homepage = "http://www.ariis.it/static/articles/lentil/page.html"; - description = "frugal issue tracker"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lentil" = callPackage ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip , filepath, hspec, natural-sort, optparse-applicative, parsec @@ -108909,7 +105121,6 @@ self: { natural-sort optparse-applicative parsec pipes regex-tdfa semigroups terminal-progress-bar text ]; - jailbreak = true; homepage = "http://www.ariis.it/static/articles/lentil/page.html"; description = "frugal issue tracker"; license = stdenv.lib.licenses.gpl3; @@ -108923,9 +105134,9 @@ self: { version = "0.1"; sha256 = "98b3aef14ca16218ecd6643812e9df5dde5c60af6e2f56f98ec523ecc0917397"; libraryHaskellDepends = [ base base-unicode-symbols transformers ]; - jailbreak = true; description = "Van Laarhoven lenses"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lenz-template" = callPackage @@ -108939,7 +105150,6 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols containers lenz template-haskell ]; - jailbreak = true; description = "Van Laarhoven lens templates"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -109013,6 +105223,7 @@ self: { homepage = "https://github.com/basvandijk/levmar"; description = "An implementation of the Levenberg-Marquardt algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "levmar-chart" = callPackage @@ -109022,7 +105233,6 @@ self: { version = "0.2"; sha256 = "5271f6dadec35b22d6fd00900992c819d2e7a7daa7e53016c9f19879a3684973"; libraryHaskellDepends = [ base Chart colour data-accessor levmar ]; - jailbreak = true; description = "Plots the results of the Levenberg-Marquardt algorithm in a chart"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -109081,7 +105291,6 @@ self: { array base containers diagrams-lib lens mtl random random-shuffle vector ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/LGtk"; description = "Lens GUI Toolkit"; license = stdenv.lib.licenses.bsd3; @@ -109116,7 +105325,6 @@ self: { array base containers directory filepath hgettext mtl parsec process setlocale utf8-string wx wxcore ]; - jailbreak = true; homepage = "http://www.imn.htwk-leipzig.de/~abau/lhae"; description = "Simple spreadsheet program"; license = "GPL"; @@ -109162,10 +105370,10 @@ self: { executableHaskellDepends = [ base cmdargs filepath haskell-src-exts syb uu-parsinglib ]; - jailbreak = true; homepage = "http://spockz.github.com/lhs2texhl/"; description = "Literate highlighter preprocessor for lhs2tex"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lhs2html" = callPackage @@ -109210,10 +105418,10 @@ self: { executableHaskellDepends = [ base directory filepath process regex-posix ]; - jailbreak = true; homepage = "https://github.com/tvh/lhslatex"; description = "Tool for using pdflatex with .lhs files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libGenI" = callPackage @@ -109265,7 +105473,6 @@ self: { librarySystemDepends = [ libconfig ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base doctest doctest-prop lens ]; - jailbreak = true; homepage = "https://github.com/peddie/libconfig-haskell"; description = "Haskell bindings to libconfig"; license = stdenv.lib.licenses.bsd3; @@ -109288,7 +105495,6 @@ self: { testHaskellDepends = [ base directory filepath mtl test-framework ]; - jailbreak = true; homepage = "https://github.com/tomgr/libcspm"; description = "A library providing a parser, type checker and evaluator for CSPM"; license = stdenv.lib.licenses.bsd3; @@ -109444,6 +105650,7 @@ self: { ]; description = "Lastfm API interface"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liblinear-enumerator" = callPackage @@ -109455,20 +105662,20 @@ self: { libraryHaskellDepends = [ base bindings-DSL enumerator mtl vector ]; - jailbreak = true; homepage = "http://github.com/NathanHowell/liblinear-enumerator"; description = "liblinear iteratee"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libltdl" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "libltdl"; - version = "0.1.0.3"; - sha256 = "f96f21553b2d6758aab7f59ecd96ad93b01dd61ae9aeca812214081e08a24415"; + version = "0.1.1"; + sha256 = "9327d7108607fecc30803217eb329465a569a1c26c564b49800ceb08e362f828"; libraryHaskellDepends = [ base ]; - homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi"; + homepage = "https://github.com/mainland/libltdl"; description = "FFI interface to libltdl"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -109496,19 +105703,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "libnotify_0_1_1_0" = callPackage - ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: - mkDerivation { - pname = "libnotify"; - version = "0.1.1.0"; - sha256 = "206ff7bb29530cd1cfabd417a9ae1aa38bf9f1a834a0f8db914d3d45c24e81f1"; - libraryHaskellDepends = [ base bytestring glib gtk ]; - librarySystemDepends = [ libnotify ]; - description = "Bindings to libnotify library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libnotify;}; - "libnotify" = callPackage ({ mkDerivation, base, bytestring, glib, gtk, libnotify }: mkDerivation { @@ -109567,7 +105761,6 @@ self: { libraryHaskellDepends = [ base transformers ]; librarySystemDepends = [ pafe ]; testHaskellDepends = [ base bytestring iconv transformers ]; - jailbreak = true; description = "Wrapper for libpafe"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -109594,7 +105787,6 @@ self: { version = "0.0.1.0"; sha256 = "b6cf23821a444e0e4f738d21b0a86dbb3bc172f86ba0be6445874b445c2aaf1f"; libraryHaskellDepends = [ base bytestring curl ]; - jailbreak = true; homepage = "https://github.com/supki/haskell-random.org"; description = "Wrapper to Random.org API"; license = stdenv.lib.licenses.mit; @@ -109642,8 +105834,8 @@ self: { ({ mkDerivation, base, hspec, QuickCheck, split }: mkDerivation { pname = "libroman"; - version = "3.0.1"; - sha256 = "49aa95b2a3dbde344f84a94ef96636df028ec04384ea1b7e40d6eff33e55f64d"; + version = "3.1.1"; + sha256 = "f1c3f44561c9478072578dca2729ee6b31cb29589024bb8a6f4483243639cf87"; libraryHaskellDepends = [ base split ]; testHaskellDepends = [ base hspec QuickCheck ]; homepage = "https://ahakki.xyz"; @@ -109737,11 +105929,11 @@ self: { uniplate unix-bytestring unordered-containers uuid vector ]; libraryPkgconfigDepends = [ systemd ]; - jailbreak = true; homepage = "http://github.com/ocharles/libsystemd-journal"; description = "Haskell bindings to libsystemd-journal"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) systemd;}; + hydraPlatforms = stdenv.lib.platforms.none; + }) {systemd = null;}; "libtagc" = callPackage ({ mkDerivation, base, bytestring, glib, taglib }: @@ -109752,18 +105944,18 @@ self: { libraryHaskellDepends = [ base bytestring glib ]; librarySystemDepends = [ taglib ]; libraryPkgconfigDepends = [ taglib ]; - jailbreak = true; homepage = "https://patch-tag.com/r/AndyStewart/libtagc/home"; description = "Binding to TagLib C library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; "libvirt-hs" = callPackage ({ mkDerivation, base, c2hs, libvirt, syb, unix }: mkDerivation { pname = "libvirt-hs"; - version = "0.2.0"; - sha256 = "52549a02bb9c736eb55e89c5353da74397a981ce990f1cb32eea1f98c8bd26a8"; + version = "0.2.1"; + sha256 = "bdcdc7cc53ad2dfaa08513c163e72044d9bbd125afe0551fa0aa78ddfd5b740a"; libraryHaskellDepends = [ base syb unix ]; libraryPkgconfigDepends = [ libvirt ]; libraryToolDepends = [ c2hs ]; @@ -109780,10 +105972,10 @@ self: { version = "0.1.0.1"; sha256 = "346fbe26e9229b1e7a8a1841b288b07ae683f6bfdbf2a6aea7caa752b6147b7a"; libraryHaskellDepends = [ base bytestring cpu ]; - jailbreak = true; homepage = "https://github.com/the-real-blackh/libvorbis"; description = "Haskell binding for libvorbis, for decoding Ogg Vorbis audio files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libxls" = callPackage @@ -109793,7 +105985,6 @@ self: { version = "0.2"; sha256 = "c6c1185ffd7981c459cd785b0ff3ad40b868a1d6cbf8eb8bd106ec2374aa740e"; libraryHaskellDepends = [ base bindings-DSL ]; - jailbreak = true; description = "Bindings to libxls"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -109823,10 +106014,10 @@ self: { libraryHaskellDepends = [ base bytestring enumerator libxml-sax text transformers xml-types ]; - jailbreak = true; homepage = "http://john-millikin.com/software/libxml-enumerator/"; description = "Enumerator-based API for libXML's SAX interface"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "libxml-sax" = callPackage @@ -109851,7 +106042,6 @@ self: { sha256 = "aad8ea748a8c787bf791a83fb6e3937413a64d42318e1e9f5b0df150e747ffeb"; libraryHaskellDepends = [ base bytestring libxml ]; librarySystemDepends = [ xslt ]; - jailbreak = true; description = "Binding to libxslt"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -109875,16 +106065,20 @@ self: { }) {nvpair = null; inherit (pkgs) zfs;}; "licensor" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, HTTP, process + ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers + , directory, http-conduit, process }: mkDerivation { pname = "licensor"; - version = "0.1.0"; - sha256 = "3fd79e5758020abbb0b9c583c5ec9f3e324ad4edd471f320478469600e4ef099"; - isLibrary = false; + version = "0.2.0"; + sha256 = "87ec4cbc25e9efa51d4bf5d7904db62169807c164041995dacc77c165d3071e5"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base bytestring Cabal containers directory http-conduit process + ]; executableHaskellDepends = [ - base Cabal containers directory HTTP process + base Cabal cmdargs containers directory ]; homepage = "https://github.com/jpvillaisaza/licensor"; description = "A license compatibility helper"; @@ -109959,7 +106153,6 @@ self: { base HUnit monad-control test-framework test-framework-hunit transformers transformers-base transformers-compat ]; - doCheck = false; homepage = "https://github.com/basvandijk/lifted-base"; description = "lifted IO operations from the base library"; license = stdenv.lib.licenses.bsd3; @@ -110025,9 +106218,9 @@ self: { version = "0.1.0.0"; sha256 = "2bb369a7c271fccfccf974149bb4d4899ba674d6d021a66f8529de0b1705030e"; libraryHaskellDepends = [ base text ]; - jailbreak = true; description = "Expand ligatures in unicode text"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ligd" = callPackage @@ -110088,9 +106281,9 @@ self: { base data-default music-dynamics-literal music-pitch-literal prettify process semigroups vector-space ]; - jailbreak = true; description = "Bindings to Lilypond"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "limp" = callPackage @@ -110105,10 +106298,10 @@ self: { testHaskellDepends = [ base containers QuickCheck tasty tasty-quickcheck tasty-th ]; - jailbreak = true; homepage = "https://github.com/amosr/limp"; description = "representation of Integer Linear Programs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "limp-cbc" = callPackage @@ -110120,7 +106313,6 @@ self: { libraryHaskellDepends = [ base containers limp vector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base limp ]; - jailbreak = true; homepage = "https://github.com/amosr/limp-cbc"; description = "bindings for integer linear programming solver Coin/CBC"; license = stdenv.lib.licenses.mit; @@ -110213,7 +106405,6 @@ self: { base binary bytestring directory doctest filepath HUnit lens simple-reflect test-framework test-framework-hunit ]; - doCheck = false; homepage = "http://github.com/ekmett/linear/"; description = "Linear Algebra"; license = stdenv.lib.licenses.bsd3; @@ -110268,7 +106459,6 @@ self: { base comfort-graph containers non-empty QuickCheck transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/linear-circuit"; description = "Compute resistance of linear electrical circuits"; license = stdenv.lib.licenses.bsd3; @@ -110296,7 +106486,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers HUnit ]; - jailbreak = true; description = "Finite maps for linear use"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -110313,7 +106502,6 @@ self: { libraryHaskellDepends = [ base distributive lens linear OpenGL OpenGLRaw tagged ]; - jailbreak = true; homepage = "http://www.github.com/bgamari/linear-opengl"; description = "Isomorphisms between linear and OpenGL types"; license = stdenv.lib.licenses.bsd3; @@ -110327,10 +106515,10 @@ self: { version = "0.1.1.0"; sha256 = "5ea6aa5361d1664bf82e4e48829a887cc3d2e11d064f439f9fd333fc2e08df44"; libraryHaskellDepends = [ base random ]; - jailbreak = true; homepage = "https://github.com/capsjac/linear-vect"; description = "A low-dimensional linear algebra library, operating on the Num typeclass"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linearEqSolver" = callPackage @@ -110345,6 +106533,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "linearmap-category" = callPackage + ({ mkDerivation, base, constrained-categories, containers + , free-vector-spaces, ieee754, lens, linear, semigroups, vector + , vector-space + }: + mkDerivation { + pname = "linearmap-category"; + version = "0.1.0.1"; + sha256 = "ff237dba6477c1ef1328c36785563422fbf3aae1acd31cf5aca139d8a0b4adbd"; + revision = "1"; + editedCabalFile = "c917ace1221a02587e65c9224c1b39fd6999b9c6f712138312def89981bcd3d4"; + libraryHaskellDepends = [ + base constrained-categories containers free-vector-spaces ieee754 + lens linear semigroups vector vector-space + ]; + homepage = "https://github.com/leftaroundabout/linearmap-family"; + description = "Native, matrix-free linear algebra"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "linearscan" = callPackage ({ mkDerivation, base, containers, ghc-prim, mtl, transformers }: mkDerivation { @@ -110391,6 +106600,7 @@ self: { homepage = "http://ariis.it/static/articles/linebreak/page.html"; description = "breaks strings to fit width"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linguistic-ordinals" = callPackage @@ -110455,6 +106665,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "linked-list-with-iterator" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "linked-list-with-iterator"; + version = "0.1.1.0"; + sha256 = "c6ae37cc9d123afcb92f28fef9c5dae6d3713489bdf7f73ac9af420bb3f11b89"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/CindyLinz/Haskell-linked-list-with-iterator#readme"; + description = "A pure linked list which is mutable through iterators"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "linkedhashmap" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, mtl, tasty , tasty-hunit, unordered-containers @@ -110470,10 +106693,10 @@ self: { base containers deepseq hashable mtl tasty tasty-hunit unordered-containers ]; - jailbreak = true; homepage = "https://github.com/abasko/linkedhashmap"; description = "Persistent LinkedHashMap data structure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linklater" = callPackage @@ -110488,10 +106711,10 @@ self: { aeson base base-prelude bytestring containers http-types text wai wreq ]; - jailbreak = true; homepage = "https://github.com/hlian/linklater"; description = "The fast and fun way to write Slack.com bots"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linode" = callPackage @@ -110511,7 +106734,6 @@ self: { aeson base bytestring containers tasty tasty-hunit tasty-quickcheck text ]; - jailbreak = true; homepage = "http://github.com/Helkafen/haskell-linode#readme"; description = "Bindings to the Linode API"; license = stdenv.lib.licenses.bsd3; @@ -110524,16 +106746,16 @@ self: { }: mkDerivation { pname = "linode-v4"; - version = "0.1.0.3"; - sha256 = "83bb8598f94a9646469469b85c1673189b89139ba9dc173bc85e8ee30ff40bfe"; + version = "0.1.0.4"; + sha256 = "f93c82446014d03ae3fa1dffc736bb8c884478d6cb81dafedba9168252b586e1"; libraryHaskellDepends = [ aeson base bytestring http-conduit unordered-containers ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; homepage = "https://github.com/eatonphil/linode-haskell"; description = "Haskell wrapper for the Linode v4 API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linux-blkid" = callPackage @@ -110548,7 +106770,6 @@ self: { base monad-control transformers transformers-base ]; libraryPkgconfigDepends = [ blkid ]; - jailbreak = true; description = "Linux libblkid"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -110561,9 +106782,9 @@ self: { version = "0.1.1.2"; sha256 = "c1bf7f5b28b77b87daf6fa4432461c30f774a1fa33f66969cc2e7963438ca135"; libraryHaskellDepends = [ base filepath ]; - jailbreak = true; description = "Very basic interface to the Linux CGroup Virtual Filesystem"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "linux-evdev" = callPackage @@ -110656,7 +106877,6 @@ self: { base bytestring containers directory filepath ghc-events process unix ]; - jailbreak = true; homepage = "https://github.com/bjpop/haskell-linux-perf"; description = "Read files generated by perf on Linux"; license = stdenv.lib.licenses.bsd3; @@ -110676,7 +106896,6 @@ self: { libraryHaskellDepends = [ base bytestring mmap posix-waitpid process template-haskell unix ]; - jailbreak = true; description = "Wrapping of Linux' ptrace(2)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -110710,7 +106929,6 @@ self: { base binary bytestring QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/kosmoskatten/linx-gateway"; description = "Implementation of the Enea LINX gateway protocol"; license = stdenv.lib.licenses.mit; @@ -110780,7 +106998,6 @@ self: { aeson attoparsec base bytestring cmdargs directory filepath simple-templates text ]; - jailbreak = true; homepage = "http://simple.cx"; description = "LIO support for the Simple web framework"; license = stdenv.lib.licenses.lgpl3; @@ -110794,9 +107011,9 @@ self: { version = "0.1.0.2"; sha256 = "6c4caaecfd8fc61e0e6d516c8cde84d653392dd17fbd30bc2cc7c9caccee731d"; libraryHaskellDepends = [ base QuickCheck ]; - jailbreak = true; description = "Generators for random sequences of English-like nonsense text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "liquid" = callPackage @@ -110818,7 +107035,6 @@ self: { semigroups tasty tasty-hunit tasty-quickcheck tasty-th text unordered-containers validation vector ]; - jailbreak = true; homepage = "https://github.com/projectorhq/haskell-liquid"; description = "Liquid template language library"; license = stdenv.lib.licenses.bsd3; @@ -110893,7 +107109,6 @@ self: { stm tagged tasty tasty-ant-xml tasty-hunit tasty-rerun transformers ]; testSystemDepends = [ z3 ]; - jailbreak = true; homepage = "http://goto.ucsd.edu/liquidhaskell"; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -110983,10 +107198,10 @@ self: { version = "1.0"; sha256 = "da5b52d5ba7d783630962f976761d6f6f4e2e5663b2dc0c32d2a9d674a58ff90"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/hellertime/list-mux"; description = "List Multiplexing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-prompt" = callPackage @@ -111034,26 +107249,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "list-t_0_4_7" = callPackage - ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control - , mtl, mtl-prelude, transformers, transformers-base - }: - mkDerivation { - pname = "list-t"; - version = "0.4.7"; - sha256 = "6b5900d4570bef59b5ebdc25317a032314f738adacc742d19d9c5078bb48a6c9"; - libraryHaskellDepends = [ - base base-prelude mmorph monad-control mtl transformers - transformers-base - ]; - testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ]; - doCheck = false; - homepage = "https://github.com/nikita-volkov/list-t"; - description = "ListT done right"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "list-t" = callPackage ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control , mtl, mtl-prelude, transformers, transformers-base @@ -111086,7 +107281,6 @@ self: { testHaskellDepends = [ attoparsec base-prelude either hspec list-t list-t-text text ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-attoparsec"; description = "An \"attoparsec\" adapter for \"list-t\""; license = stdenv.lib.licenses.mit; @@ -111112,7 +107306,6 @@ self: { base-prelude conversion conversion-text either hspec html-tokenizer list-t-attoparsec list-t-text text xml-types ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-html-parser"; description = "Streaming HTML parser"; license = stdenv.lib.licenses.mit; @@ -111130,10 +107323,10 @@ self: { libraryHaskellDepends = [ base-prelude bytestring http-client list-t mtl-prelude ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-http-client"; description = "A streaming HTTP client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-t-libcurl" = callPackage @@ -111148,7 +107341,6 @@ self: { base base-prelude bytestring curlhs either list-t mtl-prelude resource-pool stm ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-libcurl"; description = "A \"libcurl\"-based streaming HTTP client"; license = stdenv.lib.licenses.mit; @@ -111170,7 +107362,6 @@ self: { base base-prelude bytestring hspec list-t QuickCheck quickcheck-instances text transformers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/list-t-text"; description = "A streaming text codec"; license = stdenv.lib.licenses.mit; @@ -111204,10 +107395,10 @@ self: { base binary ChasingBottoms HUnit QuickCheck template-haskell test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://iki.fi/matti.niemenmaa/list-tries/"; description = "Tries and Patricia tries: finite sets and maps for list keys"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "list-zip-def" = callPackage @@ -111217,9 +107408,9 @@ self: { version = "0.1.0.1"; sha256 = "d0447f7e5347eb2b8e6d27ddcc647677b5e33a44c3e61995c2faa99deed3ca1d"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Provides zips where the combining doesn't stop premature, but instead uses default values"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "listlike-instances" = callPackage @@ -111229,7 +107420,6 @@ self: { version = "0.2.3.1"; sha256 = "5583a4ee3265b297a84582c2af56eaa69ddb6bd753c11d77ff57777e2cb67056"; libraryHaskellDepends = [ base bytestring ListLike text vector ]; - jailbreak = true; homepage = "http://jwlato.webfactional.com/haskell/listlike-instances"; description = "Extra instances of the ListLike class"; license = stdenv.lib.licenses.bsd3; @@ -111274,10 +107464,10 @@ self: { base blaze-html blaze-markup cheapskate directory filepath highlighting-kate parsec text time unordered-containers ]; - jailbreak = true; homepage = "https://github.com/cdosborn/lit"; description = "A simple tool for literate programming"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "literals" = callPackage @@ -111314,7 +107504,6 @@ self: { non-empty parsec pretty process stm stm-split strict transformers unix utility-ht wx wxcore ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer"; description = "Live coding of MIDI music"; license = "GPL"; @@ -111329,7 +107518,6 @@ self: { sha256 = "f01837f708aadef578a8b37ad426d3f9b42fc9f62f7025120163da482d63230d"; libraryHaskellDepends = [ base ]; librarySystemDepends = [ picosat ]; - jailbreak = true; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) picosat;}; @@ -111361,7 +107549,6 @@ self: { mtl network old-locale parsec pretty random template-haskell text time utf8-string uuid ]; - jailbreak = true; homepage = "http://wiki.secondlife.com/wiki/LLSD"; description = "An implementation of the LLSD data system"; license = stdenv.lib.licenses.mit; @@ -111553,7 +107740,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 transformers transformers-compat ]; - jailbreak = true; homepage = "http://github.com/bscarlet/llvm-general/"; description = "General purpose LLVM bindings"; license = stdenv.lib.licenses.bsd3; @@ -111601,7 +107787,6 @@ self: { testHaskellDepends = [ base containers HUnit llvm-general-pure tasty tasty-hunit ]; - jailbreak = true; homepage = "https://github.com/tvh/llvm-general-quote"; description = "QuasiQuoting llvm code for llvm-general"; license = stdenv.lib.licenses.bsd3; @@ -111646,8 +107831,8 @@ self: { ({ mkDerivation, base, containers, monadLib, pretty }: mkDerivation { pname = "llvm-pretty"; - version = "0.4.0.1"; - sha256 = "637506a2356076fefbf7515baa4c19ef2828fc404ab3c0ae0f9b1b2d5f04a42b"; + version = "0.5"; + sha256 = "d38228d980ad1fc0b833cf5daa0e78ce981c102a6ad7cad16bed2761f98cbb19"; libraryHaskellDepends = [ base containers monadLib pretty ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; @@ -111660,8 +107845,8 @@ self: { }: mkDerivation { pname = "llvm-pretty-bc-parser"; - version = "0.2.1.0"; - sha256 = "2d852be9dc0aa29d7a3c898486a201748c2f1a0276393a1f156e624eee108a8a"; + version = "0.3.0.0"; + sha256 = "7873abf8b3acbc679642f2f1c2d639db91c084a2a97546037f049735536dfb81"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -111685,8 +107870,8 @@ self: { }: mkDerivation { pname = "llvm-tf"; - version = "3.1"; - sha256 = "e5f7cf1a9bd2c4726718ee7606664f4d16a863c339012cae9da29c1cd54b687c"; + version = "3.1.0.1"; + sha256 = "5aa4e2e733b442de88096ba0eaa7fe92e52a1e61601c423d4fbb4dc44355e2e5"; libraryHaskellDepends = [ base containers enumset fixed-length llvm-ffi non-empty storable-record tfp transformers utility-ht @@ -111718,7 +107903,6 @@ self: { graphviz llvm-analysis llvm-data-interop optparse-applicative process-conduit unordered-containers ]; - jailbreak = true; description = "Useful tools built on llvm-analysis"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -111737,6 +107921,29 @@ self: { license = stdenv.lib.licenses.bsd2; }) {inherit (pkgs) lmdb;}; + "lmdb-high-level" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, ghc-prim + , HUnit, lmdb, pipes, primitive, QuickCheck, random, test-framework + , test-framework-hunit, test-framework-quickcheck2, text + , transformers, vector + }: + mkDerivation { + pname = "lmdb-high-level"; + version = "0.1"; + sha256 = "cf066a0db4893cd056642d58c7c288c74dcd87dacfaac93a6d342a2b0084a10d"; + libraryHaskellDepends = [ + base bytestring ghc-prim lmdb pipes primitive text transformers + vector + ]; + testHaskellDepends = [ + base bytestring containers directory HUnit pipes QuickCheck random + test-framework test-framework-hunit test-framework-quickcheck2 text + ]; + homepage = "https://github.com/andrewthad/lmdb-high-level"; + description = "Higher level API for working with LMDB"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "lmonad" = callPackage ({ mkDerivation, base, containers, exceptions, HUnit, monad-control , transformers, transformers-base @@ -111863,7 +108070,6 @@ self: { version = "0.1.0.0"; sha256 = "bab5804fa903da5b817cfa98fec5878066f1bc9d058546ebe84801fec99f5f1d"; libraryHaskellDepends = [ base monad-logger text ]; - jailbreak = true; homepage = "https://github.com/MailOnline/located-monad-logger#readme"; description = "Location-aware logging without Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -112043,7 +108249,6 @@ self: { libraryHaskellDepends = [ base bytestring extensible-effects fast-logger time ]; - jailbreak = true; homepage = "https://github.com/ibotty/log-effect"; description = "An extensible log effect using extensible-effects"; license = stdenv.lib.licenses.mit; @@ -112059,7 +108264,6 @@ self: { isLibrary = true; isExecutable = true; executableHaskellDepends = [ base containers json parsec ]; - jailbreak = true; homepage = "https://github.com/haroldl/log2json"; description = "Turn log file records into JSON"; license = "GPL"; @@ -112081,10 +108285,10 @@ self: { testHaskellDepends = [ base bytestring fast-logger hspec uuid-types ]; - jailbreak = true; homepage = "https://github.com/toddmohney/logentries#README.md"; description = "Request logger middleware for Logentries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logfloat" = callPackage @@ -112112,10 +108316,10 @@ self: { ansi-wl-pprint base containers lens mtl template-haskell time time-locale-compat transformers transformers-compat unagi-chan ]; - jailbreak = true; homepage = "https://github.com/wdanilo/haskell-logger"; description = "Fast & extensible logging framework"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logging" = callPackage @@ -112143,13 +108347,12 @@ self: { }: mkDerivation { pname = "logging-effect"; - version = "1.0.1"; - sha256 = "8a27b42451dbcda3faba5db20c275061f8133441b09b0138ac36037ff0108af1"; + version = "1.1.0"; + sha256 = "51275afa770efb4bef3bea13fb294eeb9f7b7ca8186879d49dfa4b2cdcfbdb48"; libraryHaskellDepends = [ async base exceptions free monad-control mtl stm stm-delay text time transformers transformers-base wl-pprint-text ]; - jailbreak = true; homepage = "https://github.com/ocharles/logging-effect"; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; @@ -112185,6 +108388,7 @@ self: { ]; description = "Journald back-end for logging-facade"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logic-TPTP" = callPackage @@ -112212,8 +108416,8 @@ self: { }: mkDerivation { pname = "logic-classes"; - version = "1.7"; - sha256 = "6af3404b06900e7e2f5a56b96182af2bf7764fe0ab680b9611cd34ff52a82f11"; + version = "1.7.1"; + sha256 = "4c403e8b8487d7d4843c76ad3982a2661eff4fc687bb7e8c507f9114008e6550"; libraryHaskellDepends = [ applicative-extras atp-haskell base containers HUnit mtl parsec pretty PropLogic safe safecopy set-extra syb template-haskell @@ -112272,10 +108476,10 @@ self: { sha256 = "e802251aa40c73f9dea2ebe0b7bd92450b94a513343f165cccb2e86489403604"; libraryHaskellDepends = [ base iso8601-time parsec text time ]; testHaskellDepends = [ base hspec time ]; - jailbreak = true; homepage = "https://github.com/keithduncan/logplex-parse"; description = "Parse Heroku application/logplex documents"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "logsink" = callPackage @@ -112309,7 +108513,6 @@ self: { random regex-compat strict tagsoup xml ]; executableHaskellDepends = [ haskell98 ]; - jailbreak = true; description = "Useful utilities for the Lojban language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -112387,7 +108590,6 @@ self: { random repa singletons test-framework test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/cpeikert/Lol"; description = "A library for lattice cryptography"; license = stdenv.lib.licenses.gpl2; @@ -112466,7 +108668,6 @@ self: { base containers directory filepath ghc-prim lol-calculus monad-classes tasty tasty-hunit text text-format transformers ]; - jailbreak = true; description = "Type inferencer for LOL (λω language)"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -112484,7 +108685,6 @@ self: { base bytestring containers data-default hack hack-contrib mps mtl template utf8-string ]; - jailbreak = true; homepage = "http://github.com/nfjinjing/loli"; description = "A minimum web dev DSL in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -112501,10 +108701,10 @@ self: { sha256 = "bb9ee2cea827e146d510804c6b26c6f1a62032215eba4da7eb5bb67f977c478e"; libraryHaskellDepends = [ base primitive template-haskell ]; testHaskellDepends = [ base tasty tasty-hunit ]; - jailbreak = true; homepage = "http://hub.darcs.net/jmcarthur/lookup-tables/issues"; description = "Statically generate lookup tables using Template Haskell"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loop" = callPackage @@ -112527,7 +108727,6 @@ self: { version = "0.1.1.0"; sha256 = "a230f31bc8ae63af4b6d9264fb062a2f89ee75e58e632983433ea8895215a00b"; libraryHaskellDepends = [ base effin ]; - jailbreak = true; homepage = "https://github.com/konn/loop-effin"; description = "control-monad-loop port for effin"; license = stdenv.lib.licenses.bsd3; @@ -112541,9 +108740,9 @@ self: { version = "1.0.0"; sha256 = "6d916440ef5e7e0c00322c6c96e045f88eb5f2ffa510bcb238dcc7605f487cfb"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; description = "A monad transformer supporting various styles of while loop"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loops" = callPackage @@ -112633,10 +108832,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/sfischer13/haskell-lorem"; description = "Library for generating filler text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "loris" = callPackage @@ -112648,7 +108847,6 @@ self: { libraryHaskellDepends = [ base vector ]; librarySystemDepends = [ loris ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; homepage = "http://www.tiresiaspress.us/haskell/loris"; description = "interface to Loris API"; license = stdenv.lib.licenses.gpl2; @@ -112669,10 +108867,10 @@ self: { aeson base binary bytestring cryptohash directory hex network process split ]; - jailbreak = true; homepage = "https://github.com/tvorcesky/loshadka"; description = "Minecraft 1.7 server proxy that answers to queries when the server is offline"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lostcities" = callPackage @@ -112688,7 +108886,6 @@ self: { executableHaskellDepends = [ array base containers haskell98 mtl wx wxcore ]; - jailbreak = true; homepage = "http://www.ncc.up.pt/~pbv/stuff/lostcities"; description = "An implementation of an adictive two-player card game"; license = "GPL"; @@ -112702,9 +108899,9 @@ self: { version = "0.3.1.1"; sha256 = "85f5a954970634aa41bc77b6a2932ed935b1411be4ad7badab31dad45b2365b0"; libraryHaskellDepends = [ base data-default gl linear vector ]; - jailbreak = true; description = "Basic gl wrapper and reference"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lp-diagrams" = callPackage @@ -112764,6 +108961,8 @@ self: { pname = "lrucaching"; version = "0.3.0"; sha256 = "7e699143604a50f597ba4b7877fecd04e6c23bcb303fac4831056966bd521a7f"; + revision = "1"; + editedCabalFile = "fc9c55f797b467e6ff5dc701de45e7480a8e60cb5e3aea0ceb458807c7a15aff"; libraryHaskellDepends = [ base base-compat deepseq hashable psqueues vector ]; @@ -112789,7 +108988,6 @@ self: { ansi-wl-pprint base base-unicode-symbols cmdtheline text usb usb-id-database vector ]; - jailbreak = true; homepage = "https://github.com/roelvandijk/ls-usb"; description = "List USB devices"; license = stdenv.lib.licenses.bsd3; @@ -112831,7 +109029,6 @@ self: { attoparsec base containers hspec2 language-css language-css-attoparsec text ]; - jailbreak = true; homepage = "https://github.com/dbp/lss"; description = "Lexical Style Sheets - a language for writing styles that is focused around lexical (ie, static) scoping and re-use of large components"; license = stdenv.lib.licenses.bsd3; @@ -112854,33 +109051,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "ltext_0_0_2_1" = callPackage - ({ mkDerivation, aeson, base, containers, data-default, deepseq - , directory, hspec, mtl, mtl-compat, optparse-applicative, parsec - , pretty, template-haskell, text, transformers, yaml - }: - mkDerivation { - pname = "ltext"; - version = "0.0.2.1"; - sha256 = "2e0d10a71d59a59218f7e501fc53d6de05ee4e123c2e89bed2f12f4df34d2937"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers deepseq mtl mtl-compat parsec pretty - template-haskell text transformers - ]; - executableHaskellDepends = [ - aeson base containers data-default deepseq directory mtl mtl-compat - optparse-applicative parsec pretty template-haskell text - transformers yaml - ]; - testHaskellDepends = [ base hspec mtl ]; - jailbreak = true; - description = "Higher-order file applicator"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ltext" = callPackage ({ mkDerivation, attoparsec, base, directory, exceptions, extra , mtl, optparse-applicative, pretty, QuickCheck @@ -112926,7 +109096,6 @@ self: { data-default http-client http-types random text time transformers wai wai-extra xml-conduit xml-hamlet yesod-core ]; - jailbreak = true; homepage = "https://github.com/achirkin/qua-kit"; description = "Partial implementation of a service provider for LTI 1.1."; license = stdenv.lib.licenses.mit; @@ -112945,10 +109114,10 @@ self: { base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text transformers ]; - jailbreak = true; homepage = "http://www.leksah.org"; description = "Leksah tool kit"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ltl" = callPackage @@ -113008,7 +109177,6 @@ self: { attoparsec base binary bytestring custom-prelude ghc-prim pretty text ]; - jailbreak = true; description = "Library functions for reading and writing Lua chunks"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113047,28 +109215,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lucid_2_9_5" = callPackage - ({ mkDerivation, base, bifunctors, blaze-builder, bytestring - , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text - , transformers, unordered-containers - }: - mkDerivation { - pname = "lucid"; - version = "2.9.5"; - sha256 = "ae73ed5490f11f23252e98b3b8c4aa4b86acc0019370e1a54e5957ebf948cbb8"; - libraryHaskellDepends = [ - base blaze-builder bytestring containers hashable mmorph mtl text - transformers unordered-containers - ]; - testHaskellDepends = [ - base bifunctors hspec HUnit mtl parsec text - ]; - homepage = "https://github.com/chrisdone/lucid"; - description = "Clear to write, read and edit DSL for HTML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lucid" = callPackage ({ mkDerivation, base, bifunctors, blaze-builder, bytestring , containers, hashable, hspec, HUnit, mmorph, mtl, parsec, text @@ -113106,22 +109252,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lucid-svg_0_6_0_1" = callPackage - ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: - mkDerivation { - pname = "lucid-svg"; - version = "0.6.0.1"; - sha256 = "a8cff758914de95defca5640a1f6c3ddf995078063fb8553da02249510db67cc"; - libraryHaskellDepends = [ - base blaze-builder lucid text transformers - ]; - jailbreak = true; - homepage = "http://github.com/jeffreyrosenbluth/lucid-svg.git"; - description = "DSL for SVG using lucid for HTML"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "lucid-svg" = callPackage ({ mkDerivation, base, blaze-builder, lucid, text, transformers }: mkDerivation { @@ -113152,7 +109282,6 @@ self: { compact-string-fix feed happstack happstack-server HTTP mongoDB mtl network SHA text time ]; - jailbreak = true; homepage = "http://www.imn.htwk-leipzig.de/~abau/lucienne"; description = "Server side feed aggregator/reader"; license = "GPL"; @@ -113196,10 +109325,10 @@ self: { libraryHaskellDepends = [ aeson base http-client lens text vector wreq ]; - jailbreak = true; homepage = "https://github.com/micxjo/hs-luis-client"; description = "An unofficial client for the LUIS NLP service"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "luka" = callPackage @@ -113216,38 +109345,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {objc = null;}; - "luminance_0_11_0_2" = callPackage - ({ mkDerivation, base, containers, contravariant, dlist, gl, linear - , mtl, resourcet, semigroups, transformers, vector, void - }: - mkDerivation { - pname = "luminance"; - version = "0.11.0.2"; - sha256 = "615050be1e296178ca22d13a5ad6787d648aa75760a24ce0b4c9bd9c679e506b"; - libraryHaskellDepends = [ - base containers contravariant dlist gl linear mtl resourcet - semigroups transformers vector void - ]; - jailbreak = true; - homepage = "https://github.com/phaazon/luminance"; - description = "Type-safe, type-level and stateless graphics framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "luminance" = callPackage ({ mkDerivation, base, containers, contravariant, dlist, gl, linear , mtl, resourcet, semigroups, transformers, vector, void }: mkDerivation { pname = "luminance"; - version = "0.11.0.3"; - sha256 = "94d7d9c62727cc3eceddf2f4653cba5bcbf9858855effec6687d60d3848a9547"; + version = "0.11.0.4"; + sha256 = "f34c1c4c00424a76710afc7090328f6624c3142b8154ba9847875ce18b37f9e4"; libraryHaskellDepends = [ base containers contravariant dlist gl linear mtl resourcet semigroups transformers vector void ]; - jailbreak = true; homepage = "https://github.com/phaazon/luminance"; description = "Type-safe, type-level and stateless graphics framework"; license = stdenv.lib.licenses.bsd3; @@ -113267,10 +109376,10 @@ self: { base contravariant GLFW-b JuicyPixels linear luminance mtl resourcet transformers ]; - jailbreak = true; homepage = "https://github.com/phaazon/luminance-samples"; description = "Luminance samples"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "lushtags" = callPackage @@ -113282,7 +109391,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell-src-exts text vector ]; - jailbreak = true; homepage = "https://github.com/bitc/lushtags"; description = "Create ctags compatible tags files for Haskell programs"; license = stdenv.lib.licenses.mit; @@ -113326,7 +109434,6 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th text time transformers vector ]; - jailbreak = true; description = "Parallel scheduler, LVar data structures, and infrastructure to build more"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113460,10 +109567,10 @@ self: { base bytestring conduit HUnit QuickCheck resourcet test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/alphaHeavy/lzma-conduit"; description = "Conduit interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lzma;}; "lzma-enumerator" = callPackage @@ -113483,10 +109590,10 @@ self: { base bytestring enumerator HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/alphaHeavy/lzma-enumerator"; description = "Enumerator interface for lzma/xz compression"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) lzma;}; "lzma-streams" = callPackage @@ -113522,7 +109629,6 @@ self: { libraryHaskellDepends = [ base containers template-haskell text vector ]; - jailbreak = true; description = "Monadic Abstracting Abstract Machines (MAAM) built on Galois Transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -113596,30 +109702,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "machines_0_5_1" = callPackage - ({ mkDerivation, base, comonad, containers, directory, doctest - , filepath, free, mtl, pointed, profunctors, semigroups - , transformers, void - }: - mkDerivation { - pname = "machines"; - version = "0.5.1"; - sha256 = "6229f4ff600fe2db87f43220d42089abd64dc0a0d959e15c5010a7ed81f7dbb7"; - revision = "1"; - editedCabalFile = "c50d5fcc8b1b5635539169a5da097a25c7a7b7e9b8cc582abba3703014ba2d1d"; - libraryHaskellDepends = [ - base comonad containers free mtl pointed profunctors semigroups - transformers void - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/machines/"; - description = "Networked stream transducers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "machines" = callPackage ({ mkDerivation, adjunctions, base, comonad, containers, directory , distributive, doctest, filepath, free, mtl, pointed, profunctors @@ -113645,10 +109727,9 @@ self: { ({ mkDerivation, base, binary, bytestring, machines }: mkDerivation { pname = "machines-binary"; - version = "0.3.0.2"; - sha256 = "c0c6c1a3869b3890d1b003a4adf4e91a5ae0921e775a9bfc126aa11bee663726"; + version = "0.3.0.3"; + sha256 = "60ff456d658ea1a427f32ee5ae1c726e2e7703942bd33edf28b457d753c20652"; libraryHaskellDepends = [ base binary bytestring machines ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-binary"; description = "Binary utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -113660,12 +109741,11 @@ self: { }: mkDerivation { pname = "machines-directory"; - version = "0.2.0.8"; - sha256 = "65b712af8b3ecbd91618233e811170d9d7537982440005e3cc8e00284ecda4db"; + version = "0.2.0.9"; + sha256 = "38e1e5874431f8cad71b3067bc16258e3dfa13b09bf9d8698d6e28d5e0fabf24"; libraryHaskellDepends = [ base directory filepath machines machines-io transformers ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-directory"; description = "Directory (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -113677,12 +109757,11 @@ self: { }: mkDerivation { pname = "machines-io"; - version = "0.2.0.12"; - sha256 = "375cf1c4529df84a085cb9c5d2625805e1d947cf4d444c3eeb66e7d0ffbd617d"; + version = "0.2.0.13"; + sha256 = "4d579d5e9e94fafcfca91322734263498999d2e2af45c40ff0d1db78f4a8f5d4"; libraryHaskellDepends = [ base bytestring chunked-data machines transformers ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-io"; description = "IO utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -113693,12 +109772,11 @@ self: { }: mkDerivation { pname = "machines-process"; - version = "0.2.0.6"; - sha256 = "2a51ffae469eda92ccd7a8d2d1301b0b756ec0c0672346b92572d58909a15831"; + version = "0.2.0.8"; + sha256 = "7a159328a70756acc36940a3f3f5430187ecf7a4d4f01b2b92b119d3e14ffa2d"; libraryHaskellDepends = [ base chunked-data machines machines-io process ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/machines-process"; description = "Process (system) utilities for the machines library"; license = stdenv.lib.licenses.asl20; @@ -113714,10 +109792,10 @@ self: { libraryHaskellDepends = [ base basic-prelude machines streaming-commons ]; - jailbreak = true; homepage = "https://github.com/lshift/machines-zlib"; description = "Decompression support for machines"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "macho" = callPackage @@ -113815,7 +109893,6 @@ self: { executableHaskellDepends = [ base hmatrix transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/magico"; description = "Compute solutions for Magico puzzle"; license = stdenv.lib.licenses.bsd3; @@ -113829,10 +109906,10 @@ self: { version = "0.4.0.0"; sha256 = "7fbef4ce5d50c30f6c386707e655c74626246f4bc8bb84a826a73182ae1a49a3"; libraryHaskellDepends = [ base deepseq profunctors semigroups ]; - jailbreak = true; homepage = "https://github.com/cutsea110/magma"; description = "magma is an algebraic structure consisting a set together with an binary operation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mahoro" = callPackage @@ -113902,6 +109979,24 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "mailchimp" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client + , http-client-tls, servant, servant-client, text, transformers + }: + mkDerivation { + pname = "mailchimp"; + version = "0.1.0"; + sha256 = "dbbc4645a3322e11ce33059a4660dd837574f58530aaa459b4d99dc7b1b91fe2"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring http-client http-client-tls + servant servant-client text transformers + ]; + homepage = "https://github.com/jpvillaisaza/mailchimp-haskell"; + description = "Bindings for the MailChimp API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mailchimp-subscribe" = callPackage ({ mkDerivation, aeson, base, http-client, http-client-tls , http-types, reflection, scotty, text, transformers, wai-extra @@ -113916,10 +110011,10 @@ self: { aeson base http-client http-client-tls http-types reflection scotty text transformers wai-extra ]; - jailbreak = true; homepage = "https://github.com/mietek/mailchimp-subscribe/"; description = "MailChimp subscription request handler"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mailgun" = callPackage @@ -113939,10 +110034,10 @@ self: { transformers ]; executableHaskellDepends = [ base http-conduit text transformers ]; - jailbreak = true; homepage = "https://github.com/AndrewRademacher/mailgun"; description = "Connector to Rackspace's Mailgun Service"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mainland-pretty" = callPackage @@ -113973,7 +110068,6 @@ self: { executableHaskellDepends = [ base bytestring cmdargs threads unix ]; - jailbreak = true; description = "Majordomo protocol for ZeroMQ"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114038,7 +110132,6 @@ self: { version = "0.1"; sha256 = "56d0590c8fa65216a5eaf00d63a42d0dcc1fd64b03fdd20ba786005588728269"; libraryHaskellDepends = [ base directory filepath HSH process ]; - jailbreak = true; homepage = "http://darcsden.com/kowey/makedo"; description = "Helper for writing redo scripts in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -114085,7 +110178,6 @@ self: { filepath gtk gtk-serialized-event manatee-core mtl stm template-haskell text unix utf8-string ]; - jailbreak = true; description = "The Haskell/Gtk+ Integrated Live Environment"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114133,7 +110225,6 @@ self: { gio GoogleSuggest gtk manatee-core mtl network proc regex-tdfa split stm text unix utf8-string ]; - jailbreak = true; description = "Multithread interactive input/search framework for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114153,7 +110244,6 @@ self: { base binary containers dbus-client derive filepath gtk manatee-core mtl stm text utf8-string webkit ]; - jailbreak = true; description = "Browser extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114178,7 +110268,6 @@ self: { mtl network old-locale old-time process regex-tdfa split stm template-haskell text time unix utf8-string ]; - jailbreak = true; description = "The core of Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114201,7 +110290,6 @@ self: { directory filepath gio glib gtk manatee-core mtl network old-locale old-time regex-tdfa stm template-haskell text utf8-string ]; - jailbreak = true; description = "Download Manager extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114222,7 +110310,6 @@ self: { base binary bytestring containers dbus-client dbus-core derive filepath gtk gtksourceview2 manatee-core regex-tdfa stm text ]; - jailbreak = true; description = "Editor extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114243,7 +110330,6 @@ self: { base binary containers dbus-client derive filepath gio glib gtk manatee-core mtl old-locale old-time stm text utf8-string ]; - jailbreak = true; description = "File manager extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114264,7 +110350,6 @@ self: { base binary containers dbus-client derive filepath gio glib gtk gtkimageview manatee-core regex-tdfa stm text utf8-string ]; - jailbreak = true; description = "Image viewer extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114289,7 +110374,6 @@ self: { gtksourceview2 manatee-core MorseCode mtl nano-md5 network regex-posix split stm template-haskell text unix utf8-string ]; - jailbreak = true; description = "IRC client extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114311,7 +110395,6 @@ self: { filepath gio gtk libtagc manatee-core process random regex-tdfa stm text time unix utf8-string ]; - jailbreak = true; description = "Mplayer client extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114332,7 +110415,6 @@ self: { base binary cairo containers dbus-client derive filepath gtk manatee-core mtl poppler stm text utf8-string ]; - jailbreak = true; description = "PDF viewer extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114352,7 +110434,6 @@ self: { base binary containers dbus-client derive filepath gtk manatee-core proc stm text ]; - jailbreak = true; description = "Process manager extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114373,7 +110454,6 @@ self: { base binary containers curl dbus-client derive download-curl feed filepath gtk manatee-core stm text utf8-string webkit ]; - jailbreak = true; description = "Feed reader extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114394,7 +110474,6 @@ self: { base binary bytestring containers dbus-client dbus-core derive filepath gtk gtksourceview2 manatee-core regex-tdfa stm text ]; - jailbreak = true; description = "Template code to create Manatee application"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114414,7 +110493,6 @@ self: { base binary containers dbus-client derive filepath gtk manatee-core stm text unix vte ]; - jailbreak = true; description = "Terminal Emulator extension for Manatee"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114435,7 +110513,6 @@ self: { base binary bytestring containers dbus-client dbus-core derive filepath gtk manatee-core regex-tdfa stm text ]; - jailbreak = true; description = "Welcome module to help user play Manatee quickly"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -114455,31 +110532,6 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; - "mandrill_0_5_2_2" = callPackage - ({ mkDerivation, aeson, base, base64-bytestring, blaze-html - , bytestring, containers, email-validate, http-client - , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck - , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time - , unordered-containers - }: - mkDerivation { - pname = "mandrill"; - version = "0.5.2.2"; - sha256 = "99031db2a5406c4fe2f3523af6220d793d57f3e75d106e75bfa1bdac9eb77582"; - libraryHaskellDepends = [ - aeson base base64-bytestring blaze-html bytestring containers - email-validate http-client http-client-tls http-types lens mtl - old-locale QuickCheck text time unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit - tasty-quickcheck text - ]; - description = "Library for interfacing with the Mandrill JSON API"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mandrill" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, blaze-html , bytestring, containers, email-validate, http-client @@ -114570,7 +110622,6 @@ self: { version = "0.1.1.0"; sha256 = "9979681fcea7a314db619da04ffca77c93d5afe42ce0b819bd974ca70e74050c"; libraryHaskellDepends = [ base manifolds random-fu vector-space ]; - jailbreak = true; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Sampling random points on general manifolds"; license = stdenv.lib.licenses.gpl3; @@ -114579,17 +110630,19 @@ self: { "manifolds" = callPackage ({ mkDerivation, base, comonad, constrained-categories, containers - , deepseq, hmatrix, MemoTrie, semigroups, tagged, transformers + , deepseq, free-vector-spaces, linear, linearmap-category, MemoTrie + , microlens, microlens-th, semigroups, tagged, transformers , trivial-constraint, vector, vector-space, void }: mkDerivation { pname = "manifolds"; - version = "0.2.2.0"; - sha256 = "95bfb764205c8d2038ec1dacbe30ca89a4bb85d19292dd55e77274f75e71fbc1"; + version = "0.3.0.0"; + sha256 = "011ee59126ab31c49ec4fab8cfe1a77ca76b170f74ecae75f4458e25593616ab"; libraryHaskellDepends = [ - base comonad constrained-categories containers deepseq hmatrix - MemoTrie semigroups tagged transformers trivial-constraint vector - vector-space void + base comonad constrained-categories containers deepseq + free-vector-spaces linear linearmap-category MemoTrie microlens + microlens-th semigroups tagged transformers trivial-constraint + vector vector-space void ]; homepage = "https://github.com/leftaroundabout/manifolds"; description = "Coordinate-free hypersurfaces"; @@ -114612,26 +110665,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "map-syntax_0_2" = callPackage - ({ mkDerivation, base, containers, deepseq, HUnit, mtl, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , transformers - }: - mkDerivation { - pname = "map-syntax"; - version = "0.2"; - sha256 = "395cb1c7c4152252dea825ba54c02dca28a386f495a8bff872eb6383f06e610b"; - libraryHaskellDepends = [ base containers mtl ]; - testHaskellDepends = [ - base containers deepseq HUnit mtl QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 transformers - ]; - jailbreak = true; - description = "Syntax sugar for defining maps"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "map-syntax" = callPackage ({ mkDerivation, base, containers, deepseq, hspec, HUnit, mtl , QuickCheck, transformers @@ -114684,7 +110717,6 @@ self: { executableHaskellDepends = [ base containers gloss mtl splines vector vector-space ]; - jailbreak = true; homepage = "https://github.com/paolino/marionetta"; description = "A study of marionetta movements"; license = stdenv.lib.licenses.bsd3; @@ -114715,6 +110747,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "markdown_0_1_15" = callPackage + ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup + , conduit, conduit-extra, containers, data-default, directory + , filepath, hspec, text, transformers, xml-conduit, xml-types + , xss-sanitize + }: + mkDerivation { + pname = "markdown"; + version = "0.1.15"; + sha256 = "5bf44c4a0df5a9c43dc7fcac86cbbd586c703e1a5f8ba6a77ea8f8207152e628"; + libraryHaskellDepends = [ + attoparsec base blaze-html blaze-markup conduit conduit-extra + containers data-default text transformers xml-conduit xml-types + xss-sanitize + ]; + testHaskellDepends = [ + base blaze-html conduit conduit-extra containers directory filepath + hspec text transformers + ]; + homepage = "https://github.com/snoyberg/markdown"; + description = "Convert Markdown to HTML, with XSS protection"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "markdown-kate" = callPackage ({ mkDerivation, attoparsec, attoparsec-conduit, base, blaze-html , conduit, containers, data-default, highlighting-kate, hspec @@ -114879,7 +110936,6 @@ self: { base cmdargs directory glib gtk gtk2hs-buildtools MissingH mtl pandoc temporary text transformers webkit ]; - jailbreak = true; description = "A simple markup document preview (markdown, textile, reStructuredText)"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; @@ -114908,7 +110964,6 @@ self: { testHaskellDepends = [ aeson base exceptions tasty tasty-hunit text transformers ]; - jailbreak = true; homepage = "https://github.com/lunaryorn/marmalade-upload"; description = "Upload packages to Marmalade"; license = stdenv.lib.licenses.mit; @@ -114961,7 +111016,6 @@ self: { libraryHaskellDepends = [ array base bytestring colour gloss MonadRandom mtl random ]; - jailbreak = true; homepage = "https://qlfiles.net"; description = "Generates mountainous terrain using a random walk algorithm"; license = stdenv.lib.licenses.gpl3; @@ -114988,7 +111042,6 @@ self: { executableHaskellDepends = [ base configurator dlist parsek pretty ]; - jailbreak = true; description = "Markup language preprocessor for Haskell"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -115012,7 +111065,6 @@ self: { persistent-template regex-posix text transformers twitter-conduit twitter-types ]; - jailbreak = true; homepage = "https://github.com/minamiyama1994/chomado-bot-on-haskell/tree/minamiyama1994"; description = "@minamiyama1994_bot on haskell"; license = stdenv.lib.licenses.gpl3; @@ -115057,39 +111109,12 @@ self: { sha256 = "c478bb1bd5cebcd1d64c8bb80745222b64a5b6b2e99a450df1dfa201d962369c"; libraryHaskellDepends = [ base bytestring prednote text ]; librarySystemDepends = [ pcre ]; - jailbreak = true; homepage = "http://www.github.com/massysett/matchers"; description = "Text matchers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) pcre;}; - "math-functions_0_1_7_0" = callPackage - ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-th-unbox - }: - mkDerivation { - pname = "math-functions"; - version = "0.1.7.0"; - sha256 = "f3faa070947829fb56a5563f474bfe41237b4b5e8c88c37cac42d208f4a6bea6"; - revision = "1"; - editedCabalFile = "c7e7287e2206d4bc8020141fc9a2b2f1ee09dd8c11f4e2eacbd24e68b99852f5"; - libraryHaskellDepends = [ - base deepseq erf primitive vector vector-th-unbox - ]; - testHaskellDepends = [ - base deepseq erf HUnit primitive QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 vector - vector-th-unbox - ]; - doCheck = false; - homepage = "https://github.com/bos/math-functions"; - description = "Special functions and Chebyshev polynomials"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "math-functions" = callPackage ({ mkDerivation, base, deepseq, erf, HUnit, primitive, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -115097,10 +111122,8 @@ self: { }: mkDerivation { pname = "math-functions"; - version = "0.2.0.1"; - sha256 = "ac165116d981d879b4ea4f387d40140515d75823d8d60295514c41dbf4cac641"; - revision = "1"; - editedCabalFile = "3722814c83e907f40959812ff4209a704e27d53be667c98b83815b222e073f27"; + version = "0.2.0.2"; + sha256 = "2358ee156011a9d97cae2596c788bd00cd6ee698e5fb1c67e0eefb15aff24737"; libraryHaskellDepends = [ base deepseq primitive vector vector-th-unbox ]; @@ -115109,7 +111132,6 @@ self: { test-framework-hunit test-framework-quickcheck2 vector vector-th-unbox ]; - doCheck = false; homepage = "https://github.com/bos/math-functions"; description = "Special functions and Chebyshev polynomials"; license = stdenv.lib.licenses.bsd3; @@ -115197,7 +111219,6 @@ self: { array base containers haskell98 ix-shapable mtl ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; homepage = "http://community.haskell.org/~TracyWadleigh/mathlink"; description = "Write Mathematica packages in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -115212,7 +111233,6 @@ self: { sha256 = "fd5022375f70d1d5d0bff5e7e4ea7981db04cd8725047968f11d7f1b29a36a22"; libraryHaskellDepends = [ array base Cabal filepath ]; librarySystemDepends = [ eng mat mx ]; - jailbreak = true; description = "Matlab bindings and interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -115326,7 +111346,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/jfischoff/maxent"; description = "Compute Maximum Entropy Distributions"; license = stdenv.lib.licenses.bsd3; @@ -115360,10 +111379,10 @@ self: { containers-unicode-symbols HaLeX IndentParser mtl parsec process uuagc uuagc-cabal ]; - jailbreak = true; homepage = "http://rochel.info/maxsharing/"; description = "Maximal sharing of terms in the lambda calculus with letrec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "maybe-justify" = callPackage @@ -115392,7 +111411,6 @@ self: { executableHaskellDepends = [ base benchpress Cabal directory filepath mtl process time ]; - jailbreak = true; homepage = "http://code.google.com/p/maybench/"; description = "Automated benchmarking tool"; license = stdenv.lib.licenses.bsd3; @@ -115459,9 +111477,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gloss ]; - jailbreak = true; homepage = "http://www.cas.mcmaster.ca/~anand/"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mcmc-samplers" = callPackage @@ -115475,7 +111493,6 @@ self: { libraryHaskellDepends = [ base containers hakaru hmatrix mwc-random primitive statistics ]; - jailbreak = true; description = "Combinators for MCMC sampling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -115488,9 +111505,9 @@ self: { version = "0.1.2.2"; sha256 = "781714d8cc3ba1362a98cfcdc3b21a10fb83904efa599a6d48434a8b5beae193"; libraryHaskellDepends = [ base MonadRandom ]; - jailbreak = true; description = "MCMC applied to probabilistic program synthesis"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mcmc-types" = callPackage @@ -115517,10 +111534,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base network split transformers ]; executableHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "https://github.com/DougBurke/hmcpi"; description = "Connect to MineCraft running on a Raspberry PI"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mdapi" = callPackage @@ -115537,10 +111554,10 @@ self: { aeson base bytestring data-default lens lens-aeson text transformers wreq ]; - jailbreak = true; homepage = "https://github.com/relrod/mdapi-hs"; description = "Haskell interface to Fedora's mdapi"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mdcat" = callPackage @@ -115558,7 +111575,6 @@ self: { executableHaskellDepends = [ ansi-terminal base directory pandoc terminfo ]; - jailbreak = true; homepage = "https://github.com/dorafmon/mdcat"; description = "Markdown viewer in your terminal"; license = stdenv.lib.licenses.mit; @@ -115592,9 +111608,9 @@ self: { testHaskellDepends = [ base containers HTF HUnit QuickCheck vector ]; - jailbreak = true; description = "Tools for solving Markov Decision Processes"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "means" = callPackage @@ -115616,10 +111632,10 @@ self: { sha256 = "e30f55b6a0d0ed13de5d4ecd9fedbbac918097ec0ae912c1ac2477eb8807c57c"; libraryHaskellDepends = [ base bytestring text ]; librarySystemDepends = [ mecab ]; - jailbreak = true; homepage = "http://github.com/tanakh/hsmecab"; description = "A Haskell binding to MeCab"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) mecab;}; "mech" = callPackage @@ -115629,10 +111645,10 @@ self: { version = "0.0.0.0"; sha256 = "dad2e243e0122a9c0cde529c0a309775b9332b20301942d1b02ded6c32013665"; libraryHaskellDepends = [ base machines ]; - jailbreak = true; homepage = "http://github.com/cartazio/mecha"; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mecha" = callPackage @@ -115656,10 +111672,10 @@ self: { version = "0.0.0.0"; sha256 = "dd73407f98ef5c1a795df33cb4537df60a62f36d34c7cf9a0dd0685aa5c6e413"; libraryHaskellDepends = [ base machines ]; - jailbreak = true; homepage = "http://github.com/cartazio/mecha"; description = "mecha are the most complex composite machines known to humanity, lets build them well!"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mediawiki" = callPackage @@ -115719,7 +111735,6 @@ self: { aeson base bytestring data-default-class either http-client servant-client servant-server text time ]; - jailbreak = true; description = "Haskell SDK for communicating with the Medium API"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -115767,26 +111782,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "megaparsec_4_4_0" = callPackage - ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , text, transformers - }: - mkDerivation { - pname = "megaparsec"; - version = "4.4.0"; - sha256 = "93addf2a1cf14cb88fd67ea9951d8dd76bcb75960936a517b13787ed0e26f310"; - libraryHaskellDepends = [ base bytestring mtl text transformers ]; - testHaskellDepends = [ - base HUnit mtl QuickCheck test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - homepage = "https://github.com/mrkkrp/megaparsec"; - description = "Monadic parser combinators"; - license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "megaparsec" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, exceptions , HUnit, mtl, QuickCheck, scientific, test-framework @@ -115811,6 +111806,31 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "megaparsec_5_1_2" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, exceptions + , hspec, hspec-expectations, mtl, QuickCheck, scientific, text + , transformers + }: + mkDerivation { + pname = "megaparsec"; + version = "5.1.2"; + sha256 = "ecb943979f8078a0f6e3bf8db2232d91cb1224768aa8ea0b8fc577af24b36ccd"; + revision = "1"; + editedCabalFile = "5286fd0b0f2edd01ca06e4cc1f814eedf81365c8b7b36cf3023128f75fadbc54"; + libraryHaskellDepends = [ + base bytestring containers deepseq exceptions mtl QuickCheck + scientific text transformers + ]; + testHaskellDepends = [ + base bytestring containers exceptions hspec hspec-expectations mtl + QuickCheck scientific text transformers + ]; + homepage = "https://github.com/mrkkrp/megaparsec"; + description = "Monadic parser combinators"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "meldable-heap" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -115829,8 +111849,8 @@ self: { }: mkDerivation { pname = "mellon-core"; - version = "0.7.0.1"; - sha256 = "addfa2b5cd790a7cff00f48366f5ad3e25a77e3a6d8163a3914da5b1d0c79288"; + version = "0.7.0.3"; + sha256 = "02164fc2941eed7866e81b2d06b57b1ecb18151896e0bef795ad023b21773604"; libraryHaskellDepends = [ async base mtl time transformers ]; testHaskellDepends = [ async base doctest hlint hspec mtl QuickCheck quickcheck-instances @@ -115845,8 +111865,8 @@ self: { ({ mkDerivation, base, hlint, hpio, mellon-core }: mkDerivation { pname = "mellon-gpio"; - version = "0.7.0.1"; - sha256 = "f9585f0bcf3850437eaa689046d27e2d0df52a0d668ba0ee4f9eee155ba82380"; + version = "0.7.0.3"; + sha256 = "da0a2a616eb2834fe98fd4e456317d569b88de27b573d11f1e82b15294ea3222"; libraryHaskellDepends = [ base hpio mellon-core ]; testHaskellDepends = [ base hlint ]; homepage = "https://github.com/dhess/mellon/"; @@ -115856,15 +111876,15 @@ self: { "mellon-web" = callPackage ({ mkDerivation, aeson, base, bytestring, exceptions, hlint, hpio - , hspec, hspec-wai, http-client, http-types, lucid, mellon-core - , mellon-gpio, mtl, network, optparse-applicative, servant - , servant-client, servant-docs, servant-lucid, servant-server, text - , time, transformers, wai, wai-extra, warp + , hspec, hspec-wai, http-client, http-client-tls, http-types, lucid + , mellon-core, mellon-gpio, mtl, network, optparse-applicative + , servant, servant-client, servant-docs, servant-lucid + , servant-server, text, time, transformers, wai, wai-extra, warp }: mkDerivation { pname = "mellon-web"; - version = "0.7.0.1"; - sha256 = "dc51190cd4529f2d3844fef77edafa6c7b4c5680f7e4c422392f211bf9de46b1"; + version = "0.7.0.3"; + sha256 = "77396dd6091f3c940bf1b15e1415698f432bb70d53557ea2988580fc54ae256b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -115873,8 +111893,9 @@ self: { text time transformers wai warp ]; executableHaskellDepends = [ - base exceptions hpio mellon-core mellon-gpio mtl network - optparse-applicative time transformers warp + base bytestring exceptions hpio http-client http-client-tls + http-types mellon-core mellon-gpio mtl network optparse-applicative + servant-client time transformers warp ]; testHaskellDepends = [ aeson base bytestring hlint hspec hspec-wai http-client http-types @@ -115905,7 +111926,6 @@ self: { testHaskellDepends = [ base containers HUnit mtl test-framework test-framework-hunit ]; - jailbreak = true; description = "A functional scripting language"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -115976,10 +111996,10 @@ self: { version = "0.2.1"; sha256 = "cd8bd88caf906b004307176cd468f415b536f52a4e663e3c6006fc0bedffdca8"; libraryHaskellDepends = [ base bytestring network utf8-light ]; - jailbreak = true; homepage = "http://github.com/olegkat/haskell-memcached"; description = "haskell bindings for memcached"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memcached-binary" = callPackage @@ -116000,11 +112020,10 @@ self: { testHaskellDepends = [ base bytestring data-default-class hspec HUnit network process ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/philopon/memcached-binary"; description = "memcached client using binary protocol"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memexml" = callPackage @@ -116026,9 +112045,9 @@ self: { version = "0.1.0.0"; sha256 = "29b84899c725d87518cb4cb2313d9a29c775a229116e8286ce0cb8ddc631c3ef"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "Pointer equality memoization"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "memo-sqlite" = callPackage @@ -116038,7 +112057,6 @@ self: { version = "0.1"; sha256 = "c3ef7f29b5707af12a4cd5321d9cbf4b637b307c953cf7199ae9489e84fa32be"; libraryHaskellDepends = [ base direct-sqlite ]; - jailbreak = true; homepage = "https://gitorious.org/memo-sqlite"; description = "memoize functions using SQLite3 database"; license = stdenv.lib.licenses.bsd3; @@ -116057,24 +112075,9 @@ self: { base containers lrucache time time-units ]; testHaskellDepends = [ base hspec time time-units ]; - jailbreak = true; homepage = "http://github.com/yamadapc/haskell-memoization-utils"; description = "Utilities for memoizing functions"; license = stdenv.lib.licenses.mit; - }) {}; - - "memoize_0_7" = callPackage - ({ mkDerivation, base, template-haskell }: - mkDerivation { - pname = "memoize"; - version = "0.7"; - sha256 = "04dbd6e367132c477342a3a7271438a9d2ec55cd433e1d01807a6091934d11eb"; - revision = "1"; - editedCabalFile = "4dccaf9fbeff4ff6207a78541ec3a6592db9c732fc65aa8bef1c5d8ff9c1f9f2"; - libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; - description = "A memoization library"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -116190,26 +112193,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "messagepack_0_5_1" = callPackage - ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck - , test-framework, test-framework-quickcheck2, test-framework-th - }: - mkDerivation { - pname = "messagepack"; - version = "0.5.1"; - sha256 = "e12c22991bd4265e3a52642d0e5970182ecd931afdf8552088d49a524c49625d"; - libraryHaskellDepends = [ base bytestring cereal containers ]; - testHaskellDepends = [ - base bytestring cereal containers QuickCheck test-framework - test-framework-quickcheck2 test-framework-th - ]; - doCheck = false; - homepage = "https://github.com/rodrigosetti/messagepack"; - description = "Serialize instance for Message Pack Object"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "messagepack" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck , test-framework, test-framework-quickcheck2, test-framework-th @@ -116223,7 +112206,6 @@ self: { base bytestring cereal containers QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - doCheck = false; homepage = "https://github.com/rodrigosetti/messagepack"; description = "Serialize instance for Message Pack Object"; license = stdenv.lib.licenses.mit; @@ -116256,10 +112238,10 @@ self: { libraryHaskellDepends = [ base bytestring HTTP http-conduit network ]; - jailbreak = true; homepage = "http://github.com/kaiko/messente-haskell"; description = "Messente SMS Gateway"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "meta-misc" = callPackage @@ -116318,7 +112300,6 @@ self: { version = "0.4.3.0"; sha256 = "bfb2da5ff25544a36364e2e1560034ad9bfed0bd76e317567e4a6d3def7bc020"; libraryHaskellDepends = [ base text time ]; - jailbreak = true; homepage = "https://github.com/cutsea110/metadata"; description = "metadata library for semantic web"; license = stdenv.lib.licenses.bsd3; @@ -116385,9 +112366,9 @@ self: { testHaskellDepends = [ async base lens mwc-random primitive QuickCheck unix ]; - doHaddock = false; description = "High-performance application metric tracking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "metricsd-client" = callPackage @@ -116397,9 +112378,9 @@ self: { version = "0.1"; sha256 = "09171debb866a05de5e4a9a928af37547121010446ca534401060759373f00e1"; libraryHaskellDepends = [ base network ]; - jailbreak = true; description = "Client for the metrics aggregator Metricsd"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "metronome" = callPackage @@ -116422,9 +112403,9 @@ self: { version = "0.0.0"; sha256 = "8252be7d73700b7401c87248e6eb5cb23873d0ce092f9b15583c4fd59b46df2b"; libraryHaskellDepends = [ base containers mtl transformers ]; - jailbreak = true; description = "Pure Profunctor Functional Lenses"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mfsolve" = callPackage @@ -116469,7 +112450,6 @@ self: { libraryHaskellDepends = [ base haskell-src-meta parsec split template-haskell ]; - jailbreak = true; homepage = "https://github.com/matt76k/mi"; description = "Multiple Instance for Haskell"; license = stdenv.lib.licenses.mit; @@ -116500,8 +112480,8 @@ self: { }: mkDerivation { pname = "microformats2-parser"; - version = "1.0.1.5"; - sha256 = "45be8a1f330be4dc435302dae223f80b21e5be388fbca9a8abf8a8489f4938cc"; + version = "1.0.1.6"; + sha256 = "9937ae3658bf1bfbb34f03cc8f0fcd1c236f72cd52f5845cfbd19f02a3ed33f8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116523,6 +112503,7 @@ self: { homepage = "https://github.com/myfreeweb/microformats2-parser"; description = "A Microformats 2 parser"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microformats2-types" = callPackage @@ -116542,19 +112523,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "microlens_0_4_5_0" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "microlens"; - version = "0.4.5.0"; - sha256 = "93cbdb35aa3a653aaee6ec39f895a5c12a663adc120ecb4978b31b034fd69e19"; - 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."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -116567,29 +112535,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-aeson_2_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, directory - , doctest, filepath, generic-deriving, microlens, scientific - , semigroups, simple-reflect, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-aeson"; - version = "2.1.1"; - sha256 = "5b43bcdc52d4b86b8c74040f754209efa95f5983d5d114d2af6709949614acda"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring microlens scientific text - unordered-containers vector - ]; - testHaskellDepends = [ - base directory doctest filepath generic-deriving semigroups - simple-reflect - ]; - homepage = "http://github.com/fosskers/microlens-aeson/"; - description = "Law-abiding lenses for Aeson, using microlens"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, microlens , scientific, tasty, tasty-hunit, text, unordered-containers @@ -116632,27 +112577,9 @@ self: { version = "0.1.0.0"; sha256 = "b27354ca9d7fb054db493c0aa39cd616607709e2e2156b98900a411ef3167301"; libraryHaskellDepends = [ base microlens ]; - jailbreak = true; homepage = "http://github.com/aelve/microlens"; description = "'each' for microlens"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-ghc_0_4_5_0" = callPackage - ({ mkDerivation, array, base, bytestring, containers, microlens - , transformers - }: - mkDerivation { - pname = "microlens-ghc"; - version = "0.4.5.0"; - sha256 = "331c1851cfb398faf67e6956a64cf7dc06c85d95ccd4638e3d2ae5c59199212a"; - libraryHaskellDepends = [ - array base bytestring containers microlens transformers - ]; - jailbreak = true; - homepage = "http://github.com/aelve/microlens"; - description = "microlens + array, bytestring, containers, transformers"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -116672,23 +112599,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-mtl_0_1_9_0" = callPackage - ({ mkDerivation, base, microlens, mtl, transformers - , transformers-compat - }: - mkDerivation { - pname = "microlens-mtl"; - version = "0.1.9.0"; - sha256 = "cf6dfd8c069eed3361952e8db75a065ab94072c430ed2a43a7a7383344726ac8"; - libraryHaskellDepends = [ - base microlens mtl transformers transformers-compat - ]; - homepage = "http://github.com/aelve/microlens"; - description = "microlens support for Reader/Writer/State from mtl"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-mtl" = callPackage ({ mkDerivation, base, microlens, mtl, transformers , transformers-compat @@ -116705,25 +112615,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-platform_0_3_3_0" = callPackage - ({ mkDerivation, base, hashable, microlens, microlens-ghc - , microlens-mtl, microlens-th, text, unordered-containers, vector - }: - mkDerivation { - pname = "microlens-platform"; - version = "0.3.3.0"; - sha256 = "174c87afcb0d3004e52b4283773aa16d2a6f0a3b819b362a36f75d7e72433ca8"; - libraryHaskellDepends = [ - base hashable microlens microlens-ghc microlens-mtl microlens-th - text unordered-containers vector - ]; - jailbreak = true; - homepage = "http://github.com/aelve/microlens"; - description = "Feature-complete microlens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-platform" = callPackage ({ mkDerivation, base, hashable, microlens, microlens-ghc , microlens-mtl, microlens-th, text, unordered-containers, vector @@ -116741,21 +112632,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "microlens-th_0_4_0_0" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.0.0"; - sha256 = "66972dfd673bce055e22487fde172471b50659125068438330d54732cfc2c1ce"; - libraryHaskellDepends = [ - base containers microlens template-haskell - ]; - homepage = "http://github.com/aelve/microlens"; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "microlens-th" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell }: mkDerivation { @@ -116776,16 +112652,16 @@ self: { }: mkDerivation { pname = "micrologger"; - version = "0.3.1.0"; - sha256 = "d0371c5056b7f68bb2b1f1157c162b2d084fa8d6e316b005b1e75200edbd9d96"; + version = "0.3.1.1"; + sha256 = "6c523c9c967dffa3024f0160c78aa56b8d1cadc37d6065912bad0b98a59e01e7"; libraryHaskellDepends = [ aeson base containers text text-format time transformers ]; testHaskellDepends = [ aeson base hspec text ]; - jailbreak = true; homepage = "https://github.com/savannidgerinel/micrologger#readme"; description = "A super simple logging module. Only for use for very simple projects."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "microspec" = callPackage @@ -116813,30 +112689,29 @@ self: { "mida" = callPackage ({ mkDerivation, aeson, base, containers, data-default, exceptions - , filepath, formatting, haskeline, HCodecs, megaparsec, mtl - , optparse-applicative, path, path-io, process, QuickCheck, random - , test-framework, test-framework-quickcheck2, text, tf-random - , transformers, yaml + , file-embed, filepath, formatting, haskeline, HCodecs, hspec + , megaparsec, mtl, optparse-applicative, path, path-io, process + , QuickCheck, random, text, tf-random, transformers, yaml }: mkDerivation { pname = "mida"; - version = "1.0.1"; - sha256 = "97e76f04d0bad25eefc19fdb7df6f53ce351918fc52815bf9a163417b730b859"; + version = "1.0.2"; + sha256 = "902ce590e9fb57138676eacc4bdcb4ed536f54df054f4c606a4c6c71b6f475f7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers exceptions haskeline HCodecs megaparsec mtl random - text tf-random transformers + base containers exceptions haskeline HCodecs megaparsec mtl + QuickCheck random text tf-random transformers ]; executableHaskellDepends = [ - aeson base containers data-default exceptions filepath formatting - haskeline HCodecs megaparsec mtl optparse-applicative path path-io - process random text tf-random transformers yaml + aeson base containers data-default exceptions file-embed filepath + formatting haskeline HCodecs megaparsec mtl optparse-applicative + path path-io process QuickCheck random text tf-random transformers + yaml ]; testHaskellDepends = [ - base containers HCodecs megaparsec mtl QuickCheck random - test-framework test-framework-quickcheck2 text tf-random - transformers + base containers HCodecs hspec megaparsec mtl QuickCheck random text + tf-random transformers ]; homepage = "https://github.com/mrkkrp/mida"; description = "Language for algorithmic generation of MIDI files"; @@ -116850,9 +112725,9 @@ self: { version = "0.2.0.0"; sha256 = "32262281f8785a3fa4ab6c60302566a8dcf59287f0da95e4d42bb8212f88b1b9"; libraryHaskellDepends = [ base containers safe stm ]; - jailbreak = true; description = "Hot-swappable FRP"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi" = callPackage @@ -116907,10 +112782,10 @@ self: { base containers diagrams-lib diagrams-postscript event-list midi non-empty optparse-applicative utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/midi-music-box"; description = "Convert MIDI file to music box punch tape"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midi-util" = callPackage @@ -116941,10 +112816,10 @@ self: { libraryHaskellDepends = [ base bytestring directory event-list midi parsec process ]; - jailbreak = true; homepage = "https://github.com/GuiltyDolphin/midi-utils"; description = "Utilities for working with MIDI data"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midimory" = callPackage @@ -116960,10 +112835,10 @@ self: { executableHaskellDepends = [ alsa-core alsa-seq base containers random transformers wx wxcore ]; - jailbreak = true; homepage = "http://www.youtube.com/watch?v=cOlR73h2uII"; description = "A Memory-like (Concentration, Pairs, ...) game for tones"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "midisurface" = callPackage @@ -116979,7 +112854,6 @@ self: { executableHaskellDepends = [ alsa-core alsa-seq base containers gtk mtl stm ]; - jailbreak = true; description = "A control midi surface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -117034,7 +112908,6 @@ self: { warp ]; testHaskellDepends = [ base hspec http-client ]; - jailbreak = true; homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "High performance web server on WAI/warp"; license = stdenv.lib.licenses.bsd3; @@ -117065,10 +112938,28 @@ self: { version = "0.2.0.1"; sha256 = "b7d2b0aa2288f5874aad326043676f667bc61e930d0a5e9c5a90243807e023ed"; libraryHaskellDepends = [ base bytestring ]; - jailbreak = true; homepage = "https://github.com/evanrinehart/mikmod"; description = "MikMod bindings"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "mikrokosmos" = callPackage + ({ mkDerivation, ansi-terminal, base, containers, haskeline, HUnit + , mtl, multimap, parsec + }: + mkDerivation { + pname = "mikrokosmos"; + version = "0.2.0"; + sha256 = "853b4e3c3f2299f550f18bb0692bc194a2720b57fbcb5bf2aba70713586375b2"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal base containers haskeline HUnit mtl multimap parsec + ]; + homepage = "https://github.com/M42/mikrokosmos"; + description = "Lambda calculus interpreter"; + license = stdenv.lib.licenses.gpl3; }) {}; "miku" = callPackage @@ -117106,7 +112997,6 @@ self: { base bytestring lens mtl network QuickCheck semigroups tasty tasty-hspec tasty-quickcheck ]; - jailbreak = true; description = "A Kafka client for Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -117166,8 +113056,8 @@ self: { }: mkDerivation { pname = "mime-mail-ses"; - version = "0.3.2.2"; - sha256 = "c10bbf88ca04119c060f74b7bc1f139ba23bbf122596fbf8c46d0d8e6f76f4b7"; + version = "0.3.2.3"; + sha256 = "03f977386c2cdf122097a0327509e4151eb10e320d8cec1791d259aa067f4d4c"; libraryHaskellDepends = [ base base64-bytestring byteable bytestring conduit cryptohash http-client http-conduit http-types mime-mail old-locale text time @@ -117254,7 +113144,6 @@ self: { base binary binary-generic bytestring cairo containers directory filepath glade gtk random time ]; - jailbreak = true; description = "Minesweeper game which is always solvable without guessing"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -117289,7 +113178,6 @@ self: { executableHaskellDepends = [ base containers lens mtl parsec readline ]; - jailbreak = true; description = "Miniature FORTH-like interpreter"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -117306,10 +113194,10 @@ self: { libraryHaskellDepends = [ array base bytestring containers mtl semigroups text transformers ]; - jailbreak = true; homepage = "https://github.com/RaminHAL9001/minilens"; description = "A minimalistic lens library, providing only the simplest, most basic lens functionality"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minimal-configuration" = callPackage @@ -117367,10 +113255,10 @@ self: { executableHaskellDepends = [ ansi-terminal base MissingH process time ]; - jailbreak = true; homepage = "http://github.com/jhickner/minions"; description = "A fast parallel ssh tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "minioperational" = callPackage @@ -117403,7 +113291,6 @@ self: { libraryHaskellDepends = [ base colock directory mtl network stm unix ]; - jailbreak = true; description = "simple 1-to-N interprocess communication"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -117424,7 +113311,6 @@ self: { base data-accessor data-accessor-template directory filepath mtl old-locale old-time process safe split template-haskell ]; - jailbreak = true; homepage = "http://tener.github.com/haskell-minirotate/"; description = "Minimalistic file rotation utility"; license = stdenv.lib.licenses.bsd3; @@ -117505,28 +113391,22 @@ self: { sha256 = "3be63590a01f8504f372fe7565a318eef8d6de31e6e251bdac01965297793d1a"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; - jailbreak = true; homepage = "https://github.com/kryoxide/minst-idx/"; description = "Read and write IDX data that is used in e.g. the MINST database."; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mios" = callPackage - ({ mkDerivation, base, bytestring, containers, ghc-prim, primitive - , vector - }: + ({ mkDerivation, base, bytestring, ghc-prim, vector }: mkDerivation { pname = "mios"; - version = "1.3.0"; - sha256 = "975fa3ce06cdbd03956dbd238f344f71cd4021b8e4eacd615cf1898013eb157e"; + version = "1.4.0"; + sha256 = "3cc891fd9849f2853ce2f19325fac3eb7c6adb2b684aa4922c2ae66638ac3c2d"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ - base bytestring containers ghc-prim primitive vector - ]; - executableHaskellDepends = [ - base bytestring containers ghc-prim primitive vector - ]; + libraryHaskellDepends = [ base bytestring ghc-prim vector ]; + executableHaskellDepends = [ base bytestring ghc-prim vector ]; homepage = "https://github.com/shnarazk/mios"; description = "A Minisat-based SAT solver in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -117546,7 +113426,6 @@ self: { authenticate-oauth base bytestring conduit lens monad-logger text transformers twitter-conduit ]; - jailbreak = true; homepage = "https://github.com/minamiyama1994/mirror-tweet"; description = "Tweet mirror"; license = stdenv.lib.licenses.gpl3; @@ -117625,10 +113504,10 @@ self: { executableHaskellDepends = [ array base containers simple-tabular ]; - jailbreak = true; homepage = "http://wiki.cs.pdx.edu/bartforge/oms"; description = "Find optimal mixed strategies for two-player games"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mkbndl" = callPackage @@ -117749,10 +113628,10 @@ self: { sha256 = "e8881f03789ae5046b33a051a0cc5a269614642d5876d893fc4a9c34b9bdad56"; libraryHaskellDepends = [ base binary bytestring vector ]; testHaskellDepends = [ base binary directory hspec vector ]; - jailbreak = true; homepage = "https://github.com/kryoxide/mnist-idx/"; description = "Read and write IDX data that is used in e.g. the MNIST database."; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "moan" = callPackage @@ -117767,7 +113646,6 @@ self: { base binary bytestring containers dawg regex-tdfa regex-tdfa-text tagset-positional text zlib ]; - jailbreak = true; homepage = "https://github.com/vjeranc/moan"; description = "Language-agnostic analyzer for positional morphosyntactic tags"; license = stdenv.lib.licenses.bsd3; @@ -117795,20 +113673,18 @@ self: { }) {}; "modbus-tcp" = callPackage - ({ mkDerivation, base, base-unicode-symbols, bytestring, cereal - , network - }: + ({ mkDerivation, base, bytestring, cereal, network, transformers }: mkDerivation { pname = "modbus-tcp"; - version = "0.1"; - sha256 = "996aa62fc7d5ac0112d128fc3209c4bf1c9a55bc0bd5c636f8cdefbc0d9b0fc8"; + version = "0.2.1"; + sha256 = "b235be55c9efcb4796ba7bfd11e6592ecb0dbbbf814aff4ebe33314b0caf51b8"; libraryHaskellDepends = [ - base base-unicode-symbols bytestring cereal network + base bytestring cereal network transformers ]; - jailbreak = true; homepage = "https://github.com/roelvandijk/modbus-tcp"; description = "Communicate with Modbus devices over TCP"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "modelicaparser" = callPackage @@ -117823,7 +113699,6 @@ self: { testHaskellDepends = [ ansi-terminal base containers filepath parsec QuickCheck ]; - jailbreak = true; description = "A parser for the modelica language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -117883,7 +113758,6 @@ self: { sha256 = "5b1592ef852596e8c4e1ac5e8f213ee0272a8e0bf6c3d431a86bbeaff35cb700"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; - jailbreak = true; homepage = "https://github.com/TikhonJelvis/modular-arithmetic"; description = "A type for integers modulo some constant"; license = stdenv.lib.licenses.bsd3; @@ -117903,7 +113777,6 @@ self: { base basic-prelude bytestring containers data-default hashable system-filepath text transformers unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/DanBurton/modular-prelude#readme"; description = "A new Prelude featuring first class modules"; license = stdenv.lib.licenses.mit; @@ -117917,7 +113790,6 @@ self: { version = "0.1.0.0"; sha256 = "dd76f45afabff8476079dbd0ce30ffac45c9897e123d1d4fa9daa8d45eb6f1c7"; libraryHaskellDepends = [ base classy-prelude modular-prelude ]; - jailbreak = true; homepage = "https://github.com/DanBurton/modular-prelude#readme"; description = "Reifying ClassyPrelude a la ModularPrelude"; license = stdenv.lib.licenses.mit; @@ -117968,7 +113840,6 @@ self: { base exceptions filepath ghc ghc-paths template-haskell temporary transformers ]; - jailbreak = true; homepage = "https://github.com/jfischoff/modulespection"; description = "Template Haskell for introspecting a module's declarations"; license = stdenv.lib.licenses.bsd3; @@ -117990,9 +113861,9 @@ self: { atto-lisp base data-default directory haskell-src language-c mtl nats pandoc-types parsec prettify process semigroups text ]; - jailbreak = true; description = "Modular C code generator"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "moe" = callPackage @@ -118032,6 +113903,7 @@ self: { homepage = "https://github.com/nfjinjing/moesocks"; description = "A functional firewall killer"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mohws" = callPackage @@ -118080,7 +113952,6 @@ self: { attoparsec base bytestring containers hspec hspec-smallcheck kraken smallcheck stm text time unordered-containers vector ]; - jailbreak = true; description = "A glorified string replacement tool"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -118092,8 +113963,8 @@ self: { }: mkDerivation { pname = "mollie-api-haskell"; - version = "0.1.0.1"; - sha256 = "a23421f8c7a8c3ed21f8742a8ec5072c7381e4d3e65c3c4ebf30e5fa7e2f5a20"; + version = "0.1.0.2"; + sha256 = "2d4813f1e3eb4c4996f52012075f084d69bac4b3f52bc05bad8107718860e255"; libraryHaskellDepends = [ aeson base bytestring HsOpenSSL http-client http-client-openssl http-types mtl text time @@ -118102,6 +113973,7 @@ self: { homepage = "https://github.com/paramanders/mollie-api-haskell"; description = "Mollie API client for Haskell http://www.mollie.com"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-abort-fd" = callPackage @@ -118178,6 +114050,7 @@ self: { homepage = "https://github.com/strake/monad-classes.hs"; description = "more flexible mtl"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-codec" = callPackage @@ -118267,7 +114140,6 @@ self: { base monad-control mtl-evil-instances transformers transformers-base ]; - jailbreak = true; description = "Exstensible monadic exceptions"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -118296,9 +114168,9 @@ self: { version = "0.1"; sha256 = "8cdfc6c868b5599d12cc238a5def812bc084414d50ea485c747d304ff056bc97"; libraryHaskellDepends = [ base monad-control ]; - jailbreak = true; description = "Type class for monads which support a fork operation"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-gen" = callPackage @@ -118391,7 +114263,6 @@ self: { libraryHaskellDepends = [ base constraints transformers transformers-compat ]; - jailbreak = true; homepage = "https://github.com/ivan-m/monad-levels"; description = "Specific levels of monad transformers"; license = stdenv.lib.licenses.mit; @@ -118445,8 +114316,8 @@ self: { }: mkDerivation { pname = "monad-logger"; - version = "0.3.19"; - sha256 = "a7b74d8df0db08e3ab231cba649febac0599b4b6b6bbe03828914669d1b085f0"; + version = "0.3.20"; + sha256 = "58be0b1e04d1cce4a40e9502448de8ae2c72eff98a6c173539653bacbb3c9fe9"; libraryHaskellDepends = [ base blaze-builder bytestring conduit conduit-extra exceptions fast-logger lifted-base monad-control monad-loops mtl resourcet stm @@ -118480,14 +114351,13 @@ self: { }: mkDerivation { pname = "monad-logger-prefix"; - version = "0.1.5"; - sha256 = "fac86ae4d93d817963a9f8a75eadbd08bde5b1f3e6a12f07ef85f30c9a452fcf"; + version = "0.1.6"; + sha256 = "fb7697098223b64ab42e7739eba16eacf80d8eb8a577a5a4dcca9bcec5e94d92"; libraryHaskellDepends = [ base exceptions monad-control monad-logger mtl resourcet text transformers transformers-base ]; testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; - doCheck = false; homepage = "https://github.com/sellerlabs/monad-logger-prefix#readme"; description = "Add prefixes to your monad-logger output"; license = stdenv.lib.licenses.asl20; @@ -118597,7 +114467,6 @@ self: { version = "0.1.0.0"; sha256 = "7d0b1777eed3cb67c7ac7ad65b8ca7e80394a7820a13d845e6d6b9b5db2702a2"; libraryHaskellDepends = [ base exceptions mtl transformers ]; - jailbreak = true; description = "Open recursion for when you need it"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -118685,6 +114554,7 @@ self: { homepage = "https://github.com/mnacamura/monad-parallel-progressbar"; description = "Parallel execution of monadic computations with a progress bar"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-param" = callPackage @@ -118750,7 +114620,6 @@ self: { version = "0.1.0"; sha256 = "5d51cc345f244414f48803f4a34d425b50e380efc26090e1444e7c4896d0c913"; libraryHaskellDepends = [ base ghc-prim mtl ]; - jailbreak = true; description = "Fast monads and monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -118763,10 +114632,10 @@ self: { version = "0.1.2.0"; sha256 = "79b678b13259b679438f3f7befb3ef5294dfee7bbda922326db852b9172bdf27"; libraryHaskellDepends = [ base mmorph mtl transformers ]; - jailbreak = true; homepage = "https://github.com/igraves/resumption_monads"; description = "Resumption and reactive resumption monads for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-skeleton" = callPackage @@ -118788,10 +114657,10 @@ self: { version = "0.2.4"; sha256 = "718d5ae878306e0527e3b6ce32d5ad59fd83432b90012a594059d3720fd0c7c8"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/monad-st"; description = "Provides a MonadST class"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-state" = callPackage @@ -118808,6 +114677,7 @@ self: { homepage = "https://github.com/bairyn/monad-state"; description = "Utility library for monads, particularly those involving state"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-statevar" = callPackage @@ -118897,10 +114767,10 @@ self: { version = "0.1.0"; sha256 = "287a355aa82cbbfe971984a2d3c1b1f28b0a9f773cb6eba6493c51a72be68307"; libraryHaskellDepends = [ base mtl transformers ]; - jailbreak = true; homepage = "http://github.com/ninegua/monad-task"; description = "A monad transformer that turns event processing into co-routine programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monad-time" = callPackage @@ -118957,7 +114827,6 @@ self: { revision = "1"; editedCabalFile = "7d585b29bfa558cf59d169421d1ec3363b6ef56b88cf6a9a082192d609676ce2"; libraryHaskellDepends = [ base mtl unordered-containers ]; - jailbreak = true; description = "Generic first-order unification"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -119038,10 +114907,10 @@ self: { version = "0.2"; sha256 = "c16ffae593e47f185b73369fe96c4728974fafd59eae59dfc52401bf58837e91"; libraryHaskellDepends = [ base monadLib ]; - jailbreak = true; homepage = "http://github.com/aristidb/monadLib-compose"; description = "Arrow-like monad composition for monadLib"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadacme" = callPackage @@ -119193,10 +115062,10 @@ self: { executableHaskellDepends = [ base filepath haskell-src-exts monadloc pretty syb ]; - jailbreak = true; homepage = "http://github.com/pepeiborra/monadloc-pp"; description = "A preprocessor for generating monadic call traces"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monadplus" = callPackage @@ -119217,9 +115086,9 @@ self: { version = "0.2.0.0"; sha256 = "8c74b3fdd916187655b9c9feec99b44592c2b2161ff3e6f7ad5d17b5c72d19c7"; libraryHaskellDepends = [ base mtl transformers ]; - jailbreak = true; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "monads-tf" = callPackage @@ -119259,7 +115128,6 @@ self: { network pool-conduit stm transformers transformers-base ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "https://github.com/notogawa/monarch"; description = "Monadic interface for TokyoTyrant"; license = stdenv.lib.licenses.bsd3; @@ -119285,36 +115153,11 @@ self: { base hspec network servant servant-client servant-server time timerep transformers wai warp ]; - jailbreak = true; description = "Haskell bindings for the Mondo API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mongoDB_2_0_10" = callPackage - ({ mkDerivation, array, base, base16-bytestring, base64-bytestring - , binary, bson, bytestring, containers, cryptohash, hashtables - , hspec, lifted-base, monad-control, mtl, network, nonce - , old-locale, parsec, random, random-shuffle, text, time - , transformers-base - }: - mkDerivation { - pname = "mongoDB"; - version = "2.0.10"; - sha256 = "8986956648874ce70c0bc4682d7856ea20c1477895405c532e6de34573f5b0df"; - libraryHaskellDepends = [ - array base base16-bytestring base64-bytestring binary bson - bytestring containers cryptohash hashtables lifted-base - monad-control mtl network nonce parsec random random-shuffle text - transformers-base - ]; - testHaskellDepends = [ base hspec mtl old-locale text time ]; - homepage = "https://github.com/mongodb-haskell/mongodb"; - description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mongoDB" = callPackage ({ mkDerivation, array, base, base16-bytestring, base64-bytestring , binary, bson, bytestring, containers, cryptohash @@ -119333,10 +115176,10 @@ self: { random-shuffle text tls transformers-base ]; testHaskellDepends = [ base hspec mtl old-locale text time ]; - doCheck = false; homepage = "https://github.com/mongodb-haskell/mongodb"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mongodb-queue" = callPackage @@ -119355,7 +115198,6 @@ self: { base data-default hspec lifted-base monad-control mongoDB network text transformers ]; - jailbreak = true; homepage = "https://github.com/docmunch/haskell-mongodb-queue"; description = "message queue using MongoDB"; license = stdenv.lib.licenses.mit; @@ -119375,7 +115217,6 @@ self: { attoparsec base blaze-builder blaze-textual bytestring case-insensitive containers http-types text zeromq-haskell ]; - jailbreak = true; description = "Mongrel2 Handler Library"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -119397,19 +115238,19 @@ self: { "monky" = callPackage ({ mkDerivation, base, bytestring, cereal, composition, containers , directory, env-locale, formatting, mtl, netlink, network - , optparse-applicative, process, statvfs, stm, template-haskell - , text, time, transformers, unix + , optparse-applicative, process, pulseaudio, statvfs, stm + , template-haskell, text, time, transformers, unix }: mkDerivation { pname = "monky"; - version = "2.0.1.0"; - sha256 = "8cd4fd086f4c3719af8c57d668ac0c7eb89a946a306b87485c267225546ec288"; + version = "2.1.0.0"; + sha256 = "044ea050aa7be67209652fb1a8cca97ad017a2effcdd41432c959a1b840439d0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring cereal composition containers directory env-locale - formatting mtl netlink network statvfs stm template-haskell text - time transformers unix + formatting mtl netlink network pulseaudio statvfs stm + template-haskell text time transformers unix ]; executableHaskellDepends = [ base containers directory mtl optparse-applicative process unix @@ -119425,38 +115266,12 @@ self: { version = "0.1.0.2"; sha256 = "b5d3def13119b4d1deb456d271876848aef35e6c52b32ea4e79f19d06ee2cbe2"; libraryHaskellDepends = [ base bytestring text vector ]; - jailbreak = true; homepage = "http://github.com/JohnLato/mono-foldable"; description = "Folds for monomorphic containers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "mono-traversable_0_10_2" = callPackage - ({ mkDerivation, base, bytestring, comonad, containers, dlist - , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck - , semigroupoids, semigroups, split, text, transformers - , unordered-containers, vector, vector-algorithms, vector-instances - }: - mkDerivation { - pname = "mono-traversable"; - version = "0.10.2"; - sha256 = "379ee5a7f9fc2a5c4fb11522fe28654d130c044265643122c8b3163e8e0452b8"; - libraryHaskellDepends = [ - base bytestring comonad containers dlist dlist-instances hashable - semigroupoids semigroups split text transformers - unordered-containers vector vector-algorithms vector-instances - ]; - testHaskellDepends = [ - base bytestring containers foldl hspec HUnit QuickCheck semigroups - text transformers unordered-containers vector - ]; - 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" = callPackage ({ mkDerivation, base, bytestring, containers, foldl, hashable , hspec, HUnit, QuickCheck, semigroups, split, text, transformers @@ -119464,10 +115279,8 @@ self: { }: mkDerivation { pname = "mono-traversable"; - version = "1.0.0.1"; - sha256 = "001d1fba5e3da63c46784a621d1430937e9537b38c0a74876e489ff4d7d3828a"; - revision = "1"; - editedCabalFile = "1c3e3ffbdd7dc77b065afc67e2d6d581bc43a7818d96f5bace88caf6e28106aa"; + version = "1.0.1"; + sha256 = "a96d449eb00e062be003d314884fdb06b1e02e18e0d43e5008500ae7ef3de268"; libraryHaskellDepends = [ base bytestring containers hashable split text transformers unordered-containers vector vector-algorithms @@ -119558,27 +115371,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoid-subclasses_0_4_2" = callPackage - ({ mkDerivation, base, bytestring, containers, primes, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, text, vector - }: - mkDerivation { - pname = "monoid-subclasses"; - version = "0.4.2"; - sha256 = "38257132ebd3dca4d1d95252a928ca183171ae0ba3aefd133f3c564fa3bfee2b"; - libraryHaskellDepends = [ - base bytestring containers primes text vector - ]; - testHaskellDepends = [ - base bytestring containers primes QuickCheck quickcheck-instances - tasty tasty-quickcheck text vector - ]; - homepage = "https://github.com/blamario/monoid-subclasses/"; - description = "Subclasses of Monoid"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monoid-subclasses" = callPackage ({ mkDerivation, base, bytestring, containers, primes, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, text, vector @@ -119599,6 +115391,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monoid-subclasses_0_4_3" = callPackage + ({ mkDerivation, base, bytestring, containers, primes, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, text, vector + }: + mkDerivation { + pname = "monoid-subclasses"; + version = "0.4.3"; + sha256 = "568fd54e1fe35557129bc8cd1a751343dfde61a63fab0baadc38683101aed0cd"; + libraryHaskellDepends = [ + base bytestring containers primes text vector + ]; + testHaskellDepends = [ + base bytestring containers primes QuickCheck quickcheck-instances + tasty tasty-quickcheck text vector + ]; + homepage = "https://github.com/blamario/monoid-subclasses/"; + description = "Subclasses of Monoid"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monoid-transformer" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -119610,31 +115423,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "monoidal-containers_0_1_2_5" = callPackage - ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype - , unordered-containers - }: - mkDerivation { - pname = "monoidal-containers"; - version = "0.1.2.5"; - sha256 = "c82124b1e867a271bafeffb6fb8fb1febb1887154bf28225b174180babc9d438"; - libraryHaskellDepends = [ - base containers deepseq hashable lens newtype unordered-containers - ]; - homepage = "http://github.com/bgamari/monoidal-containers"; - description = "Containers with monoidal accumulation"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "monoidal-containers" = callPackage ({ mkDerivation, base, containers, deepseq, hashable, lens, newtype , unordered-containers }: mkDerivation { pname = "monoidal-containers"; - version = "0.3.0.0"; - sha256 = "b9e2a70f92831aac6ac2216d79c319893514fce182439c40e5e33daf65499c55"; + version = "0.3.0.1"; + sha256 = "fa2a46695ae71aa24338960f06cd8fc440f295e1854ef9f2c5ffdc3e8b5da49c"; libraryHaskellDepends = [ base containers deepseq hashable lens newtype unordered-containers ]; @@ -119652,7 +115448,6 @@ self: { libraryHaskellDepends = [ base contravariant semigroups transformers ]; - jailbreak = true; description = "Extra classes/functions about monoids"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -119669,7 +115464,6 @@ self: { libraryHaskellDepends = [ array base bytestring containers fingertree parallel text ]; - jailbreak = true; homepage = "http://github.com/ekmett/monoids"; description = "Deprecated: Use 'reducers'"; license = stdenv.lib.licenses.bsd3; @@ -119704,7 +115498,6 @@ self: { stats-web stm system-uuid text time unordered-containers zeromq-haskell ]; - jailbreak = true; homepage = "http://github.com/bumptech/montage"; description = "Riak Resolution Proxy"; license = stdenv.lib.licenses.bsd3; @@ -119728,7 +115521,6 @@ self: { safe stats-web stm system-uuid text text-format time unordered-containers zeromq-haskell ]; - jailbreak = true; homepage = "http://github.com/bumptech/montage-haskell-client"; description = "Riak Resolution Proxy Client"; license = stdenv.lib.licenses.bsd3; @@ -119751,7 +115543,6 @@ self: { base gsl-random ieee754 primitive QuickCheck random test-framework test-framework-quickcheck2 transformers vector ]; - jailbreak = true; homepage = "http://github.com/patperry/hs-monte-carlo"; description = "A monad and transformer for Monte Carlo calculations"; license = stdenv.lib.licenses.bsd3; @@ -119777,7 +115568,6 @@ self: { base hspec network servant servant-client servant-server time timerep transformers wai warp ]; - jailbreak = true; description = "Haskell bindings for the Monzo API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -119839,7 +115629,6 @@ self: { array base binary bytestring containers directory filepath mtl pretty QuickCheck text utf8-string vector ]; - jailbreak = true; homepage = "http://sites.google.com/site/morfetteweb/"; description = "A tool for supervised learning of morphology"; license = stdenv.lib.licenses.bsd3; @@ -119879,37 +115668,8 @@ self: { postgresql-simple text yaml ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "A simple database migrator for PostgreSQL"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "morte_1_6_1" = callPackage - ({ mkDerivation, alex, array, base, binary, containers, deepseq - , Earley, http-client, http-client-tls, microlens, microlens-mtl - , mtl, optparse-applicative, pipes, QuickCheck, system-fileio - , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text - , text-format, transformers - }: - mkDerivation { - pname = "morte"; - version = "1.6.1"; - sha256 = "84874884eda53f75ba1b9ab8ed85151839c41de54e9ab999de429f00d319a703"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base binary containers deepseq Earley http-client - http-client-tls microlens microlens-mtl pipes system-fileio - system-filepath text text-format transformers - ]; - libraryToolDepends = [ alex ]; - executableHaskellDepends = [ base optparse-applicative text ]; - testHaskellDepends = [ - base mtl QuickCheck system-filepath tasty tasty-hunit - tasty-quickcheck text transformers - ]; - description = "A bare-bones calculus of constructions"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -119965,7 +115725,6 @@ self: { base mtl QuickCheck system-filepath tasty tasty-hunit tasty-quickcheck text transformers ]; - jailbreak = true; description = "A bare-bones calculus of constructions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -119985,7 +115744,6 @@ self: { diagrams-gtk diagrams-lib glib gtk JuicyPixels mtl split stm stm-chans transformers ]; - jailbreak = true; homepage = "http://ldc.usb.ve/~05-38235/cursos/CI3661/2015AJ/"; description = "Generación interactiva de mosaicos"; license = stdenv.lib.licenses.bsd3; @@ -120034,7 +115792,6 @@ self: { gstreamer hgettext MissingH mtl network random setlocale text unix unordered-containers utf8-string vty vty-ui ]; - jailbreak = true; homepage = "https://bitbucket.org/borekpiotr/linux-music-player"; description = "Music player for linux"; license = "GPL"; @@ -120084,7 +115841,6 @@ self: { libraryHaskellDepends = [ ansi-terminal base bytestring split text ]; - jailbreak = true; description = "Multi-dimensional parametric pretty-printer with color"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -120102,7 +115858,6 @@ self: { ansi-terminal base containers data-lens-fd data-lens-template mtl orders text transformers ]; - jailbreak = true; description = "a monadic, extensible pretty printing library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -120115,10 +115870,10 @@ self: { version = "0.1.0.0"; sha256 = "3ee98b2f922e746982a46c8bd71058c1b9882c05db3eb21d21573d9b42158685"; libraryHaskellDepends = [ base containers dbus mtl ]; - jailbreak = true; homepage = "http://github.com/Fuco1/mpris"; description = "Interface for MPRIS"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mprover" = callPackage @@ -120172,7 +115927,6 @@ self: { executableHaskellDepends = [ base directory filepath gtk mtl process template-haskell unix ]; - jailbreak = true; homepage = "https://github.com/sebadoom/mpvguihs"; description = "A minimalist mpv GUI written in I/O heavy Haskell"; license = stdenv.lib.licenses.gpl3; @@ -120191,10 +115945,10 @@ self: { async attoparsec base bytestring monad-loops mtl network singletons stm text transformers ]; - jailbreak = true; homepage = "http://github.com/k00mi/mqtt-hs"; description = "A MQTT client library"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mrm" = callPackage @@ -120204,7 +115958,6 @@ self: { version = "0.1.0.0"; sha256 = "3caa1ec68090913057379113836ea5b0458341d060d042d1f7040904509caee2"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/scmu/mrm"; description = "Modular Refiable Matching, first-class matches"; license = stdenv.lib.licenses.bsd3; @@ -120227,10 +115980,10 @@ self: { testHaskellDepends = [ base doctest profunctors tasty tasty-quickcheck vector ]; - jailbreak = true; homepage = "https://github.com/relrod/ms"; description = "metric spaces"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "msgpack" = callPackage @@ -120252,7 +116005,6 @@ self: { testHaskellDepends = [ base bytestring QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://msgpack.org/"; description = "A Haskell implementation of MessagePack"; license = stdenv.lib.licenses.bsd3; @@ -120296,7 +116048,6 @@ self: { ]; executableHaskellDepends = [ base cmdargs directory peggy ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; homepage = "http://msgpack.org/"; description = "An IDL Compiler for MessagePack"; license = stdenv.lib.licenses.bsd3; @@ -120350,9 +116101,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring hid split ]; - jailbreak = true; description = "A command line tool to change backlit colors of your MSI keyboards"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mstate" = callPackage @@ -120406,7 +116157,6 @@ self: { SHA test-framework test-framework-hunit test-framework-quickcheck2 text time transformers unordered-containers vector watchdog ]; - jailbreak = true; description = "Library to communicate with Mt.Gox"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -120419,7 +116169,6 @@ self: { version = "2.1.3.1"; sha256 = "77af766957fb49361fe63446f272a698bddb13398669edc363022e5c2517f6f6"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/mtl"; description = "Monad classes, using functional dependencies"; license = stdenv.lib.licenses.bsd3; @@ -120478,7 +116227,6 @@ self: { libraryHaskellDepends = [ base monad-control mtl transformers transformers-base ]; - jailbreak = true; description = "Instances for the mtl classes for all monad transformers"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -120502,7 +116250,6 @@ self: { version = "1.0.3"; sha256 = "1d811002b816c7afabf06eae1895a20862837432294abbde2892e6f4185f20e3"; libraryHaskellDepends = [ base mtl transformers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/mtl-prelude"; description = "Reexports of most definitions from \"mtl\" and \"transformers\""; license = stdenv.lib.licenses.mit; @@ -120585,7 +116332,6 @@ self: { sha256 = "9c2f5d3d16cbb7c9d682ee5c2fb4b36a01fb3249d35d7c0727561516d03d9898"; libraryHaskellDepends = [ base filepath unix ]; librarySystemDepends = [ mtp ]; - jailbreak = true; description = "Bindings to libmtp"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -120629,7 +116375,6 @@ self: { http-conduit http-types process random snap-core snap-server stm text transformers ]; - jailbreak = true; description = "Continuous deployment server for use with GitHub"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -120681,7 +116426,6 @@ self: { sha256 = "5df2829d85ceb46086011c96ecaf396aa78d92dda293ba728d0ad8e3efcaaddf"; libraryHaskellDepends = [ aeson base bytestring haskell-src ]; testHaskellDepends = [ aeson base bytestring haskell-src hspec ]; - jailbreak = true; description = "The Mu Language, a non-computable extended Lambda Calculus"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -120694,10 +116438,10 @@ self: { version = "0.1.0.4"; sha256 = "86b6b715d3ab239aa292ff37368976f91b72098bc442ed274d851f2fc48dc1c5"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/jsnajder/multex-east-msd"; description = "MULTEXT-East morphosyntactic descriptors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multi-cabal" = callPackage @@ -120717,7 +116461,6 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/aka-bash0r/multi-cabal"; description = "A tool supporting multi cabal project builds"; license = stdenv.lib.licenses.mit; @@ -120762,6 +116505,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "multifile" = callPackage + ({ mkDerivation, base, HaXml }: + mkDerivation { + pname = "multifile"; + version = "0.1.0.0"; + sha256 = "a0d4e0c033e8f17991fa62be64efd16d04b76befbe74cd84f547fbbdd17bef9d"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base HaXml ]; + homepage = "xy30.com"; + description = "create many files from one"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "multifocal" = callPackage ({ mkDerivation, array, base, containers, haskell-src-exts, HaXml , hxt, hxt-xpath, mtl, parsec, pointless-haskell, pointless-lenses @@ -120807,10 +116564,10 @@ self: { base base58-bytestring base64-bytestring byteable bytestring cryptohash hex io-streams optparse-applicative ]; - jailbreak = true; homepage = "https://github.com/LukeHoersten/multihash"; description = "Multihash library and CLI executable"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multimap" = callPackage @@ -120866,7 +116623,6 @@ self: { base binary containers ghc-prim hashable keys math-functions newtype unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ekmett/multipass/"; description = "Folding data with multiple named passes"; license = stdenv.lib.licenses.bsd3; @@ -120880,10 +116636,10 @@ self: { version = "0.0.3"; sha256 = "2c0016847dcedc8ba0054211256a3ef6c7f142e605668c7b64beebdf0eaf4ebf"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Multiplate"; description = "Lightweight generic library for mutually recursive data types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "multiplate-simplified" = callPackage @@ -120893,7 +116649,6 @@ self: { version = "0.0.0.2"; sha256 = "59ec1287196833863baa45be42b1a1864728935bc0ca6c1a5e8f9baaeda0f277"; libraryHaskellDepends = [ base multiplate transformers ]; - jailbreak = true; description = "Shorter, more generic functions for Multiplate"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -120938,7 +116693,6 @@ self: { libraryHaskellDepends = [ base containers mtl multirec syb template-haskell th-expand-syns ]; - jailbreak = true; description = "Alternative multirec instances deriver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -120951,7 +116705,6 @@ self: { version = "0.0.1"; sha256 = "fa57bbf7fd5159713520772307af960e2c79d9c24e045ef23680f18ea5cb41b2"; libraryHaskellDepends = [ base binary multirec ]; - jailbreak = true; description = "Generic Data.Binary instances using MultiRec."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -121027,10 +116780,10 @@ self: { base blaze-html ConfigFile directory Glob happstack-server HStringTemplate markdown MissingH process text ]; - jailbreak = true; homepage = "http://github.com/kaashif-hymabaccus/muon"; description = "Static blog generator"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "murder" = callPackage @@ -121045,7 +116798,6 @@ self: { AspectAG base containers HList ListLike template-haskell TTTAS uu-parsinglib uulib ]; - jailbreak = true; homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo"; description = "MUtually Recursive Definitions Explicitly Represented"; license = "LGPL"; @@ -121182,7 +116934,6 @@ self: { aeson base blaze-svg bytestring lens music-pitch music-preludes music-score process ]; - jailbreak = true; description = "Diagrams-based visualization of musical data structures"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -121259,7 +117010,6 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base process tasty tasty-golden ]; - jailbreak = true; description = "Some useful preludes for the Music Suite"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -121284,7 +117034,6 @@ self: { nats NumInstances parsec prettify process semigroups transformers transformers-compat vector-space vector-space-points ]; - jailbreak = true; description = "Musical score and part representation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -121375,7 +117124,6 @@ self: { smallcheck stm test-framework test-framework-hunit test-framework-smallcheck text time transformers xmlhtml ]; - jailbreak = true; homepage = "http://github.com/metabrainz/mass-mail"; description = "Send an email to all MusicBrainz editors"; license = stdenv.lib.licenses.gpl3; @@ -121393,7 +117141,6 @@ self: { libraryHaskellDepends = [ base containers directory HaXml old-time pretty ]; - jailbreak = true; homepage = "https://troglodita.di.uminho.pt/svn/musica/work/MusicXML"; description = "MusicXML format encoded as Haskell type and functions of reading and writting"; license = stdenv.lib.licenses.bsd3; @@ -121417,37 +117164,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "mustache_1_0_2" = callPackage - ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring - , cmdargs, containers, directory, either, filepath, hspec, mtl - , parsec, process, scientific, temporary, text - , unordered-containers, vector, yaml - }: - mkDerivation { - pname = "mustache"; - version = "1.0.2"; - sha256 = "77d43c251883fc5dd5afdd05ea3b6757f37b7c4aa76950418386b8e9098d0927"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base-unicode-symbols bytestring containers directory - either filepath mtl parsec scientific text unordered-containers - vector - ]; - executableHaskellDepends = [ - aeson base base-unicode-symbols bytestring cmdargs filepath text - yaml - ]; - testHaskellDepends = [ - aeson base base-unicode-symbols directory filepath hspec process - temporary text unordered-containers yaml - ]; - homepage = "https://github.com/JustusAdam/mustache"; - description = "A mustache template parser library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "mustache" = callPackage ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring , cmdargs, containers, directory, either, filepath, hspec, lens @@ -121499,10 +117215,10 @@ self: { pretty-show scientific text transformers unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/danchoi/mustache-haskell"; description = "Straight implementation of mustache templates"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mustache2hs" = callPackage @@ -121555,7 +117271,6 @@ self: { libraryHaskellDepends = [ base iteratee MonadCatchIO-transformers transformers vector ]; - jailbreak = true; homepage = "http://jwlato.webfactional.com/haskell/mutable-iter"; description = "iteratees based upon mutable buffers"; license = stdenv.lib.licenses.bsd3; @@ -121576,7 +117291,6 @@ self: { base directory filepath hslogger hslogger-template mtl network-dbus process ]; - jailbreak = true; homepage = "http://github.com/Tener/mute-unmute"; description = "Watches your screensaver and (un)mutes music when you (un)lock the screen"; license = stdenv.lib.licenses.gpl3; @@ -121606,7 +117320,6 @@ self: { version = "1.2.0"; sha256 = "c60603c0b97949219361c674097fe37b38bc68cf137b641b5abc329c0ee3ab88"; libraryHaskellDepends = [ async base foldl mvc ]; - jailbreak = true; description = "Concurrent and combinable updates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -121626,7 +117339,6 @@ self: { control-event Crypto data-binary-ieee754 hexpat http-enumerator maccatcher mtl network parsec time uuid ]; - jailbreak = true; description = "Client library for metaverse systems like Second Life"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -121692,7 +117404,6 @@ self: { testHaskellDepends = [ ansi-terminal base Cabal Euterpea QuickCheck ]; - jailbreak = true; homepage = "http://haskell.cs.yale.edu/"; description = "None"; license = stdenv.lib.licenses.bsd3; @@ -121749,7 +117460,6 @@ self: { base bytestring cereal clientsession containers mtl random regex-posix snap snap-core time ]; - jailbreak = true; description = "Sessions and continuations for Snap web apps"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -121769,7 +117479,6 @@ self: { base bytestring clientsession heist mtl mysnapsession snap snap-core snap-server text time ]; - jailbreak = true; description = "Example projects using mysnapsession"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -121802,7 +117511,6 @@ self: { libraryHaskellDepends = [ base bytestring extensible-effects mysql mysql-simple ]; - jailbreak = true; homepage = "https://github.com/ibotty/mysql-effect"; description = "An extensible mysql effect using extensible-effects and mysql-simple"; license = stdenv.lib.licenses.mit; @@ -121830,7 +117538,6 @@ self: { base bytestring io-streams optparse-applicative tasty tasty-hunit text time ]; - jailbreak = true; homepage = "https://github.com/winterland1989/mysql-haskell"; description = "pure haskell MySQL driver"; license = stdenv.lib.licenses.bsd3; @@ -121903,10 +117610,10 @@ self: { attoparsec base data-default directory process text ]; executableHaskellDepends = [ base text ]; - jailbreak = true; homepage = "https://github.com/wapxmas/mystem#readme"; description = "Bindings for Mystem morphological analyzer executabe"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mywatch" = callPackage @@ -121940,7 +117647,6 @@ self: { version = "0.1.0.2"; sha256 = "54a86a422f4949f9d63a0c7e68a011fb01ca1eb315e871af2d4f63ffe5419d10"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://github.com/ifigueroap/mzv"; description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)"; license = stdenv.lib.licenses.bsd3; @@ -122043,7 +117749,6 @@ self: { version = "0.1"; sha256 = "9188040373f6d97d14df3b34f491419ab809b058f695cfaf99bea481851361b5"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "http://github.com/nominolo/named-lock"; description = "A named lock that is created on demand"; license = stdenv.lib.licenses.bsd3; @@ -122075,10 +117780,10 @@ self: { testHaskellDepends = [ base case-insensitive QuickCheck tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/philopon/namelist-hs"; description = "fortran90 namelist parser/pretty printer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "names" = callPackage @@ -122165,7 +117870,6 @@ self: { editedCabalFile = "8ab99bab8912dff1faaeb2b7acc7a15b705b135c24f7262147be56331d707a24"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ openssl ]; - jailbreak = true; homepage = "http://code.haskell.org/~dons/code/nano-md5"; description = "Efficient, ByteString bindings to OpenSSL"; license = stdenv.lib.licenses.bsd3; @@ -122185,7 +117889,6 @@ self: { executableHaskellDepends = [ base BNFC-meta cmdargs containers mtl parsec pretty transformers ]; - jailbreak = true; description = "A toy dependently-typed language"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -122213,9 +117916,9 @@ self: { sha256 = "e3364e1c9c00931fc8d750d7804b16ce9c86fb18bd23db4c3e3fca2e87464b1a"; libraryHaskellDepends = [ base bytestring ]; librarySystemDepends = [ nanomsg ]; - jailbreak = true; description = "nanomsg - scalability protocols library"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nanomsg;}; "nanomsg-haskell" = callPackage @@ -122232,10 +117935,10 @@ self: { base binary bytestring QuickCheck test-framework test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "https://github.com/ivarnymoen/nanomsg-haskell"; description = "Bindings to the nanomsg library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) nanomsg;}; "nanoparsec" = callPackage @@ -122245,9 +117948,9 @@ self: { version = "0.1.1"; sha256 = "75d8c57ffca0dbd65b2092ea79e54658f706f03f180ab2cf236242fde76ff001"; libraryHaskellDepends = [ base bytestring ListLike ]; - jailbreak = true; description = "An implementation of attoparsec-like parser around list-like"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nanospec" = callPackage @@ -122388,7 +118091,6 @@ self: { aeson base bytestring containers dequeue hspec network network-uri random text ]; - jailbreak = true; description = "Haskell API for NATS messaging system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -122406,7 +118108,6 @@ self: { base type-equality type-level-natural-number type-level-natural-number-induction ]; - jailbreak = true; description = "Natural numbers tagged with a type-level representation of the number"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -122488,10 +118189,10 @@ self: { libraryHaskellDepends = [ aeson base iso639 lens lens-aeson network-uri random text wreq ]; - jailbreak = true; homepage = "https://github.com/dahlia/naver-translate"; description = "Interface to Naver Translate"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nbt" = callPackage @@ -122552,8 +118253,8 @@ self: { ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit }: mkDerivation { pname = "ndjson-conduit"; - version = "0.1.0.3"; - sha256 = "a4f9e574af6d565ea9edc313c78ea9ee95c957d2abe61f4a0991a49231e9b592"; + version = "0.1.0.5"; + sha256 = "c037b8f7c47b146f1384585541ae8a4f9218bc4456f428935f973ae07da49db1"; libraryHaskellDepends = [ aeson attoparsec base bytestring conduit ]; @@ -122607,7 +118308,6 @@ self: { base containers haskell-src-meta mtl parsec parsec-extra template-haskell text vector ]; - jailbreak = true; homepage = "http://scrambledeggsontoast.github.io/2014/09/28/needle-announce/"; description = "ASCII-fied arrow notation"; license = stdenv.lib.licenses.mit; @@ -122626,10 +118326,10 @@ self: { base cereal containers graphviz MonadRandom multimap parallel random transformers ]; - jailbreak = true; homepage = "https://github.com/raymoo/NEET"; description = "A NEAT library for Haskell"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nehe-tuts" = callPackage @@ -122677,10 +118377,10 @@ self: { version = "0.3.1.1"; sha256 = "ce07d3be22d9dc157d78b3455dd70df42995552f5d1d2ca5cbf786e5014154a4"; libraryHaskellDepends = [ base failure transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/neither"; description = "Provide versions of Either with good monad and applicative instances. (deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nemesis" = callPackage @@ -122735,7 +118435,6 @@ self: { text text-binary tokenize vector ]; executableHaskellDepends = [ directory filepath temporary ]; - jailbreak = true; homepage = "https://github.com/kawu/nerf"; description = "Nerf, the named entity recognition tool based on linear-chain CRFs"; license = stdenv.lib.licenses.bsd3; @@ -122756,7 +118455,6 @@ self: { testHaskellDepends = [ base bytestring doctest Glob lens tasty tasty-hunit text ]; - jailbreak = true; homepage = "https://github.com/plutonbrb/nero"; description = "Lens-based HTTP toolkit"; license = stdenv.lib.licenses.bsd3; @@ -122774,7 +118472,6 @@ self: { libraryHaskellDepends = [ base bytestring http-types lens nero text wai wai-extra ]; - jailbreak = true; homepage = "https://github.com/plutonbrb/nero-wai"; description = "WAI adapter for Nero server applications"; license = stdenv.lib.licenses.bsd3; @@ -122788,55 +118485,24 @@ self: { version = "0.3"; sha256 = "1a9094c0c274f987cb9db1d4206e9f8e1df4415c0e80b58a23279f9e3404b9b5"; libraryHaskellDepends = [ base nero nero-wai warp ]; - jailbreak = true; homepage = "https://github.com/plutonbrb/nero-warp"; description = "Run Nero server applications with Warp"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "nested-routes_7_0_0" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, composition-extra - , errors, exceptions, hashable, hspec, hspec-wai, http-types, mtl - , poly-arity, pred-trie, regex-compat, semigroups, text - , transformers, tries, unordered-containers - , wai-middleware-content-type, wai-middleware-verbs - , wai-transformers - }: - mkDerivation { - pname = "nested-routes"; - version = "7.0.0"; - sha256 = "eac01cd730d3cbcafab4a0ac2b6b8c3ca8cdcd31f996379092f2f60bc31c21a2"; - libraryHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable mtl poly-arity pred-trie regex-compat semigroups text - transformers tries unordered-containers wai-middleware-content-type - wai-middleware-verbs wai-transformers - ]; - testHaskellDepends = [ - attoparsec base bytestring composition-extra errors exceptions - hashable hspec hspec-wai http-types mtl poly-arity pred-trie - regex-compat semigroups text transformers tries - unordered-containers wai-middleware-content-type - wai-middleware-verbs wai-transformers - ]; - description = "Declarative, compositional Wai responses"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "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, text, transformers, tries, unordered-containers - , wai-middleware-content-type, wai-middleware-verbs - , wai-transformers + , 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.1"; - sha256 = "f2a813bccfb40ea242c2787ee85ab02fed43a2a7d2644509066c66fc939472ed"; + version = "7.2.2"; + sha256 = "f93d56283b2855aee02daac7ecd693a2b9f7e99a5da33211694a5a5746c35cd9"; libraryHaskellDepends = [ attoparsec base bytestring composition-extra errors exceptions hashable hashtables mtl poly-arity pred-set pred-trie regex-compat @@ -122846,8 +118512,8 @@ self: { testHaskellDepends = [ 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 text transformers tries - unordered-containers wai-middleware-content-type + pred-set pred-trie regex-compat semigroups tasty tasty-hspec text + transformers tries unordered-containers wai-middleware-content-type wai-middleware-verbs wai-transformers ]; description = "Declarative, compositional Wai responses"; @@ -122896,9 +118562,9 @@ self: { testHaskellDepends = [ base base-unicode-symbols containers data-ordlist hspec QuickCheck ]; - jailbreak = true; description = "A library for nested maps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "net-concurrent" = callPackage @@ -122912,7 +118578,6 @@ self: { libraryHaskellDepends = [ base bytestring containers ghc-binary hslogger monad-loops network ]; - jailbreak = true; homepage = "http://phaul.hobby-site.org/node/4123"; description = "Concurrent over the network execution library"; license = stdenv.lib.licenses.bsd3; @@ -122953,7 +118618,6 @@ self: { process QuickCheck random syb test-framework test-framework-hunit test-framework-quickcheck2 test-framework-th ]; - jailbreak = true; homepage = "http://frenetic-lang.org"; description = "The NetCore compiler and runtime system for OpenFlow networks"; license = stdenv.lib.licenses.bsd3; @@ -123070,7 +118734,6 @@ self: { aeson base binary bytestring mtl network template-haskell text transformers ]; - jailbreak = true; homepage = "http://github.com/DanBurton/netspec"; description = "Simplify static Networking tasks"; license = stdenv.lib.licenses.bsd3; @@ -123086,10 +118749,10 @@ self: { libraryHaskellDepends = [ base bytestring enumerator transformers ]; - jailbreak = true; homepage = "https://john-millikin.com/software/netstring-enumerator/"; description = "Enumerator-based netstring parsing"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nettle" = callPackage @@ -123111,7 +118774,6 @@ self: { QuickCheck tagged test-framework test-framework-hunit test-framework-quickcheck2 ]; - doCheck = false; homepage = "https://github.com/stbuehler/haskell-nettle"; description = "safe nettle binding"; license = stdenv.lib.licenses.mit; @@ -123129,7 +118791,6 @@ self: { base bimap binary bytestring containers mtl nettle-openflow network network-data random time ]; - jailbreak = true; description = "FRP for controlling networks of OpenFlow switches"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -123180,10 +118841,10 @@ self: { base containers deepseq parallel profunctors random semigroups time transformers ]; - jailbreak = true; homepage = "http://hub.darcs.net/ertes/netwire"; description = "Functional reactive programming library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input" = callPackage @@ -123196,6 +118857,7 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input"; description = "Input handling abstractions for netwire"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "netwire-input-glfw" = callPackage @@ -123211,27 +118873,26 @@ self: { homepage = "https://www.github.com/Mokosha/netwire-input-glfw"; description = "GLFW instance of netwire-input"; license = stdenv.lib.licenses.mit; - }) {}; - - "network_2_6_2_1" = callPackage - ({ mkDerivation, base, bytestring, HUnit, test-framework - , test-framework-hunit, unix - }: - mkDerivation { - pname = "network"; - version = "2.6.2.1"; - sha256 = "a3fda15c9bbe2c7274d97f40398c6cf8d1d3a9fe896fbf6531e1bfc849bb1bfa"; - libraryHaskellDepends = [ base bytestring unix ]; - testHaskellDepends = [ - base bytestring HUnit test-framework test-framework-hunit - ]; - doCheck = false; - homepage = "https://github.com/haskell/network"; - description = "Low-level networking interface"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "netwire-input-javascript" = callPackage + ({ mkDerivation, base, containers, ghcjs-base, netwire + , netwire-input, transformers + }: + mkDerivation { + pname = "netwire-input-javascript"; + version = "0.0.2"; + sha256 = "fa967e5c07dc504e38fd85facaa996b32021b4e51d33bdc3a423b4424eb672bf"; + libraryHaskellDepends = [ + base containers ghcjs-base netwire netwire-input transformers + ]; + homepage = "https://github.com/ziocroc/netwire-input-javascript"; + description = "JavaScript instance of netwire-input"; + license = stdenv.lib.licenses.bsd3; + broken = true; + }) {ghcjs-base = null;}; + "network" = callPackage ({ mkDerivation, base, bytestring, doctest, HUnit, test-framework , test-framework-hunit, unix @@ -123244,7 +118905,6 @@ self: { testHaskellDepends = [ base bytestring doctest HUnit test-framework test-framework-hunit ]; - doCheck = false; homepage = "https://github.com/haskell/network"; description = "Low-level networking interface"; license = stdenv.lib.licenses.bsd3; @@ -123262,7 +118922,6 @@ self: { testHaskellDepends = [ base Cabal QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/sebnow/haskell-network-address"; description = "IP data structures and textual representation"; license = stdenv.lib.licenses.mit; @@ -123286,10 +118945,10 @@ self: { attoparsec base bytestring exceptions hspec hspec-attoparsec hspec-expectations mtl network network-simple transformers uuid ]; - doCheck = false; homepage = "http://github.com/solatis/haskell-network-anonymous-i2p"; description = "Haskell API for I2P anonymous networking"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-anonymous-tor" = callPackage @@ -123334,10 +118993,10 @@ self: { aeson attoparsec base bytestring case-insensitive http-client http-client-tls http-types text time tls ]; - jailbreak = true; homepage = "https://github.com/markhibberd/network-api-support"; description = "Toolkit for building http client libraries over Network.Http.Conduit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-attoparsec" = callPackage @@ -123382,10 +119041,10 @@ self: { aeson attoparsec base bytestring cookie HTTP http-client http-types network QuickCheck text time unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/mndrix/network-bitcoin"; description = "An interface to bitcoind"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-builder" = callPackage @@ -123417,7 +119076,6 @@ self: { version = "0.1.3.4"; sha256 = "263d405345b7cd0ef03a1629eb0f14ae6e3831f42d6daf813e4a639b6405a1a6"; libraryHaskellDepends = [ base bytestring network unix ]; - jailbreak = true; homepage = "http://github.com/tibbe/network-bytestring"; description = "Fast, memory-efficient, low-level networking"; license = stdenv.lib.licenses.bsd3; @@ -123433,10 +119091,10 @@ self: { libraryHaskellDepends = [ base bytestring network text time vector ]; - jailbreak = true; homepage = "http://github.com/ocharles/network-carbon"; description = "A Haskell implementation of the Carbon protocol (part of the Graphite monitoring tools)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-conduit" = callPackage @@ -123514,9 +119172,9 @@ self: { base binary bytestring containers mtl network parsec unix utf8-string ]; - jailbreak = true; description = "D-Bus"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-dns" = callPackage @@ -123609,9 +119267,9 @@ self: { version = "0.0.1"; sha256 = "cc9409a117f8e72d4dac16495610b79469078f00524e22eb795d25ced6ca4561"; libraryHaskellDepends = [ base bytestring ioctl network ]; - jailbreak = true; description = "Haskell bindings for the ifreq structure"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-ip" = callPackage @@ -123686,18 +119344,19 @@ self: { "network-msgpack-rpc" = callPackage ({ mkDerivation, async, base, binary, binary-conduit, bytestring - , conduit, conduit-extra, data-msgpack, exceptions, hspec - , monad-control, mtl, network + , conduit, conduit-extra, data-default-class, data-msgpack + , exceptions, hspec, MissingH, monad-control, mtl, network, tagged }: mkDerivation { pname = "network-msgpack-rpc"; - version = "0.0.1"; - sha256 = "e9588ff1c7569aef8599e7161e9277904e1542a31a8fbaf7127b4da2efc1656d"; + version = "0.0.3"; + sha256 = "74bf9cd029126e26a0ebf0b02cbc12bc5410e85404ba36f3d8ba001523c3200b"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra - data-msgpack exceptions monad-control mtl network + data-default-class data-msgpack exceptions MissingH monad-control + mtl network tagged ]; - testHaskellDepends = [ async base hspec mtl network ]; + testHaskellDepends = [ async base bytestring hspec mtl network ]; homepage = "http://msgpack.org/"; description = "A MessagePack-RPC Implementation"; license = stdenv.lib.licenses.bsd3; @@ -123727,9 +119386,9 @@ self: { base bytestring foreign-storable-asymmetric ioctl network network-interfacerequest ]; - jailbreak = true; description = "Haskell bindings for low-level packet sockets (AF_PACKET)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-pgi" = callPackage @@ -123806,10 +119465,10 @@ self: { libraryHaskellDepends = [ base base64-bytestring bytestring network ]; - jailbreak = true; homepage = "https://github.com/angerman/network-service"; description = "Provide a service at the data type level"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-simple" = callPackage @@ -123839,10 +119498,10 @@ self: { libraryHaskellDepends = [ base bytestring directory exceptions network transformers ]; - jailbreak = true; homepage = "https://github.com/jdnavarro/network-simple-sockaddr"; description = "network-simple for resolved addresses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-simple-tls" = callPackage @@ -123857,7 +119516,6 @@ self: { base bytestring certificate cprng-aes exceptions network network-simple tls tls-extra transformers ]; - jailbreak = true; homepage = "https://github.com/k0001/network-simple-tls"; description = "Simple interface to TLS secured network sockets"; license = stdenv.lib.licenses.bsd3; @@ -123888,9 +119546,9 @@ self: { base binary bytestring cereal enumerator network stm text transformers ]; - jailbreak = true; description = "ByteString and Text streams for networking"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-topic-models" = callPackage @@ -123910,7 +119568,6 @@ self: { directory filepath logfloat mwc-random optparse-applicative random-fu statistics stm text transformers vector ]; - jailbreak = true; homepage = "https://github.com/bgamari/bayes-stack"; description = "A few network topic model implementations for bayes-stack"; license = stdenv.lib.licenses.bsd3; @@ -123956,7 +119613,6 @@ self: { amqp base network-transport network-transport-tests tasty tasty-hunit ]; - jailbreak = true; description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -124009,7 +119665,6 @@ self: { testHaskellDepends = [ base network network-transport network-transport-tests ]; - doCheck = false; homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = stdenv.lib.licenses.bsd3; @@ -124109,9 +119764,9 @@ self: { version = "0.3.0.1"; sha256 = "299e21e75cfe2c3c7914d05b5fe142209cbd50553369318cffc643b57660d8ba"; libraryHaskellDepends = [ base wai ]; - jailbreak = true; description = "A routing library for wai"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "network-websocket" = callPackage @@ -124121,7 +119776,6 @@ self: { version = "0.3"; sha256 = "75cd59bd534b39db084c73843c6d29c33e8d3557c440ba19ad24b4252acd7814"; libraryHaskellDepends = [ base haskell98 network webserver ]; - jailbreak = true; homepage = "http://github.com/michaelmelanson/network-websocket"; description = "WebSocket library"; license = stdenv.lib.licenses.bsd3; @@ -124141,9 +119795,9 @@ self: { libraryHaskellDepends = [ base binary bytestring containers network time transformers ]; - jailbreak = true; description = "Networked-game support library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "neural" = callPackage @@ -124171,7 +119825,6 @@ self: { array attoparsec base JuicyPixels MonadRandom pipes pipes-zlib text ]; testHaskellDepends = [ base doctest Glob hspec MonadRandom ]; - jailbreak = true; homepage = "https://github.com/brunjlar/neural"; description = "Neural Networks in native Haskell"; license = stdenv.lib.licenses.mit; @@ -124229,7 +119882,6 @@ self: { filepath mtl process safe text Unixutils ]; executableHaskellDepends = [ base cmdargs containers mtl ]; - jailbreak = true; description = "A trivially simple app to create things from simple templates"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -124258,7 +119910,6 @@ self: { base base-prelude monad-control template-haskell transformers transformers-base ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/newtype-deriving"; description = "Instance derivers for newtype wrappers"; license = stdenv.lib.licenses.mit; @@ -124273,10 +119924,9 @@ self: { sha256 = "a5ed63130601fa2f97b105adeced7e691ee7924bcfd3f7da6605495f7a655fe2"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; - jailbreak = true; - doCheck = false; description = "A typeclass and set of functions for working with newtypes, with generics support"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "newtype-th" = callPackage @@ -124290,7 +119940,6 @@ self: { libraryHaskellDepends = [ base haskell-src-meta newtype syb template-haskell ]; - jailbreak = true; homepage = "http://github.com/mgsloan/newtype-th"; description = "A template haskell deriver to create Control.Newtype instances."; license = stdenv.lib.licenses.bsd3; @@ -124309,6 +119958,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "next-ref" = callPackage + ({ mkDerivation, base, hspec, stm }: + mkDerivation { + pname = "next-ref"; + version = "0.1.0.2"; + sha256 = "a586f15c17d5d53dd647411d02660dcbfd293f38a75f030d6892a76a2c24789f"; + libraryHaskellDepends = [ base stm ]; + testHaskellDepends = [ base hspec ]; + description = "A concurrency primitive for a slow consumer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nextstep-plist" = callPackage ({ mkDerivation, base, parsec, pretty, QuickCheck }: mkDerivation { @@ -124346,21 +120008,23 @@ self: { attoparsec base machines mtl resourcet sqlite-simple text ]; executableHaskellDepends = [ base parseargs ]; - jailbreak = true; homepage = "http://github.com/YoEight/ngrams-loader"; description = "Ngrams loader based on http://www.ngrams.info format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ngx-export" = callPackage - ({ mkDerivation, base, bytestring, template-haskell }: + ({ mkDerivation, async, base, bytestring, template-haskell, unix }: mkDerivation { pname = "ngx-export"; - version = "0.1.0.0"; - sha256 = "71eb528e964f72801c832038a929a693fd654b258be0c654c004f150a17d6c63"; - libraryHaskellDepends = [ base bytestring template-haskell ]; + version = "0.2.0.0"; + sha256 = "fce59fdf3b552509a291d50c485a5847a28cfd6f6199158c2621a13f07ddd26c"; + libraryHaskellDepends = [ + async base bytestring template-haskell unix + ]; homepage = "http://github.com/lyokha/nginx-haskell-module"; - description = "Export custom haskell functions into nginx configuration"; + description = "Helper module for Nginx haskell module"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -124374,7 +120038,6 @@ self: { libraryHaskellDepends = [ base ghc-prim mtl primitive text transformers ]; - jailbreak = true; homepage = "https://github.com/fhsjaagshs/niagra"; description = "High performance CSS EDSL"; license = stdenv.lib.licenses.mit; @@ -124444,10 +120107,10 @@ self: { wai warp wreq xml-conduit ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/dahlia/nicovideo-translator"; description = "Nico Nico Douga (ニコニコ動画) Comment Translator"; license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nikepub" = callPackage @@ -124506,7 +120169,6 @@ self: { version = "0.2.2.5"; sha256 = "ab97b3fca710114f3a928803f811042b348a5a9518a8c81577e0183cc3fc589d"; libraryHaskellDepends = [ base bytestring ]; - jailbreak = true; homepage = "http://haskell.gonitro.io"; description = "Haskell bindings for Nitro"; license = stdenv.lib.licenses.bsd3; @@ -124522,10 +120184,10 @@ self: { sha256 = "f603ce62cd8abaab8cf09c8cf3f8b17332b0490658310eadea5242826b2ef419"; libraryHaskellDepends = [ base process ]; testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "http://chriswarbo.net/git/nix-eval"; description = "Evaluate Haskell expressions using Nix to get packages"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nix-paths" = callPackage @@ -124564,7 +120226,6 @@ self: { semver-range SHA shelly system-filepath temporary text text-render transformers unix unordered-containers ]; - jailbreak = true; description = "Generate nix expressions from npm packages"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -124596,7 +120257,6 @@ self: { base bytestring containers data-named filepath polysoup tar text zlib ]; - jailbreak = true; homepage = "https://github.com/kawu/nkjp"; description = "Manipulating the National Corpus of Polish (NKJP)"; license = stdenv.lib.licenses.bsd3; @@ -124626,10 +120286,10 @@ self: { executableHaskellDepends = [ base containers nlp-scores split text ]; - jailbreak = true; homepage = "https://bitbucket.org/gchrupala/lingo"; description = "NLP scoring command-line programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nm" = callPackage @@ -124728,10 +120388,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers regex-compat ]; - jailbreak = true; homepage = "https://ghc.haskell.org/trac/ghc/wiki/Building/RunningNoFib"; description = "Parse and compare nofib runs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "noise" = callPackage @@ -124753,7 +120413,6 @@ self: { testHaskellDepends = [ base HTF HUnit parsec QuickCheck string-qq ]; - jailbreak = true; homepage = "http://github.com/brow/noise"; description = "A friendly language for graphic design"; license = stdenv.lib.licenses.mit; @@ -124850,9 +120509,9 @@ self: { version = "0.1.0.1"; sha256 = "11d7f5d66a6ec832cb2c15b5f33b6b2fbc3cdf8c49da3a5a8f9ca252531c4e16"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Free structures sans laws"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nonlinear-optimization" = callPackage @@ -124959,9 +120618,9 @@ self: { executableHaskellDepends = [ base containers GLUT linear not-gloss spatial-math X11 ]; - jailbreak = true; description = "examples for not-gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "not-in-base" = callPackage @@ -124984,7 +120643,6 @@ self: { sha256 = "8a2542bed0dedf3bdcf47af754dfca452fc2262e4da199184f1d98dfbe494a95"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; - jailbreak = true; description = "Avoiding the C preprocessor via cunning use of Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -125041,7 +120699,6 @@ self: { testHaskellDepends = [ base hspec HUnit mime-mail text yesod yesod-core yesod-test ]; - jailbreak = true; homepage = "https://bitbucket.org/wuzzeb/notmuch-web"; description = "A web interface to the notmuch email indexer"; license = "GPL"; @@ -125063,10 +120720,10 @@ self: { testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/NICTA/notzero"; description = "A data type for representing numeric values, except zero"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "np-extras" = callPackage @@ -125091,7 +120748,6 @@ self: { libraryHaskellDepends = [ base binary containers numeric-prelude reflection tagged ]; - jailbreak = true; description = "Linear algebra for the numeric-prelude framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -125127,7 +120783,6 @@ self: { testHaskellDepends = [ base directory process transformers uniplate ]; - doCheck = false; homepage = "https://github.com/ndmitchell/nsis#readme"; description = "DSL for producing Windows Installer using NSIS"; license = stdenv.lib.licenses.bsd3; @@ -125212,7 +120867,6 @@ self: { aeson base containers filepath scotty split stm text transformers wai-extra warp ]; - jailbreak = true; homepage = "https://github.com/Tener/null-canvas"; description = "HTML5 Canvas Graphics Library - forked Blank Canvas"; license = stdenv.lib.licenses.bsd3; @@ -125226,10 +120880,10 @@ self: { version = "0.1.0.0"; sha256 = "0cd4f880627ea551167c981feff890c656f560d515296addab99d0c8b47f7ca7"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/derekelkins/nullary"; description = "A package for working with nullary type classes"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nullpipe" = callPackage @@ -125322,7 +120976,6 @@ self: { base base-unicode-symbols HUnit integer-gmp QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "https://github.com/roelvandijk/numerals"; description = "Convert numbers to number words"; license = stdenv.lib.licenses.bsd3; @@ -125346,7 +120999,6 @@ self: { base base-unicode-symbols containers containers-unicode-symbols fingertree HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/roelvandijk/numerals-base"; description = "Convert numbers to number words"; license = stdenv.lib.licenses.bsd3; @@ -125407,7 +121059,6 @@ self: { base loch-th placeholders template-haskell ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; doCheck = false; homepage = "https://github.com/nikita-volkov/numeric-qq"; description = "Quasi-quoters for numbers of different bases"; @@ -125438,10 +121089,10 @@ self: { editedCabalFile = "68b2a84c67b84bfe3cc3e7f4f2b0fafcd8e0741d4a3c57359f4437bb8824ea07"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit QuickCheck ]; - jailbreak = true; homepage = "http://github.com/nicodelpiano/numeric-ranges"; description = "A framework for numeric ranges"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "numeric-tools" = callPackage @@ -125573,7 +121224,6 @@ self: { template-haskell text time time-locale-compat transformers transformers-base utf8-string ]; - jailbreak = true; homepage = "https://github.com/neovimhaskell/nvim-hs"; description = "Haskell plugin backend for neovim"; license = stdenv.lib.licenses.asl20; @@ -125607,6 +121257,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "nvvm" = callPackage + ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory + , filepath, template-haskell + }: + mkDerivation { + pname = "nvvm"; + version = "0.7.5.0"; + sha256 = "ccd9efb4f1f97318e98d3ad363810d2fd4780992c37fc92d7e526b3af8f59c85"; + setupHaskellDepends = [ base Cabal directory filepath ]; + libraryHaskellDepends = [ base bytestring cuda template-haskell ]; + libraryToolDepends = [ c2hs ]; + homepage = "https://github.com/tmcdonell/nvvm"; + description = "FFI bindings to NVVM"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nyan" = callPackage ({ mkDerivation, base, bytestring, mtl, ncurses, text }: mkDerivation { @@ -125633,10 +121300,10 @@ self: { aeson base bytestring lens lens-aeson pipes pipes-aeson pipes-bytestring pipes-http pipes-parse text time wreq ]; - jailbreak = true; homepage = "https://github.com/bts/nylas-hs"; description = "Client for the Nylas API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "nymphaea" = callPackage @@ -125652,7 +121319,6 @@ self: { executableHaskellDepends = [ base cairo containers glade glib gtk mtl parsec random ]; - jailbreak = true; description = "An interactive GUI for manipulating L-systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -125696,9 +121362,9 @@ self: { http-client http-types mtl network network-uri text time transformers ]; - jailbreak = true; description = "Simple OAuth for http-client"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "obdd" = callPackage @@ -125769,10 +121435,10 @@ self: { base bytestring bytestring-arbitrary cereal QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/tsuraan/objectid"; description = "Rather unique identifier for things that need to be stored"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "objective" = callPackage @@ -125807,43 +121473,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "octane_0_4_24" = callPackage - ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary - , binary-bits, bytestring, containers, data-binary-ieee754, deepseq - , newtype-generics, tasty, tasty-hspec, text - }: - mkDerivation { - pname = "octane"; - version = "0.4.24"; - sha256 = "2c74c33a03f90c141da3ffc94c5434e24b6c7cf8c426927480ce0f278eb6802a"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty autoexporter base binary binary-bits bytestring - containers data-binary-ieee754 deepseq newtype-generics text - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base binary bytestring containers tasty tasty-hspec - ]; - jailbreak = true; - homepage = "https://github.com/tfausak/octane#readme"; - description = "Parse Rocket League replays"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "octane" = callPackage ({ mkDerivation, aeson, base, bimap, binary, binary-bits , bytestring, containers, data-binary-ieee754, data-default-class , deepseq, file-embed, http-client, http-client-tls - , overloaded-records, regex-compat, tasty, tasty-hspec, text - , unordered-containers, vector + , overloaded-records, regex-compat, tasty, tasty-hspec + , tasty-quickcheck, text, unordered-containers, vector }: mkDerivation { pname = "octane"; - version = "0.15.0"; - sha256 = "f5e89b98315efa4a62e0a07595dfecda52604bade45216def1eb23adbfc8218c"; + version = "0.16.3"; + sha256 = "e62faeb9bec990995d507e7542ebde84edfb42cbae4b0369bfe4aadec05d91fe"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125854,7 +121494,10 @@ self: { executableHaskellDepends = [ aeson base binary bytestring http-client http-client-tls ]; - testHaskellDepends = [ base tasty tasty-hspec ]; + testHaskellDepends = [ + base binary binary-bits bytestring containers tasty tasty-hspec + tasty-quickcheck text + ]; homepage = "https://github.com/tfausak/octane#readme"; description = "Parse Rocket League replays"; license = stdenv.lib.licenses.mit; @@ -125886,10 +121529,10 @@ self: { testHaskellDepends = [ base base-compat dotenv hspec hspec-expectations text transformers ]; - jailbreak = true; homepage = "https://github.com/stackbuilders/octohat"; description = "A tested, minimal wrapper around GitHub's API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "octopus" = callPackage @@ -125908,7 +121551,6 @@ self: { executableHaskellDepends = [ array base bytestring containers hexpr mtl parsec symbol text ]; - jailbreak = true; homepage = "https://github.com/Zankoku-Okuno/octopus/"; description = "Lisp with more dynamism, more power, more simplicity"; license = stdenv.lib.licenses.gpl3; @@ -125927,13 +121569,12 @@ self: { base either monads-tf transformers vect-floating ]; librarySystemDepends = [ libX11 libXinerama mesa ovr systemd ]; - jailbreak = true; homepage = "http://github.com/cpdurham/oculus"; description = "Oculus Rift ffi providing head tracking data"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; - inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;}; + inherit (pkgs) mesa; ovr = null; systemd = null;}; "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text @@ -125946,7 +121587,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers ]; - jailbreak = true; homepage = "http://oden-lang.org"; description = "Provides Go package metadata"; license = stdenv.lib.licenses.mit; @@ -125976,10 +121616,10 @@ self: { version = "0.1"; sha256 = "7247e8b9c2c81e159754665b06c52c1e572d2de2f5cf8f400a60232eeb124b0f"; libraryHaskellDepends = [ base parsec3 vector ]; - jailbreak = true; homepage = "https://github.com/acfoltzer/off-simple"; description = "A parser for simplified-syntax OFF files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ofx" = callPackage @@ -126051,7 +121691,6 @@ self: { base comonad directory filepath parallel ]; executableHaskellDepends = [ base directory filepath parallel ]; - jailbreak = true; description = "Library for purely functional lazy interactions with the outer world"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -126087,7 +121726,6 @@ self: { sha256 = "384e36f04810ca71a298e0e1a18d33a04f6dbe6a344e58f04d07143797ef64dc"; libraryHaskellDepends = [ base hogre ]; librarySystemDepends = [ OIS ]; - jailbreak = true; description = "wrapper for OIS input manager for use with hogre"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -126126,9 +121764,9 @@ self: { version = "1.4.2"; sha256 = "63e1741635b38b100c954133923c46de83c7c5e053ecfcc414e0b05c9d500feb"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Basic versioning library"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "olwrapper" = callPackage @@ -126152,7 +121790,6 @@ self: { base bytestring fay fay-jquery fay-text lens mtl snap snap-core snap-loader-static snap-server snaplet-fay text ]; - jailbreak = true; description = "An OpenLayers JavaScript Wrapper and Webframework with snaplet-fay"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -126171,7 +121808,6 @@ self: { executableHaskellDepends = [ base optparse-applicative shakespeare-text shelly text ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/omaketex"; description = "A simple tool to generate OMakefile for latex files"; license = stdenv.lib.licenses.bsd3; @@ -126229,7 +121865,6 @@ self: { executableHaskellDepends = [ base bytestring cmdargs conduit sandi transformers ]; - jailbreak = true; description = "data encoding and decoding command line utilities"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -126245,6 +121880,8 @@ self: { pname = "omnifmt"; version = "0.2.1.1"; sha256 = "1964789180234ea2ae72fa397beab99985392dac86f527ec7866463288341731"; + revision = "1"; + editedCabalFile = "51f61090b21ee761c23c15b3a1f371f306c9ac912c2b55fa565848e8dbba42fa"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -126302,24 +121939,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "once_0_1_0_0" = callPackage - ({ mkDerivation, base, containers, hashable, template-haskell - , unordered-containers - }: - mkDerivation { - pname = "once"; - version = "0.1.0.0"; - sha256 = "9a59a79946079ea2d00469f9c4a6a319ad96425f38f4b90093789109c268a7ab"; - libraryHaskellDepends = [ - base containers hashable template-haskell unordered-containers - ]; - jailbreak = true; - homepage = "https://anonscm.debian.org/cgit/users/kaction-guest/haskell-once.git"; - description = "memoization for IO actions and functions"; - license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "once" = callPackage ({ mkDerivation, base, containers, hashable, template-haskell , unordered-containers @@ -126345,7 +121964,6 @@ self: { libraryHaskellDepends = [ base contravariant ghc-prim transformers ]; - jailbreak = true; homepage = "https://github.com/sjoerdvisscher/one-liner"; description = "Constraint-based generics"; license = stdenv.lib.licenses.bsd3; @@ -126390,7 +122008,6 @@ self: { version = "0.1.0.3"; sha256 = "7798aed4847e21ba9c840fb05ad9538d7acf6ea941f1a1bce3189fb95412e4d3"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/thinkpad20/oneormore"; description = "A never-empty list type"; license = stdenv.lib.licenses.mit; @@ -126434,37 +122051,6 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; - "opaleye_0_4_2_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base16-bytestring - , bytestring, case-insensitive, containers, contravariant, multiset - , postgresql-simple, pretty, product-profunctors, profunctors - , QuickCheck, semigroups, text, time, time-locale-compat - , transformers, uuid, void - }: - mkDerivation { - pname = "opaleye"; - version = "0.4.2.0"; - sha256 = "b924c4d0fa7151c0dbaee5ddcd89adfa569614204a805392625752ea6dc13c20"; - revision = "7"; - editedCabalFile = "b3d11eb291ac042615847b8ce614cfa31d54055f7344e44a8f21b3556d92fa93"; - libraryHaskellDepends = [ - aeson attoparsec base base16-bytestring bytestring case-insensitive - contravariant postgresql-simple pretty product-profunctors - profunctors semigroups text time time-locale-compat transformers - uuid void - ]; - testHaskellDepends = [ - base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups time - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; - description = "An SQL-generating DSL targeting PostgreSQL"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "opaleye" = callPackage ({ mkDerivation, aeson, attoparsec, base, base16-bytestring , bytestring, case-insensitive, containers, contravariant, multiset @@ -126474,10 +122060,10 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.5.0.0"; - sha256 = "8fa68edc8e322f624c704526acbf2c813903bf73beab829849f515a7854415b5"; - revision = "2"; - editedCabalFile = "43d127c37fe4ff98db79dfb9c44cbc111aa77e6cbe9f449ef652e7a449b39b03"; + version = "0.5.1.1"; + sha256 = "4a931cbed10a9eb2c20abb1cfa7a70ead7c5b0464ec516a0dd437fef7b3dc02e"; + revision = "1"; + editedCabalFile = "134244b5b0a2b0d253dfd9021e6522938a138ed68631af787c0d7f3d673e6e39"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -126485,10 +122071,9 @@ self: { uuid void ]; testHaskellDepends = [ - base containers contravariant multiset postgresql-simple - product-profunctors profunctors QuickCheck semigroups time + aeson base containers contravariant multiset postgresql-simple + product-profunctors profunctors QuickCheck semigroups text time ]; - doCheck = false; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting PostgreSQL"; license = stdenv.lib.licenses.bsd3; @@ -126508,10 +122093,10 @@ self: { base bytestring lens mtl opaleye postgresql-simple product-profunctors transformers ]; - jailbreak = true; homepage = "https://github.com/benkolera/opaleye-classy/tree/master"; description = "Opaleye wrapped up in classy MTL attire"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opaleye-sqlite" = callPackage @@ -126534,7 +122119,6 @@ self: { base containers contravariant product-profunctors profunctors QuickCheck semigroups sqlite-simple time ]; - jailbreak = true; homepage = "https://github.com/tomjaguarpaw/haskell-opaleye"; description = "An SQL-generating DSL targeting SQLite"; license = stdenv.lib.licenses.bsd3; @@ -126587,9 +122171,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base basic-prelude text turtle ]; - jailbreak = true; description = "Open haddock HTML documentation"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "open-pandoc" = callPackage @@ -126710,7 +122294,6 @@ self: { sha256 = "96df8e0d3bd7df173a8d3e4b4b769cecb9f97de5683bbb3e6a137fd1f0941010"; libraryHaskellDepends = [ base bindings-DSL Cabal vector ]; libraryPkgconfigDepends = [ opencv ]; - jailbreak = true; homepage = "www.github.com/arjuncomar/opencv-raw.git"; description = "Raw Haskell bindings to OpenCV >= 2.0"; license = stdenv.lib.licenses.bsd3; @@ -126724,10 +122307,10 @@ self: { version = "0.0.0"; sha256 = "6194b08a0236a6fcc767e300dde4ec93dfe98cc416bcefd2cfea002e691267af"; libraryHaskellDepends = [ base hxt template-haskell th-lift ]; - jailbreak = true; homepage = "https://github.com/fabianbergmark/OpenDataTable"; description = "A library for working with Open Data Tables"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openexchangerates" = callPackage @@ -126759,7 +122342,6 @@ self: { aeson base bimap binary bytestring containers deepseq-generics hashable network ]; - jailbreak = true; homepage = "https://github.com/AndreasVoellmy/openflow"; description = "OpenFlow"; license = "unknown"; @@ -126820,7 +122402,6 @@ self: { base bytestring future-resource GLFW-b random time ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/capsjac/opengles#readme"; description = "Functional interface for OpenGL 4.1+ and OpenGL ES 2.0+"; license = stdenv.lib.licenses.lgpl3; @@ -126883,7 +122464,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 utf8-string ]; - jailbreak = true; homepage = "http://github.com/singpolyma/OpenPGP-Crypto"; description = "Implementation of cryptography for use with OpenPGP using the Crypto library"; license = "unknown"; @@ -126931,7 +122511,6 @@ self: { test-framework-hunit test-framework-quickcheck2 transformers utf8-string ]; - jailbreak = true; homepage = "http://github.com/singpolyma/OpenPGP-CryptoAPI"; description = "Implement cryptography for OpenPGP using crypto-api compatible libraries"; license = "unknown"; @@ -126949,7 +122528,6 @@ self: { libraryHaskellDepends = [ base binary bytestring hosc process random transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskell OpenSoundControl utilities"; license = "GPL"; @@ -126996,7 +122574,6 @@ self: { testHaskellDepends = [ base hspec keyword-args octohat optparse-applicative parsec text ]; - jailbreak = true; homepage = "https://github.com/stackbuilders/openssh-github-keys"; description = "Fetch OpenSSH keys from a GitHub team"; license = stdenv.lib.licenses.mit; @@ -127012,6 +122589,7 @@ self: { libraryHaskellDepends = [ base directory HsOpenSSL time unix ]; description = "Create OpenSSL keypairs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "openssl-streams" = callPackage @@ -127031,6 +122609,7 @@ self: { ]; description = "OpenSSL network support for io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentheory" = callPackage @@ -127098,7 +122677,6 @@ self: { base opentheory opentheory-parser opentheory-primitive QuickCheck random ]; - jailbreak = true; description = "Unicode characters"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -127244,22 +122822,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "operational_0_2_3_2" = callPackage - ({ mkDerivation, base, mtl, random }: - mkDerivation { - pname = "operational"; - version = "0.2.3.2"; - sha256 = "ed02d521b86b6791104a489b6225baf92f8a1641e6fa8ac1022990ef239443aa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base mtl ]; - executableHaskellDepends = [ random ]; - homepage = "http://haskell.org/haskellwiki/Operational"; - description = "Implementation of difficult monads made easy with operational semantics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "operational" = callPackage ({ mkDerivation, base, mtl, random }: mkDerivation { @@ -127359,6 +122921,35 @@ self: { license = "unknown"; }) {}; + "opml-conduit_0_6_0_1" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, conduit + , conduit-combinators, containers, data-default, hlint, lens-simple + , mono-traversable, monoid-subclasses, mtl, parsers, QuickCheck + , quickcheck-instances, resourcet, safe-exceptions, semigroups + , tasty, tasty-hunit, tasty-quickcheck, text, time, timerep + , uri-bytestring, xml-conduit, xml-types + }: + mkDerivation { + pname = "opml-conduit"; + version = "0.6.0.1"; + sha256 = "cb0f6e0964d854f7bbcb737867bc6d5e9ddcac6da05e6d743a1c4503abc78355"; + libraryHaskellDepends = [ + base case-insensitive conduit conduit-combinators containers + lens-simple mono-traversable monoid-subclasses safe-exceptions + semigroups text time timerep uri-bytestring xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring conduit conduit-combinators containers data-default + hlint lens-simple mono-traversable mtl parsers QuickCheck + quickcheck-instances resourcet semigroups tasty tasty-hunit + tasty-quickcheck text time uri-bytestring xml-conduit + ]; + homepage = "https://github.com/k0ral/opml-conduit"; + description = "Streaming parser/renderer for the OPML 2.0 format."; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opn" = callPackage ({ mkDerivation, base, directory, filepath, ini, network-uri , optparse-applicative, process, text, unordered-containers @@ -127395,7 +122986,6 @@ self: { testHaskellDepends = [ base bytestring bytestring-arbitrary deepseq QuickCheck vector ]; - jailbreak = true; homepage = "https://github.com/tsuraan/optimal-blocks"; description = "Optimal Block boundary determination for rsync-like behaviours"; license = stdenv.lib.licenses.bsd3; @@ -127413,10 +123003,10 @@ self: { libraryHaskellDepends = [ ad base distributive linear semigroupoids vector ]; - jailbreak = true; homepage = "http://github.com/bgamari/optimization"; description = "Numerical optimization"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optimusprime" = callPackage @@ -127433,7 +123023,6 @@ self: { base cmdargs containers fgl flite graphviz haskell98 mtl parsec uniplate wl-pprint ]; - jailbreak = true; homepage = "http://optimusprime.posterous.com/"; description = "A supercompiler for f-lite"; license = stdenv.lib.licenses.bsd3; @@ -127489,7 +123078,6 @@ self: { testHaskellDepends = [ base chell chell-quickcheck containers monads-tf transformers ]; - doCheck = false; homepage = "https://john-millikin.com/software/haskell-options/"; description = "A powerful and easy-to-use command-line option parser"; license = stdenv.lib.licenses.mit; @@ -127664,7 +123252,6 @@ self: { aeson base bytestring errors hspec lens QuickCheck smallcheck text wreq ]; - jailbreak = true; description = "An API client for http://orchestrate.io/."; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -127685,7 +123272,6 @@ self: { filestore hscolour mtl nano-md5 parsec process QuickCheck salvia salvia-extras stm time unix xml ]; - jailbreak = true; description = "Haskell Wiki Library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127705,7 +123291,6 @@ self: { base extensible-exceptions mtl network orchid Pipe salvia salvia-extras stm ]; - jailbreak = true; description = "Haskell Wiki Demo"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -127749,9 +123334,9 @@ self: { sha256 = "0069ae9ad6ed98ca367026e9c1d6be4c553e6ec451aff0f658532e0ed6a692bd"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; description = "Order statistic trees based on weight-balanced trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "order-statistics" = callPackage @@ -127765,10 +123350,10 @@ self: { libraryHaskellDepends = [ base containers math-functions statistics vector vector-space ]; - jailbreak = true; homepage = "http://github.com/ekmett/order-statistics/"; description = "L-Estimators for robust statistics"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ordered" = callPackage @@ -127789,9 +123374,9 @@ self: { version = "0.1.0.0"; sha256 = "f9d34b503516bf1bb0119ff12be4e81d78d2bc3a66e2797ba070405d1e75c6e7"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "basic orders"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ordrea" = callPackage @@ -127818,9 +123403,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ attoparsec base text ]; - jailbreak = true; description = "Organize scala imports"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orgmode" = callPackage @@ -127838,9 +123423,9 @@ self: { base containers hspec HStringTemplate network network-uri parsec QuickCheck random regex-posix syb text ]; - jailbreak = true; description = "Org Mode library for haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "orgmode-parse" = callPackage @@ -127914,10 +123499,10 @@ self: { libraryHaskellDepends = [ attoparsec base binary bytestring data-binary-ieee754 network ]; - jailbreak = true; homepage = "https://github.com/peacememories/haskell-osc"; description = "A library to handle messages in the OSC protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "oscpacking" = callPackage @@ -127988,7 +123573,6 @@ self: { persistent-sqlite persistent-template pool-conduit stm stm-chans text time transformers transformers-base ]; - jailbreak = true; description = "Download Open Street Map tiles"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -128040,7 +123624,6 @@ self: { aeson base binary HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "https://github.com/operational-transformation/ot.hs"; description = "Real-time collaborative editing with Operational Transformation"; license = stdenv.lib.licenses.mit; @@ -128092,7 +123675,6 @@ self: { sha256 = "fcdbff55a72636cfb27694ea6731cd6233fa57af937de08ee34afa80a78a6957"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; description = "An alternative to some of the Prelude"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -128109,10 +123691,10 @@ self: { libraryHaskellDepends = [ array base bytestring lens transformers vector ]; - jailbreak = true; homepage = "https://github.com/capsjac/pack"; description = "Bidirectional fast ByteString packer/unpacker"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "package-description-remote" = callPackage @@ -128159,7 +123741,6 @@ self: { executableHaskellDepends = [ base Cabal Diff filepath haskell-src-exts ]; - jailbreak = true; description = "Haskell Package Versioning Tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -128203,9 +123784,9 @@ self: { tasty-quickcheck unordered-containers vector vector-binary-instances ]; - jailbreak = true; description = "Generation and traversal of highly compressed directed acyclic word graphs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "packedstring" = callPackage @@ -128217,7 +123798,6 @@ self: { revision = "1"; editedCabalFile = "cbc334ff8e721fb18b6799b28dc3e77addc7234aa553725b0af68375f75e0bcf"; libraryHaskellDepends = [ array base ]; - jailbreak = true; description = "(Deprecated) Packed Strings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -128276,7 +123856,6 @@ self: { base Cabal directory filepath haskell-src-exts optparse-applicative split ]; - jailbreak = true; homepage = "https://github.com/hvr/packunused"; description = "Tool for detecting redundant Cabal package dependencies"; license = stdenv.lib.licenses.bsd3; @@ -128292,10 +123871,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base deepseq directory-tree ]; - jailbreak = true; homepage = "https://github.com/Tener/archlinux-utils"; description = "Read whole Pacman database which pushes it into the memory cache"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "padKONTROL" = callPackage @@ -128309,7 +123888,6 @@ self: { libraryHaskellDepends = [ base containers hmidi minioperational transformers ]; - jailbreak = true; homepage = "https://github.com/fumieval/padKONTROL"; description = "Controlling padKONTROL native mode"; license = stdenv.lib.licenses.bsd3; @@ -128330,10 +123908,10 @@ self: { aeson base bytestring containers lens text wreq ]; executableHaskellDepends = [ base text wreq ]; - jailbreak = true; homepage = "https://github.com/diogob/pagarme_haskell"; description = "Pagarme API wrapper"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pager" = callPackage @@ -128381,12 +123959,37 @@ self: { license = "unknown"; }) {}; + "pagerduty_0_0_8" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring + , bytestring-conversion, conduit, data-default-class, exceptions + , generics-sop, http-client, http-types, lens, lens-aeson, mmorph + , monad-control, mtl, template-haskell, text, time + , time-locale-compat, transformers, transformers-base + , transformers-compat, unordered-containers + }: + mkDerivation { + pname = "pagerduty"; + version = "0.0.8"; + sha256 = "2f8f9ef70a672dd9160beb1e87d9b88d8cbd6f137637f4aed98df756ea270463"; + libraryHaskellDepends = [ + aeson base bifunctors bytestring bytestring-conversion conduit + data-default-class exceptions generics-sop http-client http-types + lens lens-aeson mmorph monad-control mtl template-haskell text time + time-locale-compat transformers transformers-base + transformers-compat unordered-containers + ]; + homepage = "http://github.com/brendanhay/pagerduty"; + description = "Client library for PagerDuty Integration and REST APIs"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pagination" = callPackage ({ mkDerivation, base, deepseq, exceptions, hspec, QuickCheck }: mkDerivation { pname = "pagination"; - version = "0.1.0"; - sha256 = "1d4312ec808e0a39f15b0f78e84b298b1ad6c608aa9a43b2476e94e5c51c771d"; + version = "0.1.1"; + sha256 = "bac47b84007afe78cdb2a26e2058961d4a67669f9d9b8b0a30f813cd83e6eb04"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -128410,19 +124013,6 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "palette_0_1_0_3" = callPackage - ({ mkDerivation, array, base, colour, containers }: - mkDerivation { - pname = "palette"; - version = "0.1.0.3"; - sha256 = "f75a713245af54d86cd34ce79f2b6d2d8c35aa7d56c28c07e33465227cdedea1"; - libraryHaskellDepends = [ array base colour containers ]; - homepage = "http://projects.haskell.org/diagrams"; - description = "Utilities for choosing and creating color schemes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "palette" = callPackage ({ mkDerivation, array, base, colour, containers }: mkDerivation { @@ -128580,40 +124170,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc-citeproc_0_9_1_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring - , containers, data-default, directory, filepath, hs-bibutils, mtl - , old-locale, pandoc, pandoc-types, parsec, process, rfc5051 - , setenv, split, syb, tagsoup, temporary, text, time - , unordered-containers, vector, xml-conduit, yaml - }: - mkDerivation { - pname = "pandoc-citeproc"; - version = "0.9.1.1"; - sha256 = "15c89a9aa6bce4efd6b728ea16151eb6390cad0495eb82c50cbac490591c8f86"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers data-default directory filepath - hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051 - setenv split syb tagsoup text time unordered-containers vector - xml-conduit yaml - ]; - executableHaskellDepends = [ - aeson aeson-pretty attoparsec base bytestring filepath pandoc - pandoc-types syb text yaml - ]; - testHaskellDepends = [ - aeson base bytestring directory filepath pandoc pandoc-types - process temporary text yaml - ]; - doCheck = false; - homepage = "https://github.com/jgm/pandoc-citeproc"; - description = "Supports using pandoc with citeproc"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-citeproc" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , containers, data-default, directory, filepath, hs-bibutils, mtl @@ -128623,8 +124179,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.10.1"; - sha256 = "ebc3eb3ff95e97ebd46c0918a65db2da021de2a70d02dc85ca5b344ea5c21205"; + version = "0.10.1.1"; + sha256 = "67ea382f068ecc5eea1ad44c515e7aaa56d3e60e6be18ed3d2ec5cfd85eb8432"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128674,6 +124230,8 @@ self: { pname = "pandoc-crossref"; version = "0.2.3.0"; sha256 = "b6b4200023da4835cf50a2c9a247a837282ccf16e1684336b5a15d17b9ad085e"; + revision = "1"; + editedCabalFile = "d2e8585033cbfcb5d232c01e6df4f9ba073d1249613847c238d433b011015693"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -128705,10 +124263,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base csv pandoc pandoc-types text ]; executableHaskellDepends = [ base csv pandoc pandoc-types ]; - jailbreak = true; homepage = "https://github.com/baig/pandoc-csv2table-filter"; description = "Convert CSV to Pandoc Table Markdown"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pandoc-include" = callPackage @@ -128804,23 +124362,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pandoc-types_1_16_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , ghc-prim, syb - }: - mkDerivation { - pname = "pandoc-types"; - version = "1.16.1"; - sha256 = "846054157d7072ca3f7260b988a6752536b42bbd32c051400e55f46229b8179e"; - libraryHaskellDepends = [ - aeson base bytestring containers deepseq ghc-prim syb - ]; - homepage = "http://johnmacfarlane.net/pandoc"; - description = "Types for representing a structured document"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pandoc-types" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , ghc-prim, syb @@ -128851,24 +124392,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pango_0_13_1_1" = callPackage - ({ mkDerivation, array, base, cairo, containers, directory, glib - , gtk2hs-buildtools, mtl, pango, pretty, process, text + "pandoc-vimhl" = callPackage + ({ mkDerivation, base, cond, directory, filepath, pandoc-types + , process, regex-compat, temporary }: mkDerivation { - pname = "pango"; - version = "0.13.1.1"; - sha256 = "3c22f339fe2e30cb6d6cbc5906e1064c5fdabfbc56d2a2c015ac70b4aa5165ad"; - libraryHaskellDepends = [ - array base cairo containers directory glib mtl pretty process text + pname = "pandoc-vimhl"; + version = "0.1.1.0"; + sha256 = "ceab0f2df428c0e15bcbf3cf24cdead4cc0907252dbc0f705ce9edb2c6ef6775"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base cond directory filepath pandoc-types process regex-compat + temporary ]; - libraryPkgconfigDepends = [ pango ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Pango text rendering engine"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) pango;}; + homepage = "http://github.com/lyokha/vim-publish-helper"; + description = "Pandoc filter for native Vim code highlighting"; + license = stdenv.lib.licenses.bsd3; + }) {}; "pango" = callPackage ({ mkDerivation, array, base, Cabal, cairo, containers, directory @@ -128887,17 +124428,19 @@ self: { homepage = "http://projects.haskell.org/gtk2hs/"; description = "Binding to the Pango text rendering engine"; license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs.gnome) pango;}; + }) {inherit (pkgs.gnome2) pango;}; "papa" = callPackage - ({ mkDerivation, base, directory, doctest, filepath, papa-lens - , papa-prelude, QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, papa-base + , papa-include, papa-prelude, QuickCheck, template-haskell }: mkDerivation { pname = "papa"; - version = "0.0.1"; - sha256 = "066d3e396e227d3775ab4d636e8c71c67ad2b883053ae593a1f4f7eb128491b3"; - libraryHaskellDepends = [ base papa-lens papa-prelude ]; + version = "0.1.0"; + sha256 = "65e86b5cda900e60856216f000cd95931780f7ba437e5ecc5924da698a9fc730"; + libraryHaskellDepends = [ + base papa-base papa-include papa-prelude + ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; @@ -128907,6 +124450,40 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "papa-base" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell + }: + mkDerivation { + pname = "papa-base"; + version = "0.1.0"; + sha256 = "532ddec481ae97e7fdf074c653c3549a150f34a701572ed33aadab3f4899dcdf"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-base"; + description = "Prelude with only useful functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "papa-include" = callPackage + ({ mkDerivation, base, directory, doctest, filepath, lens + , QuickCheck, semigroupoids, semigroups, template-haskell + }: + mkDerivation { + pname = "papa-include"; + version = "0.1.0"; + sha256 = "d39ff3c7bdfe065878f53f1722c9852db6bc1d8a0ea3c6152f759e1fa65a14ff"; + libraryHaskellDepends = [ base lens semigroupoids semigroups ]; + testHaskellDepends = [ + base directory doctest filepath QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/papa-include"; + description = "Third party libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "papa-lens" = callPackage ({ mkDerivation, base, directory, doctest, filepath, lens , QuickCheck, template-haskell @@ -128925,22 +124502,17 @@ self: { }) {}; "papa-prelude" = callPackage - ({ mkDerivation, base, directory, doctest, filepath - , papa-prelude-core, papa-prelude-lens, papa-prelude-semigroupoids - , papa-prelude-semigroups, QuickCheck, template-haskell + ({ mkDerivation, base, directory, doctest, filepath, QuickCheck + , template-haskell }: mkDerivation { pname = "papa-prelude"; - version = "0.0.1"; - sha256 = "6336946e1164a30f1bb0b21e5b7f316a06488b2b329db7ef9ebb892168b2fc99"; - libraryHaskellDepends = [ - base papa-prelude-core papa-prelude-lens papa-prelude-semigroupoids - papa-prelude-semigroups - ]; + version = "0.1.1"; + sha256 = "5af67b6e0a8e49b36dd1bfdf7a9daeec1459ab4a6688f04fb87c4fd54e8f5ef1"; + libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/data61/papa-prelude"; description = "Prelude with only useful functions"; license = stdenv.lib.licenses.bsd3; @@ -129033,7 +124605,6 @@ self: { executableHaskellDepends = [ base directory filepath monads-tf template-haskell transformers ]; - jailbreak = true; homepage = "https://skami.iocikun.jp/haskell/packages/papillon"; description = "packrat parser"; license = stdenv.lib.licenses.bsd3; @@ -129112,7 +124683,6 @@ self: { uniplate ]; executableToolDepends = [ alex ]; - jailbreak = true; description = "Paragon"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129125,7 +124695,6 @@ self: { version = "3.2.0.3"; sha256 = "163a40ef3c6258c623abe690a9837c9de2bf7fe87d3fac7d0758229d7efb6dcd"; libraryHaskellDepends = [ array base containers deepseq ]; - jailbreak = true; description = "Parallel programming library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129170,7 +124739,6 @@ self: { base bytestring cereal deepseq here old-locale stm time transformers vector vector-algorithms ]; - jailbreak = true; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -129223,6 +124791,7 @@ self: { homepage = "https://github.com/troydm/paranoia#readme"; description = "http proxy server"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parco" = callPackage @@ -129281,27 +124850,28 @@ self: { ({ mkDerivation, abstract-par, accelerate, array, async, base , binary, bytestring, containers, deepseq, directory , distributed-process, distributed-process-simplelocalnet - , distributed-static, filepath, HTTP, monad-par, network + , distributed-static, filepath, http-conduit, monad-par, network , network-uri, normaldistribution, parallel, random, repa, stm , template-haskell, time, transformers, utf8-string, vector, xml }: mkDerivation { pname = "parconc-examples"; - version = "0.4.3"; - sha256 = "22770bec32f6dcfcd68a55c49473932ba09eb21e5f72631fec17e0be40599f8e"; + version = "0.4.5"; + sha256 = "90df61563ec9268a93b6313f4bcb9b25e9c2c4c3c54eef8066a44b72f4185e9c"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ abstract-par accelerate array async base binary bytestring containers deepseq directory distributed-process - distributed-process-simplelocalnet distributed-static filepath HTTP - monad-par network network-uri normaldistribution parallel random - repa stm template-haskell time transformers utf8-string vector xml + distributed-process-simplelocalnet distributed-static filepath + http-conduit monad-par network network-uri normaldistribution + parallel random repa stm template-haskell time transformers + utf8-string vector xml ]; - jailbreak = true; homepage = "http://github.com/simonmar/parconc-examples"; description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\""; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parport" = callPackage @@ -129339,7 +124909,6 @@ self: { template-haskell text th-lift ]; testHaskellDepends = [ cmdargs ]; - jailbreak = true; homepage = "http://github.com/gregwebs/cmdargs-help"; description = "generate command line arguments from a --help output"; license = stdenv.lib.licenses.bsd3; @@ -129374,7 +124943,6 @@ self: { testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - doCheck = false; homepage = "https://github.com/aslatter/parsec"; description = "Monadic parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -129387,9 +124955,25 @@ self: { version = "0.1.0.5"; sha256 = "c463e37a18a5f661a51e5b1b67b7b025bafa969fada109eef3467ce4e9bcb474"; libraryHaskellDepends = [ base monads-tf parsec transformers ]; - jailbreak = true; description = "Some miscellaneous basic string parsers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "parsec-free" = callPackage + ({ mkDerivation, base, bytestring, containers, free, lens, mtl + , parsec, text, transformers + }: + mkDerivation { + pname = "parsec-free"; + version = "3.1.11.6"; + sha256 = "10e0af2e1c16447494649442bd5fea121e51d0637d4a92b4e215ad076f076c09"; + libraryHaskellDepends = [ + base bytestring containers free lens mtl parsec text transformers + ]; + homepage = "https://github.com/jwiegley/parsec-free"; + description = "Parsec API encoded as a deeply-embedded DSL, for debugging and analysis"; + license = stdenv.lib.licenses.mit; }) {}; "parsec-numbers" = callPackage @@ -129413,10 +124997,10 @@ self: { sha256 = "72e841d83ea5f21a6e8309b661d009c092623e8704f6a10db8fb00ec2363d5ce"; libraryHaskellDepends = [ base parsec parsers ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/ekmett/parsec-parsers/"; description = "Parsing instances for Parsec"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsec-permutation" = callPackage @@ -129547,10 +125131,10 @@ self: { sha256 = "035000bf10b842dabc917132e05dd797b20c2bbd3619d415c3027bfe40b1b0f0"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec parsec ]; - jailbreak = true; homepage = "https://github.com/stackbuilders/parseerror-eq"; description = "Adds and Eq instance for Parsec's ParseError if needed"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "parsek" = callPackage @@ -129587,7 +125171,6 @@ self: { executableHaskellDepends = [ aeson base bytestring haskell-src-exts text ]; - jailbreak = true; description = "Prints Haskell parse trees in JSON"; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -129626,7 +125209,6 @@ self: { template-haskell test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; description = "TH parser generator for splitting bytestring into fixed-width fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129650,7 +125232,6 @@ self: { attoparsec base bytestring containers directory doctest filepath parsec QuickCheck quickcheck-instances ]; - doCheck = false; homepage = "http://github.com/ekmett/parsers/"; description = "Parsing combinators"; license = stdenv.lib.licenses.bsd3; @@ -129675,7 +125256,6 @@ self: { executableHaskellDepends = [ array base binary bytestring containers deepseq mtl ]; - jailbreak = true; description = "NMR-STAR file format parser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -129706,10 +125286,10 @@ self: { pipes PSQueue random transformers vector ]; testHaskellDepends = [ base containers HUnit tasty tasty-hunit ]; - jailbreak = true; homepage = "https://github.com/kawu/partage"; description = "Parsing factorized"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "partial" = callPackage @@ -129743,8 +125323,8 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "partial-isomorphisms"; - version = "0.2"; - sha256 = "fd92b4a0e8346802e02423344fff6ce1817f14de0f0950f4b839c5735be8b472"; + version = "0.2.2"; + sha256 = "f6ee216db7be14d497c428562c83423a5d2579c86b70b822996bde28c196569c"; libraryHaskellDepends = [ base template-haskell ]; homepage = "http://www.informatik.uni-marburg.de/~rendel/unparse"; description = "Partial isomorphisms"; @@ -129763,12 +125343,29 @@ self: { libraryHaskellDepends = [ base comonad-transformers data-lens transformers ]; - jailbreak = true; description = "Haskell 98 Partial Lenses"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "partial-order" = callPackage + ({ mkDerivation, base, containers, HUnit, test-framework + , test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "partial-order"; + version = "0.1.2"; + sha256 = "9a343b7206ddd717d9a1bb5562052fb503a33ebef8434d8f7f5e1eea04cef5d1"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/mtesseract/haskell-partial-order"; + description = "Provides typeclass suitable for types admitting a partial order"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "partial-uri" = callPackage ({ mkDerivation, base, network-uri }: mkDerivation { @@ -129840,13 +125437,12 @@ self: { }: mkDerivation { pname = "pasta"; - version = "0.1.0.1"; - sha256 = "19a2b39efebef3faedf7cff7434e2d1f6c9a09e1a4c49d1d7ef49f8d6d3f9e83"; + version = "0.1.0.2"; + sha256 = "53b5ebc2887e4f7e466a6a4824c2fb2fad03bd9a8a38bd0d37901df28edc8b79"; libraryHaskellDepends = [ base microlens microlens-th protolude semigroups text text-show ]; testHaskellDepends = [ base hspec microlens protolude ]; - jailbreak = true; homepage = "http://github.com/diogob/pasta#readme"; description = "PostgreSQL Abstract Syntax Tree Assember"; license = stdenv.lib.licenses.bsd3; @@ -129880,6 +125476,26 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "patat" = callPackage + ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, containers + , directory, filepath, mtl, optparse-applicative, pandoc + , terminal-size, time + }: + mkDerivation { + pname = "patat"; + version = "0.1.0.0"; + sha256 = "565b5885113d5805e15cb29be37feb1a45b10bd3202b474acc04a14bfe82c87e"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + ansi-terminal ansi-wl-pprint base containers directory filepath mtl + optparse-applicative pandoc terminal-size time + ]; + homepage = "http://github.com/jaspervdj/patat"; + description = "Terminal-based presentations using Pandoc"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "patch-combinators" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -129907,7 +125523,6 @@ self: { accelerate-io accelerate-utility base Cabal filepath gnuplot hmatrix JuicyPixels utility-ht vector ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/patch-image/"; description = "Compose a big image from overlapping parts"; license = stdenv.lib.licenses.bsd3; @@ -129928,27 +125543,9 @@ self: { testHaskellDepends = [ base criterion doctest hspec QuickCheck vector ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/liamoc/patches-vector"; description = "Patches (diffs) on vectors: composable, mergeable, and invertible"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "path_0_5_8" = callPackage - ({ mkDerivation, aeson, base, deepseq, exceptions, filepath, hspec - , HUnit, mtl, template-haskell - }: - mkDerivation { - pname = "path"; - version = "0.5.8"; - sha256 = "aa85f40a40ce8c96de260481501b1884c0d86c37ad58505bda011b803fdcefd8"; - libraryHaskellDepends = [ - aeson base deepseq exceptions filepath template-haskell - ]; - testHaskellDepends = [ aeson base hspec HUnit mtl ]; - description = "Support for well-typed paths"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -129979,24 +125576,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "path-io_1_1_0" = callPackage - ({ mkDerivation, base, directory, exceptions, filepath, hspec, path - , temporary, time, transformers - }: - mkDerivation { - pname = "path-io"; - version = "1.1.0"; - sha256 = "b94af45683e0c39d259fac8cad906957b97991a3cdac45e067fd1dc9baebe59f"; - libraryHaskellDepends = [ - base directory exceptions filepath path temporary time transformers - ]; - testHaskellDepends = [ base exceptions hspec path ]; - homepage = "https://github.com/mrkkrp/path-io"; - description = "Interface to ‘directory’ package for users of ‘path’"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "path-io" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , hspec, path, temporary, time, transformers, unix-compat @@ -130107,9 +125686,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HandsomeSoup hxt ]; - jailbreak = true; description = "A webpage scraper for Patreon which dumps a list of patrons to a text file"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pattern-arrows" = callPackage @@ -130174,7 +125753,6 @@ self: { aeson base bytestring directory filepath HUnit test-framework test-framework-hunit text ]; - jailbreak = true; homepage = "https://github.com/fanjam/paypal-adaptive-hoops"; description = "Client for a limited part of PayPal's Adaptive Payments API"; license = stdenv.lib.licenses.mit; @@ -130193,7 +125771,6 @@ self: { base bytestring conduit containers failure http-conduit http-types mtl old-locale text time wai ]; - jailbreak = true; homepage = "http://projects.haskell.org/paypal-api/"; description = "PayPal API, currently supporting \"ButtonManager\""; license = stdenv.lib.licenses.bsd3; @@ -130223,10 +125800,10 @@ self: { version = "0.1.1.5"; sha256 = "e98b3d9e9c0361eb43f1f7dfcdc2d85d72eb51572081aed6bcd9f4d4048ab399"; libraryHaskellDepends = [ base hslua string-qq ]; - jailbreak = true; homepage = "https://github.com/DavidFeng/pbc4hs"; description = "pbc for HsLua"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pbkdf" = callPackage @@ -130396,10 +125973,10 @@ self: { version = "0.0.0"; sha256 = "7daf891775c00f9105051c9246ff8d8ecaee0a163503a8b309ed6bfa9e1950ce"; libraryHaskellDepends = [ base bytestring pcre-light ]; - jailbreak = true; homepage = "http://github.com/urso/pcre-light-extra"; description = "pcre-light extra functionality"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pcre-utils" = callPackage @@ -130537,10 +126114,10 @@ self: { executableHaskellDepends = [ base directory pdfinfo process temporary ]; - jailbreak = true; homepage = "http://dmwit.com/pdfsplit"; description = "split two-column PDFs, so there is one column per page"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pdynload" = callPackage @@ -130582,9 +126159,9 @@ self: { version = "0.1.0.1"; sha256 = "31fdd23993a76155738224a7b230a1a6fcfde091b2fbc945df4cb54068eeec7b"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Peano numbers"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "peano-inf" = callPackage @@ -130664,7 +126241,6 @@ self: { base hashtables haskell-src-meta ListLike monad-control mtl template-haskell ]; - jailbreak = true; homepage = "http://tanakh.github.com/Peggy"; description = "The Parser Generator for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -130684,7 +126260,6 @@ self: { arithmoi base Cabal cabal-test-quickcheck containers primes QuickCheck ]; - jailbreak = true; homepage = "https://github.com/brunjlar/pell"; description = "Package to solve the Generalized Pell Equation"; license = stdenv.lib.licenses.mit; @@ -130745,7 +126320,6 @@ self: { anonymous-sums base parsec QuickCheck random-shuffle semigroups tasty tasty-quickcheck text time transformers ]; - jailbreak = true; homepage = "http://www.github.com/massysett/penny"; description = "Extensible double-entry accounting system"; license = stdenv.lib.licenses.bsd3; @@ -130813,9 +126387,9 @@ self: { version = "0.1.0.3"; sha256 = "e854329cfb148c22c4117914f877cf70622aafd0dfa6adb7f122fd41b6ce3b70"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "The perceptron learning algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "perdure" = callPackage @@ -130842,7 +126416,6 @@ self: { base bytestring cognimeta-utils containers MonadRandom mtl QuickCheck template-haskell transformers ]; - jailbreak = true; homepage = "https://github.com/Cognimeta/perdure"; description = "Robust persistence for acyclic immutable data"; license = "unknown"; @@ -130874,8 +126447,8 @@ self: { }: mkDerivation { pname = "period"; - version = "0.1.0.3"; - sha256 = "d5f9c9e798341990e186f98330244f22a875e87a600098666f81438b69f15ab3"; + version = "0.1.0.4"; + sha256 = "f1f0d37ee4e6e31fc448e6f552105d20c3a9359f8af8780d52eeb980d313715c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130883,7 +126456,6 @@ self: { ]; executableHaskellDepends = [ base optparse-applicative text ]; testHaskellDepends = [ base hspec HUnit text time ]; - jailbreak = true; homepage = "https://github.com/w3rs/period"; description = "Parse and format date periods, collapse and expand their text representations"; license = stdenv.lib.licenses.bsd3; @@ -130919,10 +126491,10 @@ self: { testHaskellDepends = [ base HUnit mtl test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/sonyandy/perm"; description = "permutation Applicative and Monad with many mtl instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "permutation" = callPackage @@ -130960,9 +126532,9 @@ self: { executableHaskellDepends = [ base optparse-applicative persistent text ]; - jailbreak = true; description = "Transforms persist's quasi-quoted syntax into ER format"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistable-record" = callPackage @@ -130971,8 +126543,8 @@ self: { }: mkDerivation { pname = "persistable-record"; - version = "0.4.0.2"; - sha256 = "aedb118290a52a9b5ff035247862675bad6a3f06f7019411cdbcf942bde8fa77"; + version = "0.4.0.3"; + sha256 = "0a25f3cfec301e9124293e8f38ad55fba5d18d3d7a9371a971ee17b6152ad360"; libraryHaskellDepends = [ array base containers dlist names-th template-haskell th-data-compat transformers @@ -131047,8 +126619,8 @@ self: { pname = "persistent"; version = "2.6"; sha256 = "42423362de94599581d18be644ba77181e87417087b3953daec2e8512d408e3e"; - revision = "1"; - editedCabalFile = "9a319037770f0dbdb394343aa5efca241680c2854a8d53e74b61debf4b6ded9d"; + revision = "2"; + editedCabalFile = "34e03865c3d882d04c3a03e289007cd6a8669b941b5fdac27c2628a2d976b2b6"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring blaze-html blaze-markup bytestring conduit containers exceptions fast-logger http-api-data @@ -131097,6 +126669,7 @@ self: { ]; description = "Parses a Persist Model file and produces Audit Models"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-cereal" = callPackage @@ -131106,10 +126679,10 @@ self: { version = "0.1.0"; sha256 = "ce645be2e87c2e8a51cc1022edeac91f4fa54dc235b91ddcd452d87937725325"; libraryHaskellDepends = [ base cereal persistent text ]; - jailbreak = true; homepage = "http://hub.darcs.net/co-dan/persistent-cereal"; description = "Helper functions for writing Persistent instances"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-database-url" = callPackage @@ -131127,7 +126700,6 @@ self: { testHaskellDepends = [ base bytestring hspec persistent-postgresql text ]; - jailbreak = true; description = "Parse DATABASE_URL into configuration types for Persistent"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -131140,9 +126712,9 @@ self: { version = "0.3"; sha256 = "1fa360e15d1c6e768d0d85928defdd4673ffb9b4dcb2c7d8a2746abe5600d692"; libraryHaskellDepends = [ array base diffarray ]; - jailbreak = true; description = "Persistent equivalence relations (aka union-find)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "persistent-hssqlppp" = callPackage @@ -131202,34 +126774,12 @@ self: { base binary containers directory EdisonAPI EdisonCore filepath LRU mtl stm-io-hooks ]; - jailbreak = true; homepage = "http://darcs.monoid.at/persistent-map"; description = "A thread-safe (STM) persistency interface for finite map types"; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "persistent-mongoDB_2_1_4" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal - , conduit, containers, http-api-data, monad-control, mongoDB - , network, path-pieces, persistent, resource-pool, resourcet, text - , time, transformers - }: - mkDerivation { - pname = "persistent-mongoDB"; - version = "2.1.4"; - sha256 = "06b9d86c6f6b68025a86bd9cc62595bda303007f4da721764241d160f23766a2"; - libraryHaskellDepends = [ - aeson attoparsec base bson bytestring cereal conduit containers - http-api-data monad-control mongoDB network path-pieces persistent - resource-pool resourcet text time transformers - ]; - homepage = "http://www.yesodweb.com/book/persistent"; - description = "Backend for the persistent library using mongoDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "persistent-mongoDB" = callPackage ({ mkDerivation, aeson, attoparsec, base, bson, bytestring, cereal , conduit, containers, http-api-data, monad-control, mongoDB @@ -131248,25 +126798,6 @@ self: { homepage = "http://www.yesodweb.com/book/persistent"; description = "Backend for the persistent library using mongoDB"; license = stdenv.lib.licenses.mit; - }) {}; - - "persistent-mysql_2_3_0_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, mysql, mysql-simple - , persistent, resourcet, text, transformers - }: - mkDerivation { - pname = "persistent-mysql"; - version = "2.3.0.2"; - sha256 = "7e1c21ee07df97172528c83709a4435040e477e46e1d558f3dd5bcda84c4f033"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger mysql mysql-simple persistent 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; }) {}; @@ -131318,31 +126849,9 @@ self: { sha256 = "9ec9dda9721c20aab99ff0414c08b552c4b8893ee896460c99ae7ef960017c27"; libraryHaskellDepends = [ attoparsec base text ]; testHaskellDepends = [ attoparsec base hspec text ]; - jailbreak = true; description = "Parse persistent model files"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "persistent-postgresql_2_2_2" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit - , containers, monad-control, monad-logger, persistent - , postgresql-libpq, postgresql-simple, resourcet, text, time - , transformers - }: - mkDerivation { - pname = "persistent-postgresql"; - version = "2.2.2"; - sha256 = "7ec31242349f8ea7da149991fbe3366a6a83f3e3915392c997b3c34fc27671cd"; - libraryHaskellDepends = [ - aeson base blaze-builder bytestring conduit containers - monad-control monad-logger persistent postgresql-libpq - postgresql-simple resourcet text time transformers - ]; - 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 ]; }) {}; "persistent-postgresql" = callPackage @@ -131378,7 +126887,6 @@ self: { base bytestring persistent protocol-buffers protocol-buffers-descriptor template-haskell text ]; - jailbreak = true; homepage = "https://github.com/mstone/persistent-protobuf"; description = "Template-Haskell helpers for integrating protobufs with persistent"; license = stdenv.lib.licenses.bsd3; @@ -131392,7 +126900,6 @@ self: { version = "0.2.0.0"; sha256 = "e3b14ed8c78999ebe797e84cac75bc66ed7bd264b9ccef92279193be31ed114e"; libraryHaskellDepends = [ base time yesod ]; - jailbreak = true; homepage = "https://github.com/jprider63/persistent-ratelimit"; description = "A library for rate limiting activities with a persistent backend"; license = stdenv.lib.licenses.mit; @@ -131419,7 +126926,6 @@ self: { monad-control mtl path-pieces persistent persistent-template scientific template-haskell text time transformers utf8-string ]; - doCheck = false; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ psibi ]; @@ -131580,7 +127086,6 @@ self: { template-haskell text time transformers transformers-base utf8-string ]; - jailbreak = true; description = "Backend for persistent library using Zookeeper"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -131662,7 +127167,6 @@ self: { base bytestring crypto-random handle-like network random stm x509 x509-store ]; - jailbreak = true; homepage = "https://github.com/YoshikuniJujo/peyotls/wiki"; description = "Pretty Easy YOshikuni-made TLS library"; license = stdenv.lib.licenses.bsd3; @@ -131682,7 +127186,6 @@ self: { asn1-encoding asn1-types base bytable bytestring crypto-pubkey crypto-pubkey-types monads-tf word24 x509 x509-store ]; - jailbreak = true; homepage = "https://github.com/YoshikuniJujo/peyotls/wiki"; description = "Codec parts of Pretty Easy YOshikuni-made TLS library"; license = stdenv.lib.licenses.bsd3; @@ -131701,7 +127204,6 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://brandon.si/code/pez-zipper-library-released/"; description = "A Pretty Extraordinary Zipper library"; license = stdenv.lib.licenses.bsd3; @@ -131722,7 +127224,6 @@ self: { executableHaskellDepends = [ async base ini postgresql-simple random scotty text transformers ]; - jailbreak = true; homepage = "https://github.com/BardurArantsson/pg-harness"; description = "REST service and library for creating/consuming temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; @@ -131754,7 +127255,6 @@ self: { executableHaskellDepends = [ async base ini postgresql-simple random scotty text transformers ]; - jailbreak = true; homepage = "https://github.com/BardurArantsson/pg-harness"; description = "REST service for creating temporary PostgreSQL databases"; license = stdenv.lib.licenses.agpl3; @@ -131762,23 +127262,22 @@ self: { }) {}; "pg-store" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hspec - , postgresql-libpq, QuickCheck, template-haskell, text - , transformers + ({ mkDerivation, attoparsec, base, bytestring, hspec, mtl + , postgresql-libpq, QuickCheck, template-haskell, text, time }: mkDerivation { pname = "pg-store"; - version = "0.0.1"; - sha256 = "27032e33207c53c65452bfc3ea3d90620069850297e3edb5aa3e9274e6130c7f"; + version = "0.1.1"; + sha256 = "5f8d688811e4e59accce33f43fe2168adb9a4809b794d6e27db028af605298af"; libraryHaskellDepends = [ - attoparsec base bytestring postgresql-libpq template-haskell text - transformers + attoparsec base bytestring mtl postgresql-libpq template-haskell + text time ]; testHaskellDepends = [ - base bytestring hspec postgresql-libpq QuickCheck text + base bytestring hspec mtl postgresql-libpq QuickCheck text ]; homepage = "https://github.com/vapourismo/pg-store"; - description = "Dead simple storage interface to PostgreSQL"; + description = "Simple storage interface to PostgreSQL"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -131803,9 +127302,9 @@ self: { microlens process resourcet tagsoup text time transformers unix vector vty ]; - jailbreak = true; description = "browse directory listing webpages and download files from them"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pgm" = callPackage @@ -131852,7 +127351,6 @@ self: { blaze-textual bytestring containers MonadCatchIO-transformers mtl network old-locale pcre-light text time utf8-string ]; - jailbreak = true; homepage = "https://github.com/chrisdone/pgsql-simple"; description = "A mid-level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; @@ -131879,7 +127377,6 @@ self: { stm-conduit stringsearch template-haskell text time transformers uuid vector ]; - jailbreak = true; description = "Streaming Postgres bindings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -131906,13 +127403,24 @@ self: { libraryHaskellDepends = [ array base ghc-prim monad-st primitive vector ]; - jailbreak = true; homepage = "http://github.com/glehel/phasechange"; description = "Freezing, thawing, and copy elision"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "phaser" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "phaser"; + version = "0.1.1.0"; + sha256 = "54ecb42b832a83dba458c0974c07ce956e274d579b72aa7ba3e85fee039b063e"; + libraryHaskellDepends = [ base bytestring text ]; + homepage = "https://github.com/quickdudley/phaser"; + description = "Incremental multiple pass parser library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "phash" = callPackage ({ mkDerivation, base, doctest, HUnit, pHash, smallcheck, tasty , tasty-hunit, tasty-smallcheck @@ -131927,7 +127435,6 @@ self: { base doctest HUnit smallcheck tasty tasty-hunit tasty-smallcheck ]; testSystemDepends = [ pHash ]; - jailbreak = true; homepage = "http://github.com/michaelxavier/phash"; description = "Haskell bindings to pHash, the open source perceptual hash library"; license = stdenv.lib.licenses.gpl3; @@ -131980,8 +127487,8 @@ self: { }: mkDerivation { pname = "phoityne-vscode"; - version = "0.0.8.0"; - sha256 = "da086d093e31f1277d7a3f5876d57122f9f5517747399a3f001986e3f05854e8"; + version = "0.0.10.0"; + sha256 = "6c002069fa4416c1767affe099102a031e495e74f7ff904ed3d14eef74335916"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -131990,7 +127497,7 @@ self: { HStringTemplate MissingH mtl parsec process resourcet safe split text transformers ]; - homepage = "https://sites.google.com/site/phoityne/vscode"; + homepage = "https://github.com/phoityne/phoityne-vscode"; description = "ghci debug viewer on Visual Studio Code"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -132063,7 +127570,6 @@ self: { libraryHaskellDepends = [ array base mtl reactive TypeCompose wx wxcore ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Phooey"; description = "Functional user interfaces"; license = stdenv.lib.licenses.bsd3; @@ -132076,8 +127582,8 @@ self: { }: mkDerivation { pname = "photoname"; - version = "3.1"; - sha256 = "37935445c01a19e9a6505b7d660ddf01543af14ddc26eb5d2689fb4bdd778434"; + version = "3.2"; + sha256 = "6a4ee3e631d005b6904444d025ec1ccd9aa4dd0e841f4068806567998e86fcf9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -132102,7 +127608,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl SDL transformers ]; - jailbreak = true; homepage = "https://github.com/skypers/phraskell"; description = "A fractal viewer"; license = stdenv.lib.licenses.gpl3; @@ -132137,7 +127642,6 @@ self: { test-framework test-framework-hunit test-framework-th text time vector ]; - jailbreak = true; homepage = "http://www.cs.indiana.edu/~rrnewton/projects/phybin/"; description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance"; license = stdenv.lib.licenses.bsd3; @@ -132159,7 +127663,6 @@ self: { AES base binary byteable bytestring containers cryptohash HTTP io-streams mtl network parsec RSA transformers ]; - jailbreak = true; homepage = "https://github.com/renzyq19/pi-calculus"; description = "Applied pi-calculus interpreter"; license = stdenv.lib.licenses.gpl3; @@ -132207,10 +127710,10 @@ self: { http-client-tls network-info process random text text-format time xdg-basedir ]; - jailbreak = true; homepage = "https://github.com/enolan/pia-forward"; description = "Set up port forwarding with the Private Internet Access VPN service"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pianola" = callPackage @@ -132236,6 +127739,21 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "picedit" = callPackage + ({ mkDerivation, base, cli, hmatrix, JuicyPixels, vector }: + mkDerivation { + pname = "picedit"; + version = "0.1.1.0"; + sha256 = "4219089f3375925f413111d05ce9087b1f4aca01f43d64ddd3fc2931c52d7740"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base hmatrix JuicyPixels vector ]; + executableHaskellDepends = [ base cli ]; + homepage = "https://github.com/mdibaiee/picedit#readme"; + description = "simple image manipulation functions"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "picologic" = callPackage ({ mkDerivation, base, containers, mtl, parsec, picosat, pretty , QuickCheck @@ -132253,6 +127771,7 @@ self: { homepage = "https://github.com/sdiehl/picologic"; description = "Utilities for symbolic predicate logic expressions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "picoparsec" = callPackage @@ -132286,10 +127805,25 @@ self: { version = "0.1.3"; sha256 = "374d64964bbb35d24bbc3908d9de38f0087d425b6f7ab90c88f870b865564fd2"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/sdiehl/haskell-picosat"; description = "Bindings to the PicoSAT solver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "pid1" = callPackage + ({ mkDerivation, base, process, unix }: + mkDerivation { + pname = "pid1"; + version = "0.1.0.0"; + sha256 = "2b8e4bcdb1ce5c1dd5734d4406edd899e72e0afbe83758ff77590508a39d6cd2"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base process unix ]; + executableHaskellDepends = [ base ]; + homepage = "https://github.com/fpco/pid1#readme"; + description = "Do signal handling and orphan reaping for Unix PID1 init processes"; + license = stdenv.lib.licenses.mit; }) {}; "piet" = callPackage @@ -132345,7 +127879,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "pinboard_0_9_9" = callPackage + "pinboard_0_9_10" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, either, hspec , http-client, http-client-tls, http-types, mtl, network , profunctors, QuickCheck, random, safe-exceptions, semigroups @@ -132353,8 +127887,8 @@ self: { }: mkDerivation { pname = "pinboard"; - version = "0.9.9"; - sha256 = "0000e935c683365d31d20b307b8e5495b311219f5aef66da6dcce65675fffa25"; + version = "0.9.10"; + sha256 = "841e1a70daecec66d53fb3fdeb1c89fa5c2de0e5bd701129a9596492216a5249"; libraryHaskellDepends = [ aeson base bytestring containers either http-client http-client-tls http-types mtl network profunctors random safe-exceptions text time @@ -132365,36 +127899,12 @@ self: { safe-exceptions semigroups text time transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/jonschoning/pinboard"; description = "Access to the Pinboard API"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pinch_0_2_0_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text - , unordered-containers, vector - }: - mkDerivation { - pname = "pinch"; - version = "0.2.0.2"; - sha256 = "be722c513c696845e2a04758639b661b065cd821d4e5f608fc1ec74fe18a0e0f"; - libraryHaskellDepends = [ - array base bytestring containers deepseq ghc-prim hashable text - unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers hspec hspec-discover QuickCheck text - unordered-containers vector - ]; - homepage = "https://github.com/abhinav/pinch#readme"; - description = "An alternative implementation of Thrift for Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pinch" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , ghc-prim, hashable, hspec, hspec-discover, QuickCheck, text @@ -132417,24 +127927,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pinchot_0_18_2_0" = callPackage - ({ mkDerivation, base, containers, Earley, lens, ListLike - , semigroups, template-haskell, transformers - }: - mkDerivation { - pname = "pinchot"; - version = "0.18.2.0"; - sha256 = "a32dfa0aff4761bca3c9d99755814a3acc2962197dff5b07b565c77e90bb4ed6"; - libraryHaskellDepends = [ - base containers Earley lens ListLike semigroups template-haskell - transformers - ]; - homepage = "http://www.github.com/massysett/pinchot"; - description = "Write grammars, not parsers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pinchot" = callPackage ({ mkDerivation, base, containers, Earley, lens, ListLike , non-empty-sequence, pretty-show, semigroups, template-haskell @@ -132524,8 +128016,8 @@ self: { }: mkDerivation { pname = "pipes-aeson"; - version = "0.4.1.6"; - sha256 = "fb91280e7e12c1ea1c78a36b264eafea707d08e7cd52c792a06b194ff78b03dc"; + version = "0.4.1.7"; + sha256 = "c7cfb199fe3160e3b87f70017050dec94451a4cbc56d3956c91ca007ce5cb8cd"; libraryHaskellDepends = [ aeson attoparsec base bytestring pipes pipes-attoparsec pipes-bytestring pipes-parse transformers @@ -132551,10 +128043,10 @@ self: { base hspec lifted-async lifted-base monad-control pipes pipes-safe stm transformers-base ]; - jailbreak = true; homepage = "https://github.com/jwiegley/pipes-async"; description = "A higher-level interface to using concurrency with pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-attoparsec" = callPackage @@ -132593,7 +128085,6 @@ self: { executableHaskellDepends = [ attoparsec base bytestring pipes-core transformers ]; - jailbreak = true; description = "Streaming parsing in the pipes-core framework with Attoparsec"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -132631,10 +128122,10 @@ self: { base binary bytestring ghc-prim lens-family-core pipes pipes-parse smallcheck tasty tasty-hunit tasty-smallcheck transformers ]; - jailbreak = true; homepage = "https://github.com/k0001/pipes-binary"; description = "Encode and decode binary streams using the pipes and binary libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-bytestring" = callPackage @@ -132674,20 +128165,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) bzip2;}; - "pipes-cacophony_0_2_1" = callPackage - ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: - mkDerivation { - pname = "pipes-cacophony"; - version = "0.2.1"; - sha256 = "c112376b75e744e15006b81ecd9b60bee10be6a54cca6c2fd6b7f5f7e8d99041"; - libraryHaskellDepends = [ base bytestring cacophony pipes ]; - testHaskellDepends = [ base hlint ]; - homepage = "https://github.com/centromere/pipes-cacophony"; - description = "Pipes for Noise-secured network connections"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-cacophony" = callPackage ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }: mkDerivation { @@ -132739,9 +128216,9 @@ self: { libraryHaskellDepends = [ base bytestring cereal mtl pipes pipes-bytestring pipes-parse ]; - jailbreak = true; description = "Encode and decode binary streams using the pipes and cereal libraries"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-cereal-plus" = callPackage @@ -132755,30 +128232,12 @@ self: { libraryHaskellDepends = [ base bytestring cereal-plus errors mtl pipes pipes-bytestring text ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/pipes-cereal-plus"; description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pipes-cliff_0_10_0_4" = callPackage - ({ mkDerivation, async, base, bytestring, pipes, pipes-safe - , process, stm - }: - mkDerivation { - pname = "pipes-cliff"; - version = "0.10.0.4"; - sha256 = "3d92b54e773e98996cbc1c753892e7400540d925f913d187b940e7425dfdef33"; - libraryHaskellDepends = [ - async base bytestring pipes pipes-safe process stm - ]; - homepage = "http://www.github.com/massysett/pipes-cliff"; - description = "Streaming to and from subprocesses using Pipes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-cliff" = callPackage ({ mkDerivation, async, base, bytestring, pipes, pipes-safe , process, stm, unix @@ -132814,7 +128273,6 @@ self: { version = "0.0.1"; sha256 = "08366060768aa35dfff4e8eb166d3794df72c14b15f4876d0755b8112ba4fedb"; libraryHaskellDepends = [ base conduit mtl pipes-core ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/pipes-extra"; description = "Conduit adapters"; license = stdenv.lib.licenses.bsd3; @@ -132832,7 +128290,6 @@ self: { libraryHaskellDepends = [ base categories lifted-base monad-control transformers void ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/pipes-core"; description = "Compositional pipelines"; license = stdenv.lib.licenses.bsd3; @@ -132846,7 +128303,6 @@ self: { version = "0.1.0.0"; sha256 = "ee4992048b8d42de4c36aa223dee8eb74cd2cbca7ea17deb3acaac5f99a84bec"; libraryHaskellDepends = [ base courier pipes ]; - jailbreak = true; homepage = "http://github.com/kvanberendonck/pipes-courier"; description = "Pipes utilities for interfacing with the courier message-passing framework"; license = stdenv.lib.licenses.bsd3; @@ -132882,10 +128338,10 @@ self: { version = "0.3"; sha256 = "e6586706e39cf93326a073c93e049a2abdfe7942d425e572601a813d346477ed"; libraryHaskellDepends = [ base errors pipes ]; - jailbreak = true; homepage = "https://github.com/jdnavarro/pipes-errors"; description = "Integration between pipes and errors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-extra" = callPackage @@ -132904,7 +128360,6 @@ self: { base bytestring HUnit mtl pipes-core test-framework test-framework-hunit test-framework-th-prime ]; - jailbreak = true; homepage = "https://github.com/pcapriotti/pipes-extra"; description = "Various basic utilities for Pipes"; license = stdenv.lib.licenses.bsd3; @@ -132966,7 +128421,6 @@ self: { hspec-expectations mtl pipes pipes-safe process semigroups text transformers unix ]; - jailbreak = true; homepage = "https://github.com/jwiegley/pipes-files"; description = "Fast traversal of directory trees using pipes"; license = stdenv.lib.licenses.bsd3; @@ -132989,22 +128443,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pipes-http_1_0_3" = callPackage - ({ mkDerivation, base, bytestring, http-client, http-client-tls - , pipes - }: - mkDerivation { - pname = "pipes-http"; - version = "1.0.3"; - sha256 = "a8a2f0babb5348e6cb6bde375e7af47ebe808d4e333e0dd5c7e0ace3c600d58a"; - libraryHaskellDepends = [ - base bytestring http-client http-client-tls pipes - ]; - description = "HTTP client with pipes interface"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pipes-http" = callPackage ({ mkDerivation, base, bytestring, http-client, http-client-tls , pipes @@ -133081,10 +128519,10 @@ self: { base contravariant data-default-class lens pipes pipes-text QuickCheck reflection text transformers vinyl vinyl-utils ]; - jailbreak = true; homepage = "https://github.com/marcinmrotek/key-value-csv"; description = "Streaming processing of CSV files preceded by key-value pairs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-lzma" = callPackage @@ -133115,7 +128553,6 @@ self: { sha256 = "0821194bdf7f377beeb20fc8f697ed5388a221b6e8e42c513eea67a91c198340"; libraryHaskellDepends = [ base monad-control mongoDB pipes ]; testHaskellDepends = [ base monad-control mongoDB pipes text ]; - doCheck = false; homepage = "http://github.com/jb55/pipes-mongodb"; description = "Stream results from MongoDB"; license = stdenv.lib.licenses.mit; @@ -133152,7 +128589,6 @@ self: { base bytestring network network-simple network-simple-tls pipes pipes-network pipes-safe tls transformers ]; - jailbreak = true; homepage = "https://github.com/k0001/pipes-network-tls"; description = "TLS-secured network connections support for pipes"; license = stdenv.lib.licenses.bsd3; @@ -133172,10 +128608,10 @@ self: { async base binary bytestring errors exceptions mtl network network-simple-sockaddr pipes pipes-concurrency pipes-network ]; - jailbreak = true; homepage = "https://github.com/jdnavarro/pipes-p2p"; description = "P2P network nodes with pipes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-p2p-examples" = callPackage @@ -133192,7 +128628,6 @@ self: { base binary bytestring containers errors mtl network network-simple-sockaddr pipes pipes-network pipes-p2p ]; - jailbreak = true; homepage = "https://github.com/jdnavarro/pipes-p2p-examples"; description = "Examples using pipes-p2p"; license = stdenv.lib.licenses.bsd3; @@ -133245,7 +128680,6 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/mckeankylej/pipes-protolude#readme"; description = "Alternate Prelude for the pipes ecosystem"; license = stdenv.lib.licenses.bsd3; @@ -133273,10 +128707,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base mwc-random pipes time ]; executableHaskellDepends = [ base pipes time ]; - jailbreak = true; homepage = "http://github.com/ImAlsoGreg/pipes-rt"; description = "A few pipes to control the timing of yields"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-s3" = callPackage @@ -133292,10 +128726,10 @@ self: { aws base bytestring http-client http-client-tls pipes pipes-bytestring pipes-safe resourcet text transformers ]; - jailbreak = true; homepage = "http://github.com/bgamari/pipes-s3"; description = "A simple interface for streaming data to and from Amazon S3"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-safe" = callPackage @@ -133332,7 +128766,6 @@ self: { async base bytestring directory hspec pipes pipes-bytestring pipes-safe process stm stm-chans text ]; - jailbreak = true; description = "Create proper Pipes from System.Process"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133452,10 +128885,10 @@ self: { libraryHaskellDepends = [ base bytestring pipes pipes-safe semigroups zeromq4-haskell ]; - jailbreak = true; homepage = "https://github.com/peddie/pipes-zeromq4"; description = "Pipes integration for ZeroMQ messaging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pipes-zlib" = callPackage @@ -133465,8 +128898,8 @@ self: { }: mkDerivation { pname = "pipes-zlib"; - version = "0.4.4"; - sha256 = "39de93960e739e386990044737de0734a1f4d9c925ca7f085a74dbfb127ebd64"; + version = "0.4.4.1"; + sha256 = "8fac1e12a651bfbbddf0395401d712bcceda156f5aad1a263b650200c682bde9"; libraryHaskellDepends = [ base bytestring pipes streaming-commons transformers ]; @@ -133493,7 +128926,6 @@ self: { array base bytestring containers haskeline haskeline-class mpppc mtl parsec text utf8-string ]; - jailbreak = true; description = "A dependently typed core language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133517,7 +128949,6 @@ self: { executableHaskellDepends = [ base bytestring optparse-applicative text unordered-containers yaml ]; - jailbreak = true; homepage = "https://github.com/chiro/haskell-pit"; description = "Account management tool"; license = stdenv.lib.licenses.mit; @@ -133540,9 +128971,9 @@ self: { base bytestring dywapitchtrack hspec pipes pipes-bytestring process transformers ]; - jailbreak = true; description = "Pitch tracking library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pivotal-tracker" = callPackage @@ -133562,7 +128993,6 @@ self: { executableHaskellDepends = [ base either servant text transformers ]; - jailbreak = true; description = "A library and a CLI tool for accessing Pivotal Tracker API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133682,10 +129112,10 @@ self: { version = "0.6.0"; sha256 = "31083b4d1442000e0964d2b198942d61f9ce40726c593cf66901b171c19f188e"; libraryHaskellDepends = [ base bytestring mtl time unix ]; - jailbreak = true; homepage = "https://secure.plaimi.net/works/plailude"; description = "plaimi's prelude"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plan-b" = callPackage @@ -133717,7 +129147,6 @@ self: { attoparsec base blaze-builder bytestring containers data-clist deepseq ]; - jailbreak = true; description = "A representation of planar graphs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -133754,10 +129183,10 @@ self: { base bytestring optparse-applicative text ]; testHaskellDepends = [ base bytestring doctest hlint hspec ]; - jailbreak = true; homepage = "https://github.com/pjones/playlists"; description = "Library and executable for working with playlist files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plist" = callPackage @@ -133810,7 +129239,6 @@ self: { aeson base blaze-builder bytestring errors http-streams http-types io-streams network-uri old-locale time unexceptionalio ]; - jailbreak = true; homepage = "https://github.com/singpolyma/plivo-haskell"; description = "Plivo API wrapper for Haskell"; license = "unknown"; @@ -133823,12 +129251,11 @@ self: { }: mkDerivation { pname = "plot"; - version = "0.2.3.5"; - sha256 = "db5d69d5249e562eaedaa0887075dc43142ddb20260ddc746b501b8b2ed58483"; + version = "0.2.3.6"; + sha256 = "ad606de1d746f26cea36f1818209adab83bb32bf46b562465930f64c975afdfd"; libraryHaskellDepends = [ array base cairo colour hmatrix mtl pango transformers ]; - jailbreak = true; homepage = "http://github.com/amcphail/plot"; description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk"; license = stdenv.lib.licenses.bsd3; @@ -133852,15 +129279,15 @@ self: { }: mkDerivation { pname = "plot-gtk-ui"; - version = "0.3.0.1"; - sha256 = "41c788c5093333bcc9b320bd21dc3e43f8677d9f5d94a66b106fc303649a5b79"; + version = "0.3.0.2"; + sha256 = "e7e89440798058ef082dc268795a482b9462d21ff08336bb8517b6830c0518da"; libraryHaskellDepends = [ base cairo colour fixed-vector gtk hmatrix plot text vector ]; - jailbreak = true; homepage = "https://github.com/sumitsahrawat/plot-gtk-ui"; description = "A quick way to use Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plot-gtk3" = callPackage @@ -133888,10 +129315,10 @@ self: { executableHaskellDepends = [ base colour gtk hmatrix plot text vector ]; - jailbreak = true; homepage = "https://github.com/sumitsahrawat/plot-lab"; description = "A plotting tool with Mathematica like Manipulation abilities"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "plotfont" = callPackage @@ -133931,7 +129358,6 @@ self: { array base Cabal containers directory filepath ghc ghc-paths ghc-prim haskell-src process random ]; - jailbreak = true; homepage = "http://hub.darcs.net/stepcut/plugins"; description = "Dynamic linking for Haskell and C objects"; license = stdenv.lib.licenses.bsd3; @@ -133969,7 +129395,6 @@ self: { testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck tasty-th template-haskell ]; - jailbreak = true; description = "Dynamic linking for embedded DSLs with staged compilation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -134117,27 +129542,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "pointed_4_2_0_2" = callPackage - ({ mkDerivation, base, comonad, containers, data-default-class - , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged - , transformers, transformers-compat, unordered-containers - }: - mkDerivation { - pname = "pointed"; - version = "4.2.0.2"; - sha256 = "4b8a8a5ad5a54715f6a58090d820657a2f2de4176d899ad736ebd0e54de7da7a"; - libraryHaskellDepends = [ - base comonad containers data-default-class hashable kan-extensions - semigroupoids semigroups stm tagged transformers - transformers-compat unordered-containers - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/pointed/"; - description = "Pointed and copointed data"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "pointed" = callPackage ({ mkDerivation, base, comonad, containers, data-default-class , hashable, kan-extensions, semigroupoids, semigroups, stm, tagged @@ -134243,7 +129647,6 @@ self: { base containers haskell-src-exts-simple mtl syb transformers ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/23Skidoo/pointful"; description = "Pointful refactoring tool"; license = stdenv.lib.licenses.bsd3; @@ -134319,10 +129722,10 @@ self: { base bytestring containers data-default-class lens-family proto-lens text ]; - jailbreak = true; homepage = "https://github.com/relrod/pokemon-go-protobuf-types"; description = "Haskell types for the Pokemon Go protobuf protocol"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "poker-eval" = callPackage @@ -134350,10 +129753,10 @@ self: { aeson base base64-string bytestring case-insensitive directory hex HTTP http-client http-conduit http-types strict text time ]; - jailbreak = true; homepage = "https://platform.pokitdok.com"; description = "PokitDok Platform API Client for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polar" = callPackage @@ -134408,7 +129811,6 @@ self: { base binary containers dawg directory filepath mtl polysoup text text-binary transformers ]; - jailbreak = true; homepage = "https://github.com/kawu/polh/tree/master/lexicon"; description = "A library for manipulating the historical dictionary of Polish (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -134424,10 +129826,10 @@ self: { libraryHaskellDepends = [ base binary containers text text-binary ]; - jailbreak = true; homepage = "https://github.com/kawu/polimorf"; description = "Working with the PoliMorf dictionary"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "poll" = callPackage @@ -134460,10 +129862,10 @@ self: { version = "1.0.0"; sha256 = "268f2355f258e4659d940356aaed8cf1559c1268c21bd4f53e705cdeafd39d10"; libraryHaskellDepends = [ base lens ]; - jailbreak = true; homepage = "https://github.com/wdanilo/poly-control"; description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polyToMonoid" = callPackage @@ -134505,7 +129907,6 @@ self: { algebra base base-unicode-symbols clist containers peano smallcheck tasty tasty-smallcheck transformers ]; - jailbreak = true; description = "Polynomial types and operations"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -134581,10 +129982,10 @@ self: { libraryHaskellDepends = [ base containers deepseq polyparse tagsoup ]; - jailbreak = true; homepage = "https://github.com/kawu/polysoup"; description = "Online XML parsing with polyparse and tagsoup"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "polytypeable" = callPackage @@ -134625,12 +130026,35 @@ self: { base bytestring cereal directory filepath heredoc libnotify network process time unix wx wxcore ]; - jailbreak = true; description = "pomodoro timer"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "pomohoro" = callPackage + ({ mkDerivation, base, configurator, dbus, directory, fdo-notify + , hdaemonize, hspec, network, optparse-applicative, protolude, text + , time + }: + mkDerivation { + pname = "pomohoro"; + version = "0.1.2.4"; + sha256 = "b63883fb9e820b7580a57bee84e3353a844964785e1da82406cb5643451e4a19"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base configurator dbus directory fdo-notify network protolude text + time + ]; + executableHaskellDepends = [ + base hdaemonize optparse-applicative protolude text time + ]; + testHaskellDepends = [ base hspec protolude ]; + homepage = "https://github.com/kqr/pomohoro#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.isc; + }) {}; + "ponder" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -134638,10 +130062,10 @@ self: { version = "0.0.1"; sha256 = "10448688a4368e74dc7b06825ac4b0fa68b144f67e6de278874990370cf804db"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; homepage = "https://gihub.com/matt76k/ponder"; description = "PEG parser combinator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pong-server" = callPackage @@ -134672,7 +130096,6 @@ self: { base HDBC HDBC-sqlite3 hlogger pontarius-xmpp pontarius-xpmn xml-types ]; - jailbreak = true; homepage = "http://www.pontarius.org/projects/pontarius-mediaserver/"; description = "Extended Personal Media Network (XPMN) media server"; license = "unknown"; @@ -134694,8 +130117,8 @@ self: { }: mkDerivation { pname = "pontarius-xmpp"; - version = "0.5.2"; - sha256 = "c47f4b2991dc7c6de04bc6f2cc9adebe5fecca6008a446a7747345cb40e626da"; + version = "0.5.3"; + sha256 = "70b34c6cc581183752e04c967bd6b383b0d4a813badd412ece35bcc5bff991fd"; libraryHaskellDepends = [ attoparsec base base64-bytestring binary bytestring conduit containers crypto-api crypto-random cryptohash cryptohash-cryptoapi @@ -134730,7 +130153,6 @@ self: { libraryHaskellDepends = [ base containers pontarius-xmpp random text xml-types ]; - jailbreak = true; homepage = "http://www.pontarius.org/projects/pontarius-xpmn/"; description = "Extended Personal Media Network (XPMN) library"; license = "unknown"; @@ -134760,7 +130182,6 @@ self: { revision = "1"; editedCabalFile = "c79e139723764f4d4ba584c6cf6f73174700271910b15ed0f25a150a53a8c951"; libraryHaskellDepends = [ base monad-control transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Thread-safe resource pools. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -134780,7 +130201,6 @@ self: { libraryHaskellDepends = [ base monad-control resource-pool resourcet transformers ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/persistent"; description = "Resource pool allocations via ResourceT. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -134848,7 +130268,7 @@ self: { license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; - inherit (pkgs.gnome) pango; inherit (pkgs) poppler;}; + inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;}; "populate-setup-exe-cache" = callPackage ({ mkDerivation, base }: @@ -134958,14 +130378,13 @@ self: { }: mkDerivation { pname = "posix-acl"; - version = "0.2.0.0"; - sha256 = "3b1f8858ae8acb6d3c50a3900406b0b7b018709447c4c17aee8d2f83f12a38e2"; + version = "0.2.0.1"; + sha256 = "e3e56ee3a8cc9e84c255a17593289b86c685b167d98fee0281481509454671d2"; libraryHaskellDepends = [ base bytestring containers lifted-base monad-control transformers transformers-base unix ]; librarySystemDepends = [ acl ]; - jailbreak = true; homepage = "https://github.com/tensor5/posix-acl"; description = "Support for Posix ACL"; license = stdenv.lib.licenses.bsd3; @@ -135069,7 +130488,6 @@ self: { revision = "1"; editedCabalFile = "b0c171edc197595d1edbbf49c22fb91a1d3ffac56316ba1023d9d7a175f15589"; libraryHaskellDepends = [ base unix ]; - jailbreak = true; description = "Low-level wrapping of POSIX waitpid(2)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -135123,37 +130541,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "postgresql-binary_0_9_0_1" = callPackage - ({ mkDerivation, aeson, base, base-prelude, binary-parser - , bytestring, conversion, conversion-bytestring, conversion-text - , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq - , QuickCheck, quickcheck-instances, rebase, scientific, tasty - , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time - , transformers, uuid, vector - }: - mkDerivation { - pname = "postgresql-binary"; - version = "0.9.0.1"; - sha256 = "77f4dcf7b09961b5db11d3db753e27a5116d27d3e88661a58e6e742de94b5cf7"; - libraryHaskellDepends = [ - aeson base base-prelude binary-parser bytestring foldl loch-th - placeholders scientific text time transformers uuid vector - ]; - testHaskellDepends = [ - aeson base bytestring conversion conversion-bytestring - conversion-text either json-ast loch-th placeholders - postgresql-libpq QuickCheck quickcheck-instances rebase scientific - tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time - transformers uuid vector - ]; - jailbreak = true; - doCheck = false; - 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-binary" = callPackage ({ mkDerivation, aeson, base, base-prelude, binary-parser , bytestring, conversion, conversion-bytestring, conversion-text @@ -135164,8 +130551,8 @@ self: { }: mkDerivation { pname = "postgresql-binary"; - version = "0.9.1"; - sha256 = "3b3bc4ecdc145e18e88775fbc0989f5bc5c94e58b6603cccfc024c10a423a109"; + version = "0.9.1.1"; + sha256 = "e9aeb3abc2e191ecde5f6112221fe0957364c72779dbcbe8eba6bc5c830ddac2"; libraryHaskellDepends = [ aeson base base-prelude binary-parser bytestring foldl loch-th placeholders scientific text time transformers uuid vector @@ -135177,8 +130564,6 @@ self: { tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time transformers uuid vector ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/nikita-volkov/postgresql-binary"; description = "Encoders and decoders for the PostgreSQL's binary format"; license = stdenv.lib.licenses.mit; @@ -135254,20 +130639,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "postgresql-libpq_0_9_1_1" = callPackage - ({ mkDerivation, base, bytestring, postgresql }: - mkDerivation { - pname = "postgresql-libpq"; - version = "0.9.1.1"; - sha256 = "e483aed7fe8628cee17342a1bd0a315d998488609ad08a833c01785a88785871"; - libraryHaskellDepends = [ base bytestring ]; - librarySystemDepends = [ postgresql ]; - homepage = "http://github.com/lpsmith/postgresql-libpq"; - description = "low-level binding to libpq"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) postgresql;}; - "postgresql-libpq" = callPackage ({ mkDerivation, base, bytestring, postgresql }: mkDerivation { @@ -135334,10 +130705,10 @@ self: { quickcheck-assertions quickcheck-instances tasty tasty-hunit tasty-quickcheck tasty-th text time ]; - doCheck = false; homepage = "https://bitbucket.org/s9gf4ult/postgresql-query"; description = "Sql interpolating quasiquote plus some kind of primitive ORM using it"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-schema" = callPackage @@ -135360,6 +130731,7 @@ self: { homepage = "https://github.com/mfine/postgresql-schema"; description = "PostgreSQL Schema Management"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postgresql-simple" = callPackage @@ -135382,7 +130754,6 @@ self: { aeson base base16-bytestring bytestring containers cryptohash filepath HUnit tasty tasty-golden tasty-hunit text time vector ]; - doCheck = false; description = "Mid-Level PostgreSQL client library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -135500,22 +130871,25 @@ self: { "postgresql-typed" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring - , containers, cryptonite, haskell-src-meta, memory, network - , old-locale, postgresql-binary, QuickCheck, scientific - , template-haskell, text, time, utf8-string, uuid + , containers, convertible, cryptonite, haskell-src-meta, HDBC + , HUnit, memory, network, old-locale, postgresql-binary, QuickCheck + , scientific, template-haskell, text, time, utf8-string, uuid }: mkDerivation { pname = "postgresql-typed"; - version = "0.4.4"; - sha256 = "b440545a710f17995a9e52384e1d1ef0b64202fac129d0bb44eb95c746e4f1f6"; + version = "0.4.5"; + sha256 = "bc60941a88edb91045e1b18c6d94d8466ecaa3eb763facefa9c65d579a5576c4"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite - haskell-src-meta memory network old-locale postgresql-binary + haskell-src-meta HDBC memory network old-locale postgresql-binary scientific template-haskell text time utf8-string uuid ]; - testHaskellDepends = [ base bytestring network QuickCheck time ]; + testHaskellDepends = [ + base bytestring containers convertible HDBC HUnit network + QuickCheck time + ]; homepage = "https://github.com/dylex/postgresql-typed"; - description = "A PostgreSQL access library with compile-time SQL type inference"; + description = "A PostgreSQL library with compile-time SQL type inference and optional HDBC backend"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -135565,7 +130939,6 @@ self: { transformers transformers-base unordered-containers vector wai wai-cors wai-extra wai-middleware-static warp ]; - jailbreak = true; homepage = "https://github.com/begriffs/postgrest"; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; @@ -135594,7 +130967,6 @@ self: { string-conversions transformers unix warp ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/diogob/postgrest-ws#readme"; description = "PostgREST extension to map LISTEN/NOTIFY messages to Websockets"; license = stdenv.lib.licenses.bsd3; @@ -135634,6 +131006,7 @@ self: { homepage = "https://github.com/apiengine/postmark"; description = "Library for postmarkapp.com HTTP Api"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "postmaster" = callPackage @@ -135667,10 +131040,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary bytestring split ]; - jailbreak = true; homepage = "https://github.com/RossMeikleham/Potato_Tool"; description = "Command line Dreamcast VMU filesystem toolset"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "potrace" = callPackage @@ -135739,6 +131112,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pptable" = callPackage + ({ mkDerivation, base, boxes, containers, generic-deriving, HUnit + , pretty, QuickCheck, syb, tasty, tasty-hunit, tasty-quickcheck + , vector + }: + mkDerivation { + pname = "pptable"; + version = "0.2.0.0"; + sha256 = "c78c74f345cee1afd1021df509421cb151d484c4891e9335427182339547fb2d"; + libraryHaskellDepends = [ + base boxes containers generic-deriving pretty syb vector + ]; + testHaskellDepends = [ + base boxes containers HUnit QuickCheck tasty tasty-hunit + tasty-quickcheck vector + ]; + homepage = "https://github.com/gdevanla/pptable#readme"; + description = "Pretty Print containers in a tabular format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pqc" = callPackage ({ mkDerivation, base, QuickCheck, random, stm }: mkDerivation { @@ -135756,8 +131151,8 @@ self: { ({ mkDerivation, base, deepseq }: mkDerivation { pname = "pqueue"; - version = "1.3.1.1"; - sha256 = "a40a5eaa1b74b34f774c09613ac92955ae381000a5007a67b500a794516063a2"; + version = "1.3.2"; + sha256 = "58d6c91432d91c1e9908495f5bfeb231239a53b5c59bda724fe8d7bd3873adf1"; libraryHaskellDepends = [ base deepseq ]; description = "Reliable, persistent, fast priority queues"; license = stdenv.lib.licenses.bsd3; @@ -135774,7 +131169,6 @@ self: { libraryHaskellDepends = [ base containers ghc-prim MaybeT mtl stateful-mtl uvector ]; - jailbreak = true; description = "Fully encapsulated monad transformers with queuelike functionality"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -135813,7 +131207,6 @@ self: { base Cabal containers cpphs directory filepath haskell-src-exts xhtml ]; - jailbreak = true; homepage = "http://code.google.com/p/copperbox/"; description = "Diff Cabal packages"; license = "unknown"; @@ -135919,7 +131312,6 @@ self: { barecheck base containers prednote QuickCheck quickpull rainbow rainbow-tests text ]; - jailbreak = true; homepage = "http://www.github.com/massysett/prednote"; description = "Tests and QuickCheck generators to accompany prednote"; license = stdenv.lib.licenses.bsd3; @@ -135960,7 +131352,6 @@ self: { testHaskellDepends = [ base cab containers directory filepath hspec process stm unix ]; - jailbreak = true; description = "A library for building a prefork-style server quickly"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -135979,7 +131370,6 @@ self: { base bytestring cmdargs containers data-default lens mtl parallel safe stm text transformers tuple vector ]; - jailbreak = true; homepage = "https://github.com/jxv/pregame"; description = "Prelude counterpart"; license = stdenv.lib.licenses.mit; @@ -136006,6 +131396,7 @@ self: { homepage = "http://github.com/kerscher/preliminaries"; description = "A larger alternative to the Prelude"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prelude-compat" = callPackage @@ -136050,7 +131441,6 @@ self: { version = "0.4"; sha256 = "54a2ea7783f18d89060faff8c2198717de60de4d7d5cb15ff927e97fec158540"; libraryHaskellDepends = [ base comonad logict transformers ]; - jailbreak = true; description = "Another kind of alternate Prelude file"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -136117,7 +131507,6 @@ self: { cpphs deepseq directory file-embed foldl haskell-src-exts here system-filepath temporary text turtle unix ]; - jailbreak = true; description = "Preprocess Haskell Repositories"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -136139,7 +131528,6 @@ self: { testHaskellDepends = [ base directory haskell-src-exts hspec process temporary ]; - jailbreak = true; homepage = "http://github.com/meditans/preprocessor#readme"; description = "Remove cpp annotations to get the source ready for static analysis"; license = stdenv.lib.licenses.mit; @@ -136214,9 +131602,9 @@ self: { errors HDBC HTTP http-streams io-streams lens mtl network-uri safe scientific text transformers ]; - jailbreak = true; description = "An HDBC connector for Presto"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettify" = callPackage @@ -136279,6 +131667,7 @@ self: { homepage = "https://github.com/jml/pretty-error"; description = "Pretty error messages for runtime invariants"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pretty-hex" = callPackage @@ -136349,8 +131738,8 @@ self: { ({ mkDerivation, base, hspec, mtl, tagged }: mkDerivation { pname = "pretty-types"; - version = "0.2.3.0"; - sha256 = "82a9a4b3337cc9d07aeef4b9f7af9c9010465fb7a9d258a84802a3b36806341d"; + version = "0.2.3.1"; + sha256 = "e56c49d1099aaeafe0b982ef9e60cb7194fd987c4b659a8d7bcde380d3b8784f"; libraryHaskellDepends = [ base mtl tagged ]; testHaskellDepends = [ base hspec tagged ]; homepage = "https://github.com/sheyll/pretty-types#readme"; @@ -136426,7 +131815,6 @@ self: { revision = "1"; editedCabalFile = "ee8bf53215343bfc18dc8d310fd0e03ad3eaab8b85afdbc97dea3b047e0d98ec"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "https://github.com/haskell/primitive"; description = "Primitive memory-related operations"; license = stdenv.lib.licenses.bsd3; @@ -136496,7 +131884,6 @@ self: { executableHaskellDepends = [ base ConfigFile directory HTTP mtl network parsec utf8-string XMPP ]; - jailbreak = true; homepage = "http://kagami.touhou.ru/projects/show/primula"; description = "Jabber-bot for primula-board ImageBoard"; license = "GPL"; @@ -136553,10 +131940,9 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "printf-safe"; - version = "0.1.0.0"; - sha256 = "492389dad3146efa2ab91fb2518c47c5dc6f94c993098e8e346cc5a77e3b5ed3"; + version = "0.1.0.1"; + sha256 = "54c6aadd6b084064cd2dfdddd80eec7fc03ccf0cb91ec544c82641836eff6a9d"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Type safe interface for Text.Printf"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -136582,7 +131968,6 @@ self: { version = "0.2.2"; sha256 = "8e969f0126c24703d435c67d2afe9dbcbbd238f8e3dd191440550cea018d515b"; libraryHaskellDepends = [ base containers queue reord stateref ]; - jailbreak = true; homepage = "http://code.haskell.org/~mokus/priority-queue"; description = "Simple implementation of a priority queue"; license = stdenv.lib.licenses.bsd3; @@ -136640,12 +132025,11 @@ self: { }: mkDerivation { pname = "probability"; - version = "0.2.5"; - sha256 = "1dccf0a260f37f0725f02d2f1d4f1cd61da67477dacc77caf5007584ec53a9c0"; + version = "0.2.5.1"; + sha256 = "d3e67c8b32dda838c455ddd532a668bc464cfe1d49dc74f4502175614af7ed2d"; libraryHaskellDepends = [ base containers random transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Probabilistic_Functional_Programming"; description = "Probabilistic Functional Programming"; license = stdenv.lib.licenses.bsd3; @@ -136731,23 +132115,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "process-extras_0_3_3_8" = callPackage - ({ mkDerivation, base, bytestring, deepseq, generic-deriving - , ListLike, process, text - }: - mkDerivation { - pname = "process-extras"; - version = "0.3.3.8"; - sha256 = "d9e26f829d5eab2e2df113383b814bf71c835ff874fdecdc5a125115da485ec3"; - libraryHaskellDepends = [ - base bytestring deepseq generic-deriving ListLike process text - ]; - homepage = "https://github.com/seereason/process-extras"; - description = "Process extras"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "process-extras" = callPackage ({ mkDerivation, base, bytestring, deepseq, generic-deriving , ListLike, process, text @@ -136791,7 +132158,6 @@ self: { version = "1.0.1.4"; sha256 = "7bf15534c348f865997ea661b2967cecba3427a463242a72d442486de1f229a1"; libraryHaskellDepends = [ base directory filepath unix ]; - jailbreak = true; description = "Process libraries"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -136809,7 +132175,6 @@ self: { libraryHaskellDepends = [ base bytestring deepseq ListLike process text ]; - jailbreak = true; homepage = "https://github.com/ddssff/process-listlike"; description = "Process extras"; license = stdenv.lib.licenses.mit; @@ -136846,7 +132211,6 @@ self: { base bytestring enumerator mtl process shakespeare-text template-haskell text ]; - jailbreak = true; homepage = "http://github.com/tanakh/process-qq"; description = "Quasi-Quoters for exec process"; license = stdenv.lib.licenses.bsd3; @@ -136898,7 +132262,6 @@ self: { multiset QuickCheck quickcheck-instances template-haskell text transformers ]; - jailbreak = true; description = "Web graphic applications with processing.js."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -136969,7 +132332,6 @@ self: { version = "0.1.0.1"; sha256 = "b5641816f111ec9493666d52716bac1cd00780b235b8e78fded65931982ca7d5"; libraryHaskellDepends = [ attoparsec base bytestring ]; - jailbreak = true; homepage = "http://closure.ath.cx/procstat"; description = "get information on processes in Linux"; license = stdenv.lib.licenses.bsd3; @@ -137110,6 +132472,17 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "progress-reporting" = callPackage + ({ mkDerivation, base, deepseq, mtl, time }: + mkDerivation { + pname = "progress-reporting"; + version = "1.0.0"; + sha256 = "8dddfbd5007871c47e53d01ad3366605679107504f23de568ccde0ed73a633f8"; + libraryHaskellDepends = [ base deepseq mtl time ]; + description = "Functionality for reporting function progress"; + license = stdenv.lib.licenses.lgpl3; + }) {}; + "progressbar" = callPackage ({ mkDerivation, base, io-reactive }: mkDerivation { @@ -137134,7 +132507,6 @@ self: { base containers criterion directory filepath haskeline process txt-sushi ]; - jailbreak = true; homepage = "http://chplib.wordpress.com/2010/02/04/progression-supporting-optimisation-in-haskell/"; description = "Automates the recording and graphing of criterion benchmarks"; license = stdenv.lib.licenses.bsd3; @@ -137155,7 +132527,6 @@ self: { base binary bytestring containers directory filepath ghc-prim process text ]; - jailbreak = true; homepage = "https://bitbucket.org/gchrupala/progression"; description = "Multilabel classification model which learns sequentially (online)"; license = stdenv.lib.licenses.bsd3; @@ -137235,7 +132606,6 @@ self: { base containers mtl parsec syb template-haskell th-lift transformers ]; - jailbreak = true; homepage = "https://github.com/Erdwolf/prolog"; description = "A Prolog interpreter written in Haskell"; license = stdenv.lib.licenses.publicDomain; @@ -137255,7 +132625,6 @@ self: { executableHaskellDepends = [ base cmdargs fgl graphviz mtl prolog prolog-graph-lib text ]; - jailbreak = true; homepage = "https://github.com/Erdwolf/prolog"; description = "A command line tool to visualize query resolution in Prolog"; license = stdenv.lib.licenses.publicDomain; @@ -137291,7 +132660,6 @@ self: { pretty-show string-qq text transformers transformers-base tuple typelevel vector ]; - jailbreak = true; homepage = "https://github.com/wdanilo/prologue"; description = "Better, more general Prelude exporting common utilities"; license = stdenv.lib.licenses.asl20; @@ -137357,10 +132725,10 @@ self: { version = "0.1.0.0"; sha256 = "cf59d01629e18c5f961481b483849136e97783aaf11c4b8a615795c06bbefac3"; libraryHaskellDepends = [ async base ]; - jailbreak = true; homepage = "http://github.com/jfischoff/promise"; description = "A monadic interface for async"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "promises" = callPackage @@ -137415,8 +132783,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "3.1.2"; - sha256 = "a6baace79c8dd9782985836304494bf3cc4159ae6df398c9ee9d613a418a8e47"; + version = "3.2.1"; + sha256 = "757188dbf42e595e3b2eee8df4b30076ae929df636e83750ae99777612cc0cf2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137441,9 +132809,9 @@ self: { version = "0.0.2"; sha256 = "91f356964f9411f36121d4dbfa23a2721a559f71727483bcb139e9fbfa2f4311"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "check quickCheck properties in real time"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "property-list" = callPackage @@ -137506,10 +132874,10 @@ self: { aeson base bytestring cereal containers HsOpenSSL http-streams io-streams mtl text transformers vector ]; - jailbreak = true; homepage = "https://api.prosper.com"; description = "Bindings to the Prosper marketplace API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proteaaudio" = callPackage @@ -137535,16 +132903,16 @@ self: { }: mkDerivation { pname = "proto-lens"; - version = "0.1.0.2"; - sha256 = "860abe2b2a248144a7459dd00b5a55a8e13e07ba143060295d2db0c1790d067b"; + version = "0.1.0.4"; + sha256 = "2d4d1fc8fea2aae5bec2da31f64cac3a9ed11608628fde9f549b46476d51000e"; libraryHaskellDepends = [ attoparsec base bytestring containers data-default-class lens-family parsec pretty text transformers void ]; - jailbreak = true; homepage = "https://github.com/google/proto-lens"; description = "A lens-based implementation of protocol buffers in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-arbitrary" = callPackage @@ -137561,6 +132929,7 @@ self: { homepage = "https://github.com/google/proto-lens"; description = "Arbitrary instances for proto-lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-combinators" = callPackage @@ -137570,8 +132939,8 @@ self: { }: mkDerivation { pname = "proto-lens-combinators"; - version = "0.1.0.2"; - sha256 = "6ca43460e627f46944cf9b66e831f1e6997ef24fe5a7568a0e665987f1ecc077"; + version = "0.1.0.4"; + sha256 = "3d153caff241c45097d2acac97176d2dc54af626b4895678f51069ce7ceb66fb"; libraryHaskellDepends = [ base data-default-class lens-family proto-lens proto-lens-protoc transformers @@ -137580,7 +132949,6 @@ self: { base HUnit lens-family proto-lens proto-lens-protoc test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/google/proto-lens"; description = "Utilities functions to proto-lens"; license = stdenv.lib.licenses.bsd3; @@ -137599,6 +132967,7 @@ self: { homepage = "https://github.com/google/proto-lens"; description = "Adapting proto-lens to optparse-applicative ReadMs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "proto-lens-protoc" = callPackage @@ -137608,8 +132977,8 @@ self: { }: mkDerivation { pname = "proto-lens-protoc"; - version = "0.1.0.2"; - sha256 = "f70c4ae45a950ce090d6d93303738ee79e237168a7b03bce2a4f883a0ace6b4b"; + version = "0.1.0.4"; + sha256 = "bb5f04069ae2fd5d7a429523434be7c1c5e2a279a49394bf27d4a212b35d3e62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137620,9 +132989,9 @@ self: { base bytestring containers data-default-class filepath haskell-src-exts lens-family proto-lens text ]; - jailbreak = true; description = "Protocol buffer compiler for the proto-lens library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "protobuf" = callPackage @@ -137666,7 +133035,6 @@ self: { base bytestring cereal cplusplus-th criterion hprotoc-fork protobuf protocol-buffers-fork QuickCheck text utf8-string ]; - jailbreak = true; homepage = "https://github.com/nicta/protobuf-native"; description = "Protocol Buffers via C++"; license = stdenv.lib.licenses.bsd3; @@ -137680,8 +133048,8 @@ self: { }: mkDerivation { pname = "protobuf-simple"; - version = "0.1.0.1"; - sha256 = "3186d3372b6621d7b92dd5043187bee4cb329e644632a7888fd8689d5441fcae"; + version = "0.1.0.2"; + sha256 = "ef2b79ffd3f11796027cbc5bbcfcc68a6d1948f66acd079bb60c6d6ed00622f3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -137699,27 +133067,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "protocol-buffers_2_2_0" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , directory, filepath, mtl, parsec, syb, utf8-string - }: - mkDerivation { - pname = "protocol-buffers"; - version = "2.2.0"; - sha256 = "069a9ded2e9f7840ec51aef66eaabcdb428ceed8eee2b913590d5ee245506967"; - revision = "1"; - editedCabalFile = "23ebda7ea74075546a5ab75c567f97efe8ef0b6c0d7d994196e7286351659ee4"; - libraryHaskellDepends = [ - array base binary bytestring containers directory filepath mtl - parsec syb utf8-string - ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Parse Google Protocol Buffer specifications"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protocol-buffers" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , directory, filepath, mtl, parsec, syb, utf8-string @@ -137737,22 +133084,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "protocol-buffers-descriptor_2_2_0" = callPackage - ({ mkDerivation, base, bytestring, containers, protocol-buffers }: - mkDerivation { - pname = "protocol-buffers-descriptor"; - version = "2.2.0"; - sha256 = "62b6d996c8ee7e11fad73744b3267c92b60ec4ddb59f4c37a53b97ce9836c09a"; - libraryHaskellDepends = [ - base bytestring containers protocol-buffers - ]; - jailbreak = true; - homepage = "https://github.com/k-bx/protocol-buffers"; - description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protocol-buffers-descriptor" = callPackage ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { @@ -137802,24 +133133,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "protolude_0_1_6" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , ghc-prim, mtl, safe, stm, text, transformers - }: - mkDerivation { - pname = "protolude"; - version = "0.1.6"; - sha256 = "daddf3511ec1a971f53aecc4b198c008e89ab035736dbb453440d1d2b0733cbd"; - libraryHaskellDepends = [ - async base bytestring containers deepseq ghc-prim mtl safe stm text - transformers - ]; - homepage = "https://github.com/sdiehl/protolude"; - description = "A sensible set of defaults for writing custom Preludes"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "protolude" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , ghc-prim, mtl, safe, stm, text, transformers @@ -137837,6 +133150,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_1_8" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , ghc-prim, mtl, safe, stm, text, transformers + }: + mkDerivation { + pname = "protolude"; + version = "0.1.8"; + sha256 = "014d3a551d4e0929df615ff2df7e0215d67e34af8f03928e98bbaffec98860bc"; + libraryHaskellDepends = [ + async base bytestring containers deepseq ghc-prim mtl safe stm text + transformers + ]; + homepage = "https://github.com/sdiehl/protolude"; + description = "A sensible set of defaults for writing custom Preludes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "proton-haskell" = callPackage ({ mkDerivation, base, containers, directory, filepath, HUnit , test-framework, test-framework-hunit @@ -137850,10 +133181,10 @@ self: { base containers directory filepath HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "http://github.com/jasonrbriggs/proton"; description = "Simple XML templating library"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prototype" = callPackage @@ -137883,7 +133214,6 @@ self: { optparse-applicative parsec parsers process safe text time unordered-containers wai warp ]; - jailbreak = true; homepage = "https://github.com/prove-everywhere/server"; description = "The server for ProveEverywhere"; license = stdenv.lib.licenses.bsd3; @@ -137909,7 +133239,6 @@ self: { version = "0.1"; sha256 = "27a2dfe755ed9fe4ebf0599ee3243d5c9d34730d2289e6e8696f776aa191ff72"; libraryHaskellDepends = [ base tagged ]; - jailbreak = true; homepage = "https://github.com/jberryman/proxy-kindness"; description = "A library for kind-polymorphic manipulation and inspection of Proxy values"; license = stdenv.lib.licenses.bsd3; @@ -137996,6 +133325,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "psi" = callPackage + ({ mkDerivation, base, bytestring, deepseq, semigroups, text }: + mkDerivation { + pname = "psi"; + version = "0.1.1.0"; + sha256 = "4fbd37a54cbbf64a2ce827c8d055ff6b497df36057643abcaac499dd481fd07c"; + libraryHaskellDepends = [ + base bytestring deepseq semigroups text + ]; + description = "Yet another custom Prelude"; + license = stdenv.lib.licenses.mit; + }) {}; + "psql-helpers" = callPackage ({ mkDerivation, base, postgresql-simple }: mkDerivation { @@ -138008,25 +133350,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "psqueues_0_2_2_1" = callPackage - ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit - , QuickCheck, tagged, test-framework, test-framework-hunit - , test-framework-quickcheck2 - }: - mkDerivation { - pname = "psqueues"; - version = "0.2.2.1"; - sha256 = "1428771180a34c2258bc9ca0f0c12f1df530be018e870c91348975cc7d33ae9b"; - libraryHaskellDepends = [ base deepseq ghc-prim hashable ]; - testHaskellDepends = [ - array base deepseq ghc-prim hashable HUnit QuickCheck tagged - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - description = "Pure priority search queues"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "psqueues" = callPackage ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit , QuickCheck, tagged, test-framework, test-framework-hunit @@ -138076,27 +133399,11 @@ self: { mtl network pipes pipes-bytestring safe system-filepath text time transformers ]; - jailbreak = true; description = "Pipe stdin to a redis pub/sub channel"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "publicsuffix_0_20160522" = callPackage - ({ mkDerivation, base, filepath, hspec, template-haskell }: - mkDerivation { - pname = "publicsuffix"; - version = "0.20160522"; - sha256 = "1ae1ae02b3c317d421de31490cbd4b83a306f6be53103a5b1438aa170703f529"; - libraryHaskellDepends = [ base filepath template-haskell ]; - testHaskellDepends = [ base hspec ]; - jailbreak = true; - homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; - description = "The publicsuffix list exposed as proper Haskell types"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "publicsuffix" = callPackage ({ mkDerivation, base, filepath, hspec, template-haskell }: mkDerivation { @@ -138110,6 +133417,20 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "publicsuffix_0_20161003" = callPackage + ({ mkDerivation, base, filepath, hspec, template-haskell }: + mkDerivation { + pname = "publicsuffix"; + version = "0.20161003"; + sha256 = "f3a94499b546da47dea02e260ada8d0ca7444d3261a88fdaf13dad7041999ce7"; + libraryHaskellDepends = [ base filepath template-haskell ]; + testHaskellDepends = [ base hspec ]; + homepage = "https://github.com/wereHamster/publicsuffix-haskell/"; + description = "The publicsuffix list exposed as proper Haskell types"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "publicsuffixlist" = callPackage ({ mkDerivation, base, bytestring, cereal, containers, data-default , HUnit, idna, text, utf8-string @@ -138143,7 +133464,6 @@ self: { publicsuffixlist text ]; testHaskellDepends = [ base cereal HUnit publicsuffixlist ]; - jailbreak = true; homepage = "https://github.com/litherum/publicsuffixlist"; description = "Create the publicsuffixlist package"; license = stdenv.lib.licenses.bsd3; @@ -138178,7 +133498,6 @@ self: { base Cabal HUnit QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; - jailbreak = true; homepage = "http://github.com/pubnub/haskell"; description = "PubNub Haskell SDK"; license = stdenv.lib.licenses.mit; @@ -138199,7 +133518,6 @@ self: { base feed HTTP json mime network random utf8-string xml ]; executableHaskellDepends = [ fastcgi ]; - jailbreak = true; homepage = "http://projects.haskell.org/pubsub/"; description = "A library for Google/SixApart pubsub hub interaction"; license = stdenv.lib.licenses.bsd3; @@ -138230,7 +133548,6 @@ self: { aeson base bytestring QuickCheck test-framework test-framework-quickcheck2 text time vector ]; - jailbreak = true; homepage = "https://github.com/pharpend/puffytools"; description = "A CLI assistant"; license = stdenv.lib.licenses.bsd3; @@ -138249,7 +133566,6 @@ self: { base bytestring data-default-class template-haskell ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; - jailbreak = true; homepage = "https://github.com/philopon/pugixml-hs"; description = "pugixml binding"; license = stdenv.lib.licenses.mit; @@ -138464,9 +133780,9 @@ self: { version = "0.14"; sha256 = "772cb853676ec634ee733745d77250a570d5cc3a0fc734a97bf758d3e5b4bb88"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "A pure priority queue"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pure-priority-queue-tests" = callPackage @@ -138483,9 +133799,9 @@ self: { base containers pure-priority-queue QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "Tests for the pure-priority-queue package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pure-zlib" = callPackage @@ -138532,52 +133848,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "purescript_0_8_5_0" = callPackage - ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base - , base-compat, bower-json, boxes, bytestring, containers, directory - , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec - , hspec-discover, http-types, HUnit, language-javascript - , lifted-base, monad-control, monad-logger, mtl, network - , optparse-applicative, parallel, parsec, pattern-arrows, pipes - , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap - , spdx, split, stm, syb, text, time, transformers - , transformers-base, transformers-compat, unordered-containers - , utf8-string, vector - }: - mkDerivation { - pname = "purescript"; - version = "0.8.5.0"; - sha256 = "75a253d113b33e79abceff9d280988c1a4cb46eb84547a82eda1ec4bdad60d04"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-better-errors base base-compat bower-json boxes - bytestring containers directory dlist edit-distance filepath - fsnotify Glob http-types language-javascript lifted-base - monad-control monad-logger mtl parallel parsec pattern-arrows pipes - pipes-http process regex-tdfa safe semigroups sourcemap spdx split - stm syb text time transformers transformers-base - transformers-compat unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ - aeson ansi-wl-pprint base base-compat boxes bytestring containers - directory filepath Glob haskeline monad-logger mtl network - optparse-applicative parsec process split stm text time - transformers transformers-compat utf8-string - ]; - testHaskellDepends = [ - aeson aeson-better-errors base base-compat boxes bytestring - containers directory filepath Glob haskeline hspec hspec-discover - HUnit mtl optparse-applicative parsec process stm text time - transformers transformers-compat utf8-string vector - ]; - doCheck = false; - homepage = "http://www.purescript.org/"; - description = "PureScript Programming Language Compiler"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "purescript" = callPackage ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring @@ -138620,12 +133890,60 @@ self: { HUnit mtl optparse-applicative parsec process protolude silently stm text time transformers transformers-compat utf8-string vector ]; - doCheck = false; homepage = "http://www.purescript.org/"; description = "PureScript Programming Language Compiler"; license = stdenv.lib.licenses.mit; }) {}; + "purescript_0_10_1" = callPackage + ({ mkDerivation, aeson, aeson-better-errors, ansi-terminal + , ansi-wl-pprint, base, base-compat, bower-json, boxes, bytestring + , clock, containers, data-ordlist, directory, dlist, edit-distance + , file-embed, filepath, fsnotify, Glob, haskeline, hspec + , hspec-discover, http-client, http-types, HUnit + , language-javascript, lifted-base, monad-control, monad-logger + , mtl, network, optparse-applicative, parallel, parsec + , pattern-arrows, pipes, pipes-http, process, protolude, regex-tdfa + , safe, 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.1"; + sha256 = "954e333a0f7c860941384289de241b683cbdd606c5c71ab300fe7ac7b3573df0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-better-errors ansi-terminal base base-compat bower-json + boxes bytestring clock containers data-ordlist directory dlist + edit-distance filepath fsnotify Glob haskeline http-client + http-types language-javascript lifted-base monad-control + monad-logger mtl parallel parsec pattern-arrows pipes pipes-http + process protolude regex-tdfa safe semigroups sourcemap spdx split + stm syb text time transformers transformers-base + transformers-compat unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson ansi-terminal ansi-wl-pprint base base-compat boxes + bytestring containers directory file-embed filepath Glob haskeline + http-types monad-logger mtl network optparse-applicative parsec + process protolude split stm text time transformers + transformers-compat utf8-string wai wai-websockets warp websockets + ]; + testHaskellDepends = [ + aeson aeson-better-errors base base-compat boxes bytestring + containers directory filepath Glob haskeline hspec hspec-discover + HUnit mtl optparse-applicative parsec process protolude silently + stm text time transformers transformers-compat utf8-string vector + ]; + homepage = "http://www.purescript.org/"; + description = "PureScript Programming Language Compiler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "purescript-bridge" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, hspec, hspec-expectations-pretty-diff, lens @@ -138644,6 +133962,7 @@ self: { ]; description = "Generate PureScript data types from Haskell data types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "purescript-bundle-fast" = callPackage @@ -138759,41 +134078,9 @@ self: { aeson base bytestring HTTP MissingH mtl SHA time ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; homepage = "http://www.github.com/sidraval/pusher-haskell"; description = "A Pusher.com client written in Haskell"; license = stdenv.lib.licenses.mit; - }) {}; - - "pusher-http-haskell_0_3_0_2" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , containers, cryptohash, hashable, hspec, http-client, http-types - , mtl, QuickCheck, snap-core, snap-server, text, time, transformers - , unordered-containers, yaml - }: - mkDerivation { - pname = "pusher-http-haskell"; - version = "0.3.0.2"; - sha256 = "72ce2a76a802d6c866ea0630fde7711b0298929113609998e0ec1dd733fb8098"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring cryptohash hashable - http-client http-types mtl QuickCheck text time transformers - unordered-containers - ]; - executableHaskellDepends = [ - aeson base bytestring containers mtl snap-core snap-server text - transformers unordered-containers yaml - ]; - testHaskellDepends = [ - aeson base bytestring hspec http-client http-types mtl QuickCheck - text transformers unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/pusher-community/pusher-http-haskell"; - description = "Haskell client library for the Pusher HTTP API"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138804,8 +134091,8 @@ self: { }: mkDerivation { pname = "pusher-http-haskell"; - version = "1.1.0.0"; - sha256 = "2938607770675541738af018e086b365e34fab98f389110ec34abb4fef79ca69"; + version = "1.1.0.3"; + sha256 = "7c70330d247624caaac8d2569735728a375d06a813ae1dc2a240707c4149caab"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptohash hashable http-client http-types QuickCheck text time transformers @@ -138815,10 +134102,10 @@ self: { aeson base bytestring hspec http-client http-types QuickCheck text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/pusher-community/pusher-http-haskell"; description = "Haskell client library for the Pusher HTTP API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pusher-ws" = callPackage @@ -138836,33 +134123,35 @@ self: { lens-aeson network scientific stm text time transformers unordered-containers websockets wuss ]; - jailbreak = true; homepage = "https://github.com/barrucadu/pusher-ws"; description = "Implementation of the Pusher WebSocket protocol"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "pushme" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , hslogger, io-storage, lens, old-locale, optparse-applicative - , parallel-io, pointless-fun, regex-posix, shelly, system-fileio - , system-filepath, text, text-format, time, unix - , unordered-containers, yaml + ({ mkDerivation, aeson, base, bytestring, containers, foldl + , io-storage, lens, logging, monad-logger, old-locale + , optparse-applicative, parallel-io, pipes, pipes-group, pipes-safe + , pipes-text, regex-posix, safe, shelly, system-fileio + , system-filepath, temporary, text, text-format, time, transformers + , unix, unordered-containers, yaml }: mkDerivation { pname = "pushme"; - version = "1.5.0"; - sha256 = "8d44eb63f4bee35e9474851816085317316008152ca16203338b9b0d2e28c332"; + version = "2.0.2"; + sha256 = "fc9b7ab521dee1ccc66912b08ab6d54715cc3fe9334ece6a6f6a54bd5c18ed89"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson base bytestring containers deepseq hslogger io-storage lens - old-locale optparse-applicative parallel-io pointless-fun - regex-posix shelly system-fileio system-filepath text text-format - time unix unordered-containers yaml + aeson base bytestring containers foldl io-storage lens logging + monad-logger old-locale optparse-applicative parallel-io pipes + pipes-group pipes-safe pipes-text regex-posix safe shelly + system-fileio system-filepath temporary text text-format time + transformers unix unordered-containers yaml ]; homepage = "https://github.com/jwiegley/pushme"; - description = "Tool to synchronize multiple directories with rsync, zfs or git-annex"; + description = "Tool to synchronize directories with rsync, zfs or git-annex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -138879,7 +134168,6 @@ self: { base containers ghc-prim lens mtl QuickCheck random safe split template-haskell transformers ]; - jailbreak = true; description = "Put-based lens library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -138929,7 +134217,6 @@ self: { aeson base diagrams-lib diagrams-svg filepath optparse-applicative puzzle-draw yaml ]; - jailbreak = true; description = "Creating graphics for pencil puzzles, command line tools"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -139036,10 +134323,10 @@ self: { aeson base bytestring containers pureMD5 template-haskell ]; libraryPkgconfigDepends = [ python ]; - jailbreak = true; homepage = "http://github.com/Russell91/json-python"; description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) python;}; "pyfi" = callPackage @@ -139054,10 +134341,10 @@ self: { aeson base bytestring containers pureMD5 template-haskell ]; libraryPkgconfigDepends = [ python ]; - jailbreak = true; homepage = "http://github.com/Russell91/pyfi"; description = "Call python inline from haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) python;}; "python-pickle" = callPackage @@ -139074,7 +134361,6 @@ self: { attoparsec base bytestring cereal containers mtl ]; executableHaskellDepends = [ base bytestring cmdargs ]; - jailbreak = true; description = "Serialization/deserialization using Python Pickle format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -139089,7 +134375,6 @@ self: { libraryHaskellDepends = [ base fclabels QuickCheck template-haskell ]; - jailbreak = true; homepage = "http://www.iai.uni-bonn.de/~jv/GV14.html"; description = "Compile time generation of operation invariance tests for QuickCheck"; license = stdenv.lib.licenses.bsd3; @@ -139204,14 +134489,13 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.1.1"; - sha256 = "2af216f46beaf1c491b5fee0cd25876561ecd3af98bad87e45e3f4210e6bf55f"; + version = "0.1.2"; + sha256 = "eebe064bfa0b93dd850c127632ca59ffa8f269f886ec7e247ec22530e007b442"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ base binary bytestring filepath hoppy-runtime qtah-qt5 ]; - jailbreak = true; homepage = "http://khumba.net/projects/qtah"; description = "Example programs for Qtah Qt bindings"; license = stdenv.lib.licenses.lgpl3; @@ -139246,8 +134530,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.1.1"; - sha256 = "1b6cf51a5e9bb730e3465b6ed6a2bf044c1e7122f948c59234ec20651dbc7033"; + version = "0.1.2"; + sha256 = "320c98e0d90381f56ce992fea845839bd966e030d6afa066c83123d40c73da5e"; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator ]; @@ -139255,7 +134539,6 @@ self: { libraryToolDepends = [ qtbase ]; testHaskellDepends = [ base hoppy-runtime HUnit ]; testSystemDepends = [ qtah ]; - jailbreak = true; homepage = "http://khumba.net/projects/qtah"; description = "Qt bindings for Haskell"; license = stdenv.lib.licenses.lgpl3; @@ -139291,7 +134574,6 @@ self: { base directory doctest filepath mtl numbers QuickCheck tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/ion1/quadratic-irrational"; description = "An implementation of quadratic irrationals"; license = stdenv.lib.licenses.mit; @@ -139331,7 +134613,6 @@ self: { random-source rvar transformers vector ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/boundedvariation/quantfin"; description = "Quant finance library in pure Haskell"; license = stdenv.lib.licenses.bsd3; @@ -139366,7 +134647,6 @@ self: { version = "0.0.5"; sha256 = "9c3f37a790d9372357252dabee6313a9be8c3643a7f5010478407ccb2558e5a7"; libraryHaskellDepends = [ base MonadRandom mtl QuickCheck random ]; - jailbreak = true; homepage = "http://github.com/luqui/quantum-arrow"; description = "An embedding of quantum computation as a Haskell arrow"; license = "LGPL"; @@ -139380,8 +134660,8 @@ self: { }: mkDerivation { pname = "quantum-random"; - version = "0.6.1"; - sha256 = "ebaeac863914541fd39d82073ce2223fe4583faa046bafb8632162d3b8790d2f"; + version = "0.6.3"; + sha256 = "ef14cb9adf4e05ed71d1707ebb773dc8be9ffd1bd8a54016f1c1f9b5c0def714"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139432,7 +134712,6 @@ self: { wai-middleware-static warp ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "Quenya verb conjugator"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -139520,10 +134799,10 @@ self: { aeson base hspec QuickCheck scientific text unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/benweitzman/quick-schema"; description = "Slimmed down json schema language and validator"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickbooks" = callPackage @@ -139540,7 +134819,6 @@ self: { http-client http-client-tls http-types interpolate old-locale text thyme yaml ]; - jailbreak = true; description = "QuickBooks API binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -139654,10 +134932,10 @@ self: { version = "0.1.0.2"; sha256 = "e5da89c66f52eb28a3fd708ab0feea95a4fbab20c1c6c6f9922d380eab121f73"; libraryHaskellDepends = [ base mtl QuickCheck ]; - jailbreak = true; homepage = "http://www.github.com/jfeltz/quickcheck-property-comb"; description = "Combinators for Quickcheck Property construction and diagnostics"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-property-monad" = callPackage @@ -139667,10 +134945,10 @@ self: { version = "0.2.4"; sha256 = "2ce59041850673d8125078e36b5d29e7daab17da54d0e97547d14027452ae76a"; libraryHaskellDepends = [ base either QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/bennofs/quickcheck-property-monad/"; description = "A monad for generating QuickCheck properties without Arbitrary instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-regex" = callPackage @@ -139687,6 +134965,7 @@ self: { homepage = "http://github.com/audreyt/quickcheck-regex/"; description = "Generate regex-constrained strings for QuickCheck"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-relaxng" = callPackage @@ -139703,6 +134982,7 @@ self: { homepage = "http://github.com/audreyt/quickcheck-relaxng/"; description = "Generate RelaxNG-constrained XML documents for QuickCheck"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quickcheck-rematch" = callPackage @@ -139713,7 +134993,6 @@ self: { sha256 = "6a158749e4d13b167fd242d8d2fe116493e8857d063f9b78beda0c1a0849bc5e"; libraryHaskellDepends = [ base QuickCheck rematch ]; testHaskellDepends = [ base hspec HUnit QuickCheck rematch ]; - jailbreak = true; homepage = "http://github.com/tcrayford/rematch"; description = "QuickCheck support for rematch"; license = stdenv.lib.licenses.mit; @@ -139749,8 +135028,8 @@ self: { ({ mkDerivation, base, binary, bytestring, QuickCheck, text }: mkDerivation { pname = "quickcheck-text"; - version = "0.1.1.0"; - sha256 = "bb62b4bf21b639860600ce59ce13715ad13d995e5ef7825384ffb8fa72da2585"; + version = "0.1.2.1"; + sha256 = "4442fdb8ae6cd469c04957d34fee46039c9dc0ddce23ce6050babe6826d0ab09"; libraryHaskellDepends = [ base binary bytestring QuickCheck text ]; testHaskellDepends = [ base bytestring QuickCheck text ]; homepage = "https://github.com/olorin/quickcheck-text"; @@ -139777,9 +135056,9 @@ self: { version = "0.1.0.7"; sha256 = "10447118796aefc05405e9e3b58676c888ce9f93a85d544c8f1538e22592538a"; libraryHaskellDepends = [ base QuickCheck transformers webdriver ]; - jailbreak = true; description = "Utilities for using WebDriver with QuickCheck"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quicklz" = callPackage @@ -139811,7 +135090,6 @@ self: { libraryHaskellDepends = [ base directory filepath QuickCheck ]; executableHaskellDepends = [ base directory filepath QuickCheck ]; testHaskellDepends = [ base directory filepath QuickCheck ]; - jailbreak = true; homepage = "http://www.github.com/massysett/quickpull"; description = "Generate Main module with QuickCheck tests"; license = stdenv.lib.licenses.bsd3; @@ -139853,10 +135131,10 @@ self: { version = "0.1.0.0"; sha256 = "389310e766ef5169819a296719827b0c4aa50c5c6a9eef2a58c3500e6bc147f9"; libraryHaskellDepends = [ base edit-distance hashmap ]; - jailbreak = true; homepage = "https://github.com/SamuelSchlesinger/Quickterm"; description = "An interface for describing and executing terminal applications"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quicktest" = callPackage @@ -139910,7 +135188,6 @@ self: { base containers directory easyrender mtl process random template-haskell unix ]; - jailbreak = true; homepage = "http://www.mathstat.dal.ca/~selinger/quipper/"; description = "An embedded, scalable functional programming language for quantum computing"; license = stdenv.lib.licenses.bsd3; @@ -140038,9 +135315,9 @@ self: { libraryHaskellDepends = [ base exceptions quiver resourcet transformers transformers-base ]; - jailbreak = true; description = "Extra instances for Quiver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quiver-interleave" = callPackage @@ -140051,7 +135328,6 @@ self: { sha256 = "0dbe071064fdffb6995475048afe2531096e4009243fe58fc9bfe6ed31f2dad8"; libraryHaskellDepends = [ base quiver ]; testHaskellDepends = [ base hspec QuickCheck quiver ]; - jailbreak = true; description = "Interleave values from multiple Quivers"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -140076,7 +135352,6 @@ self: { base binary directory exceptions hspec QuickCheck quiver quiver-instances resourcet temporary transformers ]; - jailbreak = true; description = "Sort the values in a quiver"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -140101,7 +135376,6 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit mtl ]; - jailbreak = true; homepage = "https://github.com/talw/quoridor-hs"; description = "A Quoridor implementation in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -140122,7 +135396,6 @@ self: { base bytestring containers directory filepath language-qux llvm-general mtl optparse-applicative pretty ]; - jailbreak = true; homepage = "https://github.com/qux-lang/qux"; description = "Command line binary for working with the Qux language"; license = stdenv.lib.licenses.bsd3; @@ -140173,7 +135446,6 @@ self: { version = "0.1.6.3"; sha256 = "4d04262c569592c6189a3300cb9e1a6d25ea6665200dd71b6357d9ba07a3e2a5"; libraryHaskellDepends = [ array base containers data-reify ]; - jailbreak = true; homepage = "http://comonad.com/reader/"; description = "Reverse Automatic Differentiation"; license = stdenv.lib.licenses.bsd3; @@ -140208,10 +135480,10 @@ self: { testHaskellDepends = [ base Cabal containers hspec parsec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/klangner/radium"; description = "Chemistry"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "radium-formula-parser" = callPackage @@ -140225,7 +135497,6 @@ self: { testHaskellDepends = [ base Cabal containers hspec parsec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/klangner/radium-formula-parser"; description = "Chemistry"; license = stdenv.lib.licenses.bsd3; @@ -140241,10 +135512,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base filepath ]; - jailbreak = true; homepage = "https://github.com/thomaseding/radix"; description = "Command-line tool for emitting numbers in various bases"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rados-haskell" = callPackage @@ -140305,7 +135576,6 @@ self: { base cairo containers gtk mtl process transformers ]; testHaskellDepends = [ base containers HUnit process ]; - jailbreak = true; homepage = "https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14"; description = "Compiler and editor for the esolang rail"; license = stdenv.lib.licenses.mit; @@ -140342,7 +135612,6 @@ self: { libraryHaskellDepends = [ barecheck base QuickCheck rainbow terminfo text ]; - jailbreak = true; homepage = "http://www.github.com/massysett/rainbow"; description = "Tests and QuickCheck generators to accompany rainbow"; license = stdenv.lib.licenses.bsd3; @@ -140393,7 +135662,6 @@ self: { attoparsec base bytestring containers lens mtl pipes scientific transformers vector zlib ]; - jailbreak = true; homepage = "http://github.com/YoEight/rakhana"; description = "Stream based PDF library"; license = stdenv.lib.licenses.bsd3; @@ -140503,10 +135771,10 @@ self: { version = "0.1.0.0"; sha256 = "17495d57a9ceace879853d7fef5bb62af3f6c678b0dc9f00902f3e869eff3922"; libraryHaskellDepends = [ base random template-haskell ]; - jailbreak = true; homepage = "https://github.com/frerich/random-derive"; description = "A Template Haskell helper for deriving Random instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "random-eff" = callPackage @@ -140516,7 +135784,6 @@ self: { version = "0.1.0.1"; sha256 = "ce77a52b645306f38b2272a6d10e0dd9f55506fcf922d0820d7729f7c1b548d4"; libraryHaskellDepends = [ base extensible-effects random ]; - jailbreak = true; description = "A simple random generator library for extensible-effects"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -140529,7 +135796,6 @@ self: { version = "0.1.1.0"; sha256 = "105c2091eba9bbfa5041a9dc90a2e4a095391265fd34486bc2005cdd5c2b365c"; libraryHaskellDepends = [ base effin random ]; - jailbreak = true; description = "A simple random generator library for effin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -140594,7 +135860,6 @@ self: { base Cabal cabal-test-quickcheck math-functions mwc-random QuickCheck random-fu vector ]; - jailbreak = true; homepage = "https://github.com/srijs/random-hypergeometric"; description = "Random variate generation from hypergeometric distributions"; license = stdenv.lib.licenses.mit; @@ -140793,10 +136058,10 @@ self: { base QuickCheck semigroups test-framework test-framework-quickcheck2 time vector-space vector-space-points ]; - jailbreak = true; homepage = "https://github.com/JohnLato/range-space"; description = "A Range type with vector-space instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rangemin" = callPackage @@ -140877,10 +136142,10 @@ self: { filepath HUnit mtl process QuickCheck tasty tasty-hunit tasty-quickcheck vector ]; - jailbreak = true; homepage = "http://soli.github.io/rascal/"; description = "A command-line client for Reddit"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rasterific-svg" = callPackage @@ -140922,26 +136187,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ratel_0_1_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, case-insensitive - , containers, http-client, http-client-tls, http-types, tasty - , tasty-hspec, text, uuid - }: - mkDerivation { - pname = "ratel"; - version = "0.1.3"; - sha256 = "49fee52e108c70551438f75f997b8c0a3053ee15476422c77509918bfb3ca9b3"; - libraryHaskellDepends = [ - aeson base bytestring case-insensitive containers http-client - http-client-tls http-types text uuid - ]; - testHaskellDepends = [ base tasty tasty-hspec ]; - homepage = "https://github.com/tfausak/ratel#readme"; - description = "Notify Honeybadger about exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ratel" = callPackage ({ mkDerivation, aeson, base, bytestring, case-insensitive , containers, http-client, http-client-tls, http-types, tasty @@ -140961,24 +136206,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "ratel-wai_0_1_2" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , http-client, ratel, wai - }: - mkDerivation { - pname = "ratel-wai"; - version = "0.1.2"; - sha256 = "f8aad4c4f57e58bda51edc56521e095e03810c825ef2333069e9151f51e1468e"; - libraryHaskellDepends = [ - base bytestring case-insensitive containers http-client ratel wai - ]; - jailbreak = true; - homepage = "https://github.com/tfausak/ratel-wai#readme"; - description = "Notify Honeybadger about exceptions via a WAI middleware"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "ratel-wai" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, containers , http-client, ratel, wai @@ -141094,7 +136321,6 @@ self: { testHaskellDepends = [ base deepseq doctest ghc-datasize lens tasty tasty-hunit ]; - jailbreak = true; homepage = "https://github.com/pkmx/rawr"; description = "Anonymous extensible records"; license = stdenv.lib.licenses.bsd3; @@ -141115,6 +136341,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "raz" = callPackage + ({ mkDerivation, base, deepseq, MonadRandom }: + mkDerivation { + pname = "raz"; + version = "0.1.0.0"; + sha256 = "ee0c0fcff08e7f2faf28218b61cd5cb0b04031d13c73b71f2f735694eb96c215"; + libraryHaskellDepends = [ base deepseq MonadRandom ]; + testHaskellDepends = [ base MonadRandom ]; + homepage = "https://github.com/Lysxia/raz.haskell"; + description = "Random Access Zippers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "razom-text-util" = callPackage ({ mkDerivation, base, QuickCheck, regex-applicative, smaoin, text , text-position @@ -141132,6 +136372,7 @@ self: { homepage = "http://rel4tion.org/projects/razom-text-util/"; description = "Common text/parsing tools for Razom language packages"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rbr" = callPackage @@ -141181,7 +136422,6 @@ self: { testHaskellDepends = [ base directory doctest filepath hlint parallel ]; - jailbreak = true; homepage = "http://github.com/ekmett/rcu/"; description = "Read-Copy-Update for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -141206,20 +136446,19 @@ self: { "rdf4h" = callPackage ({ mkDerivation, base, binary, bytestring, containers, deepseq - , directory, fgl, hashable, hgal, HTTP, HUnit, hxt, network - , network-uri, parsec, QuickCheck, safe, tasty, tasty-hunit - , tasty-quickcheck, text, text-binary, unordered-containers - , utf8-string + , directory, hashable, hgal, HTTP, HUnit, hxt, network, network-uri + , parsec, QuickCheck, safe, tasty, tasty-hunit, tasty-quickcheck + , text, text-binary, unordered-containers, utf8-string }: mkDerivation { pname = "rdf4h"; - version = "2.0.0"; - sha256 = "2c6eb2a15590931e0646731c688b010d75186a2d1ce38eabb27fdbc19647a23a"; + version = "3.0.0"; + sha256 = "aa50b95e37655e3abdfb4f83679096bd6c188750a8cb3a61132e2e8399e928db"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base binary bytestring containers deepseq directory fgl hashable - hgal HTTP hxt network network-uri parsec text text-binary + base binary bytestring containers deepseq directory hashable hgal + HTTP hxt network network-uri parsec text text-binary unordered-containers utf8-string ]; executableHaskellDepends = [ @@ -141336,10 +136575,10 @@ self: { aeson base deepseq lens-family monads-tf text transformers unordered-containers void ]; - jailbreak = true; homepage = "https://github.com/joelburget/react-haskell"; description = "Haskell React bindings"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "react-tutorial-haskell-server" = callPackage @@ -141355,7 +136594,6 @@ self: { executableHaskellDepends = [ aeson aeson-pretty base bytestring scotty time transformers ]; - jailbreak = true; description = "react-tutorial web server"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -141413,19 +136651,18 @@ self: { ({ mkDerivation, alsa-core, alsa-seq, base, containers , data-accessor, data-accessor-transformers, event-list , extensible-exceptions, midi, midi-alsa, non-negative, random - , reactive-banana, transformers, utility-ht + , reactive-banana, reactive-midyim, transformers, utility-ht }: mkDerivation { pname = "reactive-balsa"; - version = "0.1.1"; - sha256 = "7664870dd5ba4c3345e79dc06dcec64b512a13fa0c8fa2f4258b77bf652e6692"; + version = "0.2.0.1"; + sha256 = "42ea83a158dee24bbe3a031d4222e195cf0b1844cba5b63c82173b261bfc5a71"; libraryHaskellDepends = [ alsa-core alsa-seq base containers data-accessor data-accessor-transformers event-list extensible-exceptions midi - midi-alsa non-negative random reactive-banana transformers - utility-ht + midi-alsa non-negative random reactive-banana reactive-midyim + transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; description = "Programmatically edit MIDI events via ALSA and reactive-banana"; license = stdenv.lib.licenses.bsd3; @@ -141466,7 +136703,6 @@ self: { base data-lens data-lens-template reactive-banana SDL SDL-image SDL-ttf ]; - jailbreak = true; homepage = "https://github.com/JPMoresmau/reactive-banana-sdl"; description = "Reactive Banana bindings for SDL"; license = stdenv.lib.licenses.gpl3; @@ -141493,7 +136729,6 @@ self: { version = "0.7.1.3"; sha256 = "2a51bbecf637916ac67cd8803fd08072927bb38024c10e857a5677960f5e60b9"; libraryHaskellDepends = [ base reactive-banana threepenny-gui ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Reactive-banana"; description = "Examples for the reactive-banana library, using threepenny-gui"; license = stdenv.lib.licenses.bsd3; @@ -141513,6 +136748,7 @@ self: { homepage = "http://wiki.haskell.org/Reactive-banana"; description = "Examples for the reactive-banana library, using wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reactive-fieldtrip" = callPackage @@ -141572,6 +136808,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "reactive-jack" = callPackage + ({ mkDerivation, base, containers, data-accessor, event-list + , explicit-exception, extensible-exceptions, jack, midi + , non-negative, random, reactive-banana, reactive-midyim + , transformers, utility-ht + }: + mkDerivation { + pname = "reactive-jack"; + version = "0.2.0.1"; + sha256 = "8facc607ec889c7a871cd61975d7e4e0760b0064583ad1a0da938fe4fcd702cd"; + libraryHaskellDepends = [ + base containers data-accessor event-list explicit-exception + extensible-exceptions jack midi non-negative random reactive-banana + reactive-midyim transformers utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; + description = "Process MIDI events via reactive-banana and JACK"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "reactive-midyim" = callPackage + ({ mkDerivation, base, containers, data-accessor + , data-accessor-transformers, event-list, midi, non-negative + , random, reactive-banana, transformers, utility-ht + }: + mkDerivation { + pname = "reactive-midyim"; + version = "0.2.1"; + sha256 = "3d8180f416b2efd948d067d9c5c1cdcb2c8b6933093435e55e02a7e63425669c"; + libraryHaskellDepends = [ + base containers data-accessor data-accessor-transformers event-list + midi non-negative random reactive-banana transformers utility-ht + ]; + homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa"; + description = "Process MIDI events via reactive-banana"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "reactive-thread" = callPackage ({ mkDerivation, base, monad-parallel, SDL, stm, transformers }: mkDerivation { @@ -141584,7 +136858,6 @@ self: { executableHaskellDepends = [ base monad-parallel SDL stm transformers ]; - jailbreak = true; homepage = "https://github.com/strager/reactive-thread"; description = "Reactive programming via imperative threads"; license = stdenv.lib.licenses.bsd3; @@ -141622,7 +136895,6 @@ self: { array base bits-atomic comonad contravariant mtl semigroupoids transformers ]; - jailbreak = true; homepage = "http://comonad.com/reader/"; description = "Reactor - task parallel reactive programming"; license = stdenv.lib.licenses.bsd3; @@ -141636,10 +136908,10 @@ self: { version = "0.1.1.0"; sha256 = "f310debaed6ede28440f1b177be6c5c6f281b7b3c0af9936bcb615d577d9d6a7"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/thomaseding/read-bounded"; description = "Class for reading bounded values"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "read-editor" = callPackage @@ -141654,20 +136926,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "read-env-var_0_1_0_0" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "read-env-var"; - version = "0.1.0.0"; - sha256 = "fb70be65ea0889032ac0cef9890370a7c4229602744c1cb67482cfd0dc6b4e5d"; - libraryHaskellDepends = [ base ]; - 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-env-var" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { @@ -141712,9 +136970,32 @@ self: { version = "1.0.1.0"; sha256 = "88c5eec58816b2bfd487fa6220a5daa266af51a1c52a4163cf6acee6f8d0ddbd"; libraryHaskellDepends = [ base readline StateVar ]; - jailbreak = true; description = "Readline with variables (setX/getY) wrapped in state vars"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "readme-lhs" = callPackage + ({ mkDerivation, attoparsec, base, containers, filepath, foldl + , HUnit, optparse-applicative, protolude, tasty, tasty-hunit, text + }: + mkDerivation { + pname = "readme-lhs"; + version = "0.1.0.0"; + sha256 = "d2686c8149e1eec2e0a1db662e611508498dbb04151b3592656f127e8655c0de"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ attoparsec base foldl protolude text ]; + executableHaskellDepends = [ + base containers filepath foldl optparse-applicative protolude text + ]; + testHaskellDepends = [ + base HUnit protolude tasty tasty-hunit text + ]; + homepage = "https://github.com/tonyday567/readme-lhs"; + description = "See readme.lhs"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "readpyc" = callPackage @@ -141726,10 +137007,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bliplib parseargs ]; - jailbreak = true; homepage = "https://github.com/bjpop/blip"; description = "Read and pretty print Python bytecode (.pyc) files."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "readshp" = callPackage @@ -141745,7 +137026,6 @@ self: { libraryHaskellDepends = [ base binary bytestring data-binary-ieee754 filepath monad-loops ]; - jailbreak = true; description = "Code for reading ESRI Shapefiles"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -141758,7 +137038,6 @@ self: { version = "0.4.0.0"; sha256 = "deebf19a654850fc893bfa58befe4e46596f0cc9e4699d54112ad56d7574b9e2"; libraryHaskellDepends = [ base parsec ]; - jailbreak = true; homepage = "http://website-ckkashyap.rhcloud.com"; description = "A really simple XML parser"; license = stdenv.lib.licenses.publicDomain; @@ -141837,7 +137116,6 @@ self: { libraryHaskellDepends = [ base base-prelude basic-lens template-haskell transformers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/record"; description = "Anonymous records"; license = stdenv.lib.licenses.mit; @@ -141856,7 +137134,6 @@ self: { aeson base base-prelude record template-haskell ]; testHaskellDepends = [ aeson base-prelude hspec record ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/record-aeson"; description = "Instances of \"aeson\" classes for the \"record\" types"; license = stdenv.lib.licenses.mit; @@ -141901,7 +137178,6 @@ self: { base base-prelude conversion conversion-text record-syntax text ]; doHaddock = false; - jailbreak = true; homepage = "https://github.com/nikita-volkov/record-preprocessor"; description = "Compiler preprocessor introducing a syntactic extension for anonymous records"; license = stdenv.lib.licenses.mit; @@ -141924,7 +137200,6 @@ self: { testHaskellDepends = [ base base-prelude directory doctest filepath hspec record ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/record-syntax"; description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records"; license = stdenv.lib.licenses.mit; @@ -141940,7 +137215,6 @@ self: { revision = "1"; editedCabalFile = "3bbff6cb24271374eb00769bbf9313dfe54e1e08b8e5104df9e2e4f7df88cd07"; libraryHaskellDepends = [ base kinds type-functions ]; - jailbreak = true; homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records"; description = "A flexible record system"; license = stdenv.lib.licenses.bsd3; @@ -141959,7 +137233,6 @@ self: { aeson base data-default kinds records template-haskell text type-functions unordered-containers ]; - jailbreak = true; homepage = "github.com/lassoinc/records-th"; description = "Template Haskell declarations for the records package"; license = stdenv.lib.licenses.mit; @@ -141967,13 +137240,16 @@ self: { }) {}; "recursion-schemes" = callPackage - ({ mkDerivation, base, comonad, free, transformers }: + ({ mkDerivation, base, bifunctors, comonad, free, transformers + , transformers-compat + }: mkDerivation { pname = "recursion-schemes"; - version = "4.1.2"; - sha256 = "36fd1357a577e23640c2948a1b00afd38e4527e4972551042bf6b88781c8c4fc"; - libraryHaskellDepends = [ base comonad free transformers ]; - jailbreak = true; + version = "5"; + sha256 = "c6d298c2e59e2143e833d21dd82613510df55f18000b19264c68d253dfa709fc"; + libraryHaskellDepends = [ + base bifunctors comonad free transformers transformers-compat + ]; homepage = "http://github.com/ekmett/recursion-schemes/"; description = "Generalized bananas, lenses and barbed wire"; license = stdenv.lib.licenses.bsd3; @@ -142011,7 +137287,6 @@ self: { array base bytestring cgi containers haskell98 MaybeT mtl network old-time parsec stm unix xhtml ]; - jailbreak = true; description = "Monadic HTTP request handlers combinators to build a standalone web apps"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -142091,7 +137366,6 @@ self: { async base bytestring bytestring-conversion containers redis-resp tasty tasty-hunit tinylog transformers ]; - doCheck = false; homepage = "https://gitlab.com/twittner/redis-io/"; description = "Yet another redis client"; license = stdenv.lib.licenses.mpl20; @@ -142183,8 +137457,8 @@ self: { }: mkDerivation { pname = "reedsolomon"; - version = "0.0.4.0"; - sha256 = "40498e946a71155b078d307d11803800f1a4df0777dd1ba8c3cf6e6c5689b7e9"; + version = "0.0.4.2"; + sha256 = "1f2e6d4d781692ed5cbb6f655486fa7d9a8a2872feb6a4a0626e3e778e067d9f"; libraryHaskellDepends = [ base bytestring exceptions gitrev loop mtl primitive profunctors vector @@ -142194,7 +137468,6 @@ self: { QuickCheck random tasty tasty-ant-xml tasty-hunit tasty-quickcheck vector ]; - jailbreak = true; homepage = "http://github.com/NicolasT/reedsolomon"; description = "Reed-Solomon Erasure Coding in Haskell"; license = stdenv.lib.licenses.mit; @@ -142231,7 +137504,6 @@ self: { version = "0.1.1.2"; sha256 = "19c607d20eb96e758cbef709d5b387724bd7fde684bdadb051e491bf1ea53181"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "https://bitbucket.org/carter/ref"; description = "Generic Mutable Ref Abstraction Layer"; license = stdenv.lib.licenses.bsd3; @@ -142256,10 +137528,10 @@ self: { version = "0.3"; sha256 = "0001829cd8e7e63e884a157528d2f92ccbf2135ad07306bec4e67a3c9c9a3272"; libraryHaskellDepends = [ base mtl stm transformers ]; - jailbreak = true; homepage = "http://www.eecs.harvard.edu/~mainland/"; description = "A type class for monads with references compatible with the mtl2 library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ref-tf" = callPackage @@ -142301,10 +137573,10 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-th unordered-containers ]; - jailbreak = true; homepage = "https://github.com/RobotGymnast/refcount"; description = "Container with element counts"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reference" = callPackage @@ -142354,7 +137626,6 @@ self: { executableHaskellDepends = [ base clippard cmdargs directory filepath haskheap network ]; - jailbreak = true; homepage = "https://github.com/Raynes/refh"; description = "A command-line tool for pasting to https://www.refheap.com"; license = stdenv.lib.licenses.mit; @@ -142395,7 +137666,6 @@ self: { libraryHaskellDepends = [ aeson base constraints lens reflection tagged ]; - jailbreak = true; homepage = "http://github.com/jfischoff/reflection-extras"; description = "Utilities for the reflection package"; license = stdenv.lib.licenses.bsd3; @@ -142424,8 +137694,8 @@ self: { pname = "reflex"; version = "0.4.0"; sha256 = "d60c2d425c57cf2239e1088628099f44b834e3f2c661ddb6133cc397b5476b9c"; - revision = "1"; - editedCabalFile = "5d0a189f2906a9172bee253fa9763c490f92f7ab4b71461401260321bb103b56"; + revision = "2"; + editedCabalFile = "e88ff0200373c04d57ff4b3232ada2a6965f61a23d99a8ef6bcbf96603c9d992"; libraryHaskellDepends = [ base containers dependent-map dependent-sum exception-transformers haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups @@ -142434,10 +137704,10 @@ self: { testHaskellDepends = [ base containers dependent-map MemoTrie mtl ref-tf ]; - jailbreak = true; - homepage = "https://github.com/ryantrinkle/reflex"; + homepage = "https://github.com/reflex-frp/reflex"; description = "Higher-order Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflex-animation" = callPackage @@ -142452,10 +137722,10 @@ self: { base bifunctors containers profunctors reflex reflex-transformers semigroups vector-space ]; - jailbreak = true; homepage = "https://github.com/saulzar/reflex-animation"; description = "Continuous animations support for reflex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflex-dom" = callPackage @@ -142470,8 +137740,8 @@ self: { pname = "reflex-dom"; version = "0.3"; sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a"; - revision = "1"; - editedCabalFile = "908cf399bc1af34e18674cad421c0046b667ee8172254fce6e59dae83ce96a6a"; + revision = "2"; + editedCabalFile = "b569e2b08dac72a37173f680be5eaeb9ad57900c08301bf7b958f1cf52ac6055"; libraryHaskellDepends = [ aeson base bifunctors bytestring containers data-default dependent-map dependent-sum dependent-sum-template directory @@ -142479,7 +137749,6 @@ self: { ref-tf reflex safe semigroups text these time transformers unix webkitgtk3 webkitgtk3-javascriptcore ]; - jailbreak = true; description = "Functional Reactive Web Apps with Reflex"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -142517,7 +137786,6 @@ self: { http-types lens mtl random readable reflex reflex-dom safe string-conv text time transformers ]; - jailbreak = true; homepage = "https://github.com/reflex-frp/reflex-dom-contrib"; description = "A playground for experimenting with infrastructure and common code for reflex applications"; license = stdenv.lib.licenses.bsd3; @@ -142551,10 +137819,10 @@ self: { libraryHaskellDepends = [ base dependent-sum gloss mtl reflex transformers ]; - jailbreak = true; homepage = "https://github.com/reflex-frp/reflex-gloss"; description = "An reflex interface for gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflex-gloss-scene" = callPackage @@ -142580,10 +137848,10 @@ self: { base containers gloss lens linear mtl reflex reflex-animation reflex-transformers transformers ]; - jailbreak = true; homepage = "https://github.com/saulzar/reflex-gloss-scene"; description = "A simple scene-graph using reflex and gloss"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reflex-jsx" = callPackage @@ -142632,10 +137900,10 @@ self: { libraryHaskellDepends = [ base containers lens mtl reflex semigroups stateWriter transformers ]; - jailbreak = true; homepage = "http://github.com/saulzar/reflex-transformers"; description = "Collections and switchable Monad transformers for Reflex"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "reform" = callPackage @@ -142700,8 +137968,8 @@ self: { ({ mkDerivation, base, hsp, hsx2hs, reform, text }: mkDerivation { pname = "reform-hsp"; - version = "0.2.7"; - sha256 = "20ce1d81a4b2db93da55223037e0c2ee7841d5844fab9c67e4158bd9a70ee574"; + version = "0.2.7.1"; + sha256 = "48edd2a1322bacfb2d8574222c194cfa4ffdce135f4dff851d9d5e6fe3008d20"; libraryHaskellDepends = [ base hsp hsx2hs reform text ]; homepage = "http://www.happstack.com/"; description = "Add support for using HSP with Reform"; @@ -142839,6 +138107,7 @@ self: { homepage = "https://github.com/audreyt/regex-genex"; description = "From a regex, generate all possible strings it can match"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-parsec" = callPackage @@ -142961,10 +138230,10 @@ self: { libraryHaskellDepends = [ array base lens monads-tf pipes regex-base regex-tdfa ]; - jailbreak = true; homepage = "http://github.com/erisco/regex-tdfa-pipes"; description = "Parse with regular expressions on Producers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-tdfa-quasiquoter" = callPackage @@ -142974,10 +138243,10 @@ self: { version = "0.2.0.0"; sha256 = "8ae16a6297b7357ef3d9f8d2e09d006e74f67b889ec7d86296eb0ac6fb2c8361"; libraryHaskellDepends = [ base regex-tdfa template-haskell ]; - jailbreak = true; homepage = "http://github.com/erisco/regex-tdfa-quasiquoter"; description = "Quasi-quoter for TDFA (extended POSIX) regular expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-tdfa-rc" = callPackage @@ -143037,7 +138306,6 @@ self: { libraryHaskellDepends = [ array base bytestring regex-base regex-tdfa utf8-string ]; - jailbreak = true; description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -143064,10 +138332,10 @@ self: { version = "0.1.0.0"; sha256 = "fb19df907226e8b8c04110bb983c40028ebf9cecd33a46cf333e5de785a6fc0a"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/kcsongor/regex-type"; description = "Type-level regular expressions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-xmlschema" = callPackage @@ -143077,7 +138345,6 @@ self: { version = "0.1.5"; sha256 = "446be097c8d07d9e819d1fe39b1ccc2a3dd43705f66c516d9b00496dbeddb0b6"; libraryHaskellDepends = [ base haskell98 parsec ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema"; description = "A regular expression library for W3C XML Schema regular expressions"; license = stdenv.lib.licenses.bsd3; @@ -143085,20 +138352,23 @@ self: { }) {}; "regexchar" = callPackage - ({ mkDerivation, array, base, Cabal, containers, parallel, parsec - , QuickCheck, regex-base, regex-posix, regexdot, toolshed + ({ mkDerivation, array, base, Cabal, containers, data-default + , parallel, parsec, QuickCheck, regex-base, regex-posix, regexdot + , toolshed }: mkDerivation { pname = "regexchar"; - version = "0.9.0.13"; - sha256 = "6ad4cfa40156d9a26b8a3c023feb757ad3be217a9f64c1ab40a984118959b79b"; + version = "0.9.0.14"; + sha256 = "7de1d64126bc9205b569c8cda5b06b0bbebc1bed6a47c4bf8a84c24fc8255242"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base containers parsec regex-base regexdot toolshed + array base containers data-default parsec regex-base regexdot + toolshed ]; executableHaskellDepends = [ - base Cabal parallel regex-base regex-posix regexdot toolshed + base Cabal data-default parallel regex-base regex-posix regexdot + toolshed ]; testHaskellDepends = [ base QuickCheck regexdot toolshed ]; homepage = "http://functionalley.eu/RegExChar/regExChar.html"; @@ -143108,12 +138378,16 @@ self: { }) {}; "regexdot" = callPackage - ({ mkDerivation, base, deepseq, parallel, parsec, toolshed }: + ({ mkDerivation, base, data-default, deepseq, parallel, parsec + , toolshed + }: mkDerivation { pname = "regexdot"; - version = "0.11.1.2"; - sha256 = "c8f0ce31ae36d1f181a9c5a863967397b6431ec2436442869670468b039ebf9c"; - libraryHaskellDepends = [ base deepseq parallel parsec toolshed ]; + version = "0.12.0.1"; + sha256 = "b96d630861eb7028b560a43e4b5e89f8ae9e65cd6c193a7762d5d3b95ea66064"; + libraryHaskellDepends = [ + base data-default deepseq parallel parsec toolshed + ]; homepage = "http://functionalley.eu/RegExDot/regExDot.html"; description = "A polymorphic, POSIX, extended regex-engine"; license = "GPL"; @@ -143131,7 +138405,6 @@ self: { libraryHaskellDepends = [ base containers derive-trie template-haskell weighted-regexp ]; - jailbreak = true; homepage = "http://github.com/baldo/regexp-tries"; description = "Regular Expressions on Tries"; license = stdenv.lib.licenses.bsd3; @@ -143157,10 +138430,10 @@ self: { version = "0.5"; sha256 = "b9693a9b9370f2cc9640cff6cfbb279b2c768bc8ccd4138ce758b15acbdafcb2"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://sulzmann.blogspot.com/2008/12/equality-containment-and-intersection.html"; description = "Regular expressions via symbolic manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regexqq" = callPackage @@ -143188,7 +138461,6 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols regions transformers ]; - jailbreak = true; homepage = "https://github.com/basvandijk/regional-pointers/"; description = "Regional memory pointers"; license = stdenv.lib.licenses.bsd3; @@ -143206,7 +138478,6 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols monad-control transformers ]; - jailbreak = true; homepage = "https://github.com/basvandijk/regions/"; description = "Provides the region monad for safely opening and working with scarce resources"; license = stdenv.lib.licenses.bsd3; @@ -143224,7 +138495,6 @@ self: { libraryHaskellDepends = [ base-unicode-symbols monads-fd regions transformers ]; - jailbreak = true; description = "Monads-fd instances for the RegionT monad transformer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -143241,7 +138511,6 @@ self: { libraryHaskellDepends = [ base-unicode-symbols monads-tf regions transformers ]; - jailbreak = true; homepage = "https://github.com/basvandijk/regions-monadstf/"; description = "Monads-tf instances for the RegionT monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -143255,7 +138524,6 @@ self: { version = "0.3.1.7"; sha256 = "80b918c8770d470abd91b6ed5073ee28af248155ec1769737dbcce3005c91ae8"; libraryHaskellDepends = [ base-unicode-symbols mtl regions ]; - jailbreak = true; homepage = "https://github.com/basvandijk/regions-mtl/"; description = "mtl instances for the RegionT monad transformer"; license = stdenv.lib.licenses.bsd3; @@ -143269,10 +138537,10 @@ self: { version = "0.1.0.0"; sha256 = "5232f3539da39675ac7bf0de7848748ee9503558cf7afe017449573db1be5b7f"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/kcsongor/register-machine-type"; description = "A computationally universal register machine implementation at the type-level"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regress" = callPackage @@ -143282,10 +138550,10 @@ self: { version = "0.1.1"; sha256 = "d2def3d9276b75dbf685780af1af5e373b1bd2df937eb0bcba15f8c21fb16401"; libraryHaskellDepends = [ ad base vector ]; - jailbreak = true; homepage = "https://github.com/alpmestan/regress"; description = "Linear and logistic regression through automatic differentiation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regular" = callPackage @@ -143307,7 +138575,6 @@ self: { version = "0.2.3"; sha256 = "7d1352e17c067a996e8cd4fa39bfdb5b63eabb5c5686ee8cdb973306f45d3a74"; libraryHaskellDepends = [ base binary deepseq QuickCheck regular ]; - jailbreak = true; description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -143324,7 +138591,6 @@ self: { libraryHaskellDepends = [ applicative-extras base fclabels formlets json mtl regular xhtml ]; - jailbreak = true; homepage = "http://github.com/chriseidhof/regular-web"; description = "Generic programming for the web"; license = stdenv.lib.licenses.bsd3; @@ -143391,7 +138657,6 @@ self: { executableHaskellDepends = [ attoparsec base bytestring containers directory regex-tdfa split ]; - jailbreak = true; homepage = "https://github.com/kerkomen/rei"; description = "Process lists easily"; license = stdenv.lib.licenses.mit; @@ -143405,7 +138670,6 @@ self: { version = "0.2.2"; sha256 = "0a1cdceeeb41a4954f06a024bfccbc950c4ffaf153d38cf85670f8e85b2ce06d"; libraryHaskellDepends = [ base containers mtl ]; - jailbreak = true; homepage = "http://bitbucket.org/jozefg/reified-records"; description = "Reify records to Maps and back again"; license = stdenv.lib.licenses.mit; @@ -143422,7 +138686,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ghc ]; executableHaskellDepends = [ base ghc ]; - jailbreak = true; homepage = "http://www.cs.mu.oz.au/~bjpop/code.html"; description = "Serialize data"; license = "GPL"; @@ -143462,10 +138725,10 @@ self: { version = "0.2.1"; sha256 = "8cf483f92d7cbd3ade0e3bf3cbd6265bc4d17d10e1bdd6d2e3abdf3b36a2060e"; libraryHaskellDepends = [ array base containers groom ]; - jailbreak = true; homepage = "https://www.github.com/d-day/relation/"; description = "A data structure representing Relations on Sets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relational-postgresql8" = callPackage @@ -143486,30 +138749,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-query_0_8_3_0" = 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.0"; - sha256 = "8935e9b1f9dfbc7f7c34737db669ebfcbe352beac00ddc45a8b67420f93001ee"; - 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" = callPackage ({ mkDerivation, array, base, bytestring, containers, dlist , names-th, persistable-record, quickcheck-simple, sql-words @@ -143553,24 +138792,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "relational-record_0_1_5_0" = callPackage - ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query - , relational-query-HDBC - }: - mkDerivation { - pname = "relational-record"; - version = "0.1.5.0"; - sha256 = "dab27172c9307773eaf27c49c969670828998aa469279572e1873aeadaff7a6e"; - libraryHaskellDepends = [ - base persistable-types-HDBC-pg relational-query - relational-query-HDBC - ]; - homepage = "http://khibino.github.io/haskell-relational-record/"; - description = "Meta package of Relational Record"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "relational-record" = callPackage ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query , relational-query-HDBC @@ -143633,9 +138854,9 @@ self: { libraryHaskellDepends = [ base concatenative datetime mtl parsec time ]; - jailbreak = true; description = "Durations and generalized time parsing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "relit" = callPackage @@ -143693,7 +138914,6 @@ self: { sha256 = "f996de29c0e7a47484a16113129166f7df12567d3ca3ea24c5c97e98a8225c51"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec HUnit ]; - doCheck = false; description = "A simple api for matchers"; license = stdenv.lib.licenses.mit; }) {}; @@ -143765,7 +138985,6 @@ self: { QuickCheck quickcheck-instances random scientific tasty tasty-quickcheck text ]; - jailbreak = true; description = "Remote Monad implementation of the JSON RPC protocol"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -143802,7 +139021,6 @@ self: { aeson base data-default-class natural-transformation remote-json scotty text transformers warp ]; - jailbreak = true; description = "Web server wrapper for remote-json"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -143858,7 +139076,6 @@ self: { placeholders QuickCheck quickcheck-instances stm system-fileio system-filepath text time transformers-base ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/remotion"; description = "A library for client-server applications based on custom protocols"; license = stdenv.lib.licenses.mit; @@ -143899,7 +139116,6 @@ self: { libraryHaskellDepends = [ base constraints haskell-src-exts haskell-src-meta template-haskell ]; - jailbreak = true; description = "Define compound types that do not depend on member order"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -143946,7 +139162,6 @@ self: { base bytestring double-conversion filelock mtl primitive repa-convert repa-eval repa-scalar repa-stream text vector ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Bulk array representations and operators"; license = stdenv.lib.licenses.bsd3; @@ -143961,10 +139176,10 @@ self: { sha256 = "eb017a9fa85900e6a6f254e5e7ef9e31585791458344ffb2554be19846ddf3e0"; libraryHaskellDepends = [ base repa ]; doHaddock = false; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "(deprecated)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-convert" = callPackage @@ -143978,10 +139193,10 @@ self: { libraryHaskellDepends = [ base bytestring double-conversion primitive repa-scalar text vector ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Packing and unpacking flat tables"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-devil" = callPackage @@ -143992,7 +139207,6 @@ self: { sha256 = "fec3ce06f7370378427c629587dc30ee0f37e8c777c94c8970cb514c1e57fd38"; libraryHaskellDepends = [ base repa transformers ]; librarySystemDepends = [ libdevil ]; - jailbreak = true; homepage = "https://github.com/RaphaelJ/repa-devil"; description = "Support for image reading and writing of Repa arrays using in-place FFI calls"; license = stdenv.lib.licenses.bsd3; @@ -144061,7 +139275,6 @@ self: { repa-array repa-convert repa-eval repa-scalar repa-stream text vector ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Data-parallel data flows"; license = stdenv.lib.licenses.bsd3; @@ -144091,10 +139304,10 @@ self: { version = "0.3.0.1"; sha256 = "560e1b429ab07e712d28954c6443a6fd8d07d922ccd3041ac28fb996c2f499a2"; libraryHaskellDepends = [ base hmatrix repa vector ]; - jailbreak = true; homepage = "https://github.com/marcinmrotek/repa-linear-algebra"; description = "HMatrix operations for Repa"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-plugin" = callPackage @@ -144109,7 +139322,6 @@ self: { base containers ddc-base ddc-core ddc-core-flow ddc-core-simpl ghc mtl ]; - jailbreak = true; description = "Data Flow Fusion GHC Plugin"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -144126,10 +139338,10 @@ self: { libraryHaskellDepends = [ base bytestring double-conversion primitive time vector ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Scalar data types and conversions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "repa-series" = callPackage @@ -144139,7 +139351,6 @@ self: { version = "1.0.0.1"; sha256 = "b35cda295c1aeea79a0472a4c64a24bc02f81c5bdca3c371a41b6c461af98dce"; libraryHaskellDepends = [ base ghc ghc-prim vector ]; - jailbreak = true; description = "Series Expressionss API"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -144169,7 +139380,6 @@ self: { version = "4.2.3.1"; sha256 = "894e9247bdaee2be3d98fd077b766c38fd58718109989faf6a815f54abb3ba75"; libraryHaskellDepends = [ base mtl primitive repa-scalar vector ]; - jailbreak = true; homepage = "http://repa.ouroborus.net"; description = "Stream functions not present in the vector library"; license = stdenv.lib.licenses.bsd3; @@ -144206,7 +139416,6 @@ self: { libraryHaskellDepends = [ base ghc ghc-paths haskell-src-exts parsec ]; - jailbreak = true; homepage = "https://github.com/mikeplus64/repl"; description = "IRC friendly REPL library"; license = stdenv.lib.licenses.mit; @@ -144314,7 +139523,6 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols dstring random string-combinators ]; - jailbreak = true; homepage = "https://github.com/basvandijk/repr"; description = "Render overloaded expressions to their textual representation"; license = stdenv.lib.licenses.bsd3; @@ -144325,10 +139533,9 @@ self: { ({ mkDerivation, base, containers, syb, text }: mkDerivation { pname = "repr-tree-syb"; - version = "0.1.0"; - sha256 = "ba680aaa125fe2383f4cc896078e135f767cafb5df9dee80857f6c57d776fdce"; + version = "0.1.1"; + sha256 = "12de6e621f8e3452eceb82194e4f19b95de306c38c1651bafe9d4bf88a59eefa"; libraryHaskellDepends = [ base containers syb text ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/repr-tree-syb"; description = "Tree representation and pretty-printing of data structures based on SYB"; license = stdenv.lib.licenses.mit; @@ -144348,7 +139555,6 @@ self: { contravariant distributive free keys mtl semigroupoids semigroups transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/representable-functors/"; description = "Representable functors"; license = stdenv.lib.licenses.bsd3; @@ -144382,7 +139588,6 @@ self: { distributive keys mtl representable-functors semigroupoids semigroups transformers ]; - jailbreak = true; homepage = "http://github.com/ekmett/representable-tries/"; description = "Tries from representations of polynomial functors"; license = stdenv.lib.licenses.bsd3; @@ -144401,10 +139606,10 @@ self: { testHaskellDepends = [ base http-client http-types HUnit lens tasty tasty-hunit wai wreq ]; - jailbreak = true; homepage = "http://github.com/hiratara/hs-reqcatcher"; description = "A local http server to catch the HTTP redirect"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "request-monad" = callPackage @@ -144414,31 +139619,9 @@ self: { version = "0.3.0.1"; sha256 = "9a27d1628f96ba9d0fcdd0bff3cfc9ae0c7abcee7b59d2ce0ca1fda152d50cab"; libraryHaskellDepends = [ base free mtl transformers ]; - jailbreak = true; homepage = "http://github.com/nahiluhmot/request-monad"; description = "A transformer for generic requests"; license = stdenv.lib.licenses.mit; - }) {}; - - "reroute_0_3_1_0" = callPackage - ({ mkDerivation, base, deepseq, graph-core, hashable, hspec, hvect - , mtl, path-pieces, regex-compat, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "reroute"; - version = "0.3.1.0"; - sha256 = "5e31044f054305e119f80aa2625ecd4b7453e383d67dc44b8fdd9d64fa476fe9"; - libraryHaskellDepends = [ - base deepseq graph-core hashable hvect mtl path-pieces regex-compat - text transformers unordered-containers vector - ]; - testHaskellDepends = [ - base hspec hvect mtl text unordered-containers vector - ]; - homepage = "http://github.com/agrafix/reroute"; - description = "abstract implementation of typed and untyped web routing"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -144496,7 +139679,6 @@ self: { executableHaskellDepends = [ base hmatrix transformers utility-ht ]; - jailbreak = true; homepage = "http://hub.darcs.net/thielema/resistor-cube"; description = "Compute total resistance of a cube of resistors"; license = stdenv.lib.licenses.bsd3; @@ -144536,10 +139718,10 @@ self: { base containers extensible-effects HUnit mtl QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/wowus/resource-effect/"; description = "A port of the package 'resourcet' for extensible effects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resource-embed" = callPackage @@ -144589,6 +139771,7 @@ self: { homepage = "http://github.com/norm2782/pool"; description = "Fork of resource-pool, with a MonadCatchIO constraint"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "resource-pool-monad" = callPackage @@ -144619,32 +139802,11 @@ self: { base containers monad-control monad-fork mtl-evil-instances transformers transformers-base ]; - jailbreak = true; description = "Allocate resources which are guaranteed to be released"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "resourcet_1_1_7_4" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, lifted-base - , mmorph, monad-control, mtl, transformers, transformers-base - , transformers-compat - }: - mkDerivation { - pname = "resourcet"; - version = "1.1.7.4"; - sha256 = "a757d3a4d17373dc48a7072c2d98574934a53eb0ac98a32642952beb751e8f85"; - libraryHaskellDepends = [ - base containers exceptions lifted-base mmorph monad-control mtl - transformers transformers-base transformers-compat - ]; - testHaskellDepends = [ base hspec lifted-base transformers ]; - homepage = "http://github.com/snoyberg/conduit"; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "resourcet" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, lifted-base , mmorph, monad-control, mtl, transformers, transformers-base @@ -144688,7 +139850,6 @@ self: { executableHaskellDepends = [ aeson base fast-logger http-types text wai ]; - jailbreak = true; homepage = "https://github.com/raptros/respond"; description = "process and route HTTP requests and generate responses on top of WAI"; license = stdenv.lib.licenses.bsd3; @@ -144728,8 +139889,8 @@ self: { pname = "rest-core"; version = "0.39"; sha256 = "d760d0547fc1a99cd949dde08b7945fb93af24f4e55d45ecf410c352d5005404"; - revision = "1"; - editedCabalFile = "49f387b0ae7279cc04bbb7975b729df487a3670e1dab896239359f5073f5f158"; + revision = "2"; + editedCabalFile = "62fec3ffbc0dfaf26d82ad0689dfe74384f2e565ec0c2bff897cd4c71be74583"; libraryHaskellDepends = [ aeson aeson-utils base base-compat bytestring case-insensitive errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat @@ -144763,7 +139924,6 @@ self: { transformers transformers-compat unordered-containers ]; executableHaskellDepends = [ base base-compat rest-gen ]; - jailbreak = true; homepage = "http://www.github.com/silkapp/rest"; description = "Example project for rest"; license = stdenv.lib.licenses.bsd3; @@ -144810,6 +139970,8 @@ self: { pname = "rest-gen"; version = "0.20.0.0"; sha256 = "81a9486136f91773371858f9d3e248b80458e7d55aab11f17cc158c3ce68d542"; + revision = "1"; + editedCabalFile = "32caced8ad0a5273fc9c13ae65f75a37b790ad430d3923febf567616f5eb8e95"; libraryHaskellDepends = [ aeson base base-compat blaze-html Cabal code-builder directory fclabels filepath hashable haskell-src-exts HStringTemplate hxt @@ -144820,7 +139982,6 @@ self: { base fclabels haskell-src-exts HUnit rest-core test-framework test-framework-hunit ]; - jailbreak = true; description = "Documentation and client generation from rest definition"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -144931,7 +140092,6 @@ self: { digestive-functors errors heist lens mtl old-locale readable snap snap-core snap-extras template-haskell text time xmlhtml ]; - jailbreak = true; homepage = "https://github.com/ozataman/restful-snap"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -144951,7 +140111,6 @@ self: { monad-control mtl network selinux stm text transformers transformers-base unix ]; - jailbreak = true; homepage = "https://github.com/co-dan/interactive-diagrams/wiki/Restricted-Workers"; description = "Running worker processes under system resource restrictions"; license = stdenv.lib.licenses.bsd3; @@ -144968,23 +140127,18 @@ self: { isExecutable = true; libraryHaskellDepends = [ base ]; executableHaskellDepends = [ base directory filepath utf8-string ]; - jailbreak = true; description = "Convert between camel case and separated words style"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "result" = callPackage - ({ mkDerivation, base, bifunctors, keys, mtl, semigroups - , transformers - }: + ({ mkDerivation, base, bifunctors, keys, mtl, transformers }: mkDerivation { pname = "result"; - version = "0.2.4.0"; - sha256 = "043012086322e95b7b8a1f44e1603363b017a3348aa03115237b50e2baf2dec2"; - libraryHaskellDepends = [ - base bifunctors keys mtl semigroups transformers - ]; + version = "0.2.6.0"; + sha256 = "f526d97cdab851f24e215e346f6d54d3a504a6ac5d9264f580c4f72d606178c5"; + libraryHaskellDepends = [ base bifunctors keys mtl transformers ]; testHaskellDepends = [ base ]; homepage = "https://github.com/srijs/haskell-result"; description = "Encode success or at least one error"; @@ -144998,7 +140152,6 @@ self: { version = "0.0.0.20100920"; sha256 = "fa8d9776668e5356055ec8327efff7197243c211960cd24fd1b32fd690939f1a"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; description = "A monad transformer for resumable exceptions"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -145011,49 +140164,19 @@ self: { }: mkDerivation { pname = "rethinkdb"; - version = "2.2.0.6"; - sha256 = "5afb37a760a893be64812955f1d5e4a6a45a139806bd1da9e4117af29b4c0e5e"; + version = "2.2.0.7"; + sha256 = "ed74dd74333e5cd5fd99dfd84af8c6331fca04d1d04e241b533e2c2936078873"; libraryHaskellDepends = [ aeson base base64-bytestring binary bytestring containers data-default mtl network scientific text time unordered-containers utf8-string vector ]; testHaskellDepends = [ base doctest ]; - doCheck = false; homepage = "http://github.com/atnnn/haskell-rethinkdb"; description = "A driver for RethinkDB 2.2"; license = stdenv.lib.licenses.asl20; }) {}; - "rethinkdb-client-driver_0_0_22" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , hashable, hspec, hspec-smallcheck, mtl, network, old-locale - , scientific, smallcheck, stm, template-haskell, text, time - , unordered-containers, vector - }: - mkDerivation { - pname = "rethinkdb-client-driver"; - version = "0.0.22"; - sha256 = "4a192e989e1f1b60398123ad2c74701203b66a33a220f1b5c47ad495e98575bb"; - revision = "1"; - editedCabalFile = "cd3c49b103352e43c82641e8d61f7ea048e3b5e2308274024d421739b1180a46"; - libraryHaskellDepends = [ - aeson base binary bytestring containers hashable mtl network - old-locale scientific stm template-haskell text time - unordered-containers vector - ]; - testHaskellDepends = [ - base hspec hspec-smallcheck smallcheck text time - unordered-containers vector - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; - description = "Client driver for RethinkDB"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "rethinkdb-client-driver" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , hashable, hspec, hspec-smallcheck, mtl, network, old-locale @@ -145075,10 +140198,10 @@ self: { base hspec hspec-smallcheck smallcheck text time unordered-containers vector ]; - doCheck = false; homepage = "https://github.com/wereHamster/rethinkdb-client-driver"; description = "Client driver for RethinkDB"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rethinkdb-model" = callPackage @@ -145092,7 +140215,6 @@ self: { libraryHaskellDepends = [ aeson base mtl rethinkdb text transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/seanhess/rethinkdb-model"; description = "Useful tools for modeling data with rethinkdb"; license = stdenv.lib.licenses.mit; @@ -145134,7 +140256,6 @@ self: { base data-default-class exceptions ghc-prim hspec HUnit mtl QuickCheck random stm time transformers ]; - doCheck = false; homepage = "http://github.com/Soostone/retry"; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; @@ -145149,10 +140270,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base optparse-applicative process ]; - jailbreak = true; homepage = "https://github.com/dgonyeo/retryer"; description = "Retry failed commands"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rev-state" = callPackage @@ -145230,9 +140351,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base process ]; - jailbreak = true; description = "Text-only reversi (aka othelo) game"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rewrite" = callPackage @@ -145246,7 +140367,6 @@ self: { executableHaskellDepends = [ base bytestring directory multiarg process ]; - jailbreak = true; homepage = "http://www.github.com/massysett/rewrite"; description = "open file and rewrite it with new contents"; license = stdenv.lib.licenses.bsd3; @@ -145295,7 +140415,6 @@ self: { executableHaskellDepends = [ base bytestring containers datetime HTTP json mtl nano-md5 xhtml ]; - jailbreak = true; description = "Github resume generator"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -145343,39 +140462,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "riak_1_0_1_1" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder - , bytestring, containers, data-default-class, deepseq - , enclosed-exceptions, exceptions, hashable, HUnit - , mersenne-random-pure64, monad-control, mtl, network - , protocol-buffers, pureMD5, QuickCheck, random, random-shuffle - , resource-pool, riak-protobuf, semigroups, tasty, tasty-hunit - , tasty-quickcheck, text, time, transformers, unordered-containers - , vector - }: - mkDerivation { - pname = "riak"; - version = "1.0.1.1"; - sha256 = "d35e67fdcb397eedd3cddeae13dcbfa397b3ce36e7e76bb0c49d5a74f8bfc13f"; - libraryHaskellDepends = [ - aeson attoparsec base binary blaze-builder bytestring containers - data-default-class deepseq enclosed-exceptions exceptions hashable - mersenne-random-pure64 monad-control network protocol-buffers - pureMD5 random random-shuffle resource-pool riak-protobuf - semigroups text time transformers unordered-containers vector - ]; - testHaskellDepends = [ - base bytestring containers data-default-class HUnit mtl QuickCheck - semigroups tasty tasty-hunit tasty-quickcheck text - ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/markhibberd/riak-haskell-client"; - description = "A Haskell client for the Riak decentralized data store"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "riak" = callPackage ({ mkDerivation, aeson, attoparsec, base, binary, blaze-builder , bytestring, containers, data-default-class, deepseq @@ -145388,8 +140474,8 @@ self: { }: mkDerivation { pname = "riak"; - version = "1.1.0.0"; - sha256 = "afb7bbee7a95c1b08ed226a1b9cbea3664439c05176d4f2811248ceec3f3e1ee"; + version = "1.1.1.0"; + sha256 = "e6ec85c65c76c30a9cf0dce266e2dc62fa7047dcb0628410085a44c417f3769f"; libraryHaskellDepends = [ aeson attoparsec base binary blaze-builder bytestring containers data-default-class deepseq enclosed-exceptions exceptions hashable @@ -145401,27 +140487,9 @@ self: { base bytestring containers data-default-class HUnit mtl QuickCheck riak-protobuf semigroups tasty tasty-hunit tasty-quickcheck text ]; - jailbreak = true; homepage = "http://github.com/markhibberd/riak-haskell-client"; description = "A Haskell client for the Riak decentralized data store"; license = "unknown"; - }) {}; - - "riak-protobuf_0_21_0_0" = callPackage - ({ mkDerivation, array, base, parsec, protocol-buffers - , protocol-buffers-descriptor - }: - mkDerivation { - pname = "riak-protobuf"; - version = "0.21.0.0"; - sha256 = "cfa49952f54a80ebb4fdc9cc35190b8226b01b0a21b50c9da309548fa367e39a"; - libraryHaskellDepends = [ - array base parsec protocol-buffers protocol-buffers-descriptor - ]; - jailbreak = true; - homepage = "http://github.com/markhibberd/riak-haskell-client"; - description = "Haskell types for the Riak protocol buffer API"; - license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -145496,10 +140564,10 @@ self: { base binary bytestring either transformers ]; executableHaskellDepends = [ base bytestring filepath ]; - jailbreak = true; homepage = "https://bitbucket.org/robertmassaioli/riff/overview"; description = "RIFF parser for Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ring-buffer" = callPackage @@ -145589,7 +140657,6 @@ self: { isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; executableToolDepends = [ alex happy ]; - jailbreak = true; homepage = "http://www2.tcs.ifi.lmu.de/~abel/"; description = "Reduced instruction set i386 simulator"; license = stdenv.lib.licenses.bsd3; @@ -145624,7 +140691,6 @@ self: { version = "0.1.0"; sha256 = "c4681bf08ce5cf90d82c332980fa0fa12a42eb64ad1834dd64d8f2ce2b01f974"; libraryHaskellDepends = [ base lazysmallcheck oeis QuickCheck ]; - jailbreak = true; homepage = "https://github.com/d-rive/rivers"; description = "Rivers are like Streams, but different"; license = stdenv.lib.licenses.bsd3; @@ -145692,10 +140758,10 @@ self: { version = "0.1.0.1"; sha256 = "6dd95a94855da826ff509814031dbe284aebb986e0002ea4c7b660a68bb6e6ed"; libraryHaskellDepends = [ base postgresql-simple text ]; - jailbreak = true; homepage = "https://github.com/dbp/rivet"; description = "Postgresql migration support for project management tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rivet-simple-deploy" = callPackage @@ -145711,6 +140777,33 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rl-satton" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , lens, mersenne-random-pure64, monad-loops, MonadRandom, mtl + , parsec, pretty-show, process, random, stm, template-haskell, text + , time, transformers, unordered-containers + }: + mkDerivation { + pname = "rl-satton"; + version = "0.1.2.4"; + sha256 = "24f73abc44bc75565de485e22f21397d35c93e7eb0b109b344c3c3f44f2b40f5"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filepath hashable lens + mersenne-random-pure64 monad-loops MonadRandom mtl parsec + pretty-show process random stm template-haskell text time + transformers unordered-containers + ]; + executableHaskellDepends = [ + base containers mtl unordered-containers + ]; + homepage = "https://github.com/grwlf/rl"; + description = "Collection of Reinforcement Learning algorithms"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rlglue" = callPackage ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 , exceptions, network, network-simple, parsec, random, transformers @@ -145729,9 +140822,9 @@ self: { base binary bytestring data-binary-ieee754 exceptions network network-simple random transformers ]; - jailbreak = true; description = "A Haskell codec for RL-Glue"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rlist" = callPackage @@ -145876,10 +140969,10 @@ self: { attoparsec base bytestring directory heredoc hspec QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/meanpath/robots"; description = "Parser for robots.txt"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rocksdb-haskell" = callPackage @@ -145934,7 +141027,6 @@ self: { MaybeT MonadRandom mtl old-time parallel priority-sync PSQueue random stm ]; - jailbreak = true; homepage = "http://roguestar.downstairspeople.org/"; description = "Sci-fi roguelike game. Backend."; license = "unknown"; @@ -145954,7 +141046,6 @@ self: { arrows base bytestring containers filepath GLUT MonadRandom mtl OpenGL priority-sync random rsagl rsagl-frp rsagl-math stm ]; - jailbreak = true; homepage = "http://roguestar.downstairspeople.org/"; description = "Sci-fi roguelike game. Client library."; license = "unknown"; @@ -145970,7 +141061,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT roguestar-gl rsagl ]; - jailbreak = true; homepage = "http://roguestar.downstairspeople.org/"; description = "Sci-fi roguelike game. GLUT front-end."; license = "unknown"; @@ -145992,6 +141082,7 @@ self: { homepage = "https://github.com/docmunch/rollbar-haskell"; description = "error tracking through rollbar.com"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "roller" = callPackage @@ -146010,10 +141101,10 @@ self: { executableHaskellDepends = [ base optparse-applicative random regex-applicative ]; - jailbreak = true; homepage = "https://github.com/PiotrJustyna/roller"; description = "Playing with applicatives and dice!"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rolling-queue" = callPackage @@ -146081,7 +141172,6 @@ self: { libraryHaskellDepends = [ base bytestring fingertree mtl utf8-string ]; - jailbreak = true; homepage = "http://github.com/ekmett/rope"; description = "Tools for manipulating fingertrees of bytestrings with optional annotations"; license = stdenv.lib.licenses.bsd3; @@ -146141,7 +141231,6 @@ self: { libraryHaskellDepends = [ base containers deepseq minilens mtl transformers ]; - jailbreak = true; 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."; license = stdenv.lib.licenses.gpl3; @@ -146193,6 +141282,63 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "rosmsg" = callPackage + ({ mkDerivation, attoparsec, base, binary, bytestring + , data-default-class, lens-family-core, pureMD5, template-haskell + , text + }: + mkDerivation { + pname = "rosmsg"; + version = "0.5.2.0"; + sha256 = "94654afe0f61e20658239c1f0af129dbd356c7af6e9b914c2b90f084804826a4"; + libraryHaskellDepends = [ + attoparsec base binary bytestring data-default-class + lens-family-core pureMD5 template-haskell text + ]; + homepage = "https://github.com/RoboticsHS/rosmsg#readme"; + description = "ROS message parser, render, TH"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rosmsg-bin" = callPackage + ({ mkDerivation, base, filepath, monad-logger, rosmsg, rospkg + , stack, temporary, text + }: + mkDerivation { + pname = "rosmsg-bin"; + version = "0.1.0.0"; + sha256 = "74552be16ec2c8b261b09e494fe08cc4b212c6514015b4e56b573c91f4a12524"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base filepath monad-logger rosmsg rospkg stack temporary text + ]; + homepage = "https://github.com/RoboticsHS/rosmsg-bin#readme"; + description = "ROS message management tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "rospkg" = callPackage + ({ mkDerivation, async, base, bytestring, directory, fast-tagsoup + , filepath, split, tagsoup, text + }: + mkDerivation { + pname = "rospkg"; + version = "0.2.3.0"; + sha256 = "237ffd07b77f4a832e1e0a553de19ba372ca0adee80bfca099564152f39d8d8a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring directory fast-tagsoup filepath split tagsoup + text + ]; + executableHaskellDepends = [ base text ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/RoboticsHS/rospkg#readme"; + description = "ROS package system information"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "rosso" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -146256,7 +141402,6 @@ self: { version = "0.3.0"; sha256 = "de280304050edbce3efedad36ceb6dbbc94738a6ec4a0d33e30f29cb64545bb4"; libraryHaskellDepends = [ array base numeric-extras ]; - jailbreak = true; homepage = "http://patch-tag.com/r/ekmett/rounding"; description = "Explicit floating point rounding mode wrappers"; license = stdenv.lib.licenses.bsd3; @@ -146295,7 +141440,6 @@ self: { testHaskellDepends = [ aeson base bytestring lens-aeson roundtrip text vector ]; - jailbreak = true; homepage = "https://github.com/anchor/roundtrip-aeson"; description = "Un-/parse JSON with roundtrip invertible syntax definitions"; license = stdenv.lib.licenses.bsd3; @@ -146414,7 +141558,6 @@ self: { base containers mtl network template-haskell transformers ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/mmirman/rpc-framework"; description = "a remote procedure call framework"; license = stdenv.lib.licenses.bsd3; @@ -146467,7 +141610,6 @@ self: { old-time OpenGL OpenGLRaw parallel parsec random rsagl-frp rsagl-math stm Vec Vec-OpenGLRaw ]; - jailbreak = true; homepage = "http://roguestar.downstairspeople.org/"; description = "The RogueStar Animation and Graphics Library"; license = stdenv.lib.licenses.bsd3; @@ -146485,7 +141627,6 @@ self: { libraryHaskellDepends = [ array arrows base containers mtl old-time random rsagl-math stm ]; - jailbreak = true; homepage = "http://roguestar.downstairspeople.org/"; description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming"; license = stdenv.lib.licenses.bsd3; @@ -146504,7 +141645,6 @@ self: { array base containers deepseq OpenGL OpenGLRaw parallel parsec random Vec Vec-OpenGLRaw ]; - jailbreak = true; homepage = "http://roguestar.downstairspeople.org/"; description = "The RogueStar Animation and Graphics Library: Mathematics"; license = stdenv.lib.licenses.bsd3; @@ -146518,10 +141658,10 @@ self: { version = "0.1.0.1"; sha256 = "3e6771df48c5949c27d020d325295dbc322e0a1427db7f70bccf2552d73d5a8c"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/AJChapman/rspp"; description = "A Rational Street Performer Protocol solver"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rss" = callPackage @@ -146535,7 +141675,6 @@ self: { libraryHaskellDepends = [ base HaXml network network-uri old-locale time ]; - jailbreak = true; homepage = "https://github.com/basvandijk/rss"; description = "A library for generating RSS 2.0 feeds."; license = stdenv.lib.licenses.publicDomain; @@ -146569,6 +141708,33 @@ self: { license = "unknown"; }) {}; + "rss-conduit_0_3_0_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 + }: + mkDerivation { + pname = "rss-conduit"; + version = "0.3.0.0"; + sha256 = "370a507c6df71af1bdce4c27381ebaa2c87664c5ae6e853e9f43c927e3345f5c"; + 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 + 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."; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rss2irc" = callPackage ({ mkDerivation, base, bytestring, cabal-file-th, cmdargs , containers, deepseq, feed, http-client, http-conduit, http-types @@ -146587,7 +141753,6 @@ self: { old-locale parsec regexpr resourcet safe split text time transformers utf8-string ]; - jailbreak = true; homepage = "http://hackage.haskell.org/package/rss2irc"; description = "watches an RSS/Atom feed and writes it to an IRC channel"; license = stdenv.lib.licenses.bsd3; @@ -146663,7 +141828,6 @@ self: { attoparsec base blaze-builder blaze-textual bytestring deepseq haxr mtl network split utf8-string ]; - jailbreak = true; homepage = "https://github.com/megantti/rtorrent-rpc"; description = "A library for communicating with RTorrent over its XML-RPC interface"; license = stdenv.lib.licenses.mit; @@ -146744,10 +141908,10 @@ self: { testHaskellDepends = [ base bytestring cereal containers hspec mtl string-conv vector ]; - jailbreak = true; homepage = "https://github.com/filib/ruby-marshal"; description = "Parse a subset of Ruby objects serialised with Marshal.dump."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ruby-qq" = callPackage @@ -146762,7 +141926,6 @@ self: { base bytestring haskell-src-exts haskell-src-meta pcre-light process template-haskell trifecta ]; - jailbreak = true; homepage = "https://github.com/joelteon/ruby-qq"; description = "rubyish quasiquoters"; license = stdenv.lib.licenses.mit; @@ -146926,10 +142089,10 @@ self: { base binary bytestring parsec QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "https://github.com/karknu/rws"; description = "Packet Generation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "s-cargot" = callPackage @@ -146981,10 +142144,10 @@ self: { version = "0.3.0.0"; sha256 = "1eddd50993f6ed86041dbc2f543263eb6261d5d34d3128beb416a44cb8d59215"; libraryHaskellDepends = [ base mtl transformers ]; - jailbreak = true; homepage = "http://darcs.redspline.com/safe-access"; description = "A simple environment to control access to data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-exceptions" = callPackage @@ -147034,7 +142197,6 @@ self: { version = "0.2.1"; sha256 = "636cc1fb3825830f986689a0cca43520f3454cb7de54b2920542d10ca67ab88a"; libraryHaskellDepends = [ base indexed mtl vector ]; - jailbreak = true; homepage = "https://github.com/reinerp/safe-freeze"; description = "Support for safely freezing multiple arrays in the ST monad"; license = stdenv.lib.licenses.bsd3; @@ -147080,10 +142242,10 @@ self: { testHaskellDepends = [ base hspec hspec-core QuickCheck should-not-typecheck ]; - jailbreak = true; homepage = "http://www.github.com/stepcut/safe-length"; description = "Tired of accidentally calling length on tuples? Relief at last!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safe-plugins" = callPackage @@ -147117,10 +142279,10 @@ self: { base doctest haskell-src-meta hspec QuickCheck template-haskell th-lift ]; - jailbreak = true; homepage = "https://github.com/konn/safe-printf"; description = "Well-typed, flexible and variadic printf for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safecopy" = callPackage @@ -147141,7 +142303,6 @@ self: { quickcheck-instances tasty tasty-quickcheck template-haskell time vector ]; - doCheck = false; homepage = "http://acid-state.seize.it/safecopy"; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; @@ -147189,7 +142350,6 @@ self: { base base-unicode-symbols explicit-iomodes pathtype regional-pointers regions transformers ]; - jailbreak = true; homepage = "https://github.com/basvandijk/safer-file-handles/"; description = "Type-safe file handling"; license = stdenv.lib.licenses.bsd3; @@ -147208,7 +142368,6 @@ self: { base bytestring explicit-iomodes-bytestring regions safer-file-handles transformers ]; - jailbreak = true; homepage = "https://github.com/basvandijk/safer-file-handles-bytestring/"; description = "Extends safer-file-handles with ByteString operations"; license = stdenv.lib.licenses.bsd3; @@ -147226,7 +142385,6 @@ self: { libraryHaskellDepends = [ explicit-iomodes-text regions safer-file-handles text transformers ]; - jailbreak = true; homepage = "https://github.com/basvandijk/safer-file-handles-text/"; description = "Extends safer-file-handles with Text operations"; license = stdenv.lib.licenses.bsd3; @@ -147240,9 +142398,9 @@ self: { version = "0.2.0.0"; sha256 = "d02c3b48cefb6cc5088d5dd06b0209617f00200c378c53077bf0a94b88afd303"; libraryHaskellDepends = [ base blaze-html containers text ]; - jailbreak = true; description = "A simple type-safe routing library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sai-shape-syb" = callPackage @@ -147256,7 +142414,6 @@ self: { testHaskellDepends = [ base containers ghc ghc-syb-utils HUnit syb ]; - jailbreak = true; homepage = "http://fremissant.net/shape-syb"; description = "Obtain homogeneous values from arbitrary values, transforming or culling data"; license = stdenv.lib.licenses.bsd3; @@ -147296,10 +142453,10 @@ self: { testHaskellDepends = [ base bytestring-arbitrary QuickCheck saltine tasty tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/tsuraan/saltine-quickcheck"; description = "Quickcheck implementations for some NaCl data"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libsodium;}; "salvia" = callPackage @@ -147318,7 +142475,6 @@ self: { salvia-protocol split stm text threadmanager time transformers unix utf8-string ]; - jailbreak = true; description = "Modular web application framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147341,7 +142497,6 @@ self: { transformers ]; doHaddock = false; - jailbreak = true; description = "Demo Salvia servers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147363,7 +142518,6 @@ self: { salvia-protocol sendfile split stm text threadmanager time transformers utf8-string ]; - jailbreak = true; description = "Collection of non-fundamental handlers for the Salvia web server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147381,7 +142535,6 @@ self: { base bimap bytestring containers fclabels parsec safe split utf8-string ]; - jailbreak = true; description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147400,7 +142553,6 @@ self: { base containers fclabels MaybeT-transformers monads-fd pureMD5 random safe salvia salvia-protocol stm time utf8-string ]; - jailbreak = true; description = "Session support for the Salvia webserver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147418,7 +142570,6 @@ self: { base bytestring fclabels monads-fd salvia salvia-protocol stm utf8-string ]; - jailbreak = true; description = "Websocket implementation for the Salvia Webserver"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -147493,10 +142644,10 @@ self: { executableHaskellDepends = [ base bytestring conduit filepath resourcet samtools transformers ]; - jailbreak = true; homepage = "http://www.ingolia-lab.org/samtools-tutorial.html"; description = "Conduit interface to SAM/BAM format files through samtools"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "samtools-enumerator" = callPackage @@ -147529,25 +142680,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sandi_0_3_6" = callPackage - ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit - , tasty, tasty-hunit, tasty-quickcheck, tasty-th - }: - mkDerivation { - pname = "sandi"; - version = "0.3.6"; - sha256 = "fafcb3501b8a17238de44239ef62c3051f9a33010424ef91dd76057257bf2284"; - libraryHaskellDepends = [ base bytestring conduit exceptions ]; - testHaskellDepends = [ - base bytestring HUnit tasty tasty-hunit tasty-quickcheck tasty-th - ]; - jailbreak = true; - homepage = "http://hackage.haskell.org/package/sandi"; - description = "Data encoding library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sandi" = callPackage ({ mkDerivation, base, bytestring, conduit, exceptions, HUnit , stringsearch, tasty, tasty-hunit, tasty-quickcheck, tasty-th @@ -147574,10 +142706,10 @@ self: { version = "0.0.2"; sha256 = "7d5e80bf57f477f3a9fff60a28b507e2e5a1ace3756169fbdec6dd4cd436901f"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/regularlambda/sandlib"; description = "SAND data serialization and manipulation library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sandman" = callPackage @@ -147606,10 +142738,10 @@ self: { version = "0.3.0.0"; sha256 = "68102bb2f1db289783a8e406b17aaa5e89854ab667fe7d60a21c365f852d0d75"; libraryHaskellDepends = [ base deepseq portaudio ]; - jailbreak = true; homepage = "https://github.com/tokiwoousaka/Sarasvati"; description = "audio library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sarsi" = callPackage @@ -147634,7 +142766,6 @@ self: { machines machines-binary machines-io machines-process msgpack network process text unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/aloiscochard/sarsi"; description = "A universal quickfix toolkit and his protocol"; license = stdenv.lib.licenses.asl20; @@ -147788,7 +142919,6 @@ self: { libraryHaskellDepends = [ array base containers satchmo toysolver ]; - jailbreak = true; homepage = "https://github.com/msakai/satchmo-toysat"; description = "toysat driver as backend for satchmo"; license = stdenv.lib.licenses.bsd3; @@ -147805,8 +142935,8 @@ self: { }: mkDerivation { pname = "sbp"; - version = "1.1.0"; - sha256 = "9eb577cf6529958cc551629f6ee0306e495b3a7e657de8a4e15ca7c344519060"; + version = "1.2.2"; + sha256 = "2629bbcc34c50544b451567c6b314837209e4199133154cab9c0f07803231e16"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -147849,34 +142979,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sbv_5_11" = callPackage - ({ mkDerivation, array, async, base, base-compat, containers - , crackNum, data-binary-ieee754, deepseq, directory, filepath - , HUnit, mtl, old-time, pretty, process, QuickCheck, random, syb - }: - mkDerivation { - pname = "sbv"; - version = "5.11"; - sha256 = "9ede93f41cdbdfb73638f25eec9c201190d049163ad503202ebefa2d18cfc90d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array async base base-compat containers crackNum - data-binary-ieee754 deepseq directory filepath mtl old-time pretty - process QuickCheck random syb - ]; - executableHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit process syb - ]; - testHaskellDepends = [ - base data-binary-ieee754 directory filepath HUnit syb - ]; - homepage = "http://leventerkok.github.com/sbv/"; - description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sbv" = callPackage ({ mkDerivation, array, async, base, base-compat, containers , crackNum, data-binary-ieee754, deepseq, directory, filepath, ghc @@ -147949,10 +143051,10 @@ self: { attoparsec attoparsec-enumerator base blaze-builder BoundedChan bytestring enumerator mtl network network-enumerator ]; - jailbreak = true; homepage = "https://github.com/jamwt/haskell-scalable-server/"; description = "Library for writing fast/scalable TCP-based services"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scaleimage" = callPackage @@ -148136,7 +143238,6 @@ self: { array base containers fgl GLUT haskell98 hmatrix mtl old-time OpenGL process ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/SceneGraph"; description = "Scene Graph"; license = stdenv.lib.licenses.bsd3; @@ -148171,7 +143272,6 @@ self: { executableHaskellDepends = [ base directory filepath old-locale time xturtle ]; - jailbreak = true; description = "Marge schedules and show EVR"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -148203,9 +143303,9 @@ self: { version = "1.0"; sha256 = "f75d3f6f125236e88ab43f0f08806a0d6d73b078eb25e249dfc018d51dedf053"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Exposes standard POSIX function sched_yield"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scholdoc" = callPackage @@ -148246,7 +143346,6 @@ self: { HUnit process QuickCheck scholdoc-types syb test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://scholdoc.scholarlymarkdown.com"; description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format"; license = "GPL"; @@ -148281,7 +143380,6 @@ self: { aeson base bytestring directory filepath process scholdoc scholdoc-types temporary text yaml ]; - jailbreak = true; homepage = "http://scholdoc.scholarlymarkdown.com"; description = "Scholdoc fork of pandoc-citeproc"; license = stdenv.lib.licenses.bsd3; @@ -148321,7 +143419,6 @@ self: { libraryHaskellDepends = [ aeson base bytestring containers deepseq-generics ghc-prim syb ]; - jailbreak = true; homepage = "http://scholdoc.scholarlymarkdown.com"; description = "Scholdoc fork of pandoc-types"; license = "GPL"; @@ -148359,9 +143456,9 @@ self: { version = "0.2.0.0"; sha256 = "7e274af9d0ea1dbbd2baef8f4b43f2cf206affa3de5fb1849e3389a4686ae362"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Mathematical/physical/chemical constants"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "science-constants-dimensional" = callPackage @@ -148373,7 +143470,6 @@ self: { libraryHaskellDepends = [ base dimensional numtype science-constants ]; - jailbreak = true; description = "Mathematical/physical/chemical constants"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -148422,7 +143518,6 @@ self: { ghc-syb hslogger json multiset network network-bytestring time utf8-string ]; - jailbreak = true; homepage = "http://github.com/nominolo/scion"; description = "Haskell IDE library"; license = stdenv.lib.licenses.bsd3; @@ -148459,7 +143554,6 @@ self: { resourcet tar text transformers unix unordered-containers utf8-string vector zlib ]; - jailbreak = true; homepage = "http://github.com/JPMoresmau/scion-class-browser"; description = "Command-line interface for browsing and searching packages documentation"; license = stdenv.lib.licenses.bsd3; @@ -148475,9 +143569,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring containers process ]; - jailbreak = true; description = "Generates graphviz file of scons dependency information"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scope" = callPackage @@ -148534,7 +143628,6 @@ self: { base data-default enclosed-exceptions http-types lens mtl persistent resource-pool scotty stm text transformers wai warp ]; - jailbreak = true; homepage = "https://github.com/echaozh/scottish"; description = "scotty with batteries included"; license = stdenv.lib.licenses.bsd3; @@ -148641,7 +143734,6 @@ self: { http-types HUnit scotty test-framework test-framework-hunit text transformers wai wai-test ]; - jailbreak = true; description = "Fay integration for Scotty"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -148688,12 +143780,11 @@ self: { }: mkDerivation { pname = "scotty-resource"; - version = "0.1.1.0"; - sha256 = "c45125749a42b90b2ccb2378c7a4f4c77078e0e479fd694abc6b6cf3d4c06b83"; + version = "0.2.0.0"; + sha256 = "249d100a8a39da8168c342ee9397072e8b57ca2f9fb64099641aa0a600fd2008"; libraryHaskellDepends = [ base containers http-types scotty text transformers wai ]; - jailbreak = true; homepage = "https://github.com/taphu/scotty-resource"; description = "A Better way of modeling web resources"; license = stdenv.lib.licenses.asl20; @@ -148718,10 +143809,10 @@ self: { base bytestring hspec hspec-wai mtl QuickCheck scotty string-conversions text wai ]; - jailbreak = true; homepage = "http://github.com/ehamberg/scotty-rest"; description = "Webmachine-style REST library for scotty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scotty-session" = callPackage @@ -148770,8 +143861,8 @@ self: { isExecutable = true; libraryHaskellDepends = [ base scotty text transformers ]; executableHaskellDepends = [ base scotty text transformers ]; - jailbreak = true; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scp-streams" = callPackage @@ -148791,10 +143882,10 @@ self: { base bytestring cmdargs io-streams SHA sha-streams unix ]; testHaskellDepends = [ base bytestring io-streams ]; - jailbreak = true; homepage = "https://github.com/noteed/scp-streams"; description = "An SCP protocol implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scrabble-bot" = callPackage @@ -148811,7 +143902,6 @@ self: { array base binary containers deepseq directory mtl packed-dawg parallel split ]; - jailbreak = true; description = "Scrabble play generation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -148827,8 +143917,8 @@ self: { }: mkDerivation { pname = "scrape-changes"; - version = "0.1.0.3"; - sha256 = "adc2e84e97cdc4c4cca7012be5be61683e55c4ba2bb539dd2dfe75cda1a3f4e7"; + version = "0.1.0.4"; + sha256 = "cdeba91d063c2e2368c15ad5c9767572e6101003d15bb7f1ae79b317c5792a72"; libraryHaskellDepends = [ async attoparsec base bytestring cron directory email-validate filepath hashable hslogger http-client lens mime-mail network-uri @@ -148949,7 +144039,6 @@ self: { pretty process safe tagsoup time uniplate utf8-string ]; executableToolDepends = [ alex ]; - jailbreak = true; description = "Automatic generation of Isabelle/HOL correctness proofs for security protocols"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -148992,24 +144081,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "sdl2_2_1_2_1" = callPackage - ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 - , StateVar, text, transformers, vector - }: - mkDerivation { - pname = "sdl2"; - version = "2.1.2.1"; - sha256 = "a30a40495313cc40efd88d72f89e17c18354090fa1764e8217b8ee4d9884d439"; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.2)."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) SDL2;}; - "sdl2" = callPackage ({ mkDerivation, base, bytestring, exceptions, linear, SDL2 , StateVar, text, transformers, vector @@ -149080,7 +144151,6 @@ self: { libraryHaskellDepends = [ base sdl2 ]; librarySystemDepends = [ SDL2 ]; libraryPkgconfigDepends = [ SDL2 SDL2_image ]; - jailbreak = true; description = "Haskell binding to sdl2-image"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -149123,8 +144193,8 @@ self: { }: mkDerivation { pname = "sdr"; - version = "0.1.0.8"; - sha256 = "bdad09c6df50719aa70760568914a6ccdeb7e183fc11e85888963a35db326f78"; + version = "0.1.0.9"; + sha256 = "0d7725059fd930cdf4e4a7a8a63763077b8cdc7dae8e1fa4116ec3d0ae5a4b55"; libraryHaskellDepends = [ array base bytestring cairo cereal Chart Chart-cairo colour containers Decimal dynamic-graph either fftwRaw GLFW-b mwc-random @@ -149140,6 +144210,7 @@ self: { description = "A software defined radio library"; license = stdenv.lib.licenses.bsd3; platforms = [ "x86_64-darwin" "x86_64-linux" ]; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "seacat" = callPackage @@ -149161,7 +144232,6 @@ self: { persistent-template text time transformers wai wai-extra wai-middleware-static warp web-routes web-routes-wai ]; - jailbreak = true; homepage = "https://github.com/Barrucadu/lambdadelta"; description = "Small web framework using Warp and WAI"; license = "unknown"; @@ -149191,7 +144261,6 @@ self: { base ghc-prim profunctors semigroupoids tagged transformers ]; testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; homepage = "http://github.com/ekmett/search/"; description = "Infinite search in finite time with Hilbert's epsilon"; license = stdenv.lib.licenses.bsd3; @@ -149205,7 +144274,6 @@ self: { version = "0.0.1"; sha256 = "5be0f2b650c3238e045116b767687d812136dcf4c677d80d30f90c15aa05d4e7"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; homepage = "http://github.com/urso/sec"; description = "Semantic Editor Combinators"; license = stdenv.lib.licenses.bsd3; @@ -149251,9 +144319,9 @@ self: { version = "1.1.0.2"; sha256 = "dc22bdb13cf11fa9594f324be5bccbdf5ab6f2699b2e0dec60460458476b6f49"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "A simple library for static information-flow security in Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "second-transfer" = callPackage @@ -149279,7 +144347,6 @@ self: { lens network network-uri stm text transformers unordered-containers ]; testToolDepends = [ cpphs ]; - jailbreak = true; homepage = "https://www.httptwo.com/second-transfer/"; description = "Second Transfer HTTP/2 web server"; license = stdenv.lib.licenses.bsd3; @@ -149324,7 +144391,6 @@ self: { executableHaskellDepends = [ base containers diagrams-cairo diagrams-lib haskell-qrencode random ]; - jailbreak = true; homepage = "https://github.com/rodrigosetti/secret-santa"; description = "Secret Santa game assigner using QR-Codes"; license = stdenv.lib.licenses.gpl3; @@ -149362,7 +144428,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base haskell98 ]; - jailbreak = true; description = "Example of writing \"secure\" file removal in Haskell rather than C"; license = stdenv.lib.licenses.publicDomain; hydraPlatforms = stdenv.lib.platforms.none; @@ -149382,6 +144447,7 @@ self: { homepage = "http://code.google.com/p/secure-hs/"; description = "Secure point-to-point connectivity library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "securemem" = callPackage @@ -149472,7 +144538,6 @@ self: { utf8-string ]; testHaskellDepends = [ base hspec text webdriver ]; - jailbreak = true; homepage = "https://github.com/joelteon/selenium-server.git"; description = "Run the selenium standalone server for usage with webdriver"; license = stdenv.lib.licenses.mit; @@ -149533,19 +144598,17 @@ self: { }) {}; "semibounded-lattices" = callPackage - ({ mkDerivation, base, containers, lattices, semibounded-lattice }: + ({ mkDerivation, base, containers, lattices }: mkDerivation { pname = "semibounded-lattices"; - version = "0.1.0.0"; - sha256 = "433329bceb9eb326cc4f1fdb6a78970cbd278b72d051382baab1a043dddfbce4"; + version = "0.1.0.1"; + sha256 = "6a5ee4b2e956ecf62492f4cdfb26000067f2d92d4d745ad47b9b60c800ac1d77"; libraryHaskellDepends = [ base containers lattices ]; - testHaskellDepends = [ base semibounded-lattice ]; - jailbreak = true; + testHaskellDepends = [ base ]; homepage = "https://github.com/xu-hao/semibounded-lattices#readme"; description = "A Haskell implementation of semibounded lattices"; license = stdenv.lib.licenses.bsd3; - broken = true; - }) {semibounded-lattice = null;}; + }) {}; "semigroupoid-extras" = callPackage ({ mkDerivation, base, profunctors, semigroupoids }: @@ -149559,30 +144622,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "semigroupoids_5_0_1" = callPackage - ({ mkDerivation, base, base-orphans, bifunctors, comonad - , containers, contravariant, directory, distributive, doctest - , filepath, semigroups, tagged, transformers, transformers-compat - }: - mkDerivation { - pname = "semigroupoids"; - version = "5.0.1"; - sha256 = "0ce989b8b0dc02ebe9aa19c47982a6bc802b8dc973c39c7ac40ea7a21cdbd616"; - revision = "1"; - editedCabalFile = "94d9167b701f148cb429e6746dd2bbb3b6559521b7fc2e98ce47339ad09af9f2"; - libraryHaskellDepends = [ - base base-orphans bifunctors comonad containers contravariant - distributive semigroups tagged transformers transformers-compat - ]; - testHaskellDepends = [ base directory doctest filepath ]; - jailbreak = true; - doCheck = false; - homepage = "http://github.com/ekmett/semigroupoids"; - description = "Semigroupoids: Category sans id"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "semigroupoids" = callPackage ({ mkDerivation, base, base-orphans, bifunctors, comonad , containers, contravariant, directory, distributive, doctest @@ -149618,28 +144657,12 @@ self: { testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/NICTA/semigroupoids-syntax"; description = "RebindableSyntax using the semigroupoids package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "semigroups_0_18_1" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "semigroups"; - version = "0.18.1"; - sha256 = "ae7607fb2b497a53192c378dc84c00b45610fdc5de0ac8c1ac3234ec7acee807"; - revision = "1"; - editedCabalFile = "7dd2b3dcc9517705391c1c6a0b51eba1da605b554f9817255c4a1a1df4d4ae3d"; - libraryHaskellDepends = [ base ]; - homepage = "http://github.com/ekmett/semigroups/"; - description = "Anything that associates"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "semigroups" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -149659,7 +144682,6 @@ self: { version = "0.1"; sha256 = "0bc3b74e14ef6f214f1aebee98ddadde9cca08753969112219fc6bc8da16da6e"; libraryHaskellDepends = [ base containers semigroups ]; - jailbreak = true; homepage = "http://github.com/ppetr/semigroups-actions/"; description = "Semigroups actions"; license = stdenv.lib.licenses.bsd3; @@ -149673,7 +144695,6 @@ self: { version = "0.3"; sha256 = "befab81cfef9ae6499f44fdd93a2bc892f118b335462bcf2010aba4254f1a6ac"; libraryHaskellDepends = [ base Boolean containers monoids ]; - jailbreak = true; homepage = "http://github.com/srush/SemiRings/tree/master"; description = "Semirings, ring-like structures used for dynamic programming applications"; license = stdenv.lib.licenses.bsd3; @@ -149723,6 +144744,7 @@ self: { ]; description = "An implementation of semver and semantic version ranges"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sendfile" = callPackage @@ -149778,7 +144800,6 @@ self: { fsnotify hspec hspec-wai http-client http-types interpolate mockery network process silently stm text time unix wai warp ]; - jailbreak = true; homepage = "https://github.com/hspec/sensei#readme"; description = "Automatically run Hspec tests on file modifications"; license = stdenv.lib.licenses.mit; @@ -149798,7 +144819,6 @@ self: { executableHaskellDepends = [ aeson base bytestring containers process stm zeromq3-haskell ]; - jailbreak = true; homepage = "https://github.com/rossdylan/sensenet"; description = "Distributed sensor network for the raspberry pi"; license = stdenv.lib.licenses.mit; @@ -149817,6 +144837,7 @@ self: { homepage = "https://github.com/aiya000/hs-sentence-jp#readme"; description = "Easily generating message of japanese natural language"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sentry" = callPackage @@ -149835,7 +144856,6 @@ self: { old-locale old-time process safecopy time unix ]; executableHaskellDepends = [ base directory filepath unix ]; - jailbreak = true; homepage = "https://github.com/noteed/sentry"; description = "Process monitoring tool written and configured in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -149855,19 +144875,20 @@ self: { "separated" = callPackage ({ mkDerivation, base, bifunctors, directory, doctest, filepath - , lens, QuickCheck, semigroupoids, semigroups, template-haskell + , lens, papa, parsec, QuickCheck, semigroupoids, semigroups + , template-haskell }: mkDerivation { pname = "separated"; - version = "0.1.0"; - sha256 = "028a783f2427dfe73d1ec9dcb92014a4b27d567997f03887ff7046400d4b6ba2"; + version = "0.1.2"; + sha256 = "955cd8d5a41804dd32918ffdd3175d16c9274a120f7beaa7eef871b8af590443"; libraryHaskellDepends = [ - base bifunctors lens semigroupoids semigroups + base bifunctors lens papa semigroupoids semigroups ]; testHaskellDepends = [ - base directory doctest filepath QuickCheck template-haskell + base directory doctest filepath parsec QuickCheck template-haskell ]; - homepage = "https://github.com/tonymorris/separated"; + homepage = "https://github.com/data61/separated"; description = "A data type with elements separated by values"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -149892,7 +144913,6 @@ self: { executableHaskellDepends = [ base Cabal cpphs directory process regex-base regex-pcre temporary ]; - jailbreak = true; homepage = "http://fremissant.net/seqaid"; description = "Dynamic strictness control, including space leak repair"; license = stdenv.lib.licenses.bsd3; @@ -149918,7 +144938,6 @@ self: { version = "0.1.0"; sha256 = "c0d3be7fe6ce3395db637e4567345aeb0c54782cf1e76c40c2116e9527d2bb60"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; description = "Sequence ID production and consumption"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -149943,7 +144962,6 @@ self: { version = "0.1.0"; sha256 = "a299e90a0124e585ccf66feb25206b61c9af8712d95ffb1b266b504fcd61e08d"; libraryHaskellDepends = [ base io-streams seqid ]; - jailbreak = true; description = "Sequence ID IO-Streams"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150074,7 +145092,6 @@ self: { array base binary bytestring containers mtl nlp-scores pretty split text vector ]; - jailbreak = true; homepage = "https://bitbucket.org/gchrupala/sequor"; description = "A sequence labeler based on Collins's sequence perceptron"; license = stdenv.lib.licenses.bsd3; @@ -150136,7 +145153,6 @@ self: { sha256 = "077c210212ff92611b3d8a3578f3ea1f78586c094057ccc5d1dcc3170fcf4dfc"; libraryHaskellDepends = [ base bytestring unix ]; testHaskellDepends = [ base bytestring HUnit ]; - doCheck = false; homepage = "https://github.com/jputcu/serialport"; description = "Cross platform serial port library"; license = stdenv.lib.licenses.bsd3; @@ -150204,32 +145220,6 @@ self: { }) {}; "servant" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , bytestring-conversion, case-insensitive, directory, doctest - , filemanip, filepath, hspec, http-api-data, http-media, http-types - , mmorph, mtl, network-uri, QuickCheck, quickcheck-instances - , string-conversions, text, url, vault - }: - mkDerivation { - pname = "servant"; - version = "0.7.1"; - sha256 = "e4e847df340f76172f719d7570cbf2cc59e4045aa994bb764f0ca5fd11c6126c"; - libraryHaskellDepends = [ - aeson attoparsec base base-compat bytestring bytestring-conversion - case-insensitive http-api-data http-media http-types mmorph mtl - network-uri string-conversions text vault - ]; - testHaskellDepends = [ - aeson attoparsec base bytestring directory doctest filemanip - filepath hspec QuickCheck quickcheck-instances string-conversions - text url - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , bytestring-conversion, case-insensitive, directory, doctest , filemanip, filepath, hspec, http-api-data, http-media, http-types @@ -150253,6 +145243,32 @@ self: { homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant_0_9_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring + , case-insensitive, directory, doctest, filemanip, filepath, hspec + , http-api-data, http-media, http-types, mmorph, mtl, network-uri + , QuickCheck, quickcheck-instances, string-conversions, text, url + , vault + }: + mkDerivation { + pname = "servant"; + version = "0.9.0.1"; + sha256 = "997fa97c5e84f6a16ff7ec3390510ae8d83bca4d7680f3427060f6bad7daa34e"; + libraryHaskellDepends = [ + aeson attoparsec base base-compat bytestring case-insensitive + http-api-data http-media http-types mmorph mtl network-uri + string-conversions text vault + ]; + testHaskellDepends = [ + aeson attoparsec base base-compat bytestring directory doctest + filemanip filepath hspec QuickCheck quickcheck-instances + string-conversions text url + ]; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "A family of combinators for defining webservices APIs"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -150287,8 +145303,8 @@ self: { }: mkDerivation { pname = "servant-aeson-specs"; - version = "0.5.1.1"; - sha256 = "7eb183abf9e6e19d1dfec3f1c2ac6da149ec5371aad41950ee3dcef268aaa5e0"; + version = "0.5.2.0"; + sha256 = "2728ee897c7920423ab730cb32d64defc0784d7226ff95733c72aa142121f2dd"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring directory filepath hspec hspec-golden-aeson QuickCheck quickcheck-arbitrary-adt random @@ -150306,6 +145322,42 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, QuickCheck, yaml }: + mkDerivation { + pname = "servant-auth"; + version = "0.2.0.0"; + sha256 = "5743a4ac6da19e77c13d0ce02e95eff196932f789ae1bf73a711a1b2f0ed545c"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob hspec QuickCheck yaml ]; + homepage = "http://github.com/plow-technologies/servant-auth#readme"; + description = "Authentication combinators for servant"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-auth-client" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, Glob, hspec + , http-client, http-types, jose, QuickCheck, servant, servant-auth + , servant-auth-server, servant-client, servant-server, text, time + , transformers, wai, warp, yaml + }: + mkDerivation { + pname = "servant-auth-client"; + version = "0.2.0.0"; + sha256 = "276fe75aefe7686729883186125a7931ed07a8a593fb59aeea1a71b8461a46f2"; + libraryHaskellDepends = [ + base bytestring servant servant-auth servant-client text + ]; + testHaskellDepends = [ + aeson base bytestring doctest Glob hspec http-client http-types + jose QuickCheck servant servant-auth servant-auth-server + servant-client servant-server text time transformers wai warp yaml + ]; + homepage = "http://github.com/plow-technologies/servant-auth#readme"; + description = "servant-client/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-cookie" = callPackage ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html , blaze-markup, bytestring, cereal, cookie, cryptonite @@ -150315,8 +145367,8 @@ self: { }: mkDerivation { pname = "servant-auth-cookie"; - version = "0.3.1"; - sha256 = "fe4b1fe4948d1368ece446695b406170e5e049f8b7818e8d35c7bd7ffc5c4f1d"; + version = "0.3.2"; + sha256 = "c77ba7d3fb289c792aa99f6691c7d2b53f3e5dd4a2bc9ea9ebae41a3addf8080"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150337,6 +145389,53 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-auth-cookie_0_4" = callPackage + ({ mkDerivation, base, base-compat, base64-bytestring + , blaze-builder, blaze-html, blaze-markup, bytestring, cereal + , cookie, cryptonite, data-default, deepseq, exceptions, hspec + , http-api-data, http-media, http-types, memory, mtl, QuickCheck + , servant, servant-blaze, servant-server, tagged, text, time + , transformers, wai, warp + }: + mkDerivation { + pname = "servant-auth-cookie"; + version = "0.4"; + sha256 = "2b5144612cbf8835b5f069f885d9f32483a63884d5d008c7110dd9273756eef1"; + libraryHaskellDepends = [ + base base64-bytestring blaze-builder bytestring cereal cookie + cryptonite data-default exceptions http-api-data http-types memory + mtl servant servant-server tagged time transformers wai + ]; + testHaskellDepends = [ + base base-compat blaze-html blaze-markup bytestring cereal + cryptonite data-default deepseq hspec http-api-data http-media mtl + QuickCheck servant servant-blaze servant-server text time wai warp + ]; + description = "Authentication via encrypted cookies"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-auth-docs" = callPackage + ({ mkDerivation, base, doctest, Glob, hspec, lens, QuickCheck + , servant, servant-auth, servant-docs, text, yaml + }: + mkDerivation { + pname = "servant-auth-docs"; + version = "0.2.0.0"; + sha256 = "8a4c47b9804b1d9d60304247d66315ae3d789597d979570e4783a161bc84ced9"; + libraryHaskellDepends = [ + base lens servant servant-auth servant-docs text + ]; + testHaskellDepends = [ + base doctest Glob hspec lens QuickCheck servant servant-auth + servant-docs text yaml + ]; + homepage = "http://github.com/plow-technologies/servant-auth#readme"; + description = "servant-docs/servant-auth compatibility"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "servant-auth-hmac" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , blaze-html, blaze-markup, bytestring, case-insensitive, cereal @@ -150373,6 +145472,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-auth-server" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder + , bytestring, 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.0.0"; + sha256 = "e021d5fc4983eddd145fcb95e7f317534b7742fdf164b43d6735cbfe1412aa61"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base64-bytestring blaze-builder bytestring + 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 + 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 + 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; + }) {}; + "servant-auth-token" = callPackage ({ mkDerivation, aeson-injector, base, bytestring, containers, mtl , persistent, persistent-postgresql, persistent-template @@ -150381,14 +145518,13 @@ self: { }: mkDerivation { pname = "servant-auth-token"; - version = "0.3.1.0"; - sha256 = "b67564a2f93db0b3b53fc9059f42579b38cebad106b8ac28f344b7a798ffd85f"; + version = "0.3.2.0"; + sha256 = "e15307d04c1011f118696c791d641d2a22844737d2484138147beb49f1abcae2"; libraryHaskellDepends = [ aeson-injector base bytestring containers mtl persistent persistent-postgresql persistent-template pwstore-fast servant-auth-token-api servant-server text time transformers uuid ]; - jailbreak = true; homepage = "https://github.com/ncrashed/servant-auth-token#readme"; description = "Servant based API and server for token based authorisation"; license = stdenv.lib.licenses.bsd3; @@ -150401,8 +145537,8 @@ self: { }: mkDerivation { pname = "servant-auth-token-api"; - version = "0.3.1.0"; - sha256 = "f85a81c0c859807ba1ae058ab409ce3e61ce3bfa713621e8e16e7a2bbf6b6241"; + version = "0.3.2.0"; + sha256 = "f2fe6ed30518036c9866095521fc9212877e3760ea9a57fd40543d601b8c5e4e"; libraryHaskellDepends = [ aeson aeson-injector base lens raw-strings-qq servant servant-docs servant-swagger swagger2 text @@ -150419,35 +145555,22 @@ self: { pname = "servant-blaze"; version = "0.7.1"; sha256 = "90ed1c7a22b83bee344ef3896203f3699b7633bf986ffa064752c3596c072646"; - revision = "2"; - editedCabalFile = "a71af15b94933ca8330922f24c10bd5da0de630b8ff364d830c43c3cfa35b7e3"; + revision = "3"; + editedCabalFile = "9f4f41889ae9722c92c87cf84de89c3c00d48a37749797fa04a74fba7db5a5ef"; libraryHaskellDepends = [ base blaze-html http-media servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Blaze-html support for servant"; license = stdenv.lib.licenses.bsd3; }) {}; - "servant-cassava_0_7_1" = callPackage - ({ mkDerivation, base, cassava, http-media, servant, vector }: - mkDerivation { - pname = "servant-cassava"; - version = "0.7.1"; - sha256 = "385bf6187f86c0fb9ba39578eb132118d2ada5dd17f1d0abd6235e4e9113623d"; - revision = "2"; - editedCabalFile = "1bbf4a02f60f2b0d01fa94b6570ff75c1391562f13ea1a1418bd2a1227e9e37a"; - libraryHaskellDepends = [ base cassava http-media servant vector ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "Servant CSV content-type for cassava"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-cassava" = callPackage ({ mkDerivation, base, cassava, http-media, servant, vector }: mkDerivation { pname = "servant-cassava"; version = "0.8"; sha256 = "5d9b85f7dc2fc42c7fe47bf92e4502e4ff5dde03724a6ee6ab20887524dce4fb"; + revision = "1"; + editedCabalFile = "56c74c61929917f3f9a662638f9759f92fed2ce0ef49b8fcc8090651f7f854b0"; libraryHaskellDepends = [ base cassava http-media servant vector ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant CSV content-type for cassava"; @@ -150455,36 +145578,6 @@ self: { }) {}; "servant-client" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base64-bytestring - , bytestring, deepseq, exceptions, hspec, http-api-data - , http-client, http-client-tls, http-media, http-types, HUnit - , network, network-uri, QuickCheck, safe, servant, servant-server - , string-conversions, text, transformers, transformers-compat, wai - , warp - }: - mkDerivation { - pname = "servant-client"; - version = "0.7.1"; - sha256 = "1aecf3d0d573900bc0b20e3ecadd0561d8cbaaf461efb40b213341d36396661d"; - revision = "1"; - editedCabalFile = "2e5c2301bb98e655edb4e6be3a9b9a814330fcd559faba130a2798bf229800c3"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring bytestring exceptions - http-api-data http-client http-client-tls http-media http-types - network-uri safe servant string-conversions text transformers - transformers-compat - ]; - testHaskellDepends = [ - aeson base bytestring deepseq hspec http-client http-media - http-types HUnit network QuickCheck servant servant-server text - transformers transformers-compat wai warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "automatical derivation of querying functions for servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-client_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, deepseq, exceptions, hspec, http-api-data , http-client, http-client-tls, http-media, http-types, HUnit @@ -150507,7 +145600,34 @@ self: { http-types HUnit network QuickCheck servant servant-server text transformers transformers-compat wai warp ]; - jailbreak = true; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "automatical derivation of querying functions for servant webservices"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-client_0_9_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, deepseq, exceptions, hspec, http-api-data + , http-client, http-client-tls, http-media, http-types, HUnit, mtl + , network, network-uri, QuickCheck, safe, servant, servant-server + , string-conversions, text, transformers, transformers-compat, wai + , warp + }: + mkDerivation { + pname = "servant-client"; + version = "0.9.0.1"; + sha256 = "3d962e54309bf67bea62178873d5840874bc78f58149b9c6c6d9cb6e5a8563e8"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring exceptions + http-api-data http-client http-client-tls http-media http-types mtl + network-uri safe servant string-conversions text transformers + transformers-compat + ]; + testHaskellDepends = [ + aeson base bytestring deepseq hspec http-api-data http-client + http-media http-types HUnit network QuickCheck servant + servant-server text transformers transformers-compat wai warp + ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -150529,7 +145649,6 @@ self: { mtl servant servant-foreign servant-swagger swagger2 text time unordered-containers uuid uuid-types ]; - jailbreak = true; homepage = "https://github.com/cutsea110/servant-csharp.git"; description = "Generate servant client library for C#"; license = stdenv.lib.licenses.bsd3; @@ -150537,36 +145656,6 @@ self: { }) {}; "servant-docs" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring - , bytestring-conversion, case-insensitive, control-monad-omega - , hashable, hspec, http-media, http-types, lens, servant - , string-conversions, text, unordered-containers - }: - mkDerivation { - pname = "servant-docs"; - version = "0.7.1"; - sha256 = "cd1a9fbcba479a9086fb562ad5c5d5921d2e4d1d079f7922ef0f3d2c75701964"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring bytestring-conversion - case-insensitive control-monad-omega hashable http-media http-types - lens servant string-conversions text unordered-containers - ]; - executableHaskellDepends = [ - aeson base bytestring-conversion lens servant string-conversions - text - ]; - testHaskellDepends = [ - aeson base hspec lens servant string-conversions - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "generate API docs for your servant webservice"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - - "servant-docs_0_8_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring , bytestring-conversion, case-insensitive, control-monad-omega , hashable, hspec, http-media, http-types, lens, servant @@ -150590,7 +145679,35 @@ self: { testHaskellDepends = [ aeson base hspec lens servant string-conversions ]; - jailbreak = true; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "generate API docs for your servant webservice"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-docs_0_9_0_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , case-insensitive, control-monad-omega, hashable, hspec + , http-media, http-types, lens, servant, string-conversions, text + , unordered-containers + }: + mkDerivation { + pname = "servant-docs"; + version = "0.9.0.1"; + sha256 = "a93955e71706421dcd82a6f7aafb0d599cd736c09b065bd4cad26159c6aac54e"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring case-insensitive + control-monad-omega hashable http-media http-types lens servant + string-conversions text unordered-containers + ]; + executableHaskellDepends = [ + aeson base lens servant string-conversions text + ]; + testHaskellDepends = [ + aeson base hspec lens servant string-conversions + ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "generate API docs for your servant webservice"; license = stdenv.lib.licenses.bsd3; @@ -150604,10 +145721,8 @@ self: { }: mkDerivation { pname = "servant-ede"; - version = "0.5.1"; - sha256 = "54e929c1c77acb04e808aabc485cf80f19724330e233ae5b6255d41d45ac957c"; - revision = "2"; - editedCabalFile = "7145131abeb7f67475bf1c11bcf95cafff1483b370d7c53f10c49c8a29c7e519"; + version = "0.6"; + sha256 = "a091b69bf4c5762ab90d9d8a31ed88eb88baa23c4586356e11717f334a24ce28"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150616,7 +145731,7 @@ self: { xss-sanitize ]; executableHaskellDepends = [ - base ede http-media servant-server warp + base ede http-media servant-server text unordered-containers warp ]; homepage = "http://github.com/alpmestan/servant-ede"; description = "Combinators for rendering EDE templates in servant web applications"; @@ -150637,7 +145752,6 @@ self: { testHaskellDepends = [ aeson base data-default elm-export hspec servant ]; - jailbreak = true; homepage = "http://github.com/mattjbray/servant-elm#readme"; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -150662,7 +145776,6 @@ self: { servant-lucid servant-server text time transformers wai wai-extra warp ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "Example programs for servant"; license = stdenv.lib.licenses.bsd3; @@ -150673,23 +145786,22 @@ self: { ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.7.1"; - sha256 = "93ee994eeb20b28a00fea5092ec34223c4826c4db6da71f4150d8a91950fb578"; + version = "0.8.1"; + sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; }) {}; - "servant-foreign_0_8_1" = callPackage + "servant-foreign_0_9_0_1" = callPackage ({ mkDerivation, base, hspec, http-types, lens, servant, text }: mkDerivation { pname = "servant-foreign"; - version = "0.8.1"; - sha256 = "dd70baa384b353912663b7845fb8698d20350eff389b19e6c6d45181ab7b3171"; + version = "0.9.0.1"; + sha256 = "133429124fa786185b2511150cf8b50779b1c23d41cd3d624877f1d40757c8a5"; libraryHaskellDepends = [ base http-types lens servant text ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; description = "Helpers for generating clients for servant APIs in any programming language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -150717,6 +145829,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-github-webhook" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring, Crypto + , github, http-types, servant, servant-server, string-conversions + , text, wai, warp + }: + mkDerivation { + pname = "servant-github-webhook"; + version = "0.3.0.0"; + sha256 = "41c78c7c553e3c75fcca81e66bc4db8b5f7b3e2578d18b54715ecdc106b6c610"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring Crypto github http-types + servant servant-server string-conversions text wai + ]; + testHaskellDepends = [ + aeson base bytestring servant-server wai warp + ]; + homepage = "https://github.com/tsani/servant-github-webhook"; + description = "Servant combinators to facilitate writing GitHub webhooks"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , deepseq, either, exceptions, hashable, haxl, hspec, http-client @@ -150740,7 +145874,6 @@ self: { http-client-tls http-media http-types HUnit network QuickCheck servant servant-server text wai warp ]; - jailbreak = true; homepage = "http://github.com/ElvishJerricco/servant-haxl-client/"; description = "automatical derivation of querying functions for servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -150759,7 +145892,6 @@ self: { testHaskellDepends = [ base hspec hspec-expectations language-ecmascript lens servant ]; - jailbreak = true; homepage = "http://haskell-servant.github.io/"; description = "Automatically derive (jquery) javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -150767,27 +145899,6 @@ self: { }) {}; "servant-js" = callPackage - ({ mkDerivation, base, base-compat, charset, hspec - , hspec-expectations, language-ecmascript, lens, servant - , servant-foreign, text - }: - mkDerivation { - pname = "servant-js"; - version = "0.7.1"; - sha256 = "15f4f26ffe2e9613defe30c028c43bc685f1582a6a0d97186dea5867c5cd5e89"; - libraryHaskellDepends = [ - base base-compat charset lens servant-foreign text - ]; - testHaskellDepends = [ - base base-compat hspec hspec-expectations language-ecmascript lens - 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_8_1" = callPackage ({ mkDerivation, base, base-compat, charset, hspec , hspec-expectations, language-ecmascript, lens, servant , servant-foreign, text @@ -150803,7 +145914,29 @@ self: { base base-compat hspec hspec-expectations language-ecmascript lens servant text ]; - jailbreak = true; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "Automatically derive javascript functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-js_0_9" = callPackage + ({ mkDerivation, base, base-compat, charset, hspec + , hspec-expectations, language-ecmascript, lens, servant + , servant-foreign, text + }: + mkDerivation { + pname = "servant-js"; + version = "0.9"; + sha256 = "7a4b5055029c327f6bb90b8283a655ab0f3cc2da426ee94ec1b5d8d4eade6c34"; + revision = "1"; + editedCabalFile = "5d19fb0f6529051622c12e8e55fa32123f36a5d1b45a229a822e2ea7c409df1b"; + libraryHaskellDepends = [ + base base-compat charset lens servant servant-foreign text + ]; + testHaskellDepends = [ + base base-compat hspec hspec-expectations language-ecmascript lens + servant text + ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Automatically derive javascript functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; @@ -150816,8 +145949,8 @@ self: { pname = "servant-lucid"; version = "0.7.1"; sha256 = "ec26ba7d159b09be10beacf6242f6ae1bd111e9c738bfbf3cf2f560f48e0fe40"; - revision = "1"; - editedCabalFile = "1fd84dbff6493df7e55bb6f4f6bc194f48ad7e9f63b404669139b1dd231d1cc2"; + revision = "3"; + editedCabalFile = "4bb81e61336f3e3a91d3c920937beeee49a178c53d391172c07bb847a68cdbe5"; libraryHaskellDepends = [ base http-media lucid servant ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "Servant support for lucid"; @@ -150831,14 +145964,13 @@ self: { }: mkDerivation { pname = "servant-matrix-param"; - version = "0.2"; - sha256 = "22e8bc5a2109066c26ec2bca18bd349509cfe8cd35ff7507bd6f2536f9544bd0"; + version = "0.3"; + sha256 = "8b74bc16a7948862e509dc5692989de8e471be4b8933f4e2152a9d4b575c2997"; libraryHaskellDepends = [ base servant ]; testHaskellDepends = [ aeson base bytestring containers doctest hspec http-types servant servant-aeson-specs servant-server text transformers wai wai-extra ]; - jailbreak = true; description = "Matrix parameter combinator for servant"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -150851,8 +145983,10 @@ self: { }: mkDerivation { pname = "servant-mock"; - version = "0.7.1"; - sha256 = "e9bec220198a9c9ae67782d88870ea4002562ad20eb6302b5f5a4d6f9752a169"; + version = "0.8.1.1"; + sha256 = "d7371a5899460bc6e86b003afbbf92f4609bd94299f0bbc89d14cd9212d7197d"; + revision = "1"; + editedCabalFile = "2041a7472f709520506daed1a5bec13dd527851becddd34ae7c7dbf59725db4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -150866,40 +146000,11 @@ self: { aeson base bytestring-conversion hspec hspec-wai QuickCheck servant servant-server wai ]; - homepage = "http://github.com/haskell-servant/servant"; + homepage = "http://haskell-servant.readthedocs.org/"; description = "Derive a mock server for free from your servant API types"; license = stdenv.lib.licenses.bsd3; }) {}; - "servant-mock_0_8_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, bytestring-conversion - , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server - , transformers, wai, warp - }: - mkDerivation { - pname = "servant-mock"; - version = "0.8.1"; - sha256 = "eb4a6a488ca70c2448b61c6ca373eaf97f4399c75d4e51ccefff502a0f6ba4fb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring http-types QuickCheck servant servant-server - transformers wai - ]; - executableHaskellDepends = [ - aeson base QuickCheck servant-server warp - ]; - testHaskellDepends = [ - aeson base bytestring-conversion hspec hspec-wai QuickCheck servant - servant-server wai - ]; - jailbreak = true; - homepage = "http://github.com/haskell-servant/servant"; - description = "Derive a mock server for free from your servant API types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "servant-pandoc" = callPackage ({ mkDerivation, base, bytestring, http-media, lens, pandoc-types , servant-docs, text, unordered-containers @@ -150912,7 +146017,6 @@ self: { base bytestring http-media lens pandoc-types servant-docs text unordered-containers ]; - jailbreak = true; description = "Use Pandoc to render servant API documentation"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -150927,7 +146031,6 @@ self: { revision = "1"; editedCabalFile = "f84940c58e21db3616aa0f6846ae89395aa2589de5ad8cdb91bc7e21acec8c97"; libraryHaskellDepends = [ base resource-pool servant time ]; - jailbreak = true; homepage = "http://github.com/zalora/servant-pool"; description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; license = stdenv.lib.licenses.bsd3; @@ -150960,8 +146063,33 @@ self: { }: mkDerivation { pname = "servant-purescript"; - version = "0.3.1.4"; - sha256 = "3453c63c53bdea6476df27486d207efb382a5ffcb4efd5cbb739c373a5cd380a"; + version = "0.3.1.5"; + sha256 = "3bf4363b2154c7fb3e6da4eb9f5ef227c5e15d4cc6048342086d77426f74b9d5"; + libraryHaskellDepends = [ + aeson base bytestring containers directory filepath http-types lens + mainland-pretty purescript-bridge servant servant-foreign + servant-server servant-subscriber text + ]; + testHaskellDepends = [ + aeson base containers lens mainland-pretty purescript-bridge + servant servant-foreign servant-subscriber text + ]; + homepage = "https://github.com/eskimor/servant-purescript#readme"; + description = "Generate PureScript accessor functions for you servant API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "servant-purescript_0_6_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , filepath, http-types, lens, mainland-pretty, purescript-bridge + , servant, servant-foreign, servant-server, servant-subscriber + , text + }: + mkDerivation { + pname = "servant-purescript"; + version = "0.6.0.0"; + sha256 = "e66cd9e49f41ae26c41b37a87d27f6a7848a9f9b3dd41b162bbc7d1d6808285c"; libraryHaskellDepends = [ aeson base bytestring containers directory filepath http-types lens mainland-pretty purescript-bridge servant servant-foreign @@ -150979,28 +146107,27 @@ self: { "servant-quickcheck" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring - , case-insensitive, data-default-class, hspec, hspec-core + , case-insensitive, clock, data-default-class, hspec, hspec-core , http-client, http-media, http-types, mtl, pretty, process , QuickCheck, quickcheck-io, servant, servant-client - , servant-server, split, string-conversions, temporary, text + , servant-server, split, string-conversions, temporary, text, time , transformers, warp }: mkDerivation { pname = "servant-quickcheck"; - version = "0.0.1.1"; - sha256 = "e200e569feb68818c3a3cf64b3e9279e50b7ac3ead8e1702be866e4140d69673"; + version = "0.0.2.1"; + sha256 = "4ac4467627724f118c1d735724b961a5b69d79f83b67d94b6cb60acef950e84d"; libraryHaskellDepends = [ - aeson base base-compat bytestring case-insensitive + aeson base base-compat bytestring case-insensitive clock data-default-class hspec http-client http-media http-types mtl pretty process QuickCheck servant servant-client servant-server - split string-conversions temporary text warp + split string-conversions temporary text time warp ]; testHaskellDepends = [ base base-compat hspec hspec-core http-client QuickCheck quickcheck-io servant servant-client servant-server transformers warp ]; - jailbreak = true; description = "QuickCheck entire APIs"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -151037,6 +146164,7 @@ self: { homepage = "https://github.com/ElvishJerricco/servant-router"; description = "Servant router for non-server applications"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-scotty" = callPackage @@ -151053,7 +146181,6 @@ self: { aeson base http-types scotty servant servant-response text transformers ]; - jailbreak = true; homepage = "http://github.com/zalora/servant"; description = "Generate a web service for servant 'Resource's using scotty and JSON"; license = stdenv.lib.licenses.bsd3; @@ -151061,41 +146188,6 @@ self: { }) {}; "servant-server" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat - , base64-bytestring, bytestring, bytestring-conversion, containers - , directory, doctest, exceptions, filemanip, filepath, hspec - , hspec-wai, http-api-data, http-types, mtl, network, network-uri - , parsec, QuickCheck, safe, servant, should-not-typecheck, split - , string-conversions, system-filepath, temporary, text - , transformers, transformers-compat, wai, wai-app-static, wai-extra - , warp, word8 - }: - mkDerivation { - pname = "servant-server"; - version = "0.7.1"; - sha256 = "ba4f10cc14c216cf27e08cae7e7cbb717930400e46dbecc9b8354751584909eb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base base-compat base64-bytestring bytestring - containers filepath http-api-data http-types mtl network - network-uri safe servant split string-conversions system-filepath - text transformers transformers-compat wai wai-app-static warp word8 - ]; - executableHaskellDepends = [ aeson base servant text wai warp ]; - testHaskellDepends = [ - aeson base base-compat base64-bytestring bytestring - bytestring-conversion directory doctest exceptions filemanip - filepath hspec hspec-wai http-types mtl network parsec QuickCheck - safe servant should-not-typecheck string-conversions temporary text - transformers transformers-compat wai wai-extra warp - ]; - homepage = "http://haskell-servant.readthedocs.org/"; - description = "A family of combinators for defining webservices APIs and serving them"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-server_0_8_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat , base64-bytestring, bytestring, bytestring-conversion, containers , directory, doctest, exceptions, filemanip, filepath, hspec @@ -151125,7 +146217,40 @@ self: { safe servant should-not-typecheck string-conversions temporary text transformers transformers-compat wai wai-extra warp ]; - jailbreak = true; + homepage = "http://haskell-servant.readthedocs.org/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "servant-server_0_9_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base-compat + , base64-bytestring, bytestring, containers, directory, doctest + , exceptions, filemanip, filepath, hspec, hspec-wai, http-api-data + , http-types, mtl, network, network-uri, parsec, QuickCheck, safe + , servant, should-not-typecheck, split, string-conversions + , system-filepath, temporary, text, transformers + , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 + }: + mkDerivation { + pname = "servant-server"; + version = "0.9.0.1"; + sha256 = "c353df6cdfe2d97648ea3e912dfa61a62d567b9b7431a037bab2b08ccdfade70"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base-compat base64-bytestring bytestring + containers filepath http-api-data http-types mtl network + network-uri safe servant split string-conversions system-filepath + text transformers transformers-compat wai wai-app-static warp word8 + ]; + executableHaskellDepends = [ aeson base servant text wai warp ]; + testHaskellDepends = [ + aeson base base-compat base64-bytestring bytestring directory + doctest exceptions filemanip filepath hspec hspec-wai http-types + mtl network parsec QuickCheck safe servant should-not-typecheck + string-conversions temporary text transformers transformers-compat + wai wai-extra warp + ]; homepage = "http://haskell-servant.readthedocs.org/"; description = "A family of combinators for defining webservices APIs and serving them"; license = stdenv.lib.licenses.bsd3; @@ -151156,6 +146281,45 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-snap" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, case-insensitive, containers, digestive-functors + , directory, either, errors, exceptions, filepath, heist, hspec + , hspec-core, hspec-snap, http-api-data, http-types, HUnit + , io-streams, lens, map-syntax, mmorph, mtl, network, network-uri + , parsec, process, QuickCheck, servant, snap, snap-core + , snap-server, string-conversions, temporary, text, time + , transformers + }: + mkDerivation { + pname = "servant-snap"; + version = "0.7.0.2"; + sha256 = "0461cc7635c72f2c75770f029811a1c1e72f3245bc4be2fd1beaaee1cd84759b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base bytestring case-insensitive containers either + filepath http-api-data http-types io-streams mmorph mtl network-uri + servant snap snap-core snap-server string-conversions text + transformers + ]; + executableHaskellDepends = [ + aeson base bytestring either errors heist lens map-syntax servant + snap snap-core snap-server text transformers + ]; + testHaskellDepends = [ + aeson base base64-bytestring bytestring case-insensitive containers + digestive-functors directory either exceptions hspec hspec-core + hspec-snap http-types HUnit mtl network parsec process QuickCheck + servant snap snap-core snap-server string-conversions temporary + text time transformers + ]; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-subscriber" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, case-insensitive, containers, directory, filepath @@ -151184,32 +146348,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "servant-swagger_1_0_3" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob - , hspec, http-media, lens, QuickCheck, servant, swagger2, text - , time, unordered-containers - }: - mkDerivation { - pname = "servant-swagger"; - version = "1.0.3"; - sha256 = "ea1b3c7f33ae1c788ef33858c9c74849f450155c1bd81dcd472a36389aa17597"; - revision = "2"; - editedCabalFile = "9277b2e27decd3ec1b02132a8963a70dd8c3624087bf1a7bbad42da95030f85b"; - libraryHaskellDepends = [ - aeson base bytestring hspec http-media lens QuickCheck servant - swagger2 text unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-qq base doctest Glob hspec lens QuickCheck servant - swagger2 text time - ]; - jailbreak = true; - 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" = callPackage ({ mkDerivation, aeson, aeson-qq, base, bytestring, directory , doctest, filepath, hspec, http-media, insert-ordered-containers @@ -151218,8 +146356,10 @@ self: { }: mkDerivation { pname = "servant-swagger"; - version = "1.1.1"; - sha256 = "c6d8a62e495cd72a42f2ae600c4e523cf3337bb3cd24426f4cc54141a9600445"; + version = "1.1.2"; + sha256 = "1aa55cdf092189fed02e5d5bddf052eafafd23df54e0671ec32adc5ac4c8c47e"; + revision = "2"; + editedCabalFile = "1b4ce7e527556edbd2f07fe420fe82a482d7d2b6ce264606c2e34f0e0270c081"; libraryHaskellDepends = [ aeson base bytestring hspec http-media insert-ordered-containers lens QuickCheck servant swagger2 text unordered-containers @@ -151245,6 +146385,8 @@ self: { pname = "servant-swagger-ui"; version = "0.2.0.2.1.5"; sha256 = "57fa0b9d8a46482051f3e2bcab7c513adec07450b3fb6bb00281758f99922d57"; + revision = "2"; + editedCabalFile = "cd0f97ba669671dd13af499483c4e0262e7fd032a50e97396dc56bec8256c869"; libraryHaskellDepends = [ base blaze-markup bytestring directory file-embed filepath http-media servant servant-blaze servant-server servant-swagger @@ -151271,8 +146413,8 @@ self: { pname = "servant-yaml"; version = "0.1.0.0"; sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204"; - revision = "8"; - editedCabalFile = "134f4bb4d23eb291360e897c9f83e74f22de17918452b6de79b2044c97197c6b"; + revision = "11"; + editedCabalFile = "80507ee35eb6736752a80613e2a27fc89a50bbcdfc75c51785aeaf469af42902"; libraryHaskellDepends = [ base bytestring http-media servant yaml ]; @@ -151367,7 +146509,6 @@ self: { persistent-template QuickCheck resource-pool serversession text time transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using persistent and an RDBMS"; license = stdenv.lib.licenses.mit; @@ -151391,11 +146532,10 @@ self: { base bytestring hedis hspec path-pieces serversession text time transformers unordered-containers ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/yesodweb/serversession"; description = "Storage backend for serversession using Redis"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession-frontend-snap" = callPackage @@ -151411,7 +146551,6 @@ self: { base bytestring nonce path-pieces serversession snap snap-core text time transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/yesodweb/serversession"; description = "Snap bindings for serversession"; license = stdenv.lib.licenses.mit; @@ -151486,9 +146625,9 @@ self: { base base64-bytestring blaze-html byteable bytestring cryptohash HsOpenSSL http-streams tagsoup time ]; - jailbreak = true; description = "Send HTML formatted emails using Amazon's SES REST API with blaze"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ses-html-snaplet" = callPackage @@ -151503,7 +146642,6 @@ self: { base blaze-html bytestring configurator ses-html snap text transformers ]; - jailbreak = true; description = "Snaplet for the ses-html package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -151596,10 +146734,10 @@ self: { split text uuid ]; executableToolDepends = [ alex happy ]; - jailbreak = true; homepage = "http://bitbucket.org/robertmassaioli/setdown"; description = "Treating files as sets to perform rapid set manipulation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setenv" = callPackage @@ -151625,9 +146763,9 @@ self: { isExecutable = true; libraryHaskellDepends = [ base random vty ]; executableHaskellDepends = [ base ]; - jailbreak = true; description = "A console interface to the game of Set"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "setlocale" = callPackage @@ -151655,29 +146793,26 @@ self: { "sets" = callPackage ({ mkDerivation, base, commutative, composition, containers - , contravariant, hashable, invariant, keys, mtl, QuickCheck + , contravariant, hashable, keys, mtl, QuickCheck , quickcheck-instances, semigroupoids, semigroups, tasty , tasty-hunit, tasty-quickcheck, transformers, transformers-base , unordered-containers, witherable }: mkDerivation { pname = "sets"; - version = "0.0.5"; - sha256 = "78772618d3a85cbf91a20f0289eb833c4304d6a93c78bb266c38b60e85d2717b"; - revision = "1"; - editedCabalFile = "6a3f99b425c6a4ed373e1f1d2836a40b09e462f4e2744b76227f27a133acb34e"; + version = "0.0.5.2"; + sha256 = "be20d5b7b4a5770b7089879f3ef7226c485f4d5bb17e87f979f3bb6475e48713"; libraryHaskellDepends = [ - base commutative composition containers contravariant hashable - invariant keys mtl QuickCheck semigroupoids semigroups transformers + base commutative composition containers contravariant hashable keys + mtl QuickCheck semigroupoids semigroups transformers transformers-base unordered-containers witherable ]; testHaskellDepends = [ - base commutative composition containers contravariant hashable - invariant keys mtl QuickCheck quickcheck-instances semigroupoids - semigroups tasty tasty-hunit tasty-quickcheck transformers - transformers-base unordered-containers witherable + base commutative containers contravariant QuickCheck + quickcheck-instances tasty tasty-hunit tasty-quickcheck + unordered-containers ]; - description = "Various set implementations in Haskell"; + description = "Ducktyped set interface for Haskell containers"; license = stdenv.lib.licenses.mit; }) {}; @@ -151690,7 +146825,6 @@ self: { revision = "1"; editedCabalFile = "c4ff7321208bb4f71ea367d5a1811d7c13aadda0d05a1d9ddb25fff5e31c9365"; libraryHaskellDepends = [ base mtl template-haskell ]; - jailbreak = true; description = "Small (TH) library to declare setters for typical `record' data type fields"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -151795,7 +146929,6 @@ self: { version = "0.1.0.2"; sha256 = "b5101154373eac70dee9d56854333ea33735a88b7697f2877846c746dd048c3a"; libraryHaskellDepends = [ base bytestring template-haskell text ]; - jailbreak = true; homepage = "http://github.com/dzhus/sext/"; description = "Lists, Texts and ByteStrings with type-encoded length"; license = stdenv.lib.licenses.bsd3; @@ -151822,10 +146955,10 @@ self: { version = "0.1.1"; sha256 = "e6862db41ac95e52e9110d666683f5c931b6175c86fc500aaf74cf39c8d49fcb"; libraryHaskellDepends = [ base bytestring entropy primitive ]; - jailbreak = true; homepage = "https://github.com/philopon/sfmt-hs"; description = "SIMD-oriented Fast Mersenne Twister(SFMT) binding"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sfnt2woff" = callPackage @@ -151862,10 +146995,10 @@ self: { base binary bytestring containers deepseq filepath lazy-io logfloat monad-par mtl primitive random temporary vector ]; - jailbreak = true; homepage = "https://github.com/kawu/sgd"; description = "Stochastic gradient descent"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sgf" = callPackage @@ -151883,6 +147016,7 @@ self: { homepage = "https://github.com/tonicebrian/sgf"; description = "SGF (Smart Game Format) parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sgrep" = callPackage @@ -151910,10 +147044,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base binary bytestring io-streams SHA ]; executableHaskellDepends = [ base io-streams SHA ]; - jailbreak = true; homepage = "https://github.com/noteed/sha-streams"; description = "SHA hashes for io-streams"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shadower" = callPackage @@ -151963,6 +147097,7 @@ self: { homepage = "https://github.com/rnons/shadowsocks-haskell"; description = "A fast SOCKS5 proxy that help you get through firewalls"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shady-gen" = callPackage @@ -152030,7 +147165,6 @@ self: { js-flot js-jquery process QuickCheck random time transformers unix unordered-containers utf8-string ]; - doCheck = false; homepage = "http://shakebuild.com"; description = "Build system library, like Make, but more accurate dependencies"; license = stdenv.lib.licenses.bsd3; @@ -152047,10 +147181,10 @@ self: { executableHaskellDepends = [ base Cabal directory filepath process ]; - jailbreak = true; homepage = "https://github.com/samplecount/shake-cabal-build"; description = "Utility for building Shake build systems using Cabal sandboxes"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-extras" = callPackage @@ -152064,33 +147198,12 @@ self: { libraryHaskellDepends = [ base bytestring cmdargs directory filepath shake ]; - jailbreak = true; homepage = "http://thoughtpolice.github.com/shake-extras"; description = "Extra utilities for shake build systems"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shake-language-c_0_9_1" = callPackage - ({ mkDerivation, base, data-default-class, directory, doctest - , fclabels, hspec, process, shake, split, unordered-containers - }: - mkDerivation { - pname = "shake-language-c"; - version = "0.9.1"; - sha256 = "827d4225d9c52ab784793831a41f5f594ece21113ad0e5da540505a42842db70"; - libraryHaskellDepends = [ - base data-default-class fclabels process shake split - unordered-containers - ]; - testHaskellDepends = [ base directory doctest hspec shake ]; - doCheck = false; - homepage = "https://github.com/samplecount/shake-language-c"; - description = "Utilities for cross-compiling with Shake"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "shake-language-c" = callPackage ({ mkDerivation, base, data-default-class, directory, doctest , fclabels, hspec, process, shake, split, unordered-containers @@ -152119,10 +147232,10 @@ self: { libraryHaskellDepends = [ base bytestring css-text hjsmin shake text ]; - jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-minify"; description = "Shake Minify Rules"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-pack" = callPackage @@ -152132,10 +147245,10 @@ self: { version = "0.1.2"; sha256 = "413dc10d9b141ba885b3067b2ab76aee7f2978a930e874885fa0baf3d8b1c247"; libraryHaskellDepends = [ base bytestring bzlib shake tar ]; - jailbreak = true; homepage = "https://github.com/LukeHoersten/shake-pack"; description = "Shake File Pack Rule"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shake-persist" = callPackage @@ -152151,10 +147264,10 @@ self: { base binary directory shake template-haskell ]; executableHaskellDepends = [ base shake ]; - jailbreak = true; homepage = "https://anonscm.debian.org/cgit/users/kaction-guest/haskell-shake-persist.git"; description = "Shake build system on-disk caching"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shaker" = callPackage @@ -152181,40 +147294,12 @@ self: { regex-posix template-haskell test-framework test-framework-hunit test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/bonnefoa/Shaker"; description = "simple and interactive command-line build tool"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "shakespeare_2_0_9" = callPackage - ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring - , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec - , process, scientific, template-haskell, text, time, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "shakespeare"; - version = "2.0.9"; - sha256 = "d3ba75e105a367781d22e75826e07eddd4d0074e9db325722e92bdcaead48d45"; - libraryHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim parsec process scientific template-haskell text - time transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson base blaze-html blaze-markup bytestring containers directory - exceptions ghc-prim hspec HUnit parsec process template-haskell - text time transformers - ]; - homepage = "http://www.yesodweb.com/book/shakespearean-templates"; - description = "A toolkit for making compile-time interpolated templates"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - maintainers = with stdenv.lib.maintainers; [ psibi ]; - }) {}; - "shakespeare" = callPackage ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec @@ -152253,9 +147338,9 @@ self: { base classy-prelude data-default directory process shakespeare template-haskell ]; - jailbreak = true; description = "compile es2015"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shakespeare-css" = callPackage @@ -152400,7 +147485,6 @@ self: { base bytestring QuickCheck test-framework test-framework-quickcheck2 unix ]; - jailbreak = true; description = "A circular buffer built on shared memory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -152415,10 +147499,10 @@ self: { sha256 = "a7044f887276d9d630f613313c961af265027c6aa1ba8acf8ec402db0837f680"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base Cabal hspec lens text ]; - jailbreak = true; homepage = "http://github.com/intolerable/shared-fields"; description = "a tiny library for using shared lens fields"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shared-memory" = callPackage @@ -152458,7 +147542,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base filepath mtl ]; executableHaskellDepends = [ base filepath mtl ]; - jailbreak = true; homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she"; description = "A Haskell preprocessor adding miscellaneous features"; license = stdenv.lib.licenses.publicDomain; @@ -152605,10 +147688,10 @@ self: { base bytestring feed HTTP mime-types network-uri shellmate tagsoup text xml ]; - jailbreak = true; homepage = "https://github.com/valderman/shellmate"; description = "Extra functionality for shellmate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelltestrunner" = callPackage @@ -152629,10 +147712,10 @@ self: { pretty-show process regex-tdfa safe test-framework test-framework-hunit utf8-string ]; - jailbreak = true; homepage = "http://joyful.com/shelltestrunner"; description = "A tool for testing command-line programs"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shelly" = callPackage @@ -152644,8 +147727,8 @@ self: { }: mkDerivation { pname = "shelly"; - version = "1.6.8"; - sha256 = "d3d628d0ea5f147086975bd2d26d7eb2321405cadd98ff1c7f8e6bb88abce12d"; + version = "1.6.8.1"; + sha256 = "e5a32f7552779667d1f0164d271e99c9ddcabdf1a7a1503cd6fc8ba0bb4445cd"; libraryHaskellDepends = [ async base bytestring containers directory enclosed-exceptions exceptions lifted-async lifted-base monad-control mtl process @@ -152658,8 +147741,6 @@ self: { process system-fileio system-filepath text time transformers transformers-base unix-compat ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/yesodweb/Shelly.hs"; description = "shell-like (systems) programming in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -152682,6 +147763,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "shentong" = callPackage + ({ mkDerivation, base, bytestring, hashmap, mtl, parallel, text + , time, uniplate, unordered-containers, vector + }: + mkDerivation { + pname = "shentong"; + version = "0.3.1"; + sha256 = "b751f79e565899e36b71c6b31a51adb46fd61899b3cdadbb05631d03514bb523"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring hashmap mtl parallel text time uniplate + unordered-containers vector + ]; + description = "A Haskell implementation of the Shen programming language"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "shine" = callPackage ({ mkDerivation, base, ghcjs-dom, ghcjs-prim, keycode, mtl, time , transformers @@ -152696,7 +147795,6 @@ self: { base ghcjs-dom ghcjs-prim keycode mtl time transformers ]; testHaskellDepends = [ base ghcjs-dom ]; - jailbreak = true; homepage = "https://github.com/fgaz/shine"; description = "Declarative graphics for the browser using GHCJS"; license = stdenv.lib.licenses.mit; @@ -152709,6 +147807,8 @@ self: { pname = "shine-varying"; version = "0.1.0.0"; sha256 = "80301d12099fa02193881457cf80603b00d8c0fe59ef3a8e75f1f81491fbb68e"; + revision = "1"; + editedCabalFile = "fb542604b1af45c5cc7af83446a69b309d6b00f6c6070b0bde09843d4d1e718c"; libraryHaskellDepends = [ base ghcjs-dom keycode shine varying ]; testHaskellDepends = [ base ghcjs-dom keycode shine varying ]; homepage = "https://github.com/fgaz/shine-varying"; @@ -152739,10 +147839,10 @@ self: { version = "0.2"; sha256 = "3b153cd9b93959cb3f90bc98755898653bd27f4e52a475b5d818df36dd428b7b"; libraryHaskellDepends = [ base curl ]; - jailbreak = true; homepage = "http://richardfergie.com/shoap"; description = "A very basic SOAP package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shortcircuit" = callPackage @@ -152776,10 +147876,10 @@ self: { version = "0.1.0.1"; sha256 = "83771a79080efe72a813cd7839266b95badcf03c9ea4fd6907f6873e055b38eb"; libraryHaskellDepends = [ base text ]; - jailbreak = true; homepage = "https://github.com/Tarrasch/shorten-strings"; description = "Shorten a variety of string-like types adding ellipsis"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "should-not-typecheck" = callPackage @@ -152829,7 +147929,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base glade gtk random ]; - jailbreak = true; description = "A simple gtk based Russian Roulette game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -152903,6 +148002,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sibe" = callPackage + ({ mkDerivation, base, Chart, Chart-cairo, containers + , data-default-class, deepseq, directory, hmatrix, JuicyPixels + , lens, random, random-shuffle, regex-base, regex-pcre, split + , stemmer, text, vector + }: + mkDerivation { + pname = "sibe"; + version = "0.1.0.0"; + sha256 = "456846a9c4bcd467e9f95899677d216d21bf94e0d51b70e22b173272526a8db8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base Chart Chart-cairo containers data-default-class deepseq + hmatrix lens random random-shuffle regex-base regex-pcre split + stemmer text vector + ]; + executableHaskellDepends = [ + base Chart Chart-cairo containers data-default-class directory + hmatrix JuicyPixels random random-shuffle split vector + ]; + testHaskellDepends = [ base hmatrix ]; + homepage = "https://github.com/mdibaiee/sibe"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.gpl3; + }) {}; + "sieve" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -152933,10 +148059,10 @@ self: { testHaskellDepends = [ base Cabal cairo containers fgl HUnit parsec process ]; - jailbreak = true; homepage = "http://pages.iu.edu/~gdweber/software/sifflet/"; description = "Simple, visual, functional language for learning about recursion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sifflet-lib" = callPackage @@ -152952,7 +148078,6 @@ self: { parsec process unix ]; librarySystemDepends = [ gdk_x11 gtk_x11 ]; - jailbreak = true; homepage = "http://mypage.iu.edu/~gdweber/software/sifflet/"; description = "Library of modules shared by sifflet and its tests and its exporters"; license = stdenv.lib.licenses.bsd3; @@ -153018,7 +148143,6 @@ self: { version = "0.4"; sha256 = "871c2890e4817a2fab924e5e40f7279a53a969040e470d4d4faeab92c033b15f"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "Multisets with negative membership"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -153044,7 +148168,6 @@ self: { version = "0.1.0.1"; sha256 = "1559eddddc48827fd7f7432c5ee0960218779198713c67ed8181cc334b38b766"; libraryHaskellDepends = [ base ghc-prim primitive vector ]; - jailbreak = true; homepage = "http://github.com/mikeizbicki/simd"; description = "simple interface to GHC's SIMD instructions"; license = stdenv.lib.licenses.bsd3; @@ -153064,7 +148187,6 @@ self: { executableHaskellDepends = [ base containers haskell98 mersenne-random-pure64 mtl parsec random ]; - jailbreak = true; homepage = "http://simgi.sourceforge.net/"; description = "stochastic simulation engine"; license = "GPL"; @@ -153127,10 +148249,10 @@ self: { version = "0.2"; sha256 = "27a86db825f2612e758626ea689fb7de65215f83c32abf77a777803cbc5213cf"; libraryHaskellDepends = [ base containers deepseq ]; - jailbreak = true; homepage = "http://github.com/nominolo/simple-atom"; description = "Atom (or symbol) datatype for fast comparision and sorting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-bluetooth" = callPackage @@ -153187,7 +148309,6 @@ self: { monad-control mono-traversable mtl mwc-random primitive semigroups stm streaming-commons text transformers transformers-base vector ]; - jailbreak = true; homepage = "http://github.com/jwiegley/simple-conduit"; description = "A simple streaming I/O library based on monadic folds"; license = stdenv.lib.licenses.bsd3; @@ -153246,19 +148367,19 @@ self: { }) {}; "simple-effects" = callPackage - ({ mkDerivation, base, interlude-l, lens, monad-control, mtl - , transformers, transformers-base + ({ mkDerivation, base, interlude-l, lens, list-t, monad-control + , mtl, transformers, transformers-base }: mkDerivation { pname = "simple-effects"; - version = "0.1.0.1"; - sha256 = "cffc82c58b5985162eef90e8a1f51145364e2a9b48d3632d677cc68e32accd16"; + version = "0.3.0.1"; + sha256 = "16796c57b5acea501c3b03c1306813a2488c1021ba5db51d168c2bc0c2f32c7b"; libraryHaskellDepends = [ - base interlude-l lens monad-control mtl transformers + base interlude-l lens list-t monad-control mtl transformers transformers-base ]; - homepage = "https://github.com/githubuser/simple-effects#readme"; - description = "Simple project template from stack"; + homepage = "https://gitlab.com/LukaHorvat/simple-effects"; + description = "A simple effect system that integrates with MTL"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -153272,10 +148393,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base parsec text transformers ]; executableHaskellDepends = [ base text ]; - jailbreak = true; homepage = "https://github.com/gitfoxi/Language.Eval"; description = "Evaluate a Text to an Integer: \"1 + 1\" -> 2"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-firewire" = callPackage @@ -153319,10 +148440,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base parallel random ]; executableHaskellDepends = [ base deepseq parallel random ]; - jailbreak = true; homepage = "http://eax.me/haskell-genetic-algorithm/"; description = "Simple parallel genetic algorithm implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-genetic-algorithm-mr" = callPackage @@ -153368,9 +148489,9 @@ self: { libraryHaskellDepends = [ base containers hashable safecopy unordered-containers ]; - jailbreak = true; description = "Allows simple indexation on any data type"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-log" = callPackage @@ -153391,6 +148512,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-log_0_5_0" = callPackage + ({ mkDerivation, async, base, containers, deepseq, directory + , exceptions, filepath, mtl, SafeSemaphore, text, time + , transformers + }: + mkDerivation { + pname = "simple-log"; + version = "0.5.0"; + sha256 = "b46bdde8b3177b187339b741da3400c6b6a3f790f00bfd1ddf0bda34e301da9d"; + libraryHaskellDepends = [ + async base containers deepseq directory exceptions filepath mtl + SafeSemaphore text time transformers + ]; + homepage = "http://github.com/mvoidex/simple-log"; + description = "Simple log for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-log-syslog" = callPackage ({ mkDerivation, base, hsyslog, simple-log, text }: mkDerivation { @@ -153398,7 +148538,6 @@ self: { version = "0.2.0"; sha256 = "6430e132a9159897a58bf15796049508c2762229af472621af4e95ffba962998"; libraryHaskellDepends = [ base hsyslog simple-log text ]; - jailbreak = true; homepage = "http://github.com/mvoidex/simple-log-syslog"; description = "Syslog backend for simple-log"; license = stdenv.lib.licenses.bsd3; @@ -153433,10 +148572,10 @@ self: { executableHaskellDepends = [ base containers deepseq parallel random split ]; - jailbreak = true; homepage = "http://eax.me/haskell-neural-networks/"; description = "Simple parallel neural networks implementation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-nix" = callPackage @@ -153456,10 +148595,10 @@ self: { base classy-prelude error-list hspec hspec-expectations MissingH mtl parsec system-filepath text text-render unordered-containers ]; - jailbreak = true; homepage = "https://github.com/adnelson/simple-nix"; description = "Simple parsing/pretty printing for Nix expressions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-observer" = callPackage @@ -153567,7 +148706,6 @@ self: { base bytestring conduit conduit-extra directory hspec HUnit network process resourcet unix ]; - doCheck = false; description = "Cross platform library for the sendfile system call"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -153670,10 +148808,10 @@ self: { version = "0.1.0.0"; sha256 = "faa78536335a8b7579bb68a4f7d79e6ed3b7c4a0674566ae028fc36c3c6af95c"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/BartMassey/simple-tabular"; description = "Simple tabular-text formatter"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simple-tar" = callPackage @@ -153682,8 +148820,8 @@ self: { }: mkDerivation { pname = "simple-tar"; - version = "0.5"; - sha256 = "06b1ce56dc971aad0f52c5e7d27fb4d64aca83e018c6fc2e227a65dc5bc1a247"; + version = "0.5.1"; + sha256 = "d53ea4544827bfb99f8f79ddfca3888b642f8cb67d43616b7cbdcb0ca1da0e5f"; libraryHaskellDepends = [ base bytestring cereal containers filepath time ]; @@ -153717,7 +148855,6 @@ self: { version = "0.1.0.1"; sha256 = "441b08acf63ad72fc20acd3f5e02cb5c2957dab2e4ff765652803c9e1b42fdef"; libraryHaskellDepends = [ base vector ]; - jailbreak = true; homepage = "http://github.com/dzhus/simple-vec3/"; description = "Three-dimensional vectors of doubles with basic operations"; license = stdenv.lib.licenses.bsd3; @@ -153761,10 +148898,10 @@ self: { base bytestring connection containers network old-locale time ]; testHaskellDepends = [ base bytestring hspec HUnit knob ]; - doCheck = false; homepage = "http://github.com/dom96/SimpleIRC"; description = "Simple IRC Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simpleirc-lens" = callPackage @@ -153777,6 +148914,7 @@ self: { homepage = "https://github.com/relrod/simpleirc-lens"; description = "Lenses for simpleirc types"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "simplenote" = callPackage @@ -153810,7 +148948,6 @@ self: { executableHaskellDepends = [ base ghc-paths haskell-src-exts process uniplate ]; - jailbreak = true; description = "A simplified Haskell prelude for teaching"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -153855,7 +148992,6 @@ self: { base bytestring exception-hierarchy template-haskell text ]; librarySystemDepends = [ sqlite ]; - jailbreak = true; homepage = "comming soon"; description = "Simplest SQLite3 binding"; license = stdenv.lib.licenses.bsd3; @@ -153950,7 +149086,6 @@ self: { x11-xim X11-xshape ]; executablePkgconfigDepends = [ libXft ]; - jailbreak = true; homepage = "http://sigkill.dk/programs/sindre"; description = "A programming language for simple GUIs"; license = stdenv.lib.licenses.bsd3; @@ -153981,28 +149116,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "singletons_2_0_1" = callPackage - ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl - , process, syb, tasty, tasty-golden, template-haskell, th-desugar - }: - mkDerivation { - pname = "singletons"; - version = "2.0.1"; - sha256 = "fd149d3da367eebe81728a7a61389f18bb18b3cddd611b7aed6c0b265110ba41"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-desugar - ]; - testHaskellDepends = [ - base Cabal directory filepath process tasty tasty-golden - ]; - jailbreak = true; - doCheck = false; - homepage = "http://www.github.com/goldfirere/singletons"; - description = "A framework for generating singleton types"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "singletons" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath, mtl , process, syb, tasty, tasty-golden, template-haskell, th-desugar @@ -154017,7 +149130,6 @@ self: { testHaskellDepends = [ base Cabal directory filepath process tasty tasty-golden ]; - doCheck = false; homepage = "http://www.github.com/goldfirere/singletons"; description = "A framework for generating singleton types"; license = stdenv.lib.licenses.bsd3; @@ -154030,9 +149142,9 @@ self: { version = "0.1.0.1"; sha256 = "f7e736ffe4b73cb6b4d818ea0fe17a636afef60ecad80764e0b40a080a49de12"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "An alternative to lazy I/O that doesn't conflate execution with evaluation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "siphash" = callPackage @@ -154105,6 +149217,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sixfiguregroup" = callPackage + ({ mkDerivation, base, digit, directory, doctest, filepath, lens + , parsec, parsers, QuickCheck, template-haskell + }: + mkDerivation { + pname = "sixfiguregroup"; + version = "0.0.1"; + sha256 = "d98c0de2dfa1d15adc1db96284359aea3954f1cd735eafda9bf9b9ce687c14d0"; + libraryHaskellDepends = [ base digit lens parsers ]; + testHaskellDepends = [ + base directory doctest filepath parsec QuickCheck template-haskell + ]; + homepage = "https://github.com/data61/sixfiguregroup"; + description = "A six figure group of time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "size-based" = callPackage ({ mkDerivation, base, dictionary-sharing, template-haskell , testing-type-modifiers @@ -154168,7 +149298,6 @@ self: { base constraints deepseq equational-reasoning hashable monomorphic singletons template-haskell type-natural ]; - jailbreak = true; homepage = "https://github.com/konn/sized-vector"; description = "Size-parameterized vector types and functions"; license = stdenv.lib.licenses.bsd3; @@ -154231,7 +149360,6 @@ self: { testHaskellDepends = [ base bytestring cereal crypto-api filepath hspec tagged ]; - doCheck = false; homepage = "https://github.com/meteficha/skein"; description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well."; license = stdenv.lib.licenses.bsd3; @@ -154287,7 +149415,6 @@ self: { libraryHaskellDepends = [ base blaze-html bytestring containers http-types text wai ]; - jailbreak = true; homepage = "https://github.com/pharpend/skell"; description = "An overly complex Haskell web framework"; license = stdenv.lib.licenses.bsd3; @@ -154308,10 +149435,10 @@ self: { base bytestring data-default http-client http-types lens text time wreq xml-conduit ]; - jailbreak = true; homepage = "https://github.com/nyorem/skemmtun"; description = "A MyAnimeList.net client."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "skulk" = callPackage @@ -154361,7 +149488,6 @@ self: { attoparsec base bytestring containers directory filepath ghc-binary haskell98 IfElse old-locale regex-pcre time utf8-string ]; - jailbreak = true; homepage = "https://github.com/jdevelop/skypelogexport/wiki"; description = "Export Skype chat logs to text files"; license = stdenv.lib.licenses.bsd3; @@ -154380,7 +149506,6 @@ self: { aeson base containers either http-conduit mtl old-locale text time transformers ]; - jailbreak = true; description = "Haskell API for interacting with Slack"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -154404,6 +149529,7 @@ self: { testHaskellDepends = [ base ]; description = "Bindings to the Slack RTM API"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "slack-notify-haskell" = callPackage @@ -154426,30 +149552,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "slave-thread_1_0_1_1" = callPackage - ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph - , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore - , stm-containers, transformers - }: - mkDerivation { - pname = "slave-thread"; - version = "1.0.1.1"; - sha256 = "2ebab4f5f49b75fb41cfe9514e1ad5de2c118125dd549e6d7ce318e425d4575f"; - libraryHaskellDepends = [ - base base-prelude list-t mmorph partial-handler stm-containers - transformers - ]; - testHaskellDepends = [ - base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/nikita-volkov/slave-thread"; - description = "A principal solution to ghost threads and silent exceptions"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "slave-thread" = callPackage ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore @@ -154518,7 +149620,6 @@ self: { aeson base bytestring MonadCatchIO-transformers mtl pandoc snap-core snap-server utf8-string ]; - jailbreak = true; description = "ws convert markdown to reveal-js"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -154590,27 +149691,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "slug_0_1_4" = callPackage - ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent - , QuickCheck, test-framework, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "slug"; - version = "0.1.4"; - sha256 = "1a9635014b4310bfa8ed75edd4a5d34d708ec72be5aa33358fbd2fce5e68c461"; - libraryHaskellDepends = [ - aeson base exceptions path-pieces persistent text - ]; - testHaskellDepends = [ - base exceptions path-pieces QuickCheck test-framework - test-framework-quickcheck2 text - ]; - homepage = "https://github.com/mrkkrp/slug"; - description = "Type-safe slugs for Yesod ecosystem"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "slug" = callPackage ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent , QuickCheck, test-framework, test-framework-quickcheck2, text @@ -154638,7 +149718,6 @@ self: { version = "0.2.2.4"; sha256 = "3fe81a5c7d280618033899e48dc59982cf8513aa7568d24cc7b0e7879eeecf99"; libraryHaskellDepends = [ base bytestring deepseq hashable ]; - jailbreak = true; homepage = "http://community.haskell.org/~aslatter/code/bytearray"; description = "low-level unboxed arrays, with minimal features"; license = stdenv.lib.licenses.bsd3; @@ -154688,10 +149767,10 @@ self: { version = "0.3"; sha256 = "87d8ee55131915b5549a0053b605729222e3d6c79be94f8bb35aa263f50ad6cb"; libraryHaskellDepends = [ base smallcheck smallcheck-series ]; - jailbreak = true; homepage = "http://github.com/jdnavarro/smallcheck-laws"; description = "SmallCheck properties for common laws"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallcheck-lens" = callPackage @@ -154705,10 +149784,10 @@ self: { libraryHaskellDepends = [ base lens smallcheck smallcheck-series transformers ]; - jailbreak = true; homepage = "https://github.com/jdnavarro/smallcheck-lens"; description = "SmallCheck properties for lens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "smallcheck-series" = callPackage @@ -154737,7 +149816,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base vector ]; - jailbreak = true; homepage = "http://github.com/noteed/smallpt-hs"; description = "A Haskell port of the smallpt path tracer"; license = stdenv.lib.licenses.bsd3; @@ -154755,7 +149833,6 @@ self: { libraryHaskellDepends = [ base bytestring deepseq hashable smallarray text utf8-string ]; - jailbreak = true; homepage = "http://community.haskell.org/~aslatter/code/smallstring/"; description = "A Unicode text type, optimized for low memory overhead"; license = stdenv.lib.licenses.bsd3; @@ -154822,7 +149899,6 @@ self: { version = "0.2.0.0"; sha256 = "9b6e462fa7a53608df161ac051e88829447cff44e7463c55ea9d340e6fd40281"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; homepage = "http://github.com/frerich/smartconstructor"; description = "A package exposing a helper function for generating smart constructors"; license = stdenv.lib.licenses.bsd3; @@ -154873,25 +149949,11 @@ self: { base doctest exceptions free Glob hspec mtl process QuickCheck text transformers yaml ]; - jailbreak = true; homepage = "http://github.com/jkarni/smerdyakov#README.md"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "smoothie_0_4_2_2" = callPackage - ({ mkDerivation, aeson, base, linear, text, vector }: - mkDerivation { - pname = "smoothie"; - version = "0.4.2.2"; - sha256 = "be4f9b24ca5a1dc99165b2a1f5484b48b6baf16e5700514689875dbb2a0e4133"; - libraryHaskellDepends = [ aeson base linear text vector ]; - homepage = "https://github.com/phaazon/smoothie"; - description = "Smooth curves via several interpolation modes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "smoothie" = callPackage ({ mkDerivation, aeson, base, linear, text, vector }: mkDerivation { @@ -154929,7 +149991,6 @@ self: { version = "0.0.2"; sha256 = "7e4ec60e6504f23cd275e676863e24177ea72e74b588fb73bf19aaa52e2815de"; libraryHaskellDepends = [ array base directory polyparse ]; - jailbreak = true; homepage = "http://tomahawkins.org"; description = "Parsing and printing SMT-LIB"; license = stdenv.lib.licenses.bsd3; @@ -154998,7 +150059,6 @@ self: { stringsearch text tls transformers transformers-compat x509-store x509-system ]; - jailbreak = true; homepage = "https://github.com/avieth/smtp-mail-ng"; description = "An SMTP client EDSL"; license = stdenv.lib.licenses.bsd3; @@ -155048,10 +150108,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base random split terminal-size ]; - jailbreak = true; homepage = "http://code.alaminium.me/habibalamin/snake"; description = "A basic console snake game"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snake-game" = callPackage @@ -155066,40 +150126,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "snap_0_14_0_7" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal - , clientsession, comonad, configurator, containers, directory - , directory-tree, dlist, either, filepath, hashable, heist, lens - , logict, MonadCatchIO-transformers, mtl, mwc-random, old-time - , pwstore-fast, regex-posix, snap-core, snap-server, stm - , template-haskell, text, time, transformers, unordered-containers - , vector, vector-algorithms, xmlhtml - }: - mkDerivation { - pname = "snap"; - version = "0.14.0.7"; - sha256 = "98c853d2efa8104f89567a69ad271196e034b30ec13dd71051e6ce6119d15709"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring cereal clientsession comonad - configurator containers directory directory-tree dlist either - filepath hashable heist lens logict MonadCatchIO-transformers mtl - mwc-random pwstore-fast regex-posix snap-core snap-server stm text - time transformers unordered-containers vector vector-algorithms - xmlhtml - ]; - executableHaskellDepends = [ - base bytestring containers directory directory-tree filepath - hashable old-time snap-server template-haskell text - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "Top-level package for the Snap Web Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "snap" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring, cereal , clientsession, configurator, containers, deepseq, directory @@ -155112,8 +150138,8 @@ self: { }: mkDerivation { pname = "snap"; - version = "1.0.0.0"; - sha256 = "95f568ce5a4a688076fd1b035fa32a7a243f85dda56260cd95b917f391d69101"; + version = "1.0.0.1"; + sha256 = "293f16c1404793121d3d85abb6287bbb32f5dc1d82b12146d4bb650052322db8"; libraryHaskellDepends = [ aeson attoparsec base bytestring cereal clientsession configurator containers directory directory-tree dlist filepath hashable heist @@ -155144,7 +150170,6 @@ self: { version = "0.1.0"; sha256 = "35387bd97314e8c24219cb2a9d4c6dece133847af14c67884cfeacad123e56a7"; libraryHaskellDepends = [ base http-media snap-core ]; - jailbreak = true; homepage = "http://github.com/zimothy/snap-accept"; description = "Accept header branching for the Snap web framework"; license = stdenv.lib.licenses.mit; @@ -155177,7 +150202,6 @@ self: { aeson aeson-pretty base bytestring clientsession cmdargs snap text unordered-containers utf8-string ]; - jailbreak = true; homepage = "https://github.com/dzhus/snap-auth-cli"; description = "Command-line tool to manage Snap AuthManager database"; license = stdenv.lib.licenses.bsd3; @@ -155203,10 +150227,10 @@ self: { version = "0.1.0.0"; sha256 = "3eba034f63ecd902395b2e359e3565d95511b282a5428fa4b4bf9fd1644ef117"; libraryHaskellDepends = [ base blaze-html clay snap-core ]; - jailbreak = true; homepage = "http://github.com/deckool/snap-blaze-clay"; description = "blaze-html-clay integration for Snap"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-configuration-utilities" = callPackage @@ -155218,35 +150242,8 @@ self: { libraryHaskellDepends = [ base configurator text unordered-containers ]; - jailbreak = true; description = "Methods to manipulate Configurator objects for Snap & Snaplets"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "snap-core_0_9_8_0" = callPackage - ({ mkDerivation, attoparsec, attoparsec-enumerator, base - , blaze-builder, blaze-builder-enumerator, bytestring - , bytestring-mmap, case-insensitive, containers, deepseq, directory - , enumerator, filepath, hashable, HUnit, MonadCatchIO-transformers - , mtl, old-locale, random, regex-posix, text, time, unix - , unix-compat, unordered-containers, vector, zlib-enum - }: - mkDerivation { - pname = "snap-core"; - version = "0.9.8.0"; - sha256 = "47310fcd9c347883f5985c27c1fbcfac8c5783472a01afcc720bcc850622d2db"; - libraryHaskellDepends = [ - attoparsec attoparsec-enumerator base blaze-builder - blaze-builder-enumerator bytestring bytestring-mmap - case-insensitive containers deepseq directory enumerator filepath - hashable HUnit MonadCatchIO-transformers mtl old-locale random - regex-posix text time unix unix-compat unordered-containers vector - zlib-enum - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "Snap: A Haskell Web Framework (core interfaces and types)"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -155278,7 +150275,6 @@ self: { test-framework-quickcheck2 text time transformers transformers-base unix-compat unordered-containers vector zlib ]; - doCheck = false; homepage = "http://snapframework.com/"; description = "Snap: A Haskell Web Framework (core interfaces and types)"; license = stdenv.lib.licenses.bsd3; @@ -155297,7 +150293,6 @@ self: { attoparsec base bytestring case-insensitive hashable network network-uri snap text transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = stdenv.lib.licenses.bsd3; @@ -155332,7 +150327,6 @@ self: { async base containers monad-loops MonadCatchIO-transformers snap stm time transformers ]; - jailbreak = true; homepage = "http://github.com/ocharles/snap-error-collector"; description = "Collect errors in batches and dispatch them"; license = stdenv.lib.licenses.bsd3; @@ -155363,7 +150357,6 @@ self: { base bytestring containers QuickCheck snap-core tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; description = "A collection of useful helpers and utilities for Snap web applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155453,39 +150446,11 @@ self: { base blaze-builder bytestring containers filepath http-types mime-types path-pieces random snap template-haskell text ]; - jailbreak = true; description = "Typesafe URLs for Snap applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "snap-server_0_9_5_1" = callPackage - ({ mkDerivation, attoparsec, attoparsec-enumerator, base - , blaze-builder, blaze-builder-enumerator, bytestring - , case-insensitive, containers, enumerator, HsOpenSSL - , MonadCatchIO-transformers, mtl, network, old-locale, snap-core - , text, time, unix, unix-compat - }: - mkDerivation { - pname = "snap-server"; - version = "0.9.5.1"; - sha256 = "af8f2344b90f701dd1924743d6073546206384d5a904a1338bb784e18c8d3ea3"; - revision = "1"; - editedCabalFile = "7909ad539e7d3f23f3c799d736d1a54d0a9098dd55fd6be75c13b57794bfaa5c"; - configureFlags = [ "-fopenssl" ]; - libraryHaskellDepends = [ - attoparsec attoparsec-enumerator base blaze-builder - blaze-builder-enumerator bytestring case-insensitive containers - enumerator HsOpenSSL MonadCatchIO-transformers mtl network - old-locale snap-core text time unix unix-compat - ]; - jailbreak = true; - homepage = "http://snapframework.com/"; - description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "snap-server" = callPackage ({ mkDerivation, attoparsec, base, base16-bytestring, blaze-builder , bytestring, bytestring-builder, case-insensitive, clock @@ -155519,6 +150484,7 @@ self: { homepage = "http://snapframework.com/"; description = "A web server for the Snap Framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snap-templates" = callPackage @@ -155560,7 +150526,6 @@ self: { hxt io-streams lens mtl process QuickCheck snap snap-core text transformers ]; - jailbreak = true; homepage = "https://github.com/dbp/snap-testing"; description = "A library for BDD-style testing with the Snap Web Framework"; license = stdenv.lib.licenses.bsd3; @@ -155579,7 +150544,6 @@ self: { base bytestring heist http-types MonadCatchIO-transformers mtl snap snap-core text xmlhtml ]; - jailbreak = true; homepage = "https://github.com/LukeHoersten/snap-utils"; description = "Snap Framework utilities"; license = stdenv.lib.licenses.bsd3; @@ -155612,7 +150576,6 @@ self: { libraryHaskellDepends = [ acid-state base mtl snap text transformers ]; - jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-acid-state"; description = "acid-state snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -155638,7 +150601,6 @@ self: { restful-snap snap snap-extras snaplet-persistent text time transformers unordered-containers xmlhtml ]; - jailbreak = true; homepage = "https://github.com/soostone/snaplet-actionlog"; description = "Generic action log snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -155657,7 +150619,6 @@ self: { amqp base bytestring configurator lens monad-control mtl network resource-pool snap transformers ]; - jailbreak = true; homepage = "https://github.com/ixmatus/snaplet-amqp"; description = "Snap framework snaplet for the AMQP library"; license = stdenv.lib.licenses.bsd3; @@ -155680,7 +150641,6 @@ self: { safecopy scientific snap snap-core text time unordered-containers vector ]; - jailbreak = true; description = "Provides an Acid-State backend for the Auth Snaplet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155716,7 +150676,6 @@ self: { base bytestring css-text directory filepath lens snap text utf8-string ]; - jailbreak = true; homepage = "https://github.com/zmthy/snaplet-css-min"; description = "A Snaplet for CSS minification"; license = stdenv.lib.licenses.mit; @@ -155735,7 +150694,6 @@ self: { base bson configurator mtl regex-tdfa snap snap-core text unordered-containers ]; - jailbreak = true; description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155749,8 +150707,8 @@ self: { pname = "snaplet-fay"; version = "0.3.3.13"; sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f"; - revision = "4"; - editedCabalFile = "113ed86052324b14e90472827e2ad4de22e4660afc676a0f3f87becd56660afc"; + revision = "5"; + editedCabalFile = "0331163a9d3af919f0b01408f7a2d3542452e030cf838ec92f9bb6bf6c0f4ccd"; libraryHaskellDepends = [ aeson base bytestring configurator directory fay filepath mtl snap snap-core transformers @@ -155807,7 +150765,6 @@ self: { libraryHaskellDepends = [ base haxl MonadCatchIO-transformers snap transformers ]; - jailbreak = true; homepage = "https://github.com/ChristopherBiscardi/snaplet-haxl"; description = "Snaplet for Facebook's Haxl"; license = stdenv.lib.licenses.bsd3; @@ -155830,7 +150787,6 @@ self: { resource-pool-catchio snap text time transformers unordered-containers ]; - jailbreak = true; homepage = "http://norm2782.com/"; description = "HDBC snaplet for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -155848,7 +150804,6 @@ self: { libraryHaskellDepends = [ base configurator hslogger mtl snap transformers ]; - jailbreak = true; homepage = "https://github.com/ixmatus/snaplet-logger"; description = "Snap framework snaplet for the Logger API library"; license = stdenv.lib.licenses.bsd3; @@ -155873,7 +150828,6 @@ self: { base bytestring configurator filepath heist lens snap snap-loader-static text xmlhtml ]; - jailbreak = true; homepage = "https://github.com/HaskellCNOrg/snaplet-i18n"; description = "snaplet-i18n"; license = stdenv.lib.licenses.bsd3; @@ -155893,7 +150847,6 @@ self: { base bytestring configurator http-client influxdb lens monad-control mtl network snap text transformers ]; - jailbreak = true; homepage = "https://github.com/ixmatus/snaplet-influxdb"; description = "Snap framework snaplet for the InfluxDB library"; license = stdenv.lib.licenses.bsd3; @@ -155912,7 +150865,6 @@ self: { base directory filepath heist lss snap text xmlhtml ]; testHaskellDepends = [ base hspec-snap hspec2 lens snap text ]; - jailbreak = true; homepage = "https://github.com/dbp/lss"; description = "Lexical Style Sheets - Snap Web Framework adaptor"; license = stdenv.lib.licenses.bsd3; @@ -155929,7 +150881,6 @@ self: { libraryHaskellDepends = [ base configurator mandrill mtl network snap transformers ]; - jailbreak = true; homepage = "https://github.com/ixmatus/snaplet-mandrill"; description = "Snap framework snaplet for the Mandrill API library"; license = stdenv.lib.licenses.bsd3; @@ -155951,7 +150902,6 @@ self: { MonadCatchIO-transformers mongoDB mtl parsec regular safe snap snap-core template-haskell text time ]; - jailbreak = true; description = "Snap Framework MongoDB support as Snaplet"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -155967,7 +150917,6 @@ self: { libraryHaskellDepends = [ base lens mongoDB mtl snap text transformers ]; - jailbreak = true; homepage = "https://github.com/Palmik/snaplet-mongodb-minimalistic"; description = "Minimalistic MongoDB Snaplet"; license = stdenv.lib.licenses.bsd3; @@ -155989,7 +150938,6 @@ self: { MonadCatchIO-transformers mtl mysql mysql-simple resource-pool-catchio snap text transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/ibotty/snaplet-mysql-simple"; description = "mysql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -156017,7 +150965,6 @@ self: { aeson base bytestring bytestring-show HUnit test-framework test-framework-hunit text ]; - jailbreak = true; homepage = "https://github.com/HaskellCNOrg/snaplet-oauth"; description = "snaplet-oauth"; license = stdenv.lib.licenses.bsd3; @@ -156041,7 +150988,6 @@ self: { persistent-postgresql persistent-template readable resource-pool resourcet safe snap text time transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/soostone/snaplet-persistent"; description = "persistent snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -156056,14 +151002,13 @@ self: { }: mkDerivation { pname = "snaplet-postgresql-simple"; - version = "1.0"; - sha256 = "79ecdd55c04ef2f3f6a7ba4c21eb7f2c42c824fe016b6308623b81257d96c22d"; + version = "1.0.1.0"; + sha256 = "c747f9a0145c22f36441bab504a45ab20fc68ad46a8383c5f4db6686cd0dee7d"; libraryHaskellDepends = [ base bytestring clientsession configurator lens lifted-base monad-control mtl postgresql-simple resource-pool snap text transformers transformers-base unordered-containers ]; - jailbreak = true; homepage = "https://github.com/mightybyte/snaplet-postgresql-simple"; description = "postgresql-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -156081,7 +151026,6 @@ self: { libraryHaskellDepends = [ base configurator mtl postmark snap text transformers ]; - jailbreak = true; homepage = "https://github.com/LukeHoersten/snaplet-postmark"; description = "Postmark snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -156118,7 +151062,6 @@ self: { aeson base blaze-builder bytestring configurator heist http-conduit lens MonadCatchIO-transformers mtl snap text transformers ]; - jailbreak = true; homepage = "http://github.com/mikeplus64/snaplet-recaptcha"; description = "A ReCAPTCHA verification snaplet with Heist integration and connection sharing"; license = stdenv.lib.licenses.bsd3; @@ -156136,7 +151079,6 @@ self: { libraryHaskellDepends = [ base configurator hedis lens mtl network snap text transformers ]; - jailbreak = true; homepage = "https://github.com/dzhus/snaplet-redis/"; description = "Redis support for Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -156158,7 +151100,6 @@ self: { data-lens-template easy-file hedis mtl snap snap-core snaplet-redis text utf8-string websockets websockets-snap ]; - jailbreak = true; homepage = "https://github.com/dzhus/snaplet-redson/"; description = "CRUD for JSON data with Redis storage"; license = stdenv.lib.licenses.bsd3; @@ -156178,7 +151119,6 @@ self: { aeson base blaze-builder bytestring case-insensitive http-media lens mtl snap snap-accept snap-core text utf8-string xmlhtml ]; - jailbreak = true; homepage = "http://github.com/zimothy/snaplet-rest"; description = "REST resources for the Snap web framework"; license = stdenv.lib.licenses.mit; @@ -156198,7 +151138,6 @@ self: { aeson base containers data-lens data-lens-template mtl riak riak-protobuf snap snap-core time transformers ]; - jailbreak = true; homepage = "http://github.com/statusfailed/snaplet-riak"; description = "A Snaplet for the Riak database"; license = stdenv.lib.licenses.mit; @@ -156217,7 +151156,6 @@ self: { base bytestring configurator directory filepath mtl process snap snap-core transformers ]; - jailbreak = true; homepage = "https://github.com/lukerandall/snaplet-sass"; description = "Sass integration for Snap with request- and pre-compilation"; license = stdenv.lib.licenses.bsd3; @@ -156254,7 +151192,6 @@ self: { base bytestring containers monad-control mtl resource-pool sednaDBXML snap ]; - jailbreak = true; description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -156272,7 +151209,6 @@ self: { adjunctions base blaze-html bytestring configurator lens ses-html snap text transformers ]; - jailbreak = true; description = "Snaplet for the ses-html package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -156280,28 +151216,27 @@ self: { "snaplet-sqlite-simple" = callPackage ({ mkDerivation, aeson, base, bytestring, clientsession - , configurator, containers, direct-sqlite, directory, errors, HUnit - , lens, MonadCatchIO-transformers, mtl, SafeSemaphore, snap + , configurator, containers, direct-sqlite, directory, errors + , exceptions, HUnit, lens, lifted-base, monad-control, mtl, snap , snap-core, sqlite-simple, stm, test-framework - , test-framework-hunit, text, time, transformers + , test-framework-hunit, text, time, transformers, transformers-base , unordered-containers }: mkDerivation { pname = "snaplet-sqlite-simple"; - version = "0.4.8.3"; - sha256 = "a3dbe2a2a3f8301454dba81fe0d46081844b76eaef49b3fa609cb0a1d39e8059"; + version = "1.0.0.0"; + sha256 = "d787e7cadbabb380ac4a889d9d21ca1e94ead91ef0864788471d1a62f7189f38"; libraryHaskellDepends = [ aeson base bytestring clientsession configurator direct-sqlite lens - MonadCatchIO-transformers mtl snap sqlite-simple text transformers - unordered-containers + lifted-base monad-control mtl snap sqlite-simple text transformers + transformers-base unordered-containers ]; testHaskellDepends = [ aeson base bytestring clientsession configurator containers - directory errors HUnit lens MonadCatchIO-transformers mtl - SafeSemaphore snap snap-core sqlite-simple stm test-framework - test-framework-hunit text time transformers unordered-containers + directory errors exceptions HUnit lens mtl snap snap-core + sqlite-simple stm test-framework test-framework-hunit text time + transformers unordered-containers ]; - jailbreak = true; homepage = "https://github.com/nurpax/snaplet-sqlite-simple"; description = "sqlite-simple snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -156321,7 +151256,6 @@ self: { base bytestring configurator heist lens-family-core mtl snap stripe text text-format transformers xmlhtml ]; - jailbreak = true; homepage = "https://github.com/LukeHoersten/snaplet-stripe"; description = "Stripe snaplet for the Snap Framework"; license = stdenv.lib.licenses.bsd3; @@ -156340,7 +151274,6 @@ self: { base bytestring containers curl data-hash haskell98 MissingH mtl network snap snap-core ]; - jailbreak = true; description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -156359,7 +151292,6 @@ self: { base bytestring cereal clientsession containers hashtables mtl PSQueue random regex-posix snap snap-core time ]; - jailbreak = true; description = "Typed session snaplets and continuation-based programming for the Snap web framework"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -156387,7 +151319,6 @@ self: { hspec hspec-core hspec-snap lens mtl snap snaplet-redis text unordered-containers xmlhtml ]; - jailbreak = true; homepage = "https://github.com/dbp/snaplet-wordpress"; description = "A snaplet that communicates with wordpress over its api"; license = stdenv.lib.licenses.bsd3; @@ -156420,10 +151351,10 @@ self: { version = "0.1.0.0"; sha256 = "d15d858942f09f91723750f6e927f6dc56373d2ff1d0427c47019deddbd8234d"; libraryHaskellDepends = [ base bytestring conduit snappy ]; - jailbreak = true; homepage = "http://github.com/tatac1/snappy-conduit/"; description = "Conduit bindings for Snappy (see snappy package)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snappy-framing" = callPackage @@ -156445,7 +151376,6 @@ self: { version = "0.1"; sha256 = "b35a1ca7f4412df2253b111a555618e02bd9aa3890f05fad924bcc78f8d65c9e"; libraryHaskellDepends = [ base bytestring iteratee snappy ]; - jailbreak = true; homepage = "http://github.com/iand675/snappy-iteratee"; description = "An enumeratee that uses Google's snappy compression library"; license = stdenv.lib.licenses.bsd3; @@ -156466,7 +151396,6 @@ self: { listlike-instances MonadCatchIO-transformers transformers vector word24 ]; - jailbreak = true; homepage = "http://www.tiresiaspress.us/haskell/sndfile-enumerators"; description = "Audio file reading/writing"; license = stdenv.lib.licenses.bsd3; @@ -156484,10 +151413,10 @@ self: { libraryHaskellDepends = [ base classy-prelude containers lens linear mtl ncurses transformers ]; - jailbreak = true; homepage = "https://github.com/pmiddend/sneakyterm"; description = "Tiny, declarative wrapper around ncurses"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sneathlane-haste" = callPackage @@ -156554,9 +151483,32 @@ self: { cipher-aes cipher-des containers crypto-cipher-types cryptohash mtl network network-info random securemem text time ]; - jailbreak = true; description = "API for write snmp client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "snorkels" = callPackage + ({ mkDerivation, ansi-terminal, base, bimap, containers + , monad-loops, optparse-applicative, parsec, random + }: + mkDerivation { + pname = "snorkels"; + version = "0.2.0.0"; + sha256 = "3b9d7f7c50279153dbb6b9f066d88a32178dc52e30ad95293cfbf965a7a6c251"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bimap containers monad-loops + optparse-applicative parsec random + ]; + executableHaskellDepends = [ + ansi-terminal base bimap containers monad-loops + optparse-applicative parsec random + ]; + description = "Strategic board game of medium complexity"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "snow-white" = callPackage @@ -156604,6 +151556,38 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "snowflake-core" = callPackage + ({ mkDerivation, base, QuickCheck, time-exts }: + mkDerivation { + pname = "snowflake-core"; + version = "0.1.0.1"; + sha256 = "442427fa86bee84c422c3c14e02e0f33f1d04504172dfd2620c50b3aa2ef8954"; + libraryHaskellDepends = [ base time-exts ]; + testHaskellDepends = [ base QuickCheck ]; + homepage = "https://github.com/jiakai0419/snowflake#readme"; + description = "twitter's snowflake"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "snowflake-server" = callPackage + ({ mkDerivation, base, bytestring, containers, mtl, random + , snap-core, snap-server, snowflake-core + }: + mkDerivation { + pname = "snowflake-server"; + version = "0.1.0.0"; + sha256 = "af3baefdf4c9c51c7c0eb1441b24af8d9185ef41fae3890f961effbdca789c1c"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring containers mtl random snap-core snap-server + snowflake-core + ]; + description = "snowflake http server"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "snowglobe" = callPackage ({ mkDerivation, base, bytestring, containers, gl-capture, GLUT , OpenGL, OpenGLRaw, random @@ -156622,31 +151606,6 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; - "soap_0_2_3_0" = callPackage - ({ mkDerivation, base, bytestring, conduit, configurator - , data-default, exceptions, hspec, http-client, http-types, HUnit - , iconv, mtl, resourcet, text, unordered-containers, xml-conduit - , xml-conduit-writer, xml-types - }: - mkDerivation { - pname = "soap"; - version = "0.2.3.0"; - sha256 = "9d249967e3e6394749397a89c70c9aba5e5454ea4c2592ffd00aaa0ca2e98fd1"; - libraryHaskellDepends = [ - base bytestring conduit configurator data-default exceptions - http-client http-types iconv mtl resourcet text - unordered-containers xml-conduit xml-conduit-writer xml-types - ]; - testHaskellDepends = [ - base bytestring hspec HUnit text unordered-containers xml-conduit - xml-conduit-writer - ]; - homepage = "https://bitbucket.org/dpwiz/haskell-soap"; - description = "SOAP client tools"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "soap" = callPackage ({ mkDerivation, base, bytestring, conduit, configurator , data-default, exceptions, hspec, http-client, http-types, HUnit @@ -156686,6 +151645,7 @@ self: { homepage = "https://bitbucket.org/dpwiz/haskell-soap"; description = "TLS-enabled SOAP transport (using openssl bindings)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "soap-tls" = callPackage @@ -156736,20 +151696,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "socket_0_6_0_1" = callPackage - ({ mkDerivation, async, base, bytestring }: - mkDerivation { - pname = "socket"; - version = "0.6.0.1"; - sha256 = "d6b2a2bbb331997314a4b94a21530ea36d00888cbc86ab59c9a33e8ed1f03d20"; - libraryHaskellDepends = [ base bytestring ]; - testHaskellDepends = [ async base bytestring ]; - homepage = "https://github.com/lpeterse/haskell-socket"; - description = "An extensible socket library"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "socket" = callPackage ({ mkDerivation, async, base, bytestring, tasty, tasty-hunit }: mkDerivation { @@ -156775,7 +151721,6 @@ self: { testHaskellDepends = [ async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; homepage = "https://github.com/lpeterse/haskell-socket"; description = "An extensible socket library"; license = stdenv.lib.licenses.mit; @@ -156806,9 +151751,9 @@ self: { aeson attoparsec base bytestring engine-io mtl stm text transformers unordered-containers vector ]; - jailbreak = true; homepage = "http://github.com/ocharles/engine.io"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "socket-sctp" = callPackage @@ -156820,7 +151765,6 @@ self: { libraryHaskellDepends = [ base bytestring socket ]; librarySystemDepends = [ sctp ]; testHaskellDepends = [ base bytestring socket ]; - jailbreak = true; homepage = "https://github.com/lpeterse/haskell-socket-sctp"; description = "STCP socket extensions library"; license = stdenv.lib.licenses.mit; @@ -156851,7 +151795,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text transformers-base unordered-containers vector wai warp ]; - jailbreak = true; description = "Socket.IO server"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -156905,7 +151848,6 @@ self: { version = "0.11.0.3"; sha256 = "ea61f6725d01cf581a086738e9c18bbf567a428545d582824280aa48150b1a03"; libraryHaskellDepends = [ base containers mtl ]; - jailbreak = true; description = "Sodium Reactive Programming (FRP) System"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -156918,10 +151860,10 @@ self: { version = "0.12.1"; sha256 = "594591337ba8244c7387afb6f68fd063551a20edadd9f7792c0816d6394cc405"; libraryHaskellDepends = [ base cairo gtk old-time stm ]; - jailbreak = true; homepage = "http://projects.haskell.org/gtk2hs/"; description = "GUI functions as used in the book \"The Haskell School of Expression\""; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "solga" = callPackage @@ -156987,6 +151929,7 @@ self: { homepage = "https://github.com/sannsyn/solr"; description = "A minimal Solr client library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sonic-visualiser" = callPackage @@ -157023,7 +151966,6 @@ self: { testHaskellDepends = [ base bindings-sophia bytestring directory tasty tasty-hunit ]; - jailbreak = true; description = "Bindings to Sophia library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -157052,25 +151994,11 @@ self: { version = "0.0.1"; sha256 = "0340a293e80b8babb39a7041a24ef7328d76510c5056ed6d5b9a68c23eecec67"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Efficient, type-safe sorted sequences"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "sorted-list_0_1_6_1" = callPackage - ({ mkDerivation, base, deepseq }: - mkDerivation { - pname = "sorted-list"; - version = "0.1.6.1"; - sha256 = "07eda22facb55bd2c135a8a2ada96e5d7f0a2d86f471cdeb4eb3fd3ab37ce0b4"; - libraryHaskellDepends = [ base deepseq ]; - homepage = "https://github.com/Daniel-Diaz/sorted-list/blob/master/README.md"; - description = "Type-enforced sorted lists and related functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "sorted-list" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -157090,10 +152018,10 @@ self: { version = "1.0.0.1"; sha256 = "b60861d8dca5c884544cd255f33c62b65cc1aece9e2a687352329f7b705d5bc4"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/joneshf/sorting"; description = "Utils for sorting"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sorty" = callPackage @@ -157105,9 +152033,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring ]; - jailbreak = true; description = "Sort lines per file size"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sound-collage" = callPackage @@ -157128,7 +152056,6 @@ self: { storablevector-carray synthesizer-core temporary transformers utility-ht ]; - jailbreak = true; description = "Approximate a song from other pieces of sound"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157189,7 +152116,6 @@ self: { testHaskellDepends = [ aeson base bytestring process text unordered-containers utf8-string ]; - doCheck = false; description = "Implementation of source maps as proposed by Google and Mozilla"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -157292,10 +152218,10 @@ self: { version = "0.1.0.0"; sha256 = "579aaef6f85be8355094c8353295a5e11443664d1c9308c395a4f42812641c85"; libraryHaskellDepends = [ base vector-space ]; - jailbreak = true; homepage = "http://code.haskell.org/data-spacepart"; description = "Space partition data structures. Currently only a QuadTree."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "spaceprobe" = callPackage @@ -157330,7 +152256,6 @@ self: { executableHaskellDepends = [ base containers gloss lens linear MonadRandom mtl netwire ]; - jailbreak = true; homepage = "https://github.com/vtan/spanout"; description = "A breakout clone written in netwire and gloss"; license = stdenv.lib.licenses.bsd3; @@ -157383,7 +152308,6 @@ self: { test-framework test-framework-quickcheck2 test-framework-th transformers vector ]; - jailbreak = true; homepage = "http://github.com/ekmett/sparse"; description = "A playground of sparse linear algebra primitives using Morton ordering"; license = stdenv.lib.licenses.bsd3; @@ -157502,7 +152426,6 @@ self: { editedCabalFile = "adba306bc3280e794c4f69da6fb87346d53bd5c72bd9940069d68d1fc194ce61"; libraryHaskellDepends = [ base transformers ]; testHaskellDepends = [ base tasty tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/phadej/spdx"; description = "SPDX license expression language"; license = stdenv.lib.licenses.bsd3; @@ -157528,7 +152451,6 @@ self: { version = "1.0.0.1"; sha256 = "2def687fadb58e12f15696e0c3e2b0206063884e9e41fd214db663028253c830"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157653,10 +152575,10 @@ self: { executableHaskellDepends = [ base edit-distance parseargs phonetic-code sqlite ]; - jailbreak = true; homepage = "https://github.com/gregwebs/haskell-spell-suggest"; description = "Spelling suggestion tool with library and command-line interfaces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sphero" = callPackage @@ -157670,7 +152592,6 @@ self: { libraryHaskellDepends = [ base bytestring cereal containers mtl simple-bluetooth ]; - jailbreak = true; description = "Orbotix Sphero client library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -157719,7 +152640,6 @@ self: { base bytestring containers data-default elerea GLFW JuicyPixels JuicyPixels-repa OpenGL ]; - jailbreak = true; homepage = "http://github.com/crockeo/spice"; description = "An FRP-based game engine written in Haskell"; license = stdenv.lib.licenses.mit; @@ -157742,12 +152662,11 @@ self: { process random rosezipper stm webkit ]; executablePkgconfigDepends = [ libsoup ]; - jailbreak = true; homepage = "http://github.com/Tener/spike"; description = "Experimental web browser"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) libsoup;}; + }) {inherit (pkgs.gnome2) libsoup;}; "spine" = callPackage ({ mkDerivation, base }: @@ -157768,10 +152687,10 @@ self: { version = "0.0.1.0"; sha256 = "59d7b176ddafbb73aff8dd4b1a8f9557f748728e4f5262a9575108ff6e62d6ca"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/expipiplus1/spir-v"; description = "Some utilities for reading and writing SPIR-V files"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splay" = callPackage @@ -157835,7 +152754,6 @@ self: { base cmdargs doctest filepath MissingH repa repa-algorithms repa-io tasty tasty-hunit tasty-quickcheck vector ]; - jailbreak = true; homepage = "http://michael.orlitzky.com/code/spline3.php"; description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme"; license = stdenv.lib.licenses.gpl3; @@ -157869,7 +152787,6 @@ self: { version = "0.1.4.3"; sha256 = "7e69989206e26bb28f46cc8cf1edff5e439aa6be4adbc5b09118d6fdc1aa3bc5"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://code.haskell.org/~byorgey/code/split"; description = "Combinator library for splitting lists"; license = stdenv.lib.licenses.bsd3; @@ -157913,7 +152830,6 @@ self: { base numeric-prelude soxlib storablevector synthesizer-core transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/split-record/"; description = "Split a big audio file into pieces at positions of silence"; license = stdenv.lib.licenses.bsd3; @@ -157942,10 +152858,10 @@ self: { executableHaskellDepends = [ base directory filepath parsec range ]; - jailbreak = true; homepage = "https://bitbucket.org/robertmassaioli/splitter"; description = "Use numerical ranges to split out certain lines from a file"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "splot" = callPackage @@ -158023,7 +152939,6 @@ self: { aeson base bytestring lens lens-aeson pipes text unordered-containers wreq ]; - jailbreak = true; homepage = "https://github.com/davnils/spoty"; description = "Spotify web API wrapper"; license = stdenv.lib.licenses.bsd3; @@ -158052,10 +152967,10 @@ self: { version = "0.1.0.0"; sha256 = "d311a5b8d1a9a23d02623142b5d5451290ac3689038412d7325ab0f30115dbeb"; libraryHaskellDepends = [ base lens mtl vector ]; - jailbreak = true; homepage = "https://github.com/relrod/spritz"; description = "An implementation of the Spritz RC4-like stream cipher in Haskell"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sproxy" = callPackage @@ -158132,8 +153047,8 @@ self: { }: mkDerivation { pname = "spy"; - version = "0.10"; - sha256 = "f0020bed11e5e8c42dab4e2f04f00bb0f19a2251738596eca1fcd704408776ac"; + version = "0.14"; + sha256 = "c257084e554d50bc1bf76029e292ae61af6a73f922320f7cf2bac306ac0565f5"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -158162,7 +153077,6 @@ self: { base containers exceptions monad-control text transformers transformers-base ]; - jailbreak = true; homepage = "https://github.com/philopon/sql-simple"; description = "common middle-level sql client"; license = stdenv.lib.licenses.mit; @@ -158180,7 +153094,6 @@ self: { libraryHaskellDepends = [ base data-default-class mysql mysql-simple sql-simple text ]; - jailbreak = true; homepage = "https://github.com/philopon/sql-simple"; description = "mysql backend for sql-simple"; license = stdenv.lib.licenses.mit; @@ -158199,7 +153112,6 @@ self: { base data-default-class monad-control resource-pool sql-simple text time ]; - jailbreak = true; homepage = "https://github.com/philopon/sql-simple"; description = "conection pool for sql-simple"; license = stdenv.lib.licenses.mit; @@ -158217,7 +153129,6 @@ self: { libraryHaskellDepends = [ base data-default-class postgresql-simple sql-simple text ]; - jailbreak = true; homepage = "https://github.com/philopon/sql-simple"; description = "postgresql backend for sql-simple"; license = stdenv.lib.licenses.mit; @@ -158231,7 +153142,6 @@ self: { version = "0.3.0"; sha256 = "c18dc8f87af50e07ee088108e67a66726214c47ab1a19c70e268254cd609511e"; libraryHaskellDepends = [ base sql-simple sqlite-simple ]; - jailbreak = true; homepage = "https://github.com/philopon/sql-simple"; description = "sqlite backend for sql-simple"; license = stdenv.lib.licenses.mit; @@ -158290,6 +153200,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "sqlite-simple-errors" = callPackage + ({ mkDerivation, base, mtl, parsec, sqlite-simple, text }: + mkDerivation { + pname = "sqlite-simple-errors"; + version = "0.3.0.0"; + sha256 = "0d8cb4b9b51aeadc6daf112ae75b2b38a13f2da2fba574c2b4d2fafa18600c9d"; + libraryHaskellDepends = [ base parsec sqlite-simple text ]; + testHaskellDepends = [ base mtl sqlite-simple text ]; + homepage = "https://github.com/caneroj1/sqlite-simple-errors"; + description = "Wrapper around errors from sqlite-simple"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sqlite-simple-typed" = callPackage ({ mkDerivation, base, haskell-src-meta, sqlite, sqlite-simple , template-haskell, typedquery, utf8-string @@ -158302,7 +153225,6 @@ self: { base haskell-src-meta sqlite sqlite-simple template-haskell typedquery utf8-string ]; - jailbreak = true; homepage = "https://github.com/tolysz/sqlite-simple-typed"; description = "Typed extension to sqlite simple"; license = stdenv.lib.licenses.bsd3; @@ -158322,20 +153244,20 @@ self: { }) {}; "squeeze" = callPackage - ({ mkDerivation, base, Cabal, directory, factory, filepath, mtl - , QuickCheck, random, toolshed + ({ mkDerivation, base, Cabal, data-default, directory, factory + , filepath, mtl, QuickCheck, random, toolshed }: mkDerivation { pname = "squeeze"; - version = "1.0.4.8"; - sha256 = "9d67bb75f209427f4866ad9835b67e8057e2275349a1ef8f820ebbdbafcaf190"; + version = "1.0.4.12"; + sha256 = "9bf9f143c022d366144e1b4dd6f00b5c627aef88ffecbab7f5c453311f87049c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base Cabal directory factory filepath mtl toolshed + base Cabal data-default directory factory filepath mtl toolshed ]; executableHaskellDepends = [ - base Cabal factory filepath mtl random toolshed + base Cabal data-default factory filepath mtl random toolshed ]; testHaskellDepends = [ base factory QuickCheck toolshed ]; homepage = "http://functionalley.eu/Squeeze/squeeze.html"; @@ -158423,6 +153345,7 @@ self: { homepage = "https://github.com/jekor/haskell-sscgi"; description = "Simple SCGI Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sscript" = callPackage @@ -158462,11 +153385,11 @@ self: { pseudomacros QuickCheck tasty tasty-hunit tasty-quickcheck template-haskell th-lift-instances ]; - jailbreak = true; doCheck = false; homepage = "http://hub.darcs.net/ganesh/ssh"; description = "A pure-Haskell SSH server library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sshd-lint" = callPackage @@ -158485,9 +153408,9 @@ self: { testHaskellDepends = [ base containers hspec keyword-args nagios-check parsec ]; - jailbreak = true; description = "Check sshd configuration for adherence to best practices"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sshtun" = callPackage @@ -158533,7 +153456,6 @@ self: { data-default http-conduit http-types mtl network-conduit text wai wai-extra warp ]; - jailbreak = true; homepage = "http://github.com/erudify/sssp/"; description = "HTTP proxy for S3"; license = stdenv.lib.licenses.bsd3; @@ -158581,10 +153503,10 @@ self: { version = "0.1.0.0"; sha256 = "410f316118037f3fed6dcd58c667b5ad278f4e5bac6053c6366d8b59a9209d93"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://hub.darcs.net/jmcarthur/stable-heap"; description = "Purely functional stable heaps (fair priority queues)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stable-maps" = callPackage @@ -158594,10 +153516,10 @@ self: { version = "0.0.5"; sha256 = "7ce82ad8e32fadbcbd5f5c42df67e27e7f951da0d58e149b48c615b9a66f51ea"; libraryHaskellDepends = [ base containers ghc-prim ]; - jailbreak = true; homepage = "http://github.com/ekmett/stable-maps"; description = "Heterogeneous maps keyed by StableNames"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stable-marriage" = callPackage @@ -158607,7 +153529,6 @@ self: { version = "0.1.1.0"; sha256 = "12da2128ef67c7f30e9bf1fef0ccffc323bbdfc0699126945c422a52a25d09b2"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "http://github.com/cutsea110/stable-marriage"; description = "algorithms around stable marriage"; license = stdenv.lib.licenses.bsd3; @@ -158621,9 +153542,9 @@ self: { version = "0.3.1"; sha256 = "fd8ddc1d5a6200b8cfb192195d0f078545d85088bd6f04aa3f76b310063a65e7"; libraryHaskellDepends = [ base ghc-prim hashtables ]; - jailbreak = true; description = "Memoization based on argument identity"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stable-tree" = callPackage @@ -158646,7 +153567,6 @@ self: { base bytestring bytestring-arbitrary cereal containers mtl objectid QuickCheck tasty tasty-quickcheck text ]; - jailbreak = true; homepage = "https://github.com/tsuraan/stable-tree"; description = "Trees whose branches are resistant to change"; license = stdenv.lib.licenses.bsd3; @@ -158661,8 +153581,8 @@ self: { }: mkDerivation { pname = "stache"; - version = "0.1.6"; - sha256 = "078e223a2549f08ee48b2c9d40f7242992b5870e02eef2f9ef1ea8d542ff4e36"; + version = "0.1.7"; + sha256 = "3c34eec3b6b8cfc1b3c5887ab2b209e277938e897c7b3787c3baf9f7a9d0ae30"; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory exceptions filepath megaparsec mtl template-haskell text unordered-containers @@ -158678,59 +153598,63 @@ self: { }) {}; "stack" = callPackage - ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base - , base-compat, base16-bytestring, base64-bytestring, binary - , binary-tagged, blaze-builder, byteable, bytestring, Cabal - , conduit, conduit-extra, containers, cryptohash - , cryptohash-conduit, deepseq, directory, edit-distance, either - , enclosed-exceptions, errors, exceptions, extra, fast-logger - , filelock, filepath, fsnotify, generic-deriving, gitrev, hashable - , hastache, hit, hpack, hpc, hspec, http-client, http-client-tls - , http-conduit, http-types, lifted-base, microlens, monad-control - , monad-logger, monad-unlift, mtl, open-browser + ({ 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, edit-distance + , either, enclosed-exceptions, errors, exceptions, extra + , fast-logger, filelock, filepath, fsnotify, generic-deriving + , gitrev, 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, pretty, process , project-template, QuickCheck, regex-applicative-text, resourcet - , retry, safe, semigroups, split, stm, streaming-commons, tar - , template-haskell, temporary, text, text-binary, time, tls - , transformers, transformers-base, unix, unix-compat + , retry, safe, semigroups, smallcheck, split, stm, store + , streaming-commons, tar, template-haskell, temporary, text + , text-binary, 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.1.2"; - sha256 = "fc836b24fdeac54244fc79b6775d5edee146b7e552ad8e69596c7cc2f2b10625"; - revision = "8"; - editedCabalFile = "0eb7cd69c79c481cd463ccd8e33cc8e03bc79169f084c8f9bf3ef006da7c3a12"; + version = "1.2.0"; + sha256 = "6a13a98413ea5f1a0642d9080892e6bcd996a17baa4d61521c0e0f3d9bb810b3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson ansi-terminal async attoparsec base base-compat - base16-bytestring base64-bytestring binary binary-tagged - blaze-builder byteable bytestring Cabal conduit conduit-extra - containers cryptohash cryptohash-conduit deepseq directory - edit-distance either enclosed-exceptions errors exceptions extra - fast-logger filelock filepath fsnotify generic-deriving hashable - hastache hit hpack hpc http-client http-client-tls http-conduit - http-types lifted-base microlens monad-control monad-logger - monad-unlift mtl open-browser optparse-applicative path path-io - persistent persistent-sqlite persistent-template pretty process - project-template regex-applicative-text resourcet retry safe - semigroups split stm streaming-commons tar template-haskell - temporary text text-binary time tls transformers transformers-base - unix unix-compat unordered-containers vector + 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 edit-distance either enclosed-exceptions errors + exceptions extra fast-logger 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 pretty process project-template + regex-applicative-text resourcet retry safe semigroups split stm + store streaming-commons tar template-haskell temporary text + text-binary 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 filelock filepath gitrev - http-client lifted-base microlens monad-control monad-logger mtl - optparse-applicative optparse-simple path path-io text transformers + 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 ]; testHaskellDepends = [ - attoparsec base Cabal conduit conduit-extra containers cryptohash - directory exceptions hspec http-conduit monad-logger path path-io - QuickCheck resourcet retry temporary text transformers + attoparsec base bytestring Cabal conduit conduit-extra containers + cryptohash directory exceptions filepath hspec 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 ]; doCheck = false; preCheck = "export HOME=$TMPDIR"; @@ -158778,8 +153702,8 @@ self: { }: mkDerivation { pname = "stack-prism"; - version = "0.1.5"; - sha256 = "ead22ecccaa5110b9ceba98077a5101e97ac21675f9d74ff01df4a01cd41540f"; + version = "0.1.6"; + sha256 = "493ac24313cdcaf64e86cd5e8081fcb2ffda5048278057ca9d803c7939949ddb"; libraryHaskellDepends = [ base profunctors tagged template-haskell transformers ]; @@ -158852,10 +153776,10 @@ self: { stackage-install stackage-sandbox stackage-setup stackage-update stackage-upload ]; - doCheck = false; homepage = "https://www.stackage.org/"; description = "Dummy package forcing installation of other Stackage packages"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-build-plan" = callPackage @@ -158926,55 +153850,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stackage-curator_0_14_0" = callPackage - ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async - , base, base16-bytestring, binary, binary-orphans, binary-tagged - , blaze-html, byteable, bytestring, Cabal, classy-prelude-conduit - , conduit, conduit-extra, containers, cryptohash - , cryptohash-conduit, data-default-class, directory, exceptions - , filepath, hashable, hspec, html-conduit, http-client - , http-client-tls, http-conduit, lucid, mime-types, monad-unlift - , monad-unlift-ref, mono-traversable, mtl, old-locale - , optparse-applicative, optparse-simple, process, QuickCheck - , resourcet, safe, semigroups, stackage-cli, stackage-install, stm - , streaming-commons, syb, system-fileio, system-filepath, tar - , temporary, text, time, transformers, unix-compat - , unordered-containers, utf8-string, vector, xml-conduit, xml-types - , yaml, zlib - }: - mkDerivation { - pname = "stackage-curator"; - version = "0.14.0"; - sha256 = "13ad2b94821402f533d0e5b4ac38ea1107fa015ab1a5d997f03f0ae05d38fa67"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson amazonka amazonka-core amazonka-s3 async base - base16-bytestring binary binary-orphans binary-tagged blaze-html - byteable bytestring Cabal classy-prelude-conduit conduit - conduit-extra containers cryptohash cryptohash-conduit - data-default-class directory exceptions filepath hashable - html-conduit http-client http-client-tls http-conduit lucid - mime-types monad-unlift monad-unlift-ref mono-traversable mtl - old-locale process resourcet safe semigroups stackage-install stm - streaming-commons syb system-fileio system-filepath tar temporary - text time transformers unix-compat unordered-containers utf8-string - vector xml-conduit xml-types yaml zlib - ]; - executableHaskellDepends = [ - aeson base http-client http-client-tls optparse-applicative - optparse-simple stackage-cli system-filepath text - ]; - testHaskellDepends = [ - base Cabal classy-prelude-conduit containers directory hspec - http-client http-client-tls QuickCheck text yaml - ]; - homepage = "https://github.com/fpco/stackage"; - description = "Tools for curating Stackage bundles"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stackage-curator" = callPackage ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal @@ -159112,6 +153987,7 @@ self: { homepage = "https://www.stackage.org/package/stackage-setup"; description = "An executable for downloading a Haskell setup"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stackage-types" = callPackage @@ -159147,30 +154023,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stackage-upload_0_1_0_5" = callPackage - ({ mkDerivation, aeson, base, bytestring, directory, filepath - , http-client, http-client-tls, http-types, optparse-applicative - , process, stackage-cli, temporary, text - }: - mkDerivation { - pname = "stackage-upload"; - version = "0.1.0.5"; - sha256 = "f1353781fc12b09682620c6629ee4edeca3c8ca16001109080d7d0fb3dd3b33b"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring directory filepath http-client - http-client-tls http-types process temporary text - ]; - executableHaskellDepends = [ - base optparse-applicative stackage-cli - ]; - homepage = "https://github.com/fpco/stackage-upload"; - description = "A more secure version of cabal upload which uses HTTPS"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stackage-upload" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , http-client, http-client-tls, http-types, optparse-applicative @@ -159201,7 +154053,6 @@ self: { version = "0.0.0.1"; sha256 = "657bcd87ed4ffdf49461529faf3c292a8a480fce8c88c5af1eaa23b1c7e9d765"; libraryHaskellDepends = [ base mtl template-haskell ]; - jailbreak = true; homepage = "https://github.com/HaskellZhangSong/TopdownDerive"; description = "This package will derive class instance along the data type declaration tree"; license = stdenv.lib.licenses.mit; @@ -159214,8 +154065,8 @@ self: { }: mkDerivation { pname = "standalone-haddock"; - version = "1.1.4.4"; - sha256 = "24646ca673a695890424200d9f28e50acef3f23624b45bf713ac1f9b3407410a"; + version = "1.1.4.5"; + sha256 = "2d5da0efb640a6791dfbfb71a1e54752fe03f2d42fbf5c75b232df2bffec4eeb"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159258,10 +154109,10 @@ self: { libraryHaskellDepends = [ base binary bytestring failure transformers ]; - jailbreak = true; homepage = "http://community.haskell.org/~aslatter/starling"; description = "A memcached client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "starrover2" = callPackage @@ -159306,9 +154157,9 @@ self: { version = "0.1"; sha256 = "a643bd52380c8a68b561c168bf24031a97443104ebd5a9f78b8eb399015cb048"; libraryHaskellDepends = [ arrows base mtl ]; - jailbreak = true; description = "Data.State"; license = "LGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "state-bag" = callPackage @@ -159424,7 +154275,6 @@ self: { version = "0.1.1"; sha256 = "bfd22eeafac4fb37ae978cd5a3a7587d3e96ba90727d29c4ff23928979b49415"; libraryHaskellDepends = [ applicative base transformers ]; - jailbreak = true; description = "The ST monad and STRefs"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -159522,7 +154372,6 @@ self: { QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector vector-algorithms ]; - doCheck = false; homepage = "https://github.com/bos/statistics"; description = "A library of statistical types, data, and functions"; license = stdenv.lib.licenses.bsd3; @@ -159568,10 +154417,10 @@ self: { libraryHaskellDepends = [ base math-functions mwc-random primitive statistics ]; - jailbreak = true; homepage = "https://github.com/srijs/statistics-hypergeometric-genvar"; description = "Random variate generation from hypergeometric distributions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statistics-linreg" = callPackage @@ -159599,10 +154448,10 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base statistics text vector ]; - jailbreak = true; homepage = "http://github.com/cheecheeo/stats/"; description = "command line statistics"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statsd" = callPackage @@ -159616,10 +154465,10 @@ self: { libraryHaskellDepends = [ base bytestring monad-control mtl network random ]; - jailbreak = true; homepage = "https://github.com/mitchellwrosen/statsd-haskell"; description = "StatsD API"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "statsd-client" = callPackage @@ -159629,13 +154478,12 @@ self: { }: mkDerivation { pname = "statsd-client"; - version = "0.2.0.1"; - sha256 = "7ef148b3909594fe4e845a1ebc49041af5cacaf1c557b4460f117a35a59457a5"; + version = "0.3.0.0"; + sha256 = "540cfad1006bad0f38e2ebb4550c7508f3dd7c21fd4711f87371fbe03d35df06"; libraryHaskellDepends = [ base byteable bytestring crypto-api cryptohash digest-pure DRBG network network-uri old-time random time-units ]; - jailbreak = true; homepage = "https://github.com/keithduncan/statsd-client"; description = "Statsd UDP client"; license = stdenv.lib.licenses.mit; @@ -159680,6 +154528,19 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "stb-image-redux" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, vector }: + mkDerivation { + pname = "stb-image-redux"; + version = "0.1.0.3"; + sha256 = "7a3519a1832f39b3d621207cddd679e7e8bb4f1057f33bfd170de2d3e07313b7"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ base hspec QuickCheck vector ]; + homepage = "https://github.com/sasinestro/stb-image-redux#readme"; + description = "Image loading and writing microlibrary"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "stb-truetype" = callPackage ({ mkDerivation, array, base, bytestring, containers }: mkDerivation { @@ -159700,9 +154561,9 @@ self: { version = "0.0.4"; sha256 = "6ef959485f64beda76e1a7f110292a8935271917c3d5ff2f0b6c136aa7c85146"; libraryHaskellDepends = [ base parsec syb template-haskell ]; - jailbreak = true; description = "Structure Data Library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stdf" = callPackage @@ -159723,10 +154584,10 @@ self: { executableHaskellDepends = [ aeson base base64-bytestring binary bytestring split text ]; - jailbreak = true; homepage = "https://github.com/gitfoxi/Stdf"; description = "Parse Structured Test Data Format (STDF)"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "steambrowser" = callPackage @@ -159738,9 +154599,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base directory parsec transformers ]; - jailbreak = true; description = "List and launch steam games from the cli"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "steeloverseer" = callPackage @@ -159763,7 +154624,6 @@ self: { base bytestring directory filepath fsnotify optparse-applicative regex-tdfa semigroups yaml ]; - jailbreak = true; homepage = "https://github.com/schell/steeloverseer"; description = "A file watcher and development tool"; license = stdenv.lib.licenses.bsd3; @@ -159911,35 +154771,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stm-conduit_2_8_0" = callPackage - ({ mkDerivation, async, base, cereal, cereal-conduit, conduit - , conduit-combinators, conduit-extra, directory, doctest, ghc-prim - , HUnit, lifted-async, lifted-base, monad-control, monad-loops - , QuickCheck, resourcet, stm, stm-chans, test-framework - , test-framework-hunit, test-framework-quickcheck2, transformers - , void - }: - mkDerivation { - pname = "stm-conduit"; - version = "2.8.0"; - sha256 = "0bad21541ac28765802468c71b61f464daf1fca4b2adf1c66bab006d0a7d3128"; - libraryHaskellDepends = [ - async base cereal cereal-conduit conduit conduit-combinators - conduit-extra directory ghc-prim lifted-async lifted-base - monad-control monad-loops resourcet stm stm-chans transformers void - ]; - testHaskellDepends = [ - base conduit conduit-combinators directory doctest HUnit QuickCheck - resourcet stm stm-chans test-framework test-framework-hunit - test-framework-quickcheck2 transformers - ]; - jailbreak = true; - homepage = "https://github.com/cgaebel/stm-conduit"; - description = "Introduces conduits to channels, and promotes using conduits concurrently"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stm-conduit" = callPackage ({ mkDerivation, async, base, cereal, cereal-conduit, conduit , conduit-combinators, conduit-extra, directory, doctest, ghc-prim @@ -159967,31 +154798,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "stm-containers_0_2_14" = callPackage - ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF - , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive - , QuickCheck, transformers, unordered-containers - }: - mkDerivation { - pname = "stm-containers"; - version = "0.2.14"; - sha256 = "6d415061d23cee818cd3c879c828809d177c28a1c4d36fdfc408867c3bbe8e6f"; - libraryHaskellDepends = [ - base base-prelude focus hashable list-t primitive transformers - ]; - testHaskellDepends = [ - base base-prelude focus free hashable HTF list-t loch-th mtl - mtl-prelude placeholders primitive QuickCheck transformers - unordered-containers - ]; - jailbreak = true; - doCheck = false; - homepage = "https://github.com/nikita-volkov/stm-containers"; - description = "Containers for STM"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stm-containers" = callPackage ({ mkDerivation, base, base-prelude, focus, free, hashable, HTF , list-t, loch-th, mtl, mtl-prelude, placeholders, primitive @@ -160041,10 +154847,10 @@ self: { stm-conduit transformers wai wai-conduit warp ]; testHaskellDepends = [ base hspec HUnit stm ]; - jailbreak = true; homepage = "https://github.com/bartavelle/stm-firehose"; description = "Conduits and STM operations for fire hoses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-io-hooks" = callPackage @@ -160067,9 +154873,9 @@ self: { revision = "1"; editedCabalFile = "d313721a31d8e7ccc725c3a1542f4ac3f8c84fbcad10094cd1067c133edc6c54"; libraryHaskellDepends = [ base stm transformers ]; - jailbreak = true; description = "Software Transactional Memory lifted to MonadIO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stm-linkedlist" = callPackage @@ -160267,8 +155073,8 @@ self: { ({ mkDerivation, base, clock, hspec, transformers }: mkDerivation { pname = "stopwatch"; - version = "0.1.0.2"; - sha256 = "f9f0897702a3b5cb3cd7ef8960caa4733fef3273dab0c91f6f6da3d956e0489b"; + version = "0.1.0.3"; + sha256 = "0ddeaefab7989bd5fc5c5e45c769806630da7be0e699f36e4ada6e6d91c5026e"; libraryHaskellDepends = [ base clock transformers ]; testHaskellDepends = [ base clock hspec ]; homepage = "https://github.com/debug-ito/stopwatch"; @@ -160330,7 +155136,6 @@ self: { version = "0.6.1.0"; sha256 = "b5eb6edeccae1609099e915e00adeadc3c50eab02b998db844033726b6816d2a"; libraryHaskellDepends = [ array base tagged vector ]; - jailbreak = true; description = "Statically-sized array wrappers with Storable instances for FFI marshaling"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -160410,8 +155215,8 @@ self: { }: mkDerivation { pname = "store"; - version = "0.2.1.0"; - sha256 = "8f6724dc7fcf97af160106bc546d33b07ac290c81349a6c72b5db18dea6a8d6d"; + version = "0.2.1.2"; + sha256 = "5accb9a9aa79fd5dbc315b398a926722dee424935271c9a6cb90aea84f3e1cad"; libraryHaskellDepends = [ array base base-orphans base64-bytestring bytestring conduit containers cryptohash deepseq directory fail filepath ghc-prim @@ -160443,8 +155248,8 @@ self: { }: mkDerivation { pname = "store-core"; - version = "0.2.0.0"; - sha256 = "52ef7fab49c7dbd6c287de92c2f852c78f25cb32a415e56b3f21ca6b9aa5bd0a"; + version = "0.2.0.2"; + sha256 = "025f6d186f96329d1f0b76e2e2753e78852413896d19917856c096bf22e6420e"; libraryHaskellDepends = [ base bytestring fail ghc-prim primitive text transformers ]; @@ -160465,38 +155270,9 @@ self: { base base16-bytestring bytestring Crypto hashable MissingH text utf8-string ]; - jailbreak = true; homepage = "http://www.github.com/thinkpad20/str"; description = "A type class to abstract between many different string types"; license = stdenv.lib.licenses.mit; - }) {}; - - "stratosphere_0_1_2_1" = callPackage - ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory - , hlint, lens, tasty, tasty-hspec, template-haskell, text - , unordered-containers - }: - mkDerivation { - pname = "stratosphere"; - version = "0.1.2.1"; - sha256 = "70948036bc62ee5d77d01efa674fcfd762e2bf95d04a94e55dde1339940d471c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - executableHaskellDepends = [ - aeson aeson-pretty base bytestring lens template-haskell text - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory hlint lens tasty - tasty-hspec template-haskell text unordered-containers - ]; - homepage = "https://github.com/frontrowed/stratosphere#readme"; - description = "EDSL for AWS CloudFormation"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -160507,8 +155283,8 @@ self: { }: mkDerivation { pname = "stratosphere"; - version = "0.1.4"; - sha256 = "2ca934bbc3d43c9df9ffc950dcf49873a23f428081607880f4458d5c69285de3"; + version = "0.1.6"; + sha256 = "16f6aefde00cb48105506b8f396f61d32947a36456a29a377da512d40b81aae1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -160672,10 +155448,10 @@ self: { version = "0.4.0.2"; sha256 = "86cd5770f903184b47113c42978cc409a483a5bdd2619c9e11f5a2339491210c"; libraryHaskellDepends = [ base logict ]; - jailbreak = true; homepage = "http://github.com/sebfisch/stream-monad"; description = "Simple, Fair and Terminating Backtracking Monad"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamed" = callPackage @@ -160692,7 +155468,6 @@ self: { data-accessor-transformers event-list midi midi-alsa non-negative random transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/MIDI"; description = "Programmatically edit MIDI event streams via ALSA"; license = stdenv.lib.licenses.bsd3; @@ -160740,8 +155515,8 @@ self: { }: mkDerivation { pname = "streaming-commons"; - version = "0.1.15.5"; - sha256 = "7cdab71a7c696310bcac376dd9d7a1f8debd881198fc511b9140f853f6925389"; + version = "0.1.16"; + sha256 = "17fdf509823e72996265de9260eaf58e33350e746dea058a36392c843ea8106e"; libraryHaskellDepends = [ array async base blaze-builder bytestring directory network process random stm text transformers unix zlib @@ -160859,24 +155634,6 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "streams_3_2_1" = callPackage - ({ mkDerivation, adjunctions, base, comonad, distributive - , semigroupoids, semigroups - }: - mkDerivation { - pname = "streams"; - version = "3.2.1"; - sha256 = "44edcc8bda54c0c356e606896756af5e61dab0070c021df31dfbbc56cad2d9f7"; - libraryHaskellDepends = [ - adjunctions base comonad distributive semigroupoids semigroups - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/streams/issues"; - description = "Various Haskell 2010 stream comonads"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "streams" = callPackage ({ mkDerivation, adjunctions, base, comonad, distributive , semigroupoids, semigroups @@ -160931,7 +155688,6 @@ self: { revision = "2"; editedCabalFile = "70e871fd6fd7dffa2dc373fda3a062e9b9efde6cbab873b250ff5731ca1a7850"; libraryHaskellDepends = [ base deepseq ]; - jailbreak = true; homepage = "http://code.haskell.org/~dons/code/strict-concurrency"; description = "Strict concurrency abstractions"; license = stdenv.lib.licenses.bsd3; @@ -160969,10 +155725,10 @@ self: { version = "0.1.0.0"; sha256 = "218e8746098c246a5cf497e96eac6b4305495de18dc5f281598d79b54e8decbb"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/cartazio/strict-identity"; description = "Strict Identity Monad, handy for writing fast code!"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strict-io" = callPackage @@ -160982,9 +155738,9 @@ self: { version = "0.2.1"; sha256 = "ad265e5707c8badaea8b2a89457917d38ae3cf7c19ac46bac704a81ee5777700"; libraryHaskellDepends = [ base deepseq extensible-exceptions ]; - jailbreak = true; description = "A library wrapping standard IO modules to provide strict IO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "strictify" = callPackage @@ -161009,10 +155765,10 @@ self: { version = "1.0.0.0"; sha256 = "6c742c9071b79f3fa669f0c514b0b95701d9f31c1ccbc9569d64e9995efe6aa8"; libraryHaskellDepends = [ base deepseq ]; - jailbreak = true; homepage = "https://github.com/DanBurton/strictly#readme"; description = "Combinators for strictifying functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string" = callPackage @@ -161136,7 +155892,6 @@ self: { libraryHaskellDepends = [ base template-haskell type-combinators type-combinators-quote ]; - jailbreak = true; homepage = "https://github.com/kylcarte/string-typelits"; description = "Type-level Chars and Strings, with decidable equality"; license = stdenv.lib.licenses.bsd3; @@ -161179,7 +155934,6 @@ self: { base bytestring QuickCheck quickcheck-instances test-framework test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "https://github.com/selectel/stringlike"; description = "Transformations to several string-like types"; license = stdenv.lib.licenses.mit; @@ -161267,28 +156021,9 @@ self: { aeson base bytestring http-conduit http-types mtl text time unordered-containers utf8-string ]; - jailbreak = true; homepage = "https://github.com/michaelschade/hs-stripe"; description = "A Haskell implementation of the Stripe API"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "stripe-core_2_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, mtl, text, time - , transformers, unordered-containers - }: - mkDerivation { - pname = "stripe-core"; - version = "2.0.3"; - sha256 = "1c3d319ef29bb3e2863838e553a44a23449dafc8f244c62a7f3ffc7b8305e3a8"; - libraryHaskellDepends = [ - aeson base bytestring mtl text time transformers - unordered-containers - ]; - jailbreak = true; - homepage = "https://github.com/dmjio/stripe-haskell"; - description = "Stripe API for Haskell - Pure Core"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -161309,20 +156044,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stripe-haskell_2_0_3" = callPackage - ({ mkDerivation, base, stripe-core, stripe-http-streams }: - mkDerivation { - pname = "stripe-haskell"; - version = "2.0.3"; - sha256 = "225b6b5671181a8349b952bf98a30c40bf0ee24ab53cc720f02d7979ad7cd5bb"; - libraryHaskellDepends = [ base stripe-core stripe-http-streams ]; - jailbreak = true; - homepage = "https://github.com/dmjio/stripe"; - description = "Stripe API for Haskell"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stripe-haskell" = callPackage ({ mkDerivation, base, stripe-core, stripe-http-streams }: mkDerivation { @@ -161333,29 +156054,8 @@ self: { homepage = "https://github.com/dmjio/stripe"; description = "Stripe API for Haskell"; license = stdenv.lib.licenses.mit; - }) {}; - - "stripe-http-streams_2_0_3" = callPackage - ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec - , http-streams, io-streams, stripe-core, stripe-tests, text - }: - mkDerivation { - pname = "stripe-http-streams"; - version = "2.0.3"; - sha256 = "c6423451c388e3006012b01932b3fdd23d344a5d8dd73755ef00cb74b7c736f6"; - libraryHaskellDepends = [ - aeson base bytestring HsOpenSSL http-streams io-streams stripe-core - text - ]; - testHaskellDepends = [ - base free HsOpenSSL hspec http-streams stripe-core stripe-tests - ]; - jailbreak = true; - doCheck = false; - description = "Stripe API for Haskell - http-streams backend"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {stripe-tests = null;}; + }) {}; "stripe-http-streams" = callPackage ({ mkDerivation, aeson, base, bytestring, free, HsOpenSSL, hspec @@ -161372,32 +156072,11 @@ self: { testHaskellDepends = [ base free HsOpenSSL hspec http-streams stripe-core stripe-tests ]; - jailbreak = true; doCheck = false; description = "Stripe API for Haskell - http-streams backend"; license = stdenv.lib.licenses.mit; - }) {stripe-tests = null;}; - - "strive_2_2_2" = callPackage - ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline - , http-conduit, http-types, markdown-unlit, template-haskell, text - , time, transformers - }: - mkDerivation { - pname = "strive"; - version = "2.2.2"; - sha256 = "cf1b8b89a234798947931c874e9a48598737fb41d8971e5c1eed87d9fb75beb0"; - libraryHaskellDepends = [ - aeson base bytestring data-default gpolyline http-conduit - http-types template-haskell text time transformers - ]; - testHaskellDepends = [ base bytestring markdown-unlit time ]; - jailbreak = true; - homepage = "https://github.com/tfausak/strive#readme"; - description = "A client for the Strava V3 API"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {stripe-tests = null;}; "strive" = callPackage ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline @@ -161495,10 +156174,10 @@ self: { executableHaskellDepends = [ applicative-quoters base descriptive ghc-prim haskell-src-exts text ]; - jailbreak = true; homepage = "https://github.com/chrisdone/structured-haskell-mode"; description = "Structured editing Emacs mode for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "structured-mongoDB" = callPackage @@ -161515,7 +156194,6 @@ self: { monad-control mongoDB mtl old-time template-haskell transformers transformers-base ]; - jailbreak = true; description = "Structured MongoDB interface"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -161543,7 +156221,6 @@ self: { QuickCheck semigroups tasty tasty-quickcheck tasty-th unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ekmett/structures"; description = "\"Advanced\" Data Structures"; license = stdenv.lib.licenses.bsd3; @@ -161594,36 +156271,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "stylish-haskell_0_5_17_0" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, directory - , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative - , strict, syb, test-framework, test-framework-hunit, yaml - }: - mkDerivation { - pname = "stylish-haskell"; - version = "0.5.17.0"; - sha256 = "374ad1e8206ae9b41b94b95fef55ad8d439c006fa650e6315ef04eca38e53b78"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl syb yaml - ]; - executableHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts mtl optparse-applicative strict syb yaml - ]; - testHaskellDepends = [ - aeson base bytestring containers directory filepath - haskell-src-exts HUnit mtl syb test-framework test-framework-hunit - yaml - ]; - homepage = "https://github.com/jaspervdj/stylish-haskell"; - description = "Haskell code prettifier"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "stylish-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative @@ -161677,7 +156324,6 @@ self: { haskell-src-exts HUnit mtl syb test-framework test-framework-hunit yaml ]; - jailbreak = true; homepage = "https://github.com/jaspervdj/stylish-haskell"; description = "Haskell code prettifier"; license = stdenv.lib.licenses.bsd3; @@ -161691,10 +156337,10 @@ self: { version = "0.1.3"; sha256 = "e41cce6f673123ca3b785d638d5e5563277ebdbc84642997d596ee812966ea25"; libraryHaskellDepends = [ ansi-terminal base ]; - jailbreak = true; homepage = "http://patch-tag.com/r/lucid/Stylized"; description = "Ways to output stylized text on ANSI consoles"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sub-state" = callPackage @@ -161735,7 +156381,6 @@ self: { testHaskellDepends = [ base test-framework test-framework-quickcheck2 ]; - jailbreak = true; homepage = "http://github.com/mikeizbicki/subhask"; description = "Type safe interface for programming in subcategories of Hask"; license = stdenv.lib.licenses.bsd3; @@ -161759,7 +156404,6 @@ self: { testHaskellDepends = [ base containers lens mtl parsec pretty template-haskell ]; - jailbreak = true; description = "Toolchain of subleq computer"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -161841,10 +156485,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base vector ]; executableHaskellDepends = [ base HUnit ]; - jailbreak = true; homepage = "https://github.com/VictorDenisov/suffixarray"; description = "n log n implementation of suffix array"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "suffixtree" = callPackage @@ -161897,10 +156541,10 @@ self: { base bytestring data-default either lens serialport transformers vector ]; - jailbreak = true; homepage = "http://github.com/bgamari/sump"; description = "A Haskell interface to SUMP-compatible logic analyzers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sundown" = callPackage @@ -161927,7 +156571,6 @@ self: { base bytestring Cabal directory old-locale process random time tuple ]; - jailbreak = true; homepage = "http://www.github.com/massysett/sunlight"; description = "Test Cabalized package against multiple dependency versions"; license = stdenv.lib.licenses.bsd3; @@ -161947,7 +156590,6 @@ self: { base Boolean containers data-default data-reify mtl operational semigroups tagged template-haskell transformers vector-space ]; - jailbreak = true; homepage = "https://github.com/ku-fpg/sunroof-compiler"; description = "Monadic Javascript Compiler"; license = stdenv.lib.licenses.bsd3; @@ -161970,7 +156612,6 @@ self: { process QuickCheck random semigroups shake stm sunroof-compiler sunroof-server ]; - jailbreak = true; homepage = "https://github.com/ku-fpg/sunroof-examples"; description = "Tests for Sunroof"; license = stdenv.lib.licenses.bsd3; @@ -161994,7 +156635,6 @@ self: { transformers unordered-containers vector vector-space wai-middleware-static warp ]; - jailbreak = true; homepage = "https://github.com/ku-fpg/sunroof-server"; description = "Monadic Javascript Compiler - Server Utilities"; license = stdenv.lib.licenses.bsd3; @@ -162024,7 +156664,6 @@ self: { hspec-core HUnit mtl optparse-applicative parsec process pureMD5 QuickCheck shelly text transformers unix ]; - jailbreak = true; description = "Configure your dotfile deployment with a DSL"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -162041,7 +156680,6 @@ self: { libraryHaskellDepends = [ base hosc hsc3 opensoundcontrol-ht process random transformers ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Haskell SuperCollider utilities"; license = "GPL"; @@ -162066,7 +156704,6 @@ self: { non-negative opensoundcontrol-ht random supercollider-ht transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/SuperCollider"; description = "Demonstrate how to control SuperCollider via ALSA-MIDI"; license = "GPL"; @@ -162093,6 +156730,20 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "supermonad" = callPackage + ({ mkDerivation, base, containers, fgl, ghc, mtl, transformers }: + mkDerivation { + pname = "supermonad"; + version = "0.1"; + sha256 = "ed9647eae9e5b3431bf320db78c6878b6f21487ba659faf18a1f4597a91a8e62"; + libraryHaskellDepends = [ + base containers fgl ghc mtl transformers + ]; + description = "Plugin and base library to support supermonads in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "supero" = callPackage ({ mkDerivation, base, containers, cpphs, directory, filepath , haskell-src-exts, mtl, process, time, uniplate @@ -162107,7 +156758,6 @@ self: { base containers cpphs directory filepath haskell-src-exts mtl process time uniplate ]; - jailbreak = true; homepage = "http://community.haskell.org/~ndm/supero/"; description = "A Supercompiler"; license = stdenv.lib.licenses.bsd3; @@ -162175,6 +156825,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "svg-builder_0_1_0_2" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, hashable, text + , unordered-containers + }: + mkDerivation { + pname = "svg-builder"; + version = "0.1.0.2"; + sha256 = "81490cf0c843d6d7795ba32ac6cb05acf4a92431fe7702aa634ec52d60bfee54"; + libraryHaskellDepends = [ + base blaze-builder bytestring hashable text unordered-containers + ]; + homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git"; + description = "DSL for building SVG"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "svg-tree" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , JuicyPixels, lens, linear, mtl, scientific, text, transformers @@ -162182,8 +156849,8 @@ self: { }: mkDerivation { pname = "svg-tree"; - version = "0.5.1.1"; - sha256 = "cf75c195759bc114722e43aad05442ca002aa34a72aa2457c4444873945fab5e"; + version = "0.5.1.2"; + sha256 = "0c285cf21203555c7d7179e6c3924c0ba1b5e03ed42dacf596ff891317893da0"; libraryHaskellDepends = [ attoparsec base bytestring containers JuicyPixels lens linear mtl scientific text transformers vector xml @@ -162205,7 +156872,6 @@ self: { executableHaskellDepends = [ base haskell98 language-c pretty svgutils syb xml ]; - jailbreak = true; homepage = "http://www.informatik.uni-kiel.de/~jgr/svg2q"; description = "Code generation tool for Quartz code from a SVG"; license = stdenv.lib.licenses.bsd3; @@ -162238,10 +156904,10 @@ self: { isExecutable = true; libraryHaskellDepends = [ base xml ]; executableHaskellDepends = [ base filepath xml ]; - jailbreak = true; homepage = "https://patch-tag.com/r/twistedsquare/svgutils/home"; description = "Helper functions for dealing with SVG files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "svm" = callPackage @@ -162280,7 +156946,6 @@ self: { base binary bindings-svm bytestring containers deepseq directory monad-par mwc-random vector ]; - jailbreak = true; homepage = "http://github.com/aleator/Simple-SVM"; description = "Medium level, simplified, bindings to libsvm"; license = stdenv.lib.licenses.bsd3; @@ -162319,34 +156984,25 @@ self: { aeson base bytestring text time transformers ]; testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; - doCheck = false; description = "Implementation of swagger data model"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "swagger2_2_0_2" = callPackage - ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers - , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl - , network, QuickCheck, scientific, template-haskell, text, time - , transformers, unordered-containers, vector + "swagger_0_3_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, tasty, tasty-hunit, text + , time, transformers }: mkDerivation { - pname = "swagger2"; - version = "2.0.2"; - sha256 = "a9d2d65793e2c6767e06effd8e947f0072b2d6dd414e85012b73a2574167649b"; + pname = "swagger"; + version = "0.3.0"; + sha256 = "c7144fb22a0d223eb2463a896200936eab665dc01f39affc103d2ee6a38f54d0"; libraryHaskellDepends = [ - aeson base base-compat containers hashable http-media lens mtl - network scientific template-haskell text time transformers - unordered-containers vector + aeson base bytestring text time transformers ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat containers doctest Glob hashable - hspec HUnit lens mtl QuickCheck text time unordered-containers - vector - ]; - homepage = "https://github.com/GetShopTV/swagger2"; - description = "Swagger 2.0 data model"; - license = stdenv.lib.licenses.bsd3; + testHaskellDepends = [ aeson base bytestring tasty tasty-hunit ]; + description = "Implementation of swagger data model"; + license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -162355,23 +157011,23 @@ self: { , containers, doctest, generics-sop, Glob, hashable, hspec , http-media, HUnit, insert-ordered-containers, lens, mtl, network , QuickCheck, scientific, template-haskell, text, time - , transformers, unordered-containers, vector + , transformers, unordered-containers, uuid-types, vector }: mkDerivation { pname = "swagger2"; - version = "2.1.2.1"; - sha256 = "112b053db3cbeeeea9c7b43cb0f07a6ea9f73715ac5883b2eee9c2855c444930"; + version = "2.1.3"; + sha256 = "4d14f30ab538fc48d6b621f3082da6cf225d812f534a641babae0afebcc644ef"; libraryHaskellDepends = [ - aeson base base-compat containers generics-sop hashable http-media - insert-ordered-containers lens mtl network scientific - template-haskell text time transformers unordered-containers vector + aeson base base-compat bytestring containers generics-sop hashable + http-media insert-ordered-containers lens mtl network scientific + template-haskell text time transformers unordered-containers + uuid-types vector ]; testHaskellDepends = [ aeson aeson-qq base base-compat bytestring containers doctest Glob hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck text time unordered-containers vector ]; - doHaddock = false; homepage = "https://github.com/GetShopTV/swagger2"; description = "Swagger 2.0 data model"; license = stdenv.lib.licenses.bsd3; @@ -162412,7 +157068,6 @@ self: { attoparsec base containers fixplate mtl pretty random random-shuffle readline system-fileio system-filepath text ]; - jailbreak = true; homepage = "http://www.swearjure.com"; description = "Clojure without alphanumerics"; license = stdenv.lib.licenses.lgpl3; @@ -162469,7 +157124,6 @@ self: { base containers hashable HUnit network-uri old-locale semigroups test-framework test-framework-hunit text time ]; - jailbreak = true; homepage = "https://bitbucket.org/doug_burke/swish/wiki/Home"; description = "A semantic web toolkit"; license = "LGPL"; @@ -162494,7 +157148,6 @@ self: { resourcet transformers wai wai-extra wai-middleware-static warp warp-tls x509 ]; - jailbreak = true; description = "A simple web server for serving directories, similar to weborf"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -162522,7 +157175,6 @@ self: { revision = "2"; editedCabalFile = "a3be638f7ecf54a9b42e0f51cffaad6a95210a7390344e22847b1863d55913a8"; libraryHaskellDepends = [ base eq prelude-extras ]; - jailbreak = true; homepage = "http://github.com/ekmett/syb-extras/"; description = "Higher order versions of the Scrap Your Boilerplate classes"; license = stdenv.lib.licenses.bsd3; @@ -162577,7 +157229,6 @@ self: { base parsec smallcheck test-framework test-framework-smallcheck void ]; - jailbreak = true; homepage = "https://github.com/lfairy/sylvia"; description = "Lambda calculus visualization"; license = "GPL"; @@ -162605,7 +157256,6 @@ self: { version = "0.2.0"; sha256 = "e292042fe408db1ca1ca3775c5df05a1dec709120b4047d42d7afb3698890605"; libraryHaskellDepends = [ base diagrams-cairo diagrams-lib sym ]; - jailbreak = true; homepage = "http://github.com/akc/sym-plot"; description = "Plot permutations; an addition to the sym package"; license = stdenv.lib.licenses.bsd3; @@ -162637,7 +157287,6 @@ self: { libraryHaskellDepends = [ base ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ]; testSystemDepends = [ gmp gmpxx symengine ]; - doCheck = false; homepage = "http://github.com/symengine/symengine.hs#readme"; description = "SymEngine symbolic mathematics engine for Haskell"; license = stdenv.lib.licenses.mit; @@ -162720,10 +157369,10 @@ self: { io-streams mtl process random regex-compat temporary text time transformers unix zlib ]; - jailbreak = true; homepage = "https://github.com/ekarayel/sync-mht"; description = "Fast incremental file transfer using Merkle-Hash-Trees"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "synchronous-channels" = callPackage @@ -162785,7 +157434,6 @@ self: { testHaskellDepends = [ argparser base haskell-src-exts hpc hspec regexpr split Synt ]; - jailbreak = true; homepage = "http://github.com/brentlintner/synt"; description = "Similar code analysis"; license = "unknown"; @@ -162800,8 +157448,8 @@ self: { }: mkDerivation { pname = "syntactic"; - version = "3.6.1"; - sha256 = "392cd247b191958cdc4470e79799f923297d73d74ffeb93162a36e4c46b10305"; + version = "3.6.2"; + sha256 = "f110ce1a2d5029756c6388666a4d817c4c739665c1c2cea718858302b2f07a73"; libraryHaskellDepends = [ base constraints containers data-hash deepseq mtl syb template-haskell tree-view @@ -162926,7 +157574,6 @@ self: { base bifunctors bytestring scientific semi-iso semigroupoids syntax text vector ]; - jailbreak = true; description = "Text and ByteString printers for 'syntax'"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -162979,7 +157626,6 @@ self: { non-negative numeric-prelude numeric-quest process QuickCheck random sox storable-record storablevector transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing coded in Haskell"; license = "GPL"; @@ -162994,8 +157640,8 @@ self: { }: mkDerivation { pname = "synthesizer-alsa"; - version = "0.5.0.4"; - sha256 = "2a7966095f5195977c0c70575009ac57a604b16b1c625da4ac23811ef1e447e0"; + version = "0.5.0.5"; + sha256 = "aa9ac69ac0f0e1728b635cd06a1753d67a877ecfb24e6d51cbab15660f13ce26"; libraryHaskellDepends = [ alsa-core alsa-pcm alsa-seq base event-list midi midi-alsa non-negative numeric-prelude old-time random sox storablevector @@ -163017,8 +157663,8 @@ self: { }: mkDerivation { pname = "synthesizer-core"; - version = "0.8.0.1"; - sha256 = "c99bc3c2848d0f3af6d0e928b9a52b22dc47644eab8124f286f970eeb2225070"; + version = "0.8.0.2"; + sha256 = "1ad216fe5cd2f22223349d584bd32be44bb12f76fcfa13e5198fc2e3108ee54f"; libraryHaskellDepends = [ array base binary bytestring containers deepseq event-list explicit-exception filepath non-empty non-negative numeric-prelude @@ -163062,13 +157708,12 @@ self: { }: mkDerivation { pname = "synthesizer-filter"; - version = "0.4.0.1"; - sha256 = "eed6f280d102a5d0e161796de9ba60198a6733441f6c2adee62829b76b43c161"; + version = "0.4.1"; + sha256 = "da0896ae06052c4cbf9964816425ba82962e8f589f9a30ec4e66164941597ebd"; libraryHaskellDepends = [ base containers numeric-prelude numeric-quest synthesizer-core transformers utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing coded in Haskell: Filter networks"; license = "GPL"; @@ -163087,7 +157732,6 @@ self: { base event-list non-negative numeric-prelude random synthesizer-core transformers UniqueLogicNP utility-ht ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Synthesizer"; description = "Audio signal processing with dynamic physical dimensions"; license = "GPL"; @@ -163103,8 +157747,8 @@ self: { }: mkDerivation { pname = "synthesizer-llvm"; - version = "0.8.1"; - sha256 = "fa63abd89d8f87abe872ba9834ba7a204555b46deec823dfa0e87dd70dbf2e76"; + version = "0.8.1.2"; + sha256 = "29fe7aacb673c44726a7aefa627759e4545cee369c09f1197784b1b8a2aa74e6"; libraryHaskellDepends = [ base containers event-list llvm-extra llvm-tf midi non-empty non-negative numeric-prelude pathtype random sox storable-record @@ -163173,7 +157817,6 @@ self: { testHaskellDepends = [ base directory doctest filepath QuickCheck template-haskell ]; - jailbreak = true; homepage = "https://github.com/NICTA/sys-process"; description = "A replacement for System.Exit and System.Process."; license = stdenv.lib.licenses.bsd3; @@ -163204,7 +157847,6 @@ self: { base basic-prelude directory system-filepath text ]; testHaskellDepends = [ base basic-prelude chell system-filepath ]; - jailbreak = true; homepage = "https://github.com/d12frosted/CanonicalPath"; description = "Abstract data type for canonical paths with some utilities"; license = stdenv.lib.licenses.mit; @@ -163262,7 +157904,6 @@ self: { testHaskellDepends = [ base bytestring chell chell-quickcheck QuickCheck text ]; - doCheck = false; homepage = "https://github.com/fpco/haskell-filesystem"; description = "High-level, byte-based file and directory path manipulations (deprecated)"; license = stdenv.lib.licenses.mit; @@ -163284,8 +157925,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "system-info"; - version = "0.1.0.1"; - sha256 = "e037238c975acc226dc5d2d483267d5d2c09ada7a966f269d858a824e15f5c88"; + version = "0.1.0.2"; + sha256 = "31c047baaa70679f3ffab275de83a6bf2de7e144a8a2d9ec49f36cf0c6c19a5c"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/ChaosGroup/system-info"; @@ -163323,7 +157964,6 @@ self: { base directory either haskell-src-meta template-haskell text time transformers unix ]; - jailbreak = true; homepage = "https://github.com/jcristovao/system-lifted"; description = "Lifted versions of System functions"; license = stdenv.lib.licenses.bsd3; @@ -163373,7 +158013,6 @@ self: { base extensible-effects HUnit QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector ]; - jailbreak = true; homepage = "https://github.com/wowus/system-random-effect"; description = "Random number generation for extensible effects"; license = stdenv.lib.licenses.bsd3; @@ -163429,7 +158068,6 @@ self: { base directory easy-data either filepath hspec quickcheck-instances semigroups system-lifted template-haskell transformers ]; - jailbreak = true; homepage = "https://github.com/jcristovao/system-util"; description = "Various system utils lifted to EitherT"; license = stdenv.lib.licenses.bsd3; @@ -163458,13 +158096,12 @@ self: { ({ mkDerivation, base, bytestring, network, transformers, unix }: mkDerivation { pname = "systemd"; - version = "1.0.2"; - sha256 = "5235db71cd2ed14a77003c2c659582dee64f504f4de1af9ceab72f00af4cc2aa"; + version = "1.0.5"; + sha256 = "6eda0e556aa555f031d82a075baed227c389a9f40df13c5a5632b94c6c5b4906"; libraryHaskellDepends = [ base bytestring network transformers unix ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/erebe/systemd"; description = "Systemd facilities (Socket activation, Notify)"; license = stdenv.lib.licenses.bsd3; @@ -163484,7 +158121,6 @@ self: { base micrologger optparse-applicative statgrab text text-format transformers ]; - jailbreak = true; homepage = "https://github.com/githubuser/systemlog#readme"; description = "An application that regularly logs system stats for later analysis"; license = stdenv.lib.licenses.bsd3; @@ -163531,6 +158167,7 @@ self: { homepage = "http://github.com/jxv/t3#readme"; description = "tic-tac-toe Rexports for client"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "t3-game" = callPackage @@ -163565,9 +158202,9 @@ self: { either hashable hashmap MonadRandom mtl random safe stm t3-game text time transformers unordered-containers vector wai ]; - jailbreak = true; description = "tic-tac-toe server"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ta" = callPackage @@ -163581,7 +158218,6 @@ self: { libraryHaskellDepends = [ base containers ghc-prim mtl Takusen template-haskell time ]; - jailbreak = true; homepage = "not available"; description = "Transito Abierto: convenience library when using Takusen and Oracle"; license = stdenv.lib.licenses.bsd3; @@ -163599,10 +158235,10 @@ self: { executableHaskellDepends = [ base csv optparse-applicative process split ]; - jailbreak = true; homepage = "https://github.com/danchoi/table"; description = "Simple tool to generate tables from DSV input"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "table-layout" = callPackage @@ -163625,10 +158261,10 @@ self: { base data-default-class data-default-instances-base hspec HUnit QuickCheck ]; - jailbreak = true; homepage = "https://github.com/muesli4/table-layout"; description = "Layout text as grid or table"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "table-tennis" = callPackage @@ -163638,9 +158274,9 @@ self: { version = "0.1.0.3"; sha256 = "339411608776228a77ac13218342d6bdc0fc804a89cc2eab26f55dbd9623afec"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "A table tennis game tracking engine"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tableaux" = callPackage @@ -163679,7 +158315,6 @@ self: { base containers directory doctest filepath lens transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ekmett/tables/"; description = "In-memory storage with multiple keys using lenses and traversals"; license = stdenv.lib.licenses.bsd3; @@ -163776,10 +158411,10 @@ self: { version = "0.1.1.2"; sha256 = "c5c456b2917183bc0f32f329c152c2332198aadcf3825fca1afa24d8c60b3633"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "http://github.com/ekmett/tag-bits"; description = "Provides access to the dynamic pointer tagging bits used by GHC"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tag-stream" = callPackage @@ -163816,19 +158451,6 @@ self: { license = "GPL"; }) {}; - "tagged_0_8_4" = callPackage - ({ mkDerivation, base, deepseq, template-haskell }: - mkDerivation { - pname = "tagged"; - version = "0.8.4"; - sha256 = "20c861d299445ea810ba39d9d0529fb0b3862f4d0271a4fb168ccd493a234d5e"; - libraryHaskellDepends = [ base deepseq template-haskell ]; - homepage = "http://github.com/ekmett/tagged"; - description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tagged" = callPackage ({ mkDerivation, base, deepseq, template-haskell, transformers , transformers-compat @@ -163885,7 +158507,6 @@ self: { type-level-natural-number type-level-natural-number-induction type-level-natural-number-operations ]; - jailbreak = true; description = "Lists tagged with a type-level natural number representing their length"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -163900,7 +158521,6 @@ self: { libraryHaskellDepends = [ base tagged template-haskell type-spine ]; - jailbreak = true; description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -163915,10 +158535,10 @@ self: { libraryHaskellDepends = [ base time transformers unordered-containers ]; - jailbreak = true; homepage = "http://github.com/ucsd-progsys/tagged-timers"; description = "Simple wrappers for timing IO actions (single-threaded)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagged-transformer" = callPackage @@ -164023,9 +158643,9 @@ self: { base bytestring containers mtl text transformers ]; libraryPkgconfigDepends = [ taglib ]; - jailbreak = true; description = "An FFI layer over TagLib's C bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) taglib;}; "tagset-positional" = callPackage @@ -164039,10 +158659,10 @@ self: { libraryHaskellDepends = [ base binary containers parsec text text-binary ]; - jailbreak = true; homepage = "https://github.com/kawu/tagset-positional"; description = "Positional tags and tagsets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tagshare" = callPackage @@ -164056,19 +158676,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tagsoup_0_13_10" = callPackage - ({ mkDerivation, base, bytestring, containers, text }: - mkDerivation { - pname = "tagsoup"; - version = "0.13.10"; - sha256 = "ac838eeed18118423220716855c2bfd71dcc4a7a455893d8c4ad627828f57d58"; - libraryHaskellDepends = [ base bytestring containers text ]; - homepage = "https://github.com/ndmitchell/tagsoup#readme"; - description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tagsoup" = callPackage ({ mkDerivation, base, bytestring, containers, text }: mkDerivation { @@ -164100,7 +158707,6 @@ self: { base bytestring containers data-accessor explicit-exception old-time tagsoup transformers utility-ht xml-basic ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/tagsoup-ht/"; description = "alternative parser for the tagsoup package"; license = "GPL"; @@ -164137,6 +158743,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tagsoup-selection" = callPackage + ({ mkDerivation, base, containers, parsec, tagsoup }: + mkDerivation { + pname = "tagsoup-selection"; + version = "0.1.0.1"; + sha256 = "2d7159e2d8010b877983dbc3b106fabb19451eb00f65ed7a9bf9a3b7ca231c73"; + libraryHaskellDepends = [ base containers parsec tagsoup ]; + description = "Selecting subtrees from TagSoup's TagTrees using CSS selectors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagstream-conduit" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , case-insensitive, conduit, conduit-extra, data-default, hspec @@ -164281,7 +158899,6 @@ self: { tamarin-prover-theory tamarin-prover-utils text threads time transformers uniplate wai warp yesod-core yesod-json yesod-static ]; - jailbreak = true; homepage = "http://www.infsec.ethz.ch/research/software/tamarin"; description = "The Tamarin prover for security protocol analysis"; license = "GPL"; @@ -164302,7 +158919,6 @@ self: { directory dlist HUnit mtl parsec process safe split syb tamarin-prover-utils ]; - jailbreak = true; homepage = "http://www.infsec.ethz.ch/research/software/tamarin"; description = "Term manipulation library for the tamarin prover"; license = "GPL"; @@ -164326,7 +158942,6 @@ self: { safe syb tamarin-prover-term tamarin-prover-utils time transformers uniplate ]; - jailbreak = true; homepage = "http://www.infsec.ethz.ch/research/software/tamarin"; description = "Term manipulation library for the tamarin prover"; license = "GPL"; @@ -164346,7 +158961,6 @@ self: { base base64-bytestring binary blaze-builder bytestring containers deepseq dlist fclabels mtl parsec pretty SHA syb time transformers ]; - jailbreak = true; homepage = "http://www.infsec.ethz.ch/research/software/tamarin"; description = "Utility library for the tamarin prover"; license = "GPL"; @@ -164460,7 +159074,6 @@ self: { aeson attoparsec base bytestring containers csv-enumerator directory filepath old-locale random text time unix ]; - jailbreak = true; description = "A command line tool for keeping track of tasks you worked on"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -164522,27 +159135,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty_0_11_0_3" = callPackage - ({ mkDerivation, ansi-terminal, async, base, clock, containers - , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged - , unbounded-delays - }: - mkDerivation { - pname = "tasty"; - version = "0.11.0.3"; - sha256 = "ca51533c3b6fb36a63b7a6062d71024e3a823ae173779c1c81850959e29e7efa"; - revision = "1"; - editedCabalFile = "65ddea88e2f32a40483dc873704a8b6b684548b5c61400440c4dda1bdbcbd5f3"; - libraryHaskellDepends = [ - ansi-terminal async base clock containers deepseq mtl - optparse-applicative regex-tdfa stm tagged unbounded-delays - ]; - homepage = "http://documentup.com/feuerbach/tasty"; - description = "Modern and extensible testing framework"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tasty" = callPackage ({ mkDerivation, ansi-terminal, async, base, clock, containers , deepseq, mtl, optparse-applicative, regex-tdfa, stm, tagged @@ -164582,8 +159174,8 @@ self: { ({ mkDerivation, base, dejafu, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "0.3.0.1"; - sha256 = "9794201798e3afdfd84f22a6bd89fd869db3105ec33d406d6d4df742d5d0b683"; + version = "0.3.0.2"; + sha256 = "1f1d2ebbad76c763e036871ec481f40c532334f7692dc187a94b77519dbe2f5d"; libraryHaskellDepends = [ base dejafu tagged tasty ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the Tasty test framework"; @@ -164617,29 +159209,6 @@ self: { homepage = "http://github.com/MichaelXavier/tasty-fail-fast#readme"; description = "Adds the ability to fail a tasty test suite on first test failure"; license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-golden_2_3_1" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, mtl, optparse-applicative, process, tagged - , tasty, tasty-hunit, temporary, temporary-rc - }: - mkDerivation { - pname = "tasty-golden"; - version = "2.3.1"; - sha256 = "f292a57dc63afdd5607cca82bcc5ad606c5e1c59bb6fabc7fe48a26d816dcbf1"; - revision = "1"; - editedCabalFile = "ecec40232352129f5e7cf7ec06a93800c7eb76ef42a7b9fa5439ab8434513860"; - libraryHaskellDepends = [ - async base bytestring containers deepseq directory filepath mtl - optparse-applicative process tagged tasty temporary - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary-rc - ]; - homepage = "https://github.com/feuerbach/tasty-golden"; - description = "Golden tests support for tasty"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -164767,7 +159336,6 @@ self: { stringbuilder system-filepath tasty tasty-quickcheck text transformers ]; - jailbreak = true; description = "automated integration of QuickCheck properties into tasty suites"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -164803,10 +159371,10 @@ self: { tasty-smallcheck ]; testHaskellDepends = [ base smallcheck smallcheck-laws tasty ]; - jailbreak = true; homepage = "https://github.com/jdnavarro/tasty-laws"; description = "Test common laws"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-lens" = callPackage @@ -164821,10 +159389,10 @@ self: { base lens smallcheck smallcheck-lens tasty tasty-smallcheck ]; testHaskellDepends = [ base lens tasty ]; - jailbreak = true; homepage = "https://github.com/jdnavarro/tasty-lens"; description = "Tasty TestTrees for Lens validation"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-program" = callPackage @@ -164874,31 +159442,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "tasty-silver_3_1_8_1" = 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.8.1"; - sha256 = "0dc1bcced319abc9984aa8e61c4bb88c30279f1b87d4d4e0f368eade99525fb0"; - 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-silver" = callPackage ({ mkDerivation, ansi-terminal, async, base, bytestring, containers , deepseq, directory, filepath, mtl, optparse-applicative, process @@ -164947,10 +159490,10 @@ self: { testHaskellDepends = [ base directory tasty tasty-golden tasty-hunit ]; - jailbreak = true; homepage = "https://github.com/michaelxavier/tasty-tap"; description = "TAP (Test Anything Protocol) Version 13 formatter for tasty"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-th" = callPackage @@ -165005,7 +159548,6 @@ self: { array base binary cautious-file containers directory filepath IfElse monad-loops mtl random safe-failure stm-io-hooks ]; - jailbreak = true; homepage = "http://darcs.monoid.at/tbox"; description = "Transactional variables and data structures with IO hooks"; license = "LGPL"; @@ -165050,9 +159592,12 @@ self: { ({ mkDerivation, base, containers, HUnit }: mkDerivation { pname = "tce-conf"; - version = "1.1"; - sha256 = "d0dedf6185791d9808e57bf2f0a28f4164b1f285bde2f45c2b039da572ca7cb0"; + version = "1.3"; + sha256 = "b051843bb941ed137242edfcfb28b1c15083951272fe292e82c140c9e1ad26a2"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base containers ]; + executableHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers HUnit ]; homepage = "http://hub.darcs.net/dino/tce-conf"; description = "Very simple config file reading"; @@ -165107,6 +159652,30 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) openssl;}; + "tcp-streams_0_5_0_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, directory + , HsOpenSSL, HsOpenSSL-x509-system, HUnit, io-streams, network + , openssl, pem, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, tls, x509, x509-store, x509-system + }: + mkDerivation { + pname = "tcp-streams"; + version = "0.5.0.0"; + sha256 = "a963c6ad88b4feb4012c39bb6ebe1237b3e6263a3b1b0b14fb3b10f729df3be0"; + libraryHaskellDepends = [ + base bytestring data-default-class HsOpenSSL HsOpenSSL-x509-system + io-streams network pem tls x509 x509-store x509-system + ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ + base bytestring directory HUnit io-streams network QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + ]; + description = "One stop solution for tcp client and server with tls support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "tdd-util" = callPackage ({ mkDerivation, base, bytestring, HUnit, lens , MonadCatchIO-transformers, parallel-io, process, QuickCheck @@ -165173,10 +159742,10 @@ self: { revision = "1"; editedCabalFile = "84bb818fc4cb06bf91450e31e9a023926449a6157ce1e5de60649cda931db416"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/expipiplus1/teeth"; description = "Dental data types"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "telegram" = callPackage @@ -165190,39 +159759,11 @@ self: { libraryHaskellDepends = [ aeson base bytestring data-default http-conduit url utf8-string ]; - jailbreak = true; description = "Telegram API client"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "telegram-api_0_4_3_1" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either - , filepath, hjpath, hspec, http-api-data, http-client - , http-client-tls, http-media, http-types, mime-types - , optparse-applicative, servant, servant-client, string-conversions - , text, transformers, utf8-string - }: - mkDerivation { - pname = "telegram-api"; - version = "0.4.3.1"; - sha256 = "b51fa07d2dfa010a467a43b2a86dc56ec7a7adaf91b379528a97b6745771dfc8"; - libraryHaskellDepends = [ - aeson base bytestring either http-api-data http-client http-media - http-types mime-types servant servant-client string-conversions - text transformers - ]; - testHaskellDepends = [ - aeson ansi-wl-pprint base filepath hjpath hspec http-client - http-client-tls http-types optparse-applicative servant - servant-client text transformers utf8-string - ]; - homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; - description = "Telegram Bot API bindings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "telegram-api" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, either , filepath, hjpath, hspec, http-api-data, http-client @@ -165232,8 +159773,8 @@ self: { }: mkDerivation { pname = "telegram-api"; - version = "0.5.0.0"; - sha256 = "f971c4acd9101f4fd811a5e60b31ce2c85a09789a248e3a5473efa81d227ad93"; + version = "0.5.0.1"; + sha256 = "24eca611772e6810f837b372dca1b0fb7492cff8b72b68d66d886193da030ef3"; libraryHaskellDepends = [ aeson base bytestring either http-api-data http-client http-media http-types mime-types servant servant-client string-conversions @@ -165247,6 +159788,7 @@ self: { homepage = "http://github.com/klappvisor/haskell-telegram-api#readme"; description = "Telegram Bot API bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "teleport" = callPackage @@ -165285,10 +159827,10 @@ self: { base bifunctors bytestring containers http-conduit mtl network regex-pcre split tagsoup text time transformers ]; - jailbreak = true; homepage = "https://github.com/phaazon/tellbot"; description = "IRC tellbot"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "template" = callPackage @@ -165309,7 +159851,6 @@ self: { version = "0.1.2"; sha256 = "8446e58f6a926037b952ebd5e5e9e53e1629f8f35904f017d53e71caadf3aebb"; libraryHaskellDepends = [ base data-default template-haskell ]; - jailbreak = true; homepage = "https://github.com/haskell-pkg-janitors/template-default"; description = "declaring Default instances just got even easier"; license = stdenv.lib.licenses.bsd3; @@ -165359,7 +159900,6 @@ self: { testHaskellDepends = [ base parsec QuickCheck test-framework test-framework-quickcheck2 ]; - jailbreak = true; description = "Haskell's Simple Markup Language"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -165372,7 +159912,6 @@ self: { version = "0.0.0.2"; sha256 = "423e6a30ae66539a9f8935fd8c708eb8513f9f1ec30ffd67ff37daca9a2948ee"; libraryHaskellDepends = [ base bytestring text ]; - jailbreak = true; homepage = "https://github.com/YoshikuniJujo/template/wiki"; description = "Process template file"; license = stdenv.lib.licenses.bsd3; @@ -165388,7 +159927,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base mtl tagsoup uniplate ]; - jailbreak = true; homepage = "http://github.com/xpika/templateify"; description = "Make template from website"; license = stdenv.lib.licenses.gpl3; @@ -165408,10 +159946,10 @@ self: { base binary bytestring haskell-src-meta mtl network parsec regex-compat regex-posix template-haskell time utf8-string ]; - jailbreak = true; homepage = "https://github.com/jekor/templatepg"; description = "A PostgreSQL access library with compile-time SQL type inference"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "templater" = callPackage @@ -165466,7 +160004,6 @@ self: { aeson base blaze-builder bytestring containers HsOpenSSL HTTP http-streams io-streams mtl old-locale text time ]; - jailbreak = true; homepage = "https://github.com/ixmatus/hs-tempodb"; description = "A small Haskell wrapper around the TempoDB api"; license = stdenv.lib.licenses.bsd3; @@ -165592,10 +160129,10 @@ self: { testHaskellDepends = [ base directory resourcet tasty tasty-hunit transformers ]; - jailbreak = true; homepage = "http://www.github.com/ttuegel/temporary-resourcet"; description = "Portable temporary files and directories with automatic deletion"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tempus" = callPackage @@ -165613,7 +160150,6 @@ self: { uniplate utf8-string ]; executableToolDepends = [ happy ]; - jailbreak = true; description = "Interpreter for the FRP language Tempus"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -165662,7 +160198,6 @@ self: { union-find-array ]; testHaskellDepends = [ base containers HUnit QuickCheck ]; - jailbreak = true; homepage = "http://cl-informatik.uibk.ac.at/software/haskell-rewriting/"; description = "Term Rewriting Library"; license = stdenv.lib.licenses.mit; @@ -165680,7 +160215,6 @@ self: { libraryHaskellDepends = [ base ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/luciferous/termbox-bindings"; description = "Bindings to the Termbox library"; license = stdenv.lib.licenses.bsd3; @@ -165701,26 +160235,24 @@ self: { testHaskellDepends = [ base base-unicode-symbols HUnit test-framework test-framework-hunit ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/roelvandijk/terminal-progress-bar"; description = "A simple progress bar in the terminal"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "terminal-progress-bar_0_1_0" = callPackage + "terminal-progress-bar_0_1_1" = callPackage ({ mkDerivation, base, HUnit, stm, stm-chans, test-framework , test-framework-hunit }: mkDerivation { pname = "terminal-progress-bar"; - version = "0.1.0"; - sha256 = "55efcd2125f3551bb06ef1e9619cb4007bd78d4c52fa9f43a8313ad33ad50a77"; + version = "0.1.1"; + sha256 = "2053a7ac9113378a6ae8852447b4e7ba430c014776443046788e84183dc9f380"; libraryHaskellDepends = [ base stm stm-chans ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit ]; - jailbreak = true; homepage = "https://github.com/roelvandijk/terminal-progress-bar"; description = "A simple progress bar in the terminal"; license = stdenv.lib.licenses.bsd3; @@ -165745,10 +160277,10 @@ self: { version = "0.1"; sha256 = "9027db33e370a409037f35c8fb4fd260429398f34cb78d2457daf6f977d162cc"; libraryHaskellDepends = [ base containers contravariant ]; - jailbreak = true; homepage = "http://www.github.com/batterseapower/termination-combinators"; description = "Termination combinators for forcing non-terminating algorithms to terminate"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "terminfo_0_4_0_2" = callPackage @@ -165795,7 +160327,6 @@ self: { base brick data-default optparse-applicative process split time-units transformers unix vty ]; - jailbreak = true; homepage = "https://github.com/jimenezrick/termplot"; description = "Plot time series in your terminal using commands stdout"; license = stdenv.lib.licenses.mit; @@ -165828,7 +160359,6 @@ self: { sha256 = "0b52ac55ec87635def6462e0b0b23377141636f27cc3f829a3a11fbb2dfa913d"; libraryHaskellDepends = [ base haskell98 old-time ]; librarySystemDepends = [ terralib4c translib ]; - jailbreak = true; homepage = "http://lucc.ess.inpe.br/doku.php?id=terrahs"; description = "A Haskell GIS Programming Environment"; license = "GPL"; @@ -165859,8 +160389,8 @@ self: { }: mkDerivation { pname = "test-fixture"; - version = "0.4.0.0"; - sha256 = "0601604365bec95ab5407051410f7a857ae19dc6c25fad8bc004756aca02dff0"; + version = "0.4.1.0"; + sha256 = "bddd2b518151218d9848b46f233c70719711a45fd7357ecc3a5eb1d551d437a4"; libraryHaskellDepends = [ base data-default mtl template-haskell ]; testHaskellDepends = [ base hspec hspec-discover mtl transformers @@ -165901,7 +160431,6 @@ self: { base doctest test-framework test-framework-hunit ]; testHaskellDepends = [ base test-framework ]; - jailbreak = true; description = "Test.Framework wrapper for DocTest"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -165930,6 +160459,8 @@ self: { pname = "test-framework-hunit"; version = "0.3.0.2"; sha256 = "95cb8ee02a850b164bfdabdf4dbc839d621361f3ac770ad21ea43a8bde360bf8"; + revision = "1"; + editedCabalFile = "50dfa482f626505b45ab433d0110f275e314f872a198b5fc24d1a640af755880"; libraryHaskellDepends = [ base extensible-exceptions HUnit test-framework ]; @@ -165960,7 +160491,6 @@ self: { libraryHaskellDepends = [ base deepseq extensible-exceptions QuickCheck random test-framework ]; - jailbreak = true; homepage = "http://batterseapower.github.com/test-framework/"; description = "QuickCheck support for the test-framework package"; license = stdenv.lib.licenses.bsd3; @@ -166022,9 +160552,9 @@ self: { test-framework-hunit test-framework-quickcheck2 test-framework-smallcheck ]; - jailbreak = true; description = "Functions for conveniently marking some of the tests in a suite as being skipped"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-framework-smallcheck" = callPackage @@ -166106,9 +160636,9 @@ self: { version = "0.3.0.0"; sha256 = "c88ac7972b8612c8630183cc511d80e93998518819064a5ab62b773ddaf2cc3a"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Just tests Hackage"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-sandbox" = callPackage @@ -166134,7 +160664,6 @@ self: { hspec-expectations-lifted mtl process QuickCheck regex-posix template-haskell text transformers transformers-compat unix ]; - jailbreak = true; homepage = "http://gree.github.io/haskell-test-sandbox/"; description = "Sandbox for system tests"; license = stdenv.lib.licenses.bsd3; @@ -166211,9 +160740,9 @@ self: { sha256 = "a43bd874f17192f622abc9f948531b77358689630d35da2fb755542f29744f71"; libraryHaskellDepends = [ base HUnit ]; testHaskellDepends = [ base hspec hspec-discover silently ]; - jailbreak = true; description = "Catchy combinators for HUnit"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "test-simple" = callPackage @@ -166243,7 +160772,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base ]; - jailbreak = true; description = "Small test package"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -166303,7 +160831,6 @@ self: { base Cabal directory filepath fsnotify hint mtl system-filepath time unix ]; - jailbreak = true; homepage = "http://github.com/roman/testloop"; description = "Quick feedback loop for test suites"; license = stdenv.lib.licenses.mit; @@ -166322,7 +160849,6 @@ self: { libraryHaskellDepends = [ base containers HUnit mtl QuickCheck random ]; - jailbreak = true; homepage = "https://github.com/jgoerzen/testpack"; description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)"; license = "LGPL"; @@ -166383,35 +160909,12 @@ self: { isExecutable = true; libraryHaskellDepends = [ base containers deepseq parsec ]; executableHaskellDepends = [ base containers deepseq parsec ]; - jailbreak = true; homepage = "http://textmining.lt/tex2txt/"; description = "LaTeX to plain-text conversion"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "texmath_0_8_6_4" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, split, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.8.6.4"; - sha256 = "8ef75b8a82ba0d0002388b8a25148b40c06a7e4ea8033f6cc07c806dfa4c6c50"; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process split temporary text - utf8-string xml - ]; - homepage = "http://github.com/jgm/texmath"; - description = "Conversion between formats used to represent mathematics"; - license = "GPL"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "texmath" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, split, syb, temporary, text @@ -166503,22 +161006,22 @@ self: { base blaze-html bytestring containers markdown text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/andersjel/haskell-text-and-plots"; description = "EDSL to create HTML documents with plots based on the C3.js library."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-binary" = callPackage ({ mkDerivation, base, binary, text }: mkDerivation { pname = "text-binary"; - version = "0.2.1"; - sha256 = "df22f237ebfe8c813be289d40e86ce3590ccc9c33c41053f4234b5672dc7ea02"; + version = "0.2.1.1"; + sha256 = "b697b2bd09080643d4686705c779122129638904870df5c1d41c8fc72f08f4a1"; libraryHaskellDepends = [ base binary text ]; homepage = "https://github.com/kawu/text-binary"; description = "Binary instances for text types"; - license = stdenv.lib.licenses.bsd3; + license = stdenv.lib.licenses.bsd2; }) {}; "text-conversions" = callPackage @@ -166760,6 +161263,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "text-metrics_0_2_0" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, text }: + mkDerivation { + pname = "text-metrics"; + version = "0.2.0"; + sha256 = "082304ce14ac6182cbb93f51207d90b91d104e5d1fc1b17bbe1c9280ebffe43a"; + libraryHaskellDepends = [ base text ]; + testHaskellDepends = [ base hspec QuickCheck text ]; + homepage = "https://github.com/mrkkrp/text-metrics"; + description = "Calculate various string metrics efficiently"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "text-normal" = callPackage ({ mkDerivation, base, deepseq, hspec, QuickCheck , quickcheck-instances, text, text-icu @@ -166788,10 +161305,10 @@ self: { editedCabalFile = "47ad75275f3f8f705336ebac8adc9af40682a530668e2e56655a243aa516c8e3"; libraryHaskellDepends = [ base regex-applicative ]; testHaskellDepends = [ base QuickCheck regex-applicative ]; - jailbreak = true; homepage = "http://rel4tion.org/projects/text-position/"; description = "Handling positions in text and position-tagging it"; license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text-postgresql" = callPackage @@ -166871,7 +161388,6 @@ self: { version = "0.4.0"; sha256 = "f02e71da264754dc095b6bbc39811b33d0a137e1529e9ccc7472171b1d8c113c"; libraryHaskellDepends = [ base containers mtl vector ]; - jailbreak = true; homepage = "https://github.com/acfoltzer/text-register-machine"; description = "A Haskell implementation of the 1# Text Register Machine"; license = stdenv.lib.licenses.bsd3; @@ -166885,40 +161401,9 @@ self: { version = "0.1.0.2"; sha256 = "978bc340cba883bfad3300eff67a7fa6689ead23d873ba0d4dd031725bb3cf9d"; libraryHaskellDepends = [ base classy-prelude mtl parsec text ]; - jailbreak = true; homepage = "http://github.com/thinkpad20/text-render"; description = "A type class for rendering objects as text, pretty-printing, etc"; license = stdenv.lib.licenses.mit; - }) {}; - - "text-show_2_1_2" = callPackage - ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors - , bytestring, bytestring-builder, containers, generic-deriving - , ghc-prim, hspec, integer-gmp, nats, QuickCheck - , quickcheck-instances, semigroups, tagged, template-haskell, text - , transformers, transformers-compat, void - }: - mkDerivation { - pname = "text-show"; - version = "2.1.2"; - sha256 = "76c1ce631c6932816dc241b290400e7200d7c79fd50ec03f51964e244fae320d"; - revision = "2"; - editedCabalFile = "b3b37a10589923b91729f07291795acf58f98efd5df1f32de99ab27fa1d3eda3"; - libraryHaskellDepends = [ - array base base-compat bytestring bytestring-builder containers - generic-deriving ghc-prim integer-gmp nats semigroups tagged - template-haskell text transformers void - ]; - testHaskellDepends = [ - array base base-compat base-orphans bifunctors bytestring - bytestring-builder generic-deriving ghc-prim hspec nats QuickCheck - quickcheck-instances tagged text transformers transformers-compat - void - ]; - jailbreak = true; - homepage = "https://github.com/RyanGlScott/text-show"; - description = "Efficient conversion of values into Text"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -167051,25 +161536,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "text-zipper_0_4" = callPackage - ({ mkDerivation, base, text, vector }: - mkDerivation { - pname = "text-zipper"; - version = "0.4"; - sha256 = "0a94fbdc2febc7656369b30c09fe4bcee1f9323547af40037a2adbee52a45d97"; - libraryHaskellDepends = [ base text vector ]; - description = "A text editor zipper library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "text-zipper" = callPackage ({ mkDerivation, base, deepseq, text, vector }: mkDerivation { pname = "text-zipper"; - version = "0.7"; - sha256 = "7d1c215b0d244bcd947ecb9094eec845da22109502557a5dde2e931d06496c7c"; + version = "0.8.1"; + sha256 = "8bedb4c3aa8b998508d1af4f65e99f4ca53dc3803e58375c324bbff3f5542b6d"; libraryHaskellDepends = [ base deepseq text vector ]; + homepage = "https://github.com/jtdaugherty/text-zipper/"; description = "A text editor zipper library"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -167082,10 +161556,10 @@ self: { sha256 = "8629d0897046167fa96c9a9ba7292a827845e943e19e45a9b77373474b389b35"; libraryHaskellDepends = [ base mtl text-zipper ]; testHaskellDepends = [ base hspec text-zipper ]; - jailbreak = true; homepage = "https://github.com/kseo/text-zipper-monad#readme"; description = "Monadic interface to the text-zipper package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "text1" = callPackage @@ -167116,6 +161590,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "textlocal" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-conduit, text, unix-time + }: + mkDerivation { + pname = "textlocal"; + version = "0.1.0.3"; + sha256 = "56237c4982513680358a13d5bba261e55ce4ec2346e402b8ba438f7a11d06e1c"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-conduit text + unix-time + ]; + homepage = "https://github.com/just-chow/textlocal"; + description = "Haskell wrapper for textlocal SMS gateway"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "textmatetags" = callPackage ({ mkDerivation, base, haskell98, process }: mkDerivation { @@ -167147,10 +161638,10 @@ self: { aeson base bytestring conduit http-conduit http-types resourcet tasty tasty-hunit text transformers ]; - jailbreak = true; homepage = "https://github.com/gltronred/textocat-api-haskell"; description = "Unofficial Haskell SDK for Textocat API -- http://textocat.com"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texts" = callPackage @@ -167171,10 +161662,10 @@ self: { version = "0.2.0.0"; sha256 = "de00ec44e43d3ed188c13c186d0326cde86fac9b8d0f42e9f937a1038f6c4c39"; libraryHaskellDepends = [ base bytestring text utf8-string ]; - jailbreak = true; homepage = "https://sealgram.com/git/haskell/text-like/"; description = "Textual type class for data that represent text"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tf-random" = callPackage @@ -167208,7 +161699,6 @@ self: { version = "0.8"; sha256 = "f5cfed02c2a63ace2a517dd5d0333622d81e6895ad851307bdcea31937672d8d"; libraryHaskellDepends = [ base template-haskell tfp ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic"; description = "Template-Haskell code for tfp"; license = stdenv.lib.licenses.bsd3; @@ -167235,10 +161725,10 @@ self: { testHaskellDepends = [ base hslogger mtl network QuickCheck transformers ]; - jailbreak = true; homepage = "http://github.com/sheyll/tftp"; description = "A library for building tftp servers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tga" = callPackage @@ -167248,9 +161738,9 @@ self: { version = "0.2"; sha256 = "0ecae6ee98298b52e07cc1971a2d3663b9d970c9760ace07c0ecf872ca2fec52"; libraryHaskellDepends = [ base bytestring ]; - jailbreak = true; description = "Reading and writing of tga image files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-alpha" = callPackage @@ -167280,7 +161770,6 @@ self: { version = "0.4.0.0"; sha256 = "e6a7fd93ad038826f781ab3e55b137a97eae4d718045df6da913e23af9632638"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; homepage = "https://github.com/DanielSchuessler/th-build"; description = "More convenient construction of TH ASTs"; license = stdenv.lib.licenses.bsd3; @@ -167337,30 +161826,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-desugar_1_5_5" = callPackage - ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb - , template-haskell, th-lift, th-orphans - }: - mkDerivation { - pname = "th-desugar"; - version = "1.5.5"; - sha256 = "db8cfe15c2b1c5b5e6c2105a0a16f409c9eb9b359c2f2c18e440d5562c5d38a3"; - revision = "1"; - editedCabalFile = "6dffacc4a25cfaa78844eb30be50f7e0c9c502c808c84279577308cb1ec8d1b8"; - libraryHaskellDepends = [ - base containers mtl syb template-haskell th-lift th-orphans - ]; - testHaskellDepends = [ - base containers hspec HUnit mtl syb template-haskell th-lift - th-orphans - ]; - jailbreak = true; - homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; - description = "Functions to desugar Template Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "th-desugar" = callPackage ({ mkDerivation, base, containers, hspec, HUnit, mtl, syb , template-haskell, th-expand-syns, th-lift, th-orphans @@ -167369,6 +161834,8 @@ self: { pname = "th-desugar"; version = "1.6"; sha256 = "c8f8ece2bde9b12070ea50bc089fbc672f144659225d837478fbc793777f634f"; + revision = "1"; + editedCabalFile = "ba5a42169a8e996cf9d82fdb1a6a2faa1fab3f71f1c58e77f51cd655007d312d"; libraryHaskellDepends = [ base containers mtl syb template-haskell th-expand-syns th-lift th-orphans @@ -167377,7 +161844,7 @@ self: { base containers hspec HUnit mtl syb template-haskell th-expand-syns th-lift th-orphans ]; - homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar"; + homepage = "https://github.com/goldfirere/th-desugar"; description = "Functions to desugar Template Haskell"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -167447,7 +161914,6 @@ self: { base containers HTF list-extras loch-th placeholders template-haskell th-expand-syns ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/th-instance-reification"; description = "Fixed versions of instances reification functions"; license = stdenv.lib.licenses.mit; @@ -167485,7 +161951,6 @@ self: { version = "0.1.1"; sha256 = "ab388f37f83e533d01bfd0d5cd256b231f218043819c3c214ed1b7e72d071635"; libraryHaskellDepends = [ base containers mtl template-haskell ]; - jailbreak = true; description = "Automated kind inference in Template Haskell"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -167539,23 +162004,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-orphans_0_13_0" = callPackage - ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift - , th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.0"; - sha256 = "bdaeee2a3588e0622f2036481974dfe1bd135a3d71004393c94201d8d700be80"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-reify-many - ]; - testHaskellDepends = [ base hspec template-haskell ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "th-orphans" = callPackage ({ mkDerivation, base, hspec, mtl, template-haskell, th-lift , th-lift-instances, th-reify-many @@ -167586,7 +162034,6 @@ self: { testHaskellDepends = [ base bytestring hspec HUnit QuickCheck template-haskell text ]; - doCheck = false; homepage = "https://github.com/joelteon/th-printf"; description = "Compile-time printf"; license = stdenv.lib.licenses.mit; @@ -167715,10 +162162,10 @@ self: { testHaskellDepends = [ base bytestring tasty tasty-hunit text time ]; - jailbreak = true; homepage = "http://github.com/pjones/themoviedb"; description = "Haskell API bindings for http://themoviedb.org"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "themplate" = callPackage @@ -167764,10 +162211,10 @@ self: { base cookie hspec hspec-wai http-types servant-server transformers vault wai wai-extra wai-session ]; - jailbreak = true; homepage = "https://github.com/liqd/thentos"; description = "All-in-one session handling for servant-based frontends"; license = "AGPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "theoremquest" = callPackage @@ -167777,9 +162224,9 @@ self: { version = "0.0.0"; sha256 = "c160e75e395e54b0fa6442c4639f4bbd6d74fb113a62013dcde0f025ef95e017"; libraryHaskellDepends = [ base HTTP json utf8-string ]; - jailbreak = true; description = "A common library for TheoremQuest, a theorem proving game"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "theoremquest-client" = callPackage @@ -167791,40 +162238,11 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base HTTP network theoremquest ]; - jailbreak = true; description = "A simple client for the TheoremQuest theorem proving game"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "these_0_6_2_1" = callPackage - ({ mkDerivation, base, bifunctors, containers, data-default-class - , hashable, mtl, profunctors, QuickCheck, quickcheck-instances - , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers - , transformers-compat, unordered-containers, vector - }: - mkDerivation { - pname = "these"; - version = "0.6.2.1"; - sha256 = "41dd6403ec489deef66632fcae4cd058f636badb162aedff7c8b4930affb99bb"; - revision = "2"; - editedCabalFile = "3899efa5ea17e23cfb9acde7fa3316fa35183358b90d4540899b5d9d38d59a35"; - libraryHaskellDepends = [ - base bifunctors containers data-default-class hashable mtl - profunctors semigroupoids semigroups transformers - transformers-compat unordered-containers vector - ]; - testHaskellDepends = [ - base bifunctors containers hashable QuickCheck quickcheck-instances - tasty tasty-quickcheck transformers unordered-containers vector - ]; - jailbreak = true; - homepage = "https://github.com/isomorphism/these"; - description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "these" = callPackage ({ mkDerivation, aeson, base, bifunctors, binary, containers , data-default-class, deepseq, hashable, keys, mtl, profunctors @@ -167836,6 +162254,8 @@ self: { pname = "these"; version = "0.7.2"; sha256 = "a1d22644ca30b0bf549ed9881fcadc9f93fac0ec4815008496ca16e83a966dc8"; + revision = "1"; + editedCabalFile = "f1720c052d70f405e05c3c7a022d25c20afc5391dfbe179e80d3e671311594d8"; libraryHaskellDepends = [ aeson base bifunctors binary containers data-default-class deepseq hashable keys mtl profunctors QuickCheck semigroupoids transformers @@ -167923,7 +162343,6 @@ self: { base bifunctors containers contravariant mtl profunctors random template-haskell ]; - jailbreak = true; homepage = "https://github.com/Kinokkory/Thorn"; description = "Datatype Manipulation with Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -167981,12 +162400,24 @@ self: { testHaskellDepends = [ base concurrent-extra HUnit stm test-framework test-framework-hunit ]; - doCheck = false; homepage = "https://github.com/basvandijk/threads"; description = "Fork threads and wait for their result"; license = stdenv.lib.licenses.bsd3; }) {}; + "threads-extras" = callPackage + ({ mkDerivation, base, stm, threads }: + mkDerivation { + pname = "threads-extras"; + version = "0.1.0.2"; + sha256 = "4defab98b8a767b9580413d530e6823e53f6169671e53b6f8b6bfea89fde2575"; + libraryHaskellDepends = [ base stm threads ]; + testHaskellDepends = [ base ]; + description = "Extends the threads package with a bounded thread group"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "threads-pool" = callPackage ({ mkDerivation, base, containers, mtl, stm }: mkDerivation { @@ -168065,15 +162496,14 @@ self: { }: mkDerivation { pname = "threepenny-gui"; - version = "0.6.0.6"; - sha256 = "f275e22d52d419f97feacbc0dbd4a99b32992910bf6427a0a1798b6146a2f94d"; + version = "0.7.0.0"; + sha256 = "287704d0943895b653381d2546acd3076b477d1ab4be78baaa88cbe816c7156e"; libraryHaskellDepends = [ aeson async base bytestring containers data-default deepseq filepath hashable network-uri safe snap-core snap-server stm template-haskell text transformers unordered-containers vault vector websockets websockets-snap ]; - jailbreak = true; homepage = "http://wiki.haskell.org/Threepenny-gui"; description = "GUI framework that uses the web browser as a display"; license = stdenv.lib.licenses.bsd3; @@ -168096,7 +162526,6 @@ self: { network network-uri QuickCheck split text unordered-containers vector ]; - jailbreak = true; homepage = "http://thrift.apache.org"; description = "Haskell bindings for the Apache Thrift RPC system"; license = "unknown"; @@ -168209,7 +162638,6 @@ self: { old-locale profunctors QuickCheck random system-posix-redirect text time vector-space ]; - doCheck = false; homepage = "https://github.com/liyang/thyme"; description = "A faster time library"; license = stdenv.lib.licenses.bsd3; @@ -168224,8 +162652,8 @@ self: { }: mkDerivation { pname = "tianbar"; - version = "1.1.0.0"; - sha256 = "bf01e5653629bf2b0b74be9468134280d143b9690e41a9b8abb9c86c981ff4e1"; + version = "1.1.0.1"; + sha256 = "cf58ba500aa8d68bce6e35b233f13b8d8d1a2efecef24e4fece628cfd171df73"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -168288,31 +162716,9 @@ self: { version = "0.1.0.3"; sha256 = "e162cfdc30aac18f0ddb98ee3d3de72c584523937a88250742d75e0a9762ee76"; libraryHaskellDepends = [ base tuples-homogenous-h98 vector ]; - jailbreak = true; homepage = "https://github.com/ryo0ka/tictactoe3d"; description = "3D Tic-Tac-Toe game"; license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_0_7_1" = callPackage - ({ mkDerivation, base, binary, bytestring, colour, containers - , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec - , PortMidi, process, serialport, text, time, transformers - , websockets - }: - mkDerivation { - pname = "tidal"; - version = "0.7.1"; - sha256 = "fce7b8e13e4fd0b520a68fa9733cf1a29dfaf6cbdeb37be463b3e6d4ed700314"; - libraryHaskellDepends = [ - base binary bytestring colour containers hashable hmt hosc - mersenne-random-pure64 mtl parsec PortMidi process serialport text - time transformers websockets - ]; - jailbreak = true; - homepage = "http://tidal.lurk.org/"; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -168323,8 +162729,8 @@ self: { }: mkDerivation { pname = "tidal"; - version = "0.8.1"; - sha256 = "e85f7810dd3a59c04cd3238fdec1f4b3ef52e5820b7e0b624ed153ed6860b5a9"; + version = "0.8.2"; + sha256 = "f79854db40b83ec24055d27e49c37678c8d2fe2054143c66b410754648443a8b"; libraryHaskellDepends = [ base binary bytestring colour containers hashable hmt hosc mersenne-random-pure64 mtl parsec process text time transformers @@ -168346,10 +162752,10 @@ self: { libraryHaskellDepends = [ base containers PortMidi tidal time transformers ]; - jailbreak = true; homepage = "http://tidal.lurk.org/"; description = "MIDI support for tidal"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-serial" = callPackage @@ -168361,7 +162767,6 @@ self: { libraryHaskellDepends = [ base bytestring containers serialport tidal ]; - jailbreak = true; homepage = "http://tidalcycles.org/"; description = "Serial support for tidal"; license = stdenv.lib.licenses.gpl3; @@ -168387,7 +162792,6 @@ self: { version = "0.2"; sha256 = "e47108f0062c9cc0460c7134934c6070931df3d46ab9323e42d47b6660c97ac6"; libraryHaskellDepends = [ base containers mtl recursion-schemes ]; - jailbreak = true; homepage = "https://github.com/ppetr/tie-knot"; description = "\"Ties the knot\" on a given set of structures that reference each other by keys"; license = "LGPL"; @@ -168401,10 +162805,10 @@ self: { version = "0.0.1.1"; sha256 = "a8b04eef8e1eca0a496410eb82289345c2060be8726b09f5f4b0242d9ffe4a8e"; libraryHaskellDepends = [ base deepseq time ]; - jailbreak = true; homepage = "http://github.com/HaskVan/tiempo"; description = "Specify time intervals in different units (secs, mins, hours, etc.)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tiger" = callPackage @@ -168448,9 +162852,9 @@ self: { aeson base bytestring containers http-types lens mtl text wai wai-extra wreq ]; - jailbreak = true; description = "Nice API for a Slackbot"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tighttp" = callPackage @@ -168465,7 +162869,6 @@ self: { base bytestring handle-like monads-tf old-locale papillon simple-pipe time ]; - jailbreak = true; homepage = "https://github.com/YoshikuniJujo/tighttp/wiki"; description = "Tiny and Incrementally-Growing HTTP library"; license = stdenv.lib.licenses.bsd3; @@ -168558,7 +162961,6 @@ self: { version = "1.1.4"; sha256 = "74dc327986d7ef6d65bc4ee4c855995dd8e05ae92f3a34fd0b835021526d2acd"; libraryHaskellDepends = [ base time ]; - jailbreak = true; homepage = "http://semantic.org/TimeLib/"; description = "Data instances for the time package"; license = stdenv.lib.licenses.bsd3; @@ -168611,7 +163013,6 @@ self: { blaze-textual bytestring convertible-text data-default failure QuickCheck tagged time ]; - jailbreak = true; homepage = "http://cielonegro.org/HTTPDateTime.html"; description = "Parse and format HTTP/1.1 Date and Time strings"; license = stdenv.lib.licenses.publicDomain; @@ -168637,9 +163038,9 @@ self: { version = "0.1.0.0"; sha256 = "2be786989fcb0ad6d5d768aa0a7a5234543f24d8c762e1391dd9b1fb0da70558"; libraryHaskellDepends = [ base base-io-access time ]; - jailbreak = true; description = "IO Access for time"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-lens" = callPackage @@ -168689,10 +163090,8 @@ self: { }: mkDerivation { pname = "time-parsers"; - version = "0.1.0.0"; - sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8"; - revision = "4"; - editedCabalFile = "b245d40a3dd52af19e835fb9b0aaa9373dddd63cff13a3c298c97e02bca29e1e"; + version = "0.1.1.0"; + sha256 = "872d2ad4727ed7ac00a06b2acb7d7965da04d432c2d45017805fd4e6975d6ab2"; libraryHaskellDepends = [ base parsers template-haskell time ]; testHaskellDepends = [ attoparsec base bifunctors parsec parsers tasty tasty-hunit @@ -168710,10 +163109,10 @@ self: { version = "0.1.3.1"; sha256 = "56a0ac5f1a6a264f779d3de15ac09a204eda5a2fb04122e398fa9bb6848dee9d"; libraryHaskellDepends = [ base intervals lens thyme vector-space ]; - jailbreak = true; homepage = "https://bitbucket.org/jfmueller/time-patterns"; description = "Patterns for recurring events"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-qq" = callPackage @@ -168747,10 +163146,10 @@ self: { base data-ordlist HUnit mtl old-locale test-framework test-framework-hunit time ]; - jailbreak = true; homepage = "http://github.com/hellertime/time-recurrence"; description = "Generate recurring dates"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "time-series" = callPackage @@ -168787,7 +163186,6 @@ self: { version = "0.1.0.1"; sha256 = "6fb9bd6dcaf5d95093d7d24b6d37edfae71c22dab8158b650b7ba2b019dc168a"; libraryHaskellDepends = [ base convertible parsec time ]; - jailbreak = true; homepage = "http://cielonegro.org/W3CDateTime.html"; description = "Parse, format and convert W3C Date and Time"; license = stdenv.lib.licenses.publicDomain; @@ -168817,9 +163215,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base process time ]; - jailbreak = true; description = "Time commands by lines of STDOUT"; license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timeit" = callPackage @@ -168974,7 +163372,6 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring containers convertible mtl time ]; - jailbreak = true; description = "Attoparsec parsers for various Date/Time formats"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -169011,6 +163408,7 @@ self: { libraryHaskellDepends = [ base datetime ]; description = "Prints timestamps after each line evaluated"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "timerep" = callPackage @@ -169059,18 +163457,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timespan" = callPackage + ({ mkDerivation, base, time }: + mkDerivation { + pname = "timespan"; + version = "0.1.0.0"; + sha256 = "37500d586e16bad624a5a9419b750abf82e5107e3588dd873d6505e6e56253f8"; + libraryHaskellDepends = [ base time ]; + homepage = "https://github.com/agrafix/timespan#readme"; + description = "Useful timespan datatype and functions"; + license = stdenv.lib.licenses.mit; + }) {}; + "timestamp-subprocess-lines" = callPackage - ({ mkDerivation, base, bytestring, old-locale, process, split, time + ({ mkDerivation, base, bytestring, process, split, time , transformers }: mkDerivation { pname = "timestamp-subprocess-lines"; - version = "0.1.0.3"; - sha256 = "35aae25c87e8849d9eb9efe581aa94340da27c16f6f72c7ee5ea40b7d621c9ee"; + version = "0.1.0.4"; + sha256 = "2542b9977d1bf472ca8c929a6d390b223fdfff5cab940ca6bf1b632b31996bd1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base bytestring old-locale process split time transformers + base bytestring process split time transformers ]; homepage = "https://github.com/Peaker/timestamp-subprocess-lines"; description = "Run a command and timestamp its stdout/stderr lines"; @@ -169100,12 +163510,11 @@ self: { pname = "timezone-olson"; version = "0.1.7"; sha256 = "232f55b670531dced3b4f86b97b8f597073da6540e2b4e085936f73f30dea6aa"; - revision = "1"; - editedCabalFile = "cdd67661d2460ceb1720bcbb194726a57c21b113b9383cd1f1dca91e8e71d652"; + revision = "2"; + editedCabalFile = "2b056e050fea1cd6133901097f1c5338323f343b31f19bf042ded410ec8d44eb"; libraryHaskellDepends = [ base binary bytestring extensible-exceptions time timezone-series ]; - jailbreak = true; homepage = "http://projects.haskell.org/time-ng/"; description = "A pure Haskell parser and renderer for binary Olson timezone files"; license = stdenv.lib.licenses.bsd3; @@ -169117,12 +163526,11 @@ self: { }: mkDerivation { pname = "timezone-olson-th"; - version = "0.1.0.1"; - sha256 = "61eb1559bea5a5d5548a5ac0a915d741e6336eae0c3634b7f503583ed7221ef7"; + version = "0.1.0.2"; + sha256 = "5c8050daceec73b642a1ec85827d6914b2e0bfe32813b5c715a9200d0143ad76"; libraryHaskellDepends = [ base template-haskell time timezone-olson timezone-series ]; - jailbreak = true; homepage = "http://github.com/jonpetterbergman/timezone-olson-th"; description = "Load TimeZoneSeries from an Olson file at compile time"; license = stdenv.lib.licenses.bsd3; @@ -169132,10 +163540,9 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "timezone-series"; - version = "0.1.5.1"; - sha256 = "d244dda23a90f019884e6684a6bd7ec43f77875edf382861890ef1c68b2e7a56"; + version = "0.1.6.1"; + sha256 = "65ea9a8c3b1143a0f1d154943ac8311b53bb2ec7b5e52b09bd035343025c2cc3"; libraryHaskellDepends = [ base time ]; - jailbreak = true; homepage = "http://projects.haskell.org/time-ng/"; description = "Enhanced timezone handling for Data.Time"; license = stdenv.lib.licenses.bsd3; @@ -169163,10 +163570,10 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring hex serialport unix ]; - jailbreak = true; homepage = "http://github.com/mgajda/tinyMesh"; description = "TinyMesh - communicating with auto-meshing sensor network"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tinylog" = callPackage @@ -169219,7 +163626,6 @@ self: { executableHaskellDepends = [ base optparse-applicative pretty pretty-show tip-lib ]; - jailbreak = true; homepage = "http://tip-org.github.io"; description = "Convert from Haskell to Tip"; license = stdenv.lib.licenses.bsd3; @@ -169283,10 +163689,10 @@ self: { testHaskellDepends = [ base semigroups tasty tasty-hunit tasty-quickcheck text ]; - jailbreak = true; homepage = "https://github.com/nkaretnikov/titlecase"; description = "Convert English words to title case"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tkhs" = callPackage @@ -169344,9 +163750,9 @@ self: { sha256 = "feb269cd135796d7a378a01150ca89fdea380e4e7fa67b031b299fcd16acac5e"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; - jailbreak = true; description = "This project separates subdomains, domains, and top-level-domains from URLs"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tls" = callPackage @@ -169406,7 +163812,6 @@ self: { base bytestring certificate cipher-aes cipher-rc4 crypto-pubkey crypto-random cryptohash mtl network pem time tls vector ]; - jailbreak = true; homepage = "http://github.com/vincenthz/hs-tls"; description = "TLS extra default values and helpers"; license = stdenv.lib.licenses.bsd3; @@ -169447,10 +163852,10 @@ self: { executableHaskellDepends = [ base bytestring file-embed optparse-applicative optparse-helper ]; - jailbreak = true; homepage = "https://github.com/pharpend/tn"; description = "A simple daily journal program"; license = stdenv.lib.licenses.isc; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tnet" = callPackage @@ -169563,7 +163968,6 @@ self: { executableHaskellDepends = [ base containers old-locale strict time transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/toilet/"; description = "Manage the toilet queue at the IMO"; license = "GPL"; @@ -169592,10 +163996,10 @@ self: { version = "0.1.2.0"; sha256 = "90655271f5cc70dfdc571815407fbc64973318a5f02f0f0f8f70b590aa0fcebb"; libraryHaskellDepends = [ base containers text ]; - jailbreak = true; homepage = "https://github.com/AKST/tokenify"; description = "A regex lexer"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tokenize" = callPackage @@ -169676,23 +164080,23 @@ self: { libraryHaskellDepends = [ attoparsec base bytestring containers old-locale time ]; - jailbreak = true; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "toolshed" = callPackage - ({ mkDerivation, array, base, containers, deepseq, directory - , filepath, QuickCheck, random + ({ mkDerivation, array, base, containers, data-default, deepseq + , directory, filepath, HUnit, QuickCheck, random }: mkDerivation { pname = "toolshed"; - version = "0.16.0.0"; - sha256 = "bf19c993d987d9024aced25f3aeab1732ffe935c76daf276e147668f1c8fa244"; + version = "0.17.0.2"; + sha256 = "23d5c90cc0677239deec4b21c4aa8cd3d2477ba310abd39bed646cda10799e81"; libraryHaskellDepends = [ - array base containers deepseq directory filepath QuickCheck random + array base containers data-default deepseq directory filepath + QuickCheck random ]; - testHaskellDepends = [ base containers QuickCheck random ]; + testHaskellDepends = [ base containers HUnit QuickCheck random ]; homepage = "http://functionalley.eu"; description = "Ill-defined library"; license = "GPL"; @@ -169764,9 +164168,9 @@ self: { version = "1.0.4"; sha256 = "eadd2440d593a5df926f8ed77c6455c235e25948240d235a0ae7bd6bff15807e"; libraryHaskellDepends = [ base void ]; - jailbreak = true; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "total-alternative" = callPackage @@ -169819,11 +164223,33 @@ self: { isExecutable = true; libraryHaskellDepends = [ base directory process time ]; executableHaskellDepends = [ base cmdargs ]; - jailbreak = true; description = "Library (and cli) to execute a procedure on file change"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "toxcore" = callPackage + ({ mkDerivation, base, bytestring, bytestring-arbitrary + , data-default-class, hspec, QuickCheck, saltine, toxcore + }: + mkDerivation { + pname = "toxcore"; + version = "0.0.2"; + sha256 = "859eff7c76714fb802b1868a9d5165122217f3c3284c0cb0e7f7fb39921d7a72"; + libraryHaskellDepends = [ + base bytestring bytestring-arbitrary data-default-class QuickCheck + saltine + ]; + librarySystemDepends = [ toxcore ]; + testHaskellDepends = [ + base data-default-class hspec QuickCheck saltine + ]; + homepage = "https://toktok.github.io"; + description = "Haskell bindings to the C reference implementation of Tox"; + license = stdenv.lib.licenses.agpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {toxcore = null;}; + "toysolver" = callPackage ({ mkDerivation, array, base, bytestring, bytestring-builder , containers, data-default-class, data-interval, deepseq @@ -169840,6 +164266,8 @@ self: { pname = "toysolver"; version = "0.4.0"; sha256 = "e9633a7854e6b67d947da02128098f7a29100e9a185be1a5d267e1d4fbf8e3bf"; + revision = "1"; + editedCabalFile = "7d55fc9a8b47c61fab64b636ea94028f01d971e0e2b8b075aa73a04b9ed8a52e"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -169897,6 +164325,7 @@ self: { homepage = "http://github.com/bgamari/tpar/"; description = "simple, parallel job scheduling"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tpdb" = callPackage @@ -169941,9 +164370,9 @@ self: { version = "0.1"; sha256 = "5c993e37bf00d321afd93f3485a399edadb74751907b868cb26832d2d20e3fba"; libraryHaskellDepends = [ base containers mtl ]; - jailbreak = true; description = "functions for logging the arguments and results of function calls"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trace-function-call" = callPackage @@ -169953,9 +164382,9 @@ self: { version = "0.1"; sha256 = "be8fe1743d07d6d64d53dade44a14544793949da2167b6fd6c35a7d213d6b630"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Easy lightweight tracing of function arguments and results for ad hoc debugging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traced" = callPackage @@ -169991,12 +164420,14 @@ self: { pname = "tracetree"; version = "0.1.0.1"; sha256 = "12d0eb7923a905fff4b92c7f4f187a4715ba95883ac1df5e0a7efb59427f5115"; + revision = "1"; + editedCabalFile = "9e20b69ed0c5280699565c000bcd8f8b70ae6bc2275e37669af70bbca5d4f77a"; libraryHaskellDepends = [ base bifunctors containers json mtl transformers ]; - jailbreak = true; description = "Visualize Haskell data structures as edge-labeled trees"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tracker" = callPackage @@ -170018,9 +164449,9 @@ self: { version = "0.1.3.0"; sha256 = "9c298b7ff70dd4f5aaf839e7bccbc9810f0235833bb5b723babe0838eac5d301"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Convenience wrappers for non-intrusive debug tracing"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traildb" = callPackage @@ -170030,8 +164461,8 @@ self: { }: mkDerivation { pname = "traildb"; - version = "0.1.0.2"; - sha256 = "d9f92a220123ccf6bc33bd1a70736a2cf9631cae2e3252f39237d9a87b9ffac8"; + version = "0.1.1.0"; + sha256 = "15378affdaaa360d3f7c2f9e39866b9f73d60b3092ca9ab4ef4f82a33a373b3b"; libraryHaskellDepends = [ base bytestring containers directory exceptions lens primitive text time transformers unix vector @@ -170060,7 +164491,6 @@ self: { aeson attoparsec base bytestring cmdargs containers http-enumerator http-types regexpr text unordered-containers uri ]; - jailbreak = true; homepage = "https://github.com/mike-burns/trajectory"; description = "Tools and a library for working with Trajectory"; license = stdenv.lib.licenses.bsd3; @@ -170076,7 +164506,6 @@ self: { revision = "1"; editedCabalFile = "9ae1e516b5cb6219828469b330ff7017a5b943d2791f64f8bffc34ea7f964d83"; libraryHaskellDepends = [ base ListZipper MonadPrompt stm ]; - jailbreak = true; description = "Transactional events, based on Concurrent ML semantics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -170130,7 +164559,6 @@ self: { revision = "1"; editedCabalFile = "60dafcffe8c4fe6f3760426fc35a325c8e6419877596518c76f46657280207a9"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Concrete functor and monad transformers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -170181,21 +164609,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "transformers-compat_0_4_0_4" = callPackage - ({ mkDerivation, base, transformers }: - mkDerivation { - pname = "transformers-compat"; - version = "0.4.0.4"; - sha256 = "d5231bc9929ed234032411038c0baae5a3d82939163c2a36582fbe657c46af52"; - libraryHaskellDepends = [ base transformers ]; - doHaddock = false; - jailbreak = true; - homepage = "http://github.com/ekmett/transformers-compat/"; - description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "transformers-compat" = callPackage ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { @@ -170215,10 +164628,10 @@ self: { version = "0.1"; sha256 = "cddca7ec49334b951418dac5014aa0c4bf2ad38a841906d330d1681974a1704f"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "http://github.com/aristidb/transformers-compose"; description = "Arrow-like / category-like composition for transformers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "transformers-convert" = callPackage @@ -170235,7 +164648,6 @@ self: { base data-easy directory either errors haskell-src-exts hlint hspec HUnit QuickCheck text transformers unix ]; - jailbreak = true; homepage = "https://github.com/jcristovao/transformers-convert"; description = "Sensible conversions between some of the monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -170249,7 +164661,6 @@ self: { version = "0.1.0.0"; sha256 = "577f7ce07459239b1039d9f8c2935c02cc55bc585a5a4d21f5a81ac758f20037"; libraryHaskellDepends = [ base free mmorph pipes transformers ]; - jailbreak = true; homepage = "https://github.com/ocharles/transformers-eff"; description = "An approach to managing composable effects, ala mtl/transformers/extensible-effects/Eff"; license = stdenv.lib.licenses.bsd3; @@ -170287,7 +164698,6 @@ self: { version = "0.1.0.0"; sha256 = "3ac45eb89a407fca2d9872309f4f065934c9b8751abe5c6aaf3518135ddb3b54"; libraryHaskellDepends = [ base transformers ]; - jailbreak = true; homepage = "https://github.com/JanBessai/transformers-runnable"; description = "A unified interface for the run operation of monad transformers"; license = stdenv.lib.licenses.bsd3; @@ -170306,13 +164716,15 @@ self: { }) {}; "transient" = callPackage - ({ mkDerivation, base, containers, mtl, stm, time, transformers }: + ({ mkDerivation, base, containers, directory, mtl, random, stm + , time, transformers + }: mkDerivation { pname = "transient"; - version = "0.4.2.2"; - sha256 = "7c1445c12b6b38d4bad8f6461c65ad3fbbb7f81c873750f5dae14df14262fd3f"; + version = "0.4.4"; + sha256 = "da8d580e5fab1d43d791dbcc193fbe028925efdfb1b4bbcd017bccddff4dc382"; libraryHaskellDepends = [ - base containers mtl stm time transformers + base containers directory mtl random stm time transformers ]; homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Making composable programs with multithreading, events and distributed computing"; @@ -170327,14 +164739,17 @@ self: { }: mkDerivation { pname = "transient-universe"; - version = "0.3.2.3"; - sha256 = "ea861a538231bfa6a495f22b764ce80cfa8e65512419c9ab16c811b708625b2f"; + version = "0.3.5"; + sha256 = "0a990737a635cad37e7530eb1abe295df7b72b24a066fd2891d943bf4a92bbfb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bytestring case-insensitive containers directory filepath hashable HTTP iproute mtl network network-info network-uri process random stm TCache text time transformers transient vector websockets ]; + executableHaskellDepends = [ base transformers transient ]; homepage = "http://www.fpcomplete.com/user/agocorona"; description = "Remote execution and map-reduce: distributed computing for Transient"; license = stdenv.lib.licenses.mit; @@ -170347,9 +164762,9 @@ self: { version = "0.1"; sha256 = "7556dd009fa229c94ad47dfc7ef86b1e5e5bf76feee8db9b704419820b0d685f"; libraryHaskellDepends = [ base fingertree ]; - jailbreak = true; description = "Integer sets with a constant time translate operation"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "translate" = callPackage @@ -170417,10 +164832,10 @@ self: { regex-applicative tasty tasty-quickcheck text unordered-containers yaml ]; - jailbreak = true; homepage = "https://github.com/phadej/travis-meta-yaml#readme"; description = ".travis.yml preprocessor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trawl" = callPackage @@ -170437,10 +164852,10 @@ self: { base Cabal directory filepath MissingH optparse-applicative process split ]; - jailbreak = true; homepage = "https://github.com/bmjames/trawl"; description = "A tool for finding haddocks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "traypoweroff" = callPackage @@ -170452,7 +164867,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gtk process ]; - jailbreak = true; homepage = "http://projects.haskell.org/traypoweroff"; description = "Tray Icon application to PowerOff / Reboot computer"; license = stdenv.lib.licenses.bsd3; @@ -170493,6 +164907,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tree-view_0_5" = callPackage + ({ mkDerivation, base, containers, mtl }: + mkDerivation { + pname = "tree-view"; + version = "0.5"; + sha256 = "2d0046df6a78bfc57c7d11736d3baf6e1e427e8eb944f408b80a9195b062dcab"; + libraryHaskellDepends = [ base containers mtl ]; + description = "Render trees as foldable HTML and Unicode art"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "treemap" = callPackage ({ mkDerivation, base, containers, deepseq, semigroups, strict , tasty, tasty-hunit, text, transformers @@ -170508,9 +164934,9 @@ self: { base containers semigroups strict tasty tasty-hunit text transformers ]; - jailbreak = true; description = "A tree of Data.Map."; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "treemap-html" = callPackage @@ -170524,10 +164950,10 @@ self: { libraryHaskellDepends = [ base Cabal containers filepath ghc html parsec regex-posix ]; - jailbreak = true; homepage = "http://rampa.sk/static/treemap-html.html"; description = "Generates HTML for Data.Tree as TreeMap"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "treemap-html-tools" = callPackage @@ -170545,10 +164971,10 @@ self: { split treemap-html xml ]; doHaddock = false; - jailbreak = true; homepage = "http://rampa.sk/static/treemap-html.html"; description = "Treemap related commands for producing foldable TreeMap HTML"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "treersec" = callPackage @@ -170645,34 +165071,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "trifecta_1_5_2" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base - , blaze-builder, blaze-html, blaze-markup, bytestring, charset - , comonad, containers, deepseq, directory, doctest, filepath - , fingertree, ghc-prim, hashable, lens, mtl, parsers, profunctors - , QuickCheck, reducers, semigroups, transformers - , unordered-containers, utf8-string - }: - mkDerivation { - pname = "trifecta"; - version = "1.5.2"; - sha256 = "ebc23319d2cfd39c87b2cf688f3db45528e371de9a417fc9e07e50a796b6503a"; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base blaze-builder blaze-html - blaze-markup bytestring charset comonad containers deepseq - fingertree ghc-prim hashable lens mtl parsers profunctors reducers - semigroups transformers unordered-containers utf8-string - ]; - testHaskellDepends = [ - base directory doctest filepath parsers QuickCheck - ]; - jailbreak = true; - homepage = "http://github.com/ekmett/trifecta/"; - description = "A modern parser combinator library with convenient diagnostics"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "trifecta" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, array, base , blaze-builder, blaze-html, blaze-markup, bytestring, charset @@ -170708,7 +165106,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bio bytestring simpleargs ]; - jailbreak = true; description = "Search for, annotate and trim poly-A tail"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -170725,10 +165122,10 @@ self: { libraryHaskellDepends = [ base bytestring cereal filepath leveldb-haskell ]; - jailbreak = true; homepage = "https://github.com/aphorisme/tripLL"; description = "A very simple triple store"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "trivia" = callPackage @@ -170762,7 +165159,6 @@ self: { version = "0.0.0.2"; sha256 = "6282fbe2f86bb261a2f4189154125865b12754f6028181e6229ae3f59d94c9c6"; libraryHaskellDepends = [ base semiring-simple ]; - jailbreak = true; description = "A library for tropical mathematics"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -170886,9 +165282,9 @@ self: { testHaskellDepends = [ base containers hspec HUnit lens QuickCheck time vector ]; - jailbreak = true; description = "-"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tslogger" = callPackage @@ -170898,9 +165294,9 @@ self: { version = "0.1.0.0"; sha256 = "b41d3612219cc49b7e61531587ca33e582ec11f76e24254154f44fd515a5cbf7"; libraryHaskellDepends = [ async base containers random ]; - jailbreak = true; description = "Thread-safe logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tsp-viz" = callPackage @@ -170912,7 +165308,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gloss stm vector ]; - jailbreak = true; homepage = "https://github.com/davnils/tsp-viz"; description = "Real time TSP tour visualization"; license = stdenv.lib.licenses.bsd3; @@ -170930,10 +165325,10 @@ self: { libraryHaskellDepends = [ base Decimal parsec pretty process split time ]; - jailbreak = true; homepage = "http://www.github.com/massysett/tsparse"; description = "Parses U.S. federal Thrift Savings Plan PDF quarterly statements"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tst" = callPackage @@ -170962,10 +165357,10 @@ self: { attoparsec base bytestring containers optparse-applicative string-qq text unordered-containers ]; - jailbreak = true; homepage = "https://github.com/danchoi/tsvsql"; description = "Template tsv into SQL"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ttask" = callPackage @@ -171012,31 +165407,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tttool_1_6_1_1" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers - , directory, executable-path, filepath, hashable, haskeline, HPDF - , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec - , process, random, split, spool, template-haskell, time, vector - , yaml, zlib - }: - mkDerivation { - pname = "tttool"; - version = "1.6.1.1"; - sha256 = "6a002fd4ed43f6ddf165961baa88fa0eb75c4afa87f6916ec9e37331a3c5d78b"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base binary bytestring containers directory executable-path - filepath hashable haskeline HPDF JuicyPixels mtl natural-sort - optparse-applicative parsec process random split spool - template-haskell time vector yaml zlib - ]; - homepage = "https://github.com/entropia/tip-toi-reveng"; - description = "Working with files for the Tiptoi® pen"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tttool" = callPackage ({ mkDerivation, aeson, base, binary, bytestring, containers , directory, executable-path, filepath, hashable, haskeline, HPDF @@ -171061,6 +165431,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tttool_1_6_1_3" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, containers + , directory, executable-path, filepath, hashable, haskeline, HPDF + , JuicyPixels, mtl, natural-sort, optparse-applicative, parsec + , process, random, split, spool, template-haskell, time, vector + , yaml, zlib + }: + mkDerivation { + pname = "tttool"; + version = "1.6.1.3"; + sha256 = "7ca01c73dad41aab3b002db4c6f4e929be01c982c397dbca0e65315171339d45"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base binary bytestring containers directory executable-path + filepath hashable haskeline HPDF JuicyPixels mtl natural-sort + optparse-applicative parsec process random split spool + template-haskell time vector yaml zlib + ]; + homepage = "https://github.com/entropia/tip-toi-reveng"; + description = "Working with files for the Tiptoi® pen"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tubes" = callPackage ({ mkDerivation, base, comonad, contravariant, free, mtl , profunctors, semigroups, transformers @@ -171085,12 +165480,25 @@ self: { version = "0.0.2"; sha256 = "8154773e5f58768307cb2554a5b9f3af70ad1916f6769768c869b5261917cf60"; libraryHaskellDepends = [ base bytestring unix ]; - jailbreak = true; description = "Interface to TUN/TAP drivers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "tuntap-simple" = callPackage + ({ mkDerivation, base, ioctl }: + mkDerivation { + pname = "tuntap-simple"; + version = "0.1.0.0"; + sha256 = "cecb67220c3818d989c8939df10f89e9cf4987e4a7e67b7b6202ccf997c3af8c"; + revision = "2"; + editedCabalFile = "28866402f6b3961fe4808afe7d02e3cd3b5d73d99ec02aec67f2bd205dd94a96"; + libraryHaskellDepends = [ base ioctl ]; + homepage = "https://github.com/riaqn/tuntap-simple#readme"; + description = "A simple tun/tap library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "tup-functor" = callPackage ({ mkDerivation, base, cpphs, haskell-src-exts, parsec2 }: mkDerivation { @@ -171124,7 +165532,6 @@ self: { version = "2.0"; sha256 = "a76d663380cc6b4b9d12307f42cce8ed30f25406bb29be203407668e70d7fc2d"; libraryHaskellDepends = [ base combinat ]; - jailbreak = true; description = "Enum instances for tuples where the digits increase with the same speed"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -171162,10 +165569,10 @@ self: { version = "0.1.0.2"; sha256 = "fc3002223e70b7714b40c384fc42532acf1f0108b24e7b53e620908414d501e3"; libraryHaskellDepends = [ base lens template-haskell ]; - jailbreak = true; homepage = "http://github.com/jfischoff/tuple-lenses"; description = "Stock FieldN combos and generators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tuple-morph" = callPackage @@ -171200,7 +165607,6 @@ self: { version = "0.0.1"; sha256 = "237a1c4efce728055817cf2aef8a064f7b85324cd998f3eebf54ebeec263954d"; libraryHaskellDepends = [ base template-haskell ]; - jailbreak = true; homepage = "http://github.com/diegoeche/tupleinstances"; description = "Functor, Applicative and Monad for n-ary tuples"; license = stdenv.lib.licenses.bsd3; @@ -171239,10 +165645,10 @@ self: { version = "0.1.0.1"; sha256 = "65c4a837e590e86350e0aa3c7c8cd9c85037a07e28449bd02adacfb64937d0aa"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/jariazavalverde/hackage-turing-machines"; description = "A simple simulator for Turing machines"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turing-music" = callPackage @@ -171265,10 +165671,10 @@ self: { version = "0.1.3.0"; sha256 = "26b255719f25bdf73a0ce45e043b68bd57a4ebd8f582311aa6e0c8e6ec7efafc"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; homepage = "https://github.com/sanjorgek/turingMachine"; description = "An implementation of Turing Machine and Automaton"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turkish-deasciifier" = callPackage @@ -171333,7 +165739,6 @@ self: { libraryHaskellDepends = [ base optional-args parsec text turtle ]; executableHaskellDepends = [ base turtle ]; testHaskellDepends = [ base HUnit parsec ]; - doCheck = false; homepage = "https://github.com/elaye/turtle-options#readme"; description = "Collection of command line options and parsers for these options"; license = stdenv.lib.licenses.bsd3; @@ -171346,10 +165751,10 @@ self: { version = "0.1.0.1"; sha256 = "3cbe6fd74e2ef0bf5eb5fad2ba81a0880db3f005c170631f2f4527a61e49bed0"; libraryHaskellDepends = [ base containers lens stm transformers ]; - jailbreak = true; homepage = "http://github.com/jfischoff/tweak"; description = "A library for incremental computing"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twee" = callPackage @@ -171372,6 +165777,7 @@ self: { homepage = "http://github.com/nick8325/twee"; description = "An equational theorem prover"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp" = callPackage @@ -171398,9 +165804,9 @@ self: { libraryHaskellDepends = [ base network text twentefp-number twentefp-websockets ]; - jailbreak = true; description = "Used as Lab Assignments Environment at the University of Twente"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-eventloop-trees" = callPackage @@ -171423,6 +165829,7 @@ self: { libraryHaskellDepends = [ base twentefp-eventloop-graphics ]; description = "Lab Assignments Environment at Univeriteit Twente"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-number" = callPackage @@ -171446,7 +165853,6 @@ self: { libraryHaskellDepends = [ base twentefp-eventloop-graphics twentefp-number ]; - jailbreak = true; description = "RoseTree type and show functions for lab assignment of University of Twente"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -171461,6 +165867,7 @@ self: { libraryHaskellDepends = [ base twentefp-eventloop-graphics ]; description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and ParseTree"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentefp-websockets" = callPackage @@ -171477,9 +165884,9 @@ self: { case-insensitive concurrent-extra containers entropy io-streams mtl network random SHA text ]; - jailbreak = true; description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twentyseven" = callPackage @@ -171507,7 +165914,6 @@ self: { testHaskellDepends = [ base Cabal cabal-test-quickcheck HUnit-Plus QuickCheck split vector ]; - jailbreak = true; homepage = "https://github.com/lysxia/twentyseven"; description = "Rubik's cube solver"; license = stdenv.lib.licenses.mit; @@ -171540,7 +165946,6 @@ self: { twitter-conduit ]; testHaskellDepends = [ base hspec QuickCheck ]; - jailbreak = true; homepage = "https://github.com/suzuki-shin/twhs"; description = "CLI twitter client"; license = stdenv.lib.licenses.mit; @@ -171563,7 +165968,6 @@ self: { hslogger MissingH mtl network old-locale parsec regex-posix text time unix utf8-string ]; - jailbreak = true; homepage = "http://software.complete.org/twidge"; description = "Unix Command-Line Twitter and Identica Client"; license = "GPL"; @@ -171604,11 +166008,11 @@ self: { aeson base bytestring Cabal http-client http-client-tls network-uri text transformers ]; - jailbreak = true; doCheck = false; homepage = "https://github.com/markandrus/twilio-haskell"; description = "Twilio REST API library for Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "twill" = callPackage @@ -171625,7 +166029,6 @@ self: { bytestring cryptohash data-default datetime errors old-locale QuickCheck text time ]; - jailbreak = true; description = "Twilio API interaction"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -171648,7 +166051,6 @@ self: { base Cabal data-default deepseq Diff HUnit lens should-not-typecheck void ]; - jailbreak = true; homepage = "https://github.com/markandrus/twiml-haskell"; description = "TwiML library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -171683,7 +166085,6 @@ self: { libraryHaskellDepends = [ array base containers data-memocombinators MonadRandom parallel ]; - jailbreak = true; description = "Simulator of twisty puzzles à la Rubik's Cube"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -171754,7 +166155,6 @@ self: { lens-aeson network-uri resourcet template-haskell text time twitter-types twitter-types-lens ]; - doCheck = false; homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; @@ -171774,34 +166174,12 @@ self: { containers enumerator http-enumerator http-types text tls-extra transformers ]; - jailbreak = true; homepage = "https://github.com/himura/twitter-enumerator"; description = "Twitter API package with enumerator interface and Streaming API support"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "twitter-feed_0_2_0_7" = callPackage - ({ mkDerivation, aeson, authenticate-oauth, base, bytestring - , containers, http-conduit, HUnit, test-framework - , test-framework-hunit - }: - mkDerivation { - pname = "twitter-feed"; - version = "0.2.0.7"; - sha256 = "031cafcb9685b1f3f677f9a168b72831f85df43e49a74cc9e89d3d7218e15d95"; - libraryHaskellDepends = [ - aeson authenticate-oauth base bytestring http-conduit - ]; - testHaskellDepends = [ - base containers HUnit test-framework test-framework-hunit - ]; - homepage = "https://github.com/stackbuilders/twitter-feed"; - description = "Client for fetching Twitter timeline via Oauth"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "twitter-feed" = callPackage ({ mkDerivation, aeson, authenticate-oauth, base, bytestring , containers, http-conduit, HUnit, test-framework @@ -171822,6 +166200,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "twitter-feed_0_2_0_10" = callPackage + ({ mkDerivation, aeson, authenticate-oauth, base, bytestring + , containers, http-conduit, HUnit, test-framework + , test-framework-hunit + }: + mkDerivation { + pname = "twitter-feed"; + version = "0.2.0.10"; + sha256 = "8dc2ea040a332086588b8e314bd3ba389446e1e7d8746d1fca188e01c9005de0"; + libraryHaskellDepends = [ + aeson authenticate-oauth base bytestring http-conduit + ]; + testHaskellDepends = [ + base containers HUnit test-framework test-framework-hunit + ]; + homepage = "https://github.com/stackbuilders/twitter-feed"; + description = "Client for fetching Twitter timeline via Oauth"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "twitter-types" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, derive , directory, filepath, HUnit, old-locale, QuickCheck @@ -171873,7 +166272,6 @@ self: { libraryHaskellDepends = [ base bytestring cereal safecopy stm transformers ]; - jailbreak = true; homepage = "https://github.com/mcschroeder/tx"; description = "Persistent transactions on top of STM"; license = stdenv.lib.licenses.mit; @@ -171919,9 +166317,9 @@ self: { version = "0.2.0.1"; sha256 = "6b095e72de6a004432a81c85098d82f438edd021e6aacc3f7171ae16966f1723"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "Deprecated in favor of eros"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ty" = callPackage @@ -171989,7 +166387,6 @@ self: { libraryHaskellDepends = [ base containers lens lens-utils template-haskell ]; - jailbreak = true; homepage = "https://github.com/wdanilo/type-cache"; description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation."; license = stdenv.lib.licenses.asl20; @@ -172036,7 +166433,6 @@ self: { libraryHaskellDepends = [ base haskell-src-meta template-haskell type-combinators ]; - jailbreak = true; homepage = "https://github.com/kylcarte/type-combinators-quote"; description = "Quasiquoters for the 'type-combinators' package"; license = stdenv.lib.licenses.bsd3; @@ -172203,9 +166599,9 @@ self: { libraryHaskellDepends = [ base transformers type-level-natural-number ]; - jailbreak = true; description = "High-level combinators for performing inductive operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-level-natural-number-operations" = callPackage @@ -172215,9 +166611,9 @@ self: { version = "1.0"; sha256 = "7ce40401be031506c6d1b0fa9c48f8ba61af48ec6061ccc1e6152ef80b2e146f"; libraryHaskellDepends = [ base type-level-natural-number ]; - jailbreak = true; description = "Basic operations on type-level natural numbers"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-level-numbers" = callPackage @@ -172255,19 +166651,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "type-list_0_3_0_4" = callPackage - ({ mkDerivation, base, singletons }: - mkDerivation { - pname = "type-list"; - version = "0.3.0.4"; - sha256 = "cd06218bf2f6897e0caf85c86334d8834ea36410a0d0b1d9193e1cbadd1b300a"; - libraryHaskellDepends = [ base singletons ]; - jailbreak = true; - description = "Operations on type-level lists and tuples"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "type-list" = callPackage ({ mkDerivation, base, singletons }: mkDerivation { @@ -172292,7 +166675,6 @@ self: { base constraints equational-reasoning ghc-typelits-natnormalise ghc-typelits-presburger monomorphic singletons template-haskell ]; - jailbreak = true; homepage = "https://github.com/konn/type-natural"; description = "Type-level natural and proofs of their properties"; license = stdenv.lib.licenses.bsd3; @@ -172383,6 +166765,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-spec_0_3_0_1" = callPackage + ({ mkDerivation, base, pretty }: + mkDerivation { + pname = "type-spec"; + version = "0.3.0.1"; + sha256 = "aecd1a319efc13eb42b73b489cf374f94bf126f19fdc28b2f5cd6f73dda3a241"; + libraryHaskellDepends = [ base pretty ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/sheyll/type-spec#readme"; + description = "Type Level Specification by Example"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-spine" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -172417,7 +166813,6 @@ self: { template-haskell text th-instance-reification time transformers unordered-containers vector ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/type-structure"; description = "Type structure analysis"; license = stdenv.lib.licenses.mit; @@ -172474,7 +166869,6 @@ self: { sha256 = "dbcc81c6512ab975703c62d186238c7447299e575085f22766eb9faefdcc49df"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/bennofs/typeable-th"; description = "Automatic deriving of TypeableN instances with Template Haskell"; license = stdenv.lib.licenses.bsd3; @@ -172498,9 +166892,9 @@ self: { executableHaskellDepends = [ base diagrams-cairo diagrams-lib text ]; - jailbreak = true; description = "Typed and composable spreadsheets"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typed-wire" = callPackage @@ -172571,7 +166965,6 @@ self: { version = "1.4.0.4"; sha256 = "fb52604f8c0a48015c800c67dd5d9e8f8d027985d65f27c37121e695b3024187"; libraryHaskellDepends = [ base binary bytestring mtl pureMD5 syb ]; - jailbreak = true; description = "Create a unique hash value for a type"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -172584,10 +166977,10 @@ self: { version = "1.0.4"; sha256 = "1cc8131a6e2cf9c84968980d73a543c7dc73fd6d878973a9f0a5ddaedf471dc2"; libraryHaskellDepends = [ base pretty pretty-show ]; - jailbreak = true; homepage = "https://github.com/wdanilo/typelevel"; description = "Useful type level operations (type families and related operators)"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typelevel-tensor" = callPackage @@ -172665,10 +167058,10 @@ self: { revision = "2"; editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/philopon/types-compat"; description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy."; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "typesafe-endian" = callPackage @@ -172730,34 +167123,6 @@ self: { license = "GPL"; }) {}; - "tz_0_1_1_1" = callPackage - ({ mkDerivation, base, binary, bindings-posix, bytestring - , containers, data-default, deepseq, HUnit, QuickCheck - , template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, time, tzdata, unix - , vector - }: - mkDerivation { - pname = "tz"; - version = "0.1.1.1"; - sha256 = "66862e68a1dca1a9fb5372b86f23ae64f39ff0f2f075041fc3dae4c7d2dedcd0"; - libraryHaskellDepends = [ - base binary bytestring containers data-default deepseq - template-haskell time tzdata vector - ]; - testHaskellDepends = [ - base bindings-posix HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 test-framework-th - time tzdata unix vector - ]; - jailbreak = true; - preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; - homepage = "https://github.com/nilcons/haskell-tz"; - description = "Efficient time zone handling"; - license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "tz" = callPackage ({ mkDerivation, base, binary, bytestring, containers, data-default , deepseq, HUnit, QuickCheck, template-haskell, test-framework @@ -172803,6 +167168,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "u2f" = callPackage + ({ mkDerivation, aeson, asn1-encoding, asn1-types, base + , base64-bytestring, binary, bytestring, cryptohash, cryptonite + , either-unwrap, hspec, text + }: + mkDerivation { + pname = "u2f"; + version = "0.1.0.0"; + sha256 = "b7d123b1eee52751bc1310e2acca2129241bf5588a2587dcfe37691e1ff17205"; + libraryHaskellDepends = [ + aeson asn1-encoding asn1-types base base64-bytestring binary + bytestring cryptohash cryptonite either-unwrap text + ]; + testHaskellDepends = [ base bytestring hspec text ]; + homepage = "https://github.com/EButlerIV/u2f"; + description = "Haskell Universal Two Factor helper toolbox library thing"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uAgda" = callPackage ({ mkDerivation, array, base, BNFC-meta, cmdargs, containers, mtl , parsec, pretty, split, transformers @@ -172817,7 +167202,6 @@ self: { array base BNFC-meta cmdargs containers mtl parsec pretty split transformers ]; - jailbreak = true; description = "A simplistic dependently-typed language with parametricity"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; @@ -173024,9 +167408,9 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base bytestring split ]; - jailbreak = true; description = "hex dumper for UTF-8 text"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uhttpc" = callPackage @@ -173081,6 +167465,7 @@ self: { homepage = "http://github.com/hargettp/uid.git"; description = "Simple unique identifier datatype, serializable and encodable as base32"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "una" = callPackage @@ -173230,7 +167615,6 @@ self: { version = "0.4"; sha256 = "2498539b0cd384a33f0287622fe9544de67e374ca98eac0e5abb045d9b88440a"; libraryHaskellDepends = [ base unbounded-delays units units-defs ]; - jailbreak = true; homepage = "https://github.com/jcristovao/unbouded-delays-units"; description = "Thread delays and timeouts using proper time units"; license = stdenv.lib.licenses.bsd3; @@ -173266,7 +167650,6 @@ self: { cryptonite memory process text unix ]; executableHaskellDepends = [ base bytestring cmdargs ]; - jailbreak = true; homepage = "https://e.xtendo.org/scs/unbreak"; description = "Secure and resilient remote file storage utility"; license = stdenv.lib.licenses.agpl3; @@ -173542,9 +167925,9 @@ self: { version = "0.1.1.2"; sha256 = "dbafed928b75d53d7aab794012ee1fdfff6454fdda468a4ab051f4e032e62a78"; libraryHaskellDepends = [ base containers ]; - jailbreak = true; description = "Unicode alternatives for common functions and operators"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-transforms" = callPackage @@ -173571,7 +167954,6 @@ self: { libraryHaskellDepends = [ attoparsec base text ]; executableHaskellDepends = [ attoparsec base directory text ]; testHaskellDepends = [ attoparsec base text ]; - jailbreak = true; homepage = "https://github.com/Zankoku-Okuno/unicoder"; description = "Make writing in unicode easy"; license = stdenv.lib.licenses.bsd3; @@ -173605,7 +167987,6 @@ self: { ]; librarySystemDepends = [ openssl ]; testHaskellDepends = [ attoparsec base bytestring Cabal ]; - jailbreak = true; homepage = "https://sealgram.com/git/haskell/uniform-io"; description = "Uniform IO over files, network, anything"; license = stdenv.lib.licenses.mit; @@ -173624,18 +168005,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "union_0_1_1_0" = callPackage - ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: - mkDerivation { - pname = "union"; - version = "0.1.1.0"; - sha256 = "d83b04349288fe9b73c254312da9850e1c05717beb7f8db6f7fefed83f1a82e6"; - libraryHaskellDepends = [ base deepseq profunctors tagged vinyl ]; - description = "Extensible type-safe unions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "union" = callPackage ({ mkDerivation, base, deepseq, profunctors, tagged, vinyl }: mkDerivation { @@ -173728,10 +168097,10 @@ self: { testHaskellDepends = [ base non-empty QuickCheck transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/unique-logic/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unique-logic-tf" = callPackage @@ -173748,10 +168117,10 @@ self: { testHaskellDepends = [ base non-empty QuickCheck transformers utility-ht ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/unique-logic-tf/"; description = "Solve simple simultaneous equations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uniqueid" = callPackage @@ -173825,7 +168194,6 @@ self: { libraryHaskellDepends = [ attoparsec base template-haskell text units units-defs ]; - jailbreak = true; homepage = "https://github.com/jcristovao/units-attoparsec"; description = "Attoparsec parsers for the units package"; license = stdenv.lib.licenses.bsd3; @@ -173869,7 +168237,6 @@ self: { sha256 = "b4b5d74a863ac2f4d1430305aa4b2277b9d3bbec9492aa8b75cca26b793e62a9"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://bitbucket.org/xnyhps/haskell-unittyped/"; description = "An extendable library for type-safe computations including units"; license = stdenv.lib.licenses.lgpl21; @@ -174028,21 +168395,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unix-compat_0_4_1_4" = callPackage - ({ mkDerivation, base, unix }: - mkDerivation { - pname = "unix-compat"; - version = "0.4.1.4"; - sha256 = "fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b"; - revision = "2"; - editedCabalFile = "2c9cfb5497baed3eeddfe5c6cc249bf51a76e2bb646c322b8f45a0db8c42129c"; - libraryHaskellDepends = [ base unix ]; - homepage = "http://github.com/jystic/unix-compat"; - description = "Portable POSIX-compatibility layer"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "unix-compat" = callPackage ({ mkDerivation, base, unix }: mkDerivation { @@ -174062,10 +168414,10 @@ self: { version = "0.0.0"; sha256 = "69c1852fa11e98c99e0f61052bd642e66f2e491ffba1e0ee6d7cd5d049f832a3"; libraryHaskellDepends = [ base foreign-var ]; - jailbreak = true; homepage = "https://github.com/maoe/unix-fcntl"; description = "Comprehensive bindings to fcntl(2)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unix-handle" = callPackage @@ -174124,7 +168476,6 @@ self: { testHaskellDepends = [ base bytestring conduit hspec transformers unix ]; - jailbreak = true; homepage = "https://github.com/snoyberg/conduit"; description = "Run processes on Unix systems, with a conduit interface (deprecated)"; license = stdenv.lib.licenses.mit; @@ -174143,23 +168494,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unix-time_0_3_6" = callPackage - ({ mkDerivation, base, binary, bytestring, doctest, hspec - , old-locale, old-time, QuickCheck, time - }: - mkDerivation { - pname = "unix-time"; - version = "0.3.6"; - sha256 = "5d15ebd0ee74e13638a7c04a7fc5f05a29ccd3228c8798df226939a778f7db37"; - libraryHaskellDepends = [ base binary bytestring old-time ]; - testHaskellDepends = [ - base bytestring doctest hspec old-locale old-time QuickCheck time - ]; - description = "Unix time parser/formatter and utilities"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "unix-time" = callPackage ({ mkDerivation, base, binary, bytestring, doctest, hspec , old-locale, old-time, QuickCheck, time @@ -174176,6 +168510,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unjson" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , free, hashable, HUnit, invariant, pretty, primitive, scientific + , text, time, unordered-containers, vector + }: + mkDerivation { + pname = "unjson"; + version = "0.14.0.1"; + sha256 = "d173f0c4ad8c80d4e1035a57c6bf3e4a8620ffb71c0c1f6ddcb474ac440a3e13"; + revision = "4"; + editedCabalFile = "129fd242ec0082f7c3dfa73cdadb13d7b7556a61395b62d0d2e0acbb4e3768ec"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers free hashable invariant + pretty primitive scientific text time unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers free hashable HUnit + invariant pretty primitive scientific text time + unordered-containers vector + ]; + description = "Bidirectional JSON parsing and generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unlambda" = callPackage ({ mkDerivation, array, base, mtl, unix }: mkDerivation { @@ -174253,7 +168612,6 @@ self: { testHaskellDepends = [ base hashable hspec HUnit rematch unordered-containers ]; - jailbreak = true; homepage = "http://github.com/tcrayford/rematch"; description = "Rematch support for unordered containers"; license = stdenv.lib.licenses.mit; @@ -174335,10 +168693,10 @@ self: { version = "0.2.0.0"; sha256 = "19341a7d3d2e4d4ae3a4a232c566edb071c895a17e5f1d1ad092b1d3fe026583"; libraryHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/konn/unsafely"; description = "Flexible access control for unsafe operations and instances"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unsafeperformst" = callPackage @@ -174385,10 +168743,10 @@ self: { attoparsec interspersed QuickCheck quickcheck-instances rebase tasty tasty-hunit tasty-quickcheck tasty-smallcheck ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/unsequential"; description = "An extension removing the sequentiality from monads"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unusable-pkg" = callPackage @@ -174430,6 +168788,7 @@ self: { homepage = "https://github.com/joshuaclayton/unused#readme"; description = "A command line tool to identify unused code"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "uom-plugin" = callPackage @@ -174464,7 +168823,6 @@ self: { executableHaskellDepends = [ base directory filepath lambda-options mtl split ]; - jailbreak = true; homepage = "https://github.com/thomaseding/up"; description = "Command line tool to generate pathnames to facilitate moving upward in a file system"; license = stdenv.lib.licenses.bsd3; @@ -174497,7 +168855,6 @@ self: { aeson attoparsec base bytestring cryptohash hex http-conduit http-types old-locale time ]; - jailbreak = true; description = "Haskell client for Uploadcare"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -174534,7 +168891,6 @@ self: { network old-locale opml optparse-applicative parallel-io split tagsoup terminal-size text time xml ]; - jailbreak = true; homepage = "https://github.com/pxqr/ureader"; description = "Minimalistic CLI RSS reader"; license = stdenv.lib.licenses.bsd3; @@ -174556,7 +168912,6 @@ self: { base bytestring cake3 directory filepath language-javascript mime-types mtl optparse-applicative process syb text ]; - jailbreak = true; homepage = "http://github.com/grwlf/urembed"; description = "Ur/Web static content generator"; license = stdenv.lib.licenses.bsd3; @@ -174575,30 +168930,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "uri-bytestring_0_2_1_2" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , containers, derive, HUnit, lens-simple, QuickCheck - , quickcheck-instances, semigroups, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "uri-bytestring"; - version = "0.2.1.2"; - sha256 = "885eacdbca1a94b32eadcaaf20b87be7e293a09418007e0c77cc613ccaecc8eb"; - libraryHaskellDepends = [ - attoparsec base blaze-builder bytestring containers - ]; - testHaskellDepends = [ - attoparsec base blaze-builder bytestring containers derive HUnit - lens-simple QuickCheck quickcheck-instances semigroups tasty - tasty-hunit tasty-quickcheck - ]; - homepage = "https://github.com/Soostone/uri-bytestring"; - description = "Haskell URI parsing as ByteStrings"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uri-bytestring" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , containers, derive, HUnit, lens-simple, QuickCheck @@ -174635,28 +168966,12 @@ self: { base bytestring conduit containers deepseq failure monad-control network system-fileio system-filepath text transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/xml"; description = "Read and write URIs (deprecated)"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "uri-encode_1_5_0_4" = callPackage - ({ mkDerivation, base, bytestring, network-uri, text, utf8-string - }: - mkDerivation { - pname = "uri-encode"; - version = "1.5.0.4"; - sha256 = "f7ca380f88a3cc815cdffeb7cc714fbed4b9bd8da1a4ac3139e4ab001179f582"; - libraryHaskellDepends = [ - base bytestring network-uri text utf8-string - ]; - description = "Unicode aware uri-encoding"; - license = "unknown"; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uri-encode" = callPackage ({ mkDerivation, base, bytestring, network-uri, text, utf8-string }: @@ -174683,7 +168998,6 @@ self: { base bytestring containers enumerator failure network text transformers ]; - jailbreak = true; homepage = "http://github.com/snoyberg/xml"; description = "Read and write URIs (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -174704,7 +169018,6 @@ self: { network system-fileio system-filepath text transformers uri-enumerator ]; - jailbreak = true; homepage = "http://github.com/snoyberg/xml"; description = "uri-enumerator backend for the file scheme (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -174856,10 +169169,10 @@ self: { sha256 = "079adeb93b604e50f80f58344010510fd112721d5dae714ef2d47d5b08c1aff3"; libraryHaskellDepends = [ base parsec ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; homepage = "https://github.com/pxqr/urn"; description = "Universal Resource Names"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "urxml" = callPackage @@ -174875,7 +169188,6 @@ self: { executableHaskellDepends = [ base filepath mtl optparse-applicative parsec process syb ]; - jailbreak = true; homepage = "http://github.com/grwlf/urxml"; description = "XML parser-printer supporting Ur/Web syntax extensions"; license = stdenv.lib.licenses.publicDomain; @@ -174910,7 +169222,6 @@ self: { base base-unicode-symbols bindings-libusb iteratee monad-control transformers usb ]; - jailbreak = true; description = "Iteratee enumerators for the usb package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -174925,10 +169236,10 @@ self: { revision = "1"; editedCabalFile = "3fe150e203f72b72c425bef276254a2ca91ca40cab21f6088838bb32c806e8dc"; libraryHaskellDepends = [ attoparsec base bytestring usb ]; - jailbreak = true; homepage = "https://github.com/mapinguari/usb-hid"; description = "Parser and request Library for USB HIDs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "usb-id-database" = callPackage @@ -174960,7 +169271,6 @@ self: { base base-unicode-symbols bindings-libusb iteratee monad-control usb vector ]; - jailbreak = true; homepage = "https://github.com/basvandijk/usb-iteratee"; description = "Iteratee enumerators for the usb package"; license = stdenv.lib.licenses.bsd3; @@ -174979,30 +169289,12 @@ self: { base base-unicode-symbols bindings-libusb bytestring iteratee regions text transformers usb ]; - jailbreak = true; homepage = "https://github.com/basvandijk/usb-safe/"; description = "Type-safe communication with USB devices"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "userid_0_1_2_6" = callPackage - ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes - , web-routes-th - }: - mkDerivation { - pname = "userid"; - version = "0.1.2.6"; - sha256 = "2a6972e25defb31b57055249888ec19565e0f1b884da1235ef1af76d11f44ab1"; - libraryHaskellDepends = [ - aeson base boomerang safecopy web-routes web-routes-th - ]; - homepage = "http://www.github.com/Happstack/userid"; - description = "The UserId type and useful instances for web development"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "userid" = callPackage ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes , web-routes-th @@ -175067,7 +169359,6 @@ self: { base bytestring mtl postgresql-simple text time users uuid ]; testHaskellDepends = [ base hspec postgresql-simple users-test ]; - doCheck = false; homepage = "https://github.com/agrafix/users"; description = "A PostgreSQL backend for the users package"; license = stdenv.lib.licenses.mit; @@ -175101,7 +169392,6 @@ self: { attoparsec base bytestring Cabal clock exceptions QuickCheck test-framework test-framework-quickcheck2 text ]; - jailbreak = true; homepage = "https://github.com/lpeterse/haskell-utc"; description = "A pragmatic time and date library"; license = stdenv.lib.licenses.mit; @@ -175139,7 +169429,6 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base utf8-string ]; - jailbreak = true; description = "Variants of Prelude and System.IO with UTF8 text I/O operations"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -175159,19 +169448,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "utility-ht_0_0_11" = callPackage - ({ mkDerivation, base, QuickCheck }: - mkDerivation { - pname = "utility-ht"; - version = "0.0.11"; - sha256 = "5cdcc5c1eab4029d18f1712472d69b61265c2d543a8065e1e9762b1ddc235812"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base QuickCheck ]; - description = "Various small helper functions for Lists, Maybes, Tuples, Functions"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "utility-ht" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -175353,7 +169629,6 @@ self: { version = "0.1.1.0"; sha256 = "bf5a6797c6127e71ec35900b3edc96f50957c2c376e4dbaa1a51f727d7244e9b"; libraryHaskellDepends = [ base diagrams-lib SVGFonts ]; - jailbreak = true; description = "Utility for drawing attribute grammar pictures with the diagrams package"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -175393,7 +169668,6 @@ self: { base bytestring HUnit QuickCheck random tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/aslatter/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -175421,20 +169695,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "uuid-orphans_1_3_11_1" = callPackage - ({ mkDerivation, base, safecopy, text, uuid-types, web-routes }: - mkDerivation { - pname = "uuid-orphans"; - version = "1.3.11.1"; - sha256 = "264028379dc6bfea1d84ebd6c745d666c51957430822b52480dd6413717a8b75"; - libraryHaskellDepends = [ - base safecopy text uuid-types web-routes - ]; - description = "Orphan instances for the UUID datatype"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "uuid-orphans" = callPackage ({ mkDerivation, base, safecopy, text, th-lift, uuid-types , web-routes @@ -175478,7 +169738,6 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - doCheck = false; homepage = "https://github.com/aslatter/uuid"; description = "Type definitions for Universally Unique Identifiers"; license = stdenv.lib.licenses.bsd3; @@ -175505,7 +169764,6 @@ self: { revision = "1"; editedCabalFile = "e289ff93c365248deb93e6268b57be8a47d724a39702887979fd842c80577508"; libraryHaskellDepends = [ base ghc-prim ]; - jailbreak = true; homepage = "http://code.haskell.org/~dons/code/uvector"; description = "Fast unboxed arrays with a flexible interface"; license = stdenv.lib.licenses.bsd3; @@ -175575,7 +169833,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base GLUT v4l2 ]; - jailbreak = true; homepage = "https://gitorious.org/hsv4l2"; description = "video for linux two examples"; license = stdenv.lib.licenses.bsd3; @@ -175620,7 +169877,6 @@ self: { version = "2.1.0.1"; sha256 = "552c33f48aa2046caf4853ef84b16c14a33e33286d8d695df4cf2830ac516b24"; libraryHaskellDepends = [ base filepath graphviz vacuum ]; - jailbreak = true; description = "A library for transforming vacuum graphs into GraphViz output"; license = stdenv.lib.licenses.lgpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -175654,7 +169910,6 @@ self: { version = "0.2.0.2"; sha256 = "3f188444086aac662a5e833b490f10a64d4c0939c7379e5b1be688dc0479ea7e"; libraryHaskellDepends = [ base containers hubigraph vacuum ]; - jailbreak = true; description = "Visualize Haskell data structures using vacuum and Ubigraph"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -175691,10 +169946,10 @@ self: { version = "0.1.0.1"; sha256 = "e850ddb908aa6d712acf2cbf695985eae069a2c1f7897782b775cf75cd9af791"; libraryHaskellDepends = [ base containers MonadRandom ]; - jailbreak = true; homepage = "https://i.joelt.io/symbols.html"; description = "Valid operator/module characters"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validate" = callPackage @@ -175733,10 +169988,10 @@ self: { version = "0.2.0"; sha256 = "020b42ae331ee77c24402210c2715088b3b6084234b20a17eeacba27b66fa471"; libraryHaskellDepends = [ base bytestring template-haskell ]; - jailbreak = true; homepage = "https://github.com/merijn/validated-literals"; description = "Compile-time checking for partial smart-constructors"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validation" = callPackage @@ -175776,7 +170031,6 @@ self: { test-framework test-framework-hunit test-framework-quickcheck2 text transformers ]; - jailbreak = true; homepage = "https://github.com/mavenraven/validations"; description = "A nice way to define field validations in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -175787,8 +170041,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "validity"; - version = "0.3.0.2"; - sha256 = "c1d7a91bbcb4c06ebad9149e11f02a1e10bc3617f3835b441d0340230d4d1fef"; + version = "0.3.0.4"; + sha256 = "9ae590d34aeb41f096bd7432ff8c8cb07a4da010825c0190d4ef630ef6370f7f"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity typeclass"; @@ -175799,14 +170053,26 @@ self: { ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; - version = "0.1.0.0"; - sha256 = "58d5a5b068ec6f53718d73a6fdc7e76f15cad27fe6f1deff2132bb577e25e6f5"; + version = "0.1.0.1"; + sha256 = "ae626d963b2caca9f385cf65eb793fb41441ec93a4d8e937c24dc44a64a88829"; libraryHaskellDepends = [ base containers validity ]; homepage = "https://github.com/NorfairKing/validity#readme"; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; }) {}; + "validity-text" = callPackage + ({ mkDerivation, base, text, validity }: + mkDerivation { + pname = "validity-text"; + version = "0.1.0.1"; + sha256 = "ab92980b7e900db8cf8e11cf986a5a952d2306cbb4735e8bc810acf8ca5e2189"; + libraryHaskellDepends = [ base text validity ]; + homepage = "https://github.com/NorfairKing/validity#readme"; + description = "Validity instances for text"; + license = stdenv.lib.licenses.mit; + }) {}; + "value-supply" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -175835,7 +170101,6 @@ self: { base deepseq directory dlist fgl graphviz haskell-src-exts mtl optparse-applicative process uniplate ]; - jailbreak = true; homepage = "https://github.com/benzrf/vampire"; description = "Analyze and visualize expression trees"; license = stdenv.lib.licenses.gpl3; @@ -175890,7 +170155,6 @@ self: { base complex-generic floatshow integer-gmp type-level-natural-number ]; - jailbreak = true; homepage = "https://gitorious.org/variable-precision"; description = "variable-precision floating point"; license = stdenv.lib.licenses.bsd3; @@ -175905,10 +170169,10 @@ self: { sha256 = "3787a5c18d56a0b2f06a93bee1be5f38ba49b3252bf653b9b81087507bed593d"; libraryHaskellDepends = [ base mtl stm ]; testHaskellDepends = [ base hspec mtl QuickCheck stm ]; - jailbreak = true; homepage = "https://github.com/prophile/variables"; description = "Monads with variables, without deep magic"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "varying" = callPackage @@ -175927,6 +170191,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "varying_0_6_0_0" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, time, transformers }: + mkDerivation { + pname = "varying"; + version = "0.6.0.0"; + sha256 = "f26af9b5a31095c8a8b8deabae2257a91ff749f99a0f5406b7c537a6e96b5c12"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base transformers ]; + executableHaskellDepends = [ base time transformers ]; + testHaskellDepends = [ base hspec QuickCheck time transformers ]; + homepage = "https://github.com/schell/varying"; + description = "FRP through value streams and monadic splines"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vault" = callPackage ({ mkDerivation, base, containers, hashable, unordered-containers }: @@ -176079,10 +170360,10 @@ self: { executableHaskellDepends = [ base directory filepath gtk3 mtl process text vcswrapper ]; - jailbreak = true; homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vcswrapper" = callPackage @@ -176127,10 +170408,10 @@ self: { version = "0.1.0.4"; sha256 = "8f6050d788e03dd53fbdd2cc472f1aba90e6443effa4f23b98275e8ca396bacf"; libraryHaskellDepends = [ base random ]; - jailbreak = true; homepage = "http://github.com/cpdurham/vect-floating"; description = "A low-dimensional linear algebra library, operating on the Floating typeclass"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vect-floating-accelerate" = callPackage @@ -176142,10 +170423,10 @@ self: { revision = "1"; editedCabalFile = "af7a5778a0ab8e79fdd4d535aeda7dba18ead15ea3f0b5ae87c3b17c5a076216"; libraryHaskellDepends = [ accelerate base vect-floating ]; - jailbreak = true; homepage = "http://github.com/cpdurham/vect-floating-accelerate"; description = "Accelerate instances for vect-floating types"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vect-opengl" = callPackage @@ -176168,7 +170449,6 @@ self: { version = "0.10.9.3"; sha256 = "bdcd541262bc538fa43c9b3ea2dd8c1c2cd5ac7bb9efa909a8d558753678b422"; libraryHaskellDepends = [ base deepseq ghc-prim primitive ]; - jailbreak = true; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; @@ -176191,8 +170471,6 @@ self: { base QuickCheck random template-haskell test-framework test-framework-quickcheck2 transformers ]; - jailbreak = true; - doCheck = false; homepage = "https://github.com/haskell/vector"; description = "Efficient Arrays"; license = stdenv.lib.licenses.bsd3; @@ -176276,7 +170554,6 @@ self: { base bytestring deepseq ghc-prim primitive vector ]; testHaskellDepends = [ base directory QuickCheck random ]; - jailbreak = true; homepage = "https://github.com/basvandijk/vector-bytestring"; description = "ByteStrings as type synonyms of Storable Vectors of Word8s"; license = stdenv.lib.licenses.bsd3; @@ -176317,26 +170594,11 @@ self: { base conduit HUnit primitive QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 vector ]; - jailbreak = true; description = "Conduit utilities for vectors"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "vector-fftw_0_1_3_6" = callPackage - ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: - mkDerivation { - pname = "vector-fftw"; - version = "0.1.3.6"; - sha256 = "6ed9d7b6000fdc72d76e7d5a3bfe1441f67eee46bf6f814caf3c35524b000764"; - libraryHaskellDepends = [ base primitive storable-complex vector ]; - librarySystemDepends = [ fftw ]; - homepage = "http://hackage.haskell.org/package/vector-fftw"; - description = "A binding to the fftw library for one-dimensional vectors"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) fftw;}; - "vector-fftw" = callPackage ({ mkDerivation, base, fftw, primitive, storable-complex, vector }: mkDerivation { @@ -176404,7 +170666,6 @@ self: { libraryHaskellDepends = [ base collections-api template-haskell vector ]; - jailbreak = true; homepage = "http://github.com/kreuzschlitzschraubenzieher/vector-instances-collections"; description = "Instances of the Data.Collections classes for Data.Vector.*"; license = stdenv.lib.licenses.bsd3; @@ -176432,7 +170693,6 @@ self: { revision = "2"; editedCabalFile = "de331a5826345df371a52a3b130f1f608611f564dee5e82a4cb561482e4d447b"; libraryHaskellDepends = [ base mersenne-random-pure64 vector ]; - jailbreak = true; homepage = "http://code.haskell.org/~dons/code/vector-random"; description = "Generate vectors filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -176468,8 +170728,8 @@ self: { ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }: mkDerivation { pname = "vector-space"; - version = "0.10.3"; - sha256 = "efe39aa83d5ec5187c26f88496faf7411d3ee943cbc719797e58d115b004c885"; + version = "0.10.4"; + sha256 = "b712cc9fc675b1d9e592f56ed08a9636c87783c11d6ac84b5f18f46cdcbefda2"; libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ]; description = "Vector & affine spaces, linear maps, and derivatives"; license = stdenv.lib.licenses.bsd3; @@ -176517,6 +170777,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vector-split" = callPackage + ({ mkDerivation, base, QuickCheck, split, tasty, tasty-quickcheck + , vector + }: + mkDerivation { + pname = "vector-split"; + version = "1.0.0.0"; + sha256 = "fda8504ecf87abddaec1fee84d746ed6925e5076ea8f02bcea296a78821b2bdc"; + libraryHaskellDepends = [ base vector ]; + testHaskellDepends = [ + base QuickCheck split tasty tasty-quickcheck vector + ]; + homepage = "https://github.com/fhaust/vector-split#readme"; + description = "Initial project template from stack"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "vector-static" = callPackage ({ mkDerivation, base, primitive, vector }: mkDerivation { @@ -176524,7 +170801,6 @@ self: { version = "0.3.0.1"; sha256 = "216d3db923ae25dbd09e5d69bd7c3acc8ebedc437ab712a27f59486266fe57a7"; libraryHaskellDepends = [ base primitive vector ]; - jailbreak = true; homepage = "http://github.com/geezusfreeek/vector-static"; description = "Statically checked sizes on Data.Vector"; license = stdenv.lib.licenses.bsd3; @@ -176582,10 +170858,10 @@ self: { version = "1.0.0.0"; sha256 = "9ef23bffc3c29b988f7c15ee14158cf4c9599b14d2075acf2577878597385171"; libraryHaskellDepends = [ base regex-pcre ]; - jailbreak = true; homepage = "https://github.com/VerbalExpressions/HaskellVerbalExpressions"; description = "Regular expressions made easy"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verbosity" = callPackage @@ -176613,9 +170889,9 @@ self: { libraryHaskellDepends = [ base mtl text transformers ]; executableHaskellDepends = [ base markdown-unlit text ]; testHaskellDepends = [ base hspec ]; - jailbreak = true; description = "Validation framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verdict-json" = callPackage @@ -176632,9 +170908,9 @@ self: { testHaskellDepends = [ aeson base containers hspec unordered-containers vector verdict ]; - jailbreak = true; description = "JSON instances and JSON Schema for verdict"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "verilog" = callPackage @@ -176651,24 +170927,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "versions_2_0_0" = callPackage - ({ mkDerivation, base, either, megaparsec, microlens, semigroups - , tasty, tasty-hunit, text - }: - mkDerivation { - pname = "versions"; - version = "2.0.0"; - sha256 = "d8e18c140295e45e6b4f9c103c0c9d953a3baa769a0a364648074ad91623b7d2"; - libraryHaskellDepends = [ base megaparsec semigroups text ]; - testHaskellDepends = [ - base either microlens tasty tasty-hunit text - ]; - jailbreak = true; - description = "Types and parsers for software version numbers"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "versions" = callPackage ({ mkDerivation, base, either, megaparsec, microlens, semigroups , tasty, tasty-hunit, text @@ -176726,9 +170984,9 @@ self: { version = "1.0"; sha256 = "90805dfd7cd14becc4156746dc0f491eb67812cb881b9b40df72c44951b9fc4f"; libraryHaskellDepends = [ base mtl ]; - jailbreak = true; description = "Views allow you to run a State monad on part of a state"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vigilance" = callPackage @@ -176767,7 +171025,6 @@ self: { time transformers unix unordered-containers vector warp yesod yesod-core yesod-platform ]; - jailbreak = true; homepage = "http://github.com/michaelxavier/vigilance"; description = "An extensible dead-man's switch system"; license = stdenv.lib.licenses.mit; @@ -176794,10 +171051,10 @@ self: { time-locale-compat transformers xdg-basedir yaml ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://github.com/pjones/vimeta"; description = "Frontend for video metadata tagging tools"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vimus" = callPackage @@ -176894,7 +171151,6 @@ self: { aeson base bytestring template-haskell text vinyl ]; testHaskellDepends = [ base hlint ]; - jailbreak = true; description = "Provide json instances automagically to vinyl types"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -176931,7 +171187,6 @@ self: { unordered-containers vinyl ]; testHaskellDepends = [ base doctest vinyl ]; - jailbreak = true; homepage = "http://github.com/andrew/vinyl-plus"; description = "Vinyl records utilities"; license = stdenv.lib.licenses.bsd3; @@ -176962,7 +171217,6 @@ self: { base bytestring constraints data-default primitive template-haskell text vector vinyl ]; - jailbreak = true; homepage = "http://github.com/andrewthad/vinyl-vectors"; description = "Vectors for vinyl vectors"; license = stdenv.lib.licenses.bsd3; @@ -176983,7 +171237,6 @@ self: { base bytestring Cabal directory file-embed filepath mtl process safe split ]; - jailbreak = true; homepage = "https://github.com/Paczesiowa/virthualenv"; description = "Virtual Haskell Environment builder"; license = stdenv.lib.licenses.bsd3; @@ -177045,7 +171298,6 @@ self: { ipprint isevaluated lazysmallcheck parallel pretty process strict-concurrency svgcairo value-supply ]; - jailbreak = true; homepage = "http://github.com/zsol/visual-graphrewrite/"; description = "Visualize the graph-rewrite steps of a Haskell program"; license = stdenv.lib.licenses.bsd3; @@ -177066,7 +171318,6 @@ self: { base containers directory filepath haskell-src-exts mtl pretty process regexpr split uniplate ]; - jailbreak = true; homepage = "http://github.com/djv/VisualProf"; description = "Create a visual profile of a program's source code"; license = stdenv.lib.licenses.bsd3; @@ -177174,7 +171425,6 @@ self: { version = "0.1.2"; sha256 = "0fad96ceff3126968dc69755093aba416856b3cef49533f5841f6722f5b2e627"; libraryHaskellDepends = [ base bytestring ]; - jailbreak = true; homepage = "https://github.com/cartazio/Vowpal-Utils"; description = "Vowpal Wabbit utilities"; license = stdenv.lib.licenses.bsd3; @@ -177188,7 +171438,6 @@ self: { version = "0.1.0.1"; sha256 = "cef156c54919dd74980e92e8b392a16560ea94f478efdc2de26a404a0ddcfd84"; libraryHaskellDepends = [ base bytestring process utf8-string ]; - jailbreak = true; homepage = "https://github.com/sethfowler/hslibvoyeur"; description = "Haskell bindings for libvoyeur"; license = stdenv.lib.licenses.bsd3; @@ -177228,7 +171477,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; + }) {inherit (pkgs.gnome2) vte;}; "vtegtk3" = callPackage ({ mkDerivation, base, Cabal, glib, gtk2hs-buildtools, gtk3, pango @@ -177245,44 +171494,7 @@ self: { description = "Binding to the VTE library"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome) vte;}; - - "vty_5_5_0" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers - , data-default, deepseq, directory, filepath, hashable, HUnit - , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec - , QuickCheck, quickcheck-assertions, random, smallcheck, stm - , string-qq, terminfo, test-framework, test-framework-hunit - , test-framework-smallcheck, text, transformers, unix, utf8-string - , vector - }: - mkDerivation { - pname = "vty"; - version = "5.5.0"; - sha256 = "9e185e42aff3385767b2f025765d896d8f503719f08cc6484f1c12b795eca41d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring containers data-default deepseq - directory filepath hashable microlens microlens-mtl microlens-th - mtl parallel parsec stm terminfo text transformers unix utf8-string - vector - ]; - executableHaskellDepends = [ - base containers data-default microlens microlens-mtl mtl - ]; - testHaskellDepends = [ - base blaze-builder bytestring Cabal containers data-default deepseq - HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions - random smallcheck stm string-qq terminfo test-framework - test-framework-hunit test-framework-smallcheck text unix - utf8-string vector - ]; - homepage = "https://github.com/coreyoconnor/vty"; - description = "A simple terminal UI library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; + }) {inherit (pkgs.gnome2) vte;}; "vty" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers @@ -177320,6 +171532,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "vty_5_11_1" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers + , data-default, deepseq, directory, filepath, hashable, HUnit + , microlens, microlens-mtl, microlens-th, mtl, parallel, parsec + , QuickCheck, quickcheck-assertions, random, smallcheck, stm + , string-qq, terminfo, test-framework, test-framework-hunit + , test-framework-smallcheck, text, transformers, unix, utf8-string + , vector + }: + mkDerivation { + pname = "vty"; + version = "5.11.1"; + sha256 = "4d6fa0bd9ad3f53c87cca1d02dab246326a9d79737b4861674ba4ff68646d23a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base blaze-builder bytestring containers data-default deepseq + directory filepath hashable microlens microlens-mtl microlens-th + mtl parallel parsec stm terminfo text transformers unix utf8-string + vector + ]; + executableHaskellDepends = [ + base containers data-default microlens microlens-mtl mtl + ]; + testHaskellDepends = [ + base blaze-builder bytestring Cabal containers data-default deepseq + HUnit microlens microlens-mtl mtl QuickCheck quickcheck-assertions + random smallcheck stm string-qq terminfo test-framework + test-framework-hunit test-framework-smallcheck text unix + utf8-string vector + ]; + homepage = "https://github.com/coreyoconnor/vty"; + description = "A simple terminal UI library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vty-examples" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, containers , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck @@ -177345,12 +171594,11 @@ self: { ({ mkDerivation, base, vty }: mkDerivation { pname = "vty-menu"; - version = "0.0.3"; - sha256 = "71618d00d34595c96b6cd42704f72ce37d3e17d4651656037938a0c1079966aa"; + version = "0.0.4"; + sha256 = "853a7acf66a6eb0fba1c35b5da1053fed7046b8cf0091556a5c35f9dd29a9c48"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base vty ]; - jailbreak = true; description = "A lib for displaying a menu and getting a selection using VTY"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -177385,7 +171633,6 @@ self: { version = "0.1"; sha256 = "a7db07f3221854597754415f308533e5f9d408b7a71faa8fa431e630e15ec0b0"; libraryHaskellDepends = [ base regex-base regex-pcre vty vty-ui ]; - jailbreak = true; description = "Extra vty-ui functionality not included in the core library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -177424,7 +171671,6 @@ self: { aeson base bytestring containers directory filepath Glob libnotify process select text udev unordered-containers vector X11 yaml ]; - jailbreak = true; homepage = "https://github.com/portnov/wacom-intuos-pro-scripts"; description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes"; license = stdenv.lib.licenses.bsd3; @@ -177449,13 +171695,33 @@ self: { base binary bytestring case-insensitive containers directory JuicyPixels ]; - jailbreak = true; homepage = "https://github.com/mgrabmueller/waddle"; description = "DOOM WAD file utilities"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wahsp" = callPackage + ({ mkDerivation, aeson, base, data-default-class, kansas-comet + , natural-transformation, remote-monad, scotty, semigroups, stm + , text, wai-middleware-static + }: + mkDerivation { + pname = "wahsp"; + version = "0.2"; + sha256 = "e634e0743dbbf93f2dffc68b68a8cc86a7ee3b62a044932f192c5f491e81fe74"; + revision = "1"; + editedCabalFile = "145ecbcceca09e635f744466b1d439a6144cd83e3d0c74a2478e4470bbffbacd"; + libraryHaskellDepends = [ + aeson base data-default-class kansas-comet natural-transformation + remote-monad scotty semigroups stm text wai-middleware-static + ]; + homepage = "https://github.com/nshaheed/WebAudioHs/"; + description = "A haskell binding of the Web Audio API ala blank-canvas"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai" = callPackage ({ mkDerivation, base, blaze-builder, bytestring , bytestring-builder, hspec, http-types, network, text @@ -177521,50 +171787,12 @@ self: { base bytestring conduit conduit-extra directory doctest filepath hspec HTTP http-types unix wai warp ]; - jailbreak = true; homepage = "http://www.mew.org/~kazu/proj/mighttpd/"; description = "File/CGI/Rev Proxy App of WAI"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-app-static_3_1_5" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, cryptonite, directory, file-embed - , filepath, hspec, http-date, http-types, memory, mime-types - , network, old-locale, optparse-applicative, template-haskell - , temporary, text, time, transformers, unix-compat - , unordered-containers, wai, wai-extra, warp, zlib - }: - mkDerivation { - pname = "wai-app-static"; - version = "3.1.5"; - sha256 = "28667193acfcc534752b715b5f5e16fc58edb550d03c0eb2b68e123e41030d4c"; - revision = "1"; - editedCabalFile = "c3f6628138ef318fc0a5a77949627b7ce06d149f53c21a2832b671664ea473de"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - cryptonite directory file-embed filepath http-date http-types - memory mime-types old-locale optparse-applicative template-haskell - text time transformers unix-compat unordered-containers wai - wai-extra warp zlib - ]; - executableHaskellDepends = [ - base bytestring containers directory mime-types text - ]; - testHaskellDepends = [ - base bytestring filepath hspec http-date http-types mime-types - network old-locale temporary text time transformers unix-compat wai - wai-extra zlib - ]; - homepage = "http://www.yesodweb.com/book/web-application-interface"; - description = "WAI application for static serving"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-app-static" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, containers, cryptonite, directory, file-embed @@ -177634,10 +171862,10 @@ self: { process tasty tasty-hunit text wai wai-extra wai-websockets warp websockets ]; - doCheck = false; homepage = "https://github.com/larskuhtz/wai-cors"; description = "CORS for WAI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-devel" = callPackage @@ -177664,7 +171892,6 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base hspec stm ]; - jailbreak = true; homepage = "https://github.com/urbanslug/wai-devel"; description = "A web server for the development of WAI compliant web applications"; license = stdenv.lib.licenses.mit; @@ -177686,6 +171913,7 @@ self: { homepage = "https://github.com/singpolyma/wai-digestive-functors"; description = "Helpers to bind digestive-functors onto wai requests"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-dispatch" = callPackage @@ -177714,36 +171942,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_0_16_1" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring - , blaze-builder, bytestring, case-insensitive, containers, cookie - , data-default-class, deepseq, directory, fast-logger, hspec - , http-types, HUnit, iproute, lifted-base, network, old-locale - , resourcet, streaming-commons, stringsearch, text, time - , transformers, unix, unix-compat, vault, void, wai, wai-logger - , word8, zlib - }: - mkDerivation { - pname = "wai-extra"; - version = "3.0.16.1"; - sha256 = "8f726e73e1895e30e260dd843159bce4cd10740dead9b1607884217bf0975157"; - libraryHaskellDepends = [ - aeson ansi-terminal base base64-bytestring blaze-builder bytestring - case-insensitive containers cookie data-default-class deepseq - directory fast-logger http-types iproute lifted-base network - old-locale resourcet streaming-commons stringsearch text time - transformers unix unix-compat vault void wai wai-logger word8 zlib - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive cookie fast-logger - hspec http-types HUnit resourcet text time transformers wai zlib - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provides some basic WAI handlers and middleware"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-extra" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , blaze-builder, bytestring, case-insensitive, containers, cookie @@ -177755,8 +171953,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.0.17"; - sha256 = "48bbec6a692dac25972f84da1669a69f7c7c7741dd0d978aa9992bbdf809b671"; + version = "3.0.18"; + sha256 = "42fde2a6066c2de40b931a5379f3436899c96f7b31037ed27524ec86714d0764"; libraryHaskellDepends = [ aeson ansi-terminal base base64-bytestring blaze-builder bytestring case-insensitive containers cookie data-default-class deepseq @@ -177796,7 +171994,6 @@ self: { version = "0.1.0.1"; sha256 = "58c96367884118ac36aaa6482588f91d4524c921d92647a494fca53755f60628"; libraryHaskellDepends = [ base http-types mtl resourcet unix wai ]; - jailbreak = true; homepage = "https://bitbucket.org/dpwiz/wai-graceful"; description = "Graceful shutdown for WAI applications"; license = stdenv.lib.licenses.mit; @@ -177819,7 +172016,6 @@ self: { old-time text time transformers wai wai-extra warp ]; executableHaskellDepends = [ cmdargs ]; - jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "WAI server that automatically reloads code after modification. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -177862,10 +172058,10 @@ self: { version = "2.0.0.2"; sha256 = "4ced87a85c165be2436974a1d881079df09bf459e45bddabd57205621a3aed40"; libraryHaskellDepends = [ base bytestring wai wai-extra ]; - jailbreak = true; homepage = "http://www.yesodweb.com/book/web-application-interface"; description = "Wai handler to SCGI (deprecated)"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-handler-snap" = callPackage @@ -177880,7 +172076,6 @@ self: { base bytestring containers enumerator snap-core snap-server transformers wai ]; - jailbreak = true; homepage = "http://github.com/snoyberg/wai-handler-snap"; description = "Web Application Interface handler using snap-server. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -177936,10 +172131,10 @@ self: { cryptohash hspec http-types monad-loops mtl transformers wai wai-extra ]; - jailbreak = true; homepage = "https://github.com/raptros/wai-hmac-auth"; description = "hmac authentication tools for WAI apps"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-http2-extra" = callPackage @@ -177970,10 +172165,10 @@ self: { libraryHaskellDepends = [ base bytestring http-types lens network text vault wai ]; - jailbreak = true; homepage = "https://github.com/webcrank/wai-lens"; description = "Lenses for WAI"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-lite" = callPackage @@ -177987,32 +172182,11 @@ self: { libraryHaskellDepends = [ base bytestring conduit http-types text transformers wai wai-extra ]; - jailbreak = true; description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-logger_2_2_7" = callPackage - ({ mkDerivation, base, blaze-builder, byteorder, bytestring - , case-insensitive, doctest, fast-logger, http-types, network, unix - , unix-time, wai - }: - mkDerivation { - pname = "wai-logger"; - version = "2.2.7"; - sha256 = "f4718c7661373b6a93fb7ac4b4662617f9e161f6b9297d0f665f71391e489607"; - libraryHaskellDepends = [ - base blaze-builder byteorder bytestring case-insensitive - fast-logger http-types network unix unix-time wai - ]; - testHaskellDepends = [ base doctest ]; - doCheck = false; - description = "A logging system for WAI"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-logger" = callPackage ({ mkDerivation, base, blaze-builder, byteorder, bytestring , case-insensitive, doctest, fast-logger, http-types, network, unix @@ -178027,7 +172201,6 @@ self: { fast-logger http-types network unix unix-time wai ]; testHaskellDepends = [ base doctest ]; - doCheck = false; description = "A logging system for WAI"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -178050,27 +172223,29 @@ self: { }) {}; "wai-make-assets" = callPackage - ({ mkDerivation, base, bytestring, directory, getopt-generics - , hspec, http-types, lens, mockery, shake, silently - , string-conversions, wai, wai-app-static, warp, wreq + ({ mkDerivation, base, bytestring, data-default, directory + , filepath, getopt-generics, hspec, http-types, lens, mockery + , shake, silently, string-conversions, wai, wai-app-static, warp + , wreq }: mkDerivation { pname = "wai-make-assets"; - version = "0.1.1"; - sha256 = "0e05db16a0d5d93439833d29b33aed97cd9b2093b99f8939ada104eded63877f"; + version = "0.2"; + sha256 = "7e871b15d889dc8f7d185eab424eff0362bf120e6b7a5e4e43eb2e411e7ad640"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory http-types shake string-conversions wai - wai-app-static warp - ]; - executableHaskellDepends = [ - base bytestring directory getopt-generics http-types shake + base bytestring data-default directory filepath http-types shake string-conversions wai wai-app-static warp ]; + executableHaskellDepends = [ + base bytestring data-default directory filepath getopt-generics + http-types shake string-conversions wai wai-app-static warp + ]; testHaskellDepends = [ - base bytestring directory hspec http-types lens mockery shake - silently string-conversions wai wai-app-static warp wreq + base bytestring data-default directory filepath hspec http-types + lens mockery shake silently string-conversions wai wai-app-static + warp wreq ]; homepage = "https://github.com/soenkehahn/wai-make-assets#readme"; description = "Compiling and serving assets"; @@ -178094,7 +172269,6 @@ self: { base bytestring http-types HUnit test-framework test-framework-hunit wai wai-test ]; - jailbreak = true; homepage = "https://github.com/akaspin/wai-middleware-cache"; description = "Caching middleware for WAI"; license = stdenv.lib.licenses.bsd3; @@ -178115,7 +172289,6 @@ self: { conduit hedis hedis-pile http-types transformers wai wai-middleware-cache ]; - jailbreak = true; homepage = "https://github.com/akaspin/wai-middleware-cache-redis"; description = "Redis backend for wai-middleware-cache"; license = stdenv.lib.licenses.bsd3; @@ -178183,7 +172356,6 @@ self: { libraryHaskellDepends = [ base bytestring http-types lifted-base wai ]; - jailbreak = true; homepage = "https://github.com/akaspin/wai-middleware-catch"; description = "Wai error catching middleware"; license = stdenv.lib.licenses.bsd3; @@ -178209,35 +172381,6 @@ self: { homepage = "https://github.com/fpco/wai-middleware-consul"; description = "Wai Middleware for Consul"; license = stdenv.lib.licenses.mit; - }) {}; - - "wai-middleware-content-type_0_4_0" = callPackage - ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring - , clay, exceptions, hashable, hspec, hspec-wai, http-media - , http-types, lucid, mmorph, monad-control, monad-logger, mtl - , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec - , text, transformers, transformers-base, unordered-containers - , urlpath, wai, wai-transformers, warp - }: - mkDerivation { - pname = "wai-middleware-content-type"; - version = "0.4.0"; - sha256 = "bccf5fb49c39cde628d8e73b4afff934186cba6824a8b04501bb3fbada4229eb"; - libraryHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable http-media http-types lucid mmorph monad-control - monad-logger mtl pandoc resourcet shakespeare text transformers - transformers-base unordered-containers urlpath wai wai-transformers - ]; - testHaskellDepends = [ - aeson base blaze-builder blaze-html bytestring clay exceptions - hashable hspec hspec-wai http-media http-types lucid mmorph - monad-control monad-logger mtl pandoc pandoc-types resourcet - shakespeare tasty tasty-hspec text transformers transformers-base - unordered-containers urlpath wai wai-transformers warp - ]; - description = "A simple WAI library for responding with content"; - license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -178266,38 +172409,38 @@ self: { shakespeare tasty tasty-hspec text transformers transformers-base unordered-containers urlpath wai wai-transformers warp ]; - doCheck = false; description = "Route to different middlewares based on the incoming Accept header"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-middleware-crowd_0_1_4_1" = callPackage - ({ mkDerivation, authenticate, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, clientsession - , containers, cookie, gitrev, http-client, http-client-tls - , http-reverse-proxy, http-types, optparse-applicative, resourcet - , template-haskell, text, time, transformers, unix-compat, vault - , wai, wai-app-static, wai-extra, warp + "wai-middleware-content-type_0_5_0_1" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring + , clay, exceptions, hashable, hspec, hspec-wai, http-media + , http-types, lucid, mmorph, monad-control, monad-logger, mtl + , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec + , text, transformers, transformers-base, unordered-containers + , urlpath, wai, wai-transformers, warp }: mkDerivation { - pname = "wai-middleware-crowd"; - version = "0.1.4.1"; - sha256 = "b9bf4c1fe892232a8f3adcaca9407f81cadd2a8926e763eb2ecb35b2e9674d2e"; - isLibrary = true; - isExecutable = true; + pname = "wai-middleware-content-type"; + version = "0.5.0.1"; + sha256 = "2dcdccb959f0fbb42a06e56818a466017e30edb88fd8eb57abaa9c437f08bd86"; libraryHaskellDepends = [ - authenticate base base64-bytestring binary blaze-builder bytestring - case-insensitive clientsession containers cookie http-client - http-client-tls http-types resourcet text time unix-compat vault - wai + aeson base blaze-builder blaze-html bytestring clay exceptions + hashable http-media http-types lucid mmorph monad-control + monad-logger mtl pandoc resourcet shakespeare text transformers + transformers-base unordered-containers urlpath wai wai-transformers ]; - executableHaskellDepends = [ - base bytestring clientsession gitrev http-client http-client-tls - http-reverse-proxy http-types optparse-applicative template-haskell - text transformers wai wai-app-static wai-extra warp + testHaskellDepends = [ + aeson base blaze-builder blaze-html bytestring clay exceptions + hashable hspec hspec-wai http-media http-types lucid mmorph + monad-control monad-logger mtl pandoc pandoc-types resourcet + shakespeare tasty tasty-hspec text transformers transformers-base + unordered-containers urlpath wai wai-transformers warp ]; - description = "Middleware and utilities for using Atlassian Crowd authentication"; - license = stdenv.lib.licenses.mit; + description = "Route to different middlewares based on the incoming Accept header"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -178343,10 +172486,10 @@ self: { base base64-bytestring bytestring cryptohash filepath http-date http-types unix-compat unordered-containers wai ]; - jailbreak = true; homepage = "https://github.com/ameingast/wai-middleware-etag"; description = "WAI ETag middleware for static files"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-middleware-gunzip" = callPackage @@ -178396,7 +172539,6 @@ self: { base bytestring doctest Glob hlint hspec http-types HUnit process regex-compat wai wai-extra ]; - jailbreak = true; homepage = "https://github.com/creichert/wai-middleware-hmac"; description = "HMAC Authentication Middleware for WAI"; license = stdenv.lib.licenses.bsd3; @@ -178454,7 +172596,6 @@ self: { testHaskellDepends = [ base Cabal directory mtl split text wai wai-middleware-static warp ]; - jailbreak = true; homepage = "https://github.com/taktoa/wai-middleware-preprocessor"; description = "WAI middleware for preprocessing static files"; license = stdenv.lib.licenses.gpl3; @@ -178495,7 +172636,6 @@ self: { base bytestring http-types HUnit test-framework test-framework-hunit text wai wai-test ]; - jailbreak = true; homepage = "https://github.com/akaspin/wai-middleware-route"; description = "Wai dispatch middleware"; license = stdenv.lib.licenses.bsd3; @@ -178523,6 +172663,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wai-middleware-static_0_8_1" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite + , directory, expiring-cache-map, filepath, hpc-coveralls + , http-types, memory, mime-types, mtl, old-locale, semigroups, text + , time, wai + }: + mkDerivation { + pname = "wai-middleware-static"; + version = "0.8.1"; + sha256 = "e0b5f13f410f81897759acf43198a08101d2af4c9d506164367c7d1a96d55375"; + libraryHaskellDepends = [ + base bytestring containers cryptonite directory expiring-cache-map + filepath http-types memory mime-types mtl old-locale semigroups + text time wai + ]; + testHaskellDepends = [ base hpc-coveralls ]; + homepage = "https://github.com/scotty-web/wai-middleware-static"; + description = "WAI middleware that serves requests to static files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wai-middleware-static-caching" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, containers , cryptohash, directory, expiring-cache-map, filepath, http-types @@ -178537,7 +172699,6 @@ self: { expiring-cache-map filepath http-types mtl old-locale text time unix wai ]; - jailbreak = true; homepage = "https://github.com/agrafix/wai-middleware-static"; description = "WAI middleware that serves requests to static files"; license = stdenv.lib.licenses.bsd3; @@ -178565,24 +172726,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-middleware-verbs_0_2_0" = callPackage - ({ mkDerivation, base, errors, exceptions, hashable, http-types - , mmorph, monad-logger, mtl, resourcet, transformers - , transformers-base, unordered-containers, wai - }: - mkDerivation { - pname = "wai-middleware-verbs"; - version = "0.2.0"; - sha256 = "5e88a38e8e838be9334b72a4dcec70874fe02c8b128dc7a64e682cacfb6ffbf3"; - libraryHaskellDepends = [ - base errors exceptions hashable http-types mmorph monad-logger mtl - resourcet transformers transformers-base unordered-containers wai - ]; - description = "Route different middleware responses based on the incoming HTTP verb"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-middleware-verbs" = callPackage ({ mkDerivation, base, errors, exceptions, hashable, http-types , mmorph, monad-logger, mtl, resourcet, transformers @@ -178600,32 +172743,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "wai-predicates_0_8_6" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-conversion, case-insensitive, cookie, http-types - , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers - , vault, vector, wai - }: - mkDerivation { - pname = "wai-predicates"; - version = "0.8.6"; - sha256 = "7aba73c37a27975b37077b6f06d6c34488750ff022210e29a0966c68fafde918"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion case-insensitive - cookie http-types singletons transformers vault vector wai - ]; - testHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types tasty - tasty-hunit tasty-quickcheck wai - ]; - jailbreak = true; - doCheck = false; - homepage = "https://gitlab.com/twittner/wai-predicates/"; - description = "WAI request predicates"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-predicates" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, cookie, http-types @@ -178672,29 +172789,9 @@ self: { version = "0.0.0.0"; sha256 = "6a03b90b6e00d64bb46391a19c5e6f99cb36a3902258b70aa16f8410c223c661"; libraryHaskellDepends = [ base bytestring http-types wai ]; - jailbreak = true; homepage = "https://github.com/pharpend/wai-responsible"; description = "Response interface for WAI"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "wai-route_0_3_1" = callPackage - ({ mkDerivation, base, bytestring, http-types, mtl, QuickCheck - , tasty, tasty-quickcheck, unordered-containers, wai - }: - mkDerivation { - pname = "wai-route"; - version = "0.3.1"; - sha256 = "6715210058c36baf8476f27807f1ac7ef9c190f5769d516f3edfeae4fb753aef"; - libraryHaskellDepends = [ - base bytestring http-types unordered-containers wai - ]; - testHaskellDepends = [ - base bytestring http-types mtl QuickCheck tasty tasty-quickcheck - wai - ]; - description = "Minimalistic, efficient routing for WAI"; - license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -178724,10 +172821,10 @@ self: { version = "1.0.0.1"; sha256 = "e7a2f20d2aaa496206a09a508e9e8923a545181802922f026b3bfa4dccac47a0"; libraryHaskellDepends = [ base text wai ]; - jailbreak = true; homepage = "http://github.com/mdmarek/wai-router"; description = "Provides basic routing on URL paths for WAI"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-routes" = callPackage @@ -178750,39 +172847,12 @@ self: { testHaskellDepends = [ aeson base hspec hspec-wai hspec-wai-json text wai ]; - jailbreak = true; homepage = "https://ajnsit.github.io/wai-routes/"; description = "Typesafe URLs for Wai applications"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wai-routing_0_12_3" = callPackage - ({ mkDerivation, attoparsec, base, blaze-builder, bytestring - , bytestring-conversion, case-insensitive, containers, cookie - , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers - , wai, wai-predicates, wai-route - }: - mkDerivation { - pname = "wai-routing"; - version = "0.12.3"; - sha256 = "9ce8d30b45ac65162589236b33f4ea417f784c70a1cc10b564880819d2620b0b"; - libraryHaskellDepends = [ - attoparsec base bytestring bytestring-conversion case-insensitive - cookie http-types transformers wai wai-predicates wai-route - ]; - testHaskellDepends = [ - base blaze-builder bytestring bytestring-conversion - case-insensitive containers http-types tasty tasty-hunit - tasty-quickcheck wai wai-predicates - ]; - jailbreak = true; - homepage = "https://gitlab.com/twittner/wai-routing/"; - description = "Declarative routing for WAI"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-routing" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, bytestring , bytestring-conversion, case-insensitive, containers, cookie @@ -178896,10 +172966,10 @@ self: { testHaskellDepends = [ base bytestring data-default postgresql-simple text wai-session ]; - doCheck = false; homepage = "https://github.com/hce/postgresql-session#readme"; description = "PostgreSQL backed Wai session store"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wai-session-tokyocabinet" = callPackage @@ -178981,7 +173051,6 @@ self: { libraryHaskellDepends = [ base blaze-builder bytestring http-types thrift wai ]; - jailbreak = true; homepage = "https://github.com/yogeshsajanikar/wai-thrift"; description = "Thrift transport layer for Wai"; license = stdenv.lib.licenses.mit; @@ -178999,7 +173068,6 @@ self: { libraryHaskellDepends = [ base bytestring containers http-types time wai ]; - jailbreak = true; description = "Wai middleware for request throttling"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -179038,32 +173106,6 @@ self: { license = "unknown"; }) {}; - "wai-websockets_3_0_0_9" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive - , file-embed, http-types, network, text, transformers, wai - , wai-app-static, warp, websockets - }: - mkDerivation { - pname = "wai-websockets"; - version = "3.0.0.9"; - sha256 = "a2476dcd0474a4d3322b4d0bbf0418eebb834ad03cecd43d1648d0c73c9f2883"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base blaze-builder bytestring case-insensitive http-types network - transformers wai websockets - ]; - executableHaskellDepends = [ - base blaze-builder bytestring case-insensitive file-embed - http-types network text transformers wai wai-app-static warp - websockets - ]; - homepage = "http://github.com/yesodweb/wai"; - description = "Provide a bridge between WAI and the websockets package"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wai-websockets" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, case-insensitive , file-embed, http-types, network, text, transformers, wai @@ -179156,42 +173198,9 @@ self: { optparse-applicative pipes pipes-attoparsec pipes-bytestring pipes-zlib text time transformers ]; - jailbreak = true; homepage = "http://github.com/bgamari/warc"; description = "A parser for the Web Archive (WARC) format"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "warp_3_2_7" = callPackage - ({ mkDerivation, array, async, auto-update, base, blaze-builder - , bytestring, bytestring-builder, case-insensitive, containers - , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date - , http-types, http2, HUnit, iproute, lifted-base, network, process - , QuickCheck, silently, simple-sendfile, stm, streaming-commons - , text, time, transformers, unix, unix-compat, vault, wai, word8 - }: - mkDerivation { - pname = "warp"; - version = "3.2.7"; - sha256 = "ca8f59f9467151a453b5eaa6631d6ccb12ffabd4cd074bf32908e780b695f184"; - libraryHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers ghc-prim hashable - http-date http-types http2 iproute network simple-sendfile stm - streaming-commons text unix unix-compat vault wai word8 - ]; - testHaskellDepends = [ - array async auto-update base blaze-builder bytestring - bytestring-builder case-insensitive containers directory doctest - ghc-prim hashable hspec HTTP http-date http-types http2 HUnit - iproute lifted-base network process QuickCheck silently - simple-sendfile stm streaming-commons text time transformers unix - unix-compat vault wai word8 - ]; - doCheck = false; - homepage = "http://github.com/yesodweb/wai"; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -179221,7 +173230,6 @@ self: { simple-sendfile stm streaming-commons text time transformers unix unix-compat vault wai word8 ]; - doCheck = false; homepage = "http://github.com/yesodweb/wai"; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; @@ -179239,7 +173247,6 @@ self: { base data-default dyre http-types wai warp ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "http://tanakh.jp"; description = "Dynamic configurable warp HTTP server"; license = stdenv.lib.licenses.bsd3; @@ -179262,7 +173269,6 @@ self: { base bytestring cmdargs containers directory mime-types text wai-app-static wai-extra warp ]; - jailbreak = true; homepage = "http://github.com/yesodweb/wai"; description = "Static file server based on Warp and wai-app-static (deprecated)"; license = stdenv.lib.licenses.mit; @@ -179299,7 +173305,6 @@ self: { base bytestring certificate conduit crypto-random network network-conduit pem tls tls-extra unix wai warp ]; - jailbreak = true; description = "set group and user id before running server"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -179312,7 +173317,6 @@ self: { version = "0.2.2.1"; sha256 = "db48e9118b17b7cf07352a1e3dd96a0002d473c59f2b2f9734746563311b6919"; libraryHaskellDepends = [ base mtl time ]; - jailbreak = true; description = "Simple control structure to re-try an action with exponential backoff"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -179330,7 +173334,6 @@ self: { base basic-prelude containers hinotify system-fileio system-filepath ]; - jailbreak = true; description = "Opinionated filesystem watcher"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -179384,12 +173387,11 @@ self: { }: mkDerivation { pname = "wavefront"; - version = "0.7.0.1"; - sha256 = "55aae23e7baa30fbf23409d9b0ef94ed749f5e0d8c6de520148a51587da48540"; + version = "0.7.0.2"; + sha256 = "3ec8338855efbdc430f3c7f5449c9e5308d7c854dea8a51ae192b983681eae26"; libraryHaskellDepends = [ attoparsec base dlist filepath mtl text transformers vector ]; - jailbreak = true; homepage = "https://github.com/phaazon/wavefront"; description = "Wavefront OBJ loader"; license = stdenv.lib.licenses.bsd3; @@ -179407,7 +173409,6 @@ self: { base binary bytestring bytestring-lexing bytestring-show delimited-text ]; - jailbreak = true; homepage = "http://code.haskell.org/~StefanKersten/code/wavesurfer"; description = "Parse WaveSurfer files"; license = stdenv.lib.licenses.bsd3; @@ -179430,7 +173431,6 @@ self: { executableHaskellDepends = [ base bytestring filepath pretty-show split vector ]; - jailbreak = true; homepage = "http://bitbucket.org/robertmassaioli/wavy"; description = "Process WAVE files in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -179460,7 +173460,6 @@ self: { libraryHaskellDepends = [ aeson attoparsec base bytestring HTTP network utf8-string vector ]; - jailbreak = true; homepage = "https://github.com/cvb/hs-weather-api.git"; description = "Weather api implemented in haskell"; license = stdenv.lib.licenses.mit; @@ -179486,9 +173485,9 @@ self: { version = "0.1.0"; sha256 = "620afb1d90ea2fbe3850b13f7e28ff31f4d2ab9622abdbad7faa0367daf65bc1"; libraryHaskellDepends = [ base text ]; - jailbreak = true; description = "Simple functions for CSS"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "web-encodings" = callPackage @@ -179502,7 +173501,6 @@ self: { libraryHaskellDepends = [ base bytestring directory failure old-locale text time ]; - jailbreak = true; homepage = "http://github.com/snoyberg/web-encodings/tree/master"; description = "Encapsulate multiple web encoding in a single package. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -179599,26 +173597,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "web-routes_0_27_10" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, exceptions - , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck - , split, text, utf8-string - }: - mkDerivation { - pname = "web-routes"; - version = "0.27.10"; - sha256 = "1d0f5da073271aa45dbcc9ef51791841f45d13f16756cfe3c16d731e2dd67b4c"; - libraryHaskellDepends = [ - base blaze-builder bytestring exceptions ghc-prim http-types mtl - parsec split text utf8-string - ]; - testHaskellDepends = [ base hspec HUnit QuickCheck ]; - homepage = "http://www.happstack.com/docs/crashcourse/index.html#web-routes"; - description = "portable, type-safe URL routing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "web-routes" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, exceptions , ghc-prim, hspec, http-types, HUnit, mtl, parsec, QuickCheck @@ -179695,7 +173673,6 @@ self: { version = "0.7.1.1"; sha256 = "aeb63d0670b2229a246530cb05666957bfa15387d2617104856d1e0b62f50be7"; libraryHaskellDepends = [ base path-pieces template-haskell text ]; - jailbreak = true; homepage = "http://docs.yesodweb.com/web-routes-quasi/"; description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -179737,7 +173714,6 @@ self: { version = "0.19.1"; sha256 = "2b36864a2d0a1bb9b7df15c5704602a5360dede24b2a2ad263267e8a79daa15e"; libraryHaskellDepends = [ base transformers web-routes ]; - jailbreak = true; description = "Extends web-routes with some transformers instances for RouteT"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -179772,10 +173748,10 @@ self: { base bytestring primitive text types-compat unordered-containers ]; testHaskellDepends = [ base doctest ]; - jailbreak = true; homepage = "https://github.com/philopon/web-routing"; description = "simple routing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webapi" = callPackage @@ -179822,7 +173798,6 @@ self: { regex-posix stm streaming-commons text transformers unix wai warp warp-tls zlib ]; - jailbreak = true; homepage = "https://github.com/fhsjaagshs/webapp"; description = "Haskell web app framework based on WAI & Warp"; license = stdenv.lib.licenses.mit; @@ -179841,9 +173816,9 @@ self: { base bytestring cgi optparse-applicative ]; executableHaskellDepends = [ base optparse-applicative ]; - jailbreak = true; description = "Turn an optparse-applicative program into a CGI program!"; license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webcrank" = callPackage @@ -179869,10 +173844,10 @@ self: { http-media http-types lens mtl tasty tasty-hunit tasty-quickcheck unordered-containers ]; - jailbreak = true; homepage = "https://github.com/webcrank/webcrank.hs"; description = "Webmachine inspired toolkit for building http applications and services"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webcrank-dispatch" = callPackage @@ -179921,8 +173896,8 @@ self: { }: mkDerivation { pname = "webdriver"; - version = "0.8.3"; - sha256 = "56cc40adcee9ea173ba051992fbd3009e63e66d2bcf9f275b0dc2bcddb1d1ae2"; + version = "0.8.4"; + sha256 = "347f2935e7b9498d1a0391f929b347e295fa8b19a3ea0ac7b81802fda4164f23"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring data-default-class directory directory-tree exceptions filepath @@ -179935,30 +173910,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "webdriver-angular_0_1_10" = callPackage - ({ mkDerivation, aeson, base, hspec, hspec-webdriver - , language-javascript, template-haskell, text, transformers - , unordered-containers, wai-app-static, warp, webdriver - }: - mkDerivation { - pname = "webdriver-angular"; - version = "0.1.10"; - sha256 = "93e341b71b93ecd09a9bdfeae6b5debb4b92832e647ed041f435a6ef0bc34c5b"; - libraryHaskellDepends = [ - aeson base language-javascript template-haskell text transformers - unordered-containers webdriver - ]; - testHaskellDepends = [ - base hspec hspec-webdriver transformers wai-app-static warp - webdriver - ]; - doCheck = false; - homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; - description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "webdriver-angular" = callPackage ({ mkDerivation, aeson, base, hspec, hspec-webdriver , language-javascript, template-haskell, text, transformers @@ -179976,7 +173927,6 @@ self: { base hspec hspec-webdriver transformers wai-app-static warp webdriver ]; - doCheck = false; homepage = "https://bitbucket.org/wuzzeb/webdriver-utils"; description = "Webdriver actions to assist with testing a webpage which uses Angular.Js"; license = stdenv.lib.licenses.mit; @@ -180004,7 +173954,6 @@ self: { unordered-containers vector zip-archive ]; testHaskellDepends = [ base parallel text ]; - jailbreak = true; homepage = "https://github.com/kallisti-dev/hs-webdriver"; description = "a Haskell client for the Selenium WebDriver protocol (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -180046,7 +173995,6 @@ self: { executableHaskellDepends = [ base bytestring HSFFIG LEXER parsec pretty utf8-env utf8-string ]; - jailbreak = true; description = "Parser and Pretty Printer for the Web IDL Language"; license = stdenv.lib.licenses.bsd3; broken = true; @@ -180067,7 +174015,6 @@ self: { base binary binary-strict blaze-builder bytestring containers filepath hopfli optparse-applicative text vector xmlgen zlib ]; - jailbreak = true; homepage = "http://github.com/ananthakumaran/webify"; description = "webfont generator"; license = stdenv.lib.licenses.mit; @@ -180106,25 +174053,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {webkit = null;}; - "webkitgtk3_0_14_1_1" = callPackage - ({ mkDerivation, base, bytestring, cairo, glib, gtk2hs-buildtools - , gtk3, mtl, pango, text, transformers, webkit - }: - mkDerivation { - pname = "webkitgtk3"; - version = "0.14.1.1"; - sha256 = "a8edd6470fe9a6c82f98bc331d23f6c6fb6978b6d63f03f010e0c7e1000eb216"; - libraryHaskellDepends = [ - base bytestring cairo glib gtk3 mtl pango text transformers - ]; - libraryPkgconfigDepends = [ webkit ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - homepage = "http://projects.haskell.org/gtk2hs/"; - description = "Binding to the Webkit library"; - license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; - "webkitgtk3" = callPackage ({ mkDerivation, base, bytestring, Cabal, cairo, glib , gtk2hs-buildtools, gtk3, mtl, pango, text, transformers, webkit @@ -180143,22 +174071,6 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {webkit = null;}; - "webkitgtk3-javascriptcore_0_13_1_2" = callPackage - ({ mkDerivation, base, glib, gtk2hs-buildtools, gtk3, webkit - , webkitgtk3 - }: - mkDerivation { - pname = "webkitgtk3-javascriptcore"; - version = "0.13.1.2"; - sha256 = "974924ce394670a7b60126f78eaad2d9a023acab3dfc2472202f07998a95e1bd"; - libraryHaskellDepends = [ base glib gtk3 webkitgtk3 ]; - libraryPkgconfigDepends = [ webkit ]; - libraryToolDepends = [ gtk2hs-buildtools ]; - description = "JavaScriptCore FFI from webkitgtk"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {webkit = null;}; - "webkitgtk3-javascriptcore" = callPackage ({ mkDerivation, base, Cabal, gtk2hs-buildtools, webkit }: mkDerivation { @@ -180229,35 +174141,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "websockets_0_9_6_2" = callPackage - ({ mkDerivation, attoparsec, base, base64-bytestring, binary - , blaze-builder, bytestring, case-insensitive, containers, entropy - , HUnit, network, QuickCheck, random, SHA, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.9.6.2"; - sha256 = "d772478ca85b4723cadbf7d73a16c15dea466fd1524d6fe323a2675106c93353"; - revision = "1"; - editedCabalFile = "fcc1f199941e5ee4a5047a74a550877c5e8e6abe1e104f27478324d9112ecd19"; - libraryHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy network random SHA text - ]; - testHaskellDepends = [ - attoparsec base base64-bytestring binary blaze-builder bytestring - case-insensitive containers entropy HUnit network QuickCheck random - SHA test-framework test-framework-hunit test-framework-quickcheck2 - text - ]; - doCheck = false; - homepage = "http://jaspervdj.be/websockets"; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "websockets" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, binary , blaze-builder, bytestring, case-insensitive, containers, entropy @@ -180284,23 +174167,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "websockets-snap_0_9_2_0" = callPackage - ({ mkDerivation, base, bytestring, enumerator, mtl, snap-core - , snap-server, websockets - }: - mkDerivation { - pname = "websockets-snap"; - version = "0.9.2.0"; - sha256 = "b7c30525c8a3ba5aeaadccaf47efc23ac52885e520012df6fc813fbf1bf35f0f"; - libraryHaskellDepends = [ - base bytestring enumerator mtl snap-core snap-server websockets - ]; - jailbreak = true; - description = "Snap integration for the websockets library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "websockets-snap" = callPackage ({ mkDerivation, base, bytestring, io-streams, mtl, snap-core , snap-server, websockets @@ -180314,6 +174180,7 @@ self: { ]; description = "Snap integration for the websockets library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webwire" = callPackage @@ -180394,7 +174261,6 @@ self: { sha256 = "f963773841854c56d36f329dae51ec08b9028832eee53b62a9ba7df5ef2de664"; libraryHaskellDepends = [ array base ]; libraryToolDepends = [ happy ]; - jailbreak = true; homepage = "http://sebfisch.github.com/haskell-regexp"; description = "Weighted Regular Expression Matcher"; license = stdenv.lib.licenses.bsd3; @@ -180428,44 +174294,12 @@ self: { aeson base blaze-builder bytestring conduit http-types lifted-base resourcet text transformers unordered-containers wai warp ]; - jailbreak = true; homepage = "https://github.com/mcschroeder/welshy"; description = "Haskell web framework (because Scotty had trouble yodeling)"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "werewolf_1_0_2_2" = callPackage - ({ mkDerivation, aeson, base, containers, directory, extra - , filepath, lens, MonadRandom, mtl, optparse-applicative - , QuickCheck, random-shuffle, tasty, tasty-quickcheck, text - , transformers - }: - mkDerivation { - pname = "werewolf"; - version = "1.0.2.2"; - sha256 = "ef55f17c0d3a49f1135e9691d1cf29dbd0b538c4ef941b20f2f7ca7fd407fa81"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base containers directory extra filepath lens MonadRandom mtl - text transformers - ]; - executableHaskellDepends = [ - aeson base directory extra filepath lens MonadRandom mtl - optparse-applicative random-shuffle text transformers - ]; - testHaskellDepends = [ - base containers extra lens MonadRandom mtl QuickCheck tasty - tasty-quickcheck text - ]; - jailbreak = true; - homepage = "https://github.com/hjwylde/werewolf"; - description = "A game engine for playing werewolf within an arbitrary chat client"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "werewolf" = callPackage ({ mkDerivation, aeson, base, containers, directory, extra , filepath, interpolate, lens, MonadRandom, mtl @@ -180491,28 +174325,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "werewolf-slack_1_0_1_4" = callPackage - ({ mkDerivation, aeson, base, bytestring, extra, http-client - , http-client-tls, http-types, mtl, optparse-applicative, process - , text, wai, warp, werewolf - }: - mkDerivation { - pname = "werewolf-slack"; - version = "1.0.1.4"; - sha256 = "273414f32d25d2dcd8d4445b9055d8e59e68ffdd3f2e6e625de1e6a89b33d450"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - aeson base bytestring extra http-client http-client-tls http-types - mtl optparse-applicative process text wai warp werewolf - ]; - jailbreak = true; - homepage = "https://github.com/hjwylde/werewolf-slack"; - description = "A chat interface for playing werewolf in Slack"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "werewolf-slack" = callPackage ({ mkDerivation, aeson, base, bytestring, extra, http-client , http-client-tls, http-types, mtl, optparse-applicative, process @@ -180540,7 +174352,6 @@ self: { version = "0.0.3.0"; sha256 = "9e3597f9b6559ec1955889acddc6ff482cf04d65da6229ce38f072d925d0b3f7"; libraryHaskellDepends = [ base bson mongoDB mtl text Wheb ]; - jailbreak = true; homepage = "https://github.com/hansonkd/Wheb-Framework"; description = "MongoDB plugin for Wheb"; license = stdenv.lib.licenses.bsd3; @@ -180554,7 +174365,6 @@ self: { version = "0.0.1.0"; sha256 = "b0108514d32798c3469cd9af9d03538a4010ca4eed0e666aca72e140ae84ac08"; libraryHaskellDepends = [ base bytestring hedis mtl text Wheb ]; - jailbreak = true; homepage = "https://github.com/hansonkd/Wheb-Framework"; description = "Redis connection for Wheb"; license = stdenv.lib.licenses.bsd3; @@ -180568,7 +174378,6 @@ self: { version = "0.1.0.0"; sha256 = "b739be48d7105d368a8d8ec9c1d5049c4dab9c93d6eea0ce9c668c22c6bdd3f3"; libraryHaskellDepends = [ base mtl StrappedTemplates text Wheb ]; - jailbreak = true; homepage = "https://github.com/hansonkd/Wheb-Framework"; description = "Strapped templates for Wheb"; license = stdenv.lib.licenses.bsd3; @@ -180600,7 +174409,6 @@ self: { libraryHaskellDepends = [ base containers GLUT mtl OpenGL process random X11 ]; - jailbreak = true; homepage = "http://neugierig.org/software/darcs/whim/"; description = "A Haskell window manager"; license = stdenv.lib.licenses.bsd3; @@ -180614,9 +174422,9 @@ self: { version = "0.1.0.3"; sha256 = "bb1081d4a4b39ddcf1e1e2618b655c0dfae818af0c3b4517bda2896f30d87e4d"; libraryHaskellDepends = [ base parsec template-haskell ]; - jailbreak = true; description = "Mustache templates with Template Haskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "whitespace" = callPackage @@ -180662,9 +174470,9 @@ self: { monadLib pretty pretty-show profunctors text ]; libraryToolDepends = [ alex happy ]; - jailbreak = true; description = "Haskell support for the Why3 input format"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wigner-symbols" = callPackage @@ -180686,8 +174494,8 @@ self: { }: mkDerivation { pname = "wikicfp-scraper"; - version = "0.1.0.3"; - sha256 = "cec3675a09151052751110ed3637eae40a7e18cdcd17127d353e6e10582e3a1e"; + version = "0.1.0.4"; + sha256 = "57c916f27a4e4a7f2b6aad3d60d91aff9ea4a1981ad145bc4f1e2062e76e970f"; libraryHaskellDepends = [ attoparsec base bytestring scalpel text time ]; @@ -180718,6 +174526,73 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wild-bind" = callPackage + ({ mkDerivation, base, containers, hspec, microlens, QuickCheck + , stm, text, transformers + }: + mkDerivation { + pname = "wild-bind"; + version = "0.1.0.2"; + sha256 = "472a0bec3129e8b0ea60170e0535e602030e1d68c39bfd405c71b246c5211522"; + libraryHaskellDepends = [ base containers text transformers ]; + testHaskellDepends = [ + base hspec microlens QuickCheck stm transformers + ]; + homepage = "https://github.com/debug-ito/wild-bind"; + description = "Dynamic key binding framework"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "wild-bind-indicator" = callPackage + ({ mkDerivation, base, containers, gtk, text, transformers + , wild-bind + }: + mkDerivation { + pname = "wild-bind-indicator"; + version = "0.1.0.1"; + sha256 = "d57e697f44510a08f7d7608b181e06b6dea099b4f9ccd46058134105f8677053"; + libraryHaskellDepends = [ + base containers gtk text transformers wild-bind + ]; + homepage = "https://github.com/debug-ito/wild-bind"; + description = "Graphical indicator for WildBind"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "wild-bind-task-x11" = callPackage + ({ mkDerivation, base, text, transformers, wild-bind + , wild-bind-indicator, wild-bind-x11 + }: + mkDerivation { + pname = "wild-bind-task-x11"; + version = "0.1.0.1"; + sha256 = "d49347eadf4db6fe28b5de45db962e489014ebc3a9dc19353994976290527ac3"; + libraryHaskellDepends = [ + base text transformers wild-bind wild-bind-indicator wild-bind-x11 + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/debug-ito/wild-bind"; + description = "Task to install and export everything you need to use WildBind in X11"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "wild-bind-x11" = callPackage + ({ mkDerivation, base, containers, fold-debounce, hspec, QuickCheck + , stm, text, time, transformers, wild-bind, X11 + }: + mkDerivation { + pname = "wild-bind-x11"; + version = "0.1.0.2"; + sha256 = "dd31ca0fff07e5976076ed092ffb261ca438240fa33b25ba5ec3de66dcfd6d2d"; + libraryHaskellDepends = [ + base containers fold-debounce stm text transformers wild-bind X11 + ]; + testHaskellDepends = [ base hspec QuickCheck time wild-bind X11 ]; + homepage = "https://github.com/debug-ito/wild-bind"; + description = "X11-specific implementation for WildBind"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "win-hp-path" = callPackage ({ mkDerivation, base, process, split }: mkDerivation { @@ -180744,7 +174619,6 @@ self: { libraryHaskellDepends = [ base Crypto dataenc mtl network parsec pretty split time urlencoded ]; - jailbreak = true; homepage = "http://patch-tag.com/repo/windowslive"; description = "Implements Windows Live Web Authentication and Delegated Authentication"; license = stdenv.lib.licenses.bsd3; @@ -180783,21 +174657,21 @@ self: { }) {kernel32 = null; ws2_32 = null;}; "wire-streams" = callPackage - ({ mkDerivation, base, binary, bytestring, Cabal - , cabal-test-quickcheck, cereal, io-streams, QuickCheck + ({ mkDerivation, base, binary, binary-parsers, bytestring + , io-streams, QuickCheck, tasty, tasty-quickcheck }: mkDerivation { pname = "wire-streams"; - version = "0.0.2.0"; - sha256 = "2b03e9c88767a371d59ca5d941db3c3f5b11ba1b8a20606732a706acebe6dd4f"; + version = "0.1.1.0"; + sha256 = "96dffb70c08c89589881c96f199d271b55e4a5b3cc5be0f3e24e101858e2fb27"; libraryHaskellDepends = [ - base binary bytestring cereal io-streams + base binary binary-parsers bytestring io-streams ]; testHaskellDepends = [ - base binary bytestring Cabal cabal-test-quickcheck cereal - io-streams QuickCheck + base binary bytestring io-streams QuickCheck tasty tasty-quickcheck ]; - description = "Use cereal or binary with io-streams"; + homepage = "https://github.com/winterland1989/wire-streams"; + description = "Fast binary io-streams adapter"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -180829,7 +174703,6 @@ self: { testHaskellDepends = [ base hspec mtl QuickCheck template-haskell transformers ]; - jailbreak = true; homepage = "http://github.com/seanparsons/wiring/"; description = "Wiring, promotion and demotion of types"; license = stdenv.lib.licenses.bsd3; @@ -180936,7 +174809,6 @@ self: { testHaskellDepends = [ base filepath lens linear tasty tasty-golden trifecta ]; - jailbreak = true; homepage = "http://github.com/bgamari/wkt"; description = "Parsec parsers and types for geographic data in well-known text (WKT) format"; license = stdenv.lib.licenses.bsd3; @@ -180966,10 +174838,10 @@ self: { ansi-terminal base bytestring containers mtl nats semigroups text transformers wl-pprint-extras ]; - jailbreak = true; homepage = "https://github.com/seagull-kamome/wl-pprint-ansiterm"; description = "ANSI Terminal support with wl-pprint-extras"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wl-pprint-extras" = callPackage @@ -181034,7 +174906,6 @@ self: { ]; librarySystemDepends = [ wlc ]; libraryToolDepends = [ c2hs ]; - jailbreak = true; description = "Haskell bindings for the wlc library"; license = stdenv.lib.licenses.isc; hydraPlatforms = stdenv.lib.platforms.none; @@ -181071,7 +174942,6 @@ self: { lifted-async mwc-random network QuickCheck quickcheck-instances safe system-fileio system-filepath text transformers ]; - jailbreak = true; homepage = "https://github.com/nikita-volkov/wobsurv"; description = "A simple and highly performant HTTP file server"; license = stdenv.lib.licenses.mit; @@ -181089,7 +174959,6 @@ self: { executableHaskellDepends = [ base binary bytestring filepath zlib ]; - jailbreak = true; description = "Web Open Font Format (WOFF) unpacker"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -181335,13 +175204,48 @@ self: { transformers ]; executableHaskellDepends = [ base ]; - jailbreak = true; homepage = "https://github.com/sboosali/workflow-osx#readme"; description = "a \"Desktop Workflow\" monad with Objective-C bindings"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "workflow-types" = callPackage + ({ mkDerivation, base, comonad, containers, deepseq, Earley + , exceptions, free, hashable, semigroups, split, transformers + }: + mkDerivation { + pname = "workflow-types"; + version = "0.0.0"; + sha256 = "54991eaf641bdf43e0d3e99bee650fa6ae2690adeb34d0f6378b5a0d93aaafa7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base comonad containers deepseq Earley exceptions free hashable + semigroups split transformers + ]; + executableHaskellDepends = [ base ]; + homepage = "http://github.com/sboosali/workflow-types#readme"; + description = "Automate keyboard\/mouse\/clipboard\/application interaction"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "workflow-windows" = callPackage + ({ mkDerivation, base, doctest, hspec, QuickCheck }: + mkDerivation { + pname = "workflow-windows"; + version = "0.0.0"; + sha256 = "4c922f26ea5580022b8ecd184ce473eabead4a035cc95ea9394f9fc04efdff92"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest hspec QuickCheck ]; + homepage = "http://github.com/sboosali/workflow-windows#readme"; + description = "Automate keyboard/mouse/clipboard/application interaction"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wp-archivebot" = callPackage ({ mkDerivation, base, feed, HTTP, network, parallel, tagsoup }: mkDerivation { @@ -181353,7 +175257,6 @@ self: { executableHaskellDepends = [ base feed HTTP network parallel tagsoup ]; - jailbreak = true; description = "Subscribe to a wiki's RSS feed and archive external links"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -181396,13 +175299,57 @@ self: { hxt-filter polyparse tagchup tagsoup transformers utility-ht xml-basic ]; - jailbreak = true; homepage = "http://code.haskell.org/~thielema/wraxml/"; description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "wrecker" = callPackage + ({ mkDerivation, aeson, aeson-qq, ansi-terminal, ansigraph, array + , base, base64-bytestring, blaze-builder, bytestring + , case-insensitive, clock, clock-extras, connection, containers + , cookie, cryptonite, data-default, data-default-class, deepseq + , exceptions, filepath, hspec, hspec-discover, http-client + , http-types, immortal, lens, markdown-unlit, memory, mime-types + , network, network-uri, next-ref, optparse-applicative, random + , scotty, statistics, stm, stm-chans, streaming-commons, tabular + , text, threads, threads-extras, time, tls, transformers + , unagi-chan, unix, unordered-containers, vector, vty, wai, warp + , wreq + }: + mkDerivation { + pname = "wrecker"; + version = "0.1.3.3"; + sha256 = "be69fcac9665d15256247f674649a3f3b302e4c87184dd82500265722270e4ad"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-terminal ansigraph array base base64-bytestring + blaze-builder bytestring case-insensitive clock clock-extras + connection containers cookie cryptonite data-default + data-default-class deepseq exceptions filepath http-client + http-types immortal memory mime-types network network-uri next-ref + optparse-applicative random statistics stm stm-chans + streaming-commons tabular text threads threads-extras time tls + transformers unagi-chan unix unordered-containers vector vty wreq + ]; + executableHaskellDepends = [ + aeson aeson-qq base bytestring connection http-client immortal lens + markdown-unlit network next-ref optparse-applicative scotty text + transformers wai warp wreq + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring connection hspec hspec-discover + http-client immortal markdown-unlit network next-ref scotty text + transformers unordered-containers wai warp wreq + ]; + homepage = "https://github.com/skedgeme/wrecker#readme"; + description = "An HTTP Performance Benchmarker"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "wreq" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -181436,7 +175383,6 @@ self: { test-framework-hunit test-framework-quickcheck2 text time transformers unix-compat uuid vector ]; - doCheck = false; homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = stdenv.lib.licenses.bsd3; @@ -181490,7 +175436,6 @@ self: { testHaskellDepends = [ assertions base bed-and-breakfast containers filepath lens ]; - jailbreak = true; description = "Colour space transformations and metrics"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -181575,9 +175520,9 @@ self: { executableHaskellDepends = [ base bencode bytestring containers directory safe utf8-string ]; - jailbreak = true; description = "A small tool to list, add and remove webseeds from a torrent file"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wtk" = callPackage @@ -181634,7 +175579,6 @@ self: { revision = "1"; editedCabalFile = "309c49da6f6eb268ebcbe9ed3faac18c3e25c884b0b16b7c8e29dfd8a0705fcb"; libraryHaskellDepends = [ base containers time vector-space ]; - jailbreak = true; homepage = "http://code.google.com/p/copperbox/"; description = "Pure Haskell PostScript and SVG generation"; license = stdenv.lib.licenses.bsd3; @@ -181669,7 +175613,6 @@ self: { libraryHaskellDepends = [ base vector-space wumpus-basic wumpus-core wumpus-drawing ]; - jailbreak = true; homepage = "http://code.google.com/p/copperbox/"; description = "Microprints - \"greek-text\" pictures"; license = stdenv.lib.licenses.bsd3; @@ -181694,22 +175637,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "wuss_1_0_4" = callPackage - ({ mkDerivation, base, bytestring, connection, network, websockets - }: - mkDerivation { - pname = "wuss"; - version = "1.0.4"; - sha256 = "11a0072c4986d6aa60f686cf9fd29b58077706ab27aabad18d01e5942a179155"; - libraryHaskellDepends = [ - base bytestring connection network websockets - ]; - homepage = "https://github.com/tfausak/wuss#readme"; - description = "Secure WebSocket (WSS) clients"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "wuss" = callPackage ({ mkDerivation, base, bytestring, connection, network, websockets }: @@ -181735,6 +175662,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxAsteroids" = callPackage @@ -181749,6 +175677,7 @@ self: { homepage = "https://wiki.haskell.org/WxAsteroids"; description = "Try to avoid the asteroids with your space ship"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxFruit" = callPackage @@ -181761,7 +175690,6 @@ self: { isExecutable = true; libraryHaskellDepends = [ base old-time wx wxcore Yampa ]; executableHaskellDepends = [ base wx wxcore Yampa ]; - jailbreak = true; homepage = "http://www.haskell.org/haskellwiki/WxFruit"; description = "An implementation of Fruit using wxHaskell"; license = stdenv.lib.licenses.bsd3; @@ -181783,6 +175711,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell C++ wrapper"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; inherit (pkgs) wxGTK;}; @@ -181802,6 +175731,7 @@ self: { homepage = "https://wiki.haskell.org/WxHaskell"; description = "wxHaskell core"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) wxGTK;}; "wxdirect" = callPackage @@ -181817,10 +175747,10 @@ self: { executableHaskellDepends = [ base containers directory filepath parsec process strict time ]; - jailbreak = true; homepage = "https://wiki.haskell.org/WxHaskell"; description = "helper tool for building wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "wxhnotepad" = callPackage @@ -181832,7 +175762,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base wx wxcore ]; - jailbreak = true; homepage = "http://github.com/elbrujohalcon/wxhnotepad"; description = "An example of how to implement a basic notepad with wxHaskell"; license = stdenv.lib.licenses.bsd3; @@ -181891,7 +175820,6 @@ self: { base bytestring ConfigFile containers dgs directory filepath mtl parsec process sgf split ]; - jailbreak = true; homepage = "http://dmwit.com/wyvern"; description = "An autoresponder for Dragon Go Server"; license = stdenv.lib.licenses.bsd3; @@ -181910,7 +175838,6 @@ self: { array base bytestring containers monads-tf text transformers type-level ]; - jailbreak = true; homepage = "http://jwlato.webfactional.com/haskell/x-dsp"; description = "A embedded DSL for manipulating DSP languages in Haskell"; license = stdenv.lib.licenses.gpl3; @@ -181953,8 +175880,8 @@ self: { }: mkDerivation { pname = "x509"; - version = "1.6.3"; - sha256 = "36c62877046e7ecd6c913da4c21264e18eb56f7cba7abb5d41c42e95845fbade"; + version = "1.6.4"; + sha256 = "be0e7f9bddbd260cd247dce30c15f33a53937f51f304a05aec98accbcde93d42"; libraryHaskellDepends = [ asn1-encoding asn1-parse asn1-types base bytestring containers cryptonite hourglass memory mtl pem @@ -181970,15 +175897,15 @@ self: { "x509-store" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, base, bytestring - , containers, cryptonite, mtl, pem, x509 + , containers, cryptonite, directory, filepath, mtl, pem, x509 }: mkDerivation { pname = "x509-store"; - version = "1.6.1"; - sha256 = "83d69d2f5ce39fceaeca8e4dcc6d9ebe8a8e94f55d9c23b06cc7a58844e94b05"; + version = "1.6.2"; + sha256 = "49fd261c7e55a45fd357931a6d9f81e22f242e6047304d3e2662e43db94d807b"; libraryHaskellDepends = [ - asn1-encoding asn1-types base bytestring containers cryptonite mtl - pem x509 + asn1-encoding asn1-types base bytestring containers cryptonite + directory filepath mtl pem x509 ]; homepage = "http://github.com/vincenthz/hs-certificate"; description = "X.509 collection accessing and storing methods"; @@ -181991,8 +175918,8 @@ self: { }: mkDerivation { pname = "x509-system"; - version = "1.6.3"; - sha256 = "24237c3df1bf692fcf7bade432970ee2eb06db7437fa0e95986ef7535a68f6e0"; + version = "1.6.4"; + sha256 = "d98ef028855ad73a872ed86026f205aba383378bf1e63462c5d3e4733b60ff4c"; libraryHaskellDepends = [ base bytestring containers directory filepath mtl pem process x509 x509-store @@ -182029,8 +175956,8 @@ self: { }: mkDerivation { pname = "x509-validation"; - version = "1.6.3"; - sha256 = "80b7d3beef9dda913c7cc7c890ab703d6030574df2a62df1939036184cd921e3"; + version = "1.6.5"; + sha256 = "d1f73197677b6d19795fc80e4a1fa93e810d567ee4e3edc74e841b3eb20e1ca4"; libraryHaskellDepends = [ asn1-encoding asn1-types base byteable bytestring containers cryptonite data-default-class hourglass memory mtl pem x509 @@ -182042,15 +175969,19 @@ self: { }) {}; "x86-64bit" = callPackage - ({ mkDerivation, base, monads-tf, QuickCheck, tardis, vector }: + ({ mkDerivation, base, deepseq, monads-tf, QuickCheck, tardis + , vector + }: mkDerivation { pname = "x86-64bit"; - version = "0.3"; - sha256 = "cd8115c071ac2e4a9961f9a0ffe2a1733abe44f677f8cce8a0a6fcf6bda69af7"; + version = "0.4.1"; + sha256 = "c980fccd28989467703dee57477d0b4c8916cc52a81e8aa8d3aa5c206726bbaf"; libraryHaskellDepends = [ - base monads-tf QuickCheck tardis vector + base deepseq monads-tf QuickCheck tardis vector + ]; + testHaskellDepends = [ + base deepseq monads-tf QuickCheck tardis vector ]; - testHaskellDepends = [ base monads-tf QuickCheck tardis vector ]; homepage = "https://github.com/divipp/x86-64"; description = "Runtime code generation for x86 64 bit machine code"; license = stdenv.lib.licenses.bsd3; @@ -182158,55 +176089,29 @@ self: { libraryHaskellDepends = [ base bytestring containers mtl network transformers ]; - jailbreak = true; description = "Partial implementation of the XCP protocol with ethernet as transport layer"; license = stdenv.lib.licenses.gpl3; - }) {}; - - "xdcc_1_0_4" = callPackage - ({ mkDerivation, ascii-progress, base, bytestring, case-insensitive - , concurrent-extra, concurrent-output, errors, iproute, irc-ctcp - , irc-dcc, lifted-base, network, optparse-applicative, path, random - , simpleirc, transformers, unix-compat - }: - mkDerivation { - pname = "xdcc"; - version = "1.0.4"; - sha256 = "ca6eec53d1229c85d50b64ff08ef4304c795c2fae5e96e730c25d42dbb41a9e9"; - isLibrary = false; - isExecutable = true; - executableHaskellDepends = [ - ascii-progress base bytestring case-insensitive concurrent-extra - concurrent-output errors iproute irc-ctcp irc-dcc lifted-base - network optparse-applicative path random simpleirc transformers - unix-compat - ]; - jailbreak = true; - homepage = "https://github.com/JanGe/xdcc"; - description = "A wget-like utility for retrieving files from XDCC bots on IRC"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xdcc" = callPackage ({ mkDerivation, ascii-progress, async, base, bytestring - , case-insensitive, concurrent-extra, concurrent-output, errors - , iproute, irc-client, irc-conduit, irc-ctcp, irc-dcc, lifted-base - , network, optparse-applicative, path, random, safe-exceptions, stm - , text, text-format, transformers, unix-compat + , case-insensitive, concurrent-output, errors, iproute, irc-client + , irc-dcc, monad-control, network, optparse-applicative, path + , random, safe-exceptions, signal, stm, text, transformers + , transformers-base, unix-compat }: mkDerivation { pname = "xdcc"; - version = "1.1.2"; - sha256 = "d3268b0e1ffc28dabd33ffdc8c5f2e632b114002b5b3cc1d6836faa2d640b35d"; + version = "1.1.3"; + sha256 = "b34b1b10c8fc92347b0713b5b2d1ebb7450984fd7dd284d8501c291e016db49e"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ ascii-progress async base bytestring case-insensitive - concurrent-extra concurrent-output errors iproute irc-client - irc-conduit irc-ctcp irc-dcc lifted-base network - optparse-applicative path random safe-exceptions stm text - text-format transformers unix-compat + concurrent-output errors iproute irc-client irc-dcc monad-control + network optparse-applicative path random safe-exceptions signal stm + text transformers transformers-base unix-compat ]; homepage = "https://github.com/JanGe/xdcc"; description = "A wget-like utility for retrieving files from XDCC bots on IRC"; @@ -182316,7 +176221,6 @@ self: { libraryHaskellDepends = [ base bytestring containers ghc-prim mtl parsec regex-base ]; - jailbreak = true; homepage = "http://code.google.com/p/xhaskell-library/"; description = "Replaces/Enhances Text.Regex"; license = stdenv.lib.licenses.bsd3; @@ -182352,7 +176256,6 @@ self: { libraryHaskellDepends = [ base hashable mtl transformers unordered-containers xhb ]; - jailbreak = true; homepage = "http://github.com/jotrk/xhb-atom-cache/"; description = "Atom cache for XHB"; license = stdenv.lib.licenses.bsd2; @@ -182371,7 +176274,6 @@ self: { base binary bytestring dlist hashable mtl transformers xhb xhb-atom-cache ]; - jailbreak = true; homepage = "http://github.com/jotrk/xhb-ewmh/"; description = "EWMH utilities for XHB"; license = stdenv.lib.licenses.bsd2; @@ -182455,7 +176357,6 @@ self: { testHaskellDepends = [ aeson base bytestring containers HTF text time ]; - jailbreak = true; homepage = "http://github.com/JanAhrens/xing-api-haskell"; description = "Wrapper for the XING API, v1"; license = stdenv.lib.licenses.bsd3; @@ -182478,14 +176379,17 @@ self: { }) {}; "xkbcommon" = callPackage - ({ mkDerivation, base, bytestring, cpphs, data-flags, filepath - , libxkbcommon, process, storable-record, template-haskell, text - , transformers, unix + ({ mkDerivation, base, bytestring, Cabal, cpphs, data-flags + , directory, filepath, libxkbcommon, process, storable-record + , template-haskell, text, transformers, unix }: mkDerivation { pname = "xkbcommon"; - version = "0.0.2"; - sha256 = "98e0a2e42bc6a08a56416882a89165adfdf12a762fd93ece076edf37b814dfd8"; + version = "0.0.3"; + sha256 = "00b4160ed6078386e4a4d6b6fed33c71bde8e3ef5a64d9f040432b550cbb3afe"; + setupHaskellDepends = [ + base Cabal cpphs directory filepath process template-haskell text + ]; libraryHaskellDepends = [ base bytestring cpphs data-flags filepath process storable-record template-haskell text transformers @@ -182535,35 +176439,8 @@ self: { base blaze-markup bytestring text time time-locale-compat zip-archive ]; - doCheck = false; description = "Streaming Excel file generation and parsing"; license = stdenv.lib.licenses.mit; - }) {}; - - "xlsx_0_2_3" = callPackage - ({ mkDerivation, base, base64-bytestring, binary-search, bytestring - , conduit, containers, data-default, Diff, extra, filepath, groom - , lens, mtl, network-uri, old-locale, raw-strings-qq, safe - , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time - , transformers, vector, xml-conduit, zip-archive, zlib - }: - mkDerivation { - pname = "xlsx"; - version = "0.2.3"; - sha256 = "c1170f83d96c4fd500b2a09aa016d6e52668cabf5442e5ba7aa5c64b0e817563"; - libraryHaskellDepends = [ - base base64-bytestring binary-search bytestring conduit containers - data-default extra filepath lens mtl network-uri old-locale safe - text time transformers vector xml-conduit zip-archive zlib - ]; - testHaskellDepends = [ - base bytestring containers Diff groom lens mtl raw-strings-qq - smallcheck tasty tasty-hunit tasty-smallcheck time vector - xml-conduit - ]; - homepage = "https://github.com/qrilka/xlsx"; - description = "Simple and incomplete Excel file parser/writer"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -182595,6 +176472,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xlsx_0_3_0" = callPackage + ({ mkDerivation, base, base64-bytestring, binary-search, bytestring + , conduit, containers, data-default, Diff, errors, extra, filepath + , groom, lens, mtl, mtl-compat, network-uri, old-locale + , raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xml-conduit + , zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.3.0"; + sha256 = "6d941e2fdc757384d417c50db35f84aa0413b940baf6ec49fdba597cd68c11b3"; + libraryHaskellDepends = [ + base base64-bytestring binary-search bytestring conduit containers + data-default errors extra filepath lens mtl mtl-compat network-uri + old-locale safe text time transformers vector xml-conduit + zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck time vector + xml-conduit + ]; + homepage = "https://github.com/qrilka/xlsx"; + description = "Simple and incomplete Excel file parser/writer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-tabular" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -182612,6 +176518,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "xlsx-tabular_0_1_0_2" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, data-default + , lens, text, xlsx + }: + mkDerivation { + pname = "xlsx-tabular"; + version = "0.1.0.2"; + sha256 = "0650c6e22c4b1f2be1d91a62cdf6160a17f2a18cfe7918cc30523a923218689d"; + libraryHaskellDepends = [ + aeson base bytestring containers data-default lens text xlsx + ]; + testHaskellDepends = [ base ]; + homepage = "http://github.com/kkazuo/xlsx-tabular#readme"; + description = "Xlsx table decode utility"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xlsx-templater" = callPackage ({ mkDerivation, base, bytestring, conduit, containers , data-default, parsec, text, time, transformers, xlsx @@ -182626,7 +176550,6 @@ self: { base bytestring conduit containers data-default parsec text time transformers xlsx ]; - jailbreak = true; homepage = "https://github.com/qrilka/xlsx-templater"; description = "Simple and incomplete Excel file templater"; license = stdenv.lib.licenses.mit; @@ -182673,7 +176596,6 @@ self: { base bytestring conduit containers text transformers uri-conduit xml-conduit ]; - jailbreak = true; homepage = "http://github.com/snoyberg/xml"; description = "Parse XML catalog files (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -182704,6 +176626,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "xml-conduit_1_4_0_1" = callPackage + ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , data-default, deepseq, hspec, HUnit, monad-control, resourcet + , text, transformers, xml-types + }: + mkDerivation { + pname = "xml-conduit"; + version = "1.4.0.1"; + sha256 = "7c9c171230bcb66b1ab6b0b201f6e5666c79ad4eb0747e68eb1d932591ab1700"; + libraryHaskellDepends = [ + attoparsec base blaze-builder blaze-html blaze-markup bytestring + conduit conduit-extra containers data-default deepseq monad-control + resourcet text transformers xml-types + ]; + testHaskellDepends = [ + base blaze-markup bytestring conduit containers hspec HUnit + resourcet text transformers xml-types + ]; + homepage = "http://github.com/snoyberg/xml"; + description = "Pure-Haskell utilities for dealing with XML with the conduit package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "xml-conduit-decode" = callPackage ({ mkDerivation, base, bifunctors, data-default, lens, semigroups , tasty, tasty-hunit, text, time, xml-conduit, xml-types @@ -182783,7 +176730,6 @@ self: { base bytestring containers enumerator hspec HUnit text transformers xml-types ]; - jailbreak = true; homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -182801,7 +176747,6 @@ self: { libraryHaskellDepends = [ base containers enumerator xml-enumerator xml-types ]; - jailbreak = true; description = "Parser combinators for xml-enumerator and compatible XML parsers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -182825,8 +176770,8 @@ self: { }: mkDerivation { pname = "xml-hamlet"; - version = "0.4.0.11"; - sha256 = "3d598ad387e310e76a07f213afe35db06662611840d1bce3bcdf202668bc1e89"; + version = "0.4.0.12"; + sha256 = "0ff43b778e9e497b468dd123ab81fa8cfc84dcd0a6c8ab06b8fc27cf3e0669d2"; libraryHaskellDepends = [ base containers parsec shakespeare template-haskell text xml-conduit @@ -182868,10 +176813,10 @@ self: { testHaskellDepends = [ base doctest hspec hspec-expectations-lens lens xml-conduit ]; - jailbreak = true; homepage = "https://github.com/supki/xml-html-conduit-lens#readme"; description = "Optics for xml-conduit and html-conduit"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-lens" = callPackage @@ -182902,10 +176847,10 @@ self: { libraryHaskellDepends = [ base mtl transformers transformers-compose xml ]; - jailbreak = true; homepage = "http://github.com/aristidb/xml-monad"; description = "Monadic extensions to the xml package"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xml-parsec" = callPackage @@ -182982,7 +176927,6 @@ self: { peyotls random sasl simple-pipe stm tighttp transformers-base uuid x509 x509-store x509-validation xml-pipe xmpipe ]; - jailbreak = true; homepage = "https://github.com/YoshikuniJujo/xml-push/wiki"; description = "Push XML from/to client to/from server over XMPP or HTTP"; license = stdenv.lib.licenses.bsd3; @@ -183130,7 +177074,6 @@ self: { testHaskellDepends = [ aeson base bytestring hspec resourcet text transformers ]; - jailbreak = true; homepage = "http://github.com/yihuang/xml2json"; description = "translate xml to json"; license = stdenv.lib.licenses.bsd3; @@ -183150,7 +177093,6 @@ self: { executableHaskellDepends = [ array base bio bytestring containers directory xhtml ]; - jailbreak = true; description = "Convert BLAST output in XML format to CSV or HTML"; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; @@ -183171,30 +177113,10 @@ self: { base bytestring containers filepath HUnit hxt process QuickCheck text unix ]; - doCheck = false; description = "Fast XML generation library"; license = stdenv.lib.licenses.bsd3; }) {}; - "xmlhtml_0_2_3_4" = callPackage - ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup - , bytestring, containers, parsec, text, unordered-containers - }: - mkDerivation { - pname = "xmlhtml"; - version = "0.2.3.4"; - sha256 = "d955859d51f4636e3994f77b2ac38e0bdd7c152eb92b9b192db11ebc3e966533"; - revision = "1"; - editedCabalFile = "17e37eb81bbdd03eea4b12e65bd4a00e789bc7a04b792f138dc9056c488443a9"; - libraryHaskellDepends = [ - base blaze-builder blaze-html blaze-markup bytestring containers - parsec text unordered-containers - ]; - description = "XML parser and renderer with HTML 5 quirks mode"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "xmlhtml" = callPackage ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup , bytestring, containers, directory, HUnit, parsec, QuickCheck @@ -183205,6 +177127,8 @@ self: { pname = "xmlhtml"; version = "0.2.3.5"; sha256 = "e333a1c7afd5068b60b143457fea7325a34408cc65b3ac55f5b342eb0274b06d"; + revision = "1"; + editedCabalFile = "6a4d1fc061c4dd01628d762d947e63619a25714aa0dd36b6fe674a7ec62b9045"; libraryHaskellDepends = [ base blaze-builder blaze-html blaze-markup bytestring containers parsec text unordered-containers @@ -183321,7 +177245,6 @@ self: { testHaskellDepends = [ base containers extensible-exceptions QuickCheck X11 ]; - doCheck = false; postInstall = '' shopt -s globstar mkdir -p $out/share/man/man1 @@ -183346,7 +177269,6 @@ self: { base containers directory extensible-exceptions filepath mtl process unix X11 ]; - jailbreak = true; homepage = "http://xmonad.org"; description = "A tiling window manager"; license = stdenv.lib.licenses.bsd3; @@ -183388,7 +177310,6 @@ self: { old-time process random unix utf8-string X11 X11-xft xmonad-bluetilebranch ]; - jailbreak = true; homepage = "http://xmonad.org/"; description = "Third party extensions for xmonad"; license = stdenv.lib.licenses.bsd3; @@ -183436,7 +177357,6 @@ self: { base containers directory hint mtl old-locale old-time process random unix X11 xmonad xmonad-contrib ]; - jailbreak = true; homepage = "http://xmonad.org/"; description = "Module for evaluation Haskell expressions in the running xmonad instance"; license = stdenv.lib.licenses.bsd3; @@ -183513,10 +177433,10 @@ self: { libraryHaskellDepends = [ base containers utf8-string xmonad xmonad-contrib ]; - jailbreak = true; homepage = "https://github.com/plindbe2/xmonad-windownames"; description = "A library to automatically put named windows into the DynamicLog"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xmpipe" = callPackage @@ -183573,9 +177493,9 @@ self: { base blaze-builder bytestring double-conversion strict xournal-types ]; - jailbreak = true; description = "text builder for xournal file format"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xournal-convert" = callPackage @@ -183594,7 +177514,6 @@ self: { mtl xournal-parser xournal-render xournal-types ]; executableHaskellDepends = [ base cmdargs ]; - jailbreak = true; homepage = "http://ianwookim.org/hxournal"; description = "convert utility for xoj files"; license = stdenv.lib.licenses.bsd3; @@ -183633,7 +177552,6 @@ self: { base bytestring cairo containers fclabels mtl poppler strict TypeCompose xournal-types ]; - jailbreak = true; description = "Xournal file renderer"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -183686,7 +177604,6 @@ self: { executableHaskellDepends = [ array base containers directory process random unix ]; - jailbreak = true; homepage = "http://malde.org/~ketil/"; description = "Cluster EST sequences"; license = "GPL"; @@ -183765,6 +177682,7 @@ self: { homepage = "http://github.com/alanz/xtc"; description = "eXtended & Typed Controls for wxHaskell"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xtest" = callPackage @@ -183792,9 +177710,9 @@ self: { libraryHaskellDepends = [ base convertible Imlib setlocale X11 X11-xft x11-xim yjsvg yjtools ]; - jailbreak = true; description = "turtle like LOGO"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "xxhash" = callPackage @@ -183809,9 +177727,9 @@ self: { editedCabalFile = "1d641797e9e431c6152dc41cbe72551bb2f91cec8265d3a5e3b2b9718764d274"; libraryHaskellDepends = [ base bytestring crypto-api tagged ]; testHaskellDepends = [ base bytestring hspec QuickCheck ]; - jailbreak = true; description = "A Haskell implementation of the xxHash algorithm"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "y0l0bot" = callPackage @@ -183828,7 +177746,6 @@ self: { base bytestring containers mtl network old-locale old-time safe split text time ]; - jailbreak = true; description = "#plaimi's all-encompassing bot"; license = stdenv.lib.licenses.agpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -183862,9 +177779,9 @@ self: { base bytestring containers lens mtl mtl-compat parsec ]; executableHaskellDepends = [ base containers mtl parsec ]; - jailbreak = true; description = "Yet Another Brainfuck Interpreter"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yackage" = callPackage @@ -183909,6 +177826,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yahoo-finance-api_0_2_0_0" = callPackage + ({ mkDerivation, aeson, base, doctest, either, Glob, hspec + , http-api-data, http-client, http-client-tls, mtl, safe, servant + , servant-client, text, time, transformers, vector + }: + mkDerivation { + pname = "yahoo-finance-api"; + version = "0.2.0.0"; + sha256 = "a2d01a542ca627abe791d95d7e38234f731a356aa9f6e2d0f81c7df050bff3c7"; + libraryHaskellDepends = [ + aeson base either http-api-data http-client mtl servant + servant-client text time transformers vector + ]; + testHaskellDepends = [ + base doctest either Glob hspec http-client http-client-tls mtl safe + servant servant-client + ]; + homepage = "https://github.com/cdepillabout/yahoo-finance-api"; + description = "Read quotes from Yahoo Finance API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yahoo-finance-conduit" = callPackage ({ mkDerivation, attoparsec, base, cassava, conduit, lens, mtl , text, vector, wreq @@ -183920,9 +177860,9 @@ self: { libraryHaskellDepends = [ attoparsec base cassava conduit lens mtl text vector wreq ]; - jailbreak = true; description = "Streaming aproach to the yahoo finance api"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yahoo-web-search" = callPackage @@ -183964,7 +177904,6 @@ self: { libraryHaskellDepends = [ base bytestring enumerator json-types text transformers yajl ]; - jailbreak = true; homepage = "https://john-millikin.com/software/haskell-yajl/"; description = "Enumerator-based interface to YAJL, an event-based JSON implementation"; license = stdenv.lib.licenses.gpl3; @@ -183994,46 +177933,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yaml_0_8_18_1" = callPackage - ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat - , bytestring, conduit, containers, directory, enclosed-exceptions - , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific - , semigroups, text, transformers, unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.8.18.1"; - sha256 = "24610e879d243dd7307123d076d436197f7e28bee5d6a78cafe444833cc9ac7a"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - enclosed-exceptions filepath resourcet scientific semigroups text - transformers unordered-containers vector - ]; - libraryPkgconfigDepends = [ libyaml ]; - executableHaskellDepends = [ aeson base bytestring ]; - testHaskellDepends = [ - aeson aeson-qq base base-compat bytestring conduit hspec HUnit - mockery resourcet text transformers unordered-containers vector - ]; - homepage = "http://github.com/snoyberg/yaml/"; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) libyaml;}; - "yaml" = callPackage ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat , bytestring, conduit, containers, directory, enclosed-exceptions , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific - , semigroups, text, transformers, unordered-containers, vector + , semigroups, temporary, text, transformers, unordered-containers + , vector }: mkDerivation { pname = "yaml"; - version = "0.8.18.5"; - sha256 = "90875ae906872f0b2d3cc38f265f11347c80643d4b64a6c5965183e1b700e5c3"; + version = "0.8.18.7"; + sha256 = "b8cebafe9294b34258114b8ea5576d26c2d0070645ab9bfc84000b367931a944"; configureFlags = [ "-fsystem-libyaml" ]; isLibrary = true; isExecutable = true; @@ -184046,10 +177956,9 @@ self: { executableHaskellDepends = [ aeson base bytestring ]; testHaskellDepends = [ aeson aeson-qq base base-compat bytestring conduit directory hspec - HUnit mockery resourcet text transformers unordered-containers - vector + HUnit mockery resourcet temporary text transformers + unordered-containers vector ]; - doCheck = false; homepage = "http://github.com/snoyberg/yaml/"; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; @@ -184210,10 +178119,10 @@ self: { executableHaskellDepends = [ base containers parsec text unordered-containers yaml ]; - jailbreak = true; homepage = "https://github.com/acatton/yamlkeysdiff"; description = "Compares the keys from two yaml files"; license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yampa-canvas" = callPackage @@ -184243,7 +178152,6 @@ self: { executableHaskellDepends = [ base GLFW-b newtype OpenGL vector-space Yampa ]; - jailbreak = true; homepage = "https://github.com/deepfire/yampa-glfw"; description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library"; license = stdenv.lib.licenses.gpl3; @@ -184275,7 +178183,6 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ base gloss random Yampa ]; - jailbreak = true; homepage = "https://github.com/ksaveljev/yampa-2048"; description = "2048 game clone using Yampa/Gloss"; license = stdenv.lib.licenses.mit; @@ -184321,9 +178228,9 @@ self: { version = "0.2"; sha256 = "d18417aca635b9806f437c9476a80fa7633463185b06ff6e28ce3e2813299892"; libraryHaskellDepends = [ base ]; - jailbreak = true; description = "yet another prelude - a simplistic refactoring with algebraic classes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yarr" = callPackage @@ -184350,9 +178257,9 @@ self: { sha256 = "3da00b3cef4d86c9d8cf9ac768da3fc062cec7e2a1f8ad30f9b02c2e0cffb5f2"; libraryHaskellDepends = [ base yarr ]; librarySystemDepends = [ libdevil ]; - jailbreak = true; description = "Image IO for Yarr library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) libdevil;}; "yate" = callPackage @@ -184370,7 +178277,6 @@ self: { testHaskellDepends = [ attoparsec base hspec mtl unordered-containers vector ]; - jailbreak = true; description = "Yet Another Template Engine"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -184446,10 +178352,10 @@ self: { aeson base bytestring containers hspec http-client http-client-tls http-types network stm text unordered-containers ]; - jailbreak = true; homepage = "http://yellerapp.com"; description = "A Yeller Client For Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yes-precure5-command" = callPackage @@ -184546,44 +178452,12 @@ self: { base blaze-html containers directory hjsmin mtl resourcet shakespeare template-haskell text transformers yesod yesod-core ]; - jailbreak = true; homepage = "https://github.com/tolysz/yesod-angular-ui"; description = "Angular Helpers"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-auth_1_4_13_3" = 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.13.3"; - sha256 = "38380dcc421848882e1f0c4bdc01b24f8a007748ee1354185c0bff52aada5344"; - 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 - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Authentication for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth" = callPackage ({ mkDerivation, aeson, authenticate, base, base16-bytestring , base64-bytestring, binary, blaze-builder, blaze-html @@ -184613,31 +178487,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-auth-account_1_4_2" = callPackage - ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger - , mtl, nonce, persistent, persistent-sqlite, pwstore-fast - , resourcet, text, xml-conduit, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-account"; - version = "1.4.2"; - sha256 = "38d5c5795a6acb487f408b0bd7ab3fd874f3d99c5df94202dcbb436847e7eef3"; - libraryHaskellDepends = [ - base blaze-html bytestring mtl nonce persistent pwstore-fast text - yesod-auth yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - base bytestring hspec monad-logger mtl persistent-sqlite resourcet - text xml-conduit yesod yesod-auth yesod-test - ]; - jailbreak = true; - homepage = "https://bitbucket.org/wuzzeb/yesod-auth-account"; - description = "An account authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -184681,7 +178530,6 @@ self: { base bytestring hspec monad-logger mtl persistent-sqlite resourcet text xml-conduit yesod yesod-auth yesod-test ]; - jailbreak = true; homepage = "https://github.com/meteficha/yesod-auth-account-fork"; description = "An account authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; @@ -184739,10 +178587,10 @@ self: { http-conduit http-types template-haskell text time transformers yesod-auth yesod-core ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/yesod-auth-deskcom"; description = "Desk.com remote authentication support for Yesod apps."; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-fb" = callPackage @@ -184759,36 +178607,9 @@ self: { shakespeare text time transformers wai yesod-auth yesod-core yesod-fb ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/yesod-auth-fb"; description = "Authentication backend for Yesod using Facebook"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "yesod-auth-hashdb_1_5_1_1" = callPackage - ({ mkDerivation, base, basic-prelude, bytestring, containers - , cryptohash, hspec, http-conduit, http-types, monad-logger - , network-uri, persistent, persistent-sqlite, pwstore-fast - , resourcet, text, wai-extra, yesod, yesod-auth, yesod-core - , yesod-form, yesod-persistent, yesod-test - }: - mkDerivation { - pname = "yesod-auth-hashdb"; - version = "1.5.1.1"; - sha256 = "399d76adbee53b80af091b360ebe61ef8e013e13fc40226d0464f7076865bc23"; - libraryHaskellDepends = [ - base bytestring cryptohash persistent pwstore-fast text yesod-auth - yesod-core yesod-form yesod-persistent - ]; - testHaskellDepends = [ - base basic-prelude bytestring containers hspec http-conduit - http-types monad-logger network-uri persistent-sqlite resourcet - text wai-extra yesod yesod-auth yesod-core yesod-test - ]; - jailbreak = true; - homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; - description = "Authentication plugin for Yesod"; - license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -184801,8 +178622,8 @@ self: { }: mkDerivation { pname = "yesod-auth-hashdb"; - version = "1.5.1.2"; - sha256 = "95937003779f9024c65f960022dafcd125b28ae4de24b5b7be66b1dd9d4d5a66"; + version = "1.5.1.3"; + sha256 = "ea455c6cb2c60de6254860ed1b8d29f8e73154c24db3e2edbfc0090f728b051a"; libraryHaskellDepends = [ base bytestring cryptohash persistent pwstore-fast text yesod-auth yesod-core yesod-form yesod-persistent @@ -184815,6 +178636,7 @@ self: { homepage = "https://github.com/paul-rouse/yesod-auth-hashdb"; description = "Authentication plugin for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-kerberos" = callPackage @@ -184830,10 +178652,10 @@ self: { authenticate-kerberos base bytestring shakespeare text transformers yesod-auth yesod-core yesod-form ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Kerberos Authentication for Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-auth-ldap" = callPackage @@ -184848,7 +178670,6 @@ self: { authenticate-ldap base bytestring hamlet LDAP text transformers yesod-auth yesod-core yesod-form ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "LDAP Authentication for Yesod"; license = stdenv.lib.licenses.bsd3; @@ -184905,28 +178726,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yesod-auth-oauth2_0_1_10" = callPackage - ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 - , hspec, http-client, http-conduit, http-types, lifted-base - , network-uri, random, text, transformers, vector, yesod-auth - , yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-auth-oauth2"; - version = "0.1.10"; - sha256 = "90b3748945e1661311d2ca791f82df8fcb0172e4266f5751374340686eb6e72b"; - libraryHaskellDepends = [ - aeson authenticate base bytestring hoauth2 http-client http-conduit - http-types lifted-base network-uri random text transformers vector - yesod-auth yesod-core yesod-form - ]; - testHaskellDepends = [ base hspec ]; - homepage = "http://github.com/thoughtbot/yesod-auth-oauth2"; - description = "OAuth 2.0 authentication plugins"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-auth-oauth2" = callPackage ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2 , hspec, http-client, http-conduit, http-types, lifted-base @@ -184996,43 +178795,9 @@ self: { http-conduit http-types template-haskell text time transformers wai yesod-auth yesod-core ]; - jailbreak = true; homepage = "https://github.com/prowdsponsor/yesod-auth-zendesk"; description = "Zendesk remote authentication support for Yesod apps"; license = stdenv.lib.licenses.bsd3; - }) {}; - - "yesod-bin_1_4_18_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, ghc, ghc-paths, http-client, http-conduit - , http-reverse-proxy, http-types, lifted-base, network - , optparse-applicative, parsec, process, project-template - , resourcet, shakespeare, split, streaming-commons, tar - , template-haskell, text, time, transformers, transformers-compat - , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls - , yaml, zlib - }: - mkDerivation { - pname = "yesod-bin"; - version = "1.4.18.2"; - sha256 = "4cfd0c6bb3a77e7d126a17e9d11fc50325afdb89c8ed04b9692f1e7948724151"; - 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 ghc ghc-paths http-client - http-conduit http-reverse-proxy http-types lifted-base network - optparse-applicative parsec process project-template resourcet - shakespeare split streaming-commons tar template-haskell text time - transformers transformers-compat 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; }) {}; @@ -185050,8 +178815,8 @@ self: { }: mkDerivation { pname = "yesod-bin"; - version = "1.4.18.3"; - sha256 = "404f145f6dc46df6a196002810608715bc192163a2b9a8fc191bcc82e0ce2b13"; + version = "1.4.18.7"; + sha256 = "ff75fc8bc7b37d6960436dab4a97697bc172d5092f5125b23791c8efdd01ed96"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -185104,7 +178869,6 @@ self: { persistent template-haskell text time wai yesod yesod-auth yesod-form yesod-markdown ]; - jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-comments"; description = "A generic comments interface for a Yesod application"; license = stdenv.lib.licenses.bsd3; @@ -185154,47 +178918,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-core_1_4_22" = callPackage - ({ mkDerivation, aeson, async, 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, 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.22"; - sha256 = "21329336daff5825005efa5905a305e764f2db95e0e43e5d0f0a85fac8bcf124"; - 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 - ]; - homepage = "http://www.yesodweb.com/"; - description = "Creation of type-safe, RESTful web applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-core" = callPackage ({ mkDerivation, aeson, async, auto-update, base, blaze-builder , blaze-html, blaze-markup, byteable, bytestring, case-insensitive @@ -185210,8 +178933,8 @@ self: { }: mkDerivation { pname = "yesod-core"; - version = "1.4.24"; - sha256 = "3472469f56e8d5b280389bc40247f6bc1bc42da6e2b87e6865780ae93127b0d2"; + version = "1.4.25"; + sha256 = "929b881c3bddf7f868ba44d8aed72e36163affb6f455dd0f4669c8451fe6c46b"; libraryHaskellDepends = [ aeson auto-update base blaze-builder blaze-html blaze-markup byteable bytestring case-insensitive cereal clientsession conduit @@ -185248,7 +178971,6 @@ self: { base classy-prelude containers MissingH monad-control persistent random safe stm uuid yesod-core yesod-form yesod-persistent ]; - jailbreak = true; homepage = "https://github.com/league/yesod-crud"; description = "Generic administrative CRUD operations as a Yesod subsite"; license = stdenv.lib.licenses.bsd3; @@ -185282,8 +179004,8 @@ self: { }: mkDerivation { pname = "yesod-csp"; - version = "0.2.0.0"; - sha256 = "3804bdbc7b2f40a707c0af2bd6c2586abdc49c0f2eada5b24c488ed126e37280"; + version = "0.2.1.0"; + sha256 = "068357f7a3f6f6e6593730a556d84a5c1643e37b492d5486f4387dd111494e95"; libraryHaskellDepends = [ attoparsec base mono-traversable network-uri semigroups syb template-haskell text uniplate yesod yesod-core @@ -185319,7 +179041,6 @@ self: { template-haskell test-framework test-framework-hunit test-framework-quickcheck2 text transformers ]; - jailbreak = true; homepage = "http://github.com/tlaitinen/yesod-datatables"; description = "Yesod plugin for DataTables (jQuery grid plugin)"; license = stdenv.lib.licenses.bsd3; @@ -185398,7 +179119,6 @@ self: { yesod-core yesod-static ]; executableSystemDepends = [ sqlite ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Example programs using the Yesod Web Framework. (deprecated)"; license = stdenv.lib.licenses.bsd3; @@ -185542,7 +179262,6 @@ self: { base blaze-html bytestring directory HTTP old-locale pandoc pureMD5 text time yesod yesod-form ]; - jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-goodies"; description = "A collection of various small helpers useful in any yesod application"; license = stdenv.lib.licenses.bsd3; @@ -185568,23 +179287,24 @@ self: { }) {}; "yesod-job-queue" = callPackage - ({ mkDerivation, aeson, api-field-json-th, base, bytestring - , classy-prelude-yesod, cron, file-embed, hedis, lens, monad-logger - , stm, text, time, uuid, yesod + ({ mkDerivation, aeson, api-field-json-th, base, bytestring, cron + , file-embed, hedis, lens, monad-control, monad-logger, stm, text + , time, transformers, uuid, yesod, yesod-core, yesod-persistent }: mkDerivation { pname = "yesod-job-queue"; - version = "0.3.0.0"; - sha256 = "34da4826fd12624cf0d93f72e16a7722cc7510dcf37381bed89cc8bfabe42912"; + version = "0.3.0.1"; + sha256 = "a58805e218e5b0e6c623a5447f06484004d72a357f4b2e30d476da56618b734f"; libraryHaskellDepends = [ - aeson api-field-json-th base bytestring classy-prelude-yesod cron - file-embed hedis lens monad-logger stm text time uuid yesod + aeson api-field-json-th base bytestring cron file-embed hedis lens + monad-control monad-logger stm text time transformers uuid yesod + yesod-core yesod-persistent ]; testHaskellDepends = [ base ]; - doHaddock = false; homepage = "https://github.com/nakaji-dayo/yesod-job-queue#readme"; description = "Background jobs library for Yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-json" = callPackage @@ -185606,7 +179326,6 @@ self: { version = "0.3.0"; sha256 = "3e982d5e4ae6fd337339c1548e1d32a885d51881a3ba50c4b917a5cd1f252b44"; libraryHaskellDepends = [ base text yesod-core ]; - jailbreak = true; homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links"; description = "A typeclass which simplifies creating link widgets throughout your site"; license = stdenv.lib.licenses.bsd3; @@ -185745,30 +179464,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-persistent_1_4_0_5" = 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.0.5"; - sha256 = "e5ad890ca4d4c0499ae08e5e1e294f4c1435e9395ba1ba9bb3acf3982eb8d2c2"; - 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 - ]; - jailbreak = true; - homepage = "http://www.yesodweb.com/"; - description = "Some helpers for using Persistent from Yesod"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-persistent" = callPackage ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent , persistent-sqlite, persistent-template, resource-pool, resourcet @@ -185856,7 +179551,6 @@ self: { yesod-auth yesod-auth-hashdb yesod-core yesod-form yesod-persistent yesod-routes yesod-static yesod-test ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Meta package for Yesod (deprecated)"; license = stdenv.lib.licenses.mit; @@ -185879,7 +179573,6 @@ self: { executableHaskellDepends = [ aeson base shakespeare text transformers yesod yesod-form ]; - jailbreak = true; homepage = "https://github.com/cutsea110/yesod-pnotify"; description = "Yet another getMessage/setMessage using pnotify jquery plugins"; license = stdenv.lib.licenses.bsd3; @@ -185893,7 +179586,6 @@ self: { version = "0.1.0.2"; sha256 = "efb7a83712493ec4b1002eb9bf850e7597470d3fd0f820d8f082755b26dc7d6c"; libraryHaskellDepends = [ base fast-logger text yesod yesod-core ]; - jailbreak = true; homepage = "https://github.com/snoyberg/yesod-pure"; description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)"; license = stdenv.lib.licenses.mit; @@ -185915,7 +179607,6 @@ self: { mtl purescript regex-tdfa regex-tdfa-text shakespeare system-fileio system-filepath template-haskell text time transformers yesod-core ]; - jailbreak = true; homepage = "https://github.com/mpietrzak/yesod-purescript"; description = "PureScript integration for Yesod"; license = stdenv.lib.licenses.mit; @@ -186044,7 +179735,6 @@ self: { base bytestring containers hspec HUnit path-pieces template-haskell text ]; - jailbreak = true; homepage = "http://www.yesodweb.com/"; description = "Efficient routing for Yesod. (deprecated)"; license = stdenv.lib.licenses.mit; @@ -186066,6 +179756,7 @@ self: { homepage = "https://github.com/frontrowed/yesod-routes-flow"; description = "Generate Flow routes for Yesod"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-routes-typescript" = callPackage @@ -186098,7 +179789,6 @@ self: { base blaze-html directory hamlet pandoc persistent text xss-sanitize yesod-core yesod-form ]; - jailbreak = true; homepage = "http://github.com/pSub/yesod-rst"; description = "Tools for using reStructuredText (RST) in a yesod application"; license = "GPL"; @@ -186135,9 +179825,9 @@ self: { base data-default hsass shakespeare template-haskell text yesod-core ]; - jailbreak = true; description = "A simple quasiquoter to include sass code in yesod"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yesod-session-redis" = callPackage @@ -186176,42 +179866,6 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "yesod-static_1_5_0_3" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring - , blaze-builder, byteable, bytestring, conduit, conduit-extra - , containers, cryptohash, cryptohash-conduit, css-text - , data-default, directory, file-embed, filepath, hashable, hjsmin - , hspec, http-types, HUnit, mime-types, old-time, process - , resourcet, template-haskell, text, transformers, unix-compat - , unordered-containers, wai, wai-app-static, wai-extra, yesod-core - , yesod-test - }: - mkDerivation { - pname = "yesod-static"; - version = "1.5.0.3"; - sha256 = "a46f952593fc36323aba1352b4b7a2703bb609ec19b709447268e7be24f8ce74"; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring blaze-builder byteable - bytestring conduit conduit-extra containers cryptohash - cryptohash-conduit css-text data-default directory file-embed - filepath hashable hjsmin http-types mime-types old-time process - resourcet template-haskell text transformers unix-compat - unordered-containers wai wai-app-static yesod-core - ]; - testHaskellDepends = [ - async base base64-bytestring byteable bytestring conduit - conduit-extra containers cryptohash cryptohash-conduit data-default - directory file-embed filepath hjsmin hspec http-types HUnit - mime-types old-time process resourcet template-haskell text - 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; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-static" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring , blaze-builder, byteable, bytestring, conduit, conduit-extra @@ -186266,7 +179920,6 @@ self: { base bytestring hamlet hspec HUnit shakespeare template-haskell text yesod-core yesod-static yesod-test ]; - doCheck = false; homepage = "https://bitbucket.org/wuzzeb/yesod-static-angular"; description = "Yesod generators for embedding AngularJs code into yesod-static at compile time"; license = stdenv.lib.licenses.mit; @@ -186300,33 +179953,6 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "yesod-test_1_5_1_1" = 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, text, time, transformers, wai - , wai-extra, xml-conduit, xml-types, yesod-core, yesod-form - }: - mkDerivation { - pname = "yesod-test"; - version = "1.5.1.1"; - sha256 = "0886927c92ddc59608902c6fb02b8e8b9e631120dd6e75db764a95b5a75b0160"; - 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 text time - transformers wai wai-extra xml-conduit xml-types yesod-core - ]; - testHaskellDepends = [ - base bytestring containers hspec html-conduit http-types HUnit - lifted-base text wai xml-conduit yesod-core yesod-form - ]; - homepage = "http://www.yesodweb.com"; - description = "integration testing for WAI/Yesod Applications"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yesod-test" = callPackage ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html , blaze-markup, bytestring, case-insensitive, containers, cookie @@ -186367,7 +179993,6 @@ self: { aeson base bytestring conduit hspec http-types HUnit text transformers wai wai-test yesod-default ]; - jailbreak = true; homepage = "https://github.com/bogiebro/yesod-test-json"; description = "Utility functions for testing JSON web services written in Yesod"; license = stdenv.lib.licenses.bsd3; @@ -186448,7 +180073,6 @@ self: { base blaze-html hamlet monad-logger persistent persistent-sqlite resourcet text yesod yesod-form ]; - jailbreak = true; homepage = "https://github.com/Tener/yesod-vend"; description = "Simple CRUD classes for easy view creation for Yesod"; license = stdenv.lib.licenses.bsd3; @@ -186587,6 +180211,30 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi_0_13_1" = callPackage + ({ mkDerivation, base, microlens-platform, mtl + , optparse-applicative, yi-core, yi-frontend-pango, yi-frontend-vty + , yi-keymap-emacs, yi-keymap-vim, yi-misc-modes, yi-mode-haskell + , yi-mode-javascript, yi-rope + }: + mkDerivation { + pname = "yi"; + version = "0.13.1"; + sha256 = "78e1140fd9d4ca2f880bb621c18325845dfbc54a9a213cf1fb7715c6741c4c08"; + configureFlags = [ "-fpango" "-fvty" ]; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base microlens-platform mtl optparse-applicative yi-core + yi-frontend-pango yi-frontend-vty yi-keymap-emacs yi-keymap-vim + yi-misc-modes yi-mode-haskell yi-mode-javascript yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-contrib" = callPackage ({ mkDerivation, base, containers, directory, filepath, lens, mtl , old-locale, oo-prototypes, split, text, time, transformers-base @@ -186601,13 +180249,48 @@ self: { oo-prototypes split text time transformers-base yi yi-language yi-rope ]; - jailbreak = true; homepage = "http://haskell.org/haskellwiki/Yi"; description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = stdenv.lib.licenses.gpl2; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "yi-core" = callPackage + ({ mkDerivation, array, attoparsec, base, binary, bytestring + , containers, data-default, directory, dlist, dynamic-state, dyre + , exceptions, filepath, hashable, Hclip, ListLike + , microlens-platform, mtl, old-locale, oo-prototypes, parsec + , pointedlist, process, process-extras, safe, semigroups, split + , tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time + , transformers-base, unix, unix-compat, unordered-containers + , word-trie, xdg-basedir, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-core"; + version = "0.13.1"; + sha256 = "df42e9b6bd3d2546ef972e088734a9d2394617cef4d63512c8a24cdb8396062e"; + libraryHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state dyre exceptions filepath hashable + Hclip ListLike microlens-platform mtl old-locale oo-prototypes + parsec pointedlist process process-extras safe semigroups split + text text-icu time transformers-base unix unix-compat + unordered-containers word-trie xdg-basedir yi-language yi-rope + ]; + testHaskellDepends = [ + array attoparsec base binary bytestring containers data-default + directory dlist dynamic-state dyre exceptions filepath hashable + Hclip ListLike microlens-platform mtl old-locale oo-prototypes + parsec pointedlist process process-extras safe semigroups split + tasty tasty-hunit tasty-quickcheck text text-icu time + transformers-base unix unix-compat unordered-containers word-trie + xdg-basedir yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor core library"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "yi-emacs-colours" = callPackage ({ mkDerivation, base, containers, split, yi-language }: mkDerivation { @@ -186620,6 +180303,43 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-frontend-pango" = callPackage + ({ mkDerivation, base, containers, filepath, glib, gtk + , microlens-platform, mtl, oo-prototypes, pango, pointedlist, text + , transformers-base, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-frontend-pango"; + version = "0.13.1"; + sha256 = "897fae1674b6564ce54ad016a2e35e1cd771cc16f464933a6dc9fcc63ff3b279"; + libraryHaskellDepends = [ + base containers filepath glib gtk microlens-platform mtl + oo-prototypes pango pointedlist text transformers-base yi-core + yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Pango frontend for Yi editor"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-frontend-vty" = callPackage + ({ mkDerivation, base, containers, data-default, dlist + , microlens-platform, pointedlist, stm, text, vty, yi-core + , yi-language + }: + mkDerivation { + pname = "yi-frontend-vty"; + version = "0.13.1"; + sha256 = "38dc95447ea4baf8780ad21f6bdd8f1bfe6883e23baf2993d8c026782d51d06e"; + libraryHaskellDepends = [ + base containers data-default dlist microlens-platform pointedlist + stm text vty yi-core yi-language + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vty frontend for Yi editor"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "yi-fuzzy-open" = callPackage ({ mkDerivation, base, binary, containers, data-default, directory , filepath, mtl, text, transformers-base, vector, yi, yi-language @@ -186650,6 +180370,89 @@ self: { license = "GPL"; }) {}; + "yi-ireader" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, data-default + , microlens-platform, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-ireader"; + version = "0.13.1"; + sha256 = "222212c92f7271f62dd297a4298ec51b326c08bcbe515e97ede3a9fd4cc23131"; + libraryHaskellDepends = [ + base binary bytestring containers data-default microlens-platform + text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor incremental reader"; + license = stdenv.lib.licenses.gpl2; + }) {}; + + "yi-keymap-cua" = callPackage + ({ mkDerivation, base, microlens-platform, text, yi-core + , yi-keymap-emacs, yi-rope + }: + mkDerivation { + pname = "yi-keymap-cua"; + version = "0.13.1"; + sha256 = "2f35799c34970675b0f381db7d5ba77b32ad05f76ee21d30fe8233599f02c38a"; + libraryHaskellDepends = [ + base microlens-platform text yi-core yi-keymap-emacs yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Cua keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-keymap-emacs" = callPackage + ({ mkDerivation, base, containers, filepath, Hclip + , microlens-platform, mtl, oo-prototypes, semigroups, text + , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope + }: + mkDerivation { + pname = "yi-keymap-emacs"; + version = "0.13.1"; + sha256 = "dcb51f973325e9c7dfc6db781886ecd4b7f4761a8d1a88b1443ab457b4bf3f3d"; + libraryHaskellDepends = [ + base containers filepath Hclip microlens-platform mtl oo-prototypes + semigroups text transformers-base yi-core yi-language yi-misc-modes + yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Emacs keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-keymap-vim" = callPackage + ({ mkDerivation, attoparsec, base, binary, containers, data-default + , directory, filepath, Hclip, microlens-platform, mtl + , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty + , tasty-hunit, tasty-quickcheck, text, transformers-base + , unordered-containers, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-keymap-vim"; + version = "0.13.1"; + sha256 = "16913f6be574a6a4705dc3736fdfe7a3b3f4e3f4e1127d846fe510495410d85b"; + libraryHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist safe + semigroups text transformers-base unordered-containers yi-core + yi-language yi-rope + ]; + testHaskellDepends = [ + attoparsec base binary containers data-default directory filepath + Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck + safe semigroups tasty tasty-hunit tasty-quickcheck text + transformers-base unordered-containers yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Vim keymap for Yi editor"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-language" = callPackage ({ mkDerivation, alex, array, base, binary, containers , data-default, filepath, hashable, hspec, microlens-platform @@ -186676,6 +180479,99 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-language_0_13_1" = callPackage + ({ mkDerivation, alex, array, base, binary, containers + , data-default, hashable, microlens-platform, oo-prototypes + , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, transformers-base + , unordered-containers + }: + mkDerivation { + pname = "yi-language"; + version = "0.13.1"; + sha256 = "22ab333ec6bbeba4da562996a4783f20437b2383639e5f1fa144d98369a6c747"; + libraryHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform oo-prototypes pointedlist regex-base regex-tdfa + template-haskell transformers-base unordered-containers + ]; + libraryToolDepends = [ alex ]; + testHaskellDepends = [ + array base binary containers data-default hashable + microlens-platform oo-prototypes pointedlist regex-base regex-tdfa + tasty tasty-hspec tasty-quickcheck template-haskell + transformers-base unordered-containers + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Collection of language-related Yi libraries"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-misc-modes" = callPackage + ({ mkDerivation, array, base, binary, data-default, filepath + , microlens-platform, semigroups, text, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-misc-modes"; + version = "0.13.1"; + sha256 = "12ebcb20d106dcab4da2588f0d8ef357cecea52a35ff1b6e1eb197287c58d06e"; + libraryHaskellDepends = [ + array base binary data-default filepath microlens-platform + semigroups text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor miscellaneous modes"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-mode-haskell" = callPackage + ({ mkDerivation, array, base, binary, containers, data-default + , filepath, hashable, hspec, microlens-platform, pointedlist + , QuickCheck, regex-base, regex-tdfa, template-haskell, text + , transformers-base, unordered-containers, yi-core, yi-language + , yi-rope + }: + mkDerivation { + pname = "yi-mode-haskell"; + version = "0.13.1"; + sha256 = "55e78a4323eec19aab49d473fa9b5a874cb56e8bbb137756b8048696b75bab9e"; + libraryHaskellDepends = [ + array base binary data-default microlens-platform text yi-core + yi-language yi-rope + ]; + testHaskellDepends = [ + array base binary containers data-default filepath hashable hspec + microlens-platform pointedlist QuickCheck regex-base regex-tdfa + template-haskell text transformers-base unordered-containers + yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor haskell mode"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "yi-mode-javascript" = callPackage + ({ mkDerivation, array, base, binary, data-default, dlist, filepath + , microlens-platform, mtl, text, yi-core, yi-language, yi-rope + }: + mkDerivation { + pname = "yi-mode-javascript"; + version = "0.13.1"; + sha256 = "fdbad8e3fc6de90aaade5cda3881d161284fcc97b6e88c493d0005eb3923b990"; + libraryHaskellDepends = [ + array base binary data-default dlist filepath microlens-platform + mtl text yi-core yi-language yi-rope + ]; + homepage = "https://github.com/yi-editor/yi#readme"; + description = "Yi editor javascript mode"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-monokai" = callPackage ({ mkDerivation, base, yi }: mkDerivation { @@ -186688,27 +180584,6 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "yi-rope_0_7_0_1" = callPackage - ({ mkDerivation, base, binary, bytestring, charsetdetect-ae - , data-default, deepseq, fingertree, hspec, QuickCheck - , quickcheck-instances, text, text-icu - }: - mkDerivation { - pname = "yi-rope"; - version = "0.7.0.1"; - sha256 = "e0d56d061a7b5e44d0b82290e7c03ef0c5cf278071c8264a23feb7bd725919a4"; - libraryHaskellDepends = [ - base binary bytestring charsetdetect-ae data-default deepseq - fingertree text text-icu - ]; - testHaskellDepends = [ - base hspec QuickCheck quickcheck-instances text - ]; - description = "A rope data structure used by Yi"; - license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "yi-rope" = callPackage ({ mkDerivation, base, binary, bytestring, charsetdetect-ae , data-default, deepseq, fingertree, hspec, QuickCheck @@ -186729,6 +180604,27 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "yi-rope_0_8" = callPackage + ({ mkDerivation, base, binary, bytestring, charsetdetect-ae + , data-default, deepseq, fingertree, hspec, QuickCheck + , quickcheck-instances, text, text-icu + }: + mkDerivation { + pname = "yi-rope"; + version = "0.8"; + sha256 = "eacf45e10fe3ee541db2d44e2c5092a530087a84a608eff0f0348bf60f32144e"; + libraryHaskellDepends = [ + base binary bytestring charsetdetect-ae data-default deepseq + fingertree text text-icu + ]; + testHaskellDepends = [ + base hspec QuickCheck quickcheck-instances text + ]; + description = "A rope data structure used by Yi"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yi-snippet" = callPackage ({ mkDerivation, base, containers, yi, yi-rope }: mkDerivation { @@ -186760,10 +180656,10 @@ self: { version = "0.1"; sha256 = "d8ecaf71704c295944ae6648685a6b00d3787911b1763b0213629840bad05e94"; libraryHaskellDepends = [ base yi ]; - jailbreak = true; homepage = "https://github.com/melrief/yi-spolsky"; description = "Spolsky colour theme for the Yi text editor"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yi-vty" = callPackage @@ -186837,7 +180733,6 @@ self: { base directory ftphs haskeline mtl process unix ]; executableHaskellDepends = [ hsConfigure ]; - jailbreak = true; homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml"; description = "CUI FTP client like 'ftp', 'ncftp'"; license = "GPL"; @@ -186853,10 +180748,10 @@ self: { isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory ftphs mtl process unix ]; - jailbreak = true; homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml"; description = "CUI FTP client like 'ftp', 'ncftp'"; license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yjsvg" = callPackage @@ -186866,9 +180761,9 @@ self: { version = "0.2.0.0"; sha256 = "4841c8f1120ba253c616ff48cffd63d2ca7ba87127bc428b5fa5fc7d6dbe6f17"; libraryHaskellDepends = [ base HaXml ]; - jailbreak = true; description = "make SVG string from Haskell data"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yjtools" = callPackage @@ -186907,10 +180802,10 @@ self: { version = "0.1.0.0"; sha256 = "d70739d3429dede8800290939dbd08d0e23cacb5717402ba93f931fa80e1335d"; libraryHaskellDepends = [ base free mtl ]; - jailbreak = true; homepage = "https://github.com/mniip/yoctoparsec"; description = "A truly tiny monadic parsing library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yoko" = callPackage @@ -186981,7 +180876,6 @@ self: { executableHaskellDepends = [ base containers ecma262 exceptions hxt opendatatable ]; - jailbreak = true; homepage = "https://github.com/fabianbergmark/YQL"; description = "A YQL engine to execute Open Data Tables"; license = stdenv.lib.licenses.bsd2; @@ -187213,7 +181107,6 @@ self: { http-types monad-logger mtl pem template-haskell text time tls transformers unordered-containers x509 x509-store x509-validation ]; - jailbreak = true; homepage = "https://github.com/VictorDenisov/zendesk-api"; description = "Zendesk API for Haskell programming language"; license = stdenv.lib.licenses.mit; @@ -187375,7 +181268,6 @@ self: { base Cabal derive directory filepath haskell-src-exts hskeleton monoid-record process syb template-haskell ]; - jailbreak = true; description = "ZeroTH - remove unnecessary TH dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -187417,6 +181309,7 @@ self: { homepage = "https://github.com/robbinch/zim-parser#readme"; description = "Read and parse ZIM files"; license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zip" = callPackage @@ -187438,35 +181331,11 @@ self: { base bytestring conduit containers exceptions filepath hspec path path-io QuickCheck text time transformers ]; - doCheck = false; homepage = "https://github.com/mrkkrp/zip"; description = "Operations on zip archives"; license = stdenv.lib.licenses.bsd3; }) {}; - "zip-archive_0_2_3_7" = callPackage - ({ mkDerivation, array, base, binary, bytestring, containers - , digest, directory, filepath, HUnit, mtl, old-time, pretty - , process, text, time, unix, zip, zlib - }: - mkDerivation { - pname = "zip-archive"; - version = "0.2.3.7"; - sha256 = "41623b3831795e785329b017f42af3116f6332a690361f7eac7ed15f729f3699"; - libraryHaskellDepends = [ - array base binary bytestring containers digest directory filepath - mtl old-time pretty text time unix zlib - ]; - testHaskellDepends = [ - base bytestring directory HUnit old-time process time - ]; - testToolDepends = [ zip ]; - homepage = "http://github.com/jgm/zip-archive"; - description = "Library for creating and modifying zip archives"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) zip;}; - "zip-archive" = callPackage ({ mkDerivation, array, base, binary, bytestring, containers , digest, directory, filepath, HUnit, mtl, old-time, pretty @@ -187474,8 +181343,8 @@ self: { }: mkDerivation { pname = "zip-archive"; - version = "0.3.0.4"; - sha256 = "67a463b23e1694ad7d4d1f6815b009288c9b585bc411eb1754396b830eba8f92"; + version = "0.3.0.5"; + sha256 = "dc83366e44d735df4088eb174c02c35a522e6228c04fecc35fe9493299fc97c7"; libraryHaskellDepends = [ array base binary bytestring containers digest directory filepath mtl old-time pretty text time unix zlib @@ -187510,10 +181379,10 @@ self: { base bytestring conduit directory filepath hpc HUnit mtl resourcet temporary test-framework test-framework-hunit time ]; - jailbreak = true; homepage = "https://github.com/tymmym/zip-conduit"; description = "Working with zip archives via conduits"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zipedit" = callPackage @@ -187540,10 +181409,10 @@ self: { libraryHaskellDepends = [ base bytestring mersenne-random-pure64 mtl safe ]; - jailbreak = true; homepage = "https://github.com/srijs/haskell-zipkin"; description = "Zipkin-style request tracing monad"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zipper" = callPackage @@ -187613,8 +181482,6 @@ self: { testHaskellDepends = [ base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck ]; - jailbreak = true; - doCheck = false; description = "Compression and decompression in the gzip and zlib formats"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; @@ -187658,10 +181525,10 @@ self: { libraryHaskellDepends = [ base bytestring enumerator transformers zlib-bindings ]; - jailbreak = true; homepage = "http://github.com/maltem/zlib-enum"; description = "Enumerator interface for zlib compression"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zlib-lens" = callPackage @@ -187717,10 +181584,10 @@ self: { aeson base binary containers data-ordlist deepseq deepseq-generics directory filepath mtl parallel-io text zmidi-core ]; - jailbreak = true; homepage = "https://bitbucket.org/bash/zmidi-score"; description = "Representing MIDI a simple score"; license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "zmqat" = callPackage @@ -187748,7 +181615,6 @@ self: { version = "0.5"; sha256 = "1e693e02e977fbc727b0485bfadd3751982f6730b79d79ac8c41a5a3189247d8"; libraryHaskellDepends = [ base time ]; - jailbreak = true; description = "ZoneInfo library"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -187768,7 +181634,6 @@ self: { executableHaskellDepends = [ base directory filepath ghc hint mtl ]; - jailbreak = true; homepage = "http://github.com/iand675/Zoom"; description = "A rake/thor-like task runner written in Haskell"; license = stdenv.lib.licenses.bsd3; @@ -187802,7 +181667,6 @@ self: { base blaze-builder iteratee QuickCheck random test-framework test-framework-quickcheck2 transformers type-level unix ]; - jailbreak = true; description = "A streamable, seekable, zoomable cache file format"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -187820,7 +181684,6 @@ self: { base blaze-builder bytestring containers iteratee ListLike mtl type-level zoom-cache ]; - jailbreak = true; description = "Library for zoom-cache PCM audio codecs"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -187841,7 +181704,6 @@ self: { base bytestring containers data-default hsndfile hsndfile-vector mtl ui-command vector zoom-cache zoom-cache-pcm ]; - jailbreak = true; description = "Tools for generating zoom-cache-pcm files"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; @@ -187912,8 +181774,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "zxcvbn-c"; - version = "1.0.0"; - sha256 = "9db674641107eccc606f26b3a2163657ab4335e1b0c65f00d5ddf23f9bfb1a03"; + version = "1.0.1"; + sha256 = "3352ee167fb8a161a72d2e2cc09ff6a0ca4fa2b8bc7575a06471a315dd81028d"; libraryHaskellDepends = [ base ]; description = "Password strength estimation"; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh index 471b2c81584..223d19b70f0 100644 --- a/pkgs/development/haskell-modules/hoogle-local-wrapper.sh +++ b/pkgs/development/haskell-modules/hoogle-local-wrapper.sh @@ -2,4 +2,4 @@ COMMAND=$1 shift -exec @hoogle@/bin/hoogle "$COMMAND" -d @out@/share/doc/hoogle "$@" +exec @hoogle@/bin/hoogle "$COMMAND" --database @out@/share/doc/hoogle/default.hoo "$@" diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix index 3cb1efbce73..bf7fd18f820 100644 --- a/pkgs/development/haskell-modules/hoogle.nix +++ b/pkgs/development/haskell-modules/hoogle.nix @@ -23,7 +23,7 @@ # This will build mmorph and monadControl, and have the hoogle installation # refer to their documentation via symlink so they are not garbage collected. -{ lib, stdenv, hoogle, rehoo, writeText +{ lib, stdenv, hoogle, writeText , ghc, packages ? [ ghc.ghc ] }: @@ -54,7 +54,7 @@ let in stdenv.mkDerivation { name = "hoogle-local-0.1"; - buildInputs = [hoogle rehoo]; + buildInputs = [ghc hoogle]; phases = [ "buildPhase" ]; @@ -68,22 +68,11 @@ stdenv.mkDerivation { mkdir -p $out/share/doc/hoogle - function import_dbs() { - find $1 -name '*.txt' | while read f; do - newname=$(basename "$f" | tr '[:upper:]' '[:lower:]') - if [[ -f $f && ! -f ./$newname ]]; then - cp -p $f "./$newname" - hoogle convert -d "$(dirname $f)" "./$newname" - fi - done - } - echo importing builtin packages for docdir in ${ghc.doc}/${docLibGlob}/*; do name="$(basename $docdir)" ${opts isGhcjs ''docdir="$docdir/html"''} if [[ -d $docdir ]]; then - import_dbs $docdir ln -sfn $docdir $out/share/doc/hoogle/$name fi done @@ -92,10 +81,9 @@ stdenv.mkDerivation { for i in $docPackages; do if [[ ! $i == $out ]]; then for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do - name=`basename $docdir` + name="$(basename $docdir)" docdir=$docdir/html if [[ -d $docdir ]]; then - import_dbs $docdir ln -sfn $docdir $out/share/doc/hoogle/$name fi done @@ -103,13 +91,7 @@ stdenv.mkDerivation { done echo building hoogle database - # FIXME: rehoo is marked as depricated on Hackage - chmod 644 *.hoo *.txt - rehoo -j$NIX_BUILD_CORES -c64 . - - mv default.hoo .x - rm -fr downloads *.dep *.txt *.hoo - mv .x $out/share/doc/hoogle/default.hoo + hoogle generate --database $out/share/doc/hoogle/default.hoo --local=$out/share/doc/hoogle echo building haddock index # adapted from GHC's gen_contents_index diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index e96200578de..246a9f305db 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -62,6 +62,8 @@ rec { doHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = true; }); dontHyperlinkSource = drv: overrideCabal drv (drv: { hyperlinkSource = false; }); + disableHardening = drv: flags: overrideCabal drv (drv: { hardeningDisable = flags; }); + sdistTarball = pkg: pkgs.lib.overrideDerivation pkg (drv: { name = "${drv.pname}-source-${drv.version}"; buildPhase = "./Setup sdist"; diff --git a/pkgs/development/haskell-modules/patches/spy.patch b/pkgs/development/haskell-modules/patches/spy.patch deleted file mode 100644 index 4c4e1844361..00000000000 --- a/pkgs/development/haskell-modules/patches/spy.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/Spy/Watcher.hs b/src/Spy/Watcher.hs - index 8512613..4df67d4 100644 ---- a/src/Spy/Watcher.hs -+++ b/src/Spy/Watcher.hs -@@ -50,7 +50,7 @@ plainFormat = Plain - spy :: Spy -> IO b -> IO () - spy config after = withManager $ \wm -> - runIndefinitely -- (watchTree wm (decodeString $ dir config) -+ (watchTree wm (dir config) - (not . skipEvent config . eventPath) - (handleEvent config)) - (const after) -@@ -106,9 +106,9 @@ eventTime (Modified _ t) = t - eventTime (Removed _ t) = t - - eventPath :: Event -> FilePath --eventPath (Added fp _) = encodeString fp --eventPath (Modified fp _) = encodeString fp --eventPath (Removed fp _) = encodeString fp -+eventPath (Added fp _) = fp -+eventPath (Modified fp _) = fp -+eventPath (Removed fp _) = fp - - eventType :: Event -> FilePath - eventType (Added _ _) = "Added" diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix index 95ab68c5f42..3d0ea511e10 100644 --- a/pkgs/development/idris-modules/default.nix +++ b/pkgs/development/idris-modules/default.nix @@ -6,7 +6,7 @@ overrideScope = f: callPackageWithScope (mkScope (fix' (extends f scope.__unfix__))) drv args; }; - mkScope = scope : pkgs // pkgs.xorg // pkgs.gnome // scope; + mkScope = scope : pkgs // pkgs.xorg // pkgs.gnome2 // scope; idrisPackages = self: let defaultScope = mkScope self; diff --git a/pkgs/development/idris-modules/lightyear.nix b/pkgs/development/idris-modules/lightyear.nix new file mode 100644 index 00000000000..11afd4ebe76 --- /dev/null +++ b/pkgs/development/idris-modules/lightyear.nix @@ -0,0 +1,32 @@ +{ build-idris-package +, fetchFromGitHub +, prelude +, base +, effects +, lib +, idris +}: + +let + date = "2016-08-01"; +in +build-idris-package { + name = "lightyear-${date}"; + + src = fetchFromGitHub { + owner = "ziman"; + repo = "lightyear"; + rev = "9420f9e892e23a7016dea1a61d8ce43a6d4ecf15"; + sha256 = "0xbjwq7sk4x78mi2zcqxbx7wziijlr1ayxihb1vml33lqmsgl1dn"; + }; + + propagatedBuildInputs = [ prelude base effects ]; + + meta = { + description = "Parser combinators for Idris"; + homepage = https://github.com/ziman/lightyear; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.siddharthist ]; + inherit (idris.meta) platforms; + }; +} diff --git a/pkgs/development/idris-modules/wl-pprint.nix b/pkgs/development/idris-modules/wl-pprint.nix index 66dd4cefe48..12e9b28d81c 100644 --- a/pkgs/development/idris-modules/wl-pprint.nix +++ b/pkgs/development/idris-modules/wl-pprint.nix @@ -4,25 +4,27 @@ , base , lib , idris -}: build-idris-package { - name = "wl-pprint"; +}: +build-idris-package { + name = "wl-pprint-2016-09-28"; src = fetchFromGitHub { owner = "shayan-najd"; repo = "wl-pprint"; - rev = "120f654b0b9838b57e10b163d3562d959439fb07"; - sha256 = "1yymdl251zla6hv9rcg06x73gbp6xb0n6f6a02bsy5fqfmrfngcl"; + rev = "4cc88a0865620a3b997863e4167d3b98e1a41b52"; + sha256 = "1yxxh366k5njad75r0xci2q5c554cddvzgrwk43b0xn8rq0vm11x"; }; + # The tests for this package fail. We should attempt to enable them when + # updating this package again. + doCheck = false; + propagatedBuildInputs = [ prelude base ]; meta = { description = "Wadler-Leijen pretty-printing library"; - homepage = https://github.com/shayan-najd/wl-pprint; - license = lib.licenses.bsd2; - inherit (idris.meta) platforms; }; } diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index b4a0b77e705..d1c8cf15fce 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.7"; + version = "0.7.3"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { inherit name; meta = { - homepage = "https://code.google.com/p/chibi-scheme/"; + homepage = "https://github.com/ashinn/chibi-scheme"; description = "Small Footprint Scheme for use as a C Extension Language"; platforms = stdenv.lib.platforms.all; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.DerGuteMoritz ]; }; - src = fetchurl { - url = "http://abrek.synthcode.com/${name}.tgz"; - sha256 = "1hhkq0khgi8i24xv66y7r6pgk1issn1i2bf7rv91rbk0wm0kv7qm"; + src = fetchFromGitHub { + owner = "ashinn"; + repo = "chibi-scheme"; + rev = version; + sha256 = "05b17flppkll1a2c2aq6lxh4iif4pjmpxmyrmiqzk0ls85gvai2x"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/eff/default.nix b/pkgs/development/interpreters/eff/default.nix index 566d7025e5c..9fc25ad46fd 100644 --- a/pkgs/development/interpreters/eff/default.nix +++ b/pkgs/development/interpreters/eff/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, ocaml, findlib, menhir, which }: +{ stdenv, fetchgit, ocaml, findlib, ocamlbuild, menhir, which }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0cqqrpvfw0nrk5d28mkzfvc8yzqxcss0k46bkmqhqjkqq886n2mm"; }; - buildInputs = [ ocaml findlib menhir which ]; + buildInputs = [ ocaml findlib ocamlbuild menhir which ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix index 0a8d41ed909..6999ee07e3d 100644 --- a/pkgs/development/interpreters/elixir/default.nix +++ b/pkgs/development/interpreters/elixir/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "elixir-${version}"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "elixir"; rev = "v${version}"; - sha256 = "0dib7j81vgbi0npn13jj19rbrsn66cr0rm05hnhkqz6dixz96xcy"; + sha256 = "1l4ff3awil1nzrgd4pv4bx6n9ml83ci4czplv03yfz18q7jbipq2"; }; buildInputs = [ erlang rebar makeWrapper ]; diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 02f9d1f98e8..ed30fe1522b 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -23,9 +23,9 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport [ mesa wxGTK xorg.libX11 ] - ++ optional odbcSupport [ unixODBC ] - ++ optional stdenv.isDarwin [ Carbon Cocoa ]; + ] ++ optionals wxSupport [ mesa wxGTK xorg.libX11 ] + ++ optional odbcSupport unixODBC + ++ optionals stdenv.isDarwin [ Carbon Cocoa ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; diff --git a/pkgs/development/interpreters/erlang/R19.nix b/pkgs/development/interpreters/erlang/R19.nix index 1cd68221fa7..ddeccb29b59 100644 --- a/pkgs/development/interpreters/erlang/R19.nix +++ b/pkgs/development/interpreters/erlang/R19.nix @@ -20,7 +20,7 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}" + "${optionalString javacSupport "-javac"}"; - version = "19.0.2"; + version = "19.1"; # Minor OTP releases are not always released as tarbals at # http://erlang.org/download/ So we have to download from @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "erlang"; repo = "otp"; rev = "OTP-${version}"; - sha256 = "1vsykghhzpgmc42jwj48crl11zzzpvrqvh2lk8lxfqbflzflxm6j"; + sha256 = "0nnjj069d5pjhgcd8vvqbrkjdac3p1v4s3zb59i4h73vg7f5p736"; }; buildInputs = @@ -42,15 +42,6 @@ stdenv.mkDerivation rec { debugInfo = enableDebugInfo; - envAndCpPatch = fetchurl { - url = "https://github.com/binarin/otp/commit/9f9841eb7327c9fe73e84e197fd2965a97b639cf.patch"; - sha256 = "10h5348p6g279b4q01i5jdqlljww5chcvrx5b4b0dv79pk0p0m9f"; - }; - - patches = [ - envAndCpPatch - ]; - preConfigure = '' ./otp_build autoconf ''; diff --git a/pkgs/development/interpreters/lua-4/default.nix b/pkgs/development/interpreters/lua-4/default.nix index d6f385f5b50..a89f4b1e5d7 100644 --- a/pkgs/development/interpreters/lua-4/default.nix +++ b/pkgs/development/interpreters/lua-4/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://www.lua.org/ftp/lua-4.0.1.tar.gz; - md5 = "a31d963dbdf727f9b34eee1e0d29132c"; + sha256 = "0ajd906hasii365xdihv9mdmi3cixq758blx0289x4znkha6wx6z"; }; configurePhase = "sed -i -e 's/CFLAGS= -O2/CFLAGS = -O3 -fPIC/' config"; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 62568c40c78..a39e79badb6 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url="mirror://sourceforge/project/lush/lush2/lush-2.0.1.tar.gz"; - sha256="02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; + sha256 = "02pkfn3nqdkm9fm44911dbcz0v3r0l53vygj8xigl6id5g3iwi4k"; }; buildInputs = [ diff --git a/pkgs/development/interpreters/lush/default.upstream b/pkgs/development/interpreters/lush/default.upstream index 6a3b3a8357c..4a94595f772 100644 --- a/pkgs/development/interpreters/lush/default.upstream +++ b/pkgs/development/interpreters/lush/default.upstream @@ -1,3 +1,4 @@ url http://sourceforge.net/projects/lush/files/lush2/ version_link '[.]tar[.]gz/download$' SF_redirect +minimize_overwrite diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 278191bf839..b8359488725 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, clang }: stdenv.mkDerivation rec { - name = "mujs-2016-02-22"; + name = "mujs-2016-09-21"; src = fetchgit { url = git://git.ghostscript.com/mujs.git; - rev = "624f975aae6b451e35406d8cdde808626052ce2c"; - sha256 = "0cab7x73v380wklpkbrc1k4iyh4q2jyx3zxbymlfi1spmrpn6skl"; + rev = "5c337af4b3df80cf967e4f9f6a21522de84b392a"; + sha256 = "1x5g6nycggc83md2dbr2nahjbkkmmn64bg25a8hih7z72sw41dgw"; }; buildInputs = [ clang ]; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 9ae5865b0d7..ae8256dfaea 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -2,7 +2,7 @@ , mysql, libxml2, readline, zlib, curl, postgresql, gettext , openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype , libxslt, libmcrypt, bzip2, icu, openldap, cyrus_sasl, libmhash, freetds -, uwimap, pam, gmp, apacheHttpd, libiconv }: +, uwimap, pam, gmp, apacheHttpd, libiconv, systemd }: let @@ -19,11 +19,12 @@ let enableParallelBuilding = true; - buildInputs = [ flex bison pkgconfig ]; + buildInputs = [ flex bison pkgconfig systemd ]; configureFlags = [ "EXTENSION_DIR=$(out)/lib/php/extensions" - ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}"; + ] ++ lib.optional stdenv.isDarwin "--with-iconv=${libiconv}" + ++ lib.optional stdenv.isLinux "--with-fpm-systemd"; flags = { @@ -270,7 +271,7 @@ let done [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags + ./configure --with-config-file-scan-dir=/etc/php.d --with-config-file-path=$out/etc --prefix=$out $configureFlags ''; postInstall = '' @@ -300,12 +301,12 @@ let in { php56 = generic { - version = "5.6.25"; - sha256 = "1pldn4z7pzcjm8li9xryrniz5cz542cbv4nlrr13wzzdmhr61kjq"; + version = "5.6.26"; + sha256 = "0dk2ifn50iv8jvw2jyw2pr9xqnkksxfv9qbpay84na54hf0anynl"; }; php70 = generic { - version = "7.0.10"; - sha256 = "1ppn17n5klhs1b2mcbbxxiqq4xvdbmv8p866q0qnk61nlzjvnmc0"; + version = "7.0.11"; + sha256 = "1wgpkfzpiap29nxjzqjjvpgirpg61n61xbqq9f25i60lq6fp56zr"; }; } diff --git a/pkgs/development/interpreters/python/cpython/2.6/default.nix b/pkgs/development/interpreters/python/cpython/2.6/default.nix index 5311be697af..64f2b80d09f 100644 --- a/pkgs/development/interpreters/python/cpython/2.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.6/default.nix @@ -8,10 +8,14 @@ with stdenv.lib; let majorVersion = "2.6"; - version = "${majorVersion}.9"; + minorVersion = "9"; + minorVersionSuffix = ""; + pythonVersion = majorVersion; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "0hbfs2691b60c7arbysbzr0w9528d5pl8a4x7mq5psh6a2cvprya"; }; @@ -90,16 +94,19 @@ let paxmark E $out/bin/python${majorVersion} + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"} ''; passthru = rec { + inherit libPrefix; inherit zlibSupport; isPy2 = true; isPy26 = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python26Packages; }; - libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 5f15db26ebc..4c28e977b49 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, self, callPackage, python27Packages +{ stdenv, fetchurl, fetchpatch, self, callPackage, python27Packages , bzip2, openssl, gettext , includeModules ? false @@ -22,10 +22,14 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.12"; + minorVersion = "12"; + minorVersionSuffix = ""; + pythonVersion = majorVersion; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "0y7rl603vmwlxm6ilkhc51rx2mfj14ckcz40xxgs0ljnvlhp30yp"; }; @@ -44,6 +48,14 @@ let ./deterministic-build.patch ./properly-detect-curses.patch + + # FIXME: get rid of this after the next release, when the commit referenced here makes + # it in. We need it until then because it breaks compilation of programs that use + # locale with clang 3.8 and higher. + (fetchpatch { + url = "https://hg.python.org/cpython/raw-rev/e0ec3471cb09"; + sha256 = "1jdgb70jw942r4kmr01qll7mk1di8jx0qiabmp20jhnmha246ivq"; + }) ] ++ optionals stdenv.isLinux [ # Disable the use of ldconfig in ctypes.util.find_library (since @@ -150,18 +162,21 @@ let paxmark E $out/bin/python${majorVersion} + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py + ${optionalString includeModules "$out/bin/python ./setup.py build_ext"} rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev ''; passthru = rec { + inherit libPrefix; inherit zlibSupport; isPy2 = true; isPy27 = true; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python27Packages; }; - libPrefix = "python${majorVersion}"; executable = libPrefix; sitePackages = "lib/${libPrefix}/site-packages"; interpreter = "${self}/bin/${executable}"; diff --git a/pkgs/development/interpreters/python/cpython/3.3/default.nix b/pkgs/development/interpreters/python/cpython/3.3/default.nix index cb48186a69e..3be1209b636 100644 --- a/pkgs/development/interpreters/python/cpython/3.3/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.3/default.nix @@ -21,8 +21,11 @@ with stdenv.lib; let majorVersion = "3.3"; + minorVersion = "6"; + minorVersionSuffix = ""; pythonVersion = majorVersion; - version = "${majorVersion}.6"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; buildInputs = filter (p: p != null) [ zlib bzip2 lzma gdbm sqlite db readline ncurses openssl tcl tk libX11 xproto @@ -37,7 +40,7 @@ stdenv.mkDerivation { inherit buildInputs; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "0gsxpgd5p4mwd01gw501vsyahncyw3h9836ypkr3y32kgazy89jj"; }; @@ -71,17 +74,20 @@ stdenv.mkDerivation { touch $out/lib/python${majorVersion}/test/__init__.py ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; passthru = rec { + inherit libPrefix; zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python3.3m"; + executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python33Packages; }; isPy3 = true; diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix index 2e7d3a03141..78f5972e10f 100644 --- a/pkgs/development/interpreters/python/cpython/3.4/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix @@ -23,9 +23,11 @@ with stdenv.lib; let majorVersion = "3.4"; + minorVersion = "5"; + minorVersionSuffix = ""; pythonVersion = majorVersion; - version = "${majorVersion}.5"; - fullVersion = "${version}"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; buildInputs = filter (p: p != null) [ zlib @@ -45,14 +47,14 @@ let in stdenv.mkDerivation { - name = "python3-${fullVersion}"; + name = "python3-${version}"; pythonVersion = majorVersion; inherit majorVersion version; inherit buildInputs; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; + url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; sha256 = "12l9klp778wklxmckhghniy5hklss8r26995pyd00qbllk4b2r7f"; }; @@ -95,17 +97,20 @@ stdenv.mkDerivation { ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; passthru = rec { + inherit libPrefix; zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python3.4m"; + executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python34Packages; }; isPy3 = true; diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix index 69d3df32a32..84488e7e05c 100644 --- a/pkgs/development/interpreters/python/cpython/3.5/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix @@ -22,9 +22,11 @@ with stdenv.lib; let majorVersion = "3.5"; + minorVersion = "2"; + minorVersionSuffix = ""; pythonVersion = majorVersion; - version = "${majorVersion}.2"; - fullVersion = "${version}"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; buildInputs = filter (p: p != null) [ zlib @@ -42,14 +44,14 @@ let ] ++ optionals stdenv.isDarwin [ CF configd ]; in stdenv.mkDerivation { - name = "python3-${fullVersion}"; + name = "python3-${version}"; pythonVersion = majorVersion; inherit majorVersion version; inherit buildInputs; src = fetchurl { - url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; sha256 = "0h6a5fr7ram2s483lh0pnmc4ncijb8llnpfdxdcl5dxr01hza400"; }; @@ -92,6 +94,9 @@ stdenv.mkDerivation { ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; postFixup = '' @@ -106,14 +111,14 @@ stdenv.mkDerivation { ''; passthru = rec { + inherit libPrefix; zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = false; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python${majorVersion}m"; + executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python35Packages; }; isPy3 = true; diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix index 3a6635cd8b6..1d2ee98bb85 100644 --- a/pkgs/development/interpreters/python/cpython/3.6/default.nix +++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix @@ -24,9 +24,11 @@ with stdenv.lib; let majorVersion = "3.6"; + minorVersion = "0"; + minorVersionSuffix = "b2"; pythonVersion = majorVersion; - version = "${majorVersion}.0a3"; - fullVersion = "${version}"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; + libPrefix = "python${majorVersion}"; buildInputs = filter (p: p != null) [ glibc @@ -46,15 +48,15 @@ let ] ++ optionals stdenv.isDarwin [ CF configd ]; in stdenv.mkDerivation { - name = "python3-${fullVersion}"; + name = "python3-${version}"; pythonVersion = majorVersion; inherit majorVersion version; inherit buildInputs; src = fetchurl { - url = "https://www.python.org/ftp/python/${majorVersion}.0/Python-${fullVersion}.tar.xz"; - sha256 = "08c3598bwihibwca9lwxq923sjq9shvgv3wxv4vkga2n6hf63l1c"; + url = "https://www.python.org/ftp/python/${majorVersion}.${minorVersion}/Python-${version}.tar.xz"; + sha256 = "1sk990n2xm5vhn3ys2cp427dx0z14cx3sz1za5f2fcwrp524bz9s"; }; NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s"; @@ -73,8 +75,6 @@ stdenv.mkDerivation { export MACOSX_DEPLOYMENT_TARGET=10.6 ''} - substituteInPlace ./Lib/plat-generic/regen --replace "/usr/include" ${glibc.dev}/include - configureFlagsArray=( --enable-shared --with-threads CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}" LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}" @@ -98,17 +98,20 @@ stdenv.mkDerivation { ln -s "$out/include/python${majorVersion}m" "$out/include/python${majorVersion}" paxmark E $out/bin/python${majorVersion} + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; passthru = rec { + inherit libPrefix; zlibSupport = zlib != null; sqliteSupport = sqlite != null; dbSupport = db != null; readlineSupport = readline != null; opensslSupport = openssl != null; tkSupport = (tk != null) && (tcl != null) && (libX11 != null) && (xproto != null); - libPrefix = "python${majorVersion}"; - executable = "python${majorVersion}m"; + executable = "${libPrefix}m"; buildEnv = callPackage ../../wrapper.nix { python = self; }; withPackages = import ../../with-packages.nix { inherit buildEnv; pythonPackages = python36Packages; }; isPy3 = true; diff --git a/pkgs/development/interpreters/python/pypy/2.7/default.nix b/pkgs/development/interpreters/python/pypy/2.7/default.nix index 213f5dabe79..7e11ac89b16 100644 --- a/pkgs/development/interpreters/python/pypy/2.7/default.nix +++ b/pkgs/development/interpreters/python/pypy/2.7/default.nix @@ -5,9 +5,11 @@ assert zlibSupport -> zlib != null; let - - majorVersion = "5.4.0"; - version = "${majorVersion}"; + majorVersion = "5.4"; + minorVersion = "1"; + minorVersionSuffix = ""; + pythonVersion = "2.7"; + version = "${majorVersion}.${minorVersion}${minorVersionSuffix}"; libPrefix = "pypy${majorVersion}"; pypy = stdenv.mkDerivation rec { @@ -18,7 +20,7 @@ let src = fetchurl { url = "https://bitbucket.org/pypy/pypy/get/release-pypy${pythonVersion}-v${version}.tar.bz2"; - sha256 = "1jm4ak6rbqhdhm8gjbd5hanabskbyzhzvjcl93fj0i017yirw88i"; + sha256 = "1x8sa5x1nkrb8wrmicri94ji8kvyxihyryi8br5fk7gak0agcai0"; }; # http://bugs.python.org/issue27369 @@ -32,14 +34,6 @@ let patch lib-python/2.7/test/test_pyexpat.py < '${expatch}' ''; - # Increase recursion limit. This patch is not needed on pypy > 5.4.0 - patches = [ - (fetchurl { - url = "https://bitbucket.org/pypy/pypy/commits/a5db0f4359abb3f64b6d7ed83202e1cb0de37fb2/raw/"; - sha256 = "07nvqjhj0kl67f3kjwhmybaqg6089ps3q8r0si1lgk3gyb56ygn0"; - }) - ]; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl xlibsWrapper libX11 makeWrapper gdbm db ] ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; @@ -121,6 +115,9 @@ let # verify cffi modules $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" + + # Python on Nix is not manylinux1 compatible. https://github.com/NixOS/nixpkgs/issues/18484 + echo "manylinux1_compatible=False" >> $out/lib/${libPrefix}/_manylinux.py ''; passthru = rec { diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix index ba39965cb35..b4bd532dc1d 100644 --- a/pkgs/development/interpreters/python/wrapper.nix +++ b/pkgs/development/interpreters/python/wrapper.nix @@ -8,7 +8,7 @@ let recursivePthLoader = import ../../python-modules/recursive-pth-loader/default.nix { stdenv = stdenv; python = python; }; env = ( let - paths = stdenv.lib.filter (x : x ? pythonPath) (stdenv.lib.closePropagation extraLibs) ++ [ python recursivePthLoader ]; + paths = stdenv.lib.closePropagation (extraLibs ++ [ python recursivePthLoader ] ) ; in buildEnv { name = "${python.name}-env"; diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 6ab527b7ccf..8e462ffaacc 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeFontsConf, makeWrapper , cairo, coreutils, fontconfig, freefont_ttf -, glib, gmp, gtk, libffi, libjpeg, libpng +, glib, gmp, gtk2, libffi, libjpeg, libpng , libtool, mpfr, openssl, pango, poppler , readline, sqlite , disableDocs ? true @@ -17,7 +17,7 @@ let fontconfig glib gmp - gtk + gtk2 libjpeg libpng mpfr diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix index bdeb5d02065..7126a5140c3 100644 --- a/pkgs/development/interpreters/ruby/default.nix +++ b/pkgs/development/interpreters/ruby/default.nix @@ -1,32 +1,35 @@ -{ stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub +{ stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , zlib, openssl, gdbm, ncurses, readline, groff, libyaml, libffi, autoreconfHook, bison , autoconf, darwin ? null , buildEnv, bundler, bundix } @ args: let - op = stdenv.lib.optional; - ops = stdenv.lib.optionals; - opString = stdenv.lib.optionalString; + op = lib.optional; + ops = lib.optionals; + opString = lib.optionalString; patchSet = import ./rvm-patchsets.nix { inherit fetchFromGitHub; }; config = import ./config.nix { inherit fetchFromSavannah; }; rubygemsSrc = import ./rubygems-src.nix { inherit fetchurl; }; + rubygemsPatch = fetchpatch { + url = "https://github.com/zimbatm/rubygems/compare/v2.6.6...v2.6.6-nix.patch"; + sha256 = "0297rdb1m6v75q8665ry9id1s74p9305dv32l95ssf198liaihhd"; + }; unpackdir = obj: lib.removeSuffix ".tgz" (lib.removeSuffix ".tar.gz" obj.name); - generic = { majorVersion, minorVersion, teenyVersion, patchLevel, sha256 }: let - versionNoPatch = "${majorVersion}.${minorVersion}.${teenyVersion}"; - version = "${versionNoPatch}-p${patchLevel}"; - fullVersionName = if patchLevel != "0" && stdenv.lib.versionOlder versionNoPatch "2.1" - then version - else versionNoPatch; - tag = "v" + stdenv.lib.replaceChars ["." "p" "-"] ["_" "_" ""] fullVersionName; - isRuby20 = majorVersion == "2" && minorVersion == "0"; - isRuby21 = majorVersion == "2" && minorVersion == "1"; + # Contains the ruby version heuristics + rubyVersion = import ./ruby-version.nix { inherit lib; }; + + generic = { version, sha256 }: let + ver = version; + tag = ver.gitTag; + isRuby20 = ver.majMin == "2.0"; + isRuby21 = ver.majMin == "2.1"; baseruby = self.override { useRailsExpress = false; }; self = lib.makeOverridable ( - { stdenv, lib, fetchurl, fetchFromSavannah, fetchFromGitHub + { stdenv, lib, fetchurl, fetchpatch, fetchFromSavannah, fetchFromGitHub , useRailsExpress ? true , zlib, zlibSupport ? true , openssl, opensslSupport ? true @@ -46,13 +49,11 @@ let rev = tag; sha256 = sha256.git; } else fetchurl { - url = "http://cache.ruby-lang.org/pub/ruby/${majorVersion}.${minorVersion}/ruby-${fullVersionName}.tar.gz"; + url = "http://cache.ruby-lang.org/pub/ruby/${ver.majMin}/ruby-${ver}.tar.gz"; sha256 = sha256.src; }; in stdenv.mkDerivation rec { - inherit version; - name = "ruby-${version}"; srcs = [ rubySrc rubygemsSrc ]; @@ -85,13 +86,16 @@ let hardeningDisable = lib.optional isRuby20 [ "format" ]; patches = - [ ./gem_hook.patch ] ++ (import ./patchsets.nix { - inherit patchSet useRailsExpress ops patchLevel; - })."${versionNoPatch}"; + inherit patchSet useRailsExpress ops; + patchLevel = ver.patchLevel; + })."${ver.majMinTiny}"; postUnpack = '' cp -r ${unpackdir rubygemsSrc} ${sourceRoot}/rubygems + pushd ${sourceRoot}/rubygems + patch -p1 < ${rubygemsPatch} + popd '' + opString isRuby21 '' rm "$sourceRoot/enc/unicode/name2ctype.h" ''; @@ -152,25 +156,28 @@ let }; passthru = rec { - inherit majorVersion minorVersion teenyVersion patchLevel version; + version = ver; rubyEngine = "ruby"; baseRuby = baseruby; - libPath = "lib/${rubyEngine}/${versionNoPatch}"; - gemPath = "lib/${rubyEngine}/gems/${versionNoPatch}"; + libPath = "lib/${rubyEngine}/${ver.libDir}"; + gemPath = "lib/${rubyEngine}/gems/${ver.libDir}"; devEnv = import ./dev.nix { inherit buildEnv bundler bundix; ruby = self; }; + + # deprecated 2016-09-21 + majorVersion = ver.major; + minorVersion = ver.minor; + teenyVersion = ver.tiny; + patchLevel = ver.patchLevel; }; } ) args; in self; in { ruby_1_9_3 = generic { - majorVersion = "1"; - minorVersion = "9"; - teenyVersion = "3"; - patchLevel = "551"; + version = rubyVersion "1" "9" "3" "p551"; sha256 = { src = "1s2ibg3s2iflzdv7rfxi1qqkvdbn2dq8gxdn0nxrb77ls5ffanxv"; git = "1r9xzzxmci2ajb34qb4y1w424mz878zdgzxkfp9w60agldxnb36s"; @@ -178,10 +185,7 @@ in { }; ruby_2_0_0 = generic { - majorVersion = "2"; - minorVersion = "0"; - teenyVersion = "0"; - patchLevel = "647"; + version = rubyVersion "2" "0" "0" "p647"; sha256 = { src = "1v2vbvydarcx5801gx9lc6gr6dfi0i7qbzwhsavjqbn79rdsz2n8"; git = "186pf4q9xymzn4zn1sjppl1skrl5f0159ixz5cz8g72dmmynq3g3"; @@ -189,10 +193,7 @@ in { }; ruby_2_1_10 = generic { - majorVersion = "2"; - minorVersion = "1"; - teenyVersion = "10"; - patchLevel = "0"; + version = rubyVersion "2" "1" "10" ""; sha256 = { src = "086x66w51lg41abjn79xb7f6xsryymkcc3nvakmkjnjyg96labpv"; git = "133phd5r5y0np5lc9nqif93l7yb13yd52aspyl6c46z5jhvhyvfi"; @@ -200,10 +201,7 @@ in { }; ruby_2_2_5 = generic { - majorVersion = "2"; - minorVersion = "2"; - teenyVersion = "5"; - patchLevel = "0"; + version = rubyVersion "2" "2" "5" ""; sha256 = { src = "1qrmlcyc0cy9hgafb1wny2h90rjyyh6d72nvr2h4xjm4jwbb7i1h"; git = "0k0av6ypyq08c9axm721f0xi2bcp1443l7ydbxv4v8x4vsxdkmq2"; @@ -211,10 +209,7 @@ in { }; ruby_2_3_1 = generic { - majorVersion = "2"; - minorVersion = "3"; - teenyVersion = "1"; - patchLevel = "0"; + version = rubyVersion "2" "3" "1" ""; sha256 = { src = "1kbxg72las93w0y553cxv3lymy2wvij3i3pg1y9g8aq3na676z5q"; git = "0dv1rf5f9lj3icqs51bq7ljdcf17sdclmxm9hilwxps5l69v5q9r"; diff --git a/pkgs/development/interpreters/ruby/gem_hook.patch b/pkgs/development/interpreters/ruby/gem_hook.patch deleted file mode 100644 index 78ff9ddbb1a..00000000000 --- a/pkgs/development/interpreters/ruby/gem_hook.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/rubygems/lib/rubygems/installer.rb b/rubygems/lib/rubygems/installer.rb -index a88d393..8612901 100644 ---- a/rubygems/lib/rubygems/installer.rb -+++ b/rubygems/lib/rubygems/installer.rb -@@ -766,7 +766,15 @@ TEXT - # Ensures that files can't be installed outside the gem directory. - - def extract_files -- @package.extract_files gem_dir -+ ret = @package.extract_files gem_dir -+ if ENV['NIX_POST_EXTRACT_FILES_HOOK'] -+ puts -+ puts "running NIX_POST_EXTRACT_FILES_HOOK #{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{gem_dir}" -+ system("#{ENV['NIX_POST_EXTRACT_FILES_HOOK']} #{gem_dir}") -+ puts "running NIX_POST_EXTRACT_FILES_HOOK done" -+ puts -+ end -+ ret - end - - ## diff --git a/pkgs/development/interpreters/ruby/ruby-version.nix b/pkgs/development/interpreters/ruby/ruby-version.nix new file mode 100644 index 00000000000..b1cbbfc216d --- /dev/null +++ b/pkgs/development/interpreters/ruby/ruby-version.nix @@ -0,0 +1,63 @@ +# Contains the ruby version heuristics +{ lib }: +with lib; +let + # The returned set should be immutable + rubyVersion = major: minor: tiny: tail: + rec { + inherit major minor tiny tail; + + # Contains the patch number "223" if tail is "p223" or null + patchLevel = + let + p = removePrefix "p" tail; + isPosInt = num: + 0 == stringLength + (replaceStrings + ["0" "1" "2" "3" "4" "5" "6" "7" "8" "9"] + ["" "" "" "" "" "" "" "" "" "" ] + num); + in + if hasPrefix "p" tail && isPosInt p then p + else null; + + # Shortcuts + majMin = "${major}.${minor}"; + majMinTiny = "${major}.${minor}.${tiny}"; + + # Ruby separates lib and gem folders by ABI version which isn't very + # consistent. + libDir = + if versionAtLeast majMinTiny "2.1.0" then + "${majMin}.0" + else if versionAtLeast majMinTiny "2.0.0" then + "2.0.0" + else if versionAtLeast majMinTiny "1.9.1" then + "1.9.1" + else + throw "version ${majMinTiny} is not supported"; + + # How ruby releases are tagged on github.com/ruby/ruby + gitTag = + let + base = "v${major}_${minor}_${tiny}"; + in + if patchLevel != null then + "${base}_${patchLevel}" + else + if tail != "" then + "${base}_${tail}" + else + base; + + # Implements the builtins.toString interface. + __toString = self: + self.majMinTiny + ( + if self.patchLevel != null then + "-p${self.patchLevel}" + else if self.tail != "" then + "-${self.tail}" + else ""); + }; +in + rubyVersion diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix index d9cc7775d09..a2ecfb2ef97 100644 --- a/pkgs/development/interpreters/spidermonkey/17.0.nix +++ b/pkgs/development/interpreters/spidermonkey/17.0.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, nspr, perl, python, zip, libffi, readline }: +{ stdenv, fetchurl, pkgconfig, nspr, perl, python2, zip, libffi, readline }: stdenv.mkDerivation rec { version = "17.0.0"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; - buildInputs = [ pkgconfig perl python zip libffi readline ]; + buildInputs = [ pkgconfig perl python2 zip libffi readline ]; postUnpack = "sourceRoot=\${sourceRoot}/js/src"; diff --git a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch b/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch deleted file mode 100644 index f5d9e569502..00000000000 --- a/pkgs/development/libraries/accountsservice/Add-nixbld-to-user-blacklist.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e069102365a9ff03822667f435e662f938e8d768 Mon Sep 17 00:00:00 2001 -From: Alexander Ried -Date: Wed, 1 Jun 2016 12:49:48 +0200 -Subject: [PATCH] Add nixbld* to user blacklist - ---- - src/user-classify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/user-classify.c b/src/user-classify.c -index 69e6809..0e152b6 100644 ---- a/src/user-classify.c -+++ b/src/user-classify.c -@@ -75,6 +75,10 @@ user_classify_is_blacklisted (const char *username) - return TRUE; - } - -+ if (g_str_has_prefix (username, "nixbld")) { -+ return TRUE; -+ } -+ - return FALSE; - } - --- -2.7.4 - diff --git a/pkgs/development/libraries/accountsservice/default.nix b/pkgs/development/libraries/accountsservice/default.nix index 2dc6b57c339..1a49913727d 100644 --- a/pkgs/development/libraries/accountsservice/default.nix +++ b/pkgs/development/libraries/accountsservice/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "accountsservice-${version}"; - version = "0.6.42"; + version = "0.6.43"; src = fetchurl { url = "http://www.freedesktop.org/software/accountsservice/accountsservice-${version}.tar.xz"; - sha256 = "0zh0kjpdc631qh36plcgpwvnmh9wj8l5cki3aw5r09w6y7198r75"; + sha256 = "1k6n9079001sgcwlkq0bz6mkn4m8y4dwf6hs1qm85swcld5ajfzd"; }; buildInputs = [ pkgconfig glib intltool libtool makeWrapper @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { patches = [ ./no-create-dirs.patch - ./Add-nixbld-to-user-blacklist.patch ./Disable-methods-that-change-files-in-etc.patch ]; diff --git a/pkgs/development/libraries/adns/default.nix b/pkgs/development/libraries/adns/default.nix index 745cdf746ec..88c8a900570 100644 --- a/pkgs/development/libraries/adns/default.nix +++ b/pkgs/development/libraries/adns/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl }: let - version = "1.5.0"; + version = "1.5.1"; in stdenv.mkDerivation { name = "adns-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { "ftp://ftp.chiark.greenend.org.uk/users/ian/adns/adns-${version}.tar.gz" "mirror://gnu/adns/adns-${version}.tar.gz" ]; - sha256 = "0hg89b5n84zjhzvbzrpvhl0hbm4s6d1z2pzllfis64ai656ypibz"; + sha256 = "1ssfh94ck6kn98nf2yy6743srpgqgd167va5ja3bwx42igqjc42v"; }; preConfigure = diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 8450def0845..caaa826ae67 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib , gtk_doc, autoconf, automake, libtool, libarchive, libyaml , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl -, libuuid, json_glib +, libuuid, json_glib, autoconf-archive }: stdenv.mkDerivation rec { - name = "appstream-glib-0.5.12"; + name = "appstream-glib-0.6.3"; src = fetchFromGitHub { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name; - sha256 = "00b0441f409vzgy0znn42k093w7hwv3495qvsakxnhvk1h1ws23s"; + sha256 = "12l0vzhi9vpyrnf7vrpq21rb26mb6yskp5zgngdjyjanwhzmc617"; }; - nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool ]; + nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool autoconf-archive ]; buildInputs = [ glib gtk_doc gettext sqlite libsoup gcab attr acl docbook_xsl libuuid json_glib libarchive libyaml gtk3 gobjectIntrospection ]; diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix index 81e8a8a52f9..1829b3306eb 100644 --- a/pkgs/development/libraries/apr-util/default.nix +++ b/pkgs/development/libraries/apr-util/default.nix @@ -43,11 +43,14 @@ stdenv.mkDerivation rec { ++ optional ldapSupport openldap ++ optional stdenv.isFreeBSD cyrus_sasl; - # Give apr1 access to sed for runtime invocations postInstall = '' for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do - substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib" + substituteInPlace $f \ + --replace "${expat.dev}/lib" "${expat.out}/lib" \ + --replace "${openssl.dev}/lib" "${openssl.out}/lib" done + + # Give apr1 access to sed for runtime invocations. wrapProgram $dev/bin/apu-1-config --prefix PATH : "${gnused}/bin" ''; diff --git a/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 70e7b1c33c0..9b6ba128512 100644 --- a/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gnutls, gtk, libgcrypt, pkgconfig, gettext, qt4 +{ stdenv, fetchurl, gnutls, gtk2, libgcrypt, pkgconfig, gettext, qt4 , pluginSearchPaths ? [ "/run/current-system/sw/lib/gwenhywfar/plugins" @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig gettext ]; - buildInputs = [ gtk qt4 gnutls libgcrypt ]; + buildInputs = [ gtk2 qt4 gnutls libgcrypt ]; QTDIR = qt4; diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index cda126218ba..fad8dc86bd1 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, libsndfile, pkgconfig, python }: +{ stdenv, fetchurl, gtk2, libsndfile, pkgconfig, python }: stdenv.mkDerivation rec { name = "lv2-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1saq0vwqy5zjdkgc5ahs8kcabxfmff2mmg68fiqrkv8hiw9m6jks"; }; - buildInputs = [ gtk libsndfile pkgconfig python ]; + buildInputs = [ gtk2 libsndfile pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix index a56425b8425..c74c8caa23f 100644 --- a/pkgs/development/libraries/audio/lvtk/default.nix +++ b/pkgs/development/libraries/audio/lvtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, gtkmm, lv2, pkgconfig, python }: +{ stdenv, fetchurl, boost, gtkmm2, lv2, pkgconfig, python }: stdenv.mkDerivation rec { name = "lvtk-${version}"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig python ]; - buildInputs = [ boost gtkmm lv2 ]; + buildInputs = [ boost gtkmm2 lv2 ]; + + enableParallelBuilding = true; # Fix including the boost libraries during linking postPatch = '' diff --git a/pkgs/development/libraries/audio/raul/default.nix b/pkgs/development/libraries/audio/raul/default.nix index 789846c15e7..97d7dd83155 100644 --- a/pkgs/development/libraries/audio/raul/default.nix +++ b/pkgs/development/libraries/audio/raul/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, boost, gtk, pkgconfig, python }: +{ stdenv, fetchsvn, boost, gtk2, pkgconfig, python }: stdenv.mkDerivation rec { name = "raul-svn-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0yvm3j57lch89dixx7zsip7pxsws0xxy1y6ck7a3l0534qc5kny4"; }; - buildInputs = [ boost gtk pkgconfig python ]; + buildInputs = [ boost gtk2 pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index f5a98750ded..518f89092ab 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: +{ stdenv, fetchurl, gtk2, lv2, pkgconfig, python, serd, sord, sratom, qt4 }: stdenv.mkDerivation rec { name = "suil-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq"; }; - buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; + buildInputs = [ gtk2 lv2 pkgconfig python qt4 serd sord sratom ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix index ab34f64dfbf..96b53e1ad63 100644 --- a/pkgs/development/libraries/blitz/default.nix +++ b/pkgs/development/libraries/blitz/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; buildInputs = [ pkgconfig gfortran texinfo ] - ++ optional (boost != null) [ boost.out ]; + ++ optional (boost != null) boost; configureFlags = [ "--enable-shared" diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix index 4e004da3217..71366ed32ad 100644 --- a/pkgs/development/libraries/botan/unstable.nix +++ b/pkgs/development/libraries/botan/unstable.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix (args // { baseVersion = "1.11"; - revision = "30"; - sha256 = "09d1cvg6dnfi225wipc1fw691bq7xxdcmgkq8smldc5kivf3mbwd"; + revision = "32"; + sha256 = "0b4wgqyv6accsdh7fgr9as34r38f8r9024i6s3vhah6wiah7kddn"; openssl = null; postPatch = "sed '1i#include ' -i src/tests/test_bigint.cpp"; }) diff --git a/pkgs/development/libraries/c-ares/default.nix b/pkgs/development/libraries/c-ares/default.nix index eb68a7b9a91..482cf9fdfad 100644 --- a/pkgs/development/libraries/c-ares/default.nix +++ b/pkgs/development/libraries/c-ares/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "c-ares-1.10.0"; + name = "c-ares-1.12.0"; src = fetchurl { url = "http://c-ares.haxx.se/download/${name}.tar.gz"; - sha256 = "1nyka87yf2jfd0y6sspll0yxwb8zi7kyvajrdbjmh4axc5s1cw1x"; + sha256 = "1yv5ygkd813glz8hbagykgp1hlb6450chig061hr7pyw7i0gk4l6"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 80f858254ff..97a97523260 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cmake }: +{ stdenv, fetchurl, bash }: stdenv.mkDerivation rec { name = "capstone-${version}"; @@ -9,7 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1whl5c8j6vqvz2j6ay2pyszx0jg8d3x8hq66cvgghmjchvsssvax"; }; - buildInputs = [ cmake ]; + configurePhase = '' patchShebangs make.sh ''; + buildPhase = '' ./make.sh ''; + installPhase = '' env PREFIX=$out ./make.sh install ''; + enableParallelBuilding = true; meta = { diff --git a/pkgs/development/libraries/cil-aterm/default.nix b/pkgs/development/libraries/cil-aterm/default.nix index e51bb3c2d4e..62d69f943af 100644 --- a/pkgs/development/libraries/cil-aterm/default.nix +++ b/pkgs/development/libraries/cil-aterm/default.nix @@ -9,4 +9,5 @@ stdenv.mkDerivation { patches = [./cil-aterm-1.3.6.patch]; buildInputs = [ ocaml perl ]; inherit ocaml perl; + meta.broken = true; } diff --git a/pkgs/development/libraries/clutter-gst/3.0.nix b/pkgs/development/libraries/clutter-gst/3.0.nix deleted file mode 100644 index c2bec3a7f1d..00000000000 --- a/pkgs/development/libraries/clutter-gst/3.0.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }: - -stdenv.mkDerivation rec { - major = "3.0"; - minor = "18"; - name = "clutter-gst-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz"; - sha256 = "14w0pi9myvcn1yxzmk9sk8dghj17m5ji3aqdpfjikk90c060vv0a"; - }; - - propagatedBuildInputs = [ clutter gtk3 glib cogl ]; - nativeBuildInputs = [ pkgconfig ]; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "GStreamer bindings for clutter"; - - homepage = http://www.clutter-project.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 7cef673dbc6..41c7f8db6d2 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,11 +1,13 @@ { fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }: stdenv.mkDerivation rec { - name = "clutter-gst-2.0.12"; + major = "3.0"; + minor = "20"; + name = "clutter-gst-${major}.${minor}"; src = fetchurl { - url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz"; - sha256 = "1dgzpd5l5ld622b8185c3khvvllm5hfvq4q1a1mgzhxhj8v4bwf2"; + url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz"; + sha256 = "1jb6q0f6vbh8nskz88siny70pm43wbnw2wzr2klsyb9axn3if0d0"; }; propagatedBuildInputs = [ clutter gtk3 glib cogl ]; diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix deleted file mode 100644 index d3754ecd6c6..00000000000 --- a/pkgs/development/libraries/clutter-gtk/0.10.8.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, clutter, gtk }: - -stdenv.mkDerivation rec { - name = "clutter-gtk-0.10.8"; - - src = fetchurl { - urls = [ - "http://download.gnome.org/sources/clutter-gtk/0.10/${name}.tar.bz2" - "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2" - ]; - sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq"; - }; - - propagatedBuildInputs = [ clutter gtk ]; - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Clutter-GTK"; - - homepage = http://www.clutter-project.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/development/libraries/clutter-gtk/1.4.nix b/pkgs/development/libraries/clutter-gtk/1.4.nix deleted file mode 100644 index e493bab1bc7..00000000000 --- a/pkgs/development/libraries/clutter-gtk/1.4.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: - -stdenv.mkDerivation rec { - name = "clutter-gtk-1.4.4"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz"; - sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"; - }; - - propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Clutter-GTK"; - - homepage = http://www.clutter-project.org/; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/development/libraries/clutter-gtk/1.6.nix b/pkgs/development/libraries/clutter-gtk/1.6.nix deleted file mode 100644 index 9c4e7ae1271..00000000000 --- a/pkgs/development/libraries/clutter-gtk/1.6.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: - -stdenv.mkDerivation rec { - name = "clutter-gtk-1.6.0"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/1.6/${name}.tar.xz"; - sha256 = "883550b574a036363239442edceb61cf3f6bedc8adc97d3404278556dc82234d"; - }; - - propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Clutter-GTK"; - homepage = http://www.clutter-project.org/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/development/libraries/clutter-gtk/1.8.nix b/pkgs/development/libraries/clutter-gtk/1.8.nix deleted file mode 100644 index a126f770944..00000000000 --- a/pkgs/development/libraries/clutter-gtk/1.8.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: - -stdenv.mkDerivation rec { - major = "1.8"; - minor = "0"; - name = "clutter-gtk-${major}.${minor}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; - sha256 = "07dzvx0b3fsswxnpxgk0adjgccnrvbxsd971naqwndnfivbgjbkl"; - }; - - propagatedBuildInputs = [ clutter gtk3 ]; - nativeBuildInputs = [ pkgconfig gobjectIntrospection ]; - - postBuild = "rm -rf $out/share/gtk-doc"; - - meta = { - description = "Clutter-GTK"; - homepage = http://www.clutter-project.org/; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - }; -} diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix index 1d085222341..ef2ac6f9385 100644 --- a/pkgs/development/libraries/clutter-gtk/default.nix +++ b/pkgs/development/libraries/clutter-gtk/default.nix @@ -1,11 +1,13 @@ { fetchurl, stdenv, pkgconfig, gobjectIntrospection, clutter, gtk3 }: stdenv.mkDerivation rec { - name = "clutter-gtk-1.4.4"; + major = "1.8"; + minor = "2"; + name = "clutter-gtk-${major}.${minor}"; src = fetchurl { - url = "mirror://gnome/sources/clutter-gtk/1.4/${name}.tar.xz"; - sha256 = "bc3108594a01a08bb6d9b538afe995e4fd78634a8356064ee8137d87aad51b2e"; + url = "mirror://gnome/sources/clutter-gtk/${major}/${name}.tar.xz"; + sha256 = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94"; }; propagatedBuildInputs = [ clutter gtk3 ]; @@ -15,12 +17,9 @@ stdenv.mkDerivation rec { meta = { description = "Clutter-GTK"; - homepage = http://www.clutter-project.org/; - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = with stdenv.lib.maintainers; [ urkud ]; + maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/development/libraries/clutter/1.22.nix b/pkgs/development/libraries/clutter/1.22.nix deleted file mode 100644 index e303d5f0339..00000000000 --- a/pkgs/development/libraries/clutter/1.22.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.22"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "5225fef91f717118654a5b98e24f2018d09ca3c37d61ecff84f77069de0fbf54"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/clutter/1.24.nix b/pkgs/development/libraries/clutter/1.24.nix deleted file mode 100644 index b9d45b6c62b..00000000000 --- a/pkgs/development/libraries/clutter/1.24.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.24"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "85c87d5745b97af7633776419a47421aae7cea66c1b870f88cc5e06a4c5626e6"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/clutter/1.26.nix b/pkgs/development/libraries/clutter/1.26.nix deleted file mode 100644 index 07f63e1e603..00000000000 --- a/pkgs/development/libraries/clutter/1.26.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes -, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection -}: - -let - ver_maj = "1.26"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "clutter-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"; - }; - - nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection - ]; - - configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK - - #doCheck = true; # no tests possible without a display - - meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; - - longDescription = - '' Clutter is free software library for creating fast, compelling, - portable, and dynamic graphical user interfaces. It is a core part - of MeeGo, and is supported by the open source community. Its - development is sponsored by Intel. - - Clutter uses OpenGL for rendering (and optionally OpenGL|ES for use - on mobile and embedded platforms), but wraps an easy to use, - efficient, flexible API around GL's complexity. - - Clutter enforces no particular user interface style, but provides a - rich, generic foundation for higher-level toolkits tailored to - specific needs. - ''; - - license = stdenv.lib.licenses.lgpl2Plus; - homepage = http://www.clutter-project.org/; - - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index f101e3c1880..fc80b0ec2b2 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, -gobjectIntrospection, gtk3 +gobjectIntrospection }: let - ver_maj = "1.16"; - ver_min = "2"; + ver_maj = "1.26"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "clutter-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "0hnz6fnrkc7ixrm2x83sxyha32p9896d7ilzhvxwfgzlh26fidqc"; + sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango - atk json_glib gobjectIntrospection gtk3 + atk json_glib gobjectIntrospection ]; configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix deleted file mode 100644 index ae202b09377..00000000000 --- a/pkgs/development/libraries/cogl/1.20.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection -, gstreamerSupport ? true, gst_all_1 }: - -let - ver_maj = "1.20"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-introspection" - "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; - - propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage - ] - ++ libintlOrEmpty - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer - gst_all_1.gst-plugins-base ]; - - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; - - COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - #doCheck = true; # all tests fail (no idea why) - - meta = with stdenv.lib; { - description = "A small open source library for using 3D graphics hardware for rendering"; - maintainers = with maintainers; [ lovek323 ]; - - longDescription = '' - Cogl is a small open source library for using 3D graphics hardware for - rendering. The API departs from the flat state machine style of OpenGL - and is designed to make it easy to write orthogonal components that can - render without stepping on each other's toes. - ''; - - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/cogl/1.22.nix b/pkgs/development/libraries/cogl/1.22.nix deleted file mode 100644 index 88bb6707749..00000000000 --- a/pkgs/development/libraries/cogl/1.22.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty -, pangoSupport ? true, pango, cairo, gobjectIntrospection -, gstreamerSupport ? true, gst_all_1 }: - -let - ver_maj = "1.22"; - ver_min = "0"; -in -stdenv.mkDerivation rec { - name = "cogl-${ver_maj}.${ver_min}"; - - src = fetchurl { - url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; - }; - - nativeBuildInputs = [ pkgconfig ]; - - configureFlags = [ - "--enable-introspection" - "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; - - propagatedBuildInputs = with xorg; [ - glib gdk_pixbuf gobjectIntrospection - mesa_noglu libXrandr libXfixes libXcomposite libXdamage - ] - ++ libintlOrEmpty - ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer - gst_all_1.gst-plugins-base ]; - - buildInputs = stdenv.lib.optionals pangoSupport [ pango cairo ]; - - COGL_PANGO_DEP_CFLAGS - = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport) - "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo"; - - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; - - #doCheck = true; # all tests fail (no idea why) - - meta = with stdenv.lib; { - description = "A small open source library for using 3D graphics hardware for rendering"; - maintainers = with maintainers; [ lovek323 ]; - - longDescription = '' - Cogl is a small open source library for using 3D graphics hardware for - rendering. The API departs from the flat state machine style of OpenGL - and is designed to make it easy to write orthogonal components that can - render without stepping on each other's toes. - ''; - - platforms = stdenv.lib.platforms.mesaPlatforms; - }; -} diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index e4570209066..88bb6707749 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -3,7 +3,7 @@ , gstreamerSupport ? true, gst_all_1 }: let - ver_maj = "1.16"; + ver_maj = "1.22"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -11,17 +11,16 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/cogl/${ver_maj}/${name}.tar.xz"; - sha256 = "153014xygwyz9wmvgfwjxncqgc0qqvcy6b3jx1zdl3q5d9iw9hkm"; + sha256 = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91"; }; nativeBuildInputs = [ pkgconfig ]; configureFlags = [ "--enable-introspection" - "--enable-gles1" - "--enable-gles2" "--enable-kms-egl-platform" - ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst"; + ] ++ stdenv.lib.optional gstreamerSupport "--enable-cogl-gst" + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ]; propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix index c477b4b1f39..ecc730597c3 100644 --- a/pkgs/development/libraries/cpp-netlib/default.nix +++ b/pkgs/development/libraries/cpp-netlib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, boost, openssl }: +{ stdenv, fetchurl, cmake, boost, openssl, asio }: stdenv.mkDerivation rec { name = "cpp-netlib-${version}"; @@ -11,9 +11,11 @@ stdenv.mkDerivation rec { buildInputs = [ cmake boost openssl ]; + # This can be removed when updating to 0.13, see https://github.com/cpp-netlib/cpp-netlib/issues/629 + propagatedBuildInputs = [ asio ]; + cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" - "-DCMAKE_BUILD_TYPE=RELEASE" ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch b/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch new file mode 100644 index 00000000000..5a6cb3bcafb --- /dev/null +++ b/pkgs/development/libraries/crypto++/GNUmakefile-darwin.patch @@ -0,0 +1,15 @@ +diff --git a/GNUmakefile b/GNUmakefile +index 4de9d10..ff4789a 100755 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -271,8 +271,8 @@ endif # OpenMP + endif # IS_LINUX + + ifneq ($(IS_DARWIN),0) +-AR = libtool +-ARFLAGS = -static -o ++AR = ar ++ARFLAGS = cru + CXX ?= c++ + ifeq ($(IS_GCC_29),1) + CXXFLAGS += -fno-coalesce-templates -fno-coalesce-static-vtables diff --git a/pkgs/development/libraries/crypto++/GNUmakefile.patch b/pkgs/development/libraries/crypto++/GNUmakefile.patch deleted file mode 100644 index 48fdfe42048..00000000000 --- a/pkgs/development/libraries/crypto++/GNUmakefile.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- crypto++/GNUmakefile 2013-02-20 10:30:52.000000000 -0500 -+++ crypto++/GNUmakefile 2015-05-07 18:34:25.000000000 -0500 -@@ -87,8 +87,8 @@ - endif - - ifeq ($(UNAME),Darwin) --AR = libtool --ARFLAGS = -static -o -+AR = ar -+ARFLAGS = cru - CXX = c++ - IS_GCC2 = $(shell $(CXX) -v 2>&1 | $(EGREP) -c gcc-932) - ifeq ($(IS_GCC2),1) diff --git a/pkgs/development/libraries/crypto++/default.nix b/pkgs/development/libraries/crypto++/default.nix index 940af8c44e9..d1476df2b60 100644 --- a/pkgs/development/libraries/crypto++/default.nix +++ b/pkgs/development/libraries/crypto++/default.nix @@ -1,16 +1,18 @@ { fetchurl, stdenv, unzip }: stdenv.mkDerivation rec { - name = "crypto++-5.6.2"; + name = "crypto++-${version}"; + majorVersion = "5.6"; + version = "${majorVersion}.4"; src = fetchurl { - url = "mirror://sourceforge/cryptopp/cryptopp562.zip"; - sha256 = "0x1mqpz1v071cfrw4grbw7z734cxnpry1qh2b6rsmcx6nkyd5gsw"; + url = "mirror://sourceforge/cryptopp/cryptopp564.zip"; + sha256 = "1msar24a38rxzq0xgmjf09hzaw2lv6s48vnbbhfrf5awn1vh6hxy"; }; patches = with stdenv; lib.optional (system != "i686-cygwin") ./dll.patch - ++ lib.optional isDarwin ./GNUmakefile.patch; + ++ lib.optional isDarwin ./GNUmakefile-darwin.patch; buildInputs = [ unzip ]; @@ -30,14 +32,18 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - makeFlags = "PREFIX=$(out)"; - buildFlags = "libcryptopp.so"; + makeFlags = [ "PREFIX=$(out)" ]; + buildFlags = [ "libcryptopp.so" ]; + installFlags = [ "LDCONF=true" ]; doCheck = true; checkPhase = "LD_LIBRARY_PATH=`pwd` make test"; # prefer -fPIC and .so to .a; cryptotest.exe seems superfluous - postInstall = ''rm "$out"/lib/*.a -r "$out/bin" ''; + postInstall = '' + rm "$out"/lib/*.a -r "$out/bin" + ln -sf "$out"/lib/libcryptopp.so.${version} "$out"/lib/libcryptopp.so.${majorVersion} + ''; meta = with stdenv.lib; { description = "Crypto++, a free C++ class library of cryptographic schemes"; @@ -47,4 +53,3 @@ stdenv.mkDerivation rec { maintainers = [ ]; }; } - diff --git a/pkgs/development/libraries/crypto++/dll.patch b/pkgs/development/libraries/crypto++/dll.patch index 36a814e67c8..12df1fb9e9e 100644 --- a/pkgs/development/libraries/crypto++/dll.patch +++ b/pkgs/development/libraries/crypto++/dll.patch @@ -1,19 +1,10 @@ Get rid of Windows-specific stuff. ---- crypto++/dll.cpp 2009-03-01 19:44:02.000000000 +0100 -+++ crypto++/dll.cpp 2009-08-11 00:49:34.000000000 +0200 -@@ -39,7 +39,7 @@ NAMESPACE_END - - #endif - --#ifdef CRYPTOPP_EXPORTS -+#if defined CRYPTOPP_EXPORTS && defined _MSC_VER - - USING_NAMESPACE(CryptoPP) - ---- crypto++/GNUmakefile 2009-03-15 02:48:02.000000000 +0100 -+++ crypto++/GNUmakefile 2009-08-11 01:23:09.000000000 +0200 -@@ -136,7 +136,7 @@ nolib: $(OBJS) # makes it faster to tes +diff --git a/GNUmakefile b/GNUmakefile +index 4de9d10..ff4789a 100755 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -656,7 +656,7 @@ nolib: $(OBJS) dll: cryptest.import.exe dlltest.exe cryptopp.dll: $(DLLOBJS) @@ -22,3 +13,16 @@ Get rid of Windows-specific stuff. libcryptopp.import.a: $(LIBIMPORTOBJS) $(AR) $(ARFLAGS) $@ $(LIBIMPORTOBJS) +diff --git a/dll.cpp b/dll.cpp +index 72dade9..b5097ab 100644 +--- a/dll.cpp ++++ b/dll.cpp +@@ -48,7 +48,7 @@ NAMESPACE_END + + #endif + +-#ifdef CRYPTOPP_EXPORTS ++#if defined CRYPTOPP_EXPORTS && defined _MSC_VER + + USING_NAMESPACE(CryptoPP) + diff --git a/pkgs/development/libraries/cwiid/default.nix b/pkgs/development/libraries/cwiid/default.nix index 980155c007a..fb5431ff8d5 100644 --- a/pkgs/development/libraries/cwiid/default.nix +++ b/pkgs/development/libraries/cwiid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk }: +{ stdenv, autoreconfHook, fetchgit, bison, flex, bluez, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "cwiid-2010-02-21-git"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in ''; - buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk ]; + buildInputs = [ autoreconfHook bison flex bluez pkgconfig gtk2 ]; postInstall = '' # Some programs (for example, cabal-install) have problems with the double 0 diff --git a/pkgs/development/libraries/czmqpp/default.nix b/pkgs/development/libraries/czmqpp/default.nix new file mode 100644 index 00000000000..672a89cc3c0 --- /dev/null +++ b/pkgs/development/libraries/czmqpp/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, czmq }: + +stdenv.mkDerivation rec { + name = "czmqpp-${version}"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "zeromq"; + repo = "czmqpp"; + rev = "v${version}"; + sha256 = "0z8lwq53yk4h7pgibicx3q9idz15qb95r0pjpz0j5vql6qh46rja"; + }; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent"; + license = licenses.lgpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ chris-martin ]; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + propagatedBuildInputs = [ czmq ]; + + # https://github.com/zeromq/czmqpp/issues/42 + patches = [ ./socket.patch ]; +} diff --git a/pkgs/development/libraries/czmqpp/socket.patch b/pkgs/development/libraries/czmqpp/socket.patch new file mode 100644 index 00000000000..0464bcf7797 --- /dev/null +++ b/pkgs/development/libraries/czmqpp/socket.patch @@ -0,0 +1,17 @@ +--- /src/socket.cpp ++++ /src/socket.cpp +@@ -60,12 +60,12 @@ + int socket::bind(const std::string& address) + { + // format-security: format not a string literal and no format arguments. +- return zsocket_bind(self_, address.c_str()); ++ return zsocket_bind(self_, "%s", address.c_str()); + } + int socket::connect(const std::string& address) + { + // format-security: format not a string literal and no format arguments. +- return zsocket_connect(self_, address.c_str()); ++ return zsocket_connect(self_, "%s", address.c_str()); + } + + bool operator==(const socket& sock_a, const socket& sock_b) diff --git a/pkgs/development/libraries/db/clang-5.3.patch b/pkgs/development/libraries/db/clang-5.3.patch index 438fa7eedd7..0a0993da13e 100644 --- a/pkgs/development/libraries/db/clang-5.3.patch +++ b/pkgs/development/libraries/db/clang-5.3.patch @@ -1,6 +1,17 @@ ---- a/src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 -+++ b/src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 -@@ -144,7 +144,7 @@ +diff --git a/src/dbinc/atomic.h b/src/dbinc/atomic.h +index 6a858f7..9f338dc 100644 +--- a/src/dbinc/atomic.h ++++ b/src/dbinc/atomic.h +@@ -70,7 +70,7 @@ typedef struct { + * These have no memory barriers; the caller must include them when necessary. + */ + #define atomic_read(p) ((p)->value) +-#define atomic_init(p, val) ((p)->value = (val)) ++#define atomic_init_db(p, val) ((p)->value = (val)) + + #ifdef HAVE_ATOMIC_SUPPORT + +@@ -144,7 +144,7 @@ typedef LONG volatile *interlocked_val; #define atomic_inc(env, p) __atomic_inc(p) #define atomic_dec(env, p) __atomic_dec(p) #define atomic_compare_exchange(env, p, o, n) \ @@ -9,7 +20,7 @@ static inline int __atomic_inc(db_atomic_t *p) { int temp; -@@ -176,7 +176,7 @@ +@@ -176,7 +176,7 @@ static inline int __atomic_dec(db_atomic_t *p) * http://gcc.gnu.org/onlinedocs/gcc-4.1.0/gcc/Atomic-Builtins.html * which configure could be changed to use. */ @@ -18,3 +29,126 @@ db_atomic_t *p, atomic_value_t oldval, atomic_value_t newval) { atomic_value_t was; +@@ -206,7 +206,7 @@ static inline int __atomic_compare_exchange( + #define atomic_dec(env, p) (--(p)->value) + #define atomic_compare_exchange(env, p, oldval, newval) \ + (DB_ASSERT(env, atomic_read(p) == (oldval)), \ +- atomic_init(p, (newval)), 1) ++ atomic_init_db(p, (newval)), 1) + #else + #define atomic_inc(env, p) __atomic_inc(env, p) + #define atomic_dec(env, p) __atomic_dec(env, p) +diff --git a/src/dbinc/db.in b/src/dbinc/db.in +index 92ac822..f80428e 100644 +--- a/src/dbinc/db.in ++++ b/src/dbinc/db.in +@@ -2782,7 +2782,7 @@ typedef struct { + #define fetch(a) __db_dbm_fetch@DB_VERSION_UNIQUE_NAME@(a) + #define firstkey __db_dbm_firstkey@DB_VERSION_UNIQUE_NAME@ + #define nextkey(a) __db_dbm_nextkey@DB_VERSION_UNIQUE_NAME@(a) +-#define store(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) ++#define store_db(a, b) __db_dbm_store@DB_VERSION_UNIQUE_NAME@(a, b) + + /******************************************************* + * Hsearch historic interface. +diff --git a/src/mp/mp_fget.c b/src/mp/mp_fget.c +index 16de695..d0dcc29 100644 +--- a/src/mp/mp_fget.c ++++ b/src/mp/mp_fget.c +@@ -649,7 +649,7 @@ alloc: /* Allocate a new buffer header and data space. */ + + /* Initialize enough so we can call __memp_bhfree. */ + alloc_bhp->flags = 0; +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + #ifdef DIAGNOSTIC + if ((uintptr_t)alloc_bhp->buf & (sizeof(size_t) - 1)) { + __db_errx(env, DB_STR("3025", +@@ -955,7 +955,7 @@ alloc: /* Allocate a new buffer header and data space. */ + MVCC_MPROTECT(bhp->buf, mfp->pagesize, + PROT_READ); + +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + MUTEX_LOCK(env, alloc_bhp->mtx_buf); + alloc_bhp->priority = bhp->priority; + alloc_bhp->pgno = bhp->pgno; +diff --git a/src/mp/mp_mvcc.c b/src/mp/mp_mvcc.c +index 770bad8..e28cce0 100644 +--- a/src/mp/mp_mvcc.c ++++ b/src/mp/mp_mvcc.c +@@ -276,7 +276,7 @@ __memp_bh_freeze(dbmp, infop, hp, bhp, need_frozenp) + #else + memcpy(frozen_bhp, bhp, SSZA(BH, buf)); + #endif +- atomic_init(&frozen_bhp->ref, 0); ++ atomic_init_db(&frozen_bhp->ref, 0); + if (mutex != MUTEX_INVALID) + frozen_bhp->mtx_buf = mutex; + else if ((ret = __mutex_alloc(env, MTX_MPOOL_BH, +@@ -428,7 +428,7 @@ __memp_bh_thaw(dbmp, infop, hp, frozen_bhp, alloc_bhp) + #endif + alloc_bhp->mtx_buf = mutex; + MUTEX_LOCK(env, alloc_bhp->mtx_buf); +- atomic_init(&alloc_bhp->ref, 1); ++ atomic_init_db(&alloc_bhp->ref, 1); + F_CLR(alloc_bhp, BH_FROZEN); + } + +diff --git a/src/mp/mp_region.c b/src/mp/mp_region.c +index 4952030..47645f8 100644 +--- a/src/mp/mp_region.c ++++ b/src/mp/mp_region.c +@@ -245,7 +245,7 @@ __memp_init(env, dbmp, reginfo_off, htab_buckets, max_nreg) + MTX_MPOOL_FILE_BUCKET, 0, &htab[i].mtx_hash)) != 0) + return (ret); + SH_TAILQ_INIT(&htab[i].hash_bucket); +- atomic_init(&htab[i].hash_page_dirty, 0); ++ atomic_init_db(&htab[i].hash_page_dirty, 0); + } + + /* +@@ -302,7 +302,7 @@ no_prealloc: + } else + hp->mtx_hash = mtx_base + (i % dbenv->mp_mtxcount); + SH_TAILQ_INIT(&hp->hash_bucket); +- atomic_init(&hp->hash_page_dirty, 0); ++ atomic_init_db(&hp->hash_page_dirty, 0); + #ifdef HAVE_STATISTICS + hp->hash_io_wait = 0; + hp->hash_frozen = hp->hash_thawed = hp->hash_frozen_freed = 0; +diff --git a/src/mutex/mut_method.c b/src/mutex/mut_method.c +index 09353b0..177353c 100644 +--- a/src/mutex/mut_method.c ++++ b/src/mutex/mut_method.c +@@ -474,7 +474,7 @@ atomic_compare_exchange(env, v, oldval, newval) + MUTEX_LOCK(env, mtx); + ret = atomic_read(v) == oldval; + if (ret) +- atomic_init(v, newval); ++ atomic_init_db(v, newval); + MUTEX_UNLOCK(env, mtx); + + return (ret); +diff --git a/src/mutex/mut_tas.c b/src/mutex/mut_tas.c +index 106b161..fc4de9d 100644 +--- a/src/mutex/mut_tas.c ++++ b/src/mutex/mut_tas.c +@@ -47,7 +47,7 @@ __db_tas_mutex_init(env, mutex, flags) + + #ifdef HAVE_SHARED_LATCHES + if (F_ISSET(mutexp, DB_MUTEX_SHARED)) +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + else + #endif + if (MUTEX_INIT(&mutexp->tas)) { +@@ -536,7 +536,7 @@ __db_tas_mutex_unlock(env, mutex) + F_CLR(mutexp, DB_MUTEX_LOCKED); + /* Flush flag update before zeroing count */ + MEMBAR_EXIT(); +- atomic_init(&mutexp->sharecount, 0); ++ atomic_init_db(&mutexp->sharecount, 0); + } else { + DB_ASSERT(env, sharecount > 0); + MEMBAR_EXIT(); diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index 98002c24461..91adfa24b58 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,6 +3,9 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; - extraPatches = [ ./clang-5.3.patch ]; branch = "5.3"; + # https://community.oracle.com/thread/3952592 + # this patch renames some sybols that conflict with libc++-3.8 + # symbols: atomic_compare_exchange, atomic_init, store + extraPatches = [ ./clang-5.3.patch ]; }) diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index bcf8933f072..361acf632fa 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -44,7 +44,11 @@ self = stdenv.mkDerivation { "--localstatedir=/var" "--sysconfdir=/etc" "--with-session-socket-dir=/tmp" + "--with-system-pid-file=/run/dbus/pid" + "--with-system-socket=/run/dbus/system_bus_socket" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + "--with-systemduserunitdir=$(out)/etc/systemd/user" + "--enable-user-session" # this package installs nothing into those dirs and they create a dependency "--datadir=/run/current-system/sw/share" "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper @@ -81,4 +85,3 @@ self = stdenv.mkDerivation { }; }; in self - diff --git a/pkgs/development/libraries/farsight2/default.nix b/pkgs/development/libraries/farsight2/default.nix index 5c2ef0f6b4e..50f90c9d88a 100644 --- a/pkgs/development/libraries/farsight2/default.nix +++ b/pkgs/development/libraries/farsight2/default.nix @@ -1,7 +1,9 @@ -{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst_plugins_base -, pygobject, gst_python, gupnp_igd }: +{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst_plugins_base +, gst_python, gupnp_igd }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject2; +in stdenv.mkDerivation rec { name = "farsight2-0.0.31"; src = fetchurl { @@ -9,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "16qz4x14rdycm4nrn5wx6k2y22fzrazsbmihrxdwafx9cyf23kjm"; }; - buildInputs = [ libnice python pygobject gst_python gupnp_igd ]; + buildInputs = [ libnice python pygobject2 gst_python gupnp_igd ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix index a57c3da333e..260a424038f 100644 --- a/pkgs/development/libraries/farstream/default.nix +++ b/pkgs/development/libraries/farstream/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl, libnice, pkgconfig, python, gstreamer, gst-plugins-base -, pygobject, gst-python, gupnp_igd +{ stdenv, fetchurl, libnice, pkgconfig, pythonPackages, gstreamer, gst-plugins-base +, gst-python, gupnp_igd , gst-plugins-good, gst-plugins-bad, gst-libav }: -stdenv.mkDerivation rec { - name = "farstream-0.2.4"; +let + inherit (pythonPackages) python pygobject2; +in stdenv.mkDerivation rec { + name = "farstream-0.2.8"; src = fetchurl { url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz"; - sha256 = "0c5vlyiwb799wpby4g9vffiy0nf09gy2cr84ksfy3jwzsxf5n38j"; + sha256 = "0249ncd20x5mf884fd8bw75c3118b9fdml837v4fib349xmrqfrb"; }; - buildInputs = [ libnice python pygobject gupnp_igd libnice ]; + buildInputs = [ libnice python pygobject2 gupnp_igd libnice ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/fcgi/default.nix b/pkgs/development/libraries/fcgi/default.nix index 6808ea52adf..63adb5afd1c 100644 --- a/pkgs/development/libraries/fcgi/default.nix +++ b/pkgs/development/libraries/fcgi/default.nix @@ -1,14 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation rec { - name = "fcgi-2.4.0"; + name = "fcgi-${version}"; + version = "2.4.0"; src = fetchurl { - url = "http://www.fastcgi.com/dist/${name}.tar.gz"; + url = "https://launchpad.net/debian/+archive/primary/+files/libfcgi_${version}.orig.tar.gz"; + # url = "http://www.fastcgi.com/dist/${name}.tar.gz"; sha256 = "1f857wnl1d6jfrgfgfpz3zdaj8fch3vr13mnpcpvy8bang34bz36"; }; - patches = [ ./gcc-4.4.diff ]; + patches = [ + ./gcc-4.4.diff + (fetchpatch { + # Fix a stack-smashing bug: + # xhttps://bugs.debian.org/cgi-bin/bugreport.cgi?bug=681591 + url = "https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417/+attachment/2745025/+files/poll.patch"; + sha256 = "0v3gw0smjvrxh1bv3zx9xp633gbv5dd5bcn3ipj6ckqjyv4i6i7m"; + }) + ]; postInstall = "ln -s . $out/include/fastcgi"; diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix index 63e6ec2f695..04336c9ee4d 100644 --- a/pkgs/development/libraries/ffmpeg/2.8.nix +++ b/pkgs/development/libraries/ffmpeg/2.8.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.7"; + version = "${branch}.8"; branch = "2.8"; - sha256 = "1rggcy8kflmlvdyf5yqv0zshycysyqz45fl06v8zsh2n6d5cwxw7"; + sha256 = "19h6xmlcb933hgpfd40mjwkral8v389v25sx660a3p7aiyalh25p"; }) diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index 550ec2bf5c3..0130ee2a014 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -16,20 +16,14 @@ let configVersion = "2.11"; # bump whenever fontconfig breaks compatibility with older configurations in stdenv.mkDerivation rec { - name = "fontconfig-2.11.1"; + name = "fontconfig-2.12.1"; src = fetchurl { url = "http://fontconfig.org/release/${name}.tar.bz2"; - sha256 = "16baa4g5lswkyjlyf1h5lwc0zjap7c4d8grw79349a5w6dsl8qnw"; + sha256 = "1wy7svvp7df6bjpg1m5vizb3ngd7rhb20vpclv3x3qa71khs6jdl"; }; patches = [ - (fetchpatch ({ - url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67"; - sha256 = "19s5irclg4irj2yxd7xw9yikbazs9263px8qbv4r21asw06nfalv"; - name = "fc-cache-bug-77252.patch"; - } - )) (substituteAll { src = ./config-compat.patch; inherit configVersion; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index d0fba6ed821..136f18b0614 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchzip, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: +{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: stdenv.mkDerivation rec { name = "freenect-${version}"; - version = "0.5.2"; + version = "0.5.5"; - src = fetchzip { - url = "https://github.com/OpenKinect/libfreenect/archive/v${version}.tar.gz"; - sha256 = "04p4q19fkh97bn7kf0xsk6mrig2aj10i3s9z6hdrr70l6dfpf4w9"; + src = fetchFromGitHub { + owner = "OpenKinect"; + repo = "libfreenect"; + rev = "v${version}"; + sha256 = "0qmbagfkxjgbwd2ajn7i5lkic9gx5y02bsnmqm7cjay99zfw9ifx"; }; buildInputs = [ libusb freeglut mesa libXi libXmu ]; diff --git a/pkgs/development/libraries/freetts/default.nix b/pkgs/development/libraries/freetts/default.nix index 91d2c84252f..8c6f60b9801 100644 --- a/pkgs/development/libraries/freetts/default.nix +++ b/pkgs/development/libraries/freetts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, apacheAnt, unzip, sharutils, lib}: +{stdenv, fetchurl, apacheAnt, unzip, sharutils, lib, jdk}: stdenv.mkDerivation { name = "freetts-1.2.2"; @@ -6,11 +6,11 @@ stdenv.mkDerivation { url = mirror://sourceforge/freetts/freetts-1.2.2-src.zip; sha256 = "0mnikqhpf4f4jdr0irmibr8yy0dnffx1i257y22iamxi7a6by2r7"; }; - buildInputs = [ apacheAnt unzip sharutils ]; + buildInputs = [ apacheAnt unzip sharutils jdk ]; unpackPhase = '' unzip $src -x META-INF/* ''; - + buildPhase = '' cd */lib sed -i -e "s/more/cat/" jsapi.sh @@ -23,7 +23,7 @@ stdenv.mkDerivation { install -v -m755 -d $out/{lib,docs/{audio,images}} install -v -m644 lib/*.jar $out/lib ''; - + meta = { description = "Text to speech system based on Festival written in Java"; longDescription = '' diff --git a/pkgs/development/libraries/fribidi/default.nix b/pkgs/development/libraries/fribidi/default.nix index 35d67b63309..bdfbb97f021 100644 --- a/pkgs/development/libraries/fribidi/default.nix +++ b/pkgs/development/libraries/fribidi/default.nix @@ -2,15 +2,17 @@ stdenv.mkDerivation rec { name = "fribidi-${version}"; - version = "0.19.6"; + version = "0.19.7"; src = fetchurl { url = "http://fribidi.org/download/${name}.tar.bz2"; - sha256 = "0zg1hpaml34ny74fif97j7ngrshlkl3wk3nja3gmlzl17i1bga6b"; + sha256 = "13jsb5qadlhsaxkbrb49nqslmbh904vvzhsm5mm2ghmv29i2l8h8"; }; hardeningDisable = [ "format" ]; + outputs = [ "out" "devdoc" ]; + meta = with stdenv.lib; { homepage = http://fribidi.org/; description = "GNU implementation of the Unicode Bidirectional Algorithm (bidi)"; diff --git a/pkgs/development/libraries/ganv/default.nix b/pkgs/development/libraries/ganv/default.nix index eef89e9cff6..6af09bd5179 100644 --- a/pkgs/development/libraries/ganv/default.nix +++ b/pkgs/development/libraries/ganv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, graphviz, gtk, gtkmm, pkgconfig, python }: +{ stdenv, fetchsvn, graphviz, gtkmm2, pkgconfig, python }: stdenv.mkDerivation rec { name = "ganv-svn-${rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0klzng3jvc09lj4hxnzlb8z5s5qp8rj16b1x1j6hcbqdja54fccj"; }; - buildInputs = [ graphviz gtk gtkmm pkgconfig python ]; + buildInputs = [ graphviz gtkmm2 pkgconfig python ]; configurePhase = "python waf configure --prefix=$out"; diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 85446aae8ca..f3db9bf5977 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -2,7 +2,7 @@ , jasper, libintlOrEmpty, gobjectIntrospection, doCheck ? false }: let - ver_maj = "2.34"; + ver_maj = "2.36"; ver_min = "0"; in stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz"; - sha256 = "0yc8indbl3hf18z6x6kjg59xp9sngm1d8vmz4c7bs6g27qw5npnm"; + sha256 = "85ab52ce9f2c26327141b3dcf21cca3da6a3f8de84b95fa1e727d8871a23245c"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix index b54b3a38e76..304d8110ad4 100644 --- a/pkgs/development/libraries/gegl/default.nix +++ b/pkgs/development/libraries/gegl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg -, librsvg, pango, gtk, bzip2, intltool +, librsvg, pango, gtk2, bzip2, intltool , OpenGL ? null }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; - buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ] + buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool ] ++ stdenv.lib.optional stdenv.isDarwin OpenGL; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix index 754c85ecf03..9aba42fdf4b 100644 --- a/pkgs/development/libraries/geoclue/default.nix +++ b/pkgs/development/libraries/geoclue/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome, libxslt }: +{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, libxslt }: stdenv.mkDerivation rec { name = "geoclue-0.12.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg"; }; - buildInputs = [ pkgconfig libxml2 gnome.GConf libxslt ]; + buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt ]; propagatedBuildInputs = [dbus glib dbus_glib]; diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix index 0bccb857d35..fee760b3ea2 100644 --- a/pkgs/development/libraries/giflib/5.1.nix +++ b/pkgs/development/libraries/giflib/5.1.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: stdenv.mkDerivation { - name = "giflib-5.1.0"; + name = "giflib-5.1.4"; src = fetchurl { - url = mirror://sourceforge/giflib/giflib-5.1.0.tar.bz2; - sha256 = "06wd32akyawppar9mqdvyhcw47ssdfcj39lryim2w4v83i7nkv2s"; + url = mirror://sourceforge/giflib/giflib-5.1.4.tar.bz2; + sha256 = "1md83dip8rf29y40cm5r7nn19705f54iraz6545zhwa6y8zyq9yz"; }; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; diff --git a/pkgs/development/libraries/gio-sharp/default.nix b/pkgs/development/libraries/gio-sharp/default.nix index ad5220cac4e..804da49fda9 100644 --- a/pkgs/development/libraries/gio-sharp/default.nix +++ b/pkgs/development/libraries/gio-sharp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp }: +{ stdenv, fetchFromGitHub, autoconf, automake, which, pkgconfig, mono, gtk-sharp-2_0 }: stdenv.mkDerivation rec { name = "gio-sharp-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoconf automake which ]; - buildInputs = [ mono gtk-sharp ]; + buildInputs = [ mono gtk-sharp-2_0 ]; dontStrip = true; diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 5c7b3123cb6..422b7f4c58c 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -2,15 +2,15 @@ , gsettings_desktop_schemas }: let - ver_maj = "2.46"; - ver_min = "1"; + ver_maj = "2.50"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "glib-networking-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz"; - sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym"; + sha256 = "3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee"; }; outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index c678309e90a..710b6550995 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, pkgconfig, gettext, perl, python , libiconv, libintlOrEmpty, zlib, libffi, pcre, libelf +# use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib) +, utillinuxMinimal ? null # this is just for tests (not in closure of any regular package) , coreutils, dbus_daemon, libxml2, tzdata, desktop_file_utils, shared_mime_info, doCheck ? false @@ -8,6 +10,7 @@ with stdenv.lib; assert stdenv.isFreeBSD || stdenv.isDarwin || stdenv.cc.isGNU; +assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: # * Add gio-module-fam @@ -39,8 +42,8 @@ let ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true ''; - ver_maj = "2.48"; - ver_min = "2"; + ver_maj = "2.50"; + ver_min = "1"; in stdenv.mkDerivation rec { @@ -48,7 +51,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz"; - sha256 = "f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4"; + sha256 = "2ef87a78f37c1eb5b95f4cc95efd5b66f69afad9c9c0899918d04659cf6df7dd"; }; patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; @@ -59,6 +62,7 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; buildInputs = [ libelf setupHook pcre ] + ++ optionals stdenv.isLinux [ utillinuxMinimal ] # for libmount ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ]; nativeBuildInputs = [ pkgconfig gettext perl python ]; diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix index 15c455b7afb..4e03293fdf9 100644 --- a/pkgs/development/libraries/glibc/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -82,7 +82,7 @@ stdenv.mkDerivation ({ "--enable-add-ons" "--enable-obsolete-rpc" "--sysconfdir=/etc" - "libc_cv_ssp=no" + "--enable-stackguard-randomization" (if linuxHeaders != null then "--with-headers=${linuxHeaders}/include" else "--without-headers") diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix index 1c116c8d987..d6c496819da 100644 --- a/pkgs/development/libraries/glibc/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -33,6 +33,9 @@ in makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin") ''; + # The stackprotector and fortify hardening flags are autodetected by glibc + # and enabled by default if supported. Setting it for every gcc invocation + # does not work. hardeningDisable = [ "stackprotector" "fortify" ]; # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index ba26a9a5851..0b966c65f38 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, gnum4, glib, libsigcxx }: let - ver_maj = "2.48"; - ver_min = "1"; + ver_maj = "2.50"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "1pvw2mrm03p51p03179rb6fk9p42iykkwj1jcdv7jr265xymy8nw"; + sha256 = "df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/gnome-sharp/default.nix b/pkgs/development/libraries/gnome-sharp/default.nix index 59f97e46bef..f95d0720d83 100644 --- a/pkgs/development/libraries/gnome-sharp/default.nix +++ b/pkgs/development/libraries/gnome-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, mono, gtk-sharp, gnome}: +{stdenv, fetchurl, pkgconfig, gtk2, mono, gtk-sharp-2_0, gnome2}: stdenv.mkDerivation { name = "gnome-sharp-2.24.1"; @@ -7,8 +7,8 @@ stdenv.mkDerivation { sha256 = "0cfvs7hw67fp0wimskqd0gdfx323gv6hi0c5pf59krnmhdrl6z8p"; }; - buildInputs = [ pkgconfig gtk mono gtk-sharp ] - ++ (with gnome; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); + buildInputs = [ pkgconfig gtk2 mono gtk-sharp-2_0 ] + ++ (with gnome2; [ libart_lgpl gnome_vfs libgnome libgnomecanvas libgnomeui]); patches = [ ./Makefile.in.patch ]; diff --git a/pkgs/development/libraries/gnutls/3.4.nix b/pkgs/development/libraries/gnutls/3.4.nix index 2a48d045c51..4ca991b9667 100644 --- a/pkgs/development/libraries/gnutls/3.4.nix +++ b/pkgs/development/libraries/gnutls/3.4.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.4.14"; + version = "3.4.15"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/gnutls-${version}.tar.xz"; - sha256 = "35deddf2779b76ac11057de38bf380b8066c05de21b94263ad5b6dfa75dfbb23"; + sha256 = "161lbs0ijkkc94xx6yz87q36a055hl6d5hdwyz5s1wpm0lwh2apb"; }; }) diff --git a/pkgs/development/libraries/gnutls/3.5.nix b/pkgs/development/libraries/gnutls/3.5.nix index db35a13cc41..b85859f0e62 100644 --- a/pkgs/development/libraries/gnutls/3.5.nix +++ b/pkgs/development/libraries/gnutls/3.5.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, autoreconfHook, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/gnutls-${version}.tar.xz"; - sha256 = "92c4bc999a10a1b95299ebefaeea8333f19d8a98d957a35b5eae74881bdb1fef"; + sha256 = "1sx8p7v452s9m854r2c5pvcd1k15a3caiv5h35fhrxz0691h2f2f"; }; }) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 57c42ee21ef..7154db626aa 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -7,7 +7,7 @@ # In that case its about 6MB which could be separated let - ver_maj = "1.48"; + ver_maj = "1.50"; ver_min = "0"; in with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz"; - sha256 = "0xsqwxhfqzr79av89mg766kxpb2i41bd0vwspk01xjdzrnn5l9zs"; + sha256 = "1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix index 75a7dfb4898..2da683fcbeb 100644 --- a/pkgs/development/libraries/goffice/0.8.nix +++ b/pkgs/development/libraries/goffice/0.8.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, glib, gtk, libglade, bzip2 +{ fetchurl, stdenv, pkgconfig, glib, gtk2, libglade, bzip2 , pango, libgsf, libxml2, libart, intltool, gettext , cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ # All these are in the "Requires:" field of `libgoffice-0.6.pc'. - glib libgsf libxml2 gtk libglade libart cairo pango + glib libgsf libxml2 gtk2 libglade libart cairo pango ]; postInstall = diff --git a/pkgs/development/libraries/goocanvas/default.nix b/pkgs/development/libraries/goocanvas/default.nix index 5a367e1d593..080b781ca31 100644 --- a/pkgs/development/libraries/goocanvas/default.nix +++ b/pkgs/development/libraries/goocanvas/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, cairo, glib, pkgconfig }: +{ stdenv, fetchurl, gtk2, cairo, glib, pkgconfig }: stdenv.mkDerivation rec { majVersion = "1.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "07kicpcacbqm3inp7zq32ldp95mxx4kfxpaazd0x5jk7hpw2w1qw"; }; - buildInputs = [ gtk cairo glib pkgconfig ]; + buildInputs = [ gtk2 cairo glib pkgconfig ]; meta = { description = "Canvas widget for GTK+ based on the the Cairo 2D library"; diff --git a/pkgs/development/libraries/gperftools/default.nix b/pkgs/development/libraries/gperftools/default.nix index 5fa14e64a22..8eb79b27fdc 100644 --- a/pkgs/development/libraries/gperftools/default.nix +++ b/pkgs/development/libraries/gperftools/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, unzip, libunwind }: +{ stdenv, fetchurl, libunwind }: stdenv.mkDerivation rec { - name = "gperftools-2.4"; + name = "gperftools-2.5"; src = fetchurl { - url = "https://googledrive.com/host/0B6NtGsLhIcf7MWxMMF9JdTN3UVk/gperftools-2.4.tar.gz"; - sha256 = "0b8aqgch8dyapzw2zd9g89x6gsnm2ml0gf169rql0bxldqi3falq"; + url = "https://github.com/gperftools/gperftools/releases/download/${name}/${name}.tar.gz"; + sha256 = "0wsix3lhkpjv8lxmcbml549mfwifdv7n1qak09slvx6d3a7p98kg"; }; - buildInputs = [ unzip ] ++ stdenv.lib.optional stdenv.isLinux libunwind; + buildInputs = stdenv.lib.optional stdenv.isLinux libunwind; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace Makefile.am --replace stdc++ c++ @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { description = "Fast, multi-threaded malloc() and nifty performance analysis tools"; platforms = with platforms; linux ++ darwin; license = licenses.bsd3; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ vcunat wkennington ]; }; } diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 53acdfed3ba..8acc773a46c 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -9,11 +9,11 @@ let gpgProgram = if useGnupg1 then "gpg" else "gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.6.0"; + name = "gpgme-1.7.0"; src = fetchurl { url = "mirror://gnupg/gpgme/${name}.tar.bz2"; - sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh"; + sha256 = "0j6capvv6lcr6p763lr2ygzkzkj5lqm7fnbfc1xaygib1znmzxbi"; }; outputs = [ "out" "dev" "info" ]; @@ -28,6 +28,9 @@ stdenv.mkDerivation rec { "--enable-fixed-path=${gpgStorePath}/bin" ]; + NIX_CFLAGS_COMPILE = + with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64"; + meta = with stdenv.lib; { homepage = "http://www.gnupg.org/related_software/gpgme"; description = "Library for making GnuPG easier to use"; diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix index eb55ae874e5..0e1e3c4897e 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { patch -p1 < ${./gcc-4.9.patch} ''; + outputs = [ "out" "dev" ]; + # TODO : v4l, libvisual buildInputs = [ pkgconfig glib cairo orc ] diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix index f8a75c25122..af6e3be401b 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib gstreamer gst_plugins_base ] - ++ lib.optional stdenv.isLinux [ libpulseaudio ] + ++ lib.optional stdenv.isLinux libpulseaudio ++ libintlOrEmpty ++ lib.optionals (!minimalDeps) [ aalib libcaca cairo libdv flac libjpeg libpng speex diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix index 249eb9a30da..2d588e5d231 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gst-python/default.nix @@ -1,8 +1,9 @@ -{ fetchurl, stdenv, pkgconfig, python, gstreamer -, gst_plugins_base, pygobject +{ fetchurl, stdenv, pkgconfig, pythonPackages, gstreamer, gst_plugins_base }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject2; +in stdenv.mkDerivation rec { name = "gst-python-0.10.22"; src = fetchurl { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-testFake.patch ]; buildInputs = - [ pkgconfig gst_plugins_base pygobject ] + [ pkgconfig gst_plugins_base pygobject2 ] ; propagatedBuildInputs = [ gstreamer python ]; diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index adda7697ffc..304d02087b4 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "1nkid1n2l3rrlmq5qrf5yy06grrkwjh3yxl5g0w58w0pih8allci"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ perl bison flex pkgconfig ]; propagatedBuildInputs = [ glib libxml2 ] ++ libintlOrEmpty; diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix index 842dd0df0fc..9d6fa94cf3a 100644 --- a/pkgs/development/libraries/gstreamer/python/default.nix +++ b/pkgs/development/libraries/gstreamer/python/default.nix @@ -1,9 +1,11 @@ -{ fetchurl, stdenv, pkgconfig, python -, gst-plugins-base, pygobject3 +{ fetchurl, stdenv, pkgconfig, pythonPackages +, gst-plugins-base , ncurses }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject3; +in stdenv.mkDerivation rec { name = "gst-python-1.8.2"; src = fetchurl { diff --git a/pkgs/development/libraries/gtdialog/default.nix b/pkgs/development/libraries/gtdialog/default.nix index 8d8a018f1fe..b94cd88869b 100644 --- a/pkgs/development/libraries/gtdialog/default.nix +++ b/pkgs/development/libraries/gtdialog/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, cdk, unzip, gtk, glib, ncurses, pkgconfig}: +{stdenv, fetchurl, cdk, unzip, gtk2, glib, ncurses, pkgconfig}: let s = # Generated upstream information rec { baseName="gtdialog"; - version="1.2"; + version="1.3"; name="${baseName}-${version}"; - hash="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; - url="http://foicica.com/gtdialog/download/gtdialog_1.2.zip"; - sha256="0nvcldyhj8abr8jny9pbyfjwg8qfp9f2h508vjmrvr5c5fqdbbm0"; + hash="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq"; + url="http://foicica.com/gtdialog/download/gtdialog_1.3.zip"; + sha256="0y7sln877940bpj0s38cs5s97xg8csnaihh18lmnchf7c2kkbxpq"; }; buildInputs = [ - cdk unzip gtk glib ncurses pkgconfig + cdk unzip gtk2 glib ncurses pkgconfig ]; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/gtdialog/default.upstream b/pkgs/development/libraries/gtdialog/default.upstream index 843c88f55ff..b9cbcf4c5c7 100644 --- a/pkgs/development/libraries/gtdialog/default.upstream +++ b/pkgs/development/libraries/gtdialog/default.upstream @@ -1,3 +1,3 @@ url http://foicica.com/gtdialog/download -version_link '[.]zip' +version_link '[.]zip$' version '.*_([0-9.]*)[.]zip' '\1' diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index df645f10961..91407e556c0 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -44,6 +44,8 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput share/gtk-2.0/demo "$devdoc" + # The updater is needed for nixos env and it's tiny. + moveToOutput bin/gtk-update-icon-cache "$out" ''; passthru = { diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index 1ac006b2161..9882cd7692c 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -12,8 +12,8 @@ assert cupsSupport -> cups != null; with stdenv.lib; let - ver_maj = "3.20"; - ver_min = "9"; + ver_maj = "3.22"; + ver_min = "1"; version = "${ver_maj}.${ver_min}"; in stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${ver_maj}/gtk+-${version}.tar.xz"; - sha256 = "05xcwvy68p7f4hdhi4bgdm3aycvqqr4pr5kkkr8ba91l5yx0k9l3"; + sha256 = "127c8c5cfc32681f9ab3cb542eb0d5c16c1c02faba68bf8fcac9a3cf278ef471"; }; outputs = [ "out" "dev" ]; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ] ++ optionals waylandSupport [ wayland wayland-protocols ] - ++ optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) + ++ optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ AppKit Cocoa ]) ++ optional xineramaSupport libXinerama ++ optional cupsSupport cups; #TODO: colord? diff --git a/pkgs/development/libraries/gtk-sharp-beans/default.nix b/pkgs/development/libraries/gtk-sharp-beans/default.nix index 92578f42e34..b92bbf64514 100644 --- a/pkgs/development/libraries/gtk-sharp-beans/default.nix +++ b/pkgs/development/libraries/gtk-sharp-beans/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp, gio-sharp }: +{ stdenv, fetchFromGitHub, autoreconfHook, which, pkgconfig, mono, gtk-sharp-2_0, gio-sharp }: stdenv.mkDerivation rec { name = "gtk-sharp-beans-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig autoreconfHook which ]; - buildInputs = [ mono gtk-sharp gio-sharp ]; + buildInputs = [ mono gtk-sharp-2_0 gio-sharp ]; dontStrip = true; diff --git a/pkgs/development/libraries/gtk-sharp/2.0.nix b/pkgs/development/libraries/gtk-sharp/2.0.nix index a8667770271..ca6c4d0dfa6 100644 --- a/pkgs/development/libraries/gtk-sharp/2.0.nix +++ b/pkgs/development/libraries/gtk-sharp/2.0.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, mono , glib , pango -, gtk +, gtk2 , GConf ? null , libglade ? null , libgtkhtml ? null @@ -33,7 +33,7 @@ stdenv.mkDerivation { ''; buildInputs = [ - pkgconfig mono glib pango gtk GConf libglade libgnomecanvas + pkgconfig mono glib pango gtk2 GConf libglade libgnomecanvas libgtkhtml libgnomeui libgnomeprint libgnomeprintui gtkhtml libxml2 ]; @@ -42,7 +42,7 @@ stdenv.mkDerivation { inherit monoDLLFixer; passthru = { - inherit gtk; + gtk = gtk2; }; meta = { diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix index 6e5a1329c9b..82c4f25f66c 100644 --- a/pkgs/development/libraries/gtkdatabox/default.nix +++ b/pkgs/development/libraries/gtkdatabox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk }: +{ stdenv, fetchurl, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "gtkdatabox-0.9.2.0"; @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0h20685bzw5j5h6mw8c6apbrbrd9w518c6xdhr55147px11nhnkl"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ gtk ]; + propagatedBuildInputs = [ gtk2 ]; meta = { description = "Gtk+ widget for displaying large amounts of numerical data"; diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index d88160361ca..eb0ba2db103 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, pkgconfig, gtk }: +{ fetchurl, stdenv, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "gtkimageview-1.6.4"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1if3yh5z6nkv5wnkk0qyy9pkk03vn5rqbfk23q87kj39pqscgr37"; }; - buildInputs = [ pkgconfig gtk ]; + buildInputs = [ pkgconfig gtk2 ]; preConfigure = '' sed '/DEPRECATED_FLAGS/d' -i configure diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 8a6914cfcd3..e36d77142e9 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, t1lib, glib, libxml2, popt, gmetadom ? null }: +{stdenv, fetchurl, pkgconfig, gtk2, t1lib, glib, libxml2, popt, gmetadom ? null }: let pname = "gtkmathview"; @@ -13,8 +13,8 @@ stdenv.mkDerivation { sha256 = "0hwcamf5fi35frg7q6kgisc9v0prqbhsplb2gl55cg3av9sh3hqx"; }; - buildInputs = [pkgconfig gtk t1lib glib gmetadom libxml2 popt]; - propagatedBuildInputs = [gtk t1lib]; + buildInputs = [pkgconfig t1lib glib gmetadom libxml2 popt]; + propagatedBuildInputs = [gtk2 t1lib]; patches = [ ./gcc-4.3-build-fixes.patch ./gcc-4.4-build-fixes.patch ]; @@ -23,5 +23,6 @@ stdenv.mkDerivation { description = "C++ rendering engine for MathML documents"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; + broken = true; }; } diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix index 76175859e7d..119e3f77f67 100644 --- a/pkgs/development/libraries/gtkmm/2.x.nix +++ b/pkgs/development/libraries/gtkmm/2.x.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }: +{ stdenv, fetchurl, pkgconfig, gtk2, glibmm, cairomm, pangomm, atkmm }: stdenv.mkDerivation rec { - name = "gtkmm-${minVer}.4"; + name = "gtkmm-${minVer}.5"; minVer = "2.24"; src = fetchurl { url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz"; - sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4"; + sha256 = "0680a53b7bf90b4e4bf444d1d89e6df41c777e0bacc96e9c09fc4dd2f5fe6b72"; }; nativeBuildInputs = [pkgconfig]; - propagatedBuildInputs = [ glibmm gtk atkmm cairomm pangomm ]; + propagatedBuildInputs = [ glibmm gtk2 atkmm cairomm pangomm ]; doCheck = true; diff --git a/pkgs/development/libraries/gtkmozembed-sharp/default.nix b/pkgs/development/libraries/gtkmozembed-sharp/default.nix index 512d443f9fc..52fc4b26e6d 100644 --- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix +++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtk, monoDLLFixer}: +{stdenv, fetchurl, pkgconfig, mono, gtksharp, gtk2, monoDLLFixer}: stdenv.mkDerivation { name = "gtkmozembed-sharp-0.7-pre41601"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { }; buildInputs = [ - pkgconfig mono gtksharp gtk + pkgconfig mono gtksharp gtk2 ]; inherit monoDLLFixer; diff --git a/pkgs/development/libraries/gtkspell/default.nix b/pkgs/development/libraries/gtkspell/default.nix index daf400fdc5a..22b96abf642 100644 --- a/pkgs/development/libraries/gtkspell/default.nix +++ b/pkgs/development/libraries/gtkspell/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, aspell, pkgconfig, enchant, intltool}: +{stdenv, fetchurl, gtk2, aspell, pkgconfig, enchant, intltool}: stdenv.mkDerivation { name = "gtkspell-2.0.16"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "00hdv28bp72kg1mq2jdz1sdw2b8mb9iclsp7jdqwpck705bdriwg"; }; - buildInputs = [aspell pkgconfig gtk enchant intltool]; + buildInputs = [aspell pkgconfig gtk2 enchant intltool]; meta = { platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 37403f50e2b..f225f34c336 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchurl, pkgconfig, intltool, libtool -, glib, dbus, udev, libgudev, udisks2, libgcrypt +, glib, dbus, udev, libgudev, udisks2, libgcrypt, libcap, polkit , libgphoto2, avahi, libarchive, fuse, libcdio , libxml2, libxslt, docbook_xsl, samba, libmtp -, gnomeSupport ? false, gnome,libgnome_keyring, gconf, makeWrapper }: +, gnomeSupport ? false, gnome, makeWrapper }: let - ver_maj = "1.22"; - version = "${ver_maj}.4"; + ver_maj = "1.30"; + version = "${ver_maj}.1"; in stdenv.mkDerivation rec { name = "gvfs-${version}"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${ver_maj}/${name}.tar.xz"; - sha256 = "57e33faad35aba72be3822099856aca847f391626cf3ec734b42e64ba31f6484"; + sha256 = "e752e7bb46e64e4025f63428d4f5247e3e5c0d0b5eeb4f81dbf1cd7b75f59d7b"; }; nativeBuildInputs = [ pkgconfig intltool libtool ]; @@ -21,13 +21,15 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper glib dbus udev libgudev udisks2 libgcrypt libgphoto2 avahi libarchive fuse libcdio - libxml2 libxslt docbook_xsl samba libmtp + libxml2 libxslt docbook_xsl samba libmtp libcap polkit # ToDo: a ligther version of libsoup to have FTP/HTTP support? ] ++ stdenv.lib.optionals gnomeSupport (with gnome; [ - gtk libsoup libgnome_keyring gconf + gtk libsoup libgnome_keyring gconf gcr # ToDo: not working and probably useless until gnome3 from x-updates ]); + configureFlags = stdenv.lib.optional (!gnomeSupport) "--disable-gcr"; + enableParallelBuilding = true; # ToDo: one probably should specify schemas for samba and others here diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index d1c41c9ea80..14fd7cd07f0 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -5,7 +5,7 @@ }: let - version = "1.2.7"; + version = "1.3.2"; inherit (stdenv.lib) optional optionals optionalString; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2"; - sha256 = "09lh8x6qj0cd950whgaqqi3c4pqbl6z7aw9ddm73i14bw056185v"; + sha256 = "09z0ki9w76v0bh4rdkds7zsb7vf721iaiyidcdy9ii885wvschw5"; }; outputs = [ "out" "dev" ]; @@ -47,7 +47,10 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OpenType text shaping engine"; homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz; + downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/"; maintainers = [ maintainers.eelco ]; platforms = with platforms; linux ++ darwin; + inherit version; + updateWalker = true; }; } diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix index 3793a14b4dc..34c3d26c55e 100644 --- a/pkgs/development/libraries/hunspell/wrapper.nix +++ b/pkgs/development/libraries/hunspell/wrapper.nix @@ -9,5 +9,5 @@ stdenv.mkDerivation { buildCommand = '' makeWrapper ${hunspell.bin}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath} ''; - inherit (hunspell) meta; -} \ No newline at end of file + meta = removeAttrs hunspell.meta ["outputsToInstall"]; +} diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix index 00d3e45805c..2c1ca6aeb1e 100644 --- a/pkgs/development/libraries/hyena/default.nix +++ b/pkgs/development/libraries/hyena/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp, monoDLLFixer }: +{ stdenv, fetchurl, pkgconfig, mono, gtk-sharp-2_0, monoDLLFixer }: stdenv.mkDerivation rec { name = "hyena-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig mono gtk-sharp + pkgconfig mono gtk-sharp-2_0 ]; postPatch = '' diff --git a/pkgs/development/libraries/jansson/default.nix b/pkgs/development/libraries/jansson/default.nix index f0f9cc65cb2..5a3085ba728 100644 --- a/pkgs/development/libraries/jansson/default.nix +++ b/pkgs/development/libraries/jansson/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jansson-2.7"; + name = "jansson-2.9"; src = fetchurl { url = "http://www.digip.org/jansson/releases/${name}.tar.gz"; - sha256 = "1mvq9p85khsl818i4vbszyfab0fd45mdrwrxjkzw05mk1xcyc1br"; + sha256 = "19fjgfwjfj99rqa3kf96x5rssj88siazggksgrikd6h4r9sd1l0a"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 586cd9ed43f..e2061df88f0 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -1,25 +1,29 @@ -{ stdenv, fetchurl, unzip, libjpeg, autoreconfHook }: +{ stdenv, fetchurl, fetchpatch, libjpeg, autoreconfHook }: stdenv.mkDerivation rec { - name = "jasper-1.900.1"; + name = "jasper-1.900.2"; src = fetchurl { - url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.zip"; - sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; + url = "http://www.ece.uvic.ca/~mdadams/jasper/software/${name}.tar.gz"; + sha256 = "0bkibjhq3js2ldxa2f9pss84lcx4f5d3v0qis3ifi11ciy7a6c9a"; }; patches = [ - ./jasper-CVE-2016-1867.diff ./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-noabort.diff - ./jasper-CVE-2014-8138.diff - ./jasper-CVE-2014-8157.diff - ./jasper-CVE-2014-8158.diff - ./jasper-CVE-2014-9029.diff + + (fetchpatch { # CVE-2016-2089 + url = "https://github.com/mdadams/jasper/commit/aa6d9c2bbae9155f8e1466295373a68fa97291c3.patch"; + sha256 = "1pxnm86zmbq6brfwsm5wx3iv7s92n4xilc52lzp61q266jmlggrf"; + }) + (fetchpatch { # CVE-2015-5203 + url = "https://github.com/mdadams/jasper/commit/e73bb58f99fec0bf9c5d8866e010fcf736a53b9a.patch"; + sha256 = "1r6hxbnhpnb7q6p2kbdxc1cpph3ic851x2hy477yv5c3qmrbx9bk"; + }) ]; # newer reconf to recognize a multiout flag - nativeBuildInputs = [ unzip autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index 889137d6284..9fb2a2a2e3a 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf, ecj }: +{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk2, gconf, ecj }: stdenv.mkDerivation rec { name = "classpath-0.99"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./missing-casts.patch ]; - buildInputs = [ javac jvm antlr pkgconfig gtk gconf ecj ]; + buildInputs = [ javac jvm antlr pkgconfig gtk2 gconf ecj ]; configurePhase = '' # GCJ tries to compile all of Classpath during the `configure' run when diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index c3053e1f268..2cf08e34575 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk +{ stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 , libXt, libXtst, libXi, mesa, webkit, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; nativeBuildInputs = [ unzip pkgconfig ]; - buildInputs = [ jdk gtk libXt libXtst libXi mesa webkit libsoup ]; + buildInputs = [ jdk gtk2 libXt libXtst libXi mesa webkit libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 0b12e42db86..cb48738dc10 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -40,6 +40,7 @@ let let inherit (args) name; inherit (srcs."${name}") src version; + qtVersion = (builtins.parseDrvName self.qtbase.name).version; in kdeDerivation (args // { name = "${name}-${version}"; inherit src; @@ -50,6 +51,7 @@ let ]; platforms = lib.platforms.linux; homepage = "http://www.kde.org"; + broken = builtins.compareVersions qtVersion "5.6.0" < 0; } // (args.meta or {}); }); diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 4a01d1d8314..2ccc172c074 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.24/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.26/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index a3d5735ad27..91bfd28df4e 100644 --- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix @@ -1,8 +1,15 @@ -{ kdeFramework, lib, ecm, shared_mime_info }: +{ kdeFramework, lib, fetchurl, ecm, shared_mime_info }: kdeFramework { name = "kcoreaddons"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + (fetchurl { + url = "https://packaging.neon.kde.org/frameworks/kcoreaddons.git/plain/debian/patches/0001-Fix-very-old-bug-when-we-remove-space-in-url-as-foo-.patch?id=ab7258dd8a87668ba63c585a69f41f291254aa43"; + sha256 = "0svdqbikmslc0n2gdwwlbdyi61m5qgy0lxxv9iglbs3ja09xqs0p"; + name = "kcoreaddons-CVE-2016-7966.patch"; + }) + ]; nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ shared_mime_info ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 8ac0adafbd1..bbb480c3165 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,11 +1,7 @@ -{ kdeFramework, lib -, ecm -, kconfig -, kcoreaddons -, kcrash -, kdbusaddons -, kwindowsystem -, qtx11extras +{ + kdeFramework, lib, ecm, + kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, + qtx11extras }: kdeFramework { @@ -13,6 +9,6 @@ kdeFramework { meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ ecm ]; propagatedBuildInputs = [ - kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras + kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 12e617a7d9a..ca840fc8b71 100644 --- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix @@ -1,12 +1,13 @@ { - kdeFramework, lib, copyPathsToStore, ecm, + kdeFramework, lib, copyPathsToStore, + bison, ecm, flex, kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem }: kdeFramework { name = "kservice"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - propagatedNativeBuildInputs = [ ecm ]; + propagatedNativeBuildInputs = [ bison ecm flex ]; nativeBuildInputs = [ kdoctools ]; propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index aad6e5eb601..de10a734558 100644 --- a/pkgs/development/libraries/kde-frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix @@ -1,11 +1,12 @@ -{ kdeFramework, lib -, ecm -, qtdeclarative +{ + kdeFramework, lib, + bison, ecm, flex, + qtdeclarative }: kdeFramework { name = "solid"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ ecm ]; + nativeBuildInputs = [ bison ecm flex ]; propagatedBuildInputs = [ qtdeclarative ]; } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 5c48ece1e99..ec1602d5aa2 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,581 +1,581 @@ -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh { fetchurl, mirror }: { attica = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/attica-5.24.0.tar.xz"; - sha256 = "0d368gmds7m7k5pnn625wqsij38cvxk1gkm4zv24phnk9f67v7cw"; - name = "attica-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/attica-5.26.0.tar.xz"; + sha256 = "1z7718vzknp25lzx4kh0k7xw7jgx5q8afwhfcdqhfrbydbch5ilc"; + name = "attica-5.26.0.tar.xz"; }; }; baloo = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/baloo-5.24.0.tar.xz"; - sha256 = "1ayfdg6j9lvas17ryjdv4a0kaj6vw3bxfy2x9nadl0gkc9pak4nh"; - name = "baloo-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/baloo-5.26.0.tar.xz"; + sha256 = "0cgk2fmm1hivzjajih3f09x901cncl2rxxp4qq7wz6g7d2s59pfy"; + name = "baloo-5.26.0.tar.xz"; }; }; bluez-qt = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/bluez-qt-5.24.0.tar.xz"; - sha256 = "0gy0m7lcwwklf021l5i3v7j0cl7qz7cgvzrwpj87ix3kyw5xs80z"; - name = "bluez-qt-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/bluez-qt-5.26.0.tar.xz"; + sha256 = "0n235jsx6vw4v13y3hkbiz5fh4453avgvrwd1zzs4yc5mkz5w837"; + name = "bluez-qt-5.26.0.tar.xz"; }; }; breeze-icons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/breeze-icons-5.24.0.tar.xz"; - sha256 = "1dh7bijx99sdb3vn6394wmm5cq0fvvmz8h17sx4hakmbga849cx2"; - name = "breeze-icons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/breeze-icons-5.26.0.tar.xz"; + sha256 = "1kbbiid89inb7dpn0z612gb7v4p2msbvp9g5varb7wvyld1dgh59"; + name = "breeze-icons-5.26.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/extra-cmake-modules-5.24.0.tar.xz"; - sha256 = "01m12ml529pwr2sal951r5z6yb1rwbpid1y4k14nlk3xqgmdakwa"; - name = "extra-cmake-modules-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/extra-cmake-modules-5.26.0.tar.xz"; + sha256 = "1v3riz49r7pwvnj1ls6wnw0c4g69iky9yck2m4hgr9641k0rqlnd"; + name = "extra-cmake-modules-5.26.0.tar.xz"; }; }; frameworkintegration = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/frameworkintegration-5.24.0.tar.xz"; - sha256 = "0brqgq05m06d98qqvyh30727f5z7hlzxgqysfhfvqzcf3x7f6yzj"; - name = "frameworkintegration-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/frameworkintegration-5.26.0.tar.xz"; + sha256 = "0lqnwgsd6ads17qzdbd75azpk1h5ky3924ygzhbam1llnvcvfk9p"; + name = "frameworkintegration-5.26.0.tar.xz"; }; }; kactivities = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kactivities-5.24.0.tar.xz"; - sha256 = "0s8g43zk6h35bq1am1nnhj0qvmhd6kz42gs8l7ybga0367jghzhf"; - name = "kactivities-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kactivities-5.26.0.tar.xz"; + sha256 = "0cnciipmflnn1dxz69iqc2xy6g27sw4yr17yq3hp0r6kkycmpf71"; + name = "kactivities-5.26.0.tar.xz"; }; }; kactivities-stats = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kactivities-stats-5.24.0.tar.xz"; - sha256 = "1z3xvpifxbd05b2xaxxyiypcpid7jgjb1qpwiyjj1gnfp4rjmzpc"; - name = "kactivities-stats-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kactivities-stats-5.26.0.tar.xz"; + sha256 = "0vpbsg6jswaw3ax4ypp6ak823iymh9jqdf7ssn9kqljynnjhnfv8"; + name = "kactivities-stats-5.26.0.tar.xz"; }; }; kapidox = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kapidox-5.24.0.tar.xz"; - sha256 = "19a7alvn71nxflsyi7y3hghx1iw04qqc77qy54mcxcpkiyvpsggf"; - name = "kapidox-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kapidox-5.26.0.tar.xz"; + sha256 = "1snz4szrgbdzy03jc0sax9r7b1jynj2npil1ngpr40xchs70vnb8"; + name = "kapidox-5.26.0.tar.xz"; }; }; karchive = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/karchive-5.24.0.tar.xz"; - sha256 = "1n5nfhrfvqnrdjgjjy7arqik4fya5bp3dvxa16mlhqr19azkavzq"; - name = "karchive-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/karchive-5.26.0.tar.xz"; + sha256 = "1sysk9zznnahrdjfxxp3aaw6qy9c5l7agh1nbhnk0j5xm31js25g"; + name = "karchive-5.26.0.tar.xz"; }; }; kauth = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kauth-5.24.0.tar.xz"; - sha256 = "14sjjfgl3arqyqcr77w9qhpnd8mrnh53r5rfss6bvlk26bmihs49"; - name = "kauth-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kauth-5.26.0.tar.xz"; + sha256 = "08k1x943z7a044ihv79lm1c0vas5x9wc9wr4qirhllkrxd87nsc1"; + name = "kauth-5.26.0.tar.xz"; }; }; kbookmarks = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kbookmarks-5.24.0.tar.xz"; - sha256 = "10d8dnhvbrwp0dbmz93cqfdff6ir8iy3yiwaf9ihj6ma124qlyjn"; - name = "kbookmarks-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kbookmarks-5.26.0.tar.xz"; + sha256 = "0phhf5xv11iyf5vi8x6xwx7rqlxc27451bwmm2sr0c65bnnkj57j"; + name = "kbookmarks-5.26.0.tar.xz"; }; }; kcmutils = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcmutils-5.24.0.tar.xz"; - sha256 = "0aws1c76s6wbp0xpr6qv6cfwq8dw82v00pkf9gy84sbxknwjnizk"; - name = "kcmutils-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcmutils-5.26.0.tar.xz"; + sha256 = "1pymbf50idnrz8vyy9lm9535h6s7ssd3p70fdg8dicx7lx6s5grd"; + name = "kcmutils-5.26.0.tar.xz"; }; }; kcodecs = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcodecs-5.24.0.tar.xz"; - sha256 = "1qpzjh3qc2zz80j2bmlinipbispms14k9bmqw8v61zhi6in9z14c"; - name = "kcodecs-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcodecs-5.26.0.tar.xz"; + sha256 = "18xzxi5y47rn3wlxz3m98ix7sd20vmxnqsm3lksgakk08qcv47wk"; + name = "kcodecs-5.26.0.tar.xz"; }; }; kcompletion = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcompletion-5.24.0.tar.xz"; - sha256 = "1qln0v31gn86kzwhnkijr1ydf129n32jmiybbckrp4w6hyx6xfxv"; - name = "kcompletion-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcompletion-5.26.0.tar.xz"; + sha256 = "1f3h6qrpqsdds5zf99qkzxan2lh1y83d67pdswqvbfvwhr3bnl7s"; + name = "kcompletion-5.26.0.tar.xz"; }; }; kconfig = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kconfig-5.24.0.tar.xz"; - sha256 = "1dc2i6icyigw1j6qxgdza6j2g8afh390qmxsa2a54mwl84fkfmxv"; - name = "kconfig-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kconfig-5.26.0.tar.xz"; + sha256 = "0rsym5196agxzxzfxzywvsqlgvarnvw91zx04xvlsy70fnj70c4d"; + name = "kconfig-5.26.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kconfigwidgets-5.24.0.tar.xz"; - sha256 = "0v25r50gh5i984lzlv0rradghglcfqf0gsfmnkn23h87b86fm9l2"; - name = "kconfigwidgets-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kconfigwidgets-5.26.0.tar.xz"; + sha256 = "08jr6rhh8fi85827bqxh8v4pavq63i2kzwbvqcfpvrrncj5aj4ci"; + name = "kconfigwidgets-5.26.0.tar.xz"; }; }; kcoreaddons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcoreaddons-5.24.0.tar.xz"; - sha256 = "06sx7by3nvaridnavj5p0bxv4nh47n708jlacfw8ydaikmd9i03h"; - name = "kcoreaddons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcoreaddons-5.26.0.tar.xz"; + sha256 = "10krqzrmbzzkj0xg5rxgs6i4ngg57ydqn3fkmpyz0x6g4yl3raqz"; + name = "kcoreaddons-5.26.0.tar.xz"; }; }; kcrash = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kcrash-5.24.0.tar.xz"; - sha256 = "1lahgfwlp9b5rsl244kzp7rsl4ybv1q4qlvpv0xxz5ygssk48l0w"; - name = "kcrash-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kcrash-5.26.0.tar.xz"; + sha256 = "0x60rw2zy37s38fpa8agggl9mm4kgvdabbcgr673p7b6k6vj46j8"; + name = "kcrash-5.26.0.tar.xz"; }; }; kdbusaddons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdbusaddons-5.24.0.tar.xz"; - sha256 = "183nxqrhz4qk4qfp1w4an0scp2dvfqcaqbpg4cgbgk0z590q0pkk"; - name = "kdbusaddons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdbusaddons-5.26.0.tar.xz"; + sha256 = "0wl5lpqqcckn003kqfz1wapi40wkn4xjk878zwykg3lplxfdlsqw"; + name = "kdbusaddons-5.26.0.tar.xz"; }; }; kdeclarative = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdeclarative-5.24.0.tar.xz"; - sha256 = "00ik9q1r6y6g5rkdq96yczgrxmcg85x00lipyljvc3x6xw6bixbz"; - name = "kdeclarative-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdeclarative-5.26.0.tar.xz"; + sha256 = "0hmj0aj559i9flsw72zzwb2s95ajnzqh11rrs6wmcraywd4xywk8"; + name = "kdeclarative-5.26.0.tar.xz"; }; }; kded = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kded-5.24.0.tar.xz"; - sha256 = "0ngpxdxb596myn5r4kjxahx195bwklq33yvgjvcbxi2clg2wccaj"; - name = "kded-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kded-5.26.0.tar.xz"; + sha256 = "0rk8jh0bg6wqfpjcg0g1i2frmhprc8pmnj6bwdifx119kh894n0l"; + name = "kded-5.26.0.tar.xz"; }; }; kdelibs4support = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kdelibs4support-5.24.0.tar.xz"; - sha256 = "12sis63mq6i372bhx64x8y0pw6czrv64hdhjscx27cx65a4ir451"; - name = "kdelibs4support-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kdelibs4support-5.26.0.tar.xz"; + sha256 = "0jc05qzpcn72rvfyink7x56hvc7g21dcmgkfdx9w84brvqjnscz8"; + name = "kdelibs4support-5.26.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdesignerplugin-5.24.0.tar.xz"; - sha256 = "0i0s8pwwhwh5hyyvkv0cnj0yyv0g5bnm5xw18knv2yagiy4bvb2j"; - name = "kdesignerplugin-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdesignerplugin-5.26.0.tar.xz"; + sha256 = "10c8d83zl8qlg785rxn4d5ps18p0zplf5l00jnq8ikpa4ijnyn2j"; + name = "kdesignerplugin-5.26.0.tar.xz"; }; }; kdesu = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdesu-5.24.0.tar.xz"; - sha256 = "1ivcnhgvq75xvl0w9g7m45qzallz42ijaq0n1ap09lpdfmjbnrxk"; - name = "kdesu-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdesu-5.26.0.tar.xz"; + sha256 = "0kxqrzbhjahp0cx3n828q2gh1bdxsp7gmhahbhfzasknkvp1nqqs"; + name = "kdesu-5.26.0.tar.xz"; }; }; kdewebkit = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdewebkit-5.24.0.tar.xz"; - sha256 = "1xq36zv7vnllhqbisl6kcna8z6qzlvy29a47g0hbzgl8rc93qskf"; - name = "kdewebkit-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdewebkit-5.26.0.tar.xz"; + sha256 = "1z66jm8zpmksbdk7yzvcps712wd8d85r0dxw8zj3vw0z5yd68cmm"; + name = "kdewebkit-5.26.0.tar.xz"; }; }; kdnssd = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdnssd-5.24.0.tar.xz"; - sha256 = "01b650g031apxc3vd2m91g2fxqk9l8ap67z6rafniphfwy8i0d5m"; - name = "kdnssd-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdnssd-5.26.0.tar.xz"; + sha256 = "0jamzv7wxp50awjzk1vwhmj8pldnm6hjxx5zvsjfif26va30w0q3"; + name = "kdnssd-5.26.0.tar.xz"; }; }; kdoctools = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kdoctools-5.24.0.tar.xz"; - sha256 = "1r129kpq0d11b9l87cqbal6fm5ycwhsps1g3r1a7jsxz70scz4ri"; - name = "kdoctools-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kdoctools-5.26.0.tar.xz"; + sha256 = "1306ag1waw0cxkvwbb0n9gb9yc9nw6zzjssjrn19z366yp1z9ja8"; + name = "kdoctools-5.26.0.tar.xz"; }; }; kemoticons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kemoticons-5.24.0.tar.xz"; - sha256 = "0gmc52k5jb553jvzxwsq79v5y87kgav8i5qqv4bqc9yl7p866zhn"; - name = "kemoticons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kemoticons-5.26.0.tar.xz"; + sha256 = "09qpw3vr4l80hp4j6v73nsncmsrsxww2hab9c24i3167ygsvca5s"; + name = "kemoticons-5.26.0.tar.xz"; }; }; kfilemetadata = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kfilemetadata-5.24.0.tar.xz"; - sha256 = "02n9qhpr0jlwdgdbid0k34abhs3bzhlsa56ybl5dq1aib6izk1sy"; - name = "kfilemetadata-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kfilemetadata-5.26.0.tar.xz"; + sha256 = "1y80llazn66f7vndyzspz7w0n1g2xhi8g13qwakws278wsi04p1l"; + name = "kfilemetadata-5.26.0.tar.xz"; }; }; kglobalaccel = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kglobalaccel-5.24.0.tar.xz"; - sha256 = "123v0ld1q88hbm3d0mqgq6lcivfkqh7pbz4hb4n76ab5v43qc15c"; - name = "kglobalaccel-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kglobalaccel-5.26.0.tar.xz"; + sha256 = "0a1q9pif4n8fmp9kw8sbiaia2znc657fm1mi9gyvp5amphjjkzdd"; + name = "kglobalaccel-5.26.0.tar.xz"; }; }; kguiaddons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kguiaddons-5.24.0.tar.xz"; - sha256 = "0ig96ah20ybg5rwpswj9va2klvkh2q4amwxmgy3z4niwfsm2g3ic"; - name = "kguiaddons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kguiaddons-5.26.0.tar.xz"; + sha256 = "0gaaxkzjpdqk8534dpbn6dxb83nckh1g7w62nssv4a2jwfkyrmgp"; + name = "kguiaddons-5.26.0.tar.xz"; }; }; khtml = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/khtml-5.24.0.tar.xz"; - sha256 = "0f19m8ycaa41p61i0j43gafn364abral8dbiqhr0qcj33nsa4134"; - name = "khtml-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/khtml-5.26.0.tar.xz"; + sha256 = "1h1dacbwix1j9r0hgnpxhgjfbffh545852n2yn8kl25bf2ppx3m8"; + name = "khtml-5.26.0.tar.xz"; }; }; ki18n = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/ki18n-5.24.0.tar.xz"; - sha256 = "0cw24spmwsqa3ppkw03cm6yjd3sfll0dbbk2ya76fd4nw9hb00dv"; - name = "ki18n-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/ki18n-5.26.0.tar.xz"; + sha256 = "1f5xr2zskmi9x0xp6drg4mx41hs3ssyskpkd5x01b6s51av0i247"; + name = "ki18n-5.26.0.tar.xz"; }; }; kiconthemes = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kiconthemes-5.24.0.tar.xz"; - sha256 = "1k5zig2n6wzfyv6pc8dpas2862mxjyxxza00m31myrfw5i1a1h6m"; - name = "kiconthemes-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kiconthemes-5.26.0.tar.xz"; + sha256 = "0zccfdwy12zssbca4szwypykzvz3yiqwi69sz1ndpiwsvvp575b7"; + name = "kiconthemes-5.26.0.tar.xz"; }; }; kidletime = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kidletime-5.24.0.tar.xz"; - sha256 = "09jsj0pj27h93nr8v46savs6b93h8frydinfr7wlijkvpsl02jb4"; - name = "kidletime-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kidletime-5.26.0.tar.xz"; + sha256 = "13wpfkr3jsj3p16c67jfiy60pi0j1b85wrkc9bqx91wl8a22xy02"; + name = "kidletime-5.26.0.tar.xz"; }; }; kimageformats = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kimageformats-5.24.0.tar.xz"; - sha256 = "12mhgckmhnvcnm8k7mk15mipxrnm7i9ip7ykbjh8nxjiwyk1pmwc"; - name = "kimageformats-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kimageformats-5.26.0.tar.xz"; + sha256 = "13ibvrfjxm799sis1cilyaqc6cnb9wr464z605skn7qd2gqz7xfx"; + name = "kimageformats-5.26.0.tar.xz"; }; }; kinit = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kinit-5.24.0.tar.xz"; - sha256 = "1i7l6gid5hrrfglw1c461gpjg51dwz7cl4lx7ll8vz2ha8mz4d3n"; - name = "kinit-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kinit-5.26.0.tar.xz"; + sha256 = "031wjnniqmvix70da4x019r21zcv99xa4njzk0nccfihpn6i2nx9"; + name = "kinit-5.26.0.tar.xz"; }; }; kio = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kio-5.24.0.tar.xz"; - sha256 = "0zncj9yf8zaylazlwvirylpk9vki3j889b1x2s0aav54vvj7vdi5"; - name = "kio-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kio-5.26.0.tar.xz"; + sha256 = "1kvn570gcpzvm4fc8jygvf3w5jbgsjm4sr2bysbvw4zk983ldma0"; + name = "kio-5.26.0.tar.xz"; }; }; kitemmodels = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kitemmodels-5.24.0.tar.xz"; - sha256 = "1s1p4nw1pqdzbdwvjnka17p9avf00wadr437p4f96md1lvh3sh69"; - name = "kitemmodels-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kitemmodels-5.26.0.tar.xz"; + sha256 = "1qizknavlgnhc5dqrq5ins6k4s43s815v7inzwhs4qrgv175qcjv"; + name = "kitemmodels-5.26.0.tar.xz"; }; }; kitemviews = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kitemviews-5.24.0.tar.xz"; - sha256 = "0y3fx9hk1x27arrmwfzq783a44cs7p8dpmhxrwzh0di4mwa8jafw"; - name = "kitemviews-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kitemviews-5.26.0.tar.xz"; + sha256 = "1z4j1h0bykb3544iy48halb9mrjmkrd40x2c09qsm2r1kc7n3312"; + name = "kitemviews-5.26.0.tar.xz"; }; }; kjobwidgets = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kjobwidgets-5.24.0.tar.xz"; - sha256 = "1mcvrz66xcqjgbp08zpqsf943cm462wbqm5gh719p9s25hx8hwrc"; - name = "kjobwidgets-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kjobwidgets-5.26.0.tar.xz"; + sha256 = "0l2h7ghnrs3w8md5yajnbfl6na5ldg17sh9ifvhcwg6n9s57mibb"; + name = "kjobwidgets-5.26.0.tar.xz"; }; }; kjs = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kjs-5.24.0.tar.xz"; - sha256 = "1qd5sdfrdg7id0g5mwf3ijwlfvh3g36kwnckw6kwns1nf4q6gwlz"; - name = "kjs-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kjs-5.26.0.tar.xz"; + sha256 = "1f8mhhzq5k3ifpa1b0yspy886j9b82isz0vw16zl611fr564jln2"; + name = "kjs-5.26.0.tar.xz"; }; }; kjsembed = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kjsembed-5.24.0.tar.xz"; - sha256 = "1nx8ch8mzd1jyx8pd46364ij0bsbsclbipbgr6jm9aak3n13b0nw"; - name = "kjsembed-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kjsembed-5.26.0.tar.xz"; + sha256 = "030wrrxsdfkyalydi39s85hm0rgfx7647c4a4c1cck2v67k8iq3d"; + name = "kjsembed-5.26.0.tar.xz"; }; }; kmediaplayer = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kmediaplayer-5.24.0.tar.xz"; - sha256 = "147xrffkvkyv3h8ighc1vlwksysfrqc0g55k8zrd72l6r0kjjh0p"; - name = "kmediaplayer-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kmediaplayer-5.26.0.tar.xz"; + sha256 = "0zq9xx6g0lfdyxrkrjqyrq6hnygpd7n0grrm6a75hdmyh3lklrvv"; + name = "kmediaplayer-5.26.0.tar.xz"; }; }; knewstuff = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/knewstuff-5.24.0.tar.xz"; - sha256 = "0xdv3wh3100vzsx8p2zihy1dvh0wzfmrjkjq71v8igwz5d291zsj"; - name = "knewstuff-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/knewstuff-5.26.0.tar.xz"; + sha256 = "0jd80wmdz241ddk4wdqwrb655r5lzxbxbp0mjyljgi1mwlrhkry4"; + name = "knewstuff-5.26.0.tar.xz"; }; }; knotifications = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/knotifications-5.24.0.tar.xz"; - sha256 = "0qryp41phnpx4r9wa6rfhmnzy7nxl0ijnyrafadf2n2xb53ipkpa"; - name = "knotifications-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/knotifications-5.26.0.tar.xz"; + sha256 = "01fvbi4dlqhia5iqj0iddbvkzjafw698pmh2ii9ynb071sqyb2pq"; + name = "knotifications-5.26.0.tar.xz"; }; }; knotifyconfig = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/knotifyconfig-5.24.0.tar.xz"; - sha256 = "1dij841fnqia4p44x2wnpdvl8cn3nkj833y0fah50fmipjc8r70b"; - name = "knotifyconfig-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/knotifyconfig-5.26.0.tar.xz"; + sha256 = "14ri2zkzc1b3wqvfb3v6rv0ri5srm7zjk06v9j5bwz778vdh436z"; + name = "knotifyconfig-5.26.0.tar.xz"; }; }; kpackage = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kpackage-5.24.0.tar.xz"; - sha256 = "03aqzkpqz3c1v4qgwfbs3ncdbapiyg7psrkhxqv3z48rklavk1ri"; - name = "kpackage-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kpackage-5.26.0.tar.xz"; + sha256 = "1laq92gi67gn6gjz9nw51idq0wwyfwy6syfch0mssw3nbv7araqg"; + name = "kpackage-5.26.0.tar.xz"; }; }; kparts = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kparts-5.24.0.tar.xz"; - sha256 = "0z7qr93aq02i7g7cxgypx2rzlnsvbsx9cjblb0ijmad1nb8w3mix"; - name = "kparts-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kparts-5.26.0.tar.xz"; + sha256 = "1ni17k02152axvkx666lx77zwpbsfahknrhgy8y8sy2dbn47jvya"; + name = "kparts-5.26.0.tar.xz"; }; }; kpeople = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kpeople-5.24.0.tar.xz"; - sha256 = "0iknzkj23y927xh24kw5sjxyirhy6pkmfcmmgwzd78rba8a54qp2"; - name = "kpeople-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kpeople-5.26.0.tar.xz"; + sha256 = "1zx9mvy1j2ynbj7gg4hnvxrjr5akmrh0l82xh73l4b12l0b775ap"; + name = "kpeople-5.26.0.tar.xz"; }; }; kplotting = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kplotting-5.24.0.tar.xz"; - sha256 = "0gpypq9kh4b5s6dc7py3m117k3nbxczsfkxgxd9zxvr35kig7ya2"; - name = "kplotting-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kplotting-5.26.0.tar.xz"; + sha256 = "1f695bb5n46mn362wwvwf636xjy87s63w5ac97lm1c9ndiins394"; + name = "kplotting-5.26.0.tar.xz"; }; }; kpty = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kpty-5.24.0.tar.xz"; - sha256 = "1ybvdzqpa53kkki9p5da0ff9x3c63rmksk7865wqwlgy8apzi2fs"; - name = "kpty-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kpty-5.26.0.tar.xz"; + sha256 = "1f1z4z73l4xb5vymg5hsqxcgv7jm81jnjgwn0v85alfcx94dax3m"; + name = "kpty-5.26.0.tar.xz"; }; }; kross = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/portingAids/kross-5.24.0.tar.xz"; - sha256 = "0f29dpmfcj173vqnmrbpvdmfmzzbfsds1lbl546qfx9a5acdpf2p"; - name = "kross-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/portingAids/kross-5.26.0.tar.xz"; + sha256 = "05ilcgq74l5m3jjr047zwz7ij60yw5xxp5cpd12892mi054ijb31"; + name = "kross-5.26.0.tar.xz"; }; }; krunner = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/krunner-5.24.0.tar.xz"; - sha256 = "0ff87ijjd47jxf6zw2ggqgngnbyx1rj59wdfgy5wbi3acws6bafl"; - name = "krunner-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/krunner-5.26.0.tar.xz"; + sha256 = "050qq146g9wj51615m22l9jjxmgh3gsah3v7iflbdda5nrnzhz3v"; + name = "krunner-5.26.0.tar.xz"; }; }; kservice = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kservice-5.24.0.tar.xz"; - sha256 = "0w0nsg64d6xhgijr2vh0j5p544qi0q55jpqa9v9mv956zrrdssdk"; - name = "kservice-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kservice-5.26.0.tar.xz"; + sha256 = "103hjnwh4zwpf8vz3si27jb34j6dm0ff445nc9xafnl1nkwisvgr"; + name = "kservice-5.26.0.tar.xz"; }; }; ktexteditor = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/ktexteditor-5.24.0.tar.xz"; - sha256 = "1ykj1kvm7k1vxb1w235d5hp2swwdqjyp2y4c3pxbvkn999h9x5q5"; - name = "ktexteditor-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/ktexteditor-5.26.0.tar.xz"; + sha256 = "0q84vbdkhg1sjhyrcv9y8cdv5qx09f1pz5wiw7dzdw06q9xgi3v4"; + name = "ktexteditor-5.26.0.tar.xz"; }; }; ktextwidgets = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/ktextwidgets-5.24.0.tar.xz"; - sha256 = "1q10xav2gkii6s3m31c9xvxf1988l7k2lpib6pyhgsidflmwjm02"; - name = "ktextwidgets-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/ktextwidgets-5.26.0.tar.xz"; + sha256 = "0qafnlzkdqbp1par1s6mish46arbqwbl4xclvql168dlwxgd6b42"; + name = "ktextwidgets-5.26.0.tar.xz"; }; }; kunitconversion = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kunitconversion-5.24.0.tar.xz"; - sha256 = "03dfjn4lm6sl2zcdrvw0b9irzvkyc2w2j5xixag5j8nw373742h8"; - name = "kunitconversion-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kunitconversion-5.26.0.tar.xz"; + sha256 = "08nd2i76l4mvgav69qcsq0rwc0r9rkmqy0d4d3b4bc9957yfhk4i"; + name = "kunitconversion-5.26.0.tar.xz"; }; }; kwallet = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kwallet-5.24.0.tar.xz"; - sha256 = "0zad5h4vsvcl2xv3vxsjwh42b71xbp6x6rj8cvmw8szr2rzz9gsx"; - name = "kwallet-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kwallet-5.26.0.tar.xz"; + sha256 = "0a3l079zry8bmwkd2lx0cvmkj8p3pvrvpffikca6z4qdw4mnnxjs"; + name = "kwallet-5.26.0.tar.xz"; }; }; kwayland = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kwayland-5.24.0.tar.xz"; - sha256 = "1h5anbqrxcl1s8kx1l53vcsfr8ifamcjqd47dk8a7lwr1ga6myq2"; - name = "kwayland-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kwayland-5.26.0.tar.xz"; + sha256 = "1ca2f0k1qsra3c014c3lrn2qxsdq1whk5lqrxqc9dqbpvpyjy939"; + name = "kwayland-5.26.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kwidgetsaddons-5.24.0.tar.xz"; - sha256 = "1kppx0ppfhnb6q6sijs2dffyar86wkkx8miqavsjsgw1l2wiymcx"; - name = "kwidgetsaddons-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kwidgetsaddons-5.26.0.tar.xz"; + sha256 = "1jam478939cibyhnwg6n3fwyqg8lx1njjbqmlqq4cmp9j62100cn"; + name = "kwidgetsaddons-5.26.0.tar.xz"; }; }; kwindowsystem = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kwindowsystem-5.24.0.tar.xz"; - sha256 = "0w5ym8msl80v3q65253pdpj9f1fmb658rnndlbkrgpmm1rv1n6dz"; - name = "kwindowsystem-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kwindowsystem-5.26.0.tar.xz"; + sha256 = "1jmacixr2il5wpw7wzaqswslvmxam3qf7mih271qzbx6k6ngdyk3"; + name = "kwindowsystem-5.26.0.tar.xz"; }; }; kxmlgui = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kxmlgui-5.24.0.tar.xz"; - sha256 = "1qhixldhhcbklmrpjh67440h1rrzqy70h57hw6ialjdsr3pl6ihp"; - name = "kxmlgui-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kxmlgui-5.26.0.tar.xz"; + sha256 = "18w41iyfg2iphav2g7qikg4ccv2cr0wl5a6r9h460f45vq9aph4z"; + name = "kxmlgui-5.26.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/kxmlrpcclient-5.24.0.tar.xz"; - sha256 = "06ap6ipzqimz1rfrcr7z8zc7idy7sg4a97dws7h52i34ms7jqnc8"; - name = "kxmlrpcclient-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/kxmlrpcclient-5.26.0.tar.xz"; + sha256 = "001rvsmxi1mnbrs1kplsb8vx1wfpjp9g4kwm7714w3yh6vmr9j7p"; + name = "kxmlrpcclient-5.26.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/modemmanager-qt-5.24.0.tar.xz"; - sha256 = "0khz5bf84xxa8aqpzwb6x839xx6dbiadwqhyj7cvgha65fh2xinh"; - name = "modemmanager-qt-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/modemmanager-qt-5.26.0.tar.xz"; + sha256 = "1x4h334fcyqnclc9sxff73b79fsgg7a0r98c9palr787qvaafjv2"; + name = "modemmanager-qt-5.26.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/networkmanager-qt-5.24.0.tar.xz"; - sha256 = "11wy0ds0hqbba900ggkcxjfqc9n65xlzc3h1zv9433nn5d75v6fy"; - name = "networkmanager-qt-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/networkmanager-qt-5.26.0.tar.xz"; + sha256 = "0yqhchkava6jsyl0gpa62x4856qszdiglwjxsba9dgl5lasfyrg0"; + name = "networkmanager-qt-5.26.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/oxygen-icons5-5.24.0.tar.xz"; - sha256 = "1c7spjbzk04725vv0ly7vmyvwa96mfa5ki2pm146ld4888a896wm"; - name = "oxygen-icons5-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/oxygen-icons5-5.26.0.tar.xz"; + sha256 = "0lwwl26xiya7fr5ga5kf45zvj40lm10jpd7p523v2dm0xmqbkf8n"; + name = "oxygen-icons5-5.26.0.tar.xz"; }; }; plasma-framework = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/plasma-framework-5.24.0.tar.xz"; - sha256 = "0981vm00541dzihlr1fsax05biwp2ddpwjrmvnfysx5jagdc65cb"; - name = "plasma-framework-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/plasma-framework-5.26.0.tar.xz"; + sha256 = "0mjmzca0n51vwy9gxxanxfi2dvvzzdpwfjw0zdwmjm69znc870ja"; + name = "plasma-framework-5.26.0.tar.xz"; }; }; solid = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/solid-5.24.0.tar.xz"; - sha256 = "00wvsxcnvhdx7ijzpcz5wny2ypkxr1drdpr4yvawgpwa678l1107"; - name = "solid-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/solid-5.26.0.tar.xz"; + sha256 = "1dlln9dqyf7md32s6a7pd23dbs6jrvv59ylldxcxgkyjyyb2g0j3"; + name = "solid-5.26.0.tar.xz"; }; }; sonnet = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/sonnet-5.24.0.tar.xz"; - sha256 = "152xz7fb1iwhb5w1n4xqvc648iaxi0inrl4kavxcsir61das1xyl"; - name = "sonnet-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/sonnet-5.26.0.tar.xz"; + sha256 = "0akvlrbbk0nbyh12rmcjch122xqa3926gz3l31bvhqgm50b683z2"; + name = "sonnet-5.26.0.tar.xz"; }; }; threadweaver = { - version = "5.24.0"; + version = "5.26.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.24/threadweaver-5.24.0.tar.xz"; - sha256 = "02g60zr9cc4bg1p90giich4n0qvqaiakz0y94qrnyj9f7fg0yksl"; - name = "threadweaver-5.24.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.26/threadweaver-5.26.0.tar.xz"; + sha256 = "1bzlw3m1f207967pjmzlx1k0v38fwjvga9jg88iqh43zb60ks03a"; + name = "threadweaver-5.26.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 78644200e0b..8fda2b7e584 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -11,11 +11,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "${type}krb5-${version}"; - version = "1.14.2"; + version = "1.14.3"; src = fetchurl { url = "${meta.homepage}dist/krb5/1.14/krb5-${version}.tar.gz"; - sha256 = "09wbv969ak4fqlqr1ip5bi62fny1zlp1vwjarvj6a6cdfzkdgjkb"; + sha256 = "1jgjiyh1sp72lkxvk437lz5hzcibvw99jc4ihzfz03fg43aj0ind"; }; configureFlags = optional stdenv.isFreeBSD ''WARN_CFLAGS=""''; diff --git a/pkgs/development/libraries/keybinder/default.nix b/pkgs/development/libraries/keybinder/default.nix index 0ab24df57ba..63ab7144c47 100644 --- a/pkgs/development/libraries/keybinder/default.nix +++ b/pkgs/development/libraries/keybinder/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk -, gtk_doc, gtk2, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection +{ stdenv, fetchurl, autoconf, automake, libtool, pkgconfig, gnome3 +, gtk_doc, gtk2, pythonPackages, lua, libX11, libXext, libXrender, gobjectIntrospection }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject3 pygtk; +in stdenv.mkDerivation rec { name = "keybinder-${version}"; version = "0.3.0"; diff --git a/pkgs/development/libraries/keybinder3/default.nix b/pkgs/development/libraries/keybinder3/default.nix index 581e6e70b71..cfc8590c639 100644 --- a/pkgs/development/libraries/keybinder3/default.nix +++ b/pkgs/development/libraries/keybinder3/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3, pygobject3, pygtk -, gtk_doc, gtk3, python, pygobject, lua, libX11, libXext, libXrender, gobjectIntrospection +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, gnome3 +, gtk_doc, gtk3, python, lua, libX11, libXext, libXrender, gobjectIntrospection }: stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/lcms/cve-2013-4276.patch b/pkgs/development/libraries/lcms/cve-2013-4276.patch new file mode 100644 index 00000000000..8f2f3229782 --- /dev/null +++ b/pkgs/development/libraries/lcms/cve-2013-4276.patch @@ -0,0 +1,62 @@ +diff -ur lcms-1.19.dfsg/samples/icctrans.c lcms-1.19.dfsg-patched/samples/icctrans.c +--- lcms-1.19.dfsg/samples/icctrans.c 2009-10-30 15:57:45.000000000 +0000 ++++ lcms-1.19.dfsg-patched/samples/icctrans.c 2013-08-06 11:53:14.385266647 +0100 +@@ -86,6 +86,8 @@ + static LPcmsNAMEDCOLORLIST InputColorant = NULL; + static LPcmsNAMEDCOLORLIST OutputColorant = NULL; + ++unsigned int Buffer_size = 4096; ++ + + // isatty replacement + +@@ -500,7 +502,7 @@ + + Prefix[0] = 0; + if (!lTerse) +- sprintf(Prefix, "%s=", C); ++ snprintf(Prefix, 20, "%s=", C); + + if (InHexa) + { +@@ -648,7 +650,9 @@ + static + void GetLine(char* Buffer) + { +- scanf("%s", Buffer); ++ char User_buffer[Buffer_size]; ++ fgets(User_buffer, (Buffer_size - 1), stdin); ++ sscanf(User_buffer,"%s", Buffer); + + if (toupper(Buffer[0]) == 'Q') { // Quit? + +@@ -668,7 +672,7 @@ + static + double GetAnswer(const char* Prompt, double Range) + { +- char Buffer[4096]; ++ char Buffer[Buffer_size]; + double val = 0.0; + + if (Range == 0.0) { // Range 0 means double value +@@ -738,7 +742,7 @@ + static + WORD GetIndex(void) + { +- char Buffer[4096], Name[40], Prefix[40], Suffix[40]; ++ char Buffer[Buffer_size], Name[40], Prefix[40], Suffix[40]; + int index, max; + + max = cmsNamedColorCount(hTrans)-1; +diff -ur lcms-1.19.dfsg/tifficc/tiffdiff.c lcms-1.19.dfsg-patched/tifficc/tiffdiff.c +--- lcms-1.19.dfsg/tifficc/tiffdiff.c 2009-10-30 15:57:46.000000000 +0000 ++++ lcms-1.19.dfsg-patched/tifficc/tiffdiff.c 2013-08-06 11:49:06.698951157 +0100 +@@ -633,7 +633,7 @@ + cmsIT8SetSheetType(hIT8, "TIFFDIFF"); + + +- sprintf(Buffer, "Differences between %s and %s", TiffName1, TiffName2); ++ snprintf(Buffer, 256, "Differences between %s and %s", TiffName1, TiffName2); + + cmsIT8SetComment(hIT8, Buffer); + diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix index 1decde64e97..3e4f0d4265f 100644 --- a/pkgs/development/libraries/lcms/default.nix +++ b/pkgs/development/libraries/lcms/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation { sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0"; }; + patches = [ ./cve-2013-4276.patch ]; + outputs = [ "bin" "dev" "out" "man" ]; meta = { diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix index f4923a4e6bd..6fde8305da5 100644 --- a/pkgs/development/libraries/lcms2/default.nix +++ b/pkgs/development/libraries/lcms2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libtiff, libjpeg, zlib }: stdenv.mkDerivation rec { - name = "lcms2-2.7"; + name = "lcms2-2.8"; src = fetchurl { url = "mirror://sourceforge/lcms/${name}.tar.gz"; - sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925"; + sha256 = "08pvl289g0mbznzx5l6ibhaldsgx41kwvdn2c974ga9fkli2pl36"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 07689fbdd27..54196ae48ff 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -3,13 +3,15 @@ }: stdenv.mkDerivation rec { - name = "ldb-1.1.26"; + name = "ldb-1.1.27"; src = fetchurl { url = "mirror://samba/ldb/${name}.tar.gz"; - sha256 = "1rmjv12pf57vga8s5z9p9d90rlfckc1lqjbcp89r83cq5fkwfhw8"; + sha256 = "1b1mkl5p8swb67s9aswavhzswlib34hpgsv66zgns009paf2df6d"; }; + outputs = [ "out" "dev" ]; + buildInputs = [ python pkgconfig readline tdb talloc tevent popt libxslt docbook_xsl docbook_xml_dtd_42 @@ -24,6 +26,8 @@ stdenv.mkDerivation rec { "--builtin-libraries=replace" ]; + stripDebugList = "bin lib modules"; + meta = with stdenv.lib; { description = "A LDAP-like embedded database"; homepage = http://ldb.samba.org/; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix new file mode 100644 index 00000000000..1c9e8eca0d5 --- /dev/null +++ b/pkgs/development/libraries/libagar/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc +, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, mesa +, libsndfile, portaudio, mysql, fontconfig +}: + +let srcs = import ./srcs.nix { inherit fetchurl; }; in +stdenv.mkDerivation rec { + name = "libagar-${version}"; + inherit (srcs) version src; + + preConfigure = '' + substituteInPlace configure.in \ + --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' + cat configure.in | ${bsdbuild}/bin/mkconfigure > configure + ''; + + configureFlags = [ + "--with-libtool=${libtool}/bin/libtool" + "--enable-nls=yes" + "--with-gettext=${gettext}" + "--with-jpeg=${libjpeg.dev}" + "--with-gl=${mesa}" + "--with-mysql=yes" + "--with-manpages=yes" + ]; + + outputs = [ "out" "devdoc" ]; + + nativeBuildInputs = [ pkgconfig libtool gettext ]; + buildInputs = [ + bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.client mandoc + freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile + ]; + + meta = with stdenv.lib; { + description = "Cross-platform GUI toolkit"; + homepage = http://libagar.org/index.html; + license = with licenses; bsd3; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libagar/libagar_test.nix b/pkgs/development/libraries/libagar/libagar_test.nix new file mode 100644 index 00000000000..dea102774d0 --- /dev/null +++ b/pkgs/development/libraries/libagar/libagar_test.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, bsdbuild, libagar, perl, libjpeg, libpng, openssl }: + +let srcs = import ./srcs.nix { inherit fetchurl; }; in +stdenv.mkDerivation rec { + name = "libagar-test-${version}"; + inherit (srcs) version src; + + sourceRoot = "agar-1.5.0/tests"; + + preConfigure = '' + substituteInPlace configure.in \ + --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' + cat configure.in | ${bsdbuild}/bin/mkconfigure > configure + ''; + + configureFlags = "--with-agar=${libagar}"; + + buildInputs = [ perl bsdbuild libagar libjpeg libpng openssl ]; + + meta = with stdenv.lib; { + description = "Tests for libagar"; + homepage = http://libagar.org/index.html; + license = with licenses; bsd3; + maintainers = with maintainers; [ ramkromberg ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/libraries/libagar/srcs.nix b/pkgs/development/libraries/libagar/srcs.nix new file mode 100644 index 00000000000..53c6a5b89da --- /dev/null +++ b/pkgs/development/libraries/libagar/srcs.nix @@ -0,0 +1,10 @@ +{ fetchurl }: +rec { + version = "1.5.0"; + + src = fetchurl { + url = "http://stable.hypertriton.com/agar/agar-${version}.tar.gz"; + sha256 = "001wcqk5z67qg0raw9zlwmv62drxiwqykvsbk10q2mrc6knjsd42"; + }; + +} diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index 4cf0c52d88b..2717a326f4a 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -5,13 +5,15 @@ , glib, dbus_glib, gtkVersion , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, python, pygobject, pygtk, gobjectIntrospection, vala_0_23 -, monoSupport ? false, mono ? null, gtk-sharp ? null +, pythonPackages, gobjectIntrospection, vala_0_23 +, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject2 pygtk; +in stdenv.mkDerivation rec { name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}-${version}"; version = "${versionMajor}.${versionMinor}"; @@ -27,9 +29,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib - python pygobject pygtk gobjectIntrospection vala_0_23 + python pygobject2 pygtk gobjectIntrospection vala_0_23 ] ++ (if gtkVersion == "2" - then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] + then [ gtk2 libindicator-gtk2 libdbusmenu-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 libindicator-gtk3 libdbusmenu-gtk3 ]); postPatch = '' diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix index 0c5f900dd41..b2b00776582 100644 --- a/pkgs/development/libraries/libarchive/default.nix +++ b/pkgs/development/libraries/libarchive/default.nix @@ -1,5 +1,12 @@ -{ fetchurl, stdenv, acl, openssl, libxml2, attr, zlib, bzip2, e2fsprogs, xz, lzo -, sharutils }: +{ + fetchurl, stdenv, pkgconfig, + acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib, + + # Optional but increases closure only negligibly. + xarSupport ? true, +}: + +assert xarSupport -> libxml2 != null; stdenv.mkDerivation rec { name = "libarchive-${version}"; @@ -10,18 +17,24 @@ stdenv.mkDerivation rec { sha256 = "1lngng84k1kkljl74q0cdqc3s82vn2kimfm02dgm4d6m7x71mvkj"; }; - buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz lzo ] ++ - stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]; + outputs = [ "out" "lib" "dev" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ sharutils zlib bzip2 openssl xz lzo ] + ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ] + ++ stdenv.lib.optional xarSupport libxml2; # Without this, pkgconfig-based dependencies are unhappy propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ]; + configureFlags = stdenv.lib.optional (!xarSupport) "--without-xml2"; + preBuild = if stdenv.isCygwin then '' echo "#include " >> config.h '' else null; preFixup = '' - sed -i $out/lib/libarchive.la \ + sed -i $lib/lib/libarchive.la \ -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \ -e 's|-llzo2|-L${lzo}/lib -llzo2|' ''; @@ -31,7 +44,7 @@ stdenv.mkDerivation rec { longDescription = '' This library has code for detecting and reading many archive formats and compressions formats including (but not limited to) tar, shar, cpio, zip, and - compressed with gzip, bzip2, lzma, xz, .. + compressed with gzip, bzip2, lzma, xz, ... ''; homepage = http://libarchive.org; license = stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix index 4b579524a52..3528edcba12 100644 --- a/pkgs/development/libraries/libass/default.nix +++ b/pkgs/development/libraries/libass/default.nix @@ -19,11 +19,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { name = "libass-${version}"; - version = "0.13.2"; + version = "0.13.4"; src = fetchurl { url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz"; - sha256 = "1kpsw4zw95v4cjvild9wpk73dzavn1khsm3bm32kcz6amnkd166n"; + sha256 = "1dlzkjybnpl2fkvyjq0qblb7qw12cs893bs7zj3rvf8ij342yjnq"; }; configureFlags = [ diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix index ee76b79ced8..04e1af2326b 100644 --- a/pkgs/development/libraries/libcaca/default.nix +++ b/pkgs/development/libraries/libcaca/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, zlib }: +{ stdenv, fetchurl, ncurses, zlib, imlib2, pkgconfig, libX11, libXext }: stdenv.mkDerivation rec { name = "libcaca-0.99.beta19"; @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { outputs = [ "bin" "dev" "out" "man" ]; - configureFlags = "--disable-x11 --disable-imlib2 --disable-doc"; - - propagatedBuildInputs = [ ncurses zlib ]; + propagatedBuildInputs = [ ncurses zlib imlib2 pkgconfig libX11 ] + ++ stdenv.lib.optional stdenv.isDarwin libXext; postInstall = '' mkdir -p $dev/bin diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 053d6ba8e7d..4037de5a9cf 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -1,13 +1,14 @@ { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite , clutter_gtk, libsoup /*, libmemphis */ }: -let version = "0.12.13"; in stdenv.mkDerivation rec { + major = "0.12"; + version = "${major}.14"; name = "libchamplain-${version}"; src = fetchurl { - url = "mirror://gnome/sources/libchamplain/0.12/libchamplain-${version}.tar.xz"; - sha256 = "1arzd1hsgq14rbiwa1ih2g250x6ljna2s2kiqfrw155c612s9cxk"; + url = "mirror://gnome/sources/libchamplain/${major}/${name}.tar.xz"; + sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi"; }; buildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix index dbe818ba561..15e0fbc6f79 100644 --- a/pkgs/development/libraries/libconfuse/default.nix +++ b/pkgs/development/libraries/libconfuse/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libconfuse-${version}"; - version = "2.8"; + version = "3.0"; src = fetchFromGitHub { - sha256 = "0s0asxnml4rlv17ijz5w57x949anag28wx7wdahqx6mgqz0w2j2k"; + sha256 = "0021768bxqdxn84yaipncgi64889zrhc0r4ifmlfxirwq101dgr5"; rev = "v${version}"; repo = "libconfuse"; owner = "martinh"; diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index 142025c1e51..d2c202b970a 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchsvn, python }: +{ stdenv, fetchurl, python }: stdenv.mkDerivation rec { name = "ctemplate-${version}"; version = "2.3"; - src = fetchsvn { - url = "http://ctemplate.googlecode.com/svn/tags/${name}"; - sha256 = "1kvh82mhazf4qz7blnv0rcax7vi524dmz6v6rp89z2h3qjilbvc7"; + src = fetchurl { + url = "https://github.com/OlafvdSpek/ctemplate/archive/ctemplate-${version}.tar.gz"; + sha256 = "0mi5g2xlws10z1g4x0cj6kd1r673kkav35pgzyqxa1w47xnwprcr"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libcue/default.nix b/pkgs/development/libraries/libcue/default.nix index a5ff8d409b2..a1639397b5e 100644 --- a/pkgs/development/libraries/libcue/default.nix +++ b/pkgs/development/libraries/libcue/default.nix @@ -1,12 +1,19 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchFromGitHub, cmake, bison, flex }: stdenv.mkDerivation rec { - name = "libcue-1.4.0"; - src = fetchurl { - url = "mirror://sourceforge/libcue/${name}.tar.bz2"; - sha256 = "17kjd7rjz1bvfn44n3n2bjb7a1ywd0yc0g4sqp5ihf9b5bn7cwlb"; + name = "libcue-${version}"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "lipnitsk"; + repo = "libcue"; + rev = "v${version}"; + sha256 = "14a84d6sq3yp8s8i05lxvifjpkgpjwfpchrqf3bbpbwa8gvrc0rj"; }; + + nativeBuildInputs = [ cmake bison flex ]; + meta = { - description = "A library to parse a cue sheet"; + description = "CUE Sheet Parser Library"; longDescription = '' libcue is intended to parse a so called cue sheet from a char string or a file pointer. For handling of the parsed data a convenient API is diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix index 64cfb7d56ca..f2174470bec 100644 --- a/pkgs/development/libraries/libdrm/default.nix +++ b/pkgs/development/libraries/libdrm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev, valgrind }: stdenv.mkDerivation rec { - name = "libdrm-2.4.70"; + name = "libdrm-2.4.71"; src = fetchurl { url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2"; - sha256 = "b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b"; + sha256 = "c66287ddeee5f46ea8f8880b94b80acb3bbc33ba6321d17767eef145046df9b8"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix index ae3ae407a92..63978cfd740 100644 --- a/pkgs/development/libraries/libdvdcss/default.nix +++ b/pkgs/development/libraries/libdvdcss/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl }: +{stdenv, fetchurl, IOKit}: stdenv.mkDerivation rec { name = "libdvdcss-${version}"; version = "1.4.0"; + buildInputs = stdenv.lib.optional stdenv.isDarwin IOKit; + src = fetchurl { url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2"; sha256 = "0nl45ifc4xcb196snv9d6hinfw614cqpzcqp92dg43c0hickg290"; @@ -13,6 +15,6 @@ stdenv.mkDerivation rec { homepage = http://www.videolan.org/developers/libdvdcss.html; description = "A library for decrypting DVDs"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; }; } diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 2378eb915a8..9989990e35d 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libelf }: stdenv.mkDerivation rec { - name = "libdwarf-20121130"; - + name = "libdwarf-20161001"; + src = fetchurl { - url = http://reality.sgiweb.org/davea/libdwarf-20121130.tar.gz; - sha256 = "1nfdfn5xf3n485pvpb853awyxxnvrg207i0wmrr7bhk8fcxdxbn0"; + url = "http://www.prevanders.net/${name}.tar.gz"; + sha512 = "2c522ae0b6e2afffd09e2e79562987fd819b197c9bce4900b6a4fd176b5ff229e88c6b755cfbae7831e7160ddeb3bfe2afbf39d756d7e75ec31ace0668554048"; }; configureFlags = " --enable-shared --disable-nonshared"; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index f273a511aaf..364ff28f9a6 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -1,36 +1,34 @@ -{ stdenv, fetchurl, autoreconfHook, openssl, python, findutils }: +{ stdenv, fetchurl, autoreconfHook, openssl, findutils }: let version = "2.0.22"; in stdenv.mkDerivation { name = "libevent-${version}"; src = fetchurl { - url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz"; + url = "https://github.com/libevent/libevent/releases/download/release-${version}-stable/libevent-${version}-stable.tar.gz"; sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki"; }; - postPatch = "patchShebangs event_rpcgen.py"; outputs = [ "out" "dev" ]; outputBin = "dev"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openssl python ] ++ stdenv.lib.optional stdenv.isCygwin findutils; + buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isCygwin findutils; meta = with stdenv.lib; { description = "Event notification library"; + longDescription = '' + The libevent API provides a mechanism to execute a callback function + when a specific event occurs on a file descriptor or after a timeout + has been reached. Furthermore, libevent also support callbacks due + to signals or regular timeouts. - longDescription = - '' The libevent API provides a mechanism to execute a callback function - when a specific event occurs on a file descriptor or after a timeout - has been reached. Furthermore, libevent also support callbacks due - to signals or regular timeouts. - - libevent is meant to replace the event loop found in event driven - network servers. An application just needs to call event_dispatch() - and then add or remove events dynamically without having to change - the event loop. - ''; - + libevent is meant to replace the event loop found in event driven + network servers. An application just needs to call event_dispatch() + and then add or remove events dynamically without having to change + the event loop. + ''; + homepage = http://libevent.org/; license = licenses.bsd3; platforms = platforms.all; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix index f4f3c774789..32eb4e04f03 100644 --- a/pkgs/development/libraries/libfm/default.nix +++ b/pkgs/development/libraries/libfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, gtk, intltool, menu-cache, pango, pkgconfig, vala_0_23 +{ stdenv, fetchurl, glib, gtk2, intltool, menu-cache, pango, pkgconfig, vala_0_23 , extraOnly ? false }: let inherit (stdenv.lib) optional; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0bsh4p7h2glhxf1cc1lvbxyb4qy0y1zsnl9izf7vrldkikrgc13q"; }; - buildInputs = [ glib gtk intltool pango pkgconfig vala_0_23 ] + buildInputs = [ glib gtk2 intltool pango pkgconfig vala_0_23 ] ++ optional (!extraOnly) menu-cache; configureFlags = optional extraOnly "--with-extra-only"; diff --git a/pkgs/development/libraries/libfpx/default.nix b/pkgs/development/libraries/libfpx/default.nix index 9616461177e..0a7a1d462ee 100644 --- a/pkgs/development/libraries/libfpx/default.nix +++ b/pkgs/development/libraries/libfpx/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libfpx-1.3.1-4"; + name = "libfpx-1.3.1-7"; src = fetchurl { url = "mirror://imagemagick/delegates/${name}.tar.xz"; - sha256 = "0pbvxbp30zqjpc0q71qbl15cb47py74c4d6a8qv1mqa6j81pb233"; + sha256 = "1s28mwb06w6dj0zl6ashpj8m1qiyadawzl7cvbw7dmj1w39ipghh"; }; # Darwin gets misdetected as Windows without this diff --git a/pkgs/development/libraries/libgee/0.8.nix b/pkgs/development/libraries/libgee/0.8.nix new file mode 100644 index 00000000000..aba06d86107 --- /dev/null +++ b/pkgs/development/libraries/libgee/0.8.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, glib }: + +let + ver_maj = "0.8"; + ver_min = "6"; +in +stdenv.mkDerivation rec { + name = "libgee-${ver_maj}.${ver_min}"; + + src = fetchurl { + url = "https://download.gnome.org/sources/libgee/${ver_maj}/${name}.tar.xz"; + sha256 = "1mp3bfghc8qh2v8h2pfhksda22mgy2d5ygm1jr3bir544nr8i4fg"; + }; + + buildInputs = [ glib ]; + nativeBuildInputs = [ pkgconfig ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "Utility library providing GObject-based interfaces and classes for commonly used data structures"; + license = licenses.lgpl21Plus; + platforms = platforms.linux; + homepage = "http://live.gnome.org/Libgee"; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/libraries/libgeotiff/default.nix b/pkgs/development/libraries/libgeotiff/default.nix index d30ea6e5324..01dd6b0d49e 100644 --- a/pkgs/development/libraries/libgeotiff/default.nix +++ b/pkgs/development/libraries/libgeotiff/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "libgeotiff-1.2.5"; src = fetchurl { - url = ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; + url = http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz; sha256 = "0z2yx77pm0zs81hc0b4lwzdd5s0rxcbylnscgq80b649src1fyzj"; }; diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix index b86eba685bb..0de84b1141d 100644 --- a/pkgs/development/libraries/libgksu/default.nix +++ b/pkgs/development/libraries/libgksu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk, gnome, gnome3, +{ stdenv, fetchurl, pkgconfig, wrapGAppsHook, gtk2, gnome2, gnome3, libstartup_notification, libgtop, perl, perlXMLParser, autoreconfHook, intltool, gtk_doc, docbook_xsl, xauth, sudo }: @@ -18,8 +18,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk gnome.GConf libstartup_notification - gnome3.libgnome_keyring libgtop gnome.libglade perl perlXMLParser + gtk2 gnome2.GConf libstartup_notification + gnome3.libgnome_keyring libgtop gnome2.libglade perl perlXMLParser ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix index b4b951325a4..e35da9e8087 100644 --- a/pkgs/development/libraries/libgpod/default.nix +++ b/pkgs/development/libraries/libgpod/default.nix @@ -1,10 +1,12 @@ {stdenv, lib, fetchurl, gettext, perl, perlXMLParser, intltool, pkgconfig, glib, libxml2, sqlite, libusb1, zlib, sg3_utils, gdk_pixbuf, taglib, - libimobiledevice, python, pygobject, mutagen, - monoSupport ? true, mono, gtk-sharp + libimobiledevice, pythonPackages, mutagen, + monoSupport ? true, mono, gtk-sharp-2_0 }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject2; +in stdenv.mkDerivation rec { name = "libgpod-0.8.3"; src = fetchurl { url = "mirror://sourceforge/gtkpod/${name}.tar.bz2"; @@ -21,10 +23,10 @@ stdenv.mkDerivation rec { dontStrip = true; propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils - gdk_pixbuf taglib libimobiledevice python pygobject mutagen ]; + gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ]; nativeBuildInputs = [ gettext perlXMLParser intltool pkgconfig perl - libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp ]; + libimobiledevice.swig ] ++ lib.optionals monoSupport [ mono gtk-sharp-2_0 ]; meta = { homepage = http://gtkpod.sourceforge.net/; diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix new file mode 100644 index 00000000000..27891fc4e4a --- /dev/null +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchFromGitHub, gnome3, glib, json_glib, libxml2, libarchive, libsoup, gobjectIntrospection, meson, ninja, pkgconfig, valadoc}: + +stdenv.mkDerivation rec { + name = "libhttpseverywhere-${version}"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "grindhold"; + repo = "libhttpseverywhere"; + rev = "${version}"; + sha256 = "1b8bcg4jp2h3nwk1g7jgswsipqzkjq2gb017v07wb7nvl6kdi0rc"; + }; + + nativeBuildInputs = [ gnome3.vala valadoc gobjectIntrospection meson ninja pkgconfig ]; + buildInputs = [ glib gnome3.libgee libxml2 json_glib libsoup libarchive ]; + + patches = [ ./meson.patch ]; + + configurePhase = '' + mkdir build + cd build + meson.py --prefix "$out" .. + ''; + + buildPhase = '' + ninja + ninja devhelp + ''; + + installPhase = "ninja install"; + + meta = { + description = "library to use HTTPSEverywhere in desktop applications"; + homepage = https://github.com/grindhold/libhttpseverywhere; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/libraries/libhttpseverywhere/meson.patch b/pkgs/development/libraries/libhttpseverywhere/meson.patch new file mode 100644 index 00000000000..3a86bf6b836 --- /dev/null +++ b/pkgs/development/libraries/libhttpseverywhere/meson.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index c20c2f9..f40bb2b 100644 +--- a/meson.build ++++ b/meson.build +@@ -19,7 +19,7 @@ + # If not, see http://www.gnu.org/licenses/. + #********************************************************************* + +-project ('httpseverywhere', ['vala','c']) ++project ('httpseverywhere', 'vala','c') + + pkgconfig = import('pkgconfig') + diff --git a/pkgs/development/libraries/libindicate/default.nix b/pkgs/development/libraries/libindicate/default.nix index 514aea12c7e..7094fa2534b 100644 --- a/pkgs/development/libraries/libindicate/default.nix +++ b/pkgs/development/libraries/libindicate/default.nix @@ -4,13 +4,15 @@ , pkgconfig, autoconf , glib, dbus_glib, libdbusmenu-glib , gtkVersion, gtk2 ? null, gtk3 ? null -, python, pygobject, pygtk, gobjectIntrospection, vala_0_23, gnome_doc_utils -, monoSupport ? false, mono ? null, gtk-sharp ? null +, pythonPackages, gobjectIntrospection, vala_0_23, gnome_doc_utils +, monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: with lib; -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject2 pygtk; +in stdenv.mkDerivation rec { name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libindicate-${postfix}-${version}"; version = "${versionMajor}.${versionMinor}"; @@ -26,9 +28,9 @@ stdenv.mkDerivation rec { buildInputs = [ glib dbus_glib libdbusmenu-glib - python pygobject pygtk gobjectIntrospection vala_0_23 gnome_doc_utils + python pygobject2 pygtk gobjectIntrospection vala_0_23 gnome_doc_utils ] ++ (if gtkVersion == "2" - then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp ] + then [ gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ gtk3 ]); postPatch = '' diff --git a/pkgs/development/libraries/libinfinity/default.nix b/pkgs/development/libraries/libinfinity/default.nix index 3e88ed99b85..d13a9050dc9 100644 --- a/pkgs/development/libraries/libinfinity/default.nix +++ b/pkgs/development/libraries/libinfinity/default.nix @@ -3,7 +3,7 @@ , documentation ? false # build documentation , avahiSupport ? false # build support for Avahi in libinfinity , stdenv, fetchurl, pkgconfig, glib, libxml2, gnutls, gsasl -, gtk ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }: +, gtk2 ? null, gtkdoc ? null, avahi ? null, libdaemon ? null, libidn, gss }: let edf = flag: feature: (if flag then "--with-" else "--without-") + feature; @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { }; buildInputs = [ pkgconfig glib libxml2 gsasl libidn gss ] - ++ optional gtkWidgets gtk + ++ optional gtkWidgets gtk2 ++ optional documentation gtkdoc ++ optional avahiSupport avahi ++ optional daemon libdaemon; diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index afc8a44397d..a3b01162914 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -16,11 +16,12 @@ in with stdenv.lib; stdenv.mkDerivation rec { - name = "libinput-1.3.3"; + name = "libinput-${version}"; + version = "1.5.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1kmiv1mcrxniigdcs65w23897mczsx0hasxc6p13hjk58zzfvj1h"; + sha256 = "0708259k2qpdyi8z8n74d2pprjdvivmqkskjkq7s7ypchn9mb5js"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 0cf07d0769a..6f833ec81a9 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, useGTK ? false }: +{ stdenv, fetchurl, pkgconfig, gtk2, useGTK ? false }: stdenv.mkDerivation rec { name = "libiodbc-3.52.8"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "16hjb6fcval85gnkgkxfhw4c5h3pgf86awyh8p2bhnnvzc0ma5hq"; }; - buildInputs = stdenv.lib.optionals useGTK [ gtk pkgconfig ]; + buildInputs = stdenv.lib.optionals useGTK [ gtk2 pkgconfig ]; preBuild = '' diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix new file mode 100644 index 00000000000..39806d7d22c --- /dev/null +++ b/pkgs/development/libraries/libite/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libconfuse }: + +stdenv.mkDerivation rec { + name = "libite-${version}"; + version = "1.8.2"; + + src = fetchFromGitHub { + owner = "troglobit"; + repo = "libite"; + rev = "v${version}"; + sha256 = "0cx566rcjq2m24yq7m88ci642x34lxy97kjb12cbi1c174k738hm"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libconfuse ]; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "Lightweight library of frog DNA"; + longDescription = '' + Libite is a lightweight library of frog DNA. It can be used to fill + the gaps in any dinosaur project. It holds useful functions and macros + developed by both Finit and the OpenBSD project. Most notably the + string functions: strlcpy(3), strlcat(3) and the highly useful *BSD + sys/queue.h and sys/tree.h API's. + + Libite is the frog DNA missing in GNU libc. However, -lite does not + aim to become another GLIB! One noticeable gap in GLIBC is the missing + _SAFE macros in the BSD sys/queue.h API — highly recommended when + traversing lists to delete/free nodes. + ''; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; + }; +} + diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 9171471882c..9e1d4b58a92 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -1,15 +1,23 @@ { stdenv, fetchurl, libgpgerror }: stdenv.mkDerivation rec { - name = "libksba-1.3.4"; + name = "libksba-1.3.5"; src = fetchurl { url = "mirror://gnupg/libksba/${name}.tar.bz2"; - sha256 = "0kxdb02z41cwm1xbwfwj9nbc0dzjhwyq8c475mlhhmpcxcy8ihpn"; + sha256 = "0h53q4sns1jz1pkmhcz5wp9qrfn9f5g9i3vjv6dafwzzlvblyi21"; }; + outputs = [ "out" "dev" "doc" ]; + propagatedBuildInputs = [ libgpgerror ]; + postInstall = '' + mkdir -p $dev/bin + mv $out/bin/*-config $dev/bin/ + rmdir --ignore-fail-on-non-empty $out/bin + ''; + meta = with stdenv.lib; { homepage = https://www.gnupg.org; description = "CMS and X.509 access library"; diff --git a/pkgs/development/libraries/libmaxminddb/default.nix b/pkgs/development/libraries/libmaxminddb/default.nix new file mode 100644 index 00000000000..827f18d2ffc --- /dev/null +++ b/pkgs/development/libraries/libmaxminddb/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libmaxminddb-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = meta.homepage + "/releases/download/${version}/${name}.tar.gz"; + sha256 = "0dxdyw6sxxmpzk2a96qp323r5kdmw7vm6m0l5a8gr52gf7nmks0z"; + }; + + meta = with stdenv.lib; { + description = "C library for working with MaxMind geolocation DB files"; + homepage = "https://github.com/maxmind/libmaxminddb"; + license = licenses.apsl20; + platforms = platforms.all; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index aa5d858d82c..c40e54e09cb 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python, udev, libgudev }: stdenv.mkDerivation rec { - name = "libmbim-1.12.2"; + name = "libmbim-1.14.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libmbim/${name}.tar.xz"; - sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl"; + url = "https://www.freedesktop.org/software/libmbim/${name}.tar.xz"; + sha256 = "0nxb4x8l092xckk4dy84cn5qhviif8akzy0miypapjqqbalm53fa"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix index 806f0e9cd82..f6dc4b86292 100644 --- a/pkgs/development/libraries/libmikmod/default.nix +++ b/pkgs/development/libraries/libmikmod/default.nix @@ -4,10 +4,10 @@ let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { - name = "libmikmod-3.3.7"; + name = "libmikmod-3.3.10"; src = fetchurl { url = "mirror://sourceforge/mikmod/${name}.tar.gz"; - sha256 = "18nrkf5l50hfg0y50yxr7bvik9f002lhn8c00nbcp6dgm5011x2c"; + sha256 = "0j7g4jpa2zgzw7x6s3rldypa7zlwjvn97rwx0sylx1iihhlzbcq0"; }; buildInputs = [ texinfo ] diff --git a/pkgs/development/libraries/libmpcdec/default.nix b/pkgs/development/libraries/libmpcdec/default.nix index 64cf460d75a..084d7ba7370 100644 --- a/pkgs/development/libraries/libmpcdec/default.nix +++ b/pkgs/development/libraries/libmpcdec/default.nix @@ -1,13 +1,16 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: stdenv.mkDerivation { name = "libmpcdec-1.2.6"; + src = fetchurl { url = http://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2; - md5 = "7f7a060e83b4278acf4b77d7a7b9d2c0"; + sha256 = "1a0jdyga1zfi4wgkg3905y6inghy3s4xfs5m4x7pal08m0llkmab"; }; meta = { + description = "Musepack SV7 decoder library"; platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix new file mode 100644 index 00000000000..3905ba1b271 --- /dev/null +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, cmake, boost, mysql }: + +stdenv.mkDerivation rec { + name = "libmysqlconnectorcpp-${version}"; + version = "1.1.7"; + + src = fetchurl { + url = "http://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}.tar.gz"; + sha256 = "0qy7kxz8h1zswr50ysyl2cc9gy0ip2j7ikl714m7lq3gsay3ydav"; + }; + + buildInputs = [ cmake boost mysql ]; + + cmakeFlags = [ "-DMYSQL_LIB_DIR=${mysql}/lib" ]; + + meta = { + homepage = http://dev.mysql.com/downloads/connector/cpp/; + description = "C++ library for connecting to mysql servers."; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libnabo/default.nix b/pkgs/development/libraries/libnabo/default.nix new file mode 100644 index 00000000000..485b24beaa3 --- /dev/null +++ b/pkgs/development/libraries/libnabo/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchFromGitHub, cmake, eigen, boost}: + +stdenv.mkDerivation rec { + version = "1.0.6"; + name = "libnabo-${version}"; + + src = fetchFromGitHub { + owner = "ethz-asl"; + repo = "libnabo"; + rev = version; + sha256 = "1pg4vjfq5n7zhjdf7rgvycd7bkk1iwr50fl2dljq43airxz6525w"; + }; + + buildInputs = [cmake eigen boost]; + + enableParallelBuilding = true; + + cmakeFlags = " + -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 + "; + + doCheck = true; + checkTarget = "test"; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "A fast K Nearest Neighbor library for low-dimensional spaces"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ cryptix ]; + }; +} diff --git a/pkgs/development/libraries/libnfnetlink/default.nix b/pkgs/development/libraries/libnfnetlink/default.nix index c47076014c4..be60612a4ff 100644 --- a/pkgs/development/libraries/libnfnetlink/default.nix +++ b/pkgs/development/libraries/libnfnetlink/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2"; - md5 = "98927583d2016a9fb1936fed992e2c5e"; + sha256 = "06mm2x4b01k3m7wnrxblk9j0mybyr4pfz28ml7944xhjx6fy2w7j"; }; meta = { diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index a59420a7045..dc0beb07db9 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { sha256 = "1rfkyz13cm8izm90c1xflp4rvsa24aqs6qpbbbqqcbmvzsj6j9yn"; }; + outputs = [ "out" "dev" ]; + + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray=(--includedir=$dev/include --libdir=$out/lib) + ''; + propagatedBuildInputs = [ expat curl fftw ]; meta = { diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 07a95887ab4..82bf9a48679 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fixedPoint ? false, withCustomModes ? true }: let - version = "1.1.2"; + version = "1.1.3"; in stdenv.mkDerivation rec { name = "libopus-${version}"; src = fetchurl { url = "http://downloads.xiph.org/releases/opus/opus-${version}.tar.gz"; - sha256 = "1z87x5c5x951lhnm70iqr2gqn15wns5cqsw8nnkvl48jwdw00a8f"; + sha256 = "0cxnd7pjxbgh6l3cbzsw29phpr5cq28fikfhjlp1hc3y5s0gxdjq"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libpinyin/default.nix b/pkgs/development/libraries/libpinyin/default.nix index bda5143208e..15d14199041 100644 --- a/pkgs/development/libraries/libpinyin/default.nix +++ b/pkgs/development/libraries/libpinyin/default.nix @@ -1,19 +1,34 @@ -{ stdenv, fetchurl, glib, db, pkgconfig }: +{ stdenv, fetchurl, fetchFromGitHub, autoreconfHook, glib, db, pkgconfig }: -stdenv.mkDerivation { - name = "libpinyin-1.3.0"; +let + modelData = fetchurl { + url = "mirror://sourceforge/libpinyin/models/model12.text.tar.gz"; + sha256 = "1fijhhnjgj8bj1xr5pp7c4qxf11cqybgfqg7v36l3x780d84hfnd"; + }; +in + +stdenv.mkDerivation rec { + name = "libpinyin-${version}"; + version = "1.6.0"; + + nativeBuildInputs = [ autoreconfHook glib db pkgconfig ]; + + postUnpack = '' + tar -xzf ${modelData} -C $sourceRoot/data + ''; + + src = fetchFromGitHub { + owner = "libpinyin"; + repo = "libpinyin"; + rev = version; + sha256 = "0k40a7wfp8zj9d426afv0am5sr3m2i2p309fq0vf8qrb050hj17f"; + }; meta = with stdenv.lib; { description = "Library for intelligent sentence-based Chinese pinyin input method"; homepage = https://sourceforge.net/projects/libpinyin; license = licenses.gpl2; + maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; - - buildInputs = [ glib db pkgconfig ]; - - src = fetchurl { - url = "mirror://sourceforge/project/libpinyin/libpinyin/libpinyin-1.3.0.tar.gz"; - sha256 = "e105c443b01cd67b9db2a5236435d5441cf514b997b891215fa65f16030cf1f2"; - }; } diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix new file mode 100644 index 00000000000..2b8fc1fcc8f --- /dev/null +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchFromGitHub, cmake, eigen, boost, libnabo}: + +stdenv.mkDerivation rec { + version = "2016-09-11"; + name = "libpointmatcher-${version}"; + + src = fetchFromGitHub { + owner = "ethz-asl"; + repo = "libpointmatcher"; + rev = "75044815d40ff934fe0bb7e05ed8bbf18c06493b"; + sha256 = "1s7ilvg3lhr1fq8sxw05ydmbd3kl46496jnyxprhnpgvpmvqsbzl"; + }; + + buildInputs = [cmake eigen boost libnabo]; + + enableParallelBuilding = true; + + cmakeFlags = " + -DEIGEN_INCLUDE_DIR=${eigen}/include/eigen3 + "; + + checkPhase = '' + export LD_LIBRARY_PATH=$PWD + ./utest/utest --path ../examples/data/ + ''; + doCheck = true; + + meta = with stdenv.lib; { + inherit (src.meta) homepage; + description = "An \"Iterative Closest Point\" library for 2-D/3-D mapping in robotic"; + license = licenses.bsd3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ cryptix ]; + }; +} diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 3aa708e568a..734760c8830 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "libqalculate-${version}"; - version = "0.9.9"; + version = "0.9.10"; src = fetchurl { url = "https://github.com/Qalculate/libqalculate/archive/v${version}.tar.gz"; - sha256 = "0avri5c3sr31ax0vjvzla1a11xb4irnrc6571lm6w4zxigqakkqk"; + sha256 = "0whzc15nwsrib6bpw4lqsm59yr0pfk44hny9sivfbwhidk0177zi"; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = [ intltool pkgconfig autoreconfHook doxygen ]; buildInputs = [ readline ]; propagatedBuildInputs = [ cln libxml2 glib ]; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index cfce5e0fd71..d0b46722ff3 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, python }: stdenv.mkDerivation rec { - name = "libqmi-1.12.6"; + name = "libqmi-1.16.0"; src = fetchurl { - url = "http://www.freedesktop.org/software/libqmi/${name}.tar.xz"; - sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8"; + url = "https://www.freedesktop.org/software/libqmi/${name}.tar.xz"; + sha256 = "0amshs06qc8zy8jz3r2yksqhhbamll7f893ll4zlvgr3zm3vpdks"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index d3127437de6..fedc5287b49 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "18fygk896gxbx47nh2rn5jp4skisgkl6pdfjqb7h0zn39hd6b6g5"; }; + outputs = [ "out" "lib" "dev" "doc" ]; + buildInputs = [ jasper ]; propagatedBuildInputs = [ lcms2 ]; diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix index 6009a44dcd2..1c101365950 100644 --- a/pkgs/development/libraries/libressl/2.3.nix +++ b/pkgs/development/libraries/libressl/2.3.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.3.7"; + version = "2.3.8"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "0q08yysyalz0fvzajm3x4wg4k6gn4hhd04qsfv27r1p4kj2mv7zm"; + sha256 = "1hjglpaw1bparlzyjczn0rak32n8hl53317izq81683x5kns8smf"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libressl/2.4.nix b/pkgs/development/libraries/libressl/2.4.nix index 43f9244d7a8..6db9df2a59e 100644 --- a/pkgs/development/libraries/libressl/2.4.nix +++ b/pkgs/development/libraries/libressl/2.4.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "libressl-${version}"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; - sha256 = "1qyrcyzrrn6r9cqvm66ib72qyr65q4hrdyiq1vb24a6nwmwdg1sz"; + sha256 = "03ln2ac9cv0pbz3109yjk7cr5yxqfk8ld6g61k9sgrs7wbrjcmxx"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/libressl/2.5.nix b/pkgs/development/libraries/libressl/2.5.nix new file mode 100644 index 00000000000..51925ee108e --- /dev/null +++ b/pkgs/development/libraries/libressl/2.5.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libressl-${version}"; + version = "2.5.0"; + + src = fetchurl { + url = "mirror://openbsd/LibreSSL/${name}.tar.gz"; + sha256 = "1bkfvapi4z826slycmicvs7hwgk4l82gd8w6nqvznldbammvyll6"; + }; + + enableParallelBuilding = true; + + outputs = [ "bin" "dev" "out" "man" ]; + + meta = with stdenv.lib; { + description = "Free TLS/SSL implementation"; + homepage = "http://www.libressl.org"; + platforms = platforms.all; + maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ]; + }; +} diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 7a0112e15ca..409307fb52b 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -6,11 +6,11 @@ # no introspection by default, it's too big stdenv.mkDerivation rec { - name = "librsvg-2.40.9"; + name = "librsvg-2.40.16"; src = fetchurl { url = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz"; - sha256 = "0fplymmqqr28y24vcnb01szn62pfbqhk8p1ngns54x9m6mflr5hk"; + sha256 = "0bpz6gsq8xi1pb5k9ax6vinph460v14znch3y5yz167s0dmwz2yl"; }; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ] - ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ]; + ++ stdenv.lib.optional enableIntrospection gobjectIntrospection; propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3; diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix index d7cb741a042..faeeb34d65d 100644 --- a/pkgs/development/libraries/libsamplerate/default.nix +++ b/pkgs/development/libraries/libsamplerate/default.nix @@ -4,20 +4,18 @@ let inherit (stdenv.lib) optionals optionalString; in stdenv.mkDerivation rec { - name = "libsamplerate-0.1.8"; + name = "libsamplerate-0.1.9"; src = fetchurl { url = "http://www.mega-nerd.com/SRC/${name}.tar.gz"; - sha256 = "01hw5xjbjavh412y63brcslj5hi9wdgkjd3h9csx5rnm8vglpdck"; + sha256 = "1ha46i0nbibq0pl0pjwcqiyny4hj8lp1bnl4dpxm64zjw9lb2zha"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libsndfile ] ++ optionals stdenv.isDarwin [ ApplicationServices CoreServices ]; - # maybe interesting configure flags: - #--disable-fftw disable usage of FFTW - #--disable-cpu-clip disable tricky cpu specific clipper + configureFlags = [ "--disable-fftw" ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/libsexy/default.nix b/pkgs/development/libraries/libsexy/default.nix index c0f12c54564..c8751c3e5dd 100644 --- a/pkgs/development/libraries/libsexy/default.nix +++ b/pkgs/development/libraries/libsexy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, glib, gtk, libxml2, pango +, glib, gtk2, libxml2, pango }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib gtk libxml2 pango ]; + buildInputs = [ glib gtk2 libxml2 pango ]; meta = with stdenv.lib; { description = "A collection of GTK+ widgets"; diff --git a/pkgs/development/libraries/libshout/default.nix b/pkgs/development/libraries/libshout/default.nix index 0e1d3a4bb4c..ef023640621 100644 --- a/pkgs/development/libraries/libshout/default.nix +++ b/pkgs/development/libraries/libshout/default.nix @@ -11,6 +11,8 @@ stdenv.mkDerivation rec { sha256 = "0kgjpf8jkgyclw11nilxi8vyjk4s8878x23qyxnvybbgqbgbib7k"; }; + outputs = [ "out" "dev" "doc" ]; + nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ libvorbis libtheora speex ]; diff --git a/pkgs/development/libraries/libsigcxx/default.nix b/pkgs/development/libraries/libsigcxx/default.nix index e062e2db5c2..4a309a87f2e 100644 --- a/pkgs/development/libraries/libsigcxx/default.nix +++ b/pkgs/development/libraries/libsigcxx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, gnum4 }: let - ver_maj = "2.8"; # odd major numbers are unstable + ver_maj = "2.10"; # odd major numbers are unstable ver_min = "0"; in stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/libsigc++/${ver_maj}/${name}.tar.xz"; - sha256 = "0lcnzzdq6718znfshs1hflpwqq6awbzwdyp4kv5lfaf54z880jbp"; + sha256 = "f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81"; }; patches = [(fetchpatch { url = "https://anonscm.debian.org/cgit/collab-maint/libsigc++-2.0.git/plain" diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix index b0bef6149d5..e0ad2100804 100644 --- a/pkgs/development/libraries/libsodium/default.nix +++ b/pkgs/development/libraries/libsodium/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libsodium-1.0.10"; + name = "libsodium-1.0.11"; src = fetchurl { url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz"; - sha256 = "1gn45g956lyz8l6iq187yc6l627vyivyp8qc5dkr6dnhdnlqddvi"; + sha256 = "0rf7z6bgpnf8lyz8sph4h43fbb28pmj4dgybf0hsxxj97kdljid1"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index cece520e3c5..480891e98af 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - rev = "0.6.20"; + rev = "0.6.23"; name = "libsolv-${rev}"; src = fetchFromGitHub { inherit rev; owner = "openSUSE"; repo = "libsolv"; - sha256 = "1gammarbnjbbkw2vlgcj9ynp1kgi5nns6xcl6ab8b5i4zgq91v2p"; + sha256 = "08ba7yx0br421lk6zf5mp0yl6nznkmc2vbka20qwm2lx5f0a25xg"; }; cmakeFlags = "-DENABLE_RPMMD=true -DENABLE_RPMDB=true -DENABLE_PUBKEY=true -DENABLE_RPMDB_BYRPMHEADER=true"; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index 707129a16bb..1489ab62774 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -4,15 +4,15 @@ , libintlOrEmpty , intltool, python }: let - majorVersion = "2.54"; - version = "${majorVersion}.1"; + majorVersion = "2.56"; + version = "${majorVersion}.0"; in stdenv.mkDerivation { name = "libsoup-${version}"; src = fetchurl { url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; - sha256 = "0cyn5pq4xl1gb8413h2p4d5wrn558dc054zhwmk4swrl40ijrd27"; + sha256 = "d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5"; }; prePatch = '' diff --git a/pkgs/development/libraries/libspatialite/default.nix b/pkgs/development/libraries/libspatialite/default.nix index eb3917b1192..faa0b988be2 100644 --- a/pkgs/development/libraries/libspatialite/default.nix +++ b/pkgs/development/libraries/libspatialite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos }: +{ stdenv, fetchurl, pkgconfig, libxml2, sqlite, zlib, proj, geos, libiconv }: stdenv.mkDerivation rec { name = "libspatialite-4.2.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0b9ipmp09y2ij7yajyjsh0zcwps8n5g88lzfzlkph33lail8l4wz"; }; - buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos ]; + buildInputs = [ pkgconfig libxml2 sqlite zlib proj geos libiconv ]; configureFlags = "--disable-freexl"; @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = https://www.gaia-gis.it/fossil/libspatialite; # They allow any of these license = with licenses; [ gpl2Plus lgpl21Plus mpl11 ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libstdc++5/default.nix b/pkgs/development/libraries/libstdc++5/default.nix new file mode 100644 index 00000000000..abe0538b8a9 --- /dev/null +++ b/pkgs/development/libraries/libstdc++5/default.nix @@ -0,0 +1,115 @@ +{ stdenv, fetchurl, fetchpatch, flex, bison, file }: + +stdenv.mkDerivation rec { + name = "libstdc++5-${version}"; + version = "3.3.6"; + + src = [ + (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; + sha256 = "1dpyrpsgakilz2rnh5f8gvrzq5pwzvndacc0df6m04bpqn5fx6sg"; + }) + (fetchurl { + url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; + sha256 = "14lxl81f7adpc9jxfiwzdxsdzs5zv4piv8xh7f9w910hfzrgvsby"; + }) + ]; + + patches = [ + ./no-sys-dirs.patch + (fetchpatch { + name = "siginfo.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/siginfo.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; + sha256 = "15zldbm33yba293dgrgsbv3j332hkc3iqpyc8fa7zl42mh9qk22j"; + addPrefixes = true; + }) + (fetchpatch { + name = "gcc-3.4.3-no_multilib_amd64.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/gcc-3.4.3-no_multilib_amd64.patch?h=packages/libstdc%2B%2B5&id=e36ee8ed9bb5942db14cf6249a2ead14974a2bfa"; + sha256 = "11m5lc51b0addhc4yq4rz0dwpv6k73rrj73wya3lqdk8rly6cjpm"; + addPrefixes = true; + }) + ]; + + postPatch = '' + # fix build issue with recent gcc + sed -i "s#O_CREAT#O_CREAT, 0666#" gcc/collect2.c + + # No fixincludes + sed -i -e 's@\./fixinc\.sh@-c true@' gcc/Makefile.in + ''; + + preConfigure = '' + mkdir ../build + cd ../build + configureScript=../$sourceRoot/configure + ''; + + preBuild = '' + # libstdc++ needs this; otherwise it will use /lib/cpp, which is a Bad + # Thing. + export CPP="gcc -E" + + # Use *real* header files, otherwise a limits.h is generated + # that does not include Glibc's limits.h (notably missing + # SSIZE_MAX, which breaks the build). + export NIX_FIXINC_DUMMY="$(cat $NIX_CC/nix-support/orig-libc-dev)/include" + + # The path to the Glibc binaries such as `crti.o'. + glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" + + # Figure out what extra flags to pass to the gcc compilers + # being generated to make sure that they use our glibc. + EXTRA_FLAGS="-I$NIX_FIXINC_DUMMY $(cat $NIX_CC/nix-support/libc-cflags) -O2" + + extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" + for i in $extraLDFlags; do + EXTRA_FLAGS="$EXTRA_FLAGS -Wl,$i" + done + + # CFLAGS_FOR_TARGET are needed for the libstdc++ configure script to find + # the startfiles. + # FLAGS_FOR_TARGET are needed for the target libraries to receive the -Bxxx + # for the startfiles. + makeFlagsArray=( \ + "''${makeFlagsArray[@]}" \ + NATIVE_SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + SYSTEM_HEADER_DIR="$NIX_FIXINC_DUMMY" \ + CFLAGS_FOR_BUILD="$EXTRA_FLAGS" \ + CFLAGS_FOR_TARGET="$EXTRA_FLAGS" \ + CXXFLAGS_FOR_BUILD="$EXTRA_FLAGS" \ + CXXFLAGS_FOR_TARGET="$EXTRA_FLAGS" \ + FLAGS_FOR_TARGET="$EXTRA_FLAGS" \ + LDFLAGS_FOR_BUILD="$EXTRA_FLAGS" \ + LDFLAGS_FOR_TARGET="$EXTRA_FLAGS" \ + BOOT_CFLAGS="$EXTRA_FLAGS" \ + BOOT_LDFLAGS="$EXTRA_FLAGS" + ) + ''; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ flex bison file ]; + + configureFlags = [ "--disable-multilib" "--enable-__cxa-atexit" "--enable-threads=posix" "--enable-languages=c++" "--enable-clocale=gnu" ]; + + buildFLags = [ "all-target-libstdc++-v3" ]; + + installFlags = [ "install-target-libstdc++-v3" ]; + + postInstall = '' + # Remove includefiles and libs provided by gcc + shopt -s extglob + rm -rf $out/{bin,include,share,man,info} + rm -f $out/lib/*.a + rm -rf $out/lib/!(libstdc++*) + ''; + + meta = with stdenv.lib; { + homepage = http://gcc.gnu.org/; + license = licenses.lgpl3Plus; + description = "GNU Compiler Collection, version ${version} -- C++ standard library"; + platforms = platforms.linux; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch b/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch new file mode 100644 index 00000000000..8c91d75f2a5 --- /dev/null +++ b/pkgs/development/libraries/libstdc++5/no-sys-dirs.patch @@ -0,0 +1,53 @@ +diff -ru3 gcc-3.3.6-old/gcc/cppdefault.c gcc-3.3.6/gcc/cppdefault.c +--- gcc-3.3.6-old/gcc/cppdefault.c 2003-11-07 02:13:31.000000000 +0300 ++++ gcc-3.3.6/gcc/cppdefault.c 2016-09-02 16:00:03.492484016 +0300 +@@ -26,6 +26,10 @@ + #include "system.h" + #include "cppdefault.h" + ++#undef LOCAL_INCLUDE_DIR ++#undef SYSTEM_INCLUDE_DIR ++#undef STANDARD_INCLUDE_DIR ++ + const struct default_include cpp_include_defaults[] + #ifdef INCLUDE_DEFAULTS + = INCLUDE_DEFAULTS; +diff -ru3 gcc-3.3.6-old/gcc/gcc.c gcc-3.3.6/gcc/gcc.c +--- gcc-3.3.6-old/gcc/gcc.c 2004-04-01 20:55:17.000000000 +0400 ++++ gcc-3.3.6/gcc/gcc.c 2016-09-02 16:01:24.843520114 +0300 +@@ -6130,10 +6130,6 @@ + NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1); + } + +- add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1, +- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); +- add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_2, +- "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1); + #if 0 /* Can cause surprises, and one can use -B./ instead. */ + add_prefix (&startfile_prefixes, "./", NULL, + PREFIX_PRIORITY_LAST, 1, NULL, 0); +diff -ru3 gcc-3.3.6-old/gcc/Makefile.in gcc-3.3.6/gcc/Makefile.in +--- gcc-3.3.6-old/gcc/Makefile.in 2004-04-01 20:55:23.000000000 +0400 ++++ gcc-3.3.6/gcc/Makefile.in 2016-09-02 16:00:03.493484017 +0300 +@@ -260,7 +260,11 @@ + PARTITION_H = $(srcdir)/../include/partition.h + + # Default native SYSTEM_HEADER_DIR, to be overridden by targets. +-NATIVE_SYSTEM_HEADER_DIR = /usr/include ++# Nix: we override NATIVE_SYSTEM_HEADER_DIR in order to prevent ++# `fixinc' from fixing header files in /usr/include. However, ++# NATIVE_SYSTEM_HEADER_DIR must point to an existing directory, so set ++# it to some dummy directory. ++NATIVE_SYSTEM_HEADER_DIR = $(NIX_FIXINC_DUMMY) + # Default cross SYSTEM_HEADER_DIR, to be overridden by targets. + CROSS_SYSTEM_HEADER_DIR = @CROSS_SYSTEM_HEADER_DIR@ + +@@ -2201,7 +2205,7 @@ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_alias)\" \ + -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \ +- -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \ ++ -DLOCAL_INCLUDE_DIR=\"/no-such-dir\" \ + -DCROSS_INCLUDE_DIR=\"$(CROSS_SYSTEM_HEADER_DIR)\" \ + -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \ + @TARGET_SYSTEM_ROOT_DEFINE@ diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 373405432c8..bb6907c7b04 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -7,10 +7,7 @@ stdenv.mkDerivation rec { name = "libtiff-${version}"; src = fetchurl { - urls = - [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" - "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" - ]; + url = "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd"; }; diff --git a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix b/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix deleted file mode 100644 index 985c570a34e..00000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/0.16.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "0.16.19"; - sha256 = "1nlrivhnshn4wd9m5dsbjmq84731z9f9glj5q3vxz0c01s1lv7vw"; -}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix new file mode 100644 index 00000000000..97aa0145956 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.0.nix @@ -0,0 +1,6 @@ +{ callPackage, ... } @ args: + +callPackage ./generic.nix (args // { + version = "1.0.10"; + sha256 = "1x5gvajplmwx869avlpx8p3c12pzi6wkgqaxmj5049nvw57l00kl"; +}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix deleted file mode 100644 index e2809e9d483..00000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.09.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "1.0.9"; - sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl"; -}) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index 1950f94aca2..b6aace0de2d 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "1.1"; - sha256 = "06dzzr9g2qhy48yy50xgac9jadjmqjykl52fq2kfl2l7xxzykkkz"; + version = "1.1.1"; + sha256 = "1185ixlhhwpkqvwhnhrzgply03zq8mycj25m1am9aad8nshiaw3j"; }) diff --git a/pkgs/development/libraries/libtunepimp/default.nix b/pkgs/development/libraries/libtunepimp/default.nix index 0d929941044..061b2cfedfb 100644 --- a/pkgs/development/libraries/libtunepimp/default.nix +++ b/pkgs/development/libraries/libtunepimp/default.nix @@ -4,6 +4,14 @@ stdenv.mkDerivation rec { name = "libtunepimp-0.5.3"; + outputs = [ "out" "lib" "dev" ]; + + setOutputFlags = false; + + preConfigure = '' + configureFlagsArray=(--includedir=$dev/include --libdir=$lib/lib) + ''; + propagatedBuildInputs = [ zlib expat curl libmusicbrainz2 taglib libmpcdec libmad libogg libvorbis flac libofa libtool ]; diff --git a/pkgs/development/libraries/libuecc/default.nix b/pkgs/development/libraries/libuecc/default.nix new file mode 100644 index 00000000000..3b45d4de884 --- /dev/null +++ b/pkgs/development/libraries/libuecc/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, cmake }: + +stdenv.mkDerivation rec { + version = "7"; + name = "libuecc-${version}"; + + src = fetchgit { + url = "git://git.universe-factory.net/libuecc"; + rev = "refs/tags/v${version}"; + sha256 = "1sm05aql75sh13ykgsv3ns4x4zzw9lvzid6misd22gfgf6r9n5fs"; + }; + + buildInputs = [ cmake ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Very small Elliptic Curve Cryptography library"; + homepage = https://git.universe-factory.net/libuecc; + license = licenses.bsd2; + platforms = platforms.unix; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 50c42f4f10b..4db64186850 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -1,8 +1,9 @@ -{ stdenv, fetchgit, cmake, pkgconfig, gtk3 }: +{ stdenv, fetchgit, cmake, pkgconfig, gtk3, darwin }: let shortName = "libui"; version = "3.1a"; + backend = if stdenv.isDarwin then "darwin" else "unix"; in stdenv.mkDerivation rec { name = "${shortName}-${version}"; @@ -12,27 +13,42 @@ in sha256 = "1lpbfa298c61aarlzgp7vghrmxg1274pzxh1j9isv8x758gk6mfn"; }; - buildInputs = [ cmake pkgconfig gtk3 ]; + buildInputs = [ cmake pkgconfig ] ++ + (if stdenv.isDarwin then [darwin.apple_sdk.frameworks.Cocoa] else [gtk3]); + + preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt + ''; + cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ + "-DCMAKE_OSX_SYSROOT=" + "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + ]; installPhase = '' mkdir -p $out/{include,lib} mkdir -p $out/lib/pkgconfig - + '' + stdenv.lib.optionalString stdenv.isLinux '' mv ./out/${shortName}.so.0 $out/lib/ ln -s $out/lib/${shortName}.so.0 $out/lib/${shortName}.so - + '' + stdenv.lib.optionalString stdenv.isDarwin '' + mv ./out/${shortName}.A.dylib $out/lib/ + ln -s $out/lib/${shortName}.A.dylib $out/lib/${shortName}.dylib + '' + '' cp $src/ui.h $out/include - cp $src/ui_unix.h $out/include + cp $src/ui_${backend}.h $out/include cp ${./libui.pc} $out/lib/pkgconfig/${shortName}.pc substituteInPlace $out/lib/pkgconfig/${shortName}.pc \ --subst-var-by out $out \ --subst-var-by version "${version}" ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -id $out/lib/${shortName}.A.dylib $out/lib/${shortName}.A.dylib + ''; meta = { homepage = https://github.com/andlabs/libui; description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports."; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/libraries/libunique/default.nix b/pkgs/development/libraries/libunique/default.nix index 0cdcbd72bae..ebf81c67be0 100644 --- a/pkgs/development/libraries/libunique/default.nix +++ b/pkgs/development/libraries/libunique/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, dbus_glib }: +{ stdenv, fetchurl, pkgconfig, glib, gtk2, dbus_glib }: stdenv.mkDerivation rec { name = "libunique-1.1.6"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ./1.1.6-include-terminator.patch ]; - buildInputs = [ pkgconfig glib gtk dbus_glib ]; + buildInputs = [ pkgconfig glib gtk2 dbus_glib ]; # don't make deprecated usages hard errors preBuild = ''substituteInPlace unique/dbus/Makefile --replace -Werror ""''; diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index 7f32f37a704..5b9c8facdb1 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.isDarwin [ ./clang.patch ]; - propagatedBuildInputs = [ libiconv ]; + propagatedBuildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv; configureFlags = [ "--with-libiconv-prefix=${libiconv}" diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix index 3f5d1b91723..947a10c0e47 100644 --- a/pkgs/development/libraries/libusb1/default.nix +++ b/pkgs/development/libraries/libusb1/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit }: stdenv.mkDerivation rec { - name = "libusb-1.0.19"; + name = "libusb-1.0.20"; src = fetchurl { url = "mirror://sourceforge/libusb/${name}.tar.bz2"; - sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c"; + sha256 = "1zzp6hc7r7m3gl6zjbmzn92zkih4664cckaf49l1g5hapa8721fb"; }; outputs = [ "out" "dev" ]; # get rid of propagating systemd closure diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 425eef00185..8cba1a38b5b 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -4,11 +4,12 @@ }: stdenv.mkDerivation rec { - name = "libva-1.7.0"; + name = "libva-${version}"; + version = "1.7.2"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2"; - sha256 = "0py9igf4kicj7ji22bjawkpd6my013qpg0s4ir2np9l1rk5vr2d6"; + sha256 = "04rczbnbi70y1ziy9ab59szi3glk9q35hshlws0bcj2ndbqirmjx"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/libvirt-glib/default.nix b/pkgs/development/libraries/libvirt-glib/default.nix index ae83ce78d5f..6bd0ec52f27 100644 --- a/pkgs/development/libraries/libvirt-glib/default.nix +++ b/pkgs/development/libraries/libvirt-glib/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchurl, pkgconfig, libvirt, glib, libxml2, intltool, libtool, yajl -, nettle, libgcrypt, python, pygobject, gobjectIntrospection, libcap_ng, numactl +, nettle, libgcrypt, pythonPackages, gobjectIntrospection, libcap_ng, numactl , xen }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygobject2; +in stdenv.mkDerivation rec { name = "libvirt-glib-0.2.3"; src = fetchurl { @@ -13,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libvirt glib libxml2 intltool libtool yajl nettle libgcrypt - python pygobject gobjectIntrospection libcap_ng numactl xen + python pygobject2 gobjectIntrospection libcap_ng numactl xen ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix index a5f52beed54..6e0809664cf 100644 --- a/pkgs/development/libraries/libwnck/default.nix +++ b/pkgs/development/libraries/libwnck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, intltool, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, intltool, xorg }: let ver_maj = "2.31"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ]; + buildInputs = [ pkgconfig gtk2 intltool xorg.libX11 xorg.libXres ]; # ?another optional: startup-notification configureFlags = [ "--disable-introspection" ]; # not needed anywhere AFAIK diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 72afc1d55eb..65e10c5a399 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }: stdenv.mkDerivation rec { - name = "libxml++-2.38.1"; + name = "libxml++-${maj_ver}.${min_ver}"; + maj_ver = "2.40"; + min_ver = "1"; src = fetchurl { - url = "mirror://gnome/sources/libxml++/2.38/${name}.tar.xz"; - sha256 = "0px0ljcf9rsfa092dzmm097yn7wln6d5fgsvj9lnrnq3kcc2j9c8"; + url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz"; + sha256 = "1sb3akryklvh2v6m6dihdnbpf1lkx441v972q9hlz1sq6bfspm2a"; }; nativeBuildInputs = [ pkgconfig perl ]; @@ -14,8 +16,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ libxml2 ]; - configureFlags = "--disable-documentation"; #doesn't build without this for some reason - meta = with stdenv.lib; { homepage = http://libxmlplusplus.sourceforge.net/; description = "C++ wrapper for the libxml2 XML parser library"; diff --git a/pkgs/development/libraries/libxmlxx/v3.nix b/pkgs/development/libraries/libxmlxx/v3.nix new file mode 100644 index 00000000000..e9b08609f23 --- /dev/null +++ b/pkgs/development/libraries/libxmlxx/v3.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, libxml2, glibmm, perl }: + +stdenv.mkDerivation rec { + name = "libxml++-${maj_ver}.${min_ver}"; + maj_ver = "3.0"; + min_ver = "0"; + + src = fetchurl { + url = "mirror://gnome/sources/libxml++/${maj_ver}/${name}.tar.xz"; + sha256 = "0lkrajbdys5f6w6qwfijih3hnbk4c6809qx2mmxkb7bj2w269wrg"; + }; + + nativeBuildInputs = [ pkgconfig perl ]; + + buildInputs = [ glibmm ]; + + propagatedBuildInputs = [ libxml2 ]; + + meta = with stdenv.lib; { + homepage = http://libxmlplusplus.sourceforge.net/; + description = "C++ wrapper for the libxml2 XML parser library, version 3"; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + maintainers = with maintainers; [ loskutov ]; + }; +} diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index f1b69447fac..2afbfc2fe99 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,27 +1,14 @@ { stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs }: stdenv.mkDerivation rec { - name = "libxslt-1.1.28"; + name = "libxslt-1.1.29"; src = fetchurl { url = "http://xmlsoft.org/sources/${name}.tar.gz"; - sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz"; + sha256 = "1klh81xbm9ppzgqk339097i39b7fnpmlj8lzn8bpczl3aww6x5xm"; }; - patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch - ++ stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt") - (fetchpatch { - name = "mingw.patch"; - url = "http://git.gnome.org/browse/libxslt/patch/?id=ab5810bf27cd63"; - sha256 = "0kkqq3fv2k3q86al38vp6zwxazpvp5kslcjnmrq4ax5cm2zvsjk3"; - }) - ++ [ - (fetchpatch { - name = "CVE-2015-7995.patch"; - url = "http://git.gnome.org/browse/libxslt/patch/?id=7ca19df892ca22"; - sha256 = "1xzg0q94dzbih9nvqp7g9ihz0a3qb0w23l1158m360z9smbi8zbd"; - }) - ]; + patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch; outputs = [ "bin" "dev" "out" "doc" ]; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 667298922ca..e441d1e6b61 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,21 +1,15 @@ { stdenv, fetchurl, fetchpatch }: let - version = "0.1.6"; + version = "0.1.7"; in stdenv.mkDerivation { name = "libyaml-${version}"; src = fetchurl { url = "http://pyyaml.org/download/libyaml/yaml-${version}.tar.gz"; - sha256 = "0j9731s5zjb8mjx7wzf6vh7bsqi38ay564x6s9nri2nh9cdrg9kx"; + sha256 = "0a87931cx5m14a1x8rbjix3nz7agrcgndf4h392vm62a4rby9240"; }; - patches = [(fetchpatch { - name = "CVE-2014-9130.diff"; - url = "http://bitbucket.org/xi/libyaml/commits/2b915675/raw/"; - sha256 = "1vrkga2wk060wccg61c2mj5prcyv181qikgdfi1z4hz8ygmpvl04"; - })]; - meta = with stdenv.lib; { homepage = http://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; diff --git a/pkgs/development/libraries/linenoise/create-pkg-config-file.sh b/pkgs/development/libraries/linenoise/create-pkg-config-file.sh new file mode 100755 index 00000000000..e3c38f05ab4 --- /dev/null +++ b/pkgs/development/libraries/linenoise/create-pkg-config-file.sh @@ -0,0 +1,13 @@ +cat < linenoise.pc +prefix=$out +exec_prefix=\${prefix} +libdir=\${exec_prefix}/lib +includedir=\${prefix}/include + +Name: linenoise +Description: A minimal, zero-config, BSD licensed, readline replacement. +Requires: +Version: 1.0.10 +Cflags: -I\${includedir}/ \${prefix}/src/linenoise.c + +EOF diff --git a/pkgs/development/libraries/linenoise/default.nix b/pkgs/development/libraries/linenoise/default.nix new file mode 100644 index 00000000000..6bbcc725f22 --- /dev/null +++ b/pkgs/development/libraries/linenoise/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "linenoise-${version}"; + version = "1.0.10"; # Its version 1.0 plus 10 commits + + src = fetchFromGitHub { + owner = "antirez"; + repo = "linenoise"; + rev = "c894b9e59f02203dbe4e2be657572cf88c4230c3"; + sha256 = "0wasql7ph5g473zxhc2z47z3pjp42q0dsn4gpijwzbxawid71b4w"; + }; + + buildPhase = ./create-pkg-config-file.sh; + + installPhase = '' + mkdir -p $out/{lib/pkgconfig,src,include} + cp linenoise.c $out/src/ + cp linenoise.h $out/include/ + cp linenoise.pc $out/lib/pkgconfig/ + ''; + + meta = { + homepage = https://github.com/antirez/linenoise; + description = "A minimal, zero-config, BSD licensed, readline replacement"; + maintainers = with stdenv.lib.maintainers; [ mpsyco ]; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/development/libraries/loudmouth/default.nix b/pkgs/development/libraries/loudmouth/default.nix index dfb3077f58f..775b515dc7f 100644 --- a/pkgs/development/libraries/loudmouth/default.nix +++ b/pkgs/development/libraries/loudmouth/default.nix @@ -1,21 +1,15 @@ { stdenv, fetchurl, openssl, libidn, glib, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "loudmouth-1.4.3"; + version = "1.5.3"; + name = "loudmouth-${version}"; src = fetchurl { - url = "mirror://gnome/sources/loudmouth/1.4/${name}.tar.bz2"; - sha256 = "1qr9z73i33y49pbpq6zy7q537g0iyc8sm56rjf0ylwcv01fkzacm"; + url = "http://mcabber.com/files/loudmouth/${name}.tar.bz2"; + sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; }; patches = [ - ./glib-2.32.patch - (fetchurl rec { - name = "01-fix-sasl-md5-digest-uri.patch"; - url = "https://projects.archlinux.org/svntogit/packages.git/plain/trunk/" - + "${name}?h=packages/loudmouth"; - sha256 = "0y79vbklscgp8248iirllwmgk4q0wwyl3gmxz7l9frc2384xvanm"; - }) ]; configureFlags = "--with-ssl=openssl"; @@ -27,5 +21,8 @@ stdenv.mkDerivation rec { meta = { description = "A lightweight C library for the Jabber protocol"; platforms = stdenv.lib.platforms.linux; + downloadPage = "http://mcabber.com/files/loudmouth/"; + downloadURLRegexp = "loudmouth-[0-9.]+[.]tar[.]bz2$"; + updateWalker = true; }; } diff --git a/pkgs/development/libraries/mapnik/default.nix b/pkgs/development/libraries/mapnik/default.nix index de8cc1e49cc..1df9cf0492d 100644 --- a/pkgs/development/libraries/mapnik/default.nix +++ b/pkgs/development/libraries/mapnik/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl +{ stdenv, fetchzip , boost, cairo, freetype, gdal, harfbuzz, icu, libjpeg, libpng, libtiff , libwebp, libxml2, proj, python, scons, sqlite, zlib }: stdenv.mkDerivation rec { name = "mapnik-${version}"; - version = "3.0.10"; + version = "3.0.12"; - src = fetchurl { - url = "https://mapnik.s3.amazonaws.com/dist/v${version}/mapnik-v${version}.tar.bz2"; - sha256 = "0fda6syrfb81930sf7rgw1qmpnik8k1ngrjkh43ywd3s37nbqh1n"; + src = fetchzip { + # this one contains all git submodules and is cheaper than fetchgit + url = "https://github.com/mapnik/mapnik/releases/download/v${version}/mapnik-v${version}.tar.bz2"; + sha256 = "02w360fxk0pfkk0zbwc134jq7rkkib58scs5k67j8np6fx6gag6i"; }; - outputs = [ "out" "dev" ]; + # a distinct dev output makes python-mapnik fail + outputs = [ "out" ]; nativeBuildInputs = [ python scons ]; diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index 3d0c594b61b..aae3d0f9c8b 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.2.1"; + version = "1.2.2"; name = "mdds-${version}"; src = fetchurl { url = "http://kohei.us/files/mdds/src/mdds-${version}.tar.bz2"; - sha256 = "0yzwdl8mf8xdj8rif1qq0qnlq7vlk5q86r3hs2x49m5rqzgljbqy"; + sha256 = "17fcjhsq3bzqm7ba9sgp6my3y4226jnwai6q5jq3810i745p67hl"; }; postInstall = '' diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 7231cf96302..4e464907c6b 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -26,7 +26,7 @@ if ! lists.elem stdenv.system platforms.mesaPlatforms then else let - version = "12.0.2"; + version = "12.0.3"; branch = head (splitString "." version); driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32"; in @@ -40,7 +40,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 = "d957a5cc371dcd7ff2aa0d87492f263aece46f79352f4520039b58b1f32552cb"; + sha256 = "1dc86dd9b51272eee1fad3df65e18cda2e556ef1bc0b6e07cd750b9757f493b1"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/development/libraries/mesa/symlink-drivers.patch b/pkgs/development/libraries/mesa/symlink-drivers.patch index b96e8e0b816..68c0f1da26b 100644 --- a/pkgs/development/libraries/mesa/symlink-drivers.patch +++ b/pkgs/development/libraries/mesa/symlink-drivers.patch @@ -1,7 +1,7 @@ -diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am mesa-11.1.4/src/gallium/targets/dri/Makefile.am ---- mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am 2016-05-09 14:20:52.000000000 +0200 -+++ mesa-11.1.4/src/gallium/targets/dri/Makefile.am 2016-05-22 17:56:03.396185082 +0200 -@@ -126,14 +126,13 @@ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am mesa-12.0.3/src/gallium/targets/dri/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/dri/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/dri/Makefile.am 2016-09-22 14:42:19.173575498 +0200 +@@ -134,14 +134,13 @@ done; endif @@ -19,9 +19,25 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/dri/Makefile.am mesa-11.1. uninstall-hook: for i in $(TARGET_DRIVERS); do \ -diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am mesa-11.1.4/src/gallium/targets/vdpau/Makefile.am ---- mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am 2016-01-29 13:21:30.000000000 +0100 -+++ mesa-11.1.4/src/gallium/targets/vdpau/Makefile.am 2016-05-22 20:54:12.722358242 +0200 +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am mesa-12.0.3/src/gallium/targets/va/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/va/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/va/Makefile.am 2016-09-22 14:45:39.635963339 +0200 +@@ -71,10 +71,10 @@ + # gallium_drv_video.so in the set of final installed files. + install-data-hook: + for i in $(TARGET_DRIVERS); do \ +- ln -f $(DESTDIR)$(vadir)/gallium_drv_video.so \ ++ ln -srf $(DESTDIR)$(vadir)/gallium_drv_video.so \ + $(DESTDIR)$(vadir)/$${i}_drv_video.so; \ + done; \ +- $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.* ++ $(RM) $(DESTDIR)$(vadir)/gallium_drv_video.la + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/vdpau/Makefile.am 2016-05-24 21:19:37.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/vdpau/Makefile.am 2016-09-22 14:42:19.173575498 +0200 @@ -103,15 +103,14 @@ done; endif @@ -49,10 +65,31 @@ diff -ru -x '*~' mesa-11.1.4-orig/src/gallium/targets/vdpau/Makefile.am mesa-11. uninstall-hook: for i in $(TARGET_DRIVERS); do \ -diff -ru -x '*~' mesa-11.1.4-orig/src/mesa/drivers/dri/Makefile.am mesa-11.1.4/src/mesa/drivers/dri/Makefile.am ---- mesa-11.1.4-orig/src/mesa/drivers/dri/Makefile.am 2016-01-18 08:39:26.000000000 +0100 -+++ mesa-11.1.4/src/mesa/drivers/dri/Makefile.am 2016-05-22 17:55:46.251244940 +0200 -@@ -86,14 +86,13 @@ +diff -ru -x '*~' mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am +--- mesa-12.0.3-orig/src/gallium/targets/xvmc/Makefile.am 2016-05-24 21:19:37.000000000 +0200 ++++ mesa-12.0.3/src/gallium/targets/xvmc/Makefile.am 2016-09-22 14:54:22.291014543 +0200 +@@ -73,7 +73,7 @@ + j=libXvMCgallium.$(LIB_EXT); \ + k=libXvMC$${i}.$(LIB_EXT); \ + l=$${k}.$(XVMC_MAJOR).$(XVMC_MINOR).0; \ +- ln -f $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ ++ ln -srf $${dest_dir}/$${j}.$(XVMC_MAJOR).$(XVMC_MINOR).0 \ + $${dest_dir}/$${l}; \ + ln -sf $${l} \ + $${dest_dir}/$${k}.$(XVMC_MAJOR).$(XVMC_MINOR); \ +@@ -82,7 +82,7 @@ + ln -sf $${l} \ + $${dest_dir}/$${k}; \ + done; \ +- $(RM) $${dest_dir}/libXvMCgallium.* ++ $(RM) $${dest_dir}/libXvMCgallium.la + + uninstall-hook: + for i in $(TARGET_DRIVERS); do \ +diff -ru -x '*~' mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am mesa-12.0.3/src/mesa/drivers/dri/Makefile.am +--- mesa-12.0.3-orig/src/mesa/drivers/dri/Makefile.am 2016-09-08 18:57:48.000000000 +0200 ++++ mesa-12.0.3/src/mesa/drivers/dri/Makefile.am 2016-09-22 14:42:19.173575498 +0200 +@@ -94,14 +94,13 @@ done; endif diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index fdb31293f37..907e628b767 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -9,6 +9,8 @@ stdenv.mkDerivation rec { sha256 = "0wyl5xl4pkw17pkxsdg8idqvsgm4fxapd0r4dw9wlxw250915nmf"; }; + outputs = [ "out" "dev" ]; + GTEST_DIR = "${gtest}"; propagatedBuildInputs = [ eigen epoxy ]; diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 6d5e36d726c..152c592f591 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.1.1"; + version = "3.2"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "0k1x57zviysvi91lkk66cg8v819vywm5g5yqs22wppfqcifx5m2z"; + sha256 = "15wxhk52yc62rx0pddmry66hqm6z5brrrkx4npd3wh9nybg86hpa"; }; }) diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 2eff4b3b5a4..a761106d9b1 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "nghttp2-${version}"; - version = "1.10.0"; + version = "1.14.1"; # 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 = "1m95j3lhxp6k16aa2m03rsky13nmj8ky1kk96cwl88vbsrliz4mh"; + sha256 = "0d7sk3pfkajhkmcqa7zx4rjg1pkwqraxxs7bxbwbm67r8wwqw87j"; }; # Configure script searches for a symbol which does not exist in jemalloc on Darwin diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix new file mode 100644 index 00000000000..32467e4849b --- /dev/null +++ b/pkgs/development/libraries/ntl/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, perl, gmp, libtool +}: + +stdenv.mkDerivation rec { + name = "ntl-${version}"; + version = "9.11.0"; + src = fetchurl { + url = "http://www.shoup.net/ntl/ntl-${version}.tar.gz"; + sha256 = "1wcwxpcby1c50llncz131334qq26lzh3dz21rahymgvakrq0369p"; + }; + + buildInputs = [ perl gmp libtool ]; + + sourceRoot = "${name}/src"; + + enableParallelBuilding = true; + + dontAddPrefix = true; + + configureFlags = [ "DEF_PREFIX=$(out)" "WIZARD=off" "SHARED=on" "NATIVE=off" "CXX=c++" ]; + + # doCheck = true; # takes some time + + meta = { + description = "A Library for doing Number Theory"; + longDescription = '' + NTL is a high-performance, portable C++ library providing data + structures and algorithms for manipulating signed, arbitrary + length integers, and for vectors, matrices, and polynomials over + the integers and over finite fields. + ''; + homepage = http://www.shoup.net/ntl/; + license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/ntrack/default.nix b/pkgs/development/libraries/ntrack/default.nix index b7460778474..564bf9f62e3 100644 --- a/pkgs/development/libraries/ntrack/default.nix +++ b/pkgs/development/libraries/ntrack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, pygobject, python }: +{ stdenv, fetchurl, glib, qt4, pkgconfig, libnl, python }: let version = "016"; diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix index 4a466ad133a..c17c224415d 100644 --- a/pkgs/development/libraries/openal-soft/default.nix +++ b/pkgs/development/libraries/openal-soft/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ optional alsaSupport alsaLib ++ optional pulseSupport libpulseaudio - ++ optional stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; + ++ optionals stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ]; NIX_LDFLAGS = [] ++ optional alsaSupport "-lasound" diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix index 3f3218a550f..4d3e9e9a04e 100644 --- a/pkgs/development/libraries/openbr/default.nix +++ b/pkgs/development/libraries/openbr/default.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - meta = { description = "Open Source Biometric Recognition"; homepage = http://openbiometrics.org/; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index d7f4367739f..fd66d5bd41e 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -28,6 +28,14 @@ stdenv.mkDerivation rec { sha256 = "1k29rxlvrhgc5hadg2nc50wa3d2ls9ndp373257p756a0aividxh"; }; + patches = + [ # Don't include a copy of the CMake status output in the + # build. This causes a runtime dependency on GCC. + ./no-build-info.patch + ]; + + outputs = [ "out" "dev" ]; + buildInputs = [ zlib ] ++ lib.optional enablePython pythonPackages.python diff --git a/pkgs/development/libraries/opencv/no-build-info.patch b/pkgs/development/libraries/opencv/no-build-info.patch new file mode 100644 index 00000000000..4ee9701583a --- /dev/null +++ b/pkgs/development/libraries/opencv/no-build-info.patch @@ -0,0 +1,14 @@ +diff -ru -x '*~' opencv-2.4.13-orig/modules/core/src/system.cpp opencv-2.4.13/modules/core/src/system.cpp +--- opencv-2.4.13-orig/modules/core/src/system.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ opencv-2.4.13/modules/core/src/system.cpp 2016-10-02 18:44:53.674181762 +0200 +@@ -442,9 +442,7 @@ + + const std::string& getBuildInformation() + { +- static std::string build_info = +-#include "version_string.inc" +- ; ++ static std::string build_info = "(build info elided)"; + return build_info; + } + diff --git a/pkgs/development/libraries/openjpeg/1.x.nix b/pkgs/development/libraries/openjpeg/1.x.nix index 2147bab0a6a..dfa5605dec8 100644 --- a/pkgs/development/libraries/openjpeg/1.x.nix +++ b/pkgs/development/libraries/openjpeg/1.x.nix @@ -1,7 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.2"; + version = "1.5.2"; branch = "1.5"; - sha256 = "11waq9w215zvzxrpv40afyd18qf79mxc28fda80bm3ax98cpppqm"; + revision = "version.1.5.2"; + sha256 = "1dvvpvb597i5z8srz2v4c5dsbxb966h125jx3m2z0r2gd2wvpfkp"; }) diff --git a/pkgs/development/libraries/openjpeg/2.0.nix b/pkgs/development/libraries/openjpeg/2.0.nix index 034942b25dd..dd30b18e97c 100644 --- a/pkgs/development/libraries/openjpeg/2.0.nix +++ b/pkgs/development/libraries/openjpeg/2.0.nix @@ -1,7 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.0.1"; + version = "2.0.1"; branch = "2"; - sha256 = "1c2xc3nl2mg511b63rk7hrckmy14681p1m44mzw3n1fyqnjm0b0z"; + revision = "version.2.0.1"; + sha256 = "03d0r8x66cxri9i20nr9gm1jnkp85yyd8mkrbmawv5nvybd0r7wv"; }) diff --git a/pkgs/development/libraries/openjpeg/2.1.nix b/pkgs/development/libraries/openjpeg/2.1.nix index f6b3ce3a9cd..00cd4103c8f 100644 --- a/pkgs/development/libraries/openjpeg/2.1.nix +++ b/pkgs/development/libraries/openjpeg/2.1.nix @@ -1,7 +1,8 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // rec { - version = "${branch}.0"; + version = "2.1.2"; branch = "2.1"; - sha256 = "00zzm303zvv4ijzancrsb1cqbph3pgz0nky92k9qx3fq9y0vnchj"; + revision = "v2.1.2"; + sha256 = "0kdcl9sqjz0vagli4ad6bxq1r8ma086m0prpkm5x3dxp37hpjp8h"; }) diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix index 03b6faed267..c70bab523cb 100644 --- a/pkgs/development/libraries/openjpeg/generic.nix +++ b/pkgs/development/libraries/openjpeg/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig +{ stdenv, fetchFromGitHub, cmake, pkgconfig , libpng, libtiff, lcms2 , mj2Support ? true # MJ2 executables , jpwlLibSupport ? true # JPWL library & executables @@ -11,7 +11,7 @@ , testsSupport ? false , jdk ? null # Inherit generics -, branch, sha256, version, ... +, branch, version, revision, sha256, ... }: assert jpipServerSupport -> jpipLibSupport && curl != null && fcgi != null; @@ -26,8 +26,10 @@ in stdenv.mkDerivation rec { name = "openjpeg-${version}"; - src = fetchurl { - url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz"; + src = fetchFromGitHub { + owner = "uclouvain"; + repo = "openjpeg"; + rev = revision; inherit sha256; }; diff --git a/pkgs/development/libraries/openscenegraph/default.nix b/pkgs/development/libraries/openscenegraph/default.nix index 1b69563355b..ec85542c920 100644 --- a/pkgs/development/libraries/openscenegraph/default.nix +++ b/pkgs/development/libraries/openscenegraph/default.nix @@ -1,33 +1,33 @@ -{ stdenv, lib, fetchurl, cmake, giflib, libjpeg, libtiff, lib3ds, freetype -, libpng, coin3d, jasper, gdal_1_11, xproto, libX11, libXmu -, freeglut, mesa, doxygen, ffmpeg, xineLib, unzip, zlib, openal -, libxml2, curl, a52dec, faad2, gdk_pixbuf, pkgconfig, kbproto, SDL -, qt4, poppler, librsvg, gtk -, withApps ? true }: +{ stdenv, lib, fetchurl, cmake, pkgconfig, doxygen, unzip +, freetype, libjpeg, jasper, libxml2, zlib, gdal, curl, libX11 +, cairo, poppler, librsvg, libpng, libtiff, libXrandr +, xineLib, boost +, withApps ? false +, withSDL ? false, SDL +, withQt4 ? false, qt4 +}: stdenv.mkDerivation rec { name = "openscenegraph-${version}"; - version = "3.2.1"; + version = "3.2.3"; src = fetchurl { - url = "http://trac.openscenegraph.org/downloads/developer_releases/${name}.zip"; - sha256 = "0v9y1gxb16y0mj994jd0mhcz32flhv2r6kc01xdqb4817lk75bnr"; + url = "http://trac.openscenegraph.org/downloads/developer_releases/OpenSceneGraph-${version}.zip"; + sha256 = "0gic1hy7fhs27ipbsa5862q120a9y4bx176nfaw2brcjp522zvb9"; }; + nativeBuildInputs = [ pkgconfig cmake doxygen unzip ]; + buildInputs = [ - cmake giflib libjpeg libtiff lib3ds freetype libpng coin3d jasper - gdal_1_11 xproto libX11 libXmu freeglut mesa doxygen ffmpeg - xineLib unzip zlib openal libxml2 curl a52dec faad2 gdk_pixbuf - pkgconfig kbproto SDL qt4 poppler librsvg gtk - ]; + freetype libjpeg jasper libxml2 zlib gdal curl libX11 + cairo poppler librsvg libpng libtiff libXrandr boost + xineLib + ] ++ lib.optional withSDL SDL + ++ lib.optional withQt4 qt4; enableParallelBuilding = true; - cmakeFlags = [ - "-DMATH_LIBRARY=" - "-DCMAKE_C_FLAGS=-D__STDC_CONSTANT_MACROS=1" - "-DCMAKE_CXX_FLAGS=-D__STDC_CONSTANT_MACROS=1" - ] ++ lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; + cmakeFlags = lib.optional (!withApps) "-DBUILD_OSG_APPLICATIONS=OFF"; meta = with stdenv.lib; { description = "A 3D graphics toolkit"; diff --git a/pkgs/development/libraries/openssl/1.0.1-CVE-2016-2177.diff b/pkgs/development/libraries/openssl/1.0.1-CVE-2016-2177.diff deleted file mode 100644 index f8a4b7c2257..00000000000 --- a/pkgs/development/libraries/openssl/1.0.1-CVE-2016-2177.diff +++ /dev/null @@ -1,256 +0,0 @@ -From 6f35f6deb5ca7daebe289f86477e061ce3ee5f46 Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Thu, 5 May 2016 11:10:26 +0100 -Subject: [PATCH] Avoid some undefined pointer arithmetic - -A common idiom in the codebase is: - -if (p + len > limit) -{ - return; /* Too long */ -} - -Where "p" points to some malloc'd data of SIZE bytes and -limit == p + SIZE - -"len" here could be from some externally supplied data (e.g. from a TLS -message). - -The rules of C pointer arithmetic are such that "p + len" is only well -defined where len <= SIZE. Therefore the above idiom is actually -undefined behaviour. - -For example this could cause problems if some malloc implementation -provides an address for "p" such that "p + len" actually overflows for -values of len that are too big and therefore p + len < limit! - -Issue reported by Guido Vranken. - -CVE-2016-2177 - -Reviewed-by: Rich Salz ---- - ssl/s3_srvr.c | 14 +++++++------- - ssl/ssl_sess.c | 2 +- - ssl/t1_lib.c | 48 ++++++++++++++++++++++++++---------------------- - 3 files changed, 34 insertions(+), 30 deletions(-) - -diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c -index 04cf93a..6c74caa 100644 ---- a/ssl/s3_srvr.c -+++ b/ssl/s3_srvr.c -@@ -1040,7 +1040,7 @@ int ssl3_get_client_hello(SSL *s) - - session_length = *(p + SSL3_RANDOM_SIZE); - -- if (p + SSL3_RANDOM_SIZE + session_length + 1 >= d + n) { -+ if (SSL3_RANDOM_SIZE + session_length + 1 >= (d + n) - p) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1058,7 +1058,7 @@ int ssl3_get_client_hello(SSL *s) - /* get the session-id */ - j = *(p++); - -- if (p + j > d + n) { -+ if ((d + n) - p < j) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1114,14 +1114,14 @@ int ssl3_get_client_hello(SSL *s) - - if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) { - /* cookie stuff */ -- if (p + 1 > d + n) { -+ if ((d + n) - p < 1) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; - } - cookie_len = *(p++); - -- if (p + cookie_len > d + n) { -+ if ((d + n ) - p < cookie_len) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1166,7 +1166,7 @@ int ssl3_get_client_hello(SSL *s) - p += cookie_len; - } - -- if (p + 2 > d + n) { -+ if ((d + n ) - p < 2) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1180,7 +1180,7 @@ int ssl3_get_client_hello(SSL *s) - } - - /* i bytes of cipher data + 1 byte for compression length later */ -- if ((p + i + 1) > (d + n)) { -+ if ((d + n) - p < i + 1) { - /* not enough data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH); -@@ -1246,7 +1246,7 @@ int ssl3_get_client_hello(SSL *s) - - /* compression */ - i = *(p++); -- if ((p + i) > (d + n)) { -+ if ((d + n) - p < i) { - /* not enough data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH); -diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c -index 48fc451..a97d060 100644 ---- a/ssl/ssl_sess.c -+++ b/ssl/ssl_sess.c -@@ -602,7 +602,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, - int r; - #endif - -- if (session_id + len > limit) { -+ if (limit - session_id < len) { - fatal = 1; - goto err; - } -diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c -index 0bdb77d..8ed1793 100644 ---- a/ssl/t1_lib.c -+++ b/ssl/t1_lib.c -@@ -942,11 +942,11 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - 0x02, 0x03, /* SHA-1/ECDSA */ - }; - -- if (data >= (limit - 2)) -+ if (limit - data <= 2) - return; - data += 2; - -- if (data > (limit - 4)) -+ if (limit - data < 4) - return; - n2s(data, type); - n2s(data, size); -@@ -954,7 +954,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - if (type != TLSEXT_TYPE_server_name) - return; - -- if (data + size > limit) -+ if (limit - data < size) - return; - data += size; - -@@ -962,7 +962,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - const size_t len1 = sizeof(kSafariExtensionsBlock); - const size_t len2 = sizeof(kSafariTLS12ExtensionsBlock); - -- if (data + len1 + len2 != limit) -+ if (limit - data != (int)(len1 + len2)) - return; - if (memcmp(data, kSafariExtensionsBlock, len1) != 0) - return; -@@ -971,7 +971,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - } else { - const size_t len = sizeof(kSafariExtensionsBlock); - -- if (data + len != limit) -+ if (limit - data != (int)(len)) - return; - if (memcmp(data, kSafariExtensionsBlock, len) != 0) - return; -@@ -1019,19 +1019,19 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, - if (data == limit) - goto ri_check; - -- if (data > (limit - 2)) -+ if (limit - data < 2) - goto err; - - n2s(data, len); - -- if (data + len != limit) -+ if (limit - data != len) - goto err; - -- while (data <= (limit - 4)) { -+ while (limit - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > (limit)) -+ if (limit - data < size) - goto err; - # if 0 - fprintf(stderr, "Received extension type %d size %d\n", type, size); -@@ -1460,20 +1460,20 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, - SSL_TLSEXT_HB_DONT_SEND_REQUESTS); - # endif - -- if (data >= (d + n - 2)) -+ if ((d + n) - data <= 2) - goto ri_check; - - n2s(data, length); -- if (data + length != d + n) { -+ if ((d + n) - data != length) { - *al = SSL_AD_DECODE_ERROR; - return 0; - } - -- while (data <= (d + n - 4)) { -+ while ((d + n) - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > (d + n)) -+ if ((d + n) - data < size) - goto ri_check; - - if (s->tlsext_debug_cb) -@@ -2179,29 +2179,33 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len, - /* Skip past DTLS cookie */ - if (s->version == DTLS1_VERSION || s->version == DTLS1_BAD_VER) { - i = *(p++); -- p += i; -- if (p >= limit) -+ -+ if (limit - p <= i) - return -1; -+ -+ p += i; - } - /* Skip past cipher list */ - n2s(p, i); -- p += i; -- if (p >= limit) -+ if (limit - p <= i) - return -1; -+ p += i; -+ - /* Skip past compression algorithm list */ - i = *(p++); -- p += i; -- if (p > limit) -+ if (limit - p < i) - return -1; -+ p += i; -+ - /* Now at start of extensions */ -- if ((p + 2) >= limit) -+ if (limit - p <= 2) - return 0; - n2s(p, i); -- while ((p + 4) <= limit) { -+ while (limit - p >= 4) { - unsigned short type, size; - n2s(p, type); - n2s(p, size); -- if (p + size > limit) -+ if (limit - p < size) - return 0; - if (type == TLSEXT_TYPE_session_ticket) { - int r; --- -1.9.1 - diff --git a/pkgs/development/libraries/openssl/1.0.2-CVE-2016-2177.diff b/pkgs/development/libraries/openssl/1.0.2-CVE-2016-2177.diff deleted file mode 100644 index ca934c20a67..00000000000 --- a/pkgs/development/libraries/openssl/1.0.2-CVE-2016-2177.diff +++ /dev/null @@ -1,279 +0,0 @@ -From a004e72b95835136d3f1ea90517f706c24c03da7 Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Thu, 5 May 2016 11:10:26 +0100 -Subject: [PATCH] Avoid some undefined pointer arithmetic - -A common idiom in the codebase is: - -if (p + len > limit) -{ - return; /* Too long */ -} - -Where "p" points to some malloc'd data of SIZE bytes and -limit == p + SIZE - -"len" here could be from some externally supplied data (e.g. from a TLS -message). - -The rules of C pointer arithmetic are such that "p + len" is only well -defined where len <= SIZE. Therefore the above idiom is actually -undefined behaviour. - -For example this could cause problems if some malloc implementation -provides an address for "p" such that "p + len" actually overflows for -values of len that are too big and therefore p + len < limit! - -Issue reported by Guido Vranken. - -CVE-2016-2177 - -Reviewed-by: Rich Salz ---- - ssl/s3_srvr.c | 14 +++++++------- - ssl/ssl_sess.c | 2 +- - ssl/t1_lib.c | 56 ++++++++++++++++++++++++++++++-------------------------- - 3 files changed, 38 insertions(+), 34 deletions(-) - -diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c -index ab28702..ab7f690 100644 ---- a/ssl/s3_srvr.c -+++ b/ssl/s3_srvr.c -@@ -980,7 +980,7 @@ int ssl3_get_client_hello(SSL *s) - - session_length = *(p + SSL3_RANDOM_SIZE); - -- if (p + SSL3_RANDOM_SIZE + session_length + 1 >= d + n) { -+ if (SSL3_RANDOM_SIZE + session_length + 1 >= (d + n) - p) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -998,7 +998,7 @@ int ssl3_get_client_hello(SSL *s) - /* get the session-id */ - j = *(p++); - -- if (p + j > d + n) { -+ if ((d + n) - p < j) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1054,14 +1054,14 @@ int ssl3_get_client_hello(SSL *s) - - if (SSL_IS_DTLS(s)) { - /* cookie stuff */ -- if (p + 1 > d + n) { -+ if ((d + n) - p < 1) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; - } - cookie_len = *(p++); - -- if (p + cookie_len > d + n) { -+ if ((d + n ) - p < cookie_len) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1131,7 +1131,7 @@ int ssl3_get_client_hello(SSL *s) - } - } - -- if (p + 2 > d + n) { -+ if ((d + n ) - p < 2) { - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT); - goto f_err; -@@ -1145,7 +1145,7 @@ int ssl3_get_client_hello(SSL *s) - } - - /* i bytes of cipher data + 1 byte for compression length later */ -- if ((p + i + 1) > (d + n)) { -+ if ((d + n) - p < i + 1) { - /* not enough data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH); -@@ -1211,7 +1211,7 @@ int ssl3_get_client_hello(SSL *s) - - /* compression */ - i = *(p++); -- if ((p + i) > (d + n)) { -+ if ((d + n) - p < i) { - /* not enough data */ - al = SSL_AD_DECODE_ERROR; - SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH); -diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c -index b182998..54ee783 100644 ---- a/ssl/ssl_sess.c -+++ b/ssl/ssl_sess.c -@@ -573,7 +573,7 @@ int ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, - int r; - #endif - -- if (session_id + len > limit) { -+ if (limit - session_id < len) { - fatal = 1; - goto err; - } -diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c -index fb64607..cdac011 100644 ---- a/ssl/t1_lib.c -+++ b/ssl/t1_lib.c -@@ -1867,11 +1867,11 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - 0x02, 0x03, /* SHA-1/ECDSA */ - }; - -- if (data >= (limit - 2)) -+ if (limit - data <= 2) - return; - data += 2; - -- if (data > (limit - 4)) -+ if (limit - data < 4) - return; - n2s(data, type); - n2s(data, size); -@@ -1879,7 +1879,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - if (type != TLSEXT_TYPE_server_name) - return; - -- if (data + size > limit) -+ if (limit - data < size) - return; - data += size; - -@@ -1887,7 +1887,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - const size_t len1 = sizeof(kSafariExtensionsBlock); - const size_t len2 = sizeof(kSafariTLS12ExtensionsBlock); - -- if (data + len1 + len2 != limit) -+ if (limit - data != (int)(len1 + len2)) - return; - if (memcmp(data, kSafariExtensionsBlock, len1) != 0) - return; -@@ -1896,7 +1896,7 @@ static void ssl_check_for_safari(SSL *s, const unsigned char *data, - } else { - const size_t len = sizeof(kSafariExtensionsBlock); - -- if (data + len != limit) -+ if (limit - data != (int)(len)) - return; - if (memcmp(data, kSafariExtensionsBlock, len) != 0) - return; -@@ -2053,19 +2053,19 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p, - if (data == limit) - goto ri_check; - -- if (data > (limit - 2)) -+ if (limit - data < 2) - goto err; - - n2s(data, len); - -- if (data + len != limit) -+ if (limit - data != len) - goto err; - -- while (data <= (limit - 4)) { -+ while (limit - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > (limit)) -+ if (limit - data < size) - goto err; - # if 0 - fprintf(stderr, "Received extension type %d size %d\n", type, size); -@@ -2472,18 +2472,18 @@ static int ssl_scan_clienthello_custom_tlsext(SSL *s, - if (s->hit || s->cert->srv_ext.meths_count == 0) - return 1; - -- if (data >= limit - 2) -+ if (limit - data <= 2) - return 1; - n2s(data, len); - -- if (data > limit - len) -+ if (limit - data < len) - return 1; - -- while (data <= limit - 4) { -+ while (limit - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > limit) -+ if (limit - data < size) - return 1; - if (custom_ext_parse(s, 1 /* server */ , type, data, size, al) <= 0) - return 0; -@@ -2569,20 +2569,20 @@ static int ssl_scan_serverhello_tlsext(SSL *s, unsigned char **p, - SSL_TLSEXT_HB_DONT_SEND_REQUESTS); - # endif - -- if (data >= (d + n - 2)) -+ if ((d + n) - data <= 2) - goto ri_check; - - n2s(data, length); -- if (data + length != d + n) { -+ if ((d + n) - data != length) { - *al = SSL_AD_DECODE_ERROR; - return 0; - } - -- while (data <= (d + n - 4)) { -+ while ((d + n) - data >= 4) { - n2s(data, type); - n2s(data, size); - -- if (data + size > (d + n)) -+ if ((d + n) - data < size) - goto ri_check; - - if (s->tlsext_debug_cb) -@@ -3307,29 +3307,33 @@ int tls1_process_ticket(SSL *s, unsigned char *session_id, int len, - /* Skip past DTLS cookie */ - if (SSL_IS_DTLS(s)) { - i = *(p++); -- p += i; -- if (p >= limit) -+ -+ if (limit - p <= i) - return -1; -+ -+ p += i; - } - /* Skip past cipher list */ - n2s(p, i); -- p += i; -- if (p >= limit) -+ if (limit - p <= i) - return -1; -+ p += i; -+ - /* Skip past compression algorithm list */ - i = *(p++); -- p += i; -- if (p > limit) -+ if (limit - p < i) - return -1; -+ p += i; -+ - /* Now at start of extensions */ -- if ((p + 2) >= limit) -+ if (limit - p <= 2) - return 0; - n2s(p, i); -- while ((p + 4) <= limit) { -+ while (limit - p >= 4) { - unsigned short type, size; - n2s(p, type); - n2s(p, size); -- if (p + size > limit) -+ if (limit - p < size) - return 0; - if (type == TLSEXT_TYPE_session_ticket) { - int r; --- -1.9.1 - diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index c023965c0f6..ea89bb859e5 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, perl -, withCryptodev ? false, cryptodevHeaders }: +, withCryptodev ? false, cryptodevHeaders +, enableSSL2 ? false }: with stdenv.lib; @@ -44,7 +45,7 @@ let ] ++ stdenv.lib.optionals withCryptodev [ "-DHAVE_CRYPTODEV" "-DUSE_CRYPTODEV_DIGESTS" - ]; + ] ++ stdenv.lib.optional enableSSL2 "enable-ssl2"; makeFlags = [ "MANDIR=$(man)/share/man" ]; @@ -106,26 +107,18 @@ let in { openssl_1_0_1 = common { - version = "1.0.1t"; - sha256 = "4a6ee491a2fdb22e519c76fdc2a628bb3cec12762cd456861d207996c8a07088"; - patches = [ - # https://git.openssl.org/?p=openssl.git;a=commit;h=6f35f6deb5ca7daebe289f86477e061ce3ee5f46 - ./1.0.1-CVE-2016-2177.diff - ]; + version = "1.0.1u"; + sha256 = "0fb7y9pwbd76pgzd7xzqfrzibmc0vf03sl07f34z5dhm2b5b84j3"; }; openssl_1_0_2 = common { - version = "1.0.2h"; - sha256 = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"; - patches = [ - # https://git.openssl.org/?p=openssl.git;a=commit;h=a004e72b95835136d3f1ea90517f706c24c03da7 - ./1.0.2-CVE-2016-2177.diff - ]; + version = "1.0.2j"; + sha256 = "0cf4ar97ijfc7mg35zdgpad6x8ivkdx9qii6mz35khi1ps9g5bz7"; }; openssl_1_1_0 = common { - version = "1.1.0"; - sha256 = "10lcpmnxap9nw8ymdglys93cgkwd1lf1rz4fhq5whwhlmkwrzipm"; + version = "1.1.0b"; + sha256 = "1xznrqvb1dbngv2k2nb6da6fdw00c01sy2i36yjdxr4vpxrf0pd4"; }; } diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 6daa1274565..b253a27a7db 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation { - name = "opensubdiv-3.0.4"; + name = "opensubdiv-3.0.5"; src = fetchFromGitHub { owner = "PixarAnimationStudios"; repo = "OpenSubdiv"; - rev = "v3_0_4"; - sha256 = "14ylpzk4121gi3fl02dwmqjp5sbaqpkm4gd0lh6jijccdih0xsc0"; + rev = "v3_0_5"; + sha256 = "16xv4cw1k75wgd4ddr0sa87wd46ygbn2k2avh9c1mfd405p80d92"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index 4db1cb5b524..814158276ce 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.1.0"; + version = "5.0.0"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "014503kqv7z63az6lgxr5fbajlrqylm5c4kgbf8p3a0n6cva0slr"; + sha256 = "00yznbrm9q04wgd4b831km8iwlvwvsnwv87igf79g5vj9yakr88q"; }; name = "libosip2-${version}"; diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 0de99ece5c4..6850c13b44e 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -2,14 +2,14 @@ let ver_maj = "2.40"; - ver_min = "0"; + ver_min = "1"; in stdenv.mkDerivation rec { name = "pangomm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/pangomm/${ver_maj}/${name}.tar.xz"; - sha256 = "03fpqdjp7plybf4zsgszbm8yhgl28vmajzfpmaqcsmyfvjlszl3x"; + sha256 = "9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 42a8d00eec0..b9762e284e6 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4 -, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private +, libusb1, libpcap, libXt, libpng, Cocoa, AGL, cf-private, OpenGL }: stdenv.mkDerivation rec { @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { libpng vtk qt4 libXt ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa AGL cf-private ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" ]; + "-DCMAKE_OSX_SYSROOT=" "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" + ]; preConfigure = stdenv.lib.optionalString stdenv.isDarwin '' NIX_CFLAGS_COMPILE=$(echo "$NIX_CFLAGS_COMPILE" | sed "s,[[:space:]]*-F$NIX_STORE/[[:alnum:]]*-CF-osx-[[:digit:].]*/Library/Frameworks,,g") diff --git a/pkgs/development/libraries/pcre/CVE-2016-1283.patch b/pkgs/development/libraries/pcre/CVE-2016-1283.patch deleted file mode 100644 index 2c2dad29e92..00000000000 --- a/pkgs/development/libraries/pcre/CVE-2016-1283.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: pcre_compile.c -=================================================================== ---- a/pcre_compile.c (revision 1635) -+++ b/pcre_compile.c (revision 1636) -@@ -7311,7 +7311,12 @@ - so far in order to get the number. If the name is not found, leave - the value of recno as 0 for a forward reference. */ - -- else -+ /* This patch (removing "else") fixes a problem when a reference is -+ to multiple identically named nested groups from within the nest. -+ Once again, it is not the "proper" fix, and it results in an -+ over-allocation of memory. */ -+ -+ /* else */ - { - ng = cd->named_groups; - for (i = 0; i < cd->names_found; i++, ng++) diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix index 7e2bec80c3c..d3499f3e15c 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.38"; + version = "8.39"; pname = if (variant == null) then "pcre" else if (variant == "cpp") then "pcre-cpp" else variant; @@ -17,13 +17,9 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${version}.tar.bz2"; - sha256 = "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r"; + sha256 = "12wyajlqx2v7dsh39ra9v9m5hibjkrl129q90bp32c28haghjn5q"; }; - patches = [ - ./CVE-2016-1283.patch - ]; - outputs = [ "bin" "dev" "out" "doc" "man" ]; configureFlags = [ diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index 447b8fe15ec..d226a51d0f8 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "pcre2-10.21"; + name = "pcre2-${version}"; + version = "10.22"; src = fetchurl { url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2"; - sha256 = "1q6lrj9b08l1q39vxipb0fi88x6ybvkr6439h8bjb9r8jd81fsn6"; + sha256 = "05pl338962d7syd1rbkg96916mq7d3amz1n2fjnm0v5cyhcldd5j"; }; configureFlags = [ @@ -13,11 +14,17 @@ stdenv.mkDerivation rec { "--enable-jit" ]; - meta = { - description = "Perl Compatible Regular Expressions"; + outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; + + postFixup = '' + moveToOutput bin/pcre2-config "$dev" + ''; + + meta = with stdenv.lib; { + description = "Perl Compatible Regular Expressions"; homepage = "http://www.pcre.org/"; - license = stdenv.lib.licenses.bsd3; - maintainers = [ stdenv.lib.maintainers.ttuegel ]; - platforms = stdenv.lib.platforms.all; + license = licenses.bsd3; + maintainers = with maintainers; [ ttuegel ]; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/pkcs11helper/default.nix b/pkgs/development/libraries/pkcs11helper/default.nix index fa373a7e97f..9094eca26e5 100644 --- a/pkgs/development/libraries/pkcs11helper/default.nix +++ b/pkgs/development/libraries/pkcs11helper/default.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchurl, pkgconfig, openssl, autoreconfHook }: +{ stdenv, fetchFromGitHub, pkgconfig, openssl, autoreconfHook }: -let - rev = "5d412bad60"; -in stdenv.mkDerivation rec { - name = "pkcs11-helper-20121123-${rev}"; + name = "pkcs11-helper-${version}"; + version = "1.11"; - src = fetchurl { - url = "https://github.com/alonbl/pkcs11-helper/tarball/${rev}"; - name = "${name}.tar.gz"; - sha256 = "1mih6mha39yr5s5m18lg4854qc105asgnwmjw7f95kgmzni62kxp"; + src = fetchFromGitHub { + owner = "OpenSC"; + repo = "pkcs11-helper"; + rev = "${name}"; + sha256 = "1bfsmy9w2qf7avvs3rsc1ycqczzzw0j2wsqkd2fj4dc1fqzigq2q"; }; buildInputs = [ pkgconfig openssl autoreconfHook ]; meta = with stdenv.lib; { homepage = https://www.opensc-project.org/opensc/wiki/pkcs11-helper; - license = with licenses; [ "BSD" gpl2 ]; + license = with licenses; [ bsd3 gpl2 ]; description = "Library that simplifies the interaction with PKCS#11 providers"; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/png++/default.nix b/pkgs/development/libraries/png++/default.nix index baebce8e4b1..6ca4734a4f7 100644 --- a/pkgs/development/libraries/png++/default.nix +++ b/pkgs/development/libraries/png++/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { postCheck = "cat test/test.log"; buildInputs = [ ] - ++ stdenv.lib.optional docSupport [ doxygen ]; + ++ stdenv.lib.optional docSupport doxygen; propagatedBuildInputs = [ libpng ]; diff --git a/pkgs/development/libraries/polkit-qt-1/qt-4.nix b/pkgs/development/libraries/polkit-qt-1/qt-4.nix index 523189c3b2e..54e10b96592 100644 --- a/pkgs/development/libraries/polkit-qt-1/qt-4.nix +++ b/pkgs/development/libraries/polkit-qt-1/qt-4.nix @@ -10,10 +10,21 @@ stdenv.mkDerivation { sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; }; + outputs = [ "out" "dev" ]; + nativeBuildInputs = [ cmake pkgconfig automoc4 ]; propagatedBuildInputs = [ polkit glib qt4 ]; + postFixup = + '' + for i in $dev/lib/cmake/*/*.cmake; do + echo "fixing $i" + substituteInPlace $i \ + --replace "\''${PACKAGE_PREFIX_DIR}/lib" $out/lib + done + ''; + meta = { description = "A Qt wrapper around PolKit"; maintainers = with stdenv.lib.maintainers; [ ttuegel ]; diff --git a/pkgs/development/libraries/pupnp/default.nix b/pkgs/development/libraries/pupnp/default.nix index 2138e1689b3..b1d2b1fd92e 100644 --- a/pkgs/development/libraries/pupnp/default.nix +++ b/pkgs/development/libraries/pupnp/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libupnp-1.6.19"; + name = "libupnp-1.6.20"; src = fetchurl { url = "mirror://sourceforge/pupnp/${name}.tar.bz2"; - sha256 = "0amjv4lypvclmi4vim2qdyw5xa6v4x50zjgf682vahqjc0wjn55k"; + sha256 = "0qrsdsb1qm85hc4jy04qph895613d148f0x1mmk6z99y3q43fdgf"; }; hardeningDisable = [ "fortify" ]; 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 65d45923e5a..8526a5f5b82 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -6,7 +6,7 @@ , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst_plugins_base , buildWebkit ? stdenv.isLinux , flashplayerFix ? false, gdk_pixbuf -, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs +, gtkStyle ? false, libgnomeui, gtk2, GConf, gnome_vfs , developerBuild ? false , docs ? false , examples ? false @@ -36,6 +36,12 @@ stdenv.mkDerivation rec { sha256 = "183fca7n7439nlhxyg1z7aky0izgbyll3iwakw4gwivy16aj5272"; }; + outputs = [ "out" "dev" ]; + + outputInclude = "out"; + + setOutputFlags = false; + # The version property must be kept because it will be included into the QtSDK package name version = vers; @@ -65,13 +71,13 @@ stdenv.mkDerivation rec { src = ./dlopen-gtkstyle.diff; # substituteAll ignores env vars starting with capital letter gconf = GConf.out; - gtk = gtk.out; + gtk = gtk2.out; libgnomeui = libgnomeui.out; gnome_vfs = gnome_vfs.out; }) ++ stdenv.lib.optional flashplayerFix (substituteAll { src = ./dlopen-webkit-nsplugin.diff; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }) ++ [(fetchpatch { @@ -87,8 +93,8 @@ stdenv.mkDerivation rec { -docdir $out/share/doc/${name} -plugindir $out/lib/qt4/plugins -importdir $out/lib/qt4/imports - -examplesdir $out/share/doc/${name}/examples - -demosdir $out/share/doc/${name}/demos + -examplesdir $TMPDIR/share/doc/${name}/examples + -demosdir $TMPDIR/share/doc/${name}/demos -datadir $out/share/${name} -translationdir $out/share/${name}/translations " @@ -98,6 +104,7 @@ stdenv.mkDerivation rec { ''; prefixKey = "-prefix "; + configureFlags = '' -v -no-separate-debug-info -release -no-fast -confirm-license -opensource @@ -131,7 +138,7 @@ stdenv.mkDerivation rec { [ cups # Qt dlopen's libcups instead of linking to it postgresql sqlite libjpeg libmng libtiff icu ] ++ optionals (mysql != null) [ mysql.lib ] - ++ optionals gtkStyle [ gtk gdk_pixbuf ] + ++ optionals gtkStyle [ gtk2 gdk_pixbuf ] ++ optionals stdenv.isDarwin [ cf-private ApplicationServices OpenGL Cocoa AGL libcxx libobjc ]; nativeBuildInputs = [ perl pkgconfig which ]; @@ -153,6 +160,11 @@ stdenv.mkDerivation rec { sed -i 's/^\(LIBS[[:space:]]*=.*$\)/\1 -lobjc/' ./src/corelib/Makefile.Release ''; + postInstall = + '' + rm -rf $out/tests + ''; + crossAttrs = let isMingw = stdenv.cross.libc == "msvcrt"; in { diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix index 2f252a6cf28..fdeb4f7e6c9 100644 --- a/pkgs/development/libraries/qt-5/5.5/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/default.nix @@ -66,7 +66,7 @@ let harfbuzz = pkgs.harfbuzz-icu; cups = if stdenv.isLinux then pkgs.cups else null; # GNOME dependencies are not used unless gtkStyle == true - inherit (pkgs.gnome) libgnomeui GConf gnome_vfs; + inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; bison = pkgs.bison2; # error: too few arguments to function 'int yylex(... inherit developerBuild decryptSslTraffic; }; diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix index b80b8a1e761..138faf86506 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix @@ -7,7 +7,7 @@ , openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , zlib, libjpeg, libpng, libtiff, sqlite, icu -, coreutils, bison, flex, gdb, gperf, lndir, ruby +, coreutils, bison, flex, gdb, gperf, lndir , patchelf, perl, pkgconfig, python # optional dependencies @@ -19,7 +19,7 @@ , buildExamples ? false , buildTests ? false , developerBuild ? false -, libgnomeui, GConf, gnome_vfs, gtk +, libgnomeui, GConf, gnome_vfs, gtk2 , decryptSslTraffic ? false }: @@ -28,7 +28,7 @@ let system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64; # Search path for Gtk plugin - gtkLibPath = lib.makeLibraryPath [ gtk gnome_vfs libgnomeui GConf ]; + gtkLibPath = lib.makeLibraryPath [ gtk2 gnome_vfs libgnomeui GConf ]; dontInvalidateBacking = fetchurl { url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c"; @@ -205,13 +205,13 @@ stdenv.mkDerivation { ++ lib.optional mesaSupported mesa; buildInputs = - [ bison flex gperf ruby ] + [ 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 gtk GConf]; + ++ [gnome_vfs.out libgnomeui.out gtk2 GConf]; nativeBuildInputs = [ lndir patchelf perl pkgconfig python ]; @@ -256,7 +256,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix index 32b07b6c907..3a2d026842a 100644 --- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; 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 2f414efc314..25e94c44ad2 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix @@ -7,7 +7,7 @@ , openssl, dbus, glib, udev, libxml2, libxslt, pcre16 , zlib, libjpeg, libpng, libtiff, sqlite, icu -, coreutils, bison, flex, gdb, gperf, lndir, ruby +, coreutils, bison, flex, gdb, gperf, lndir , patchelf, perl, pkgconfig, python # optional dependencies @@ -180,7 +180,7 @@ stdenv.mkDerivation { ++ lib.optional mesaSupported mesa; buildInputs = - [ bison flex gperf ruby ] + [ bison flex gperf ] ++ lib.optional developerBuild gdb ++ lib.optional (cups != null) cups ++ lib.optional (mysql != null) mysql.lib @@ -213,7 +213,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix index 46f47b41535..683bb031e95 100644 --- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; diff --git a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix index a31452e6d9b..81d0e446f2a 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtbase/default.nix @@ -189,7 +189,7 @@ stdenv.mkDerivation { ++ lib.optional (postgresql != null) postgresql; nativeBuildInputs = - [ bison flex gperf lndir patchelf perl pkgconfig python ruby ]; + [ bison flex gperf lndir patchelf perl pkgconfig python ]; # freetype-2.5.4 changed signedness of some struct fields NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; @@ -216,7 +216,7 @@ stdenv.mkDerivation { postFixup = '' - # Don't retain build-time dependencies like gdb and ruby. + # Don't retain build-time dependencies like gdb. sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri # Move libtool archives and qmake projects diff --git a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix index 46f47b41535..683bb031e95 100644 --- a/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix +++ b/pkgs/development/libraries/qt-5/5.7/qtwebkit/default.nix @@ -1,5 +1,5 @@ { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors -, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt +, fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby , substituteAll @@ -18,12 +18,12 @@ qtSubmodule { patches = let dlopen-webkit-nsplugin = substituteAll { src = ./0001-dlopen-webkit-nsplugin.patch; - gtk = gtk.out; + gtk = gtk2.out; gdk_pixbuf = gdk_pixbuf.out; }; dlopen-webkit-gtk = substituteAll { src = ./0002-dlopen-webkit-gtk.patch; - gtk = gtk.out; + gtk = gtk2.out; }; dlopen-webkit-udev = substituteAll { src = ./0003-dlopen-webkit-udev.patch; diff --git a/pkgs/development/libraries/quickder/default.nix b/pkgs/development/libraries/quickder/default.nix new file mode 100644 index 00000000000..2ee3a61aacf --- /dev/null +++ b/pkgs/development/libraries/quickder/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchFromGitHub, fetchurl, hexio, python, which, asn2quickder, bash }: + +stdenv.mkDerivation rec { + pname = "quickder"; + name = "${pname}-${version}"; + version = "1.0-RC1"; + + src = fetchFromGitHub { + sha256 = "05gw5dqkw3l8kwwm0044zpxhcp7sxicx9wxbfyr49c91403p870w"; + rev = "version-${version}"; + owner = "vanrein"; + repo = "quick-der"; + }; + + buildInputs = [ which asn2quickder bash ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace 'lib tool test rfc' 'lib test rfc' + substituteInPlace ./rfc/Makefile \ + --replace 'ASN2QUICKDER_CMD = ' 'ASN2QUICKDER_CMD = ${asn2quickder}/bin/asn2quickder #' + ''; + + installFlags = "ASN2QUICKDER_DIR=${asn2quickder}/bin ASN2QUICKDER_CMD=${asn2quickder}/bin/asn2quickder"; + installPhase = '' + mkdir -p $out/lib $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "Quick (and Easy) DER, a Library for parsing ASN.1"; + homepage = https://github.com/vanrein/quick-der; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/libraries/rabbitmq-c/0.4.nix b/pkgs/development/libraries/rabbitmq-c/0.4.nix deleted file mode 100644 index 2c92ba5618c..00000000000 --- a/pkgs/development/libraries/rabbitmq-c/0.4.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, fetchurl, cmake, openssl, popt, xmlto }: - -stdenv.mkDerivation rec { - version = "0.4.1"; - name = "rabbitmq-c-${version}"; - - src = fetchurl { - name = "${name}.tar.gz"; - url = "https://github.com/alanxz/rabbitmq-c/releases/download/v${version}/${name}.tar.gz"; - sha256 = "01m4n043hzhhxky8z67zj3r4gbg3mwcqbwqr9nms9lqbfaa70x93"; - }; - - buildInputs = [ cmake openssl popt xmlto ]; - - meta = { - description = "RabbitMQ C AMQP client library"; - homepage = https://github.com/alanxz/rabbitmq-c; - license = stdenv.lib.licenses.mit; - platforms = with stdenv.lib.platforms; linux; - }; -} diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix new file mode 100644 index 00000000000..9d1c1c57f8c --- /dev/null +++ b/pkgs/development/libraries/readline/7.0.nix @@ -0,0 +1,66 @@ +{ fetchurl, stdenv, ncurses }: + +stdenv.mkDerivation rec { + name = "readline-${version}"; + version = "7.0p0"; + + src = fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}.tar.gz"; + sha256 = "0d13sg9ksf982rrrmv5mb6a2p4ys9rvg9r71d6il0vr8hmql63bm"; + }; + + outputs = [ "out" "dev" "doc" ]; + + propagatedBuildInputs = [ncurses]; + + patchFlags = "-p0"; + + patches = + [ ./link-against-ncurses.patch + ./no-arch_only-6.3.patch + ] + ; + /* + ++ + (let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/readline/readline-${meta.branch}-patches/readline70-${nr}"; + inherit sha256; + }; + in + import ./readline-7.0-patches.nix patch); + */ + + # Don't run the native `strip' when cross-compiling. + dontStrip = stdenv ? cross; + bash_cv_func_sigsetjmp = if stdenv.isCygwin then "missing" else null; + + meta = with stdenv.lib; { + description = "Library for interactive line editing"; + + longDescription = '' + The GNU Readline library provides a set of functions for use by + applications that allow users to edit command lines as they are + typed in. Both Emacs and vi editing modes are available. The + Readline library includes additional functions to maintain a + list of previously-entered command lines, to recall and perhaps + reedit those lines, and perform csh-like history expansion on + previous commands. + + The history facilities are also placed into a separate library, + the History library, as part of the build process. The History + library may be used without Readline in applications which + desire its capabilities. + ''; + + homepage = http://savannah.gnu.org/projects/readline/; + + license = licenses.gpl3Plus; + + maintainers = [ ]; + + platforms = platforms.unix; + branch = "7.0"; + }; +} diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index 77a74c4e844..6803dfd76de 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk, m4, pkgconfig, mesa, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, mesa, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL gtk mesa ]; + buildInputs = [ SDL gtk2 mesa ]; nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 0ef024424b2..7fc39cfd52b 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,22 +1,24 @@ -{ stdenv, fetchurl, pkgconfig, gtk, spice_protocol, intltool, celt_0_5_1 +{ stdenv, fetchurl, pkgconfig, spice_protocol, intltool, celt_0_5_1 , openssl, libpulseaudio, pixman, gobjectIntrospection, libjpeg_turbo, zlib -, cyrus_sasl, python, pygtk, autoreconfHook, usbredir, libsoup -, gtk3, enableGTK3 ? false }: +, cyrus_sasl, pythonPackages, autoreconfHook, usbredir, libsoup +, gtk3, epoxy }: with stdenv.lib; -stdenv.mkDerivation rec { - name = "spice-gtk-0.29"; +let + inherit (pythonPackages) python pygtk; +in stdenv.mkDerivation rec { + name = "spice-gtk-0.32"; src = fetchurl { url = "http://www.spice-space.org/download/gtk/${name}.tar.bz2"; - sha256 = "0wz9sm44gnmwjpmyacwd5jyzvhfl1wlf1dn3qda20si42cky5is4"; + sha256 = "00pf94xh2xf0h1g13lnavxrysd0d0x22l5jl108cvq1mjc4z8j2c"; }; buildInputs = [ spice_protocol celt_0_5_1 openssl libpulseaudio pixman gobjectIntrospection - libjpeg_turbo zlib cyrus_sasl python pygtk usbredir - ] ++ (if enableGTK3 then [ gtk3 ] else [ gtk ]); + libjpeg_turbo zlib cyrus_sasl python pygtk usbredir gtk3 epoxy + ]; nativeBuildInputs = [ pkgconfig intltool libsoup autoreconfHook ]; @@ -33,7 +35,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-maintainer-mode" - (if enableGTK3 then "--with-gtk3" else "--with-gtk=2.0") + "--with-gtk3" ]; dontDisableStatic = true; # Needed by the coroutine test @@ -41,9 +43,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "A GTK+2 and GTK+3 SPICE widget"; + description = "A GTK+3 SPICE widget"; longDescription = '' - spice-gtk is a GTK+2 and GTK+3 SPICE widget. It features glib-based + spice-gtk is a GTK+3 SPICE widget. It features glib-based objects for SPICE protocol parsing and a gtk widget for embedding the SPICE display into other applications such as virt-manager. Python bindings are available too. diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 0f9b1288cc4..bd56d880f94 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.10"; + name = "spice-protocol-0.12.12"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "1yrfacqgnabmx2q768mim892ga2wnlp5cavkf51v3idyjmqhv3vq"; + sha256 = "00wx81f2ml62g3maw63jq9w217zym921rdi38h7lpm5m8ckxraqp"; }; postInstall = '' diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 8e1227e46ff..c0145f4f776 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.12.6"; + name = "spice-0.12.8"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "1dk9hp78ldqb0a52kdlqq0scnk3drnhj7rsw8r7hmy2v2cqflj7i"; + sha256 = "0za03i77j8i3g5l2np2j7vy8cqsdbkm9wbv4hjnaqq9xhz2sa0gr"; }; buildInputs = [ pixman celt alsaLib openssl libjpeg zlib diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index ee89eda327d..faba57d155f 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { url = "http://www.vandenoever.info/software/strigi/${name}.tar.bz2"; sha256 = "12grxzqwnvbyqw7q1gnz42lypadxmq89vk2qpxczmpmc4nk63r23"; }; - + includeAllQtDirs = true; CLUCENE_HOME = clucene_core; @@ -24,6 +24,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Strigi installs some libraries in an incorrect place + # ($out/$out/lib instead of $out/lib), so move them to the right + # place. + postInstall = + '' + mv $out/$out/lib/* $out/lib + rm -rf $out/nix + ''; + meta = { homepage = http://strigi.sourceforge.net; description = "A very fast and efficient crawler to index data on your harddrive"; diff --git a/pkgs/development/libraries/stxxl/default.nix b/pkgs/development/libraries/stxxl/default.nix index 9fb25aa36e0..2244803f4d3 100644 --- a/pkgs/development/libraries/stxxl/default.nix +++ b/pkgs/development/libraries/stxxl/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DBUILD_STATIC_LIBS=OFF" - "-DCMAKE_BUILD_TYPE=Release" (mkFlag parallel "USE_GNU_PARALLEL") ]; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index 3c40ae247f6..024531a3027 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "talloc-2.1.5"; + name = "talloc-2.1.8"; src = fetchurl { url = "mirror://samba/talloc/${name}.tar.gz"; - sha256 = "1pfx3kmj973hpacfw46fzfnjd7ms1j03ifkc30wk930brx8ffcrq"; + sha256 = "0c3ihyb0jd8mhvi7gg2mr5w1zl2habx6jlkbyxzyckad2q8lkl92"; }; buildInputs = [ diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index 0843d05e028..f7449dcf1ab 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.8"; + name = "tdb-1.3.11"; src = fetchurl { url = "mirror://samba/tdb/${name}.tar.gz"; - sha256 = "1cg6gmpgn36dd4bsp3j9k3hyrm87d8hdigqyyqxw5jga4w2aq186"; + sha256 = "0i1l38h0vyck6zkcj4fn2l03spadlmyr1qa1xpdp9dy2ccbm3s1r"; }; buildInputs = [ diff --git a/pkgs/development/libraries/tevent/default.nix b/pkgs/development/libraries/tevent/default.nix index 95eb0255bdc..2856f025a88 100644 --- a/pkgs/development/libraries/tevent/default.nix +++ b/pkgs/development/libraries/tevent/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tevent-0.9.28"; + name = "tevent-0.9.30"; src = fetchurl { url = "mirror://samba/tevent/${name}.tar.gz"; - sha256 = "0a9ml52jjnzz7qg9z750mavlvs1yibjwrzy4yl55dc95j0vm7n84"; + sha256 = "1gccqiibf6ia129xhqrg18anax3sxwfbwm8h4pvsga3ndxg931ap"; }; buildInputs = [ diff --git a/pkgs/development/libraries/udns/default.nix b/pkgs/development/libraries/udns/default.nix index 9d781b301a0..9c899eb21ba 100644 --- a/pkgs/development/libraries/udns/default.nix +++ b/pkgs/development/libraries/udns/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ''; # keep man3 - outputDocdev = "out"; + outputDevdoc = "out"; meta = with stdenv.lib; { homepage = http://www.corpit.ru/mjt/udns.html; diff --git a/pkgs/development/libraries/unixODBC/default.nix b/pkgs/development/libraries/unixODBC/default.nix index e40f362a3b1..99ab8a05616 100644 --- a/pkgs/development/libraries/unixODBC/default.nix +++ b/pkgs/development/libraries/unixODBC/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { description = "ODBC driver manager for Unix"; homepage = http://www.unixodbc.org/; license = licenses.lgpl2; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/uri/default.nix b/pkgs/development/libraries/uri/default.nix new file mode 100644 index 00000000000..61ac651256a --- /dev/null +++ b/pkgs/development/libraries/uri/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, cmake, doxygen }: + +stdenv.mkDerivation { + name = "uri-2016-09-04"; + + src = fetchFromGitHub { + owner = "cpp-netlib"; + repo = "uri"; + rev = "8b1eec80621ea7be1db3b28f1621e531cc72855c"; + sha256 = "0f77y79b11pp31y0qpydki2nnxd6gpycp24fmrapi70fsni2ah0d"; + }; + + buildInputs = [ cmake doxygen ]; + + cmakeFlags = [ "-DUri_BUILD_TESTS=OFF" "-DBUILD_SHARED_LIBS=ON" ]; + + postBuild = '' + make doc + ''; + + # https://github.com/cpp-netlib/uri/issues/90 + postInstall = '' + mv $out/include $out/include2 + mv $out/include2/include $out/ + rmdir $out/include2 + mkdir -p $out/share/doc + mv html $out/share/doc/uri + ''; + + meta = { + description = "C++ URI library"; + homepage = http://cpp-netlib.org; + license = stdenv.lib.licenses.boost; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index f970a63ff12..76912f19ab5 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -2,13 +2,16 @@ stdenv.mkDerivation rec { name = "usbredir-${version}"; - version = "0.7"; + version = "0.7.1"; src = fetchurl { url = "http://spice-space.org/download/usbredir/${name}.tar.bz2"; - sha256 = "1ah64271r83lvh8hrpkxzv0iwpga1wkrfkx4rkljpijx5dqs0qqa"; + sha256 = "1wsnmk4wjpdhbn1zaxg6bmyxspcki2zgy0am9lk037rnl4krwzj0"; }; + # Works around bunch of "format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'uint64_t {aka long long unsigned int}'" warnings + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isi686 "-Wno-error=format"; + buildInputs = [ pkgconfig libusb ]; propagatedBuildInputs = [ libusb ]; diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 0bc3c196c46..922aed61ed6 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "libva-intel-driver-1.7.0"; + name = "libva-intel-driver-1.7.2"; src = fetchurl { url = "http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${name}.tar.bz2"; - sha256 = "032w8d0whymi5ac8fk7c5d8nnxxsjgwymw644g7gp959i73xc6cx"; + sha256 = "1g371q9p31i57fkidjp2akvrbaadpyx3bwmg5kn72sc2mbv7p7h9"; }; patchPhase = '' diff --git a/pkgs/development/libraries/vsqlite/default.nix b/pkgs/development/libraries/vsqlite/default.nix new file mode 100644 index 00000000000..43a8f7db8d6 --- /dev/null +++ b/pkgs/development/libraries/vsqlite/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, boost, sqlite }: + +stdenv.mkDerivation rec { + name = "vsqlite-${version}"; + version = "0.3.13"; + + src = fetchurl { + url = "http://evilissimo.fedorapeople.org/releases/vsqlite--/0.3.13/vsqlite++-${version}.tar.gz"; + sha256 = "17fkj0d2jh0xkjpcayhs1xvbnh1d69f026i7vs1zqnbiwbkpz237"; + }; + + buildInputs = [ boost sqlite ]; + + meta = { + homepage = http://vsqlite.virtuosic-bytes.com/; + description = "C++ wrapper library for sqlite."; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 20e2213e3e7..083f4a9140a 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt -, qtLib ? null }: +, qtLib ? null +# Darwin support +, Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL +, ApplicationServices, CoreText, IOSurface, cf-private, ImageIO, xpc, libobjc }: with stdenv.lib; @@ -17,8 +20,14 @@ stdenv.mkDerivation rec { sha256 = "1hrjxkcvs3ap0bdhk90vymz5pgvxmg7q6sz8ab3wsyddbshr1abq"; }; - buildInputs = [ cmake mesa libX11 xproto libXt ] - ++ optional (qtLib != null) qtLib; + buildInputs = + if !stdenv.isDarwin + then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib + else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private + CFNetwork Security ApplicationServices CoreText IOSurface ImageIO + OpenGL GLUT ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ Cocoa libobjc ]; + preBuild = '' export LD_LIBRARY_PATH="$(pwd)/lib"; @@ -30,7 +39,17 @@ stdenv.mkDerivation rec { # At least, we use -fPIC for other packages to be able to use this in shared # objects. cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" ] - ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ]; + ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] + ++ optional stdenv.isDarwin [ "-DBUILD_TESTING:BOOL=OFF" + "-DCMAKE_OSX_SYSROOT=" + "-DCMAKE_OSX_DEPLOYMENT_TARGET=" + "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ]; + + postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c + sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c + ''; enableParallelBuilding = true; @@ -39,6 +58,6 @@ stdenv.mkDerivation rec { homepage = http://www.vtk.org/; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; unix; }; } diff --git a/pkgs/development/libraries/wayland/1.9.nix b/pkgs/development/libraries/wayland/1.9.nix new file mode 100644 index 00000000000..4c6d95e67c0 --- /dev/null +++ b/pkgs/development/libraries/wayland/1.9.nix @@ -0,0 +1,33 @@ +{ lib, stdenv, fetchurl, pkgconfig +, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2 +, expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0) +}: + +# Require the optional to be enabled until upstream fixes or removes the configure flag +assert expat != null; + +stdenv.mkDerivation rec { + name = "wayland-${version}"; + version = "1.9.0"; + + src = fetchurl { + url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; + sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww"; + }; + + configureFlags = "--with-scanner --disable-documentation"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libffi /* docbook_xsl doxygen graphviz libxslt xmlto */ expat libxml2 ]; + + meta = { + description = "Reference implementation of the wayland protocol"; + homepage = http://wayland.freedesktop.org/; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ codyopel wkennington ]; + }; + + passthru.version = version; +} diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix index c388a3f3065..e644b5728ed 100644 --- a/pkgs/development/libraries/wayland/default.nix +++ b/pkgs/development/libraries/wayland/default.nix @@ -8,11 +8,11 @@ assert expat != null; stdenv.mkDerivation rec { name = "wayland-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "http://wayland.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "1c0d5ivy9n44hykvw2ggrvqrnn7naw3wg11vbvgwzgi8g5gr4h4m"; + sha256 = "d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1"; }; configureFlags = "--with-scanner --disable-documentation"; diff --git a/pkgs/development/libraries/webkitgtk/2.10.nix b/pkgs/development/libraries/webkitgtk/2.10.nix deleted file mode 100644 index e74cc6421b2..00000000000 --- a/pkgs/development/libraries/webkitgtk/2.10.nix +++ /dev/null @@ -1,86 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, cmake -, pkgconfig, gettext, gobjectIntrospection, libnotify -, gtk2, gtk3, wayland, libwebp, enchant -, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs -, enableGeoLocation ? false, geoclue2, sqlite, xorg -, enableCredentialStorage ? !stdenv.isDarwin -, gst-plugins-base, readline, libedit -}: - -assert enableGeoLocation -> geoclue2 != null; -assert stdenv.isDarwin -> !enableCredentialStorage; - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "webkitgtk-${version}"; - version = "2.10.9"; - - meta = { - description = "Web content rendering engine, GTK+ port"; - homepage = "http://webkitgtk.org/"; - license = licenses.bsd2; - platforms = platforms.linux; - hydraPlatforms = []; - maintainers = with maintainers; [ koral ]; - }; - - preConfigure = "patchShebangs Tools"; - - src = fetchurl { - url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0sg935wpkgyd5ypd5fj25vd7ri8s6sbrmssb53xbgcc02xs8vcdv"; - }; - - patches = [ - ./finding-harfbuzz-icu.patch - ] ++ optional stdenv.isDarwin ./adding-libintl.patch; - - cmakeFlags = [ - "-DPORT=GTK" - "-DUSE_LIBHYPHEN=OFF" - ] ++ optionals (!enableCredentialStorage) [ - "-DENABLE_CREDENTIAL_STORAGE=OFF" - ] ++ optionals (!enableGeoLocation) [ - "-DENABLE_GEOLOCATION=OFF" - ] ++ optionals stdenv.isDarwin [ - "-DENABLE_WEBKIT=ON" - "-DENABLE_X11_TARGET=OFF" - "-DENABLE_QUARTZ_TARGET=ON" - "-DENABLE_TOOLS=ON" - "-DENABLE_MINIBROWSER=ON" - "-DENABLE_PLUGIN_PROCESS_GTK2=OFF" - "-DENABLE_VIDEO=OFF" - "-DENABLE_WEB_AUDIO=OFF" - "-DENABLE_OPENGL=OFF" - "-DENABLE_INTROSPECTION=OFF" - "-DUSE_LIBNOTIFY=OFF" - "-DCMAKE_SHARED_LINKER_FLAGS=-L/path/to/nonexistent/folder" - ]; - - # XXX: WebKit2 missing include path for gst-plugins-base. - # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 - NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; - - nativeBuildInputs = [ - cmake perl python ruby bison gperf sqlite - pkgconfig gettext gobjectIntrospection - ]; - - buildInputs = [ - gtk2 libwebp enchant libnotify - libxml2 libxslt harfbuzz libpthreadstubs - gst-plugins-base xorg.libXt - ] ++ optionals enableCredentialStorage [ - libsecret - ] ++ (if stdenv.isDarwin then [ - readline libedit - ] else [ - wayland - ]) ++ optional enableGeoLocation geoclue2; - - propagatedBuildInputs = [ - libsoup gtk3 - ]; - - enableParallelBuilding = true; -} diff --git a/pkgs/development/libraries/webkitgtk/2.12.nix b/pkgs/development/libraries/webkitgtk/2.12.nix index 3de8a942082..38d8b7ac75a 100644 --- a/pkgs/development/libraries/webkitgtk/2.12.nix +++ b/pkgs/development/libraries/webkitgtk/2.12.nix @@ -11,7 +11,7 @@ assert enableGeoLocation -> geoclue2 != null; with stdenv.lib; stdenv.mkDerivation rec { name = "webkitgtk-${version}"; - version = "2.12.4"; + version = "2.12.5"; meta = { description = "Web content rendering engine, GTK+ port"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; - sha256 = "0xwsc2lpb4q55vdgmwljx43219l0sa6r5mqs3bmw3fwsb5vk2ka2"; + sha256 = "0h0wig413399wws6l88mn1nnjbqb42vb55yvz8az39b4p1a7h53b"; }; patches = [ ./finding-harfbuzz-icu.patch ]; diff --git a/pkgs/development/libraries/webkitgtk/2.14.nix b/pkgs/development/libraries/webkitgtk/2.14.nix new file mode 100644 index 00000000000..7439d72151d --- /dev/null +++ b/pkgs/development/libraries/webkitgtk/2.14.nix @@ -0,0 +1,63 @@ +{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake +, pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls +, gtk2, gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core +, libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs +, enableGeoLocation ? true, geoclue2, sqlite +, gst-plugins-base +}: + +assert enableGeoLocation -> geoclue2 != null; + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "webkitgtk-${version}"; + version = "2.14.0"; + + meta = { + description = "Web content rendering engine, GTK+ port"; + homepage = "http://webkitgtk.org/"; + license = licenses.bsd2; + platforms = platforms.linux; + hydraPlatforms = []; + maintainers = with maintainers; [ ]; + }; + + preConfigure = "patchShebangs Tools"; + + src = fetchurl { + url = "http://webkitgtk.org/releases/${name}.tar.xz"; + sha256 = "02paj0anbnqn1z3hn5c4csmq9nga995rzagiplj3sjk2dj1ss4q5"; + }; + + # see if we can clean this up.... + + patches = [ ./finding-harfbuzz-icu.patch ]; + + cmakeFlags = [ + "-DPORT=GTK" + "-DUSE_LIBHYPHEN=0" + "-DENABLE_GLES2=ON" + ]; + + # XXX: WebKit2 missing include path for gst-plugins-base. + # Filled: https://bugs.webkit.org/show_bug.cgi?id=148894 + NIX_CFLAGS_COMPILE = "-I${gst-plugins-base.dev}/include/gstreamer-1.0"; + + nativeBuildInputs = [ + cmake perl python ruby bison gperf sqlite + pkgconfig gettext gobjectIntrospection + ]; + + buildInputs = [ + gtk2 wayland libwebp enchant libnotify gnutls + libxml2 libsecret libxslt harfbuzz libpthreadstubs + gst-plugins-base libxkbcommon epoxy at_spi2_core + ] ++ optional enableGeoLocation geoclue2 + ++ (with xlibs; [ libXdmcp libXt libXtst ]); + + propagatedBuildInputs = [ + libsoup gtk3 + ]; + + enableParallelBuilding = true; +} diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix index 7396b700955..c4530da5453 100644 --- a/pkgs/development/libraries/wxGTK-2.8/default.nix +++ b/pkgs/development/libraries/wxGTK-2.8/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, libX11, cairo , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf libX11 cairo ] ++ optional withMesa mesa; nativeBuildInputs = [ pkgconfig ]; @@ -56,7 +56,10 @@ stdenv.mkDerivation rec { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wxGTK-2.9/default.nix b/pkgs/development/libraries/wxGTK-2.9/default.nix index d9f0dcc1b0f..82ba9daed80 100644 --- a/pkgs/development/libraries/wxGTK-2.9/default.nix +++ b/pkgs/development/libraries/wxGTK-2.9/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa ++ optional stdenv.isDarwin setfile; @@ -52,7 +52,10 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/wxGTK-3.0/default.nix b/pkgs/development/libraries/wxGTK-3.0/default.nix index bdb0032a85a..087e93b0e05 100644 --- a/pkgs/development/libraries/wxGTK-3.0/default.nix +++ b/pkgs/development/libraries/wxGTK-3.0/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libXinerama, libSM, libXxf86vm, xf86vidmodeproto +{ stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst_plugins_base, GConf, setfile , withMesa ? true, mesa ? null, compat24 ? false, compat26 ? true, unicode ? true, }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { }; buildInputs = - [ gtk libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer + [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst_plugins_base GConf ] ++ optional withMesa mesa ++ optional stdenv.isDarwin setfile; @@ -52,7 +52,10 @@ stdenv.mkDerivation { (cd $out/include && ln -s wx-*/* .) "; - passthru = {inherit gtk compat24 compat26 unicode;}; + passthru = { + inherit compat24 compat26 unicode; + gtk = gtk2; + }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix index 144af122d73..33c30a96251 100644 --- a/pkgs/development/libraries/zeroc-ice/default.nix +++ b/pkgs/development/libraries/zeroc-ice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "zeroc-ice-${version}"; - version = "3.6.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "044511zbhwiach1867r3xjz8i4931wn7c1l3nz4kcpgks16kqhhz"; + sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2"; }; buildInputs = [ mcpp bzip2 expat openssl db5 ]; diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index dbf429d8daf..278690f3a1c 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.1.6"; + version="3.1.7"; name="${baseName}-${version}"; - hash="0535pf1828w5q6ydhmawf5f33xh6bc2czw76llgpikla0gdzh58w"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.1.6.tar.gz"; - sha256="0535pf1828w5q6ydhmawf5f33xh6bc2czw76llgpikla0gdzh58w"; + hash="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.1.7.tar.gz"; + sha256="16x065q6adidbdr77axsxz4f8c818szfz0b9sw1a4c89y82ylsnn"; }; buildInputs = [ texinfo texLive perl @@ -19,6 +19,7 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + sourceRoot = "."; buildPhase = '' make build/asdf.lisp make -C doc asdf.info asdf.html diff --git a/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh b/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh index 030e9e40323..13965f14c5e 100755 --- a/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh +++ b/pkgs/development/lisp-modules/clwrapper/build-with-lisp.sh @@ -47,7 +47,7 @@ case "$NIX_LISP" in :toplevel (lambda () (setf common-lisp:*standard-input* (sb-sys::make-fd-stream 0 :input t :buffering :line)) (setf common-lisp:*standard-output* (sb-sys::make-fd-stream 1 :output t :buffering :line)) - (setf asdf/image:*command-line-arguments* (cdr sb-ext:*posix-argv*)) + (setf uiop/image:*command-line-arguments* (cdr sb-ext:*posix-argv*)) $code) :executable t :save-runtime-options t :purify t))" systems=":sb-posix $systems" diff --git a/pkgs/development/lisp-modules/lisp-packages.nix b/pkgs/development/lisp-modules/lisp-packages.nix index abadf07a574..6887c8ff60d 100644 --- a/pkgs/development/lisp-modules/lisp-packages.nix +++ b/pkgs/development/lisp-modules/lisp-packages.nix @@ -344,14 +344,14 @@ let lispPackages = rec { command-line-arguments = buildLispPackage rec { baseName = "command-line-arguments"; - version = "git-20141113"; + 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 = "1jgx8k706wz2qjdnqnralvnhwlzxd0nx22r6rncgs2kw7p4wll9d"; - rev = ''121f303bbef9c9cdf37a7a12d8adb1ad4be5a6ae''; + sha256 = "0qx33j0bq8dshiyyv8rjwd0zvhqhqx5gby6xrghfy8ylcwf11r5j"; + rev = ''003bdbc05e2816e43293530f58efb529e9e89a20''; }; }; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index acd71d65c0e..fc2981f7f1f 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -22,6 +22,7 @@ let url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz"; x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b"; x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; + patches = [ ./gcc-5.patch]; }; "2.8" = { @@ -30,7 +31,7 @@ let x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; # TODO: Add support for aparapi, java parallel api - patches = [ ./01-remove-aparapi-samples.patch ]; + patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch]; }; }; diff --git a/pkgs/development/misc/amdapp-sdk/gcc-5.patch b/pkgs/development/misc/amdapp-sdk/gcc-5.patch new file mode 100644 index 00000000000..dc8538db4c1 --- /dev/null +++ b/pkgs/development/misc/amdapp-sdk/gcc-5.patch @@ -0,0 +1,11 @@ +--- include/CL/cl.hpp ++++ include/CL/cl.hpp +@@ -201,7 +201,7 @@ + #include + #define __CL_FUNCTION_TYPE typename std::function + #define CL_USE_CPP_FUNCTORS +-#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) ++#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) + #include + #define __CL_FUNCTION_TYPE typename std::tr1::function + #define CL_USE_CPP_FUNCTORS diff --git a/pkgs/development/mobile/androidenv/addon.xml b/pkgs/development/mobile/androidenv/addon.xml index 645795034cd..aef61bb2fc2 100644 --- a/pkgs/development/mobile/androidenv/addon.xml +++ b/pkgs/development/mobile/androidenv/addon.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -587,7 +587,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 3 - + 34908058 1f92abf3a76be66ae8032257fc7620acbd2b2e3a google_apis-3-r03.zip @@ -614,7 +614,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 42435735 9b6e86d8568558de4d606a7debc4f6049608dbd0 google_apis-4_r02.zip @@ -641,7 +641,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 49123776 46eaeb56b645ee7ffa24ede8fa17f3df70db0503 google_apis-5_r01.zip @@ -668,7 +668,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 53382941 5ff545d96e031e09580a6cf55713015c7d4936b2 google_apis-6_r01.zip @@ -695,7 +695,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 53691339 2e7f91e0fe34fef7f58aeced973c6ae52361b5ac google_apis-7_r01.zip @@ -722,7 +722,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 59505020 3079958e7ec87222cac1e6b27bc471b27bf2c352 google_apis-8_r02.zip @@ -749,7 +749,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 63401546 78664645a1e9accea4430814f8694291a7f1ea5d google_apis-9_r02.zip @@ -776,7 +776,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 65781578 cc0711857c881fa7534f90cf8cc09b8fe985484d google_apis-10_r02.zip @@ -807,7 +807,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 83477179 5eab5e81addee9f3576d456d205208314b5146a5 google_apis-11_r01.zip @@ -834,7 +834,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 86099835 e9999f4fa978812174dfeceec0721c793a636e5d google_apis-12_r01.zip @@ -865,7 +865,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 88615525 3b153edd211c27dc736c893c658418a4f9041417 google_apis-13_r01.zip @@ -896,7 +896,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 106533714 f8eb4d96ad0492b4c0db2d7e4f1a1a3836664d39 google_apis-14_r02.zip @@ -925,7 +925,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 3 - + 106624396 d0d2bf26805eb271693570a1aaec33e7dc3f45e9 google_apis-15_r03.zip @@ -958,7 +958,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 127341982 ee6acf1b01020bfa8a8e24725dbc4478bee5e792 google_apis-16_r04.zip @@ -991,7 +991,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 137231243 a076be0677f38df8ca5536b44dfb411a0c808c4f google_apis-17_r04.zip @@ -1024,7 +1024,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 4 - + 143195183 6109603409debdd40854d4d4a92eaf8481462c8b google_apis-18_r04.zip @@ -1057,7 +1057,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 20 - + 147081 5b933abe830b2f25b4c0f171d45e9e0651e56311 google_apis-19_r20.zip @@ -1085,12 +1085,45 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& + + + 1 + + + + 154865 + 31361c2868f27343ee917fbd259c1463821b6145 + google_apis-24_r1.zip + + + + google + Google Inc. + google_apis + Google APIs + 24 + Android + Google APIs + + + com.google.android.maps + API for Google Maps + + + com.android.future.usb.accessory + API for USB Accessories + + + com.google.android.media.effects + Collection of video effects + + + 1 - + 179499 66a754efb24e9bb07cc51648426443c7586c9d4a google_apis-21_r01.zip @@ -1123,7 +1156,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 179259 5def0f42160cba8acff51b9c0c7e8be313de84f5 google_apis-22_r01.zip @@ -1156,7 +1189,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 179900 04c5cc1a7c88967250ebba9561d81e24104167db google_apis-23_r01.zip @@ -1190,7 +1223,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 2 - + 78266751 92128a12e7e8b0fb5bac59153d7779b717e7b840 google_tv-12_r02.zip @@ -1212,7 +1245,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& 1 - + 87721879 b73f7c66011ac8180b44aa4e83b8d78c66ea9a09 google_tv-13_r01.zip @@ -1229,18 +1262,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& - + - 35 + 37 0 0 - - 251973915 - 7a201334775d78bf185ffcce686b1b168d152217 - android_m2repository_r35.zip + + 281268000 + 2f862a5d66d5526cd5b7655c3e9678f493e485f7 + android_m2repository_r37.zip @@ -1275,88 +1308,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& compatibility - + - 1 - 0 - 3 + 32 - - 12968916 - 7c9ef7544cf0aea030bcc29bd8e12c04fd53e653 - gapid_r01_linux.zip - linux - - - - 15824058 - 597eb271349d890566274861eba2770a84ee4c69 - gapid_r01_osx.zip - - - - 13220091 - 82c9b3eb1b281f27f58fe55025227148b3deb12e - gapid_r01_windows.zip - windows - - - - android - Android - Tools that support GPU debugging and profiling within an IDE. - GPU Debugging tools - gapid - - - - - 3 - 1 - 0 - - - - - 31528127 - a33fe37c87b095171d647385445abe164ae03514 - gapid_2994895_linux.zip - linux - - - - 31908588 - 81dec931c8b0a5fe7c68accd8b3f8c731a9474f3 - gapid_2994895_osx.zip - - - - 31656334 - ce00f4a7364d7fdd5d25d2429f04c4d50f56be1e - gapid_2994895_windows.zip - windows - - - - android - Android - Tools that support GPU debugging and profiling within an IDE. - GPU Debugging tools - gapid_3 - - - - - 31 - - - - - 106690833 - 20054f56e8e24c5f1aadd8cdf232d5dd54565aee - google_m2repository_r31.zip + + 113922721 + ae24bde9c8f732f4d13b72e70802be8c97dcfddf + google_m2repository_r32.zip @@ -1431,16 +1392,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS& google_play_services_froyo - + - 31 + 32 - - 11746505 - 3f1b502d0f6361c036cb332b8c15249a1168e08b - google_play_services_9256000_r31.zip + + 11820632 + bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f + google_play_services_945200_r32.zip diff --git a/pkgs/development/mobile/androidenv/addons.nix b/pkgs/development/mobile/androidenv/addons.nix index 66d548d3304..f999f603b8f 100644 --- a/pkgs/development/mobile/androidenv/addons.nix +++ b/pkgs/development/mobile/androidenv/addons.nix @@ -256,6 +256,18 @@ in }; }; + google_apis_24 = buildGoogleApis { + name = "google_apis-24"; + src = fetchurl { + url = https://dl.google.com/android/repository/google_apis-24_r1.zip; + sha1 = "31361c2868f27343ee917fbd259c1463821b6145"; + }; + meta = { + description = "Android + Google APIs"; + + }; + }; + android_support_extra = buildGoogleApis { name = "android_support_extra"; src = fetchurl { @@ -271,8 +283,8 @@ in google_play_services = buildGoogleApis { name = "google_play_services"; src = fetchurl { - url = https://dl.google.com/android/repository/google_play_services_9256000_r31.zip; - sha1 = "3f1b502d0f6361c036cb332b8c15249a1168e08b"; + url = https://dl.google.com/android/repository/google_play_services_945200_r32.zip; + sha1 = "bf0e7c1848371c7e6dd7a01e237dbd916e5cb04f"; }; meta = { description = "Google Play services client library and sample code"; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index a0ecb641f08..a742386920b 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,8 +1,9 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper -, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons +, platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources , libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib -, freetype, fontconfig, glib, gtk, atk, file, jdk, coreutils, libpulseaudio, dbus +, freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig +, includeSources }: { platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs ? false, useGooglePlayServices ? false }: @@ -10,16 +11,16 @@ with { inherit (stdenv.lib) makeLibraryPath; }; stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "25.1.7"; + version = "25.2.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-linux.zip"; - sha1 = "p03br08zfq0j7aar5638z8fdh5n9x1in"; + sha256 = "0q53yq8fjc10kr4fz3rap5vsil3297w5nn4kw1z0ms7yz1d1im8h"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/repository/tools_r${version}-macosx.zip"; - sha1 = "7fzlfms37cfk25kk4f9zriy63djmbi8g"; + sha256 = "1wq7xm0rhy0h6qylv7fq9mhf8hqihrr1nzf7d322rc3g0jfrdrcl"; } else throw "platform not ${stdenv.system} supported!"; @@ -67,15 +68,15 @@ stdenv.mkDerivation rec { wrapProgram `pwd`/android \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk2 libXtst ]} wrapProgram `pwd`/uiautomatorviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} wrapProgram `pwd`/hierarchyviewer \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk libXtst ]} + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ glib gtk2 libXtst ]} # The emulators need additional libraries, which are dynamically loaded => let's wrap them @@ -101,7 +102,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} cd ../.. '' @@ -114,7 +115,7 @@ stdenv.mkDerivation rec { patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]} + --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk2 atk stdenv.cc.cc libXtst ]} cd ../.. '' @@ -165,6 +166,22 @@ stdenv.mkDerivation rec { cd ../.. + # Symlink required sources + mkdir -p sources + cd sources + + ${if includeSources then + stdenv.lib.concatMapStrings (platformVersion: + if (builtins.hasAttr ("source_"+platformVersion) sources) then + let + source = builtins.getAttr ("source_"+platformVersion) sources; + in + "ln -s ${source}/* android-${platformVersion}\n" + else "") platformVersions + else ""} + + cd .. + # Symlink required platforms mkdir -p platforms diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 255aa497e24..945cc0bedd5 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,16 +1,16 @@ -{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit}: +{stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit, ncurses_32bit, file, zlib, ncurses}: stdenv.mkDerivation rec { - version = "23.0.1"; + version = "24.0.2"; name = "android-build-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-linux.zip"; - sha1 = "b6ba7c399d5fa487d95289d8832e4ad943aed556"; + sha256 = "15bxk03m1r1i74idydgqsrz1k7qczi8f9sj4kl8vvbw9l6w2jklj"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/build-tools_r${version}-macosx.zip"; - sha1 = "d96ec1522721e9a179ae2c591c99f75d31d39718"; + sha256 = "0h71bv8rdkssn7a17vj3r7jl5jwsxbwpg3sig0k9a7yfwyfc71s8"; } else throw "System ${stdenv.system} not supported!"; @@ -23,50 +23,34 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") '' cd ${version} - - # Patch the interpreter - for i in aidl bcc_compat dexdump llvm-rs-cc - do - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i - done - - # These binaries need to find libstdc++ and libgcc_s - for i in aidl lib/libLLVM.so - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib $i - done - - # These binaries need to find libstdc++, libgcc_s and libraries in the current folder - for i in lib/libbcc.so lib/libbcinfo.so lib/libclang.so aidl - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:`pwd`/lib $i - done - - # Create link to make libtinfo.so.5 work - ln -s ${ncurses_32bit.out}/lib/libncurses.so.5 `pwd`/lib/libtinfo.so.5 - - # These binaries need to find libstdc++, libgcc_s, ncurses, and libraries in the current folder - for i in bcc_compat llvm-rs-cc - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${ncurses_32bit.out}/lib:`pwd`/lib $i - done - # These binaries also need zlib in addition to libstdc++ - for i in arm-linux-androideabi-ld i686-linux-android-ld mipsel-linux-android-ld split-select aapt zipalign + ln -s ${ncurses.out}/lib/libncurses.so.5 `pwd`/lib64/libtinfo.so.5 + + find . -type f -print0 | while IFS= read -r -d "" file do - patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i - done - - # These binaries need to find libstdc++, libgcc_s, and zlib - for i in aapt dexdump - do - patchelf --set-rpath ${stdenv_32bit.cc.cc.lib}/lib:${zlib_32bit.out}/lib:`pwd`/lib $i + type=$(file "$file") + ## Patch 64-bit binaries + if grep -q "ELF 64-bit" <<< "$type" + then + if grep -q "interpreter" <<< "$type" + then + patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 "$file" + fi + patchelf --set-rpath `pwd`/lib64:${stdenv.cc.cc.lib.out}/lib:${zlib.out}/lib:${ncurses.out}/lib "$file" + ## Patch 32-bit binaries + elif grep -q "ELF 32-bit" <<< "$type" + then + if grep -q "interpreter" <<< "$type" + then + patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 "$file" + fi + patchelf --set-rpath ${stdenv_32bit.cc.cc.lib.out}/lib:${zlib_32bit.out}/lib:${ncurses_32bit.out}/lib "$file" + fi done ''} patchShebangs . ''; - buildInputs = [ unzip ]; + buildInputs = [ unzip file ]; } diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 5a5eb1ab51b..7ecb82ce406 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -1,4 +1,4 @@ -{pkgs, pkgs_i686}: +{pkgs, pkgs_i686, includeSources ? true}: rec { platformTools = import ./platform-tools.nix { @@ -6,10 +6,11 @@ rec { }; buildTools = import ./build-tools.nix { - inherit (pkgs) stdenv fetchurl unzip; + inherit (pkgs) stdenv fetchurl unzip zlib file; stdenv_32bit = pkgs_i686.stdenv; zlib_32bit = pkgs_i686.zlib; - ncurses_32bit = pkgs_i686.ncurses; + ncurses_32bit = pkgs_i686.ncurses5; + ncurses = pkgs.ncurses5; }; support = import ./support.nix { @@ -38,12 +39,16 @@ rec { inherit (pkgs) stdenv fetchurl unzip; }; + sources = import ./sources.nix { + inherit (pkgs) stdenv fetchurl unzip; + }; + androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk atk mesa file alsaLib jdk coreutils libpulseaudio dbus; + inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; - inherit platformTools buildTools support supportRepository platforms sysimages addons; + inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; stdenv_32bit = pkgs_i686.stdenv; }; diff --git a/pkgs/development/mobile/androidenv/fetch.sh b/pkgs/development/mobile/androidenv/fetch.sh index c14c060fc67..cd9f29a4c24 100755 --- a/pkgs/development/mobile/androidenv/fetch.sh +++ b/pkgs/development/mobile/androidenv/fetch.sh @@ -12,3 +12,4 @@ curl -o sys-img.xml https://dl.google.com/android/repository/sys-img/andro ./generate-addons.sh ./generate-platforms.sh ./generate-sysimages.sh +./generate-sources.sh diff --git a/pkgs/development/mobile/androidenv/generate-sources.sh b/pkgs/development/mobile/androidenv/generate-sources.sh new file mode 100755 index 00000000000..861fbbf9d2e --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-sources.sh @@ -0,0 +1,3 @@ +#!/bin/sh -e + +xsltproc generate-sources.xsl repository-11.xml > sources.nix diff --git a/pkgs/development/mobile/androidenv/generate-sources.xsl b/pkgs/development/mobile/androidenv/generate-sources.xsl new file mode 100644 index 00000000000..ad76369b2be --- /dev/null +++ b/pkgs/development/mobile/androidenv/generate-sources.xsl @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + https://dl.google.com/android/repository/ + + + + + + +# This file is generated from generate-sources.sh. DO NOT EDIT. +# Execute generate-sources.sh or fetch.sh to update the file. +{stdenv, fetchurl, unzip}: + +let + buildSource = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + source_ = buildSource { + name = "android-source-"; + src = fetchurl { + url = ; + sha1 = ""; + }; + meta = { + description = "Source code for Android API "; + }; + }; + +} + + diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index bafdf75bef3..517167b0d55 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,16 +1,16 @@ {stdenv, zlib, fetchurl, unzip}: stdenv.mkDerivation rec { - version = "24"; + version = "24.0.2"; name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-linux.zip"; - sha1 = "qabpsfhm7shvyjy6amdl7b3d41n64zsr"; + sha256 = "0y36mlwh4kb77d3vcpqxqwkxsadllap6g6jjylf3rb7blh5l4zw6"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "https://dl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; - sha1 = "5s808wby36xxkfmrj4va9dnc0rwsz2gh"; + sha256 = "1whfhdwjir2sv2pfypagva813yn0fx8idi6c2mxhddv2mlws6zk4"; } else throw "System ${stdenv.system} not supported!"; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index b33d80f13e7..e0c77ad294e 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -283,8 +283,8 @@ in platform_24 = buildPlatform { name = "android-platform-7.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r01.zip; - sha1 = "27516dab4848f55896e16f7089038c62bbbffea7"; + url = https://dl.google.com/android/repository/platform-24_r02.zip; + sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; }; meta = { description = "Android SDK Platform 24"; diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index d39d6dab7ca..60fae208ae1 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -283,8 +283,8 @@ in platform_24 = buildPlatform { name = "android-platform-7.0"; src = fetchurl { - url = https://dl.google.com/android/repository/platform-24_r01.zip; - sha1 = "27516dab4848f55896e16f7089038c62bbbffea7"; + url = https://dl.google.com/android/repository/platform-24_r02.zip; + sha1 = "8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee"; }; meta = { description = "Android SDK Platform 24"; diff --git a/pkgs/development/mobile/androidenv/repository-11.xml b/pkgs/development/mobile/androidenv/repository-11.xml index ead5dcad711..a0ef9bc4485 100644 --- a/pkgs/development/mobile/androidenv/repository-11.xml +++ b/pkgs/development/mobile/androidenv/repository-11.xml @@ -15,7 +15,7 @@ * limitations under the License. --> - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -335,18 +335,58 @@ June 2014. + + + NDK + 13 + + + + 665405792 + 0cbdb271b103a7e4237b34b73f0e56381e4632aa + android-ndk-r13-beta2-darwin-x86_64.zip + macosx + 64 + + + + 686843165 + ea1a76d9ebdc82fe742d32798aaee7c980afd2f6 + android-ndk-r13-beta2-linux-x86_64.zip + linux + 64 + + + + 619981813 + a5f6edceb3afa4ecd47071822ea32ba6bd6ac002 + android-ndk-r13-beta2-windows-x86.zip + windows + 32 + + + + 680836961 + a0b6a0ed271b0a99cdca28ce8fd405f89defc539 + android-ndk-r13-beta2-windows-x86_64.zip + windows + 64 + + + + - + 7.0 24 Android SDK Platform 24 2 - - 82645675 - 27516dab4848f55896e16f7089038c62bbbffea7 - platform-24_r01.zip + + 82648154 + 8912da3d4bfe7a9f28f0e5ce92d3a8dc96342aee + platform-24_r02.zip @@ -952,6 +992,20 @@ June 2014. 4 + + + 24 + 1 + + + + 30270410 + 6b96115830a83d654479f32ce4b724ca9011148b + sources-24_r01.zip + + + + 23 @@ -1094,7 +1148,39 @@ June 2014. - + + + 24 + 0 + 2 + + + + + 48936295 + f199a7a788c3fefbed102eea34d6007737b803cf + build-tools_r24.0.2-linux.zip + linux + + + + 48726190 + 8bb8fc575477491d5957de743089df412de55cda + build-tools_r24.0.2-macosx.zip + macosx + + + + 49512513 + 09586a1f1c39bcfa7db5205c9a07837247deb67e + build-tools_r24.0.2-windows.zip + windows + + + + + + 24 0 @@ -1102,23 +1188,23 @@ June 2014. - - 48936213 - d3647db5c349247787d4e124dfb717e72b4304c7 + + 48936286 + 84f18c392919a074fcbb9b1d967984e6b2fef8b4 build-tools_r24.0.1-linux.zip linux - - 48725466 - 4fb942e52d05ded78719410fc8644e70a62f18d6 + + 48726085 + 5c6457fcdfa07724fb086d8ff4e8316fc0742848 build-tools_r24.0.1-macosx.zip macosx - - 49511433 - f73cc9028bff45689351ac8e093876bbeb80d1f1 + + 49511883 + ac4a7cea42c3ef74d7fbf1b992fad311c550034e build-tools_r24.0.1-windows.zip windows @@ -1134,21 +1220,21 @@ June 2014. - + 48960919 c6271c4d78a5612ea6c7150688bcd5b7313de8d1 build-tools_r24-linux.zip linux - + 48747930 97fc4ed442f23989cc488d02c1d1de9bdde241de build-tools_r24-macosx.zip macosx - + 49535326 dc61b9e5b451a0c3ec42ae2b1ce27c4d3c8da9f7 build-tools_r24-windows.zip @@ -1166,21 +1252,21 @@ June 2014. - + 39071201 8a9f2b37f6fcf7a9fa784dc21aeaeb41bbb9f2c3 build-tools_r23.0.2-linux.zip linux - + 38060914 482c4cbceef8ff58aefd92d8155a38610158fdaf build-tools_r23.0.2-macosx.zip macosx - + 38217626 fc3a92c744d3ba0a16ccb5d2b41eea5974ce0a96 build-tools_r23.0.2-windows.zip @@ -1198,21 +1284,21 @@ June 2014. - + 40733174 368f2600feac7e9b511b82f53d1f2240ae4a91a3 build-tools_r23.0.3-linux.zip linux - + 39679533 fbc98cd303fd15a31d472de6c03bd707829f00b0 build-tools_r23.0.3-macosx.zip macosx - + 39869945 c6d8266c6a3243c8f1e41b786c0e3cee4c781263 build-tools_r23.0.3-windows.zip @@ -1263,21 +1349,21 @@ June 2014. - + 39080519 c1d6209212b01469f80fa804e0c1d39a06bc9060 build-tools_r23-linux.zip linux - + 38070540 90ba6e716f7703a236cd44b2e71c5ff430855a03 build-tools_r23-macosx.zip macosx - + 38570715 3874948f35f2f8946597679cc6e9151449f23b5d build-tools_r23-windows.zip @@ -1295,21 +1381,21 @@ June 2014. - + 33104577 da8b9c5c3ede39298e6cf0283c000c2ee9029646 build-tools_r22.0.1-linux.zip linux - + 33646102 53dad7f608e01d53b17176ba11165acbfccc5bbf build-tools_r22.0.1-macosx.zip macosx - + 33254137 61d8cbe069d9e0a57872a83e5e5abe164b7d52cf build-tools_r22.0.1-windows.zip @@ -1328,21 +1414,21 @@ June 2014. - + 33104280 a8a1619dd090e44fac957bce6842e62abf87965b build-tools_r22-linux.zip linux - + 33646090 af95429b24088d704bc5db9bd606e34ac1b82c0d build-tools_r22-macosx.zip macosx - + 33254114 08fcca41e81b172bd9f570963b90d3a84929e043 build-tools_r22-windows.zip @@ -1360,21 +1446,21 @@ June 2014. - + 32637678 5e35259843bf2926113a38368b08458735479658 build-tools_r21.1.2-linux.zip linux - + 33152878 e7c906b4ba0eea93b32ba36c610dbd6b204bff48 build-tools_r21.1.2-macosx.zip macosx - + 32792587 1d944759c47f60e634d2b8a1f3a4259be2f8d652 build-tools_r21.1.2-windows.zip @@ -1393,21 +1479,21 @@ June 2014. - + 32642454 1c712ee3a1ba5a8b0548f9c32f17d4a0ddfd727d build-tools_r21.1.1-linux.zip linux - + 33157676 836a146eab0504aa9387a5132e986fe7c7381571 build-tools_r21.1.1-macosx.zip macosx - + 32797356 53fc4201237f899d5cd92f0b76ad41fb89da188b build-tools_r21.1.1-windows.zip @@ -1426,21 +1512,21 @@ June 2014. - + 32642820 b7455e543784d52a8925f960bc880493ed1478cb build-tools_r21.1-linux.zip linux - + 33158159 df619356c2359aa5eacdd48699d15b335d9bd246 build-tools_r21.1-macosx.zip macosx - + 32797810 c79d63ac6b713a1e326ad4dae43f2ee76708a2f4 build-tools_r21.1-windows.zip @@ -1459,21 +1545,21 @@ June 2014. - + 22153122 e1236ab8897b62b57414adcf04c132567b2612a5 build-tools_r21.0.2-linux.zip linux - + 22668597 f17471c154058f3734729ef3cc363399b1cd3de1 build-tools_r21.0.2-macosx.zip macosx - + 22306371 37496141b23cbe633167927b7abe6e22d9f1a1c1 build-tools_r21.0.2-windows.zip @@ -1492,21 +1578,21 @@ June 2014. - + 22153013 e573069eea3e5255e7a65bedeb767f4fd0a5f49a build-tools_r21.0.1-linux.zip linux - + 22668616 b60c8f9b810c980abafa04896706f3911be1ade7 build-tools_r21.0.1-macosx.zip macosx - + 22306243 d68e7e6fd7a48c8759aa41d713c9d4f0e4c1c1df build-tools_r21.0.1-windows.zip @@ -1877,100 +1963,64 @@ June 2014. - + 24 0 - 1 + 2 - - 3328487 - 597f626c206dac435b55c64bbfa13e153a7d97c2 - platform-tools_r24-linux.zip + + 3341647 + a268850d31973d32de5c1515853f81924a4068cf + platform-tools_r24.0.2-linux.zip linux - - 3143839 - f089af7906ccb6a43691b9bad9bb197e7104902e - platform-tools_r24-macosx.zip + + 3157182 + 16053da716cbc6ef31c32a0d2f1437b22089c88c + platform-tools_r24.0.2-macosx.zip macosx - - 2984063 - f1e2d122544d7beaa6f979e485fe742ba735802e - platform-tools_r24-windows.zip + + 2997417 + ce09a7351d5c50865691554ed56325f6e5cd733c + platform-tools_r24.0.2-windows.zip windows - - - 25 - 1 - 7 - - - - - 234442830 - 36869e6c81cda18f862959a92301761f81bc06b8 - tools_r25.1.7-linux.zip - linux - - - - 161408907 - 0fc555651bc6c7fc93237316311d3b435747bf3b - tools_r25.1.7-macosx.zip - macosx - - - - 230413711 - 2556ac9a5fa741d44d9b989966c0bbdf15cb6424 - tools_r25.1.7-windows.zip - windows - - - - - 20 - - - - + 25 2 - 0 - 1 + 2 - - 277445993 - 084ff93feb2f432f532cb00375e582f46b583ff2 - tools_r25.2-linux.zip + + 273491448 + 99257925a3d8b46fee948a7520d7b7e3e3e1890e + tools_r25.2.2-linux.zip linux - - 195767390 - e49cc97f6f408fde9181f11ab942dbbea31abce3 - tools_r25.2-macosx.zip + + 195856788 + bbaa3929696ce523ea62b58cc8032d7964a154c5 + tools_r25.2.2-macosx.zip macosx - - 301550581 - cc8bcbd7fb5627ab866cc583b041d0bfc18e4441 - tools_r25.2-windows.zip + + 301642481 + ef898dff805c4b9e39f6e77fd9ec397fb1b1f809 + tools_r25.2.2-windows.zip windows @@ -1980,15 +2030,15 @@ June 2014. - - 23 + + 24 1 - - 332171437 - 060ebab2f74861e1ddd9136df26b837312bc087f - docs-23_r01.zip + + 419477967 + eef58238949ee9544876cb3e002f2d58e4ee7b5d + docs-24_r01.zip diff --git a/pkgs/development/mobile/androidenv/sources.nix b/pkgs/development/mobile/androidenv/sources.nix new file mode 100644 index 00000000000..5bb7409c2c4 --- /dev/null +++ b/pkgs/development/mobile/androidenv/sources.nix @@ -0,0 +1,140 @@ + +# This file is generated from generate-sources.sh. DO NOT EDIT. +# Execute generate-sources.sh or fetch.sh to update the file. +{stdenv, fetchurl, unzip}: + +let + buildSource = args: + stdenv.mkDerivation (args // { + buildInputs = [ unzip ]; + buildCommand = '' + mkdir -p $out + cd $out + unzip $src + ''; + }); +in +{ + + source_14 = buildSource { + name = "android-source-14"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-14_r01.zip; + sha1 = "eaf4ed7dcac46e68516a1b4aa5b0d9e5a39a7555"; + }; + meta = { + description = "Source code for Android API 14"; + }; + }; + + source_15 = buildSource { + name = "android-source-15"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-15_r02.zip; + sha1 = "e5992a5747c9590783fbbdd700337bf0c9f6b1fa"; + }; + meta = { + description = "Source code for Android API 15"; + }; + }; + + source_16 = buildSource { + name = "android-source-16"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-16_r02.zip; + sha1 = "0f83c14ed333c45d962279ab5d6bc98a0269ef84"; + }; + meta = { + description = "Source code for Android API 16"; + }; + }; + + source_17 = buildSource { + name = "android-source-17"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-17_r01.zip; + sha1 = "6f1f18cd2d2b1852d7f6892df9cee3823349d43a"; + }; + meta = { + description = "Source code for Android API 17"; + }; + }; + + source_18 = buildSource { + name = "android-source-18"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-18_r01.zip; + sha1 = "8b49fdf7433f4881a2bfb559b5dd05d8ec65fb78"; + }; + meta = { + description = "Source code for Android API 18"; + }; + }; + + source_19 = buildSource { + name = "android-source-19"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-19_r02.zip; + sha1 = "433a1d043ef77561571250e94cb7a0ef24a202e7"; + }; + meta = { + description = "Source code for Android API 19"; + }; + }; + + source_20 = buildSource { + name = "android-source-20"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-20_r01.zip; + sha1 = "8da3e40f2625f9f7ef38b7e403f49f67226c0d76"; + }; + meta = { + description = "Source code for Android API 20"; + }; + }; + + source_21 = buildSource { + name = "android-source-21"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-21_r01.zip; + sha1 = "137a5044915d32bea297a8c1552684802bbc2e25"; + }; + meta = { + description = "Source code for Android API 21"; + }; + }; + + source_22 = buildSource { + name = "android-source-22"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-22_r01.zip; + sha1 = "98320e13976d11597a4a730a8d203ac9a03ed5a6"; + }; + meta = { + description = "Source code for Android API 22"; + }; + }; + + source_23 = buildSource { + name = "android-source-23"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-23_r01.zip; + sha1 = "b0f15da2762b42f543c5e364c2b15b198cc99cc2"; + }; + meta = { + description = "Source code for Android API 23"; + }; + }; + + source_24 = buildSource { + name = "android-source-24"; + src = fetchurl { + url = https://dl.google.com/android/repository/sources-24_r01.zip; + sha1 = "6b96115830a83d654479f32ce4b724ca9011148b"; + }; + meta = { + description = "Source code for Android API 24"; + }; + }; + +} diff --git a/pkgs/development/mobile/androidenv/sys-img.xml b/pkgs/development/mobile/androidenv/sys-img.xml index 1138d8284d4..237f1348232 100644 --- a/pkgs/development/mobile/androidenv/sys-img.xml +++ b/pkgs/development/mobile/androidenv/sys-img.xml @@ -1,6 +1,6 @@ - + Terms and Conditions This is the Android Software Development Kit License Agreement @@ -558,22 +558,39 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 24 ARM EABI v7a System Image - 5 + 7 - - 497498007 - 2eb8fb86f7312614a2a0b033d669d67206a618ff - sysimg_armeabi-v7a-24_r05.zip + + 283677512 + 3454546b4eed2d6c3dd06d47757d6da9f4176033 + armeabi-v7a-24_r07.zip - + armeabi-v7a default + + + 24 + ARM 64 v8a System Image + 7 + + + + 384556503 + e8ab2e49e4efe4b064232b33b5eeaded61437d7f + arm64-v8a-24_r07.zip + + + + arm64-v8a + default + 15 @@ -779,19 +796,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 24 Intel x86 Atom System Image - 5 + 7 - - 535224957 - ce6441c4cadaecd28b364c59b36c31ef0904dae0 - sysimg_x86-24_r05.zip + + 302213276 + 566fdee283a907854bfa3c174265bc31f396eabd + x86-24_r07.zip - + x86 default @@ -847,19 +864,19 @@ ANY PRE-RELEASE MATERIALS ARE NON-QUALIFIED AND, AS SUCH, ARE PROVIDED “AS IS default - + 24 Intel x86 Atom_64 System Image - 5 + 7 - - 727226879 - e1869b32b1dcb2f4d4d18c912166b3e2bee8a841 - sysimg_x86_64-24_r05.zip + + 407148033 + a379932395ced0a8f572b39c396d86e08827a9ba + x86_64-24_r07.zip - + x86_64 default diff --git a/pkgs/development/mobile/androidenv/sysimages.nix b/pkgs/development/mobile/androidenv/sysimages.nix index cd6ac3b2943..2c8e1b33a46 100644 --- a/pkgs/development/mobile/androidenv/sysimages.nix +++ b/pkgs/development/mobile/androidenv/sysimages.nix @@ -207,27 +207,35 @@ in }; }; + sysimg_arm64-v8a_24 = buildSystemImage { + name = "sysimg-arm64-v8a-24"; + src = fetchurl { + url = https://dl.google.com/android/repository/sys-img/android/arm64-v8a-24_r07.zip; + sha1 = "e8ab2e49e4efe4b064232b33b5eeaded61437d7f"; + }; + }; + sysimg_armeabi-v7a_24 = buildSystemImage { name = "sysimg-armeabi-v7a-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_armeabi-v7a-24_r05.zip; - sha1 = "2eb8fb86f7312614a2a0b033d669d67206a618ff"; + url = https://dl.google.com/android/repository/sys-img/android/armeabi-v7a-24_r07.zip; + sha1 = "3454546b4eed2d6c3dd06d47757d6da9f4176033"; }; }; sysimg_x86_24 = buildSystemImage { name = "sysimg-x86-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86-24_r05.zip; - sha1 = "ce6441c4cadaecd28b364c59b36c31ef0904dae0"; + url = https://dl.google.com/android/repository/sys-img/android/x86-24_r07.zip; + sha1 = "566fdee283a907854bfa3c174265bc31f396eabd"; }; }; sysimg_x86_64_24 = buildSystemImage { name = "sysimg-x86_64-24"; src = fetchurl { - url = https://dl.google.com/android/repository/sys-img/android/sysimg_x86_64-24_r05.zip; - sha1 = "e1869b32b1dcb2f4d4d18c912166b3e2bee8a841"; + url = https://dl.google.com/android/repository/sys-img/android/x86_64-24_r07.zip; + sha1 = "a379932395ced0a8f572b39c396d86e08827a9ba"; }; }; } diff --git a/pkgs/development/node-packages/README b/pkgs/development/node-packages/README deleted file mode 100644 index 48354324a05..00000000000 --- a/pkgs/development/node-packages/README +++ /dev/null @@ -1,13 +0,0 @@ -How to update the NPM packages -============================== -- Install node2nix: - -nix-env -f '' -iA node2nix - -- Modify node-packages.json, add, update or remove package entries - -- Run the script: - -sh generate.sh - -- Done! diff --git a/pkgs/development/node-packages/README.md b/pkgs/development/node-packages/README.md new file mode 100644 index 00000000000..138d1475c2f --- /dev/null +++ b/pkgs/development/node-packages/README.md @@ -0,0 +1,13 @@ +Node.js packages +=============== +To add a package from [NPM](https://www.npmjs.com/) to nixpkgs: + + 1. Install node2nix: `nix-env -f '' -iA node2nix`. + 2. Modify `pkgs/development/node-packages/node-packages.json`, to add, update, + or remove package entries. + 3. Run the script: `cd pkgs/development/node-packages && sh generate.sh`. + 4. Build your new package to test your changes: `cd /path/to/nixpkgs && + nix-build -A nodePackages.`. To build against a + specific node.js version (e.g. 5.x): `nix-build -A + nodePackages_5_x.` + 5. Add, commit, and share your changes! diff --git a/pkgs/development/node-packages/composition-v4.nix b/pkgs/development/node-packages/composition-v4.nix index 05c18f861a0..1c0f5f0626e 100644 --- a/pkgs/development/node-packages/composition-v4.nix +++ b/pkgs/development/node-packages/composition-v4.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/composition-v5.nix b/pkgs/development/node-packages/composition-v5.nix index a1567025c7d..be9201677ce 100644 --- a/pkgs/development/node-packages/composition-v5.nix +++ b/pkgs/development/node-packages/composition-v5.nix @@ -1,4 +1,4 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! {pkgs ? import { inherit system; diff --git a/pkgs/development/node-packages/default-v4.nix b/pkgs/development/node-packages/default-v4.nix index 5d724034201..99cb7ca4044 100644 --- a/pkgs/development/node-packages/default-v4.nix +++ b/pkgs/development/node-packages/default-v4.nix @@ -35,5 +35,16 @@ nodePackages // { buildInputs = oldAttrs.buildInputs ++ [ pkgs.phantomjs2 ]; }); - npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0"; + npm2nix = nodePackages."npm2nix-git://github.com/NixOS/npm2nix.git#5.12.0".override { + postInstall = "npm run-script prepublish"; + }; + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } diff --git a/pkgs/development/node-packages/default-v5.nix b/pkgs/development/node-packages/default-v5.nix index c858c580d2a..00dce5966aa 100644 --- a/pkgs/development/node-packages/default-v5.nix +++ b/pkgs/development/node-packages/default-v5.nix @@ -32,4 +32,13 @@ nodePackages // { dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. }); + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } diff --git a/pkgs/development/node-packages/default-v6.nix b/pkgs/development/node-packages/default-v6.nix index c858c580d2a..00dce5966aa 100644 --- a/pkgs/development/node-packages/default-v6.nix +++ b/pkgs/development/node-packages/default-v6.nix @@ -32,4 +32,13 @@ nodePackages // { dontNpmInstall = true; # We face an error with underscore not found, but the package will work fine if we ignore this. }); + + bower2nix = nodePackages.bower2nix.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = '' + for prog in bower2nix fetch-bower; do + wrapProgram "$out/bin/$prog" --prefix PATH : "${pkgs.git}/bin" + done + ''; + }); } diff --git a/pkgs/development/node-packages/node-env.nix b/pkgs/development/node-packages/node-env.nix index 29995f22e26..c5c69c7d05d 100644 --- a/pkgs/development/node-packages/node-env.nix +++ b/pkgs/development/node-packages/node-env.nix @@ -227,6 +227,9 @@ let done done fi + + # Run post install hook, if provided + runHook postInstall ''; }); diff --git a/pkgs/development/node-packages/node-packages-v4.nix b/pkgs/development/node-packages/node-packages-v4.nix index b506ea1d269..0cfdd2b62ef 100644 --- a/pkgs/development/node-packages/node-packages-v4.nix +++ b/pkgs/development/node-packages/node-packages-v4.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! -{nodeEnv, fetchurl, fetchgit}: +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { @@ -310,31 +310,31 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.10" = { + "which-1.2.11" = { name = "which"; packageName = "which"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.10.tgz"; - sha1 = "91cd9bd0751322411b659b40f054b21de957ab2d"; + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; }; }; - "os-homedir-1.0.1" = { + "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"; - sha1 = "0d62bdf44b916fd3bbdcf2cab191948fb094f007"; + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "os-tmpdir-1.0.1" = { + "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"; - sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e"; + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; "isexe-1.1.2" = { @@ -391,13 +391,13 @@ let sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; }; }; - "azure-common-0.9.17" = { + "azure-common-0.9.18" = { name = "azure-common"; packageName = "azure-common"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.17.tgz"; - sha1 = "8f8df41ccb4a026b670645f223e41e1a7f42f33f"; + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; + sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; }; }; "azure-arm-authorization-2.0.0" = { @@ -463,6 +463,15 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; + "azure-arm-iothub-0.1.1" = { + name = "azure-arm-iothub"; + packageName = "azure-arm-iothub"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; + sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + }; + }; "azure-arm-servermanagement-0.1.2" = { name = "azure-arm-servermanagement"; packageName = "azure-arm-servermanagement"; @@ -472,13 +481,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.13.2" = { + "azure-arm-network-0.17.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.13.2"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.13.2.tgz"; - sha1 = "c1f798e5de97295aa0def2cb7f49c53f258d12b0"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz"; + sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -499,22 +508,22 @@ let sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; }; }; - "azure-arm-dns-0.10.1" = { + "azure-arm-dns-0.11.1" = { name = "azure-arm-dns"; packageName = "azure-arm-dns"; - version = "0.10.1"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.10.1.tgz"; - sha1 = "8f6dded24a8b8dbc9b81f6b273970ac8ba2a0c54"; + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz"; + sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2"; }; }; - "azure-arm-website-0.10.0" = { + "azure-arm-website-0.11.0" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.10.0.tgz"; - sha1 = "610400ecb801bff16b7e2d7c1c6d1fe99c4f9ec9"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.0.tgz"; + sha1 = "f98cd857d183866e74393f2f1d138002e6cccc79"; }; }; "azure-arm-rediscache-0.2.1" = { @@ -553,13 +562,13 @@ let sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; }; }; - "azure-graph-1.0.1" = { + "azure-graph-1.1.1" = { name = "azure-graph"; packageName = "azure-graph"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.0.1.tgz"; - sha1 = "a2eda330ccd336832b190da0caba9735a73aee97"; + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz"; + sha1 = "5277e750d223aec0fd2559e49149777fe1371708"; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -571,13 +580,13 @@ let sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; }; }; - "azure-keyvault-0.10.1" = { + "azure-keyvault-0.10.2" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.1.tgz"; - sha1 = "b3899d04b5115a22b794a9e83f89201a66c83855"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.2.tgz"; + sha1 = "f00b091362e0e2076eaf9bd0b1687f793bb701a5"; }; }; "azure-asm-compute-0.17.0" = { @@ -625,13 +634,13 @@ let sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; }; }; - "azure-asm-network-0.12.0" = { + "azure-asm-network-0.13.0" = { name = "azure-asm-network"; packageName = "azure-asm-network"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.12.0.tgz"; - sha1 = "f407498dcf4a41e2a674fba23597157370a6ac05"; + url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; + sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; "azure-arm-resource-1.4.5-preview" = { @@ -697,13 +706,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-1.1.0" = { + "azure-storage-1.3.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.1.0.tgz"; - sha1 = "45de61074dbddf44f9245ad287c929541ae971ab"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz"; + sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce"; }; }; "azure-arm-batch-0.2.0" = { @@ -715,13 +724,22 @@ let sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d"; }; }; - "azure-batch-0.4.0" = { + "azure-batch-0.5.2" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.4.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.4.0.tgz"; - sha1 = "065e3fb7ab3e7bb33a254e5cd2d15a23edc7cf40"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz"; + sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; + }; + }; + "azure-servicefabric-0.1.4" = { + name = "azure-servicefabric"; + packageName = "azure-servicefabric"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; + sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; }; }; "applicationinsights-0.15.12" = { @@ -823,6 +841,15 @@ let sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; }; }; + "jsonminify-0.4.1" = { + name = "jsonminify"; + packageName = "jsonminify"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; + sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; + }; + }; "jsrsasign-4.8.2" = { name = "jsrsasign"; packageName = "jsrsasign"; @@ -841,13 +868,13 @@ let sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10"; }; }; - "moment-2.14.1" = { + "moment-2.15.1" = { name = "moment"; packageName = "moment"; - version = "2.14.1"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; - sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + url = "https://registry.npmjs.org/moment/-/moment-2.15.1.tgz"; + sha1 = "e979c2a29e22888e60f396f2220a6118f85cd94c"; }; }; "ms-rest-1.15.0" = { @@ -931,13 +958,13 @@ let sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; - "request-2.69.0" = { + "request-2.74.0" = { name = "request"; packageName = "request"; - version = "2.69.0"; + version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; "ssh-key-to-pem-0.11.0" = { @@ -1003,6 +1030,15 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1138,13 +1174,13 @@ let sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; }; }; - "inherits-2.0.1" = { + "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; "typedarray-0.0.6" = { @@ -1264,22 +1300,22 @@ let sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; }; }; - "is-finite-1.0.1" = { + "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; }; }; - "number-is-nan-1.0.0" = { + "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1327,15 +1363,6 @@ let sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; }; }; - "request-2.72.0" = { - name = "request"; - packageName = "request"; - version = "2.72.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; - sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; - }; - }; "validator-3.22.2" = { name = "validator"; packageName = "validator"; @@ -1372,6 +1399,438 @@ let sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; + "moment-2.6.0" = { + name = "moment"; + packageName = "moment"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; + sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; + }; + }; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + }; + }; + "extend-1.2.1" = { + name = "extend"; + packageName = "extend"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + }; + "browserify-mime-1.2.9" = { + name = "browserify-mime"; + packageName = "browserify-mime"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; + sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; + }; + }; + "json-edm-parser-0.1.2" = { + name = "json-edm-parser"; + packageName = "json-edm-parser"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; + sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; + }; + }; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + }; + "jsonparse-1.2.0" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; + sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; + }; + }; + "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"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "stack-trace-0.0.9" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + }; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + }; + "from-0.1.3" = { + name = "from"; + packageName = "from"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; + sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + }; + "split-0.2.10" = { + name = "split"; + packageName = "split"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; + sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; + }; + }; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + }; + "commander-1.1.1" = { + name = "commander"; + packageName = "commander"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; + }; + }; + "streamline-0.4.11" = { + name = "streamline"; + packageName = "streamline"; + version = "0.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz"; + sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; + }; + }; + "async-0.2.7" = { + name = "async"; + packageName = "async"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; + sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; + }; + }; + "uuid-2.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; + sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + }; + }; + "azure-arm-resource-1.4.4-preview" = { + name = "azure-arm-resource"; + packageName = "azure-arm-resource"; + version = "1.4.4-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz"; + sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2"; + }; + }; + "debug-0.7.4" = { + name = "debug"; + packageName = "debug"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + }; + "q-0.9.7" = { + name = "q"; + packageName = "q"; + version = "0.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; + }; + }; + "pkginfo-0.4.0" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz"; + sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65"; + }; + }; + "revalidator-0.1.8" = { + name = "revalidator"; + packageName = "revalidator"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; + sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + }; + }; + "utile-0.2.1" = { + name = "utile"; + packageName = "utile"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; + sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; + }; + }; + "winston-0.8.3" = { + name = "winston"; + packageName = "winston"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + }; + }; + "deep-equal-1.0.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + }; + "i-0.3.5" = { + name = "i"; + packageName = "i"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz"; + sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + }; + }; + "rimraf-2.5.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; + sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "glob-7.1.0" = { + name = "glob"; + packageName = "glob"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz"; + sha1 = "36add856d746d0d99e4cc2797bba1ae2c67272fd"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "inflight-1.0.5" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; + sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; + }; + }; + "minimatch-3.0.3" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "brace-expansion-1.1.6" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; + sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + }; + }; + "balanced-match-0.4.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; + sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "colors-0.6.2" = { + name = "colors"; + packageName = "colors"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + }; + "cycle-1.0.3" = { + name = "cycle"; + packageName = "cycle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "pkginfo-0.3.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -1480,15 +1939,6 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -1498,13 +1948,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.11" = { + "mime-types-2.1.12" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.11"; + version = "2.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"; - sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; + sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; }; }; "oauth-sign-0.8.2" = { @@ -1516,13 +1966,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.1.0" = { + "qs-6.2.1" = { name = "qs"; packageName = "qs"; - version = "6.1.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; - sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; }; }; "stringstream-0.0.5" = { @@ -1534,13 +1984,13 @@ let sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; }; }; - "tough-cookie-2.2.2" = { + "tough-cookie-2.3.1" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; - sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; }; }; "tunnel-agent-0.4.3" = { @@ -1552,42 +2002,6 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; - }; - }; - "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"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -1606,13 +2020,13 @@ let sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; }; }; - "lodash-4.15.0" = { + "lodash-4.16.2" = { name = "lodash"; packageName = "lodash"; - version = "4.15.0"; + version = "4.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz"; - sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz"; + sha1 = "3e626db827048a699281a8a125226326cfc0e652"; }; }; "chalk-1.1.3" = { @@ -1633,13 +2047,13 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "is-my-json-valid-2.13.1" = { + "is-my-json-valid-2.14.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.13.1"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; - sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.14.0.tgz"; + sha1 = "47bf808609b2df5d48c969c74becd09fbca02725"; }; }; "pinkie-promise-2.0.1" = { @@ -1813,22 +2227,22 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.0" = { + "jsprim-1.3.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"; - sha1 = "ce2e1bef835204b4f3099928c602f8b6ae615650"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; - "sshpk-1.10.0" = { + "sshpk-1.10.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz"; - sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz"; + sha1 = "30e1a5d329244974a1af61511339d595af6638b0"; }; }; "extsprintf-1.0.2" = { @@ -1840,13 +2254,13 @@ let sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }; }; - "json-schema-0.2.2" = { + "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; "verror-1.3.6" = { @@ -1903,13 +2317,13 @@ let sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; }; }; - "tweetnacl-0.13.3" = { + "tweetnacl-0.14.3" = { name = "tweetnacl"; packageName = "tweetnacl"; - version = "0.13.3"; + version = "0.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; - sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; + sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; }; }; "jodid25519-1.0.2" = { @@ -1939,202 +2353,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "tweetnacl-0.14.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; - sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; - }; - }; - "mime-db-1.23.0" = { + "mime-db-1.24.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"; - sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; - }; - }; - "azure-common-0.9.12" = { - name = "azure-common"; - packageName = "azure-common"; - version = "0.9.12"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.12.tgz"; - sha1 = "8ca8167c2dbaa43b61e3caa9c7d98e78908749f6"; - }; - }; - "moment-2.6.0" = { - name = "moment"; - packageName = "moment"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; - sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; - }; - }; - "request-2.45.0" = { - name = "request"; - packageName = "request"; - version = "2.45.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.45.0.tgz"; - sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c"; - }; - }; - "validator-3.1.0" = { - name = "validator"; - packageName = "validator"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-3.1.0.tgz"; - sha1 = "2ea1ff7e92254d69367f385f015299e5ead8755b"; - }; - }; - "bl-0.9.5" = { - name = "bl"; - packageName = "bl"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; - sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; - }; - }; - "caseless-0.6.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "qs-1.2.2" = { - name = "qs"; - packageName = "qs"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; - sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; - }; - }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "tough-cookie-2.3.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; - }; - }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.4.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; - }; - }; - "hawk-1.1.1" = { - name = "hawk"; - packageName = "hawk"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; + sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; }; }; "asn1-0.1.11" = { @@ -2146,456 +2371,6 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }; - }; - "extend-1.2.1" = { - name = "extend"; - packageName = "extend"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - }; - "browserify-mime-1.2.9" = { - name = "browserify-mime"; - packageName = "browserify-mime"; - version = "1.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; - sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; - }; - }; - "json-edm-parser-0.1.2" = { - name = "json-edm-parser"; - packageName = "json-edm-parser"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; - sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; - }; - }; - "jsonparse-1.2.0" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; - sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; - }; - }; - "stack-trace-0.0.9" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - }; - "keypress-0.1.0" = { - name = "keypress"; - packageName = "keypress"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - }; - "from-0.1.3" = { - name = "from"; - packageName = "from"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; - sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; - }; - }; - "map-stream-0.1.0" = { - name = "map-stream"; - packageName = "map-stream"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; - }; - }; - "pause-stream-0.0.11" = { - name = "pause-stream"; - packageName = "pause-stream"; - version = "0.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; - }; - }; - "split-0.2.10" = { - name = "split"; - packageName = "split"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; - sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; - }; - }; - "stream-combiner-0.0.4" = { - name = "stream-combiner"; - packageName = "stream-combiner"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; - }; - }; - "commander-1.1.1" = { - name = "commander"; - packageName = "commander"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; - sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; - }; - }; - "streamline-0.4.11" = { - name = "streamline"; - packageName = "streamline"; - version = "0.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz"; - sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; - }; - }; - "request-2.74.0" = { - name = "request"; - packageName = "request"; - version = "2.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; - }; - }; - "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"; - }; - }; - "async-0.2.7" = { - name = "async"; - packageName = "async"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; - sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; - }; - }; - "uuid-2.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; - sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; - }; - }; - "azure-arm-resource-1.4.4-preview" = { - name = "azure-arm-resource"; - packageName = "azure-arm-resource"; - version = "1.4.4-preview"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz"; - sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2"; - }; - }; - "debug-0.7.4" = { - name = "debug"; - packageName = "debug"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; - }; - }; - "q-0.9.7" = { - name = "q"; - packageName = "q"; - version = "0.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; - }; - }; - "pkginfo-0.4.0" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz"; - sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65"; - }; - }; - "revalidator-0.1.8" = { - name = "revalidator"; - packageName = "revalidator"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; - sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; - }; - }; - "utile-0.2.1" = { - name = "utile"; - packageName = "utile"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; - sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; - }; - }; - "winston-0.8.3" = { - name = "winston"; - packageName = "winston"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; - sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; - }; - }; - "deep-equal-1.0.1" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; - }; - }; - "i-0.3.5" = { - name = "i"; - packageName = "i"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz"; - sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "ncp-0.4.2" = { - name = "ncp"; - packageName = "ncp"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; - sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; - }; - }; - "rimraf-2.5.4" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; - sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "glob-7.0.6" = { - name = "glob"; - packageName = "glob"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "inflight-1.0.5" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; - sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; - }; - }; - "minimatch-3.0.3" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; - }; - }; - "once-1.3.3" = { - name = "once"; - packageName = "once"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; - }; - }; - "path-is-absolute-1.0.0" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "brace-expansion-1.1.6" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; - }; - }; - "balanced-match-0.4.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "colors-0.6.2" = { - name = "colors"; - packageName = "colors"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - }; - "cycle-1.0.3" = { - name = "cycle"; - packageName = "cycle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - }; - "pkginfo-0.3.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; - }; - }; - "qs-6.0.2" = { - name = "qs"; - packageName = "qs"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; - }; - }; "ctype-0.5.2" = { name = "ctype"; packageName = "ctype"; @@ -2677,13 +2452,13 @@ let sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; }; }; - "asap-2.0.4" = { + "asap-2.0.5" = { name = "asap"; packageName = "asap"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz"; - sha1 = "b391bf7f6bfbc65706022fec8f49c4b07fecf589"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; + sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; }; }; "async-1.0.0" = { @@ -3028,6 +2803,15 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; "buffer-shims-1.0.0" = { name = "buffer-shims"; packageName = "buffer-shims"; @@ -3127,22 +2911,22 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.0" = { + "signal-exit-3.0.1" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz"; - sha1 = "3c0543b65d7b4fbc60b6cd94593d9bf436739be8"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; }; }; - "array-find-index-1.0.1" = { + "array-find-index-1.0.2" = { name = "array-find-index"; packageName = "array-find-index"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; - sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; "hosted-git-info-2.1.5" = { @@ -3253,13 +3037,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.6" = { + "graceful-fs-4.1.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.6"; + version = "4.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"; + sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29"; }; }; "parse-json-2.2.0" = { @@ -3370,13 +3154,13 @@ let sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; }; }; - "jsonfile-2.3.1" = { + "jsonfile-2.4.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz"; - sha1 = "28bcb29c596b5b7aafd34e662a329ba62cd842fc"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; "klaw-1.3.0" = { @@ -3424,13 +3208,13 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.1.4" = { + "JSONStream-1.2.1" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.1.4"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; - sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; + sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; }; }; "assert-1.3.0" = { @@ -3703,13 +3487,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.3.1" = { + "stream-http-2.4.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz"; - sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.0.tgz"; + sha1 = "9599aa8e263667ce4190e0dc04a1d065d3595a7e"; }; }; "subarg-1.0.0" = { @@ -3856,13 +3640,13 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "base64-js-1.1.2" = { + "base64-js-1.2.0" = { name = "base64-js"; packageName = "base64-js"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; "ieee754-1.1.6" = { @@ -3937,13 +3721,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.4" = { + "pbkdf2-3.0.8" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.4"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"; - sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.8.tgz"; + sha1 = "2f8abf16ebecc82277945d748aba1d78761f61e2"; }; }; "public-encrypt-4.0.0" = { @@ -4000,13 +3784,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.2" = { + "cipher-base-1.0.3" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"; - sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; + sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; }; }; "des.js-1.0.0" = { @@ -4045,13 +3829,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.1" = { + "elliptic-6.3.2" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.1.tgz"; - sha1 = "17781f2109ab0ec686b146bdcff5d2e8c6aeceda"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; + sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; }; }; "parse-asn1-5.0.0" = { @@ -4063,13 +3847,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.5" = { + "brorand-1.0.6" = { name = "brorand"; packageName = "brorand"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; - sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; + sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; }; }; "hash.js-1.0.3" = { @@ -4081,13 +3865,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.0" = { + "asn1.js-4.8.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.0.tgz"; - sha1 = "e0e04e9923319163be46aed9e5378973b161ef13"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; + sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; }; }; "ripemd160-1.0.1" = { @@ -4288,6 +4072,15 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "indexof-0.0.1" = { name = "indexof"; packageName = "indexof"; @@ -4819,6 +4612,15 @@ let sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; }; }; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4927,13 +4729,13 @@ let sha1 = "106df57e0e509bafa6756e544d88205e52be33a6"; }; }; - "simple-get-2.2.2" = { + "simple-get-2.2.3" = { name = "simple-get"; packageName = "simple-get"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.2.tgz"; - sha1 = "e4d0ff30af7dddf8ef9b5221c32658e7f1438515"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.3.tgz"; + sha1 = "cc4b653891601977db17ff3bcbb01474997f9fdb"; }; }; "thirty-two-1.0.2" = { @@ -4972,22 +4774,22 @@ let sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f"; }; }; - "rusha-0.8.3" = { + "rusha-0.8.4" = { name = "rusha"; packageName = "rusha"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.3.tgz"; - sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz"; + sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b"; }; }; - "unzip-response-1.0.0" = { + "unzip-response-1.0.1" = { name = "unzip-response"; packageName = "unzip-response"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.0.tgz"; - sha1 = "bfda54eeec658f00c2df4d4494b9dca0ca00f3e4"; + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; + sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; }; }; "once-1.2.0" = { @@ -5296,13 +5098,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "buffer-equals-1.0.3" = { + "buffer-equals-1.0.4" = { name = "buffer-equals"; packageName = "buffer-equals"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.3.tgz"; - sha1 = "9e9b8c160a5ceaf68f12ee5a8d2f4ba91c5453e0"; + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; "k-bucket-0.6.0" = { @@ -5575,6 +5377,15 @@ let sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }; }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; "hawk-0.10.2" = { name = "hawk"; packageName = "hawk"; @@ -5647,6 +5458,24 @@ let sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }; }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; "hoek-0.7.6" = { name = "hoek"; packageName = "hoek"; @@ -5881,13 +5710,13 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "npm-2.15.10" = { + "npm-2.15.11" = { name = "npm"; packageName = "npm"; - version = "2.15.10"; + version = "2.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.10.tgz"; - sha1 = "de5a3dab6dcc0494784c8b8e37bf52ee851f842c"; + url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; + sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; }; }; "opener-1.4.1" = { @@ -6979,13 +6808,22 @@ let sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa"; }; }; - "lockfile-1.0.1" = { + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; + "lockfile-1.0.2" = { name = "lockfile"; packageName = "lockfile"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"; - sha1 = "9d353ecfe3f54d150bb57f89d51746935a39c4f5"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz"; + sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83"; }; }; "lru-cache-4.0.1" = { @@ -7042,13 +6880,13 @@ let sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a"; }; }; - "npm-registry-client-7.1.2" = { + "npm-registry-client-7.2.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.1.2"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; - sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz"; + sha1 = "c792266b088cc313f8525e7e35248626c723db75"; }; }; "npm-user-validate-0.1.5" = { @@ -7069,13 +6907,13 @@ let sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; }; }; - "path-is-inside-1.0.1" = { + "path-is-inside-1.0.2" = { name = "path-is-inside"; packageName = "path-is-inside"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; - sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; "read-installed-4.0.3" = { @@ -7096,13 +6934,13 @@ let sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; }; }; - "retry-0.9.0" = { + "retry-0.10.0" = { name = "retry"; packageName = "retry"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; + sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; }; }; "sha-2.0.1" = { @@ -7123,13 +6961,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "sorted-object-2.0.0" = { + "sorted-object-2.0.1" = { name = "sorted-object"; packageName = "sorted-object"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.0.tgz"; - sha1 = "1cfea981609047d8043807a490a9d99b317faf7f"; + url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; }; }; "tar-2.2.1" = { @@ -7312,15 +7150,6 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; - "retry-0.8.0" = { - name = "retry"; - packageName = "retry"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; - sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; - }; - }; "are-we-there-yet-1.1.2" = { name = "are-we-there-yet"; packageName = "are-we-there-yet"; @@ -7420,6 +7249,51 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; + "bl-0.9.5" = { + name = "bl"; + packageName = "bl"; + version = "0.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; + sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + }; + }; + "caseless-0.6.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; "qs-2.3.3" = { name = "qs"; packageName = "qs"; @@ -7429,6 +7303,105 @@ let sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "oauth-sign-0.4.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; + sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + }; + }; + "hawk-1.1.1" = { + name = "hawk"; + packageName = "hawk"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; "pegjs-0.9.0" = { name = "pegjs"; packageName = "pegjs"; @@ -7510,13 +7483,13 @@ let sha1 = "364200d5f13646ca8bcd44490271335614792300"; }; }; - "big-integer-1.6.15" = { + "big-integer-1.6.16" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz"; - sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; + sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; }; }; "configstore-1.4.0" = { @@ -7564,13 +7537,13 @@ let sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; }; }; - "uuid-2.0.2" = { + "uuid-2.0.3" = { name = "uuid"; packageName = "uuid"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"; - sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726"; + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; "write-file-atomic-1.2.0" = { @@ -7699,6 +7672,15 @@ let sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf"; }; }; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; "ansi-escapes-1.4.0" = { name = "ansi-escapes"; packageName = "ansi-escapes"; @@ -7771,13 +7753,13 @@ let sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; - "code-point-at-1.0.0" = { + "code-point-at-1.0.1" = { name = "code-point-at"; packageName = "code-point-at"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; - sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"; + sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -7825,6 +7807,33 @@ let sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; }; }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; + }; + }; + "parserlib-1.0.0" = { + name = "parserlib"; + packageName = "parserlib"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz"; + sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f"; + }; + }; "bluebird-2.9.9" = { name = "bluebird"; packageName = "bluebird"; @@ -8477,13 +8486,13 @@ let sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; - "cors-2.8.0" = { + "cors-2.8.1" = { name = "cors"; packageName = "cors"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.0.tgz"; - sha1 = "6262888a49f9ce4c5d189d29e1d5710ab73e6a85"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; + sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; }; }; "docker-parse-image-3.0.1" = { @@ -8531,13 +8540,13 @@ let sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; }; }; - "level-sublevel-6.5.4" = { + "level-sublevel-6.6.0" = { name = "level-sublevel"; packageName = "level-sublevel"; - version = "6.5.4"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.5.4.tgz"; - sha1 = "92e6534e7ac3fa35c8bdb121b8a8094a8d1c0826"; + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.0.tgz"; + sha1 = "675f2f6a3d437b10700e840069bcb331a5c8362f"; }; }; "leveldown-0.10.6" = { @@ -8873,13 +8882,130 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "doctrine-1.3.0" = { + "JSONStream-1.1.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; + sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + }; + }; + "got-6.5.0" = { + name = "got"; + packageName = "got"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; + sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "node-status-codes-2.0.1" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz"; + sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; + "doctrine-1.4.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.3.0.tgz"; - sha1 = "13e75682b55518424276f7c173783456ef913d26"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.4.0.tgz"; + sha1 = "e2db32defa752407b935b381e89f3740e469e599"; }; }; "escope-3.6.0" = { @@ -8891,13 +9017,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.1.7" = { + "espree-3.3.2" = { name = "espree"; packageName = "espree"; - version = "3.1.7"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz"; - sha1 = "fd5deec76a97a5120a9cd3a7cb1177a0923b11d2"; + url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz"; + sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"; }; }; "estraverse-4.2.0" = { @@ -8927,13 +9053,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.9.0" = { + "globals-9.10.0" = { name = "globals"; packageName = "globals"; - version = "9.9.0"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.9.0.tgz"; - sha1 = "4c5ffc359fb21edc83fedb87b1c0b414dc24d552"; + url = "https://registry.npmjs.org/globals/-/globals-9.10.0.tgz"; + sha1 = "d1047641c49b7b03cacf7e15fb8a42a3d33c88f7"; }; }; "ignore-3.1.5" = { @@ -8999,13 +9125,13 @@ let sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; }; - "optionator-0.8.1" = { + "optionator-0.8.2" = { name = "optionator"; packageName = "optionator"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz"; - sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; "pluralize-1.2.1" = { @@ -9044,22 +9170,13 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; - "table-3.7.8" = { + "table-3.8.0" = { name = "table"; packageName = "table"; - version = "3.7.8"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.7.8.tgz"; - sha1 = "b424433ef596851922b2fd77224a69a1951618eb"; - }; - }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + url = "https://registry.npmjs.org/table/-/table-3.8.0.tgz"; + sha1 = "252166c7f3286684a9d561b0f3a8929caf3a997b"; }; }; "es6-map-0.1.4" = { @@ -9116,13 +9233,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-3.3.0" = { + "acorn-4.0.3" = { name = "acorn"; packageName = "acorn"; - version = "3.3.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"; + sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"; }; }; "acorn-jsx-3.0.1" = { @@ -9134,6 +9251,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.1" = { name = "flat-cache"; packageName = "flat-cache"; @@ -9260,13 +9386,13 @@ let sha1 = "c196b0073e6b1c595d93c9c830855b7acc32a453"; }; }; - "argparse-1.0.7" = { + "argparse-1.0.9" = { name = "argparse"; packageName = "argparse"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz"; - sha1 = "c289506480557810f14a8bc62d7a06f63ed7f951"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; + sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; "esprima-2.7.3" = { @@ -9314,13 +9440,13 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "fast-levenshtein-1.1.4" = { + "fast-levenshtein-2.0.5" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; - version = "1.1.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; - sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz"; + sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2"; }; }; "caller-path-0.1.0" = { @@ -9350,13 +9476,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "bluebird-3.4.6" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.4.6"; + "ajv-4.7.5" = { + name = "ajv"; + packageName = "ajv"; + version = "4.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; - sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.7.5.tgz"; + sha1 = "f44172aec18514e6ba6350cc5fae0ee9b142e68c"; + }; + }; + "ajv-keywords-1.1.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz"; + sha1 = "02550bc605a3e576041565628af972e06c549d50"; }; }; "slice-ansi-0.0.4" = { @@ -9368,22 +9503,13 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "tv4-1.2.7" = { - name = "tv4"; - packageName = "tv4"; - version = "1.2.7"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz"; - sha1 = "bd29389afc73ade49ae5f48142b5d544bf68d120"; - }; - }; - "xregexp-3.1.1" = { - name = "xregexp"; - packageName = "xregexp"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-3.1.1.tgz"; - sha1 = "8ee18d75ef5c7cb3f9967f8d29414a6ca5b1a184"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; "glob-3.2.11" = { @@ -9827,13 +9953,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-0.1.5" = { + "for-in-0.1.6" = { name = "for-in"; packageName = "for-in"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"; - sha1 = "007374e2b6d5c67420a1479bdb75a04872b738c4"; + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; + sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; }; }; "glob-base-0.3.0" = { @@ -10089,13 +10215,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.10.0" = { + "coffee-script-1.11.0" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz"; + sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d"; }; }; "jade-1.11.0" = { @@ -10134,13 +10260,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.19" = { + "clean-css-3.4.20" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.19"; + version = "3.4.20"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.19.tgz"; - sha1 = "c32a8a13ca3b824609b14306a5da76d8793c7874"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; + sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; }; }; "commander-2.6.0" = { @@ -11124,85 +11250,58 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-1.2.0" = { + "eventemitter3-2.0.2" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "1.2.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz"; + sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac"; }; }; - "escodegen-1.8.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.8.1"; + "csslint-0.10.0" = { + name = "csslint"; + packageName = "csslint"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; - sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; + sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; }; }; - "handlebars-4.0.5" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.0.5"; + "jshint-2.8.0" = { + name = "jshint"; + packageName = "jshint"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; - sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; + sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; }; }; - "supports-color-3.1.2" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; - sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; - }; - }; - "estraverse-1.9.3" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; - sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; - }; - }; - "source-map-0.2.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; - sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; - }; - }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; + "xml-1.0.0" = { + name = "xml"; + packageName = "xml"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; + sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; }; }; - "when-3.4.6" = { - name = "when"; - packageName = "when"; - version = "3.4.6"; + "parserlib-0.2.5" = { + name = "parserlib"; + packageName = "parserlib"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; - sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; + sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; }; }; - "cli-1.0.0" = { + "cli-0.6.6" = { name = "cli"; packageName = "cli"; - version = "1.0.0"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; - sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; + sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; }; }; "exit-0.1.2" = { @@ -11295,6 +11394,87 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; + "escodegen-1.8.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; + sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + }; + }; + "handlebars-4.0.5" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; + sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "estraverse-1.9.3" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; + sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + }; + }; + "source-map-0.2.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + }; + }; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + }; + "when-3.4.6" = { + name = "when"; + packageName = "when"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; + sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + }; + }; + "cli-1.0.0" = { + name = "cli"; + packageName = "cli"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; + sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + }; + }; + "bluebird-3.4.6" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; + sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + }; + }; "body-parser-1.15.2" = { name = "body-parser"; packageName = "body-parser"; @@ -11304,22 +11484,22 @@ let sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; }; }; - "combine-lists-1.0.0" = { + "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.0.tgz"; - sha1 = "e55dee53e5584f232eb59aeb16a7e66c338b5d06"; + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.4.1" = { + "connect-3.5.0" = { name = "connect"; packageName = "connect"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; - sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; + sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; }; }; "core-js-2.4.1" = { @@ -11358,13 +11538,13 @@ let sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "http-proxy-1.14.0" = { + "http-proxy-1.15.1" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz"; - sha1 = "be32ab34dd5229e87840f4c27cb335ee195b2a83"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz"; + sha1 = "91a6088172e79bc0e821d5eb04ce702f32446393"; }; }; "isbinaryfile-3.0.1" = { @@ -11448,15 +11628,6 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "finalhandler-0.4.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; - }; - }; "custom-event-1.0.0" = { name = "custom-event"; packageName = "custom-event"; @@ -11520,6 +11691,15 @@ let sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -12339,13 +12519,13 @@ let sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07"; }; }; - "glob-stream-5.3.4" = { + "glob-stream-5.3.5" = { name = "glob-stream"; packageName = "glob-stream"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.4.tgz"; - sha1 = "2da166001578c4ee17fd92e4ee15083462ae72fc"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; }; }; "gulp-sourcemaps-1.6.0" = { @@ -12420,6 +12600,15 @@ let sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; }; }; + "glob-parent-3.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.0.tgz"; + sha1 = "c7bdeb5260732196c740de9274c08814056014bb"; + }; + }; "ordered-read-streams-0.3.0" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -12447,6 +12636,24 @@ let sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; }; }; + "is-glob-3.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.0.0.tgz"; + sha1 = "e433c222db9d77844084d72db1eff047845985c1"; + }; + }; + "is-extglob-2.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.0.0.tgz"; + sha1 = "a9b92c1ae2d7a975ad307be0722049c7e4ea2f13"; + }; + }; "extend-shallow-2.0.1" = { name = "extend-shallow"; packageName = "extend-shallow"; @@ -12609,6 +12816,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "npm-registry-client-7.1.2" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; + sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + }; + }; "npmconf-2.0.9" = { name = "npmconf"; packageName = "npmconf"; @@ -12654,6 +12870,15 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; + "retry-0.8.0" = { + name = "retry"; + packageName = "retry"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; + sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; + }; + }; "npmlog-3.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -12915,13 +13140,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "es6-promise-3.2.1" = { + "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; - version = "3.2.1"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; - sha1 = "ec56233868032909207170c39448e24449dd1fc4"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; }; "ignore-by-default-1.0.1" = { @@ -13203,13 +13428,13 @@ let sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; }; }; - "node-red-node-twitter-0.1.6" = { + "node-red-node-twitter-0.1.7" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.6.tgz"; - sha1 = "ee1c65767db0325f316987bf155543864995e618"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; + sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; }; }; "node-red-node-rbe-0.1.5" = { @@ -13509,6 +13734,15 @@ let sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; }; }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; "qs-5.2.1" = { name = "qs"; packageName = "qs"; @@ -13518,6 +13752,15 @@ let sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; }; }; + "tough-cookie-2.2.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -13554,13 +13797,13 @@ let sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; }; }; - "imap-0.8.17" = { + "imap-0.8.18" = { name = "imap"; packageName = "imap"; - version = "0.8.17"; + version = "0.8.18"; src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.17.tgz"; - sha1 = "e70ff1d1def0456af8bf1d96164d36176662172a"; + url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz"; + sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f"; }; }; "libmime-1.2.0" = { @@ -13698,13 +13941,13 @@ let sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; }; }; - "utf7-1.0.0" = { + "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/utf7/-/utf7-1.0.0.tgz"; - sha1 = "70c895de9d85b8ee7ef5a1fa8e169241c46e72cc"; + url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; + sha1 = "955f490aae653ba220b9456a0a8776c199360991"; }; }; "twitter-ng-0.6.2" = { @@ -13716,15 +13959,6 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "request-2.67.0" = { - name = "request"; - packageName = "request"; - version = "2.67.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; - sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; - }; - }; "serialport-2.1.2" = { name = "serialport"; packageName = "serialport"; @@ -14256,13 +14490,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-3.10.0" = { + "mailcomposer-3.12.0" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.10.0.tgz"; - sha1 = "ce55c7b488ae84520a38f221aa12c4ce526d5168"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; + sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; }; }; "simplesmtp-0.3.35" = { @@ -14274,22 +14508,22 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-3.8.0" = { + "buildmail-3.10.0" = { name = "buildmail"; packageName = "buildmail"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-3.8.0.tgz"; - sha1 = "191b6369710b2bd35a7819edf2cb0b642efd65bf"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; + sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; }; }; - "libmime-2.0.3" = { + "libmime-2.1.0" = { name = "libmime"; packageName = "libmime"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-2.0.3.tgz"; - sha1 = "55751aa832d31492363df3dd810580dfd59d080c"; + url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; + sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; }; }; "addressparser-1.0.1" = { @@ -14301,22 +14535,22 @@ let sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; }; }; - "nodemailer-fetch-1.4.0" = { + "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.4.0.tgz"; - sha1 = "08a6174f755aba6ad9d88133355a70c1dee4e698"; + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; }; }; - "nodemailer-shared-1.0.5" = { + "nodemailer-shared-1.1.0" = { name = "nodemailer-shared"; packageName = "nodemailer-shared"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.5.tgz"; - sha1 = "6de64484d47944422bb5f0886fffd908ada4ce5e"; + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; }; }; "rai-0.1.12" = { @@ -14373,6 +14607,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; "lodash._baseuniq-4.6.0" = { name = "lodash._baseuniq"; packageName = "lodash._baseuniq"; @@ -14382,40 +14625,40 @@ let sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; }; }; - "lodash.clonedeep-4.3.2" = { + "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.3.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; - sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.union-4.4.0" = { + "lodash.union-4.6.0" = { name = "lodash.union"; packageName = "lodash.union"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; - sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; }; }; - "lodash.uniq-4.3.0" = { + "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.3.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; - sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "lodash.without-4.2.0" = { + "lodash.without-4.4.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; - sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; "npm-install-checks-3.0.0" = { @@ -14427,6 +14670,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; + }; + }; "read-cmd-shim-1.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -14490,33 +14742,6 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "lodash._baseflatten-4.2.1" = { - name = "lodash._baseflatten"; - packageName = "lodash._baseflatten"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; - sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; - }; - }; - "lodash._basedifference-4.5.0" = { - name = "lodash._basedifference"; - packageName = "lodash._basedifference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; - sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; - }; - }; "unique-slug-2.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -14742,13 +14967,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.7" = { + "npm-3.10.8" = { name = "npm"; packageName = "npm"; - version = "3.10.7"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; - sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; }; "npmi-2.0.1" = { @@ -14787,42 +15012,6 @@ let sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac"; }; }; - "lodash.clonedeep-4.4.1" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; - sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; - }; - }; - "lodash.union-4.5.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; - sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; - }; - }; - "lodash.uniq-4.4.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; - sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; - }; - }; - "lodash.without-4.3.0" = { - name = "lodash.without"; - packageName = "lodash.without"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; - sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; - }; - }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -14922,13 +15111,13 @@ let sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839"; }; }; - "buffer-indexof-1.0.2" = { + "buffer-indexof-1.1.0" = { name = "buffer-indexof"; packageName = "buffer-indexof"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.0.2.tgz"; - sha1 = "7fff11985ce51fe9ff07c40121ad301781587cdf"; + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz"; + sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; }; }; "next-line-1.1.0" = { @@ -14940,13 +15129,13 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "single-line-log-1.1.1" = { + "single-line-log-1.1.2" = { name = "single-line-log"; packageName = "single-line-log"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.1.tgz"; - sha1 = "f87743dfdb5519b5fe1dda36edd68f35e3cb5de6"; + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; "array-flatten-2.1.0" = { @@ -14976,13 +15165,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.0.1" = { + "multicast-dns-6.1.0" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.0.1.tgz"; - sha1 = "069da64a0b695e156ef47c86a94e69e1a17ff2c2"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; + sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -15570,6 +15759,15 @@ let sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; }; }; + "request-2.67.0" = { + name = "request"; + packageName = "request"; + version = "2.67.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; + }; + }; "request-progress-2.0.1" = { name = "request-progress"; packageName = "request-progress"; @@ -15886,13 +16084,13 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "openid-2.0.2" = { + "openid-2.0.6" = { name = "openid"; packageName = "openid"; - version = "2.0.2"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.2.tgz"; - sha1 = "10105d793ef59fad19501c51da942f63920875a1"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; + sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; "node-swt-0.1.1" = { @@ -16075,6 +16273,15 @@ let sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; }; }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; "path-to-regexp-0.1.6" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -16228,13 +16435,13 @@ let sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; }; }; - "uc.micro-1.0.2" = { + "uc.micro-1.0.3" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.2.tgz"; - sha1 = "466f26316a0bb707def6682f91f50139b8b8d538"; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; }; }; "htmlparser2-3.9.1" = { @@ -16552,6 +16759,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + }; + }; "verror-1.3.3" = { name = "verror"; packageName = "verror"; @@ -16795,13 +17011,13 @@ let sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; }; }; - "blueimp-md5-2.3.0" = { + "blueimp-md5-2.3.1" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.0.tgz"; - sha1 = "a0a2207c53c3311fcd44c0ad95c019bf0ef53951"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; + sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; }; }; "color-0.11.3" = { @@ -16993,13 +17209,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.4.0" = { + "color-convert-1.5.0" = { name = "color-convert"; packageName = "color-convert"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.4.0.tgz"; - sha1 = "4ad8f531c31af5d8cbc5a4af2bb6000891d398e1"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; + sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; }; }; "color-string-0.3.0" = { @@ -17038,6 +17254,15 @@ let sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; }; }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; "send-0.13.1" = { name = "send"; packageName = "send"; @@ -17191,6 +17416,42 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "lodash.clonedeep-4.3.2" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; + sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + }; + }; + "lodash.union-4.4.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; + sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + }; + }; + "lodash.uniq-4.3.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; + sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + }; + }; + "lodash.without-4.2.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; + sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + }; + }; "node-gyp-3.3.1" = { name = "node-gyp"; packageName = "node-gyp"; @@ -17200,6 +17461,60 @@ let sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; }; }; + "request-2.72.0" = { + name = "request"; + packageName = "request"; + version = "2.72.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; + sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; + }; + }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; + "lodash._baseflatten-4.2.1" = { + name = "lodash._baseflatten"; + packageName = "lodash._baseflatten"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; + sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; + }; + }; + "lodash._basedifference-4.5.0" = { + name = "lodash._basedifference"; + packageName = "lodash._basedifference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; + sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; + }; + }; + "qs-6.1.0" = { + name = "qs"; + packageName = "qs"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; + sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -17362,6 +17677,15 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; + "tmp-0.0.29" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz"; + sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -17389,13 +17713,13 @@ let sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; }; }; - "loader-utils-0.2.15" = { + "loader-utils-0.2.16" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.15.tgz"; - sha1 = "c7df3342a9d4e2103dddc97d4060daccc246d6ac"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; + sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; "memory-fs-0.3.0" = { @@ -17557,10 +17881,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.1.tgz"; - sha1 = "f45de3859d1c84d539e247a98bb1b5356119338c"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.2.tgz"; + sha1 = "b214d69a935cf28be68719813ed8a6865cb4654d"; }; dependencies = [ sources."colors-0.6.0-1" @@ -17613,11 +17937,11 @@ in sources."ini-1.3.4" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -17651,6 +17975,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium MVC Framework"; homepage = "https://github.com/appcelerator/alloy#readme"; @@ -17661,10 +17986,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.3"; + version = "0.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.3.tgz"; - sha1 = "be426d6bd3b940e0e82e85e13381fd3f6372e8a6"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.5.tgz"; + sha1 = "7e7490d92521818ab57c561f48e5d6058d9f1583"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -17676,7 +18001,7 @@ in dependencies = [ (sources."concat-stream-1.4.10" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-1.1.14" // { dependencies = [ @@ -17700,9 +18025,9 @@ in sources."get-stdin-4.0.1" (sources."repeating-1.1.3" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -17733,7 +18058,7 @@ in ]; }) sources."async-1.4.2" - (sources."azure-common-0.9.17" // { + (sources."azure-common-0.9.18" // { dependencies = [ (sources."xml2js-0.2.7" // { dependencies = [ @@ -17741,137 +18066,6 @@ in ]; }) sources."dateformat-1.0.2-1.2.3" - (sources."request-2.72.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.1" - 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."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.13.1" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-2.0.0" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" - sources."getpass-0.1.6" - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { - dependencies = [ - sources."mime-db-1.23.0" - ]; - }) - sources."node-uuid-1.4.7" - sources."oauth-sign-0.8.2" - sources."qs-6.1.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" - sources."tunnel-agent-0.4.3" - ]; - }) sources."validator-3.22.2" sources."envconf-0.0.4" sources."duplexer-0.1.1" @@ -17884,82 +18078,20 @@ in sources."azure-arm-hdinsight-0.2.0" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" + sources."azure-arm-iothub-0.1.1" sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.13.2" + sources."azure-arm-network-0.17.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" - sources."azure-arm-dns-0.10.1" - (sources."azure-arm-website-0.10.0" // { - dependencies = [ - (sources."azure-common-0.9.12" // { - dependencies = [ - (sources."xml2js-0.2.7" // { - dependencies = [ - sources."sax-0.5.2" - ]; - }) - sources."dateformat-1.0.2-1.2.3" - (sources."request-2.45.0" // { - dependencies = [ - sources."bl-0.9.5" - sources."caseless-0.6.0" - sources."forever-agent-0.5.2" - sources."qs-1.2.2" - sources."json-stringify-safe-5.0.1" - sources."mime-types-1.0.2" - sources."node-uuid-1.4.7" - sources."tunnel-agent-0.4.3" - (sources."form-data-0.1.4" // { - dependencies = [ - (sources."combined-stream-0.0.7" // { - dependencies = [ - sources."delayed-stream-0.0.5" - ]; - }) - sources."mime-1.2.11" - sources."async-0.9.2" - ]; - }) - sources."tough-cookie-2.3.1" - (sources."http-signature-0.10.1" // { - dependencies = [ - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."ctype-0.5.3" - ]; - }) - sources."oauth-sign-0.4.0" - (sources."hawk-1.1.1" // { - dependencies = [ - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - }) - sources."aws-sign2-0.5.0" - sources."stringstream-0.0.5" - ]; - }) - sources."validator-3.1.0" - sources."envconf-0.0.4" - sources."duplexer-0.1.1" - ]; - }) - sources."moment-2.6.0" - ]; - }) + sources."azure-arm-dns-0.11.1" + sources."azure-arm-website-0.11.0" sources."azure-arm-rediscache-0.2.1" sources."azure-arm-datalake-analytics-0.4.3" sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" - sources."azure-graph-1.0.1" + sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" - (sources."azure-keyvault-0.10.1" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."azure-keyvault-0.10.2" sources."azure-asm-compute-0.17.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" @@ -17969,15 +18101,19 @@ in sources."moment-2.6.0" ]; }) - sources."azure-asm-network-0.12.0" + sources."azure-asm-network-0.13.0" sources."azure-arm-resource-1.4.5-preview" sources."azure-arm-storage-0.13.1-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" sources."azure-asm-subscription-0.10.1" - sources."azure-asm-website-0.10.4" - (sources."azure-storage-1.1.0" // { + (sources."azure-asm-website-0.10.4" // { + dependencies = [ + sources."moment-2.14.1" + ]; + }) + (sources."azure-storage-1.3.0" // { dependencies = [ sources."extend-1.2.1" sources."browserify-mime-1.2.9" @@ -17990,7 +18126,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -18006,7 +18142,8 @@ in ]; }) sources."azure-arm-batch-0.2.0" - sources."azure-batch-0.4.0" + sources."azure-batch-0.5.2" + sources."azure-servicefabric-0.1.4" sources."applicationinsights-0.15.12" (sources."caller-id-0.1.0" // { dependencies = [ @@ -18051,6 +18188,7 @@ in sources."JSV-4.0.2" ]; }) + sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" (sources."kuduscript-1.0.8" // { dependencies = [ @@ -18062,140 +18200,9 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.14.1" + sources."moment-2.15.1" (sources."ms-rest-1.15.0" // { dependencies = [ - (sources."request-2.74.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - (sources."readable-stream-2.0.6" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."inherits-2.0.1" - 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."caseless-0.11.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - (sources."chalk-1.1.3" // { - dependencies = [ - sources."ansi-styles-2.2.1" - sources."escape-string-regexp-1.0.5" - (sources."has-ansi-2.0.0" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) - (sources."commander-2.9.0" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."is-my-json-valid-2.13.1" // { - dependencies = [ - sources."generate-function-2.0.0" - (sources."generate-object-property-1.2.0" // { - dependencies = [ - sources."is-property-1.0.2" - ]; - }) - sources."jsonpointer-2.0.0" - sources."xtend-4.0.1" - ]; - }) - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" - sources."getpass-0.1.6" - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { - dependencies = [ - sources."mime-db-1.23.0" - ]; - }) - sources."node-uuid-1.4.7" - sources."oauth-sign-0.8.2" - sources."qs-6.2.1" - sources."stringstream-0.0.5" - sources."tough-cookie-2.3.1" - sources."tunnel-agent-0.4.3" - ]; - }) sources."duplexer-0.1.1" ]; }) @@ -18233,7 +18240,7 @@ in sources."ncp-0.4.2" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -18241,7 +18248,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18252,12 +18259,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -18281,19 +18288,19 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) - (sources."request-2.69.0" // { + (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" - (sources."bl-1.0.3" // { + (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -18314,7 +18321,7 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -18343,7 +18350,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -18373,28 +18380,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -18402,16 +18405,16 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.0.2" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" ]; }) @@ -18437,7 +18440,7 @@ in dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -18457,7 +18460,7 @@ in sources."http-basic-2.5.1" (sources."promise-7.1.1" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."qs-6.2.1" @@ -18468,6 +18471,11 @@ in sources."through-2.3.4" sources."tunnel-0.0.2" sources."underscore-1.4.4" + (sources."user-home-2.0.0" // { + dependencies = [ + sources."os-homedir-1.0.2" + ]; + }) sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -18492,6 +18500,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Microsoft Azure Cross Platform Command Line tool"; homepage = https://github.com/Azure/azure-xplat-cli; @@ -18507,6 +18516,7 @@ in url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; }; + buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; homepage = http://bower.io/; @@ -18517,10 +18527,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + sha1 = "77cc8f966a3595686f5d6fae30ad9bd2cc20bfe3"; }; dependencies = [ (sources."argparse-1.0.4" // { @@ -18551,7 +18561,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -18570,7 +18580,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-2.1.1" @@ -18581,7 +18591,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -18608,10 +18618,10 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -18653,7 +18663,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -18678,7 +18688,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -18697,9 +18707,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -18738,13 +18748,13 @@ in sources."bower-logger-0.2.1" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -18752,7 +18762,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18763,7 +18773,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -18793,7 +18803,7 @@ in sources."semver-5.3.0" (sources."temp-0.8.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" ]; }) @@ -18804,7 +18814,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -18815,15 +18825,16 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; homepage = https://github.com/rvl/bower2nix; @@ -18840,7 +18851,7 @@ in sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; }; dependencies = [ - (sources."JSONStream-1.1.4" // { + (sources."JSONStream-1.2.1" // { dependencies = [ sources."jsonparse-1.2.0" sources."through-2.3.8" @@ -18868,7 +18879,7 @@ in }) (sources."buffer-4.9.1" // { dependencies = [ - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."ieee754-1.1.6" sources."isarray-1.0.0" ]; @@ -18899,12 +18910,12 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) (sources."browserify-des-1.0.0" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" (sources."des.js-1.0.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" @@ -18919,15 +18930,15 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.8.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -18935,7 +18946,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -18946,9 +18957,9 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -18956,7 +18967,7 @@ in }) (sources."create-hash-1.1.2" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" ]; @@ -18967,19 +18978,19 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" ]; }) ]; }) - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.8" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.8.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -18987,7 +18998,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -19020,12 +19031,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."has-1.0.1" // { @@ -19035,7 +19046,7 @@ in }) sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."insert-module-globals-7.0.1" // { dependencies = [ (sources."combine-source-map-0.7.2" // { @@ -19114,7 +19125,7 @@ in ]; }) sources."stream-browserify-2.0.1" - (sources."stream-http-2.3.1" // { + (sources."stream-http-2.4.0" // { dependencies = [ sources."builtin-status-codes-2.0.0" sources."to-arraybuffer-1.0.1" @@ -19151,7 +19162,11 @@ in sources."querystring-0.2.0" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) (sources."vm-browserify-0.0.4" // { dependencies = [ sources."indexof-0.0.1" @@ -19159,6 +19174,7 @@ in }) sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; homepage = "https://github.com/substack/node-browserify#readme"; @@ -19270,10 +19286,10 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -19315,7 +19331,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -19340,7 +19356,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -19359,9 +19375,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -19452,20 +19468,20 @@ in sources."bencode-0.10.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.2.2" // { + (sources."simple-get-2.2.3" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) ]; @@ -19514,7 +19530,7 @@ in }) (sources."random-access-file-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."randombytes-2.0.3" @@ -19543,7 +19559,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -19553,7 +19569,7 @@ in (sources."peer-wire-swarm-0.12.1" // { dependencies = [ sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -19565,7 +19581,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" @@ -19581,7 +19597,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -19589,7 +19605,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -19600,12 +19616,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -19615,7 +19631,7 @@ in (sources."bittorrent-dht-6.4.2" // { dependencies = [ sources."bencode-0.7.0" - sources."buffer-equals-1.0.3" + sources."buffer-equals-1.0.4" (sources."k-bucket-0.6.0" // { dependencies = [ sources."buffer-equal-0.0.1" @@ -19649,16 +19665,16 @@ in ]; }) sources."ip-1.1.3" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.2.2" // { + (sources."simple-get-2.2.3" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) (sources."simple-peer-6.0.7" // { @@ -19706,7 +19722,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."re-emitter-1.1.3" sources."run-parallel-1.1.6" ]; @@ -19762,7 +19778,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -19810,7 +19826,7 @@ in sources."voc-0.5.0" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -19840,13 +19856,14 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "commandline chromecast player"; homepage = "https://github.com/xat/castnow#readme"; @@ -19857,11 +19874,12 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz"; + sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d"; }; + buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; homepage = http://coffeescript.org/; @@ -19905,7 +19923,7 @@ in sources."q-1.4.1" (sources."shelljs-0.7.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -19913,7 +19931,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -19924,12 +19942,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."interpret-1.0.1" @@ -19946,7 +19964,7 @@ in dependencies = [ (sources."browserify-10.1.3" // { dependencies = [ - (sources."JSONStream-1.1.4" // { + (sources."JSONStream-1.2.1" // { dependencies = [ sources."jsonparse-1.2.0" sources."through-2.3.8" @@ -20020,12 +20038,12 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) (sources."browserify-des-1.0.0" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" (sources."des.js-1.0.0" // { dependencies = [ sources."minimalistic-assert-1.0.0" @@ -20040,15 +20058,15 @@ in dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.8.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -20056,7 +20074,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -20067,9 +20085,9 @@ in (sources."create-ecdh-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" - (sources."elliptic-6.3.1" // { + (sources."elliptic-6.3.2" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" ]; }) @@ -20077,7 +20095,7 @@ in }) (sources."create-hash-1.1.2" // { dependencies = [ - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" ]; @@ -20088,19 +20106,19 @@ in sources."bn.js-4.11.6" (sources."miller-rabin-4.0.0" // { dependencies = [ - sources."brorand-1.0.5" + sources."brorand-1.0.6" ]; }) ]; }) - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.8" (sources."public-encrypt-4.0.0" // { dependencies = [ sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" (sources."parse-asn1-5.0.0" // { dependencies = [ - (sources."asn1.js-4.8.0" // { + (sources."asn1.js-4.8.1" // { dependencies = [ sources."minimalistic-assert-1.0.0" ]; @@ -20108,7 +20126,7 @@ in (sources."browserify-aes-1.0.6" // { dependencies = [ sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" ]; }) sources."evp_bytestokey-1.0.0" @@ -20142,7 +20160,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -20161,7 +20179,7 @@ in ]; }) sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."insert-module-globals-6.6.3" // { dependencies = [ (sources."combine-source-map-0.6.1" // { @@ -20276,7 +20294,11 @@ in sources."querystring-0.2.0" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) (sources."vm-browserify-0.0.4" // { dependencies = [ sources."indexof-0.0.1" @@ -20311,9 +20333,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -20322,7 +20344,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.8" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) (sources."debug-2.2.0" // { @@ -20338,9 +20360,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -20402,9 +20424,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -20433,7 +20455,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -20444,12 +20466,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."init-package-json-1.9.4" // { @@ -20461,7 +20483,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -20472,12 +20494,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."npm-package-arg-4.2.0" // { @@ -20509,7 +20531,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) (sources."validate-npm-package-license-3.0.1" // { @@ -20534,7 +20556,7 @@ in sources."abbrev-1.0.9" ]; }) - (sources."npm-2.15.10" // { + (sources."npm-2.15.11" // { dependencies = [ sources."abbrev-1.0.9" sources."ansi-0.3.1" @@ -20567,7 +20589,7 @@ in }) (sources."dezalgo-1.0.3" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."editor-1.0.0" @@ -20588,15 +20610,15 @@ in (sources."glob-7.0.6" // { dependencies = [ sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."hosted-git-info-2.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" (sources."lru-cache-4.0.1" // { dependencies = [ sources."pseudomap-1.0.2" @@ -20658,7 +20680,7 @@ in sources."npm-cache-filename-1.0.2" sources."npm-install-checks-1.0.7" sources."npm-package-arg-4.1.1" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -20674,7 +20696,6 @@ in }) ]; }) - sources."retry-0.8.0" ]; }) sources."npm-user-validate-0.1.5" @@ -20695,14 +20716,14 @@ in }) ]; }) - sources."once-1.3.3" + sources."once-1.4.0" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -20719,7 +20740,7 @@ in dependencies = [ (sources."glob-6.0.4" // { dependencies = [ - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."json-parse-helpfulerror-1.0.3" // { @@ -20769,7 +20790,7 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -20789,7 +20810,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -20819,28 +20840,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -20848,9 +20865,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -20861,12 +20878,12 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."spdx-license-ids-1.2.2" sources."strip-ansi-3.0.1" sources."tar-2.2.1" @@ -20884,7 +20901,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -20918,7 +20935,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -20969,7 +20986,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -20977,7 +20994,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -20995,19 +21012,19 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."unorm-1.3.3" @@ -21035,7 +21052,7 @@ in sources."ansi-0.3.1" (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) sources."cordova-registry-mapper-1.1.15" @@ -21051,13 +21068,13 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."minimatch-3.0.3" // { @@ -21072,8 +21089,8 @@ in }) (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) (sources."plist-1.2.0" // { @@ -21123,20 +21140,20 @@ in }) (sources."configstore-1.4.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."object-assign-4.1.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" (sources."write-file-atomic-1.2.0" // { dependencies = [ sources."imurmurhash-0.1.4" @@ -21145,7 +21162,7 @@ in }) (sources."xdg-basedir-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -21168,7 +21185,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -21188,7 +21205,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -21204,7 +21221,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21234,9 +21251,9 @@ in }) (sources."repeating-1.1.3" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -21279,19 +21296,19 @@ in }) (sources."configstore-1.4.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" (sources."write-file-atomic-1.2.0" // { dependencies = [ sources."imurmurhash-0.1.4" @@ -21300,7 +21317,7 @@ in }) (sources."xdg-basedir-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -21328,14 +21345,14 @@ in sources."lodash-3.10.1" (sources."readline2-1.0.1" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) sources."mute-stream-0.0.5" @@ -21343,7 +21360,7 @@ in }) (sources."run-async-0.1.0" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21376,7 +21393,7 @@ in }) ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -21385,7 +21402,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21402,13 +21419,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -21418,7 +21431,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -21448,28 +21461,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -21477,9 +21486,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."oauth-sign-0.8.2" @@ -21492,12 +21501,33 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Cordova command line interface tool"; license = "Apache-2.0"; }; production = true; }; + csslint = nodeEnv.buildNodePackage { + name = "csslint"; + packageName = "csslint"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.3.tgz"; + sha1 = "5dc024f13a1ff91c0dd08d01186ae1f6f9e92862"; + }; + dependencies = [ + sources."clone-1.0.2" + sources."parserlib-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CSSLint"; + homepage = http://csslint.net/; + license = "MIT"; + }; + production = true; + }; dnschain = nodeEnv.buildNodePackage { name = "dnschain"; packageName = "dnschain"; @@ -21524,9 +21554,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.5.3" @@ -21732,12 +21762,13 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; homepage = https://github.com/okTurtles/dnschain; @@ -21762,7 +21793,7 @@ in }) sources."basic-auth-1.0.4" sources."cookie-signature-1.0.6" - (sources."cors-2.8.0" // { + (sources."cors-2.8.1" // { dependencies = [ sources."vary-1.1.0" ]; @@ -21779,7 +21810,7 @@ in }) (sources."from2-1.3.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-1.1.14" // { dependencies = [ sources."core-util-is-1.0.2" @@ -21802,7 +21833,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -21824,7 +21855,7 @@ in sources."level-packager-0.18.0" ]; }) - (sources."level-sublevel-6.5.4" // { + (sources."level-sublevel-6.6.0" // { dependencies = [ (sources."pull-stream-2.21.0" // { dependencies = [ @@ -21847,7 +21878,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-5.1.1" @@ -21892,7 +21923,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-2.3.2" @@ -21907,7 +21938,7 @@ in sources."xtend-3.0.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ltgt-1.0.2" ]; }) @@ -21924,7 +21955,7 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21957,7 +21988,7 @@ in sources."stream-shift-1.0.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."relative-date-1.1.3" @@ -21975,7 +22006,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -21983,7 +22014,7 @@ in sources."split2-0.2.1" (sources."stream-collector-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -21997,7 +22028,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22010,7 +22041,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22026,7 +22057,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -22034,6 +22065,7 @@ in sources."thunky-0.1.0" sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "docker registry server implemented in node"; homepage = https://github.com/mafintosh/docker-registry-server; @@ -22058,7 +22090,7 @@ in }) (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) sources."aws4-1.4.1" @@ -22068,7 +22100,7 @@ in sources."minimist-0.0.10" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" (sources."bl-1.1.2" // { @@ -22076,7 +22108,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22093,7 +22125,11 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + (sources."form-data-2.0.0" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) (sources."har-validator-2.0.6" // { dependencies = [ (sources."chalk-1.1.3" // { @@ -22118,7 +22154,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -22148,28 +22184,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -22177,9 +22209,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -22191,6 +22223,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "import and export tools for elasticsearch"; homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; @@ -22198,13 +22231,218 @@ in }; production = true; }; + emoj = nodeEnv.buildNodePackage { + name = "emoj"; + packageName = "emoj"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; + sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + }; + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."got-6.5.0" // { + dependencies = [ + (sources."create-error-class-3.0.2" // { + dependencies = [ + sources."capture-stack-trace-1.0.0" + ]; + }) + sources."duplexer3-0.1.4" + (sources."get-stream-2.3.1" // { + dependencies = [ + sources."object-assign-4.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-2.0.1" + sources."timed-out-2.0.0" + sources."unzip-response-2.0.1" + (sources."url-parse-lax-1.0.0" // { + dependencies = [ + sources."prepend-http-1.0.4" + ]; + }) + ]; + }) + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."lodash.debounce-4.0.8" + (sources."log-update-1.0.2" // { + dependencies = [ + sources."ansi-escapes-1.4.0" + (sources."cli-cursor-1.0.2" // { + dependencies = [ + (sources."restore-cursor-1.0.1" // { + dependencies = [ + sources."exit-hook-1.1.1" + sources."onetime-1.1.0" + ]; + }) + ]; + }) + ]; + }) + sources."mem-0.1.1" + (sources."meow-3.7.0" // { + dependencies = [ + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + (sources."loud-rejection-1.6.0" // { + dependencies = [ + (sources."currently-unhandled-0.4.1" // { + dependencies = [ + sources."array-find-index-1.0.2" + ]; + }) + sources."signal-exit-3.0.1" + ]; + }) + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.3" + ]; + }) + ]; + }) + sources."object-assign-4.1.0" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.9" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.9" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."redent-1.0.0" // { + dependencies = [ + (sources."indent-string-2.1.0" // { + dependencies = [ + (sources."repeating-2.0.1" // { + dependencies = [ + (sources."is-finite-1.0.2" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + ]; + }) + (sources."strip-indent-1.0.1" // { + dependencies = [ + sources."get-stdin-4.0.1" + ]; + }) + ]; + }) + sources."trim-newlines-1.0.0" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find relevant emoji from text on the command-line"; + homepage = "https://github.com/sindresorhus/emoj#readme"; + license = "MIT"; + }; + production = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.4.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.4.0.tgz"; - sha1 = "af5984007bd3f1fb1b3b6b01a0a22eda0ec7a9f4"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.7.0.tgz"; + sha1 = "27499b403de70f8832815c3550330bad67292a57"; }; dependencies = [ (sources."chalk-1.1.3" // { @@ -22226,7 +22464,7 @@ in }) (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -22244,7 +22482,7 @@ in sources."ms-0.7.1" ]; }) - (sources."doctrine-1.3.0" // { + (sources."doctrine-1.4.0" // { dependencies = [ sources."isarray-1.0.0" ]; @@ -22277,10 +22515,14 @@ in }) ]; }) - (sources."espree-3.1.7" // { + (sources."espree-3.3.2" // { dependencies = [ - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" + sources."acorn-4.0.3" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) ]; }) sources."estraverse-4.2.0" @@ -22317,14 +22559,14 @@ in sources."rimraf-2.5.4" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."write-0.2.1" ]; }) sources."object-assign-4.1.0" ]; }) - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -22332,7 +22574,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -22343,15 +22585,15 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."globals-9.9.0" + sources."globals-9.10.0" sources."ignore-3.1.5" sources."imurmurhash-0.1.4" (sources."inquirer-0.12.0" // { @@ -22377,14 +22619,14 @@ in }) (sources."readline2-1.0.1" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) sources."mute-stream-0.0.5" @@ -22392,7 +22634,7 @@ in }) (sources."run-async-0.1.0" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -22402,14 +22644,14 @@ in sources."rx-lite-3.1.2" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -22418,7 +22660,7 @@ in sources."through-2.3.8" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -22437,7 +22679,7 @@ in }) (sources."js-yaml-3.6.1" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -22456,23 +22698,23 @@ in sources."type-check-0.3.2" ]; }) - sources."lodash-4.15.0" + sources."lodash-4.16.2" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."natural-compare-1.4.0" - (sources."optionator-0.8.1" // { + (sources."optionator-0.8.2" // { dependencies = [ sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" sources."type-check-0.3.2" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.5" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" (sources."require-uncached-1.0.2" // { @@ -22488,40 +22730,44 @@ in sources."shelljs-0.6.1" sources."strip-bom-3.0.0" sources."strip-json-comments-1.0.4" - (sources."table-3.7.8" // { + (sources."table-3.8.0" // { dependencies = [ - sources."bluebird-3.4.6" + (sources."ajv-4.7.5" // { + dependencies = [ + sources."co-4.6.0" + ]; + }) + sources."ajv-keywords-1.1.1" sources."slice-ansi-0.0.4" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" ]; }) ]; }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.0.0" - ]; - }) - sources."tv4-1.2.7" - sources."xregexp-3.1.1" ]; }) sources."text-table-0.2.0" (sources."user-home-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; homepage = http://eslint.org/; @@ -22529,6 +22775,21 @@ in }; production = true; }; + emojione = nodeEnv.buildNodePackage { + name = "emojione"; + packageName = "emojione"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz"; + sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Emoji One is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG and SVG formats provided for the emoji images."; + homepage = http://www.emojione.com/; + }; + production = true; + }; fetch-bower = nodeEnv.buildNodePackage { name = "fetch-bower"; packageName = "fetch-bower"; @@ -22543,7 +22804,7 @@ in sources."bower-1.7.9" (sources."glob-3.2.11" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-0.3.0" // { dependencies = [ sources."lru-cache-2.7.3" @@ -22553,6 +22814,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; homepage = https://bitbucket.org/shlevy/fetch-bower; @@ -22691,7 +22953,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -22715,7 +22977,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -22728,7 +22990,7 @@ in }) (sources."readdirp-2.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -22791,17 +23053,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -22825,7 +23087,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -22850,13 +23112,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -22883,7 +23141,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -22913,28 +23171,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -22942,9 +23196,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -22957,7 +23211,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -22975,7 +23229,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -22990,7 +23244,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) ]; @@ -23004,7 +23258,7 @@ in }) (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) (sources."fstream-ignore-1.0.5" // { @@ -23095,7 +23349,7 @@ in sources."minimist-0.0.10" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."prettyjson-1.1.3" // { dependencies = [ sources."colors-1.1.2" @@ -23114,7 +23368,7 @@ in sources."defined-0.0.0" sources."through-2.3.8" sources."resumer-0.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -23135,7 +23389,7 @@ in sources."ncp-0.4.2" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -23143,7 +23397,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -23154,7 +23408,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23176,6 +23430,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; homepage = "https://github.com/foreverjs/forever#readme"; @@ -23199,6 +23454,7 @@ in }) sources."tabtab-git+https://github.com/mixu/node-tabtab.git" ]; + buildInputs = globalBuildInputs; meta = { description = "A tool for managing multiple git repositories"; homepage = "https://github.com/mixu/gr#readme"; @@ -23224,7 +23480,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -23235,12 +23491,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -23253,6 +23509,7 @@ in }) sources."resolve-1.1.7" ]; + buildInputs = globalBuildInputs; meta = { description = "The grunt command line interface"; homepage = "https://github.com/gruntjs/grunt-cli#readme"; @@ -23270,11 +23527,11 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" (sources."jade-1.11.0" // { dependencies = [ sources."character-parser-1.2.1" - (sources."clean-css-3.4.19" // { + (sources."clean-css-3.4.20" // { dependencies = [ (sources."commander-2.8.1" // { dependencies = [ @@ -23403,7 +23660,7 @@ in }) (sources."q-2.0.3" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" sources."pop-iterate-1.0.1" sources."weak-map-1.0.5" ]; @@ -23413,7 +23670,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -23424,6 +23681,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "See a representation of the Guifi.net network in Google Earth."; homepage = https://github.com/jmendeth/guifi-earth; @@ -23478,10 +23736,10 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -23522,7 +23780,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -23547,7 +23805,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -23566,9 +23824,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -23636,7 +23894,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -23650,7 +23908,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -23732,7 +23990,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -23760,7 +24018,7 @@ in dependencies = [ (sources."expand-tilde-1.2.2" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) (sources."global-modules-0.2.3" // { @@ -23770,11 +24028,11 @@ in sources."ini-1.3.4" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -23792,7 +24050,7 @@ in dependencies = [ (sources."expand-tilde-1.2.2" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) sources."lodash.assignwith-4.2.0" @@ -23853,7 +24111,7 @@ in sources."semver-4.3.6" (sources."tildify-1.2.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) (sources."v8flags-2.0.11" // { @@ -23877,8 +24135,8 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -23952,7 +24210,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."xtend-4.0.1" @@ -23967,6 +24225,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "The streaming build system"; homepage = http://gulpjs.com/; @@ -23985,13 +24244,14 @@ in dependencies = [ (sources."http-proxy-1.0.2" // { dependencies = [ - sources."eventemitter3-1.2.0" + sources."eventemitter3-2.0.2" ]; }) sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Complete high-scaled reverse-proxy solution"; homepage = https://github.com/dotcloud/hipache; @@ -23999,6 +24259,134 @@ in }; production = true; }; + htmlhint = nodeEnv.buildNodePackage { + name = "htmlhint"; + packageName = "htmlhint"; + version = "0.9.13"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; + sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; + }; + dependencies = [ + sources."async-1.4.2" + sources."colors-1.0.3" + sources."commander-2.6.0" + (sources."csslint-0.10.0" // { + dependencies = [ + sources."parserlib-0.2.5" + ]; + }) + (sources."glob-5.0.15" // { + dependencies = [ + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.1" + ]; + }) + (sources."jshint-2.8.0" // { + dependencies = [ + (sources."cli-0.6.6" // { + dependencies = [ + (sources."glob-3.2.11" // { + dependencies = [ + sources."inherits-2.0.3" + (sources."minimatch-0.3.0" // { + dependencies = [ + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + ]; + }) + ]; + }) + ]; + }) + (sources."console-browserify-1.1.0" // { + dependencies = [ + sources."date-now-0.1.4" + ]; + }) + sources."exit-0.1.2" + (sources."htmlparser2-3.8.3" // { + dependencies = [ + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { + dependencies = [ + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."entities-1.1.1" + ]; + }) + ]; + }) + sources."domelementtype-1.3.0" + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.3" + ]; + }) + sources."entities-1.0.0" + ]; + }) + (sources."minimatch-2.0.10" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + sources."shelljs-0.3.0" + sources."lodash-3.7.0" + ]; + }) + (sources."parse-glob-3.0.4" // { + dependencies = [ + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + ]; + }) + sources."is-dotfile-1.0.2" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) + sources."strip-json-comments-1.0.4" + sources."xml-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Static Code Analysis Tool for HTML"; + homepage = "https://github.com/yaniswang/HTMLHint#readme"; + license = "MIT"; + }; + production = true; + }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; packageName = "istanbul"; @@ -24014,13 +24402,13 @@ in dependencies = [ sources."estraverse-1.9.3" sources."esutils-2.0.2" - (sources."optionator-0.8.1" // { + (sources."optionator-0.8.2" // { dependencies = [ sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."type-check-0.3.2" sources."levn-0.3.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.5" ]; }) (sources."source-map-0.2.0" // { @@ -24038,7 +24426,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -24049,7 +24437,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."handlebars-4.0.5" // { @@ -24119,7 +24507,7 @@ in }) (sources."js-yaml-3.6.1" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -24132,7 +24520,7 @@ in ]; }) sources."nopt-3.0.6" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -24143,13 +24531,14 @@ in sources."has-flag-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) sources."wordwrap-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; homepage = "https://github.com/gotwarlost/istanbul#readme"; @@ -24168,6 +24557,7 @@ in dependencies = [ sources."when-3.4.6" ]; + buildInputs = globalBuildInputs; meta = { description = "A comprehensive JSON Schema validator for Node.js"; homepage = https://github.com/natesilva/jayschema; @@ -24186,7 +24576,7 @@ in dependencies = [ (sources."cli-1.0.0" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -24194,13 +24584,13 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -24230,7 +24620,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."entities-1.0.0" @@ -24250,6 +24640,7 @@ in sources."strip-json-comments-1.0.4" sources."lodash-3.7.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; homepage = http://jshint.com/; @@ -24265,6 +24656,7 @@ in url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging and processing JSON on the command line"; homepage = https://github.com/trentm/json; @@ -24279,6 +24671,7 @@ in url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging JSON on the command line"; homepage = https://github.com/trentm/json; @@ -24294,13 +24687,14 @@ in sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; }; dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; }) sources."esprima-2.7.3" ]; + buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; homepage = https://github.com/nodeca/js-yaml; @@ -24311,10 +24705,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.2.0.tgz"; - sha1 = "6dca89ec25f4753f120f834c89398098040fd63e"; + url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; + sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; }; dependencies = [ sources."bluebird-3.4.6" @@ -24350,9 +24744,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -24412,7 +24806,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -24436,7 +24830,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -24447,7 +24841,7 @@ in sources."is-extglob-1.0.0" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ (sources."readable-stream-2.1.5" // { @@ -24502,17 +24896,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -24536,7 +24930,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -24561,13 +24955,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -24594,7 +24984,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -24624,28 +25014,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -24653,9 +25039,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -24707,19 +25093,19 @@ in ]; }) sources."colors-1.1.2" - (sources."combine-lists-1.0.0" // { + (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) - (sources."connect-3.4.1" // { + (sources."connect-3.5.0" // { dependencies = [ (sources."debug-2.2.0" // { dependencies = [ sources."ms-0.7.1" ]; }) - (sources."finalhandler-0.4.1" // { + (sources."finalhandler-0.5.0" // { dependencies = [ sources."escape-html-1.0.3" (sources."on-finished-2.3.0" // { @@ -24727,6 +25113,7 @@ in sources."ee-first-1.1.1" ]; }) + sources."statuses-1.3.0" sources."unpipe-1.0.0" ]; }) @@ -24760,7 +25147,7 @@ in }) ]; }) - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -24768,17 +25155,17 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" - (sources."http-proxy-1.14.0" // { + sources."graceful-fs-4.1.9" + (sources."http-proxy-1.15.1" // { dependencies = [ sources."eventemitter3-1.2.0" sources."requires-port-1.0.0" @@ -24793,7 +25180,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."semver-4.3.6" @@ -24817,6 +25204,7 @@ in ]; }) sources."qjobs-1.1.5" + sources."range-parser-1.2.0" sources."rimraf-2.5.4" (sources."socket.io-1.4.7" // { dependencies = [ @@ -24957,7 +25345,7 @@ in sources."source-map-0.5.6" (sources."tmp-0.0.28" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" ]; }) (sources."useragent-2.1.9" // { @@ -24966,6 +25354,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; homepage = http://karma-runner.github.io/; @@ -25012,9 +25401,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.5.3" @@ -25022,7 +25411,7 @@ in }) (sources."compressible-2.0.8" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -25052,9 +25441,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -25085,7 +25474,7 @@ in }) (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."statuses-1.3.0" ]; }) @@ -25110,7 +25499,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -25134,9 +25523,9 @@ in }) sources."batch-0.5.3" sources."escape-html-1.0.3" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -25163,9 +25552,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -25207,7 +25596,7 @@ in sources."destroy-1.0.3" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -25262,12 +25651,13 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; license = "MIT"; @@ -25288,7 +25678,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25318,11 +25708,11 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."stream-shift-1.0.0" ]; }) - (sources."glob-stream-5.3.4" // { + (sources."glob-stream-5.3.5" // { dependencies = [ sources."extend-3.0.0" (sources."glob-5.0.15" // { @@ -25332,7 +25722,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -25343,19 +25733,19 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - (sources."glob-parent-2.0.0" // { + (sources."glob-parent-3.0.0" // { dependencies = [ - (sources."is-glob-2.0.1" // { + (sources."is-glob-3.0.0" // { dependencies = [ - sources."is-extglob-1.0.0" + sources."is-extglob-2.0.0" ]; }) ]; @@ -25409,7 +25799,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -25417,7 +25807,11 @@ in }) (sources."parse-glob-3.0.4" // { dependencies = [ - sources."glob-base-0.3.0" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + ]; + }) sources."is-dotfile-1.0.2" ]; }) @@ -25441,7 +25835,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."xtend-4.0.1" @@ -25467,7 +25861,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."gulp-sourcemaps-1.6.0" // { dependencies = [ sources."convert-source-map-1.3.0" @@ -25487,7 +25881,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25513,6 +25907,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; homepage = https://github.com/mweibel/lcov-result-merger; @@ -25560,6 +25955,7 @@ in sources."mkdirp-0.3.0" sources."node.extend-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; homepage = https://bitbucket.org/aahmed/meat; @@ -25578,6 +25974,7 @@ in sources."optparse-1.0.5" sources."slasp-0.0.4" ]; + buildInputs = globalBuildInputs; meta = { description = "An internal DSL for the Nix package manager in JavaScript"; homepage = https://github.com/svanderburg/nijs; @@ -25588,10 +25985,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.0.1.tgz"; - sha1 = "de96ccbd0228983e788d68b9792836964614548c"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; + sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; }; dependencies = [ sources."optparse-1.0.5" @@ -25601,7 +25998,7 @@ in sources."chownr-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -25614,7 +26011,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -25646,12 +26043,12 @@ in sources."semver-5.3.0" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -25660,7 +26057,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25677,13 +26074,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -25710,7 +26103,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -25740,28 +26133,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -25769,9 +26158,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -25785,7 +26174,7 @@ in sources."retry-0.8.0" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -25793,7 +26182,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -25804,7 +26193,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -25819,7 +26208,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -25835,17 +26224,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -25870,7 +26259,7 @@ in sources."proto-list-1.2.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -25889,8 +26278,8 @@ in }) (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) sources."semver-4.3.6" @@ -25902,7 +26291,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -25910,7 +26299,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -25928,24 +26317,24 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."temp-0.8.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" ]; }) @@ -25974,6 +26363,7 @@ in sources."slasp-0.0.4" sources."nijs-0.0.23" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; homepage = https://github.com/svanderburg/node2nix; @@ -25991,10 +26381,10 @@ in dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -26002,16 +26392,16 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26041,7 +26431,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26057,17 +26447,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -26085,8 +26475,8 @@ in }) (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) (sources."path-array-1.0.1" // { @@ -26112,7 +26502,7 @@ in }) ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -26121,7 +26511,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26138,13 +26528,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -26171,7 +26557,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -26201,28 +26587,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -26230,9 +26612,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -26248,15 +26630,16 @@ in (sources."tar-2.2.1" // { dependencies = [ sources."block-stream-0.0.9" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon build tool"; homepage = "https://github.com/nodejs/node-gyp#readme"; @@ -26287,8 +26670,8 @@ in }) (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) (sources."plist-1.2.0" // { @@ -26321,7 +26704,7 @@ in dependencies = [ (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) (sources."meow-3.7.0" // { @@ -26336,10 +26719,10 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -26380,7 +26763,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -26405,7 +26788,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -26424,9 +26807,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -26445,7 +26828,7 @@ in }) (sources."untildify-2.1.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -26463,9 +26846,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -26522,9 +26905,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -26540,7 +26923,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26551,14 +26934,14 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rc-1.1.6" // { dependencies = [ sources."deep-extend-0.4.1" @@ -26605,7 +26988,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26621,17 +27004,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -26647,7 +27030,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -26656,7 +27039,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26673,13 +27056,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -26706,7 +27085,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -26736,28 +27115,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -26765,9 +27140,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -26780,7 +27155,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -26788,7 +27163,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26799,7 +27174,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -26814,23 +27189,23 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."graceful-fs-4.1.9" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -26852,7 +27227,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26890,7 +27265,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26906,17 +27281,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -26932,7 +27307,7 @@ in sources."set-blocking-2.0.0" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -26941,7 +27316,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26958,13 +27333,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -26991,7 +27362,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -27021,28 +27392,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -27050,9 +27417,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -27065,7 +27432,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -27073,7 +27440,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27084,7 +27451,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -27099,23 +27466,23 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."graceful-fs-4.1.9" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27137,7 +27504,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27151,7 +27518,7 @@ in }) ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -27187,14 +27554,14 @@ in }) (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."strip-ansi-3.0.1" // { @@ -27209,6 +27576,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; homepage = http://github.com/node-inspector/node-inspector; @@ -27243,7 +27611,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27259,17 +27627,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -27293,7 +27661,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -27302,7 +27670,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27319,13 +27687,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -27352,7 +27716,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -27382,28 +27746,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -27411,9 +27771,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -27426,7 +27786,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -27434,7 +27794,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27445,12 +27805,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -27461,10 +27821,10 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { @@ -27476,13 +27836,13 @@ in }) (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."graceful-fs-4.1.9" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -27504,7 +27864,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -27515,6 +27875,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon binary install tool"; homepage = "https://github.com/mapbox/node-pre-gyp#readme"; @@ -27584,7 +27945,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -27608,7 +27969,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -27619,10 +27980,10 @@ in sources."is-extglob-1.0.0" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -27675,17 +28036,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -27709,7 +28070,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -27734,13 +28095,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -27767,7 +28124,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -27797,28 +28154,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -27826,9 +28179,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -27841,7 +28194,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -27849,7 +28202,7 @@ in sources."wrappy-1.0.2" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -27864,7 +28217,7 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) ]; @@ -27873,7 +28226,7 @@ in dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."fstream-ignore-1.0.5" @@ -27906,7 +28259,7 @@ in sources."ms-0.7.1" ]; }) - sources."es6-promise-3.2.1" + sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" (sources."lodash.defaults-3.1.2" // { dependencies = [ @@ -27991,20 +28344,20 @@ in }) (sources."configstore-1.4.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."object-assign-4.1.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" (sources."write-file-atomic-1.2.0" // { dependencies = [ sources."imurmurhash-0.1.4" @@ -28013,7 +28366,7 @@ in }) (sources."xdg-basedir-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -28036,7 +28389,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -28056,7 +28409,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -28072,7 +28425,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28102,9 +28455,9 @@ in }) (sources."repeating-1.1.3" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -28126,6 +28479,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; homepage = http://nodemon.io/; @@ -28170,9 +28524,9 @@ in sources."qs-6.2.0" (sources."type-is-1.6.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -28204,7 +28558,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."entities-1.0.0" @@ -28234,7 +28588,7 @@ in dependencies = [ (sources."moment-timezone-0.3.1" // { dependencies = [ - sources."moment-2.14.1" + sources."moment-2.15.1" ]; }) ]; @@ -28243,9 +28597,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -28306,9 +28660,9 @@ in sources."serve-static-1.11.1" (sources."type-is-1.6.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -28329,13 +28683,13 @@ in }) (sources."fs-extra-0.30.0" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -28343,7 +28697,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -28354,7 +28708,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -28416,7 +28770,7 @@ in ]; }) sources."help-me-0.1.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimist-1.2.0" (sources."mqtt-connection-2.1.1" // { dependencies = [ @@ -28431,7 +28785,7 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -28639,7 +28993,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -28656,7 +29010,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; @@ -28668,7 +29022,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28684,15 +29038,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -28747,7 +29101,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -28855,33 +29209,35 @@ in }) ]; }) - (sources."imap-0.8.17" // { + (sources."imap-0.8.18" // { dependencies = [ - sources."utf7-1.0.0" + sources."utf7-1.0.2" (sources."readable-stream-1.1.14" // { dependencies = [ sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; }) ]; }) - (sources."node-red-node-twitter-0.1.6" // { + (sources."node-red-node-twitter-0.1.7" // { dependencies = [ sources."twitter-ng-0.6.2" sources."oauth-0.9.14" - (sources."request-2.67.0" // { + (sources."request-2.75.0" // { dependencies = [ - (sources."bl-1.0.3" // { + sources."aws-sign2-0.6.0" + sources."aws4-1.4.1" + (sources."bl-1.1.2" // { dependencies = [ (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -28891,74 +29247,18 @@ in ]; }) sources."caseless-0.11.0" - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) - ]; - }) - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { - dependencies = [ - sources."mime-db-1.23.0" - ]; - }) - sources."node-uuid-1.4.7" - sources."qs-5.2.1" - sources."tunnel-agent-0.4.3" - sources."tough-cookie-2.2.2" - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { - dependencies = [ - sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.0" - sources."getpass-0.1.6" - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - ]; - }) - ]; - }) - sources."oauth-sign-0.8.2" - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - sources."aws-sign2-0.6.0" - sources."stringstream-0.0.5" (sources."combined-stream-1.0.5" // { dependencies = [ sources."delayed-stream-1.0.0" ]; }) - sources."isstream-0.1.2" - sources."is-typedarray-1.0.0" + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-2.0.0" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) (sources."har-validator-2.0.6" // { dependencies = [ (sources."chalk-1.1.3" // { @@ -28983,7 +29283,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -29002,6 +29302,53 @@ in }) ]; }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.1" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.12" // { + dependencies = [ + sources."mime-db-1.24.0" + ]; + }) + sources."node-uuid-1.4.7" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.1" + sources."tunnel-agent-0.4.3" ]; }) ]; @@ -29035,7 +29382,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29051,17 +29398,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -29085,7 +29432,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -29094,7 +29441,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29111,13 +29458,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -29144,7 +29487,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -29174,28 +29517,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -29203,9 +29542,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -29218,7 +29557,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -29226,7 +29565,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -29237,12 +29576,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -29252,23 +29591,23 @@ in sources."block-stream-0.0.9" (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."tar-pack-3.1.4" // { dependencies = [ (sources."fstream-1.0.10" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."inherits-2.0.1" + sources."graceful-fs-4.1.9" + sources."inherits-2.0.3" ]; }) (sources."fstream-ignore-1.0.5" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -29290,7 +29629,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -29345,6 +29684,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A visual tool for wiring the Internet of Things"; homepage = http://nodered.org/; @@ -29419,7 +29759,7 @@ in (sources."config-0.4.15" // { dependencies = [ sources."js-yaml-0.3.7" - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" (sources."vows-0.8.1" // { dependencies = [ sources."eyes-0.1.8" @@ -29431,14 +29771,14 @@ in sources."natives-1.1.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-1.0.0" // { dependencies = [ sources."lru-cache-2.7.3" sources."sigmund-1.0.1" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -29480,18 +29820,18 @@ in sources."moment-2.1.0" (sources."nodemailer-0.3.35" // { dependencies = [ - (sources."mailcomposer-3.10.0" // { + (sources."mailcomposer-3.12.0" // { dependencies = [ - (sources."buildmail-3.8.0" // { + (sources."buildmail-3.10.0" // { dependencies = [ sources."addressparser-1.0.1" sources."libbase64-0.1.0" sources."libqp-1.1.0" - sources."nodemailer-fetch-1.4.0" - sources."nodemailer-shared-1.0.5" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" ]; }) - (sources."libmime-2.0.3" // { + (sources."libmime-2.1.0" // { dependencies = [ sources."iconv-lite-0.4.13" sources."libbase64-0.1.0" @@ -29535,6 +29875,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Remote monitoring for HTTP applications"; license = "MIT"; @@ -29544,10 +29885,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.6"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.6.tgz"; - sha1 = "a2a3d39b9e93c2afb7ca1328e39ef72ba451dd1e"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; dependencies = [ sources."abbrev-1.0.9" @@ -29555,7 +29896,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { @@ -29581,7 +29922,7 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - (sources."fstream-npm-1.1.1" // { + (sources."fstream-npm-1.2.0" // { dependencies = [ (sources."fstream-ignore-1.0.5" // { dependencies = [ @@ -29612,15 +29953,15 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -29636,41 +29977,23 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" ]; }) - (sources."lodash.clonedeep-4.3.2" // { - dependencies = [ - sources."lodash._baseclone-4.5.7" - ]; - }) - (sources."lodash.union-4.4.0" // { - dependencies = [ - sources."lodash._baseflatten-4.2.1" - sources."lodash.rest-4.0.5" - ]; - }) - sources."lodash.uniq-4.3.0" - (sources."lodash.without-4.2.0" // { - dependencies = [ - (sources."lodash._basedifference-4.5.0" // { - dependencies = [ - sources."lodash._root-3.0.1" - ]; - }) - sources."lodash.rest-4.0.5" - ]; - }) + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -29688,6 +30011,39 @@ in }) ]; }) + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) (sources."path-array-1.0.1" // { dependencies = [ (sources."array-index-1.0.0" // { @@ -29727,7 +30083,7 @@ in 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.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -29743,11 +30099,43 @@ in }) ]; }) - sources."retry-0.8.0" + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-3.1.2" // { + (sources."npmlog-4.0.0" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -29759,17 +30147,17 @@ in dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -29780,15 +30168,15 @@ in sources."set-blocking-2.0.0" ]; }) - sources."once-1.3.3" - sources."opener-1.4.1" + sources."once-1.4.0" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -29814,7 +30202,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."json-parse-helpfulerror-1.0.3" // { @@ -29836,7 +30224,7 @@ in ]; }) sources."realize-package-specifier-3.0.3" - (sources."request-2.72.0" // { + (sources."request-2.74.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -29865,7 +30253,7 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -29885,7 +30273,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -29915,28 +30303,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -29944,25 +30328,25 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.1.0" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" - sources."semver-5.1.1" + sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -29983,13 +30367,13 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -30011,6 +30395,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; homepage = https://docs.npmjs.com/; @@ -30037,7 +30422,7 @@ in }) (sources."npm-registry-client-0.2.27" // { dependencies = [ - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -30046,7 +30431,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -30063,13 +30448,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -30096,7 +30477,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -30126,28 +30507,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -30155,9 +30532,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -30175,7 +30552,7 @@ in sources."mkdirp-0.3.5" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -30183,7 +30560,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -30194,12 +30571,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -30215,7 +30592,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -30231,17 +30608,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -30285,7 +30662,7 @@ in sources."inherits-1.0.2" (sources."block-stream-0.0.9" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fstream-0.1.31" // { @@ -30295,7 +30672,7 @@ in sources."natives-1.1.0" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30303,7 +30680,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -30321,12 +30698,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -30363,8 +30740,9 @@ in ]; }) sources."findit-1.2.0" - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; homepage = https://github.com/NixOS/npm2nix; @@ -30429,17 +30807,17 @@ in sources."lodash-3.10.1" (sources."node-alias-1.0.4" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) - (sources."npm-3.10.7" // { + (sources."npm-3.10.8" // { dependencies = [ sources."abbrev-1.0.9" sources."ansicolors-0.3.2" sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" (sources."columnify-1.5.4" // { @@ -30465,7 +30843,7 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - (sources."fstream-npm-1.1.1" // { + (sources."fstream-npm-1.2.0" // { dependencies = [ (sources."fstream-ignore-1.0.5" // { dependencies = [ @@ -30496,15 +30874,15 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -30520,23 +30898,23 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" ]; }) - sources."lodash.clonedeep-4.4.1" - sources."lodash.union-4.5.0" - sources."lodash.uniq-4.4.0" - sources."lodash.without-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" @@ -30554,6 +30932,39 @@ in }) ]; }) + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) (sources."path-array-1.0.1" // { dependencies = [ (sources."array-index-1.0.0" // { @@ -30593,7 +31004,7 @@ in 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.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ (sources."concat-stream-1.5.2" // { dependencies = [ @@ -30609,11 +31020,43 @@ in }) ]; }) - sources."retry-0.8.0" + (sources."npmlog-3.1.2" // { + dependencies = [ + (sources."are-we-there-yet-1.1.2" // { + dependencies = [ + sources."delegates-1.0.0" + ]; + }) + sources."console-control-strings-1.1.0" + (sources."gauge-2.6.0" // { + dependencies = [ + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.1" + ]; + }) + ]; + }) + sources."wide-align-1.1.0" + ]; + }) + sources."set-blocking-2.0.0" + ]; + }) ]; }) sources."npm-user-validate-0.1.5" - (sources."npmlog-3.1.2" // { + (sources."npmlog-4.0.0" // { dependencies = [ (sources."are-we-there-yet-1.1.2" // { dependencies = [ @@ -30625,17 +31068,17 @@ in dependencies = [ sources."has-color-0.1.7" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -30646,15 +31089,15 @@ in sources."set-blocking-2.0.0" ]; }) - sources."once-1.3.3" - sources."opener-1.4.1" + sources."once-1.4.0" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -30680,7 +31123,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -30726,14 +31169,14 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) (sources."har-validator-2.0.6" // { dependencies = [ - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -30763,28 +31206,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -30792,9 +31231,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -30805,12 +31244,11 @@ in sources."tunnel-agent-0.4.3" ]; }) - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" - sources."semver-5.1.1" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -30831,13 +31269,13 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -30873,20 +31311,20 @@ in dependencies = [ (sources."configstore-1.4.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."mkdirp-0.5.1" // { dependencies = [ sources."minimist-0.0.8" ]; }) sources."object-assign-4.1.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) - sources."uuid-2.0.2" + sources."uuid-2.0.3" (sources."write-file-atomic-1.2.0" // { dependencies = [ sources."imurmurhash-0.1.4" @@ -30895,7 +31333,7 @@ in }) (sources."xdg-basedir-2.0.0" // { dependencies = [ - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" ]; }) ]; @@ -30918,7 +31356,7 @@ in }) ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -30938,7 +31376,7 @@ in sources."lowercase-keys-1.0.0" (sources."nested-error-stacks-1.0.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."object-assign-3.0.0" @@ -30954,7 +31392,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -30984,9 +31422,9 @@ in }) (sources."repeating-1.1.3" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -31004,6 +31442,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; homepage = https://github.com/tjunnone/npm-check-updates; @@ -31031,12 +31470,12 @@ in }) (sources."bplist-parser-0.1.1" // { dependencies = [ - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" ]; }) (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -31067,7 +31506,7 @@ in dependencies = [ (sources."consume-until-1.0.0" // { dependencies = [ - sources."buffer-indexof-1.0.2" + sources."buffer-indexof-1.1.0" ]; }) (sources."http-headers-3.0.1" // { @@ -31077,7 +31516,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31105,18 +31544,18 @@ in sources."supports-color-2.0.0" ]; }) - (sources."single-line-log-1.1.1" // { + (sources."single-line-log-1.1.2" // { dependencies = [ (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."strip-ansi-3.0.1" // { @@ -31137,10 +31576,10 @@ in sources."dns-equal-1.0.0" (sources."dns-txt-2.0.2" // { dependencies = [ - sources."buffer-indexof-1.0.2" + sources."buffer-indexof-1.1.0" ]; }) - (sources."multicast-dns-6.0.1" // { + (sources."multicast-dns-6.1.0" // { dependencies = [ (sources."dns-packet-1.1.0" // { dependencies = [ @@ -31167,10 +31606,10 @@ in dependencies = [ (sources."currently-unhandled-0.4.1" // { dependencies = [ - sources."array-find-index-1.0.1" + sources."array-find-index-1.0.2" ]; }) - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" ]; }) sources."map-obj-1.0.1" @@ -31212,7 +31651,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -31237,7 +31676,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -31256,9 +31695,9 @@ in dependencies = [ (sources."repeating-2.0.1" // { dependencies = [ - (sources."is-finite-1.0.1" // { + (sources."is-finite-1.0.2" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -31346,20 +31785,20 @@ in sources."bencode-0.10.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) sources."uniq-1.0.1" ]; }) - (sources."simple-get-2.2.2" // { + (sources."simple-get-2.2.3" // { dependencies = [ - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) ]; @@ -31409,7 +31848,7 @@ in }) (sources."random-access-file-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."randombytes-2.0.3" @@ -31438,7 +31877,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -31448,7 +31887,7 @@ in (sources."peer-wire-swarm-0.12.1" // { dependencies = [ sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31460,7 +31899,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" @@ -31476,7 +31915,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -31484,7 +31923,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -31495,12 +31934,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -31510,7 +31949,7 @@ in (sources."bittorrent-dht-6.4.2" // { dependencies = [ sources."bencode-0.7.0" - sources."buffer-equals-1.0.3" + sources."buffer-equals-1.0.4" (sources."k-bucket-0.6.0" // { dependencies = [ sources."buffer-equal-0.0.1" @@ -31545,16 +31984,16 @@ in }) sources."ip-1.1.3" sources."minimist-1.2.0" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) sources."random-iterate-1.0.1" sources."run-series-1.1.4" - (sources."simple-get-2.2.2" // { + (sources."simple-get-2.2.3" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" ]; }) (sources."simple-peer-6.0.7" // { @@ -31607,7 +32046,7 @@ in sources."ms-0.7.1" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."re-emitter-1.1.3" sources."run-parallel-1.1.6" ]; @@ -31618,6 +32057,7 @@ in sources."windows-no-runnable-0.0.6" sources."xtend-4.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; homepage = https://github.com/mafintosh/peerflix; @@ -31643,7 +32083,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -31732,7 +32172,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -31770,8 +32210,16 @@ in }) (sources."pump-1.0.1" // { dependencies = [ - sources."end-of-stream-1.1.0" - (sources."once-1.3.3" // { + (sources."end-of-stream-1.1.0" // { + dependencies = [ + (sources."once-1.3.3" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31799,7 +32247,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -31879,7 +32327,7 @@ in sources."ms-0.7.1" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-ip-1.0.0" // { dependencies = [ sources."ip-regex-1.0.3" @@ -31887,7 +32335,7 @@ in }) sources."k-bucket-0.5.0" sources."network-address-1.1.0" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31895,7 +32343,7 @@ in sources."run-parallel-1.1.6" (sources."simple-get-1.4.3" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."xtend-4.0.1" ]; }) @@ -31917,8 +32365,8 @@ in ]; }) sources."extend.js-0.0.2" - sources."inherits-2.0.1" - (sources."once-1.3.3" // { + sources."inherits-2.0.3" + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -31931,7 +32379,7 @@ in sources."run-series-1.1.4" (sources."simple-get-1.4.3" // { dependencies = [ - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."xtend-4.0.1" ]; }) @@ -31985,7 +32433,7 @@ in sources."bencode-0.7.0" (sources."simple-sha1-2.0.8" // { dependencies = [ - sources."rusha-0.8.3" + sources."rusha-0.8.4" ]; }) ]; @@ -32001,14 +32449,14 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."bncode-0.2.3" ]; }) sources."fifo-0.1.4" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32019,7 +32467,7 @@ in sources."random-access-file-0.3.2" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -32027,7 +32475,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32038,12 +32486,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -32055,10 +32503,10 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -32066,6 +32514,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for node.js with web ui."; homepage = "https://github.com/asapach/peerflix-server#readme"; @@ -32086,7 +32535,7 @@ in dependencies = [ (sources."concat-stream-1.5.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -32118,13 +32567,13 @@ in }) (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -32132,7 +32581,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32143,7 +32592,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -32173,7 +32622,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32189,15 +32638,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -32207,28 +32656,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -32275,7 +32720,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -32301,12 +32746,13 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Headless WebKit with JS API"; homepage = https://github.com/Medium/phantomjs; @@ -32343,7 +32789,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -32354,15 +32800,15 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."iconv-lite-0.4.13" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -32392,6 +32838,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; homepage = https://facebook.github.io/react; @@ -32443,7 +32890,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."stream-counter-0.2.0" @@ -32495,9 +32942,9 @@ in sources."fresh-0.1.0" ]; }) - (sources."openid-2.0.2" // { + (sources."openid-2.0.6" // { dependencies = [ - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -32506,7 +32953,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32523,13 +32970,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -32556,7 +32999,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -32586,28 +33029,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -32615,9 +33054,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -32635,7 +33074,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; @@ -32653,6 +33092,7 @@ in }) sources."crypto-0.0.3" ]; + buildInputs = globalBuildInputs; meta = { }; production = true; @@ -32665,6 +33105,7 @@ in url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; + buildInputs = globalBuildInputs; meta = { description = "The semantic version parser used by npm."; homepage = "https://github.com/npm/node-semver#readme"; @@ -32685,9 +33126,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.5.3" @@ -32742,7 +33183,7 @@ in sources."destroy-1.0.3" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -32759,7 +33200,7 @@ in sources."destroy-1.0.4" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -32772,9 +33213,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -32818,9 +33259,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -32831,9 +33272,9 @@ in dependencies = [ (sources."accepts-1.3.3" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.6.1" @@ -32842,7 +33283,7 @@ in sources."bytes-2.3.0" (sources."compressible-2.0.8" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) (sources."debug-2.2.0" // { @@ -32861,7 +33302,7 @@ in }) (sources."js-yaml-3.6.1" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -32875,7 +33316,7 @@ in sources."keygrip-1.0.1" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -32884,7 +33325,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -32901,13 +33342,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -32929,7 +33366,7 @@ in sources."supports-color-2.0.0" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -32959,28 +33396,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -32988,9 +33421,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -33029,7 +33462,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33040,12 +33473,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -33053,7 +33486,7 @@ in ]; }) sources."safe-json-stringify-1.0.3" - sources."moment-2.14.1" + sources."moment-2.15.1" ]; }) (sources."handlebars-2.0.0" // { @@ -33081,7 +33514,7 @@ in dependencies = [ (sources."markdown-it-4.4.0" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -33089,7 +33522,7 @@ in sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" - sources."uc.micro-1.0.2" + sources."uc.micro-1.0.3" ]; }) (sources."sanitize-html-1.13.0" // { @@ -33108,7 +33541,7 @@ in ]; }) sources."entities-1.1.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."readable-stream-2.1.5" // { dependencies = [ sources."buffer-shims-1.0.0" @@ -33128,7 +33561,7 @@ in ]; }) sources."jju-1.3.0" - (sources."JSONStream-1.1.4" // { + (sources."JSONStream-1.2.1" // { dependencies = [ sources."jsonparse-1.2.0" sources."through-2.3.8" @@ -33152,7 +33585,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."fs-ext-0.5.0" // { @@ -33166,6 +33599,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Private npm repository server"; homepage = https://github.com/rlidwka/sinopia; @@ -33198,7 +33632,7 @@ in }) (sources."readdirp-2.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33213,7 +33647,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33224,6 +33658,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "sloc is a simple tool to count SLOC (source lines of code)"; homepage = "https://github.com/flosse/sloc#readme"; @@ -33275,7 +33710,7 @@ in sources."mime-1.3.4" sources."negotiator-0.5.3" sources."node-uuid-1.4.7" - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -33331,7 +33766,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33342,12 +33777,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -33366,10 +33801,10 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) @@ -33383,7 +33818,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33442,6 +33877,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Client SDK and CLI for the Joyent SmartDataCenter API"; homepage = "https://github.com/joyent/node-smartdc#readme"; @@ -33477,7 +33913,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -33488,12 +33924,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."source-map-0.1.43" // { @@ -33502,6 +33938,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Robust, expressive, and feature-rich CSS superset"; homepage = https://github.com/stylus/stylus; @@ -33512,10 +33949,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.0.tgz"; - sha1 = "51a95c5f7aaa98824f92857ac14c2cdbe81537aa"; + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; + sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; }; dependencies = [ sources."sax-1.2.1" @@ -33526,7 +33963,7 @@ in }) (sources."js-yaml-3.6.1" // { dependencies = [ - (sources."argparse-1.0.7" // { + (sources."argparse-1.0.9" // { dependencies = [ sources."sprintf-js-1.0.3" ]; @@ -33568,6 +34005,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; homepage = https://github.com/svg/svgo; @@ -33578,10 +34016,10 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.9"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.9.tgz"; - sha1 = "113f5f986b5e39e92db0d5d0ba5b2b1f237504e7"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; + sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; }; dependencies = [ sources."async-1.4.2" @@ -33625,7 +34063,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33641,15 +34079,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."qs-4.0.0" @@ -33704,7 +34142,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -33750,7 +34188,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -33766,15 +34204,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -33830,7 +34268,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -33850,7 +34288,7 @@ in sources."sprintf-0.1.5" (sources."temp-0.8.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" ]; }) @@ -33867,6 +34305,7 @@ in }) sources."wrench-1.5.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium Command line"; homepage = "https://github.com/appcelerator/titanium#readme"; @@ -33877,11 +34316,12 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "1.8.10"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"; - sha1 = "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.3.tgz"; + sha1 = "33dec9eae86b8eee327dd419ca050c853cabd514"; }; + buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; homepage = http://typescriptlang.org/; @@ -33945,6 +34385,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; homepage = http://lisperator.net/uglifyjs; @@ -33963,7 +34404,7 @@ in dependencies = [ sources."async-2.0.1" sources."bluebird-3.3.5" - sources."blueimp-md5-2.3.0" + sources."blueimp-md5-2.3.1" (sources."body-parser-1.15.2" // { dependencies = [ sources."bytes-2.4.0" @@ -33996,9 +34437,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -34008,7 +34449,7 @@ in (sources."color-0.11.3" // { dependencies = [ sources."clone-1.0.2" - sources."color-convert-1.4.0" + sources."color-convert-1.5.0" (sources."color-string-0.3.0" // { dependencies = [ sources."color-name-1.1.1" @@ -34032,9 +34473,9 @@ in dependencies = [ (sources."accepts-1.2.13" // { dependencies = [ - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."negotiator-0.5.3" @@ -34081,7 +34522,7 @@ in sources."destroy-1.0.4" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -34092,9 +34533,9 @@ in (sources."type-is-1.6.13" // { dependencies = [ sources."media-typer-0.3.0" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) ]; @@ -34291,7 +34732,7 @@ in }) (sources."dezalgo-1.0.3" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."editor-1.0.0" @@ -34329,15 +34770,15 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ @@ -34353,13 +34794,13 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) sources."promzard-0.3.0" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" (sources."lodash._baseuniq-4.6.0" // { dependencies = [ sources."lodash._createset-4.0.3" @@ -34468,13 +34909,13 @@ in ]; }) sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" (sources."osenv-0.1.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" ]; }) - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" (sources."read-1.0.7" // { dependencies = [ sources."mute-stream-0.0.6" @@ -34500,7 +34941,7 @@ in }) ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) (sources."json-parse-helpfulerror-1.0.3" // { @@ -34563,7 +35004,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -34593,28 +35034,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -34622,9 +35059,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -34638,7 +35075,7 @@ in sources."retry-0.9.0" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" (sources."tar-2.2.1" // { dependencies = [ @@ -34659,7 +35096,7 @@ in sources."builtins-0.0.7" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; @@ -34693,7 +35130,7 @@ in sources."chownr-1.0.1" (sources."concat-stream-1.5.2" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -34706,7 +35143,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."normalize-package-data-2.3.5" // { dependencies = [ sources."hosted-git-info-2.1.5" @@ -34732,12 +35169,12 @@ in sources."hosted-git-info-2.1.5" ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -34746,7 +35183,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -34763,7 +35200,11 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + (sources."form-data-2.0.0" // { + dependencies = [ + sources."asynckit-0.4.0" + ]; + }) (sources."har-validator-2.0.6" // { dependencies = [ (sources."chalk-1.1.3" // { @@ -34788,7 +35229,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -34818,28 +35259,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -34847,9 +35284,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -34871,7 +35308,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -34887,17 +35324,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -34917,7 +35354,7 @@ in }) sources."octicons-3.5.0" sources."open-0.0.5" - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" (sources."passport-0.3.2" // { dependencies = [ sources."passport-strategy-1.0.0" @@ -34947,7 +35384,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -34955,7 +35392,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -34966,12 +35403,12 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" ]; }) ]; @@ -34990,7 +35427,7 @@ in sources."fresh-0.3.0" (sources."http-errors-1.3.1" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."mime-1.3.4" @@ -35178,14 +35615,14 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) ]; }) (sources."temp-0.8.3" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" ]; }) @@ -35238,7 +35675,7 @@ in }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -35281,7 +35718,7 @@ in dependencies = [ (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" (sources."parse-json-2.2.0" // { dependencies = [ (sources."error-ex-1.3.0" // { @@ -35326,7 +35763,7 @@ in }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."pify-2.3.0" (sources."pinkie-promise-2.0.1" // { dependencies = [ @@ -35343,14 +35780,14 @@ in sources."set-blocking-1.0.0" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."strip-ansi-3.0.1" // { @@ -35366,6 +35803,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; @@ -35393,7 +35831,7 @@ in sources."ini-1.3.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."once-1.3.3" // { dependencies = [ sources."wrappy-1.0.2" @@ -35415,7 +35853,7 @@ in dependencies = [ (sources."concat-stream-1.5.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" (sources."readable-stream-2.0.6" // { dependencies = [ @@ -35447,13 +35885,13 @@ in }) (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -35461,7 +35899,7 @@ in sources."wrappy-1.0.2" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."minimatch-3.0.3" // { dependencies = [ (sources."brace-expansion-1.1.6" // { @@ -35472,7 +35910,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -35502,7 +35940,7 @@ in (sources."readable-stream-2.0.6" // { dependencies = [ sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -35518,15 +35956,15 @@ in dependencies = [ (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) ]; }) sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -35536,28 +35974,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -35604,7 +36038,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -35630,16 +36064,16 @@ in sources."throttleit-1.0.0" ]; }) - (sources."which-1.2.10" // { + (sources."which-1.2.11" // { dependencies = [ sources."isexe-1.1.2" ]; }) ]; }) - (sources."tmp-0.0.28" // { + (sources."tmp-0.0.29" // { dependencies = [ - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" ]; }) (sources."follow-redirects-0.0.3" // { @@ -35648,6 +36082,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; homepage = https://github.com/uxebu/webdrvr; @@ -35669,12 +36104,12 @@ in (sources."enhanced-resolve-0.9.1" // { dependencies = [ sources."memory-fs-0.2.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."acorn-3.3.0" sources."interpret-0.6.6" - (sources."loader-utils-0.2.15" // { + (sources."loader-utils-0.2.16" // { dependencies = [ sources."big.js-3.1.3" sources."emojis-list-2.0.1" @@ -35693,7 +36128,7 @@ in dependencies = [ sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -35717,7 +36152,7 @@ in }) (sources."buffer-4.9.1" // { dependencies = [ - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."ieee754-1.1.6" sources."isarray-1.0.0" ]; @@ -35740,7 +36175,7 @@ in (sources."http-browserify-1.7.0" // { dependencies = [ sources."Base64-0.2.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."https-browserify-0.0.0" @@ -35753,12 +36188,12 @@ in dependencies = [ sources."core-util-is-1.0.2" sources."isarray-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) (sources."stream-browserify-1.0.0" // { dependencies = [ - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; }) sources."string_decoder-0.10.31" @@ -35900,7 +36335,7 @@ in dependencies = [ (sources."for-own-0.1.4" // { dependencies = [ - sources."for-in-0.1.5" + sources."for-in-0.1.6" ]; }) sources."is-extendable-0.1.1" @@ -35924,7 +36359,7 @@ in }) sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" (sources."is-binary-path-1.0.1" // { dependencies = [ sources."binary-extensions-1.6.0" @@ -35935,7 +36370,7 @@ in sources."is-extglob-1.0.0" ]; }) - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."readdirp-2.1.0" // { dependencies = [ (sources."minimatch-3.0.3" // { @@ -35995,17 +36430,17 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" (sources."string-width-1.0.2" // { dependencies = [ - (sources."code-point-at-1.0.0" // { + (sources."code-point-at-1.0.1" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) (sources."is-fullwidth-code-point-1.0.0" // { dependencies = [ - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; }) ]; @@ -36029,7 +36464,7 @@ in sources."strip-json-comments-1.0.4" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."aws-sign2-0.6.0" sources."aws4-1.4.1" @@ -36054,13 +36489,9 @@ in }) sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { + (sources."form-data-2.0.0" // { dependencies = [ - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" ]; }) (sources."har-validator-2.0.6" // { @@ -36087,7 +36518,7 @@ in sources."graceful-readlink-1.0.1" ]; }) - (sources."is-my-json-valid-2.13.1" // { + (sources."is-my-json-valid-2.14.0" // { dependencies = [ sources."generate-function-2.0.0" (sources."generate-object-property-1.2.0" // { @@ -36117,28 +36548,24 @@ in (sources."http-signature-1.1.1" // { dependencies = [ sources."assert-plus-0.2.0" - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" ]; }) - (sources."sshpk-1.10.0" // { + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" sources."dashdash-1.14.0" sources."getpass-0.1.6" sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" ]; }) ]; @@ -36146,9 +36573,9 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.11" // { + (sources."mime-types-2.1.12" // { dependencies = [ - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" ]; }) sources."node-uuid-1.4.7" @@ -36161,7 +36588,7 @@ in }) (sources."rimraf-2.5.4" // { dependencies = [ - (sources."glob-7.0.6" // { + (sources."glob-7.1.0" // { dependencies = [ sources."fs.realpath-1.0.0" (sources."inflight-1.0.5" // { @@ -36179,7 +36606,7 @@ in }) ]; }) - (sources."once-1.3.3" // { + (sources."once-1.4.0" // { dependencies = [ sources."wrappy-1.0.2" ]; @@ -36241,7 +36668,7 @@ in }) ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) (sources."webpack-core-0.6.8" // { @@ -36255,6 +36682,7 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; @@ -36270,6 +36698,7 @@ in url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; }; + buildInputs = globalBuildInputs; meta = { description = "Extract content from websites using CSS Selectors and XPath"; homepage = "https://github.com/osener/wring#readme"; diff --git a/pkgs/development/node-packages/node-packages-v5.nix b/pkgs/development/node-packages/node-packages-v5.nix index 8527dbf02e1..fe1eb1769ea 100644 --- a/pkgs/development/node-packages/node-packages-v5.nix +++ b/pkgs/development/node-packages/node-packages-v5.nix @@ -1,6 +1,6 @@ -# This file has been generated by node2nix 1.0.1. Do not edit! +# This file has been generated by node2nix 1.1.0. Do not edit! -{nodeEnv, fetchurl, fetchgit}: +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: let sources = { @@ -310,31 +310,31 @@ let sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217"; }; }; - "which-1.2.10" = { + "which-1.2.11" = { name = "which"; packageName = "which"; - version = "1.2.10"; + version = "1.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.10.tgz"; - sha1 = "91cd9bd0751322411b659b40f054b21de957ab2d"; + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; }; }; - "os-homedir-1.0.1" = { + "os-homedir-1.0.2" = { name = "os-homedir"; packageName = "os-homedir"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz"; - sha1 = "0d62bdf44b916fd3bbdcf2cab191948fb094f007"; + url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; + sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; }; }; - "os-tmpdir-1.0.1" = { + "os-tmpdir-1.0.2" = { name = "os-tmpdir"; packageName = "os-tmpdir"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz"; - sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e"; + url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; + sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; }; "isexe-1.1.2" = { @@ -391,13 +391,13 @@ let sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab"; }; }; - "azure-common-0.9.17" = { + "azure-common-0.9.18" = { name = "azure-common"; packageName = "azure-common"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.17.tgz"; - sha1 = "8f8df41ccb4a026b670645f223e41e1a7f42f33f"; + url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.18.tgz"; + sha1 = "38b960f4ddadd44d34f52e8b85d5d1e0226440fd"; }; }; "azure-arm-authorization-2.0.0" = { @@ -463,6 +463,15 @@ let sha1 = "4e38f8d72cd532e8ad3982d26f43f73f8fb2149f"; }; }; + "azure-arm-iothub-0.1.1" = { + name = "azure-arm-iothub"; + packageName = "azure-arm-iothub"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-iothub/-/azure-arm-iothub-0.1.1.tgz"; + sha1 = "edce480a3e1836745d0fcf8f0f1d8e0b2c022535"; + }; + }; "azure-arm-servermanagement-0.1.2" = { name = "azure-arm-servermanagement"; packageName = "azure-arm-servermanagement"; @@ -472,13 +481,13 @@ let sha1 = "937f87a8aeceb641a8210a9ba837323f0206eb47"; }; }; - "azure-arm-network-0.13.2" = { + "azure-arm-network-0.17.0" = { name = "azure-arm-network"; packageName = "azure-arm-network"; - version = "0.13.2"; + version = "0.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.13.2.tgz"; - sha1 = "c1f798e5de97295aa0def2cb7f49c53f258d12b0"; + url = "https://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.17.0.tgz"; + sha1 = "97371f42301b40d56757f340c0dd0ed34984cdd6"; }; }; "azure-arm-powerbiembedded-0.1.0" = { @@ -499,22 +508,22 @@ let sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01"; }; }; - "azure-arm-dns-0.10.1" = { + "azure-arm-dns-0.11.1" = { name = "azure-arm-dns"; packageName = "azure-arm-dns"; - version = "0.10.1"; + version = "0.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.10.1.tgz"; - sha1 = "8f6dded24a8b8dbc9b81f6b273970ac8ba2a0c54"; + url = "https://registry.npmjs.org/azure-arm-dns/-/azure-arm-dns-0.11.1.tgz"; + sha1 = "835f08aef8a5d87d3072d5dabc34110cb5e62df2"; }; }; - "azure-arm-website-0.10.0" = { + "azure-arm-website-0.11.0" = { name = "azure-arm-website"; packageName = "azure-arm-website"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.10.0.tgz"; - sha1 = "610400ecb801bff16b7e2d7c1c6d1fe99c4f9ec9"; + url = "https://registry.npmjs.org/azure-arm-website/-/azure-arm-website-0.11.0.tgz"; + sha1 = "f98cd857d183866e74393f2f1d138002e6cccc79"; }; }; "azure-arm-rediscache-0.2.1" = { @@ -553,13 +562,13 @@ let sha1 = "76604b8d2ad7b881f6ff53a37e37365481ca8c40"; }; }; - "azure-graph-1.0.1" = { + "azure-graph-1.1.1" = { name = "azure-graph"; packageName = "azure-graph"; - version = "1.0.1"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.0.1.tgz"; - sha1 = "a2eda330ccd336832b190da0caba9735a73aee97"; + url = "https://registry.npmjs.org/azure-graph/-/azure-graph-1.1.1.tgz"; + sha1 = "5277e750d223aec0fd2559e49149777fe1371708"; }; }; "azure-gallery-2.0.0-pre.18" = { @@ -571,13 +580,13 @@ let sha1 = "3cd4c5e4e0091551d6a5ee757af2354c8a36b3e6"; }; }; - "azure-keyvault-0.10.1" = { + "azure-keyvault-0.10.2" = { name = "azure-keyvault"; packageName = "azure-keyvault"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.1.tgz"; - sha1 = "b3899d04b5115a22b794a9e83f89201a66c83855"; + url = "https://registry.npmjs.org/azure-keyvault/-/azure-keyvault-0.10.2.tgz"; + sha1 = "f00b091362e0e2076eaf9bd0b1687f793bb701a5"; }; }; "azure-asm-compute-0.17.0" = { @@ -625,13 +634,13 @@ let sha1 = "2b7d493306747b43e4e2dcad44d65328e6c3cf57"; }; }; - "azure-asm-network-0.12.0" = { + "azure-asm-network-0.13.0" = { name = "azure-asm-network"; packageName = "azure-asm-network"; - version = "0.12.0"; + version = "0.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.12.0.tgz"; - sha1 = "f407498dcf4a41e2a674fba23597157370a6ac05"; + url = "https://registry.npmjs.org/azure-asm-network/-/azure-asm-network-0.13.0.tgz"; + sha1 = "8d5d46b66b16c36dfc067f7c7c87bd2f42049c54"; }; }; "azure-arm-resource-1.4.5-preview" = { @@ -697,13 +706,13 @@ let sha1 = "bfd0c01a8ae6afd90eaa13360976242e28459650"; }; }; - "azure-storage-1.1.0" = { + "azure-storage-1.3.0" = { name = "azure-storage"; packageName = "azure-storage"; - version = "1.1.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.1.0.tgz"; - sha1 = "45de61074dbddf44f9245ad287c929541ae971ab"; + url = "https://registry.npmjs.org/azure-storage/-/azure-storage-1.3.0.tgz"; + sha1 = "314c66699211cd065bb4f7ec98f27b2e533b48ce"; }; }; "azure-arm-batch-0.2.0" = { @@ -715,13 +724,22 @@ let sha1 = "4093c10422565b9b2564db449b5b2d6bb3e2646d"; }; }; - "azure-batch-0.4.0" = { + "azure-batch-0.5.2" = { name = "azure-batch"; packageName = "azure-batch"; - version = "0.4.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.4.0.tgz"; - sha1 = "065e3fb7ab3e7bb33a254e5cd2d15a23edc7cf40"; + url = "https://registry.npmjs.org/azure-batch/-/azure-batch-0.5.2.tgz"; + sha1 = "21b23f9db7f42734e97f35bd703818a1cf2492eb"; + }; + }; + "azure-servicefabric-0.1.4" = { + name = "azure-servicefabric"; + packageName = "azure-servicefabric"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-servicefabric/-/azure-servicefabric-0.1.4.tgz"; + sha1 = "7f8d7e7949202e599638fd8abba8f1dc1a89f79e"; }; }; "applicationinsights-0.15.12" = { @@ -823,6 +841,15 @@ let sha1 = "5737045085f55eb455c68b1ff4ebc01bd50e8830"; }; }; + "jsonminify-0.4.1" = { + name = "jsonminify"; + packageName = "jsonminify"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonminify/-/jsonminify-0.4.1.tgz"; + sha1 = "805dafbb39395188cee9ab582c81ef959d7e710c"; + }; + }; "jsrsasign-4.8.2" = { name = "jsrsasign"; packageName = "jsrsasign"; @@ -841,13 +868,13 @@ let sha1 = "412beb19e5cf7937b461bb7897fd98c2b95d4e10"; }; }; - "moment-2.14.1" = { + "moment-2.15.1" = { name = "moment"; packageName = "moment"; - version = "2.14.1"; + version = "2.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; - sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + url = "https://registry.npmjs.org/moment/-/moment-2.15.1.tgz"; + sha1 = "e979c2a29e22888e60f396f2220a6118f85cd94c"; }; }; "ms-rest-1.15.0" = { @@ -931,13 +958,13 @@ let sha1 = "125820e34bc842d2f2aaafafe4c2916ee32c157c"; }; }; - "request-2.69.0" = { + "request-2.74.0" = { name = "request"; packageName = "request"; - version = "2.69.0"; + version = "2.74.0"; src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz"; - sha1 = "cf91d2e000752b1217155c005241911991a2346a"; + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; }; }; "ssh-key-to-pem-0.11.0" = { @@ -1003,6 +1030,15 @@ let sha1 = "61a6a32010622afa07963bf325203cf12239d604"; }; }; + "user-home-2.0.0" = { + name = "user-home"; + packageName = "user-home"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; + sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + }; + }; "validator-5.2.0" = { name = "validator"; packageName = "validator"; @@ -1138,13 +1174,13 @@ let sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1"; }; }; - "inherits-2.0.1" = { + "inherits-2.0.3" = { name = "inherits"; packageName = "inherits"; - version = "2.0.1"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; }; }; "typedarray-0.0.6" = { @@ -1264,22 +1300,22 @@ let sha1 = "3d4114218877537494f97f77f9785fab810fa4ac"; }; }; - "is-finite-1.0.1" = { + "is-finite-1.0.2" = { name = "is-finite"; packageName = "is-finite"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; + sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; }; }; - "number-is-nan-1.0.0" = { + "number-is-nan-1.0.1" = { name = "number-is-nan"; packageName = "number-is-nan"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; + sha1 = "097b602b53422a522c1afb8790318336941a011d"; }; }; "buffer-equal-constant-time-1.0.1" = { @@ -1327,15 +1363,6 @@ let sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9"; }; }; - "request-2.72.0" = { - name = "request"; - packageName = "request"; - version = "2.72.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; - sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; - }; - }; "validator-3.22.2" = { name = "validator"; packageName = "validator"; @@ -1372,6 +1399,438 @@ let sha1 = "735ffaa39a1cff8ffb9598f0223abdb03a9fb2ea"; }; }; + "moment-2.6.0" = { + name = "moment"; + packageName = "moment"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; + sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; + }; + }; + "moment-2.14.1" = { + name = "moment"; + packageName = "moment"; + version = "2.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.14.1.tgz"; + sha1 = "b35b27c47e57ed2ddc70053d6b07becdb291741c"; + }; + }; + "extend-1.2.1" = { + name = "extend"; + packageName = "extend"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; + sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; + }; + }; + "browserify-mime-1.2.9" = { + name = "browserify-mime"; + packageName = "browserify-mime"; + version = "1.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; + sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; + }; + }; + "json-edm-parser-0.1.2" = { + name = "json-edm-parser"; + packageName = "json-edm-parser"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; + sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; + }; + }; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + }; + "jsonparse-1.2.0" = { + name = "jsonparse"; + packageName = "jsonparse"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; + sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; + }; + }; + "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"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "stack-trace-0.0.9" = { + name = "stack-trace"; + packageName = "stack-trace"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; + sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; + }; + }; + "keypress-0.1.0" = { + name = "keypress"; + packageName = "keypress"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; + sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; + }; + }; + "from-0.1.3" = { + name = "from"; + packageName = "from"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; + sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; + }; + }; + "map-stream-0.1.0" = { + name = "map-stream"; + packageName = "map-stream"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; + sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; + }; + }; + "pause-stream-0.0.11" = { + name = "pause-stream"; + packageName = "pause-stream"; + version = "0.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; + sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; + }; + }; + "split-0.2.10" = { + name = "split"; + packageName = "split"; + version = "0.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; + sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; + }; + }; + "stream-combiner-0.0.4" = { + name = "stream-combiner"; + packageName = "stream-combiner"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; + sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; + }; + }; + "commander-1.1.1" = { + name = "commander"; + packageName = "commander"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; + sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; + }; + }; + "streamline-0.4.11" = { + name = "streamline"; + packageName = "streamline"; + version = "0.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz"; + sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; + }; + }; + "async-0.2.7" = { + name = "async"; + packageName = "async"; + version = "0.2.7"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; + sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; + }; + }; + "uuid-2.0.1" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; + sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + }; + }; + "azure-arm-resource-1.4.4-preview" = { + name = "azure-arm-resource"; + packageName = "azure-arm-resource"; + version = "1.4.4-preview"; + src = fetchurl { + url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz"; + sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2"; + }; + }; + "debug-0.7.4" = { + name = "debug"; + packageName = "debug"; + version = "0.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; + sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; + }; + }; + "q-0.9.7" = { + name = "q"; + packageName = "q"; + version = "0.9.7"; + src = fetchurl { + url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; + sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; + }; + }; + "pkginfo-0.4.0" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz"; + sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65"; + }; + }; + "revalidator-0.1.8" = { + name = "revalidator"; + packageName = "revalidator"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; + sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + }; + }; + "utile-0.2.1" = { + name = "utile"; + packageName = "utile"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; + sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; + }; + }; + "winston-0.8.3" = { + name = "winston"; + packageName = "winston"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; + sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; + }; + }; + "deep-equal-1.0.1" = { + name = "deep-equal"; + packageName = "deep-equal"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; + sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; + }; + }; + "i-0.3.5" = { + name = "i"; + packageName = "i"; + version = "0.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz"; + sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "ncp-0.4.2" = { + name = "ncp"; + packageName = "ncp"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; + sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; + }; + }; + "rimraf-2.5.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; + sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "glob-7.1.0" = { + name = "glob"; + packageName = "glob"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.1.0.tgz"; + sha1 = "36add856d746d0d99e4cc2797bba1ae2c67272fd"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "inflight-1.0.5" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; + sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; + }; + }; + "minimatch-3.0.3" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "brace-expansion-1.1.6" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; + sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + }; + }; + "balanced-match-0.4.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; + sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "colors-0.6.2" = { + name = "colors"; + packageName = "colors"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; + sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; + }; + }; + "cycle-1.0.3" = { + name = "cycle"; + packageName = "cycle"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; + sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "pkginfo-0.3.1" = { + name = "pkginfo"; + packageName = "pkginfo"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; + sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + }; + }; "aws-sign2-0.6.0" = { name = "aws-sign2"; packageName = "aws-sign2"; @@ -1480,15 +1939,6 @@ let sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; }; }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; "json-stringify-safe-5.0.1" = { name = "json-stringify-safe"; packageName = "json-stringify-safe"; @@ -1498,13 +1948,13 @@ let sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; }; }; - "mime-types-2.1.11" = { + "mime-types-2.1.12" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.11"; + version = "2.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"; - sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c"; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"; + sha1 = "152ba256777020dd4663f54c2e7bc26381e71729"; }; }; "oauth-sign-0.8.2" = { @@ -1516,13 +1966,13 @@ let sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; }; }; - "qs-6.1.0" = { + "qs-6.2.1" = { name = "qs"; packageName = "qs"; - version = "6.1.0"; + version = "6.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; - sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + url = "https://registry.npmjs.org/qs/-/qs-6.2.1.tgz"; + sha1 = "ce03c5ff0935bc1d9d69a9f14cbd18e568d67625"; }; }; "stringstream-0.0.5" = { @@ -1534,13 +1984,13 @@ let sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; }; }; - "tough-cookie-2.2.2" = { + "tough-cookie-2.3.1" = { name = "tough-cookie"; packageName = "tough-cookie"; - version = "2.2.2"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; - sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; }; }; "tunnel-agent-0.4.3" = { @@ -1552,42 +2002,6 @@ let sha1 = "6373db76909fe570e08d73583365ed828a74eeeb"; }; }; - "readable-stream-2.0.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; - }; - }; - "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"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; "delayed-stream-1.0.0" = { name = "delayed-stream"; packageName = "delayed-stream"; @@ -1606,13 +2020,13 @@ let sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; }; }; - "lodash-4.15.0" = { + "lodash-4.16.2" = { name = "lodash"; packageName = "lodash"; - version = "4.15.0"; + version = "4.16.2"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz"; - sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"; + url = "https://registry.npmjs.org/lodash/-/lodash-4.16.2.tgz"; + sha1 = "3e626db827048a699281a8a125226326cfc0e652"; }; }; "chalk-1.1.3" = { @@ -1633,13 +2047,13 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "is-my-json-valid-2.13.1" = { + "is-my-json-valid-2.14.0" = { name = "is-my-json-valid"; packageName = "is-my-json-valid"; - version = "2.13.1"; + version = "2.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; - sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.14.0.tgz"; + sha1 = "47bf808609b2df5d48c969c74becd09fbca02725"; }; }; "pinkie-promise-2.0.1" = { @@ -1813,22 +2227,22 @@ let sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; }; }; - "jsprim-1.3.0" = { + "jsprim-1.3.1" = { name = "jsprim"; packageName = "jsprim"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.0.tgz"; - sha1 = "ce2e1bef835204b4f3099928c602f8b6ae615650"; + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; }; }; - "sshpk-1.10.0" = { + "sshpk-1.10.1" = { name = "sshpk"; packageName = "sshpk"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz"; - sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa"; + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.1.tgz"; + sha1 = "30e1a5d329244974a1af61511339d595af6638b0"; }; }; "extsprintf-1.0.2" = { @@ -1840,13 +2254,13 @@ let sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; }; }; - "json-schema-0.2.2" = { + "json-schema-0.2.3" = { name = "json-schema"; packageName = "json-schema"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; - sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; "verror-1.3.6" = { @@ -1903,13 +2317,13 @@ let sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; }; }; - "tweetnacl-0.13.3" = { + "tweetnacl-0.14.3" = { name = "tweetnacl"; packageName = "tweetnacl"; - version = "0.13.3"; + version = "0.14.3"; src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; - sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; + sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; }; }; "jodid25519-1.0.2" = { @@ -1939,193 +2353,13 @@ let sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; }; }; - "tweetnacl-0.14.3" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; - sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; - }; - }; - "mime-db-1.23.0" = { + "mime-db-1.24.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"; - sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; - }; - }; - "azure-common-0.9.12" = { - name = "azure-common"; - packageName = "azure-common"; - version = "0.9.12"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-common/-/azure-common-0.9.12.tgz"; - sha1 = "8ca8167c2dbaa43b61e3caa9c7d98e78908749f6"; - }; - }; - "moment-2.6.0" = { - name = "moment"; - packageName = "moment"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.6.0.tgz"; - sha1 = "0765b72b841dd213fa91914c0f6765122719f061"; - }; - }; - "request-2.45.0" = { - name = "request"; - packageName = "request"; - version = "2.45.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.45.0.tgz"; - sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c"; - }; - }; - "validator-3.1.0" = { - name = "validator"; - packageName = "validator"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-3.1.0.tgz"; - sha1 = "2ea1ff7e92254d69367f385f015299e5ead8755b"; - }; - }; - "bl-0.9.5" = { - name = "bl"; - packageName = "bl"; - version = "0.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; - sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; - }; - }; - "caseless-0.6.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; - sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; - }; - }; - "forever-agent-0.5.2" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; - sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; - }; - }; - "qs-1.2.2" = { - name = "qs"; - packageName = "qs"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz"; - sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88"; - }; - }; - "mime-types-1.0.2" = { - name = "mime-types"; - packageName = "mime-types"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; - sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; - }; - }; - "form-data-0.1.4" = { - name = "form-data"; - packageName = "form-data"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; - sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; - }; - }; - "http-signature-0.10.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "0.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; - sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; - }; - }; - "oauth-sign-0.4.0" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; - sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; - }; - }; - "hawk-1.1.1" = { - name = "hawk"; - packageName = "hawk"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; - sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; - }; - }; - "aws-sign2-0.5.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; - sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; - }; - }; - "combined-stream-0.0.7" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; - sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; - }; - }; - "mime-1.2.11" = { - name = "mime"; - packageName = "mime"; - version = "1.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; - sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "delayed-stream-0.0.5" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; - sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; - }; - }; - "assert-plus-0.1.5" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; - sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"; + sha1 = "e2d13f939f0016c6e4e9ad25a8652f126c467f0c"; }; }; "asn1-0.1.11" = { @@ -2137,465 +2371,6 @@ let sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7"; }; }; - "ctype-0.5.3" = { - name = "ctype"; - packageName = "ctype"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; - sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; - }; - }; - "hoek-0.9.1" = { - name = "hoek"; - packageName = "hoek"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; - sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; - }; - }; - "boom-0.4.2" = { - name = "boom"; - packageName = "boom"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; - sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; - }; - }; - "cryptiles-0.2.2" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; - sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; - }; - }; - "sntp-0.2.4" = { - name = "sntp"; - packageName = "sntp"; - version = "0.2.4"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; - sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; - }; - }; - "extend-1.2.1" = { - name = "extend"; - packageName = "extend"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz"; - sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c"; - }; - }; - "browserify-mime-1.2.9" = { - name = "browserify-mime"; - packageName = "browserify-mime"; - version = "1.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz"; - sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f"; - }; - }; - "json-edm-parser-0.1.2" = { - name = "json-edm-parser"; - packageName = "json-edm-parser"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/json-edm-parser/-/json-edm-parser-0.1.2.tgz"; - sha1 = "1e60b0fef1bc0af67bc0d146dfdde5486cd615b4"; - }; - }; - "jsonparse-1.2.0" = { - name = "jsonparse"; - packageName = "jsonparse"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz"; - sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd"; - }; - }; - "stack-trace-0.0.9" = { - name = "stack-trace"; - packageName = "stack-trace"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"; - sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; - }; - }; - "keypress-0.1.0" = { - name = "keypress"; - packageName = "keypress"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz"; - sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a"; - }; - }; - "from-0.1.3" = { - name = "from"; - packageName = "from"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz"; - sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc"; - }; - }; - "map-stream-0.1.0" = { - name = "map-stream"; - packageName = "map-stream"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz"; - sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194"; - }; - }; - "pause-stream-0.0.11" = { - name = "pause-stream"; - packageName = "pause-stream"; - version = "0.0.11"; - src = fetchurl { - url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz"; - sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445"; - }; - }; - "split-0.2.10" = { - name = "split"; - packageName = "split"; - version = "0.2.10"; - src = fetchurl { - url = "https://registry.npmjs.org/split/-/split-0.2.10.tgz"; - sha1 = "67097c601d697ce1368f418f06cd201cf0521a57"; - }; - }; - "stream-combiner-0.0.4" = { - name = "stream-combiner"; - packageName = "stream-combiner"; - version = "0.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz"; - sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14"; - }; - }; - "commander-1.1.1" = { - name = "commander"; - packageName = "commander"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-1.1.1.tgz"; - sha1 = "50d1651868ae60eccff0a2d9f34595376bc6b041"; - }; - }; - "streamline-0.4.11" = { - name = "streamline"; - packageName = "streamline"; - version = "0.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/streamline/-/streamline-0.4.11.tgz"; - sha1 = "0e3c4f24a3f052b231b12d5049085a0a099be782"; - }; - }; - "request-2.74.0" = { - name = "request"; - packageName = "request"; - version = "2.74.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; - sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; - }; - }; - "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"; - }; - }; - "tough-cookie-2.3.1" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; - sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; - }; - }; - "async-0.2.7" = { - name = "async"; - packageName = "async"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.2.7.tgz"; - sha1 = "44c5ee151aece6c4bf5364cfc7c28fe4e58f18df"; - }; - }; - "uuid-2.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; - sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; - }; - }; - "azure-arm-resource-1.4.4-preview" = { - name = "azure-arm-resource"; - packageName = "azure-arm-resource"; - version = "1.4.4-preview"; - src = fetchurl { - url = "https://registry.npmjs.org/azure-arm-resource/-/azure-arm-resource-1.4.4-preview.tgz"; - sha1 = "557696d45a89d8320c1aa0916297024b71b73fe2"; - }; - }; - "debug-0.7.4" = { - name = "debug"; - packageName = "debug"; - version = "0.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz"; - sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39"; - }; - }; - "q-0.9.7" = { - name = "q"; - packageName = "q"; - version = "0.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz"; - sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75"; - }; - }; - "pkginfo-0.4.0" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz"; - sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65"; - }; - }; - "revalidator-0.1.8" = { - name = "revalidator"; - packageName = "revalidator"; - version = "0.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; - sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; - }; - }; - "utile-0.2.1" = { - name = "utile"; - packageName = "utile"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz"; - sha1 = "930c88e99098d6220834c356cbd9a770522d90d7"; - }; - }; - "winston-0.8.3" = { - name = "winston"; - packageName = "winston"; - version = "0.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz"; - sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; - }; - }; - "deep-equal-1.0.1" = { - name = "deep-equal"; - packageName = "deep-equal"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz"; - sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5"; - }; - }; - "i-0.3.5" = { - name = "i"; - packageName = "i"; - version = "0.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/i/-/i-0.3.5.tgz"; - sha1 = "1d2b854158ec8169113c6cb7f6b6801e99e211d5"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "ncp-0.4.2" = { - name = "ncp"; - packageName = "ncp"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz"; - sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574"; - }; - }; - "rimraf-2.5.4" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; - sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "glob-7.0.6" = { - name = "glob"; - packageName = "glob"; - version = "7.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; - sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "inflight-1.0.5" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; - sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; - }; - }; - "minimatch-3.0.3" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; - }; - }; - "once-1.3.3" = { - name = "once"; - packageName = "once"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; - sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; - }; - }; - "path-is-absolute-1.0.0" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; - sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "brace-expansion-1.1.6" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; - }; - }; - "balanced-match-0.4.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "colors-0.6.2" = { - name = "colors"; - packageName = "colors"; - version = "0.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz"; - sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc"; - }; - }; - "cycle-1.0.3" = { - name = "cycle"; - packageName = "cycle"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; - }; - }; - "pkginfo-0.3.1" = { - name = "pkginfo"; - packageName = "pkginfo"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; - }; - }; - "bl-1.0.3" = { - name = "bl"; - packageName = "bl"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; - sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; - }; - }; - "qs-6.0.2" = { - name = "qs"; - packageName = "qs"; - version = "6.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz"; - sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd"; - }; - }; "ctype-0.5.2" = { name = "ctype"; packageName = "ctype"; @@ -2668,13 +2443,13 @@ let sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf"; }; }; - "asap-2.0.4" = { + "asap-2.0.5" = { name = "asap"; packageName = "asap"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-2.0.4.tgz"; - sha1 = "b391bf7f6bfbc65706022fec8f49c4b07fecf589"; + url = "https://registry.npmjs.org/asap/-/asap-2.0.5.tgz"; + sha1 = "522765b50c3510490e52d7dcfe085ef9ba96958f"; }; }; "async-1.0.0" = { @@ -3010,6 +2785,15 @@ let sha1 = "d5c752825e5367e786f78e18e445ea223a155952"; }; }; + "once-1.3.3" = { + name = "once"; + packageName = "once"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz"; + sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20"; + }; + }; "buffer-shims-1.0.0" = { name = "buffer-shims"; packageName = "buffer-shims"; @@ -3109,22 +2893,22 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "signal-exit-3.0.0" = { + "signal-exit-3.0.1" = { name = "signal-exit"; packageName = "signal-exit"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.0.tgz"; - sha1 = "3c0543b65d7b4fbc60b6cd94593d9bf436739be8"; + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; }; }; - "array-find-index-1.0.1" = { + "array-find-index-1.0.2" = { name = "array-find-index"; packageName = "array-find-index"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; - sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; + sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; "hosted-git-info-2.1.5" = { @@ -3235,13 +3019,13 @@ let sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; }; }; - "graceful-fs-4.1.6" = { + "graceful-fs-4.1.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.1.6"; + version = "4.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; - sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.9.tgz"; + sha1 = "baacba37d19d11f9d146d3578bc99958c3787e29"; }; }; "parse-json-2.2.0" = { @@ -3352,13 +3136,13 @@ let sha1 = "e9ff841418a6b2ec7a495e939984f78f163e6e31"; }; }; - "jsonfile-2.3.1" = { + "jsonfile-2.4.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz"; - sha1 = "28bcb29c596b5b7aafd34e662a329ba62cd842fc"; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; }; }; "klaw-1.3.0" = { @@ -3406,13 +3190,13 @@ let sha1 = "e439be2aaee327321952730f99a8929e4fc50582"; }; }; - "JSONStream-1.1.4" = { + "JSONStream-1.2.1" = { name = "JSONStream"; packageName = "JSONStream"; - version = "1.1.4"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; - sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.2.1.tgz"; + sha1 = "32aa5790e799481083b49b4b7fa94e23bae69bf9"; }; }; "assert-1.3.0" = { @@ -3694,13 +3478,13 @@ let sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"; }; }; - "stream-http-2.3.1" = { + "stream-http-2.4.0" = { name = "stream-http"; packageName = "stream-http"; - version = "2.3.1"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/stream-http/-/stream-http-2.3.1.tgz"; - sha1 = "7e1dc87102c3e31b32e660f04ca31f23ddbd1d52"; + url = "https://registry.npmjs.org/stream-http/-/stream-http-2.4.0.tgz"; + sha1 = "9599aa8e263667ce4190e0dc04a1d065d3595a7e"; }; }; "subarg-1.0.0" = { @@ -3847,13 +3631,13 @@ let sha1 = "f3f7522f4ef782348da8161bad9ecfd51bf83a75"; }; }; - "base64-js-1.1.2" = { + "base64-js-1.2.0" = { name = "base64-js"; packageName = "base64-js"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; - sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.2.0.tgz"; + sha1 = "a39992d723584811982be5e290bb6a53d86700f1"; }; }; "ieee754-1.1.6" = { @@ -3928,13 +3712,13 @@ let sha1 = "b5835739270cfe26acf632099fded2a07f209e5e"; }; }; - "pbkdf2-3.0.4" = { + "pbkdf2-3.0.8" = { name = "pbkdf2"; packageName = "pbkdf2"; - version = "3.0.4"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz"; - sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc"; + url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.8.tgz"; + sha1 = "2f8abf16ebecc82277945d748aba1d78761f61e2"; }; }; "public-encrypt-4.0.0" = { @@ -3991,13 +3775,13 @@ let sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9"; }; }; - "cipher-base-1.0.2" = { + "cipher-base-1.0.3" = { name = "cipher-base"; packageName = "cipher-base"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz"; - sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f"; + url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.3.tgz"; + sha1 = "eeabf194419ce900da3018c207d212f2a6df0a07"; }; }; "des.js-1.0.0" = { @@ -4036,13 +3820,13 @@ let sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524"; }; }; - "elliptic-6.3.1" = { + "elliptic-6.3.2" = { name = "elliptic"; packageName = "elliptic"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.1.tgz"; - sha1 = "17781f2109ab0ec686b146bdcff5d2e8c6aeceda"; + url = "https://registry.npmjs.org/elliptic/-/elliptic-6.3.2.tgz"; + sha1 = "e4c81e0829cf0a65ab70e998b8232723b5c1bc48"; }; }; "parse-asn1-5.0.0" = { @@ -4054,13 +3838,13 @@ let sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23"; }; }; - "brorand-1.0.5" = { + "brorand-1.0.6" = { name = "brorand"; packageName = "brorand"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz"; - sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04"; + url = "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"; + sha1 = "4028706b915f91f7b349a2e0bf3c376039d216e5"; }; }; "hash.js-1.0.3" = { @@ -4072,13 +3856,13 @@ let sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573"; }; }; - "asn1.js-4.8.0" = { + "asn1.js-4.8.1" = { name = "asn1.js"; packageName = "asn1.js"; - version = "4.8.0"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.0.tgz"; - sha1 = "e0e04e9923319163be46aed9e5378973b161ef13"; + url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.8.1.tgz"; + sha1 = "3949b7f5fd1e8bedc13be3abebf477f93490c810"; }; }; "ripemd160-1.0.1" = { @@ -4279,6 +4063,15 @@ let sha1 = "b209849203bb25df820da756e747005878521620"; }; }; + "inherits-2.0.1" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; + sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + }; + }; "indexof-0.0.1" = { name = "indexof"; packageName = "indexof"; @@ -4810,6 +4603,15 @@ let sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963"; }; }; + "base64-js-1.1.2" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz"; + sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8"; + }; + }; "xmlbuilder-8.2.2" = { name = "xmlbuilder"; packageName = "xmlbuilder"; @@ -4918,13 +4720,13 @@ let sha1 = "106df57e0e509bafa6756e544d88205e52be33a6"; }; }; - "simple-get-2.2.2" = { + "simple-get-2.2.3" = { name = "simple-get"; packageName = "simple-get"; - version = "2.2.2"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.2.tgz"; - sha1 = "e4d0ff30af7dddf8ef9b5221c32658e7f1438515"; + url = "https://registry.npmjs.org/simple-get/-/simple-get-2.2.3.tgz"; + sha1 = "cc4b653891601977db17ff3bcbb01474997f9fdb"; }; }; "thirty-two-1.0.2" = { @@ -4963,22 +4765,22 @@ let sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f"; }; }; - "rusha-0.8.3" = { + "rusha-0.8.4" = { name = "rusha"; packageName = "rusha"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/rusha/-/rusha-0.8.3.tgz"; - sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f"; + url = "https://registry.npmjs.org/rusha/-/rusha-0.8.4.tgz"; + sha1 = "006599181ab437e53f3ca6bb5340f96c7a533c7b"; }; }; - "unzip-response-1.0.0" = { + "unzip-response-1.0.1" = { name = "unzip-response"; packageName = "unzip-response"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.0.tgz"; - sha1 = "bfda54eeec658f00c2df4d4494b9dca0ca00f3e4"; + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.1.tgz"; + sha1 = "4a73959f2989470fa503791cefb54e1dbbc68412"; }; }; "once-1.2.0" = { @@ -5287,13 +5089,13 @@ let sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7"; }; }; - "buffer-equals-1.0.3" = { + "buffer-equals-1.0.4" = { name = "buffer-equals"; packageName = "buffer-equals"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.3.tgz"; - sha1 = "9e9b8c160a5ceaf68f12ee5a8d2f4ba91c5453e0"; + url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.4.tgz"; + sha1 = "0353b54fd07fd9564170671ae6f66b9cf10d27f5"; }; }; "k-bucket-0.6.0" = { @@ -5566,6 +5368,15 @@ let sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed"; }; }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; "hawk-0.10.2" = { name = "hawk"; packageName = "hawk"; @@ -5638,6 +5449,24 @@ let sha1 = "31b1ad058567651c526921506b9a8793911a0384"; }; }; + "combined-stream-0.0.7" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "0.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz"; + sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f"; + }; + }; + "delayed-stream-0.0.5" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz"; + sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f"; + }; + }; "hoek-0.7.6" = { name = "hoek"; packageName = "hoek"; @@ -5881,13 +5710,13 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; - "npm-2.15.10" = { + "npm-2.15.11" = { name = "npm"; packageName = "npm"; - version = "2.15.10"; + version = "2.15.11"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-2.15.10.tgz"; - sha1 = "de5a3dab6dcc0494784c8b8e37bf52ee851f842c"; + url = "https://registry.npmjs.org/npm/-/npm-2.15.11.tgz"; + sha1 = "350588fba9cd8d384cf9a6e8dc0fef0f94992b7c"; }; }; "opener-1.4.1" = { @@ -6979,13 +6808,22 @@ let sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa"; }; }; - "lockfile-1.0.1" = { + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; + "lockfile-1.0.2" = { name = "lockfile"; packageName = "lockfile"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz"; - sha1 = "9d353ecfe3f54d150bb57f89d51746935a39c4f5"; + url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.2.tgz"; + sha1 = "97e1990174f696cbe0a3acd58a43b84aa30c7c83"; }; }; "lru-cache-4.0.1" = { @@ -7042,13 +6880,13 @@ let sha1 = "86d9dca985b4c5e5d59772dfd5de6919998a495a"; }; }; - "npm-registry-client-7.1.2" = { + "npm-registry-client-7.2.1" = { name = "npm-registry-client"; packageName = "npm-registry-client"; - version = "7.1.2"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; - sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.2.1.tgz"; + sha1 = "c792266b088cc313f8525e7e35248626c723db75"; }; }; "npm-user-validate-0.1.5" = { @@ -7069,13 +6907,13 @@ let sha1 = "98b52530f2514ca90d09ec5b22c8846722375692"; }; }; - "path-is-inside-1.0.1" = { + "path-is-inside-1.0.2" = { name = "path-is-inside"; packageName = "path-is-inside"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz"; - sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89"; + url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; + sha1 = "365417dede44430d1c11af61027facf074bdfc53"; }; }; "read-installed-4.0.3" = { @@ -7096,13 +6934,13 @@ let sha1 = "d0def882952b8de3f67eba5e91199661271f41f4"; }; }; - "retry-0.9.0" = { + "retry-0.10.0" = { name = "retry"; packageName = "retry"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; - sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + url = "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz"; + sha1 = "649e15ca408422d98318161935e7f7d652d435dd"; }; }; "sha-2.0.1" = { @@ -7123,13 +6961,13 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "sorted-object-2.0.0" = { + "sorted-object-2.0.1" = { name = "sorted-object"; packageName = "sorted-object"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.0.tgz"; - sha1 = "1cfea981609047d8043807a490a9d99b317faf7f"; + url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.1.tgz"; + sha1 = "7d631f4bd3a798a24af1dffcfbfe83337a5df5fc"; }; }; "tar-2.2.1" = { @@ -7312,13 +7150,31 @@ let sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac"; }; }; - "retry-0.8.0" = { - name = "retry"; - packageName = "retry"; - version = "0.8.0"; + "request-2.75.0" = { + name = "request"; + packageName = "request"; + version = "2.75.0"; src = fetchurl { - url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; - sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; + url = "https://registry.npmjs.org/request/-/request-2.75.0.tgz"; + sha1 = "d2b8268a286da13eaa5d01adf5d18cc90f657d93"; + }; + }; + "form-data-2.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz"; + sha1 = "6f0aebadcc5da16c13e1ecc11137d85f9b883b25"; + }; + }; + "asynckit-0.4.0" = { + name = "asynckit"; + packageName = "asynckit"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; + sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; "are-we-there-yet-1.1.2" = { @@ -7420,6 +7276,51 @@ let sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3"; }; }; + "bl-0.9.5" = { + name = "bl"; + packageName = "bl"; + version = "0.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz"; + sha1 = "c06b797af085ea00bc527afc8efcf11de2232054"; + }; + }; + "caseless-0.6.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz"; + sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4"; + }; + }; + "forever-agent-0.5.2" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz"; + sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130"; + }; + }; + "form-data-0.1.4" = { + name = "form-data"; + packageName = "form-data"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz"; + sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12"; + }; + }; + "mime-types-1.0.2" = { + name = "mime-types"; + packageName = "mime-types"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz"; + sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce"; + }; + }; "qs-2.3.3" = { name = "qs"; packageName = "qs"; @@ -7429,6 +7330,105 @@ let sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404"; }; }; + "http-signature-0.10.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "0.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"; + sha1 = "4fbdac132559aa8323121e540779c0a012b27e66"; + }; + }; + "oauth-sign-0.4.0" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz"; + sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69"; + }; + }; + "hawk-1.1.1" = { + name = "hawk"; + packageName = "hawk"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz"; + sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9"; + }; + }; + "aws-sign2-0.5.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz"; + sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "assert-plus-0.1.5" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz"; + sha1 = "ee74009413002d84cec7219c6ac811812e723160"; + }; + }; + "ctype-0.5.3" = { + name = "ctype"; + packageName = "ctype"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz"; + sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f"; + }; + }; + "hoek-0.9.1" = { + name = "hoek"; + packageName = "hoek"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz"; + sha1 = "3d322462badf07716ea7eb85baf88079cddce505"; + }; + }; + "boom-0.4.2" = { + name = "boom"; + packageName = "boom"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz"; + sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b"; + }; + }; + "cryptiles-0.2.2" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz"; + sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c"; + }; + }; + "sntp-0.2.4" = { + name = "sntp"; + packageName = "sntp"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz"; + sha1 = "fb885f18b0f3aad189f824862536bceeec750900"; + }; + }; "pegjs-0.9.0" = { name = "pegjs"; packageName = "pegjs"; @@ -7501,13 +7501,13 @@ let sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; }; }; - "big-integer-1.6.15" = { + "big-integer-1.6.16" = { name = "big-integer"; packageName = "big-integer"; - version = "1.6.15"; + version = "1.6.16"; src = fetchurl { - url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz"; - sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e"; + url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.16.tgz"; + sha1 = "0ca30b58013db46b10084a09242ca1d8954724cc"; }; }; "configstore-1.4.0" = { @@ -7555,13 +7555,13 @@ let sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac"; }; }; - "uuid-2.0.2" = { + "uuid-2.0.3" = { name = "uuid"; packageName = "uuid"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"; - sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726"; + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; + sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; }; }; "xdg-basedir-2.0.0" = { @@ -7753,13 +7753,13 @@ let sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; }; - "code-point-at-1.0.0" = { + "code-point-at-1.0.1" = { name = "code-point-at"; packageName = "code-point-at"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; - sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6"; + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.1.tgz"; + sha1 = "1104cd34f9b5b45d3eba88f1babc1924e1ce35fb"; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -7807,6 +7807,15 @@ let sha1 = "5fa55e02be7ca934edfc12665632e849b72e5209"; }; }; + "parserlib-1.0.0" = { + name = "parserlib"; + packageName = "parserlib"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parserlib/-/parserlib-1.0.0.tgz"; + sha1 = "88340e7e8d95bac9e09236742eef53bec1e4b30f"; + }; + }; "bluebird-2.9.9" = { name = "bluebird"; packageName = "bluebird"; @@ -8459,13 +8468,13 @@ let sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; }; }; - "cors-2.8.0" = { + "cors-2.8.1" = { name = "cors"; packageName = "cors"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/cors/-/cors-2.8.0.tgz"; - sha1 = "6262888a49f9ce4c5d189d29e1d5710ab73e6a85"; + url = "https://registry.npmjs.org/cors/-/cors-2.8.1.tgz"; + sha1 = "6181aa56abb45a2825be3304703747ae4e9d2383"; }; }; "docker-parse-image-3.0.1" = { @@ -8513,13 +8522,13 @@ let sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf"; }; }; - "level-sublevel-6.5.4" = { + "level-sublevel-6.6.0" = { name = "level-sublevel"; packageName = "level-sublevel"; - version = "6.5.4"; + version = "6.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.5.4.tgz"; - sha1 = "92e6534e7ac3fa35c8bdb121b8a8094a8d1c0826"; + url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.0.tgz"; + sha1 = "675f2f6a3d437b10700e840069bcb331a5c8362f"; }; }; "leveldown-0.10.6" = { @@ -8855,13 +8864,130 @@ let sha1 = "80ab4e919749351263ef14500d684e57c4202840"; }; }; - "doctrine-1.3.0" = { + "JSONStream-1.1.4" = { + name = "JSONStream"; + packageName = "JSONStream"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.4.tgz"; + sha1 = "be11a495938e882d277773d11986f3974a8ba37a"; + }; + }; + "got-6.5.0" = { + name = "got"; + packageName = "got"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/got/-/got-6.5.0.tgz"; + sha1 = "67dcc727db871c7b250320860180e24d2db18a04"; + }; + }; + "lodash.debounce-4.0.8" = { + name = "lodash.debounce"; + packageName = "lodash.debounce"; + version = "4.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"; + sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; + }; + }; + "log-update-1.0.2" = { + name = "log-update"; + packageName = "log-update"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz"; + sha1 = "19929f64c4093d2d2e7075a1dad8af59c296b8d1"; + }; + }; + "mem-0.1.1" = { + name = "mem"; + packageName = "mem"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mem/-/mem-0.1.1.tgz"; + sha1 = "24df988c3102b03c074c1b296239c5b2e6647825"; + }; + }; + "create-error-class-3.0.2" = { + name = "create-error-class"; + packageName = "create-error-class"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz"; + sha1 = "06be7abef947a3f14a30fd610671d401bca8b7b6"; + }; + }; + "duplexer3-0.1.4" = { + name = "duplexer3"; + packageName = "duplexer3"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; + sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + }; + }; + "get-stream-2.3.1" = { + name = "get-stream"; + packageName = "get-stream"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"; + sha1 = "5f38f93f346009666ee0150a054167f91bdd95de"; + }; + }; + "is-retry-allowed-1.1.0" = { + name = "is-retry-allowed"; + packageName = "is-retry-allowed"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz"; + sha1 = "11a060568b67339444033d0125a61a20d564fb34"; + }; + }; + "node-status-codes-2.0.1" = { + name = "node-status-codes"; + packageName = "node-status-codes"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-2.0.1.tgz"; + sha1 = "298067659cb68a2b4670abbefde02a3819981f5b"; + }; + }; + "unzip-response-2.0.1" = { + name = "unzip-response"; + packageName = "unzip-response"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz"; + sha1 = "d2f0f737d16b0615e72a6935ed04214572d56f97"; + }; + }; + "url-parse-lax-1.0.0" = { + name = "url-parse-lax"; + packageName = "url-parse-lax"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz"; + sha1 = "7af8f303645e9bd79a272e7a14ac68bc0609da73"; + }; + }; + "capture-stack-trace-1.0.0" = { + name = "capture-stack-trace"; + packageName = "capture-stack-trace"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz"; + sha1 = "4a6fa07399c26bba47f0b2496b4d0fb408c5550d"; + }; + }; + "doctrine-1.4.0" = { name = "doctrine"; packageName = "doctrine"; - version = "1.3.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/doctrine/-/doctrine-1.3.0.tgz"; - sha1 = "13e75682b55518424276f7c173783456ef913d26"; + url = "https://registry.npmjs.org/doctrine/-/doctrine-1.4.0.tgz"; + sha1 = "e2db32defa752407b935b381e89f3740e469e599"; }; }; "escope-3.6.0" = { @@ -8873,13 +8999,13 @@ let sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3"; }; }; - "espree-3.1.7" = { + "espree-3.3.2" = { name = "espree"; packageName = "espree"; - version = "3.1.7"; + version = "3.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-3.1.7.tgz"; - sha1 = "fd5deec76a97a5120a9cd3a7cb1177a0923b11d2"; + url = "https://registry.npmjs.org/espree/-/espree-3.3.2.tgz"; + sha1 = "dbf3fadeb4ecb4d4778303e50103b3d36c88b89c"; }; }; "estraverse-4.2.0" = { @@ -8909,13 +9035,13 @@ let sha1 = "c392990c3e684783d838b8c84a45d8a048458361"; }; }; - "globals-9.9.0" = { + "globals-9.10.0" = { name = "globals"; packageName = "globals"; - version = "9.9.0"; + version = "9.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-9.9.0.tgz"; - sha1 = "4c5ffc359fb21edc83fedb87b1c0b414dc24d552"; + url = "https://registry.npmjs.org/globals/-/globals-9.10.0.tgz"; + sha1 = "d1047641c49b7b03cacf7e15fb8a42a3d33c88f7"; }; }; "ignore-3.1.5" = { @@ -8981,13 +9107,13 @@ let sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; }; - "optionator-0.8.1" = { + "optionator-0.8.2" = { name = "optionator"; packageName = "optionator"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz"; - sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b"; + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; + sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; }; }; "pluralize-1.2.1" = { @@ -9026,22 +9152,13 @@ let sha1 = "2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"; }; }; - "table-3.7.8" = { + "table-3.8.0" = { name = "table"; packageName = "table"; - version = "3.7.8"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/table/-/table-3.7.8.tgz"; - sha1 = "b424433ef596851922b2fd77224a69a1951618eb"; - }; - }; - "user-home-2.0.0" = { - name = "user-home"; - packageName = "user-home"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz"; - sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; + url = "https://registry.npmjs.org/table/-/table-3.8.0.tgz"; + sha1 = "252166c7f3286684a9d561b0f3a8929caf3a997b"; }; }; "es6-map-0.1.4" = { @@ -9098,13 +9215,13 @@ let sha1 = "f6caca728933a850ef90661d0e17982ba47111a2"; }; }; - "acorn-3.3.0" = { + "acorn-4.0.3" = { name = "acorn"; packageName = "acorn"; - version = "3.3.0"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz"; - sha1 = "45e37fb39e8da3f25baee3ff5369e2bb5f22017a"; + url = "https://registry.npmjs.org/acorn/-/acorn-4.0.3.tgz"; + sha1 = "1a3e850b428e73ba6b09d1cc527f5aaad4d03ef1"; }; }; "acorn-jsx-3.0.1" = { @@ -9116,6 +9233,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.1" = { name = "flat-cache"; packageName = "flat-cache"; @@ -9242,13 +9368,13 @@ let sha1 = "c196b0073e6b1c595d93c9c830855b7acc32a453"; }; }; - "argparse-1.0.7" = { + "argparse-1.0.9" = { name = "argparse"; packageName = "argparse"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz"; - sha1 = "c289506480557810f14a8bc62d7a06f63ed7f951"; + url = "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz"; + sha1 = "73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"; }; }; "esprima-2.7.3" = { @@ -9296,13 +9422,13 @@ let sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; }; }; - "fast-levenshtein-1.1.4" = { + "fast-levenshtein-2.0.5" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; - version = "1.1.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; - sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.5.tgz"; + sha1 = "bd33145744519ab1c36c3ee9f31f08e9079b67f2"; }; }; "caller-path-0.1.0" = { @@ -9332,13 +9458,22 @@ let sha1 = "afab96262910a7f33c19a5775825c69f34e350ca"; }; }; - "bluebird-3.4.6" = { - name = "bluebird"; - packageName = "bluebird"; - version = "3.4.6"; + "ajv-4.7.5" = { + name = "ajv"; + packageName = "ajv"; + version = "4.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; - sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + url = "https://registry.npmjs.org/ajv/-/ajv-4.7.5.tgz"; + sha1 = "f44172aec18514e6ba6350cc5fae0ee9b142e68c"; + }; + }; + "ajv-keywords-1.1.1" = { + name = "ajv-keywords"; + packageName = "ajv-keywords"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.1.1.tgz"; + sha1 = "02550bc605a3e576041565628af972e06c549d50"; }; }; "slice-ansi-0.0.4" = { @@ -9350,22 +9485,13 @@ let sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; }; - "tv4-1.2.7" = { - name = "tv4"; - packageName = "tv4"; - version = "1.2.7"; + "co-4.6.0" = { + name = "co"; + packageName = "co"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz"; - sha1 = "bd29389afc73ade49ae5f48142b5d544bf68d120"; - }; - }; - "xregexp-3.1.1" = { - name = "xregexp"; - packageName = "xregexp"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xregexp/-/xregexp-3.1.1.tgz"; - sha1 = "8ee18d75ef5c7cb3f9967f8d29414a6ca5b1a184"; + url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; + sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; }; }; "glob-3.2.11" = { @@ -9809,13 +9935,13 @@ let sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; }; }; - "for-in-0.1.5" = { + "for-in-0.1.6" = { name = "for-in"; packageName = "for-in"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz"; - sha1 = "007374e2b6d5c67420a1479bdb75a04872b738c4"; + url = "https://registry.npmjs.org/for-in/-/for-in-0.1.6.tgz"; + sha1 = "c9f96e89bfad18a545af5ec3ed352a1d9e5b4dc8"; }; }; "glob-base-0.3.0" = { @@ -10071,13 +10197,13 @@ let sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149"; }; }; - "coffee-script-1.10.0" = { + "coffee-script-1.11.0" = { name = "coffee-script"; packageName = "coffee-script"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz"; + sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d"; }; }; "jade-1.11.0" = { @@ -10116,13 +10242,13 @@ let sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; }; }; - "clean-css-3.4.19" = { + "clean-css-3.4.20" = { name = "clean-css"; packageName = "clean-css"; - version = "3.4.19"; + version = "3.4.20"; src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.19.tgz"; - sha1 = "c32a8a13ca3b824609b14306a5da76d8793c7874"; + url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.20.tgz"; + sha1 = "c0d8963b5448e030f0bcd3ddd0dac4dfe3dea501"; }; }; "commander-2.6.0" = { @@ -11106,85 +11232,58 @@ let sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c"; }; }; - "eventemitter3-1.2.0" = { + "eventemitter3-2.0.2" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "1.2.0"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; - sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz"; + sha1 = "20ce4891909ce9f35b088c94fab40e2c96f473ac"; }; }; - "escodegen-1.8.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.8.1"; + "csslint-0.10.0" = { + name = "csslint"; + packageName = "csslint"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; - sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + url = "https://registry.npmjs.org/csslint/-/csslint-0.10.0.tgz"; + sha1 = "3a6a04e7565c8e9d19beb49767c7ec96e8365805"; }; }; - "handlebars-4.0.5" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.0.5"; + "jshint-2.8.0" = { + name = "jshint"; + packageName = "jshint"; + version = "2.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; - sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + url = "https://registry.npmjs.org/jshint/-/jshint-2.8.0.tgz"; + sha1 = "1d09a3bd913c4cadfa81bf18d582bd85bffe0d44"; }; }; - "supports-color-3.1.2" = { - name = "supports-color"; - packageName = "supports-color"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; - sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; - }; - }; - "estraverse-1.9.3" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; - sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; - }; - }; - "source-map-0.2.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; - sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; - }; - }; - "has-flag-1.0.0" = { - name = "has-flag"; - packageName = "has-flag"; + "xml-1.0.0" = { + name = "xml"; + packageName = "xml"; version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; - sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + url = "https://registry.npmjs.org/xml/-/xml-1.0.0.tgz"; + sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe"; }; }; - "when-3.4.6" = { - name = "when"; - packageName = "when"; - version = "3.4.6"; + "parserlib-0.2.5" = { + name = "parserlib"; + packageName = "parserlib"; + version = "0.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; - sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + url = "https://registry.npmjs.org/parserlib/-/parserlib-0.2.5.tgz"; + sha1 = "85907dd8605aa06abb3dd295d50bb2b8fa4dd117"; }; }; - "cli-1.0.0" = { + "cli-0.6.6" = { name = "cli"; packageName = "cli"; - version = "1.0.0"; + version = "0.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; - sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz"; + sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3"; }; }; "exit-0.1.2" = { @@ -11277,6 +11376,87 @@ let sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; }; }; + "escodegen-1.8.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; + sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + }; + }; + "handlebars-4.0.5" = { + name = "handlebars"; + packageName = "handlebars"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"; + sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7"; + }; + }; + "supports-color-3.1.2" = { + name = "supports-color"; + packageName = "supports-color"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"; + sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5"; + }; + }; + "estraverse-1.9.3" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; + sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + }; + }; + "source-map-0.2.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + }; + }; + "has-flag-1.0.0" = { + name = "has-flag"; + packageName = "has-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz"; + sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa"; + }; + }; + "when-3.4.6" = { + name = "when"; + packageName = "when"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz"; + sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c"; + }; + }; + "cli-1.0.0" = { + name = "cli"; + packageName = "cli"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cli/-/cli-1.0.0.tgz"; + sha1 = "ee07dfc1390e3f2e6a9957cf88e1d4bfa777719d"; + }; + }; + "bluebird-3.4.6" = { + name = "bluebird"; + packageName = "bluebird"; + version = "3.4.6"; + src = fetchurl { + url = "https://registry.npmjs.org/bluebird/-/bluebird-3.4.6.tgz"; + sha1 = "01da8d821d87813d158967e743d5fe6c62cf8c0f"; + }; + }; "body-parser-1.15.2" = { name = "body-parser"; packageName = "body-parser"; @@ -11286,22 +11466,22 @@ let sha1 = "d7578cf4f1d11d5f6ea804cef35dc7a7ff6dae67"; }; }; - "combine-lists-1.0.0" = { + "combine-lists-1.0.1" = { name = "combine-lists"; packageName = "combine-lists"; - version = "1.0.0"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.0.tgz"; - sha1 = "e55dee53e5584f232eb59aeb16a7e66c338b5d06"; + url = "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz"; + sha1 = "458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"; }; }; - "connect-3.4.1" = { + "connect-3.5.0" = { name = "connect"; packageName = "connect"; - version = "3.4.1"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; - sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + url = "https://registry.npmjs.org/connect/-/connect-3.5.0.tgz"; + sha1 = "b357525a0b4c1f50599cd983e1d9efeea9677198"; }; }; "core-js-2.4.1" = { @@ -11340,13 +11520,13 @@ let sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea"; }; }; - "http-proxy-1.14.0" = { + "http-proxy-1.15.1" = { name = "http-proxy"; packageName = "http-proxy"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.14.0.tgz"; - sha1 = "be32ab34dd5229e87840f4c27cb335ee195b2a83"; + url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.15.1.tgz"; + sha1 = "91a6088172e79bc0e821d5eb04ce702f32446393"; }; }; "isbinaryfile-3.0.1" = { @@ -11430,15 +11610,6 @@ let sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; }; }; - "finalhandler-0.4.1" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; - sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; - }; - }; "custom-event-1.0.0" = { name = "custom-event"; packageName = "custom-event"; @@ -11502,6 +11673,15 @@ let sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae"; }; }; + "eventemitter3-1.2.0" = { + name = "eventemitter3"; + packageName = "eventemitter3"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz"; + sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; + }; + }; "requires-port-1.0.0" = { name = "requires-port"; packageName = "requires-port"; @@ -12321,13 +12501,13 @@ let sha1 = "3d97e562ebfdd4b66921dea70626b84bde9d2d07"; }; }; - "glob-stream-5.3.4" = { + "glob-stream-5.3.5" = { name = "glob-stream"; packageName = "glob-stream"; - version = "5.3.4"; + version = "5.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.4.tgz"; - sha1 = "2da166001578c4ee17fd92e4ee15083462ae72fc"; + url = "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz"; + sha1 = "a55665a9a8ccdc41915a87c701e32d4e016fad22"; }; }; "gulp-sourcemaps-1.6.0" = { @@ -12402,6 +12582,15 @@ let sha1 = "1b904a59609fb328ef078138420934f6b86709a6"; }; }; + "glob-parent-3.0.0" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.0.0.tgz"; + sha1 = "c7bdeb5260732196c740de9274c08814056014bb"; + }; + }; "ordered-read-streams-0.3.0" = { name = "ordered-read-streams"; packageName = "ordered-read-streams"; @@ -12429,6 +12618,24 @@ let sha1 = "5aa003cfbe94c5ff866c4e7d668bb1c4dbadb369"; }; }; + "is-glob-3.0.0" = { + name = "is-glob"; + packageName = "is-glob"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-3.0.0.tgz"; + sha1 = "e433c222db9d77844084d72db1eff047845985c1"; + }; + }; + "is-extglob-2.0.0" = { + name = "is-extglob"; + packageName = "is-extglob"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.0.0.tgz"; + sha1 = "a9b92c1ae2d7a975ad307be0722049c7e4ea2f13"; + }; + }; "extend-shallow-2.0.1" = { name = "extend-shallow"; packageName = "extend-shallow"; @@ -12591,6 +12798,15 @@ let sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a"; }; }; + "npm-registry-client-7.1.2" = { + name = "npm-registry-client"; + packageName = "npm-registry-client"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.2.tgz"; + sha1 = "ddf243a2bd149d35172fe680aff40dfa20054bc3"; + }; + }; "npmconf-2.0.9" = { name = "npmconf"; packageName = "npmconf"; @@ -12636,6 +12852,15 @@ let sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a"; }; }; + "retry-0.8.0" = { + name = "retry"; + packageName = "retry"; + version = "0.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz"; + sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f"; + }; + }; "npmlog-3.1.2" = { name = "npmlog"; packageName = "npmlog"; @@ -12897,13 +13122,13 @@ let sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; }; }; - "es6-promise-3.2.1" = { + "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; - version = "3.2.1"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; - sha1 = "ec56233868032909207170c39448e24449dd1fc4"; + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"; + sha1 = "a08cdde84ccdbf34d027a1451bc91d4bcd28a613"; }; }; "ignore-by-default-1.0.1" = { @@ -13194,13 +13419,13 @@ let sha1 = "4a64070f3fc5596fdc50e988813dd4ff003b3fd8"; }; }; - "node-red-node-twitter-0.1.6" = { + "node-red-node-twitter-0.1.7" = { name = "node-red-node-twitter"; packageName = "node-red-node-twitter"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.6.tgz"; - sha1 = "ee1c65767db0325f316987bf155543864995e618"; + url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.7.tgz"; + sha1 = "8cef1e54df6217d83b49fd48684e6ca2ee1cf595"; }; }; "node-red-node-rbe-0.1.5" = { @@ -13500,6 +13725,15 @@ let sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a"; }; }; + "bl-1.0.3" = { + name = "bl"; + packageName = "bl"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"; + sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e"; + }; + }; "qs-5.2.1" = { name = "qs"; packageName = "qs"; @@ -13509,6 +13743,15 @@ let sha1 = "801fee030e0b9450d6385adc48a4cc55b44aedfc"; }; }; + "tough-cookie-2.2.2" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz"; + sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7"; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -13545,13 +13788,13 @@ let sha1 = "3de4db3f4a90c160c06d8cb8b825a7f1c6f6a7c3"; }; }; - "imap-0.8.17" = { + "imap-0.8.18" = { name = "imap"; packageName = "imap"; - version = "0.8.17"; + version = "0.8.18"; src = fetchurl { - url = "https://registry.npmjs.org/imap/-/imap-0.8.17.tgz"; - sha1 = "e70ff1d1def0456af8bf1d96164d36176662172a"; + url = "https://registry.npmjs.org/imap/-/imap-0.8.18.tgz"; + sha1 = "4a7cdd0ff276efa0298708bb2c6d0db0b77f7a3f"; }; }; "libmime-1.2.0" = { @@ -13689,13 +13932,13 @@ let sha1 = "07af69344defa9851b7b845c1c18110b8264e51e"; }; }; - "utf7-1.0.0" = { + "utf7-1.0.2" = { name = "utf7"; packageName = "utf7"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/utf7/-/utf7-1.0.0.tgz"; - sha1 = "70c895de9d85b8ee7ef5a1fa8e169241c46e72cc"; + url = "https://registry.npmjs.org/utf7/-/utf7-1.0.2.tgz"; + sha1 = "955f490aae653ba220b9456a0a8776c199360991"; }; }; "twitter-ng-0.6.2" = { @@ -13707,15 +13950,6 @@ let sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4"; }; }; - "request-2.67.0" = { - name = "request"; - packageName = "request"; - version = "2.67.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; - sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; - }; - }; "serialport-2.1.2" = { name = "serialport"; packageName = "serialport"; @@ -14247,13 +14481,13 @@ let sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2"; }; }; - "mailcomposer-3.10.0" = { + "mailcomposer-3.12.0" = { name = "mailcomposer"; packageName = "mailcomposer"; - version = "3.10.0"; + version = "3.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.10.0.tgz"; - sha1 = "ce55c7b488ae84520a38f221aa12c4ce526d5168"; + url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.12.0.tgz"; + sha1 = "9c5e1188aa8e1c62ec8b86bd43468102b639e8f9"; }; }; "simplesmtp-0.3.35" = { @@ -14265,22 +14499,22 @@ let sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03"; }; }; - "buildmail-3.8.0" = { + "buildmail-3.10.0" = { name = "buildmail"; packageName = "buildmail"; - version = "3.8.0"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/buildmail/-/buildmail-3.8.0.tgz"; - sha1 = "191b6369710b2bd35a7819edf2cb0b642efd65bf"; + url = "https://registry.npmjs.org/buildmail/-/buildmail-3.10.0.tgz"; + sha1 = "c6826d716e7945bb6f6b1434b53985e029a03159"; }; }; - "libmime-2.0.3" = { + "libmime-2.1.0" = { name = "libmime"; packageName = "libmime"; - version = "2.0.3"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/libmime/-/libmime-2.0.3.tgz"; - sha1 = "55751aa832d31492363df3dd810580dfd59d080c"; + url = "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"; + sha1 = "51bc76de2283161eb9051c4bc80aed713e4fd1cd"; }; }; "addressparser-1.0.1" = { @@ -14292,22 +14526,22 @@ let sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746"; }; }; - "nodemailer-fetch-1.4.0" = { + "nodemailer-fetch-1.6.0" = { name = "nodemailer-fetch"; packageName = "nodemailer-fetch"; - version = "1.4.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.4.0.tgz"; - sha1 = "08a6174f755aba6ad9d88133355a70c1dee4e698"; + url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz"; + sha1 = "79c4908a1c0f5f375b73fe888da9828f6dc963a4"; }; }; - "nodemailer-shared-1.0.5" = { + "nodemailer-shared-1.1.0" = { name = "nodemailer-shared"; packageName = "nodemailer-shared"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.5.tgz"; - sha1 = "6de64484d47944422bb5f0886fffd908ada4ce5e"; + url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz"; + sha1 = "cf5994e2fd268d00f5cf0fa767a08169edb07ec0"; }; }; "rai-0.1.12" = { @@ -14364,6 +14598,15 @@ let sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; }; }; + "fstream-npm-1.2.0" = { + name = "fstream-npm"; + packageName = "fstream-npm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.2.0.tgz"; + sha1 = "d2c3c89101346982d64e57091c38487bda916fce"; + }; + }; "lodash._baseuniq-4.6.0" = { name = "lodash._baseuniq"; packageName = "lodash._baseuniq"; @@ -14373,40 +14616,40 @@ let sha1 = "0ebb44e456814af7905c6212fa2c9b2d51b841e8"; }; }; - "lodash.clonedeep-4.3.2" = { + "lodash.clonedeep-4.5.0" = { name = "lodash.clonedeep"; packageName = "lodash.clonedeep"; - version = "4.3.2"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; - sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; }; }; - "lodash.union-4.4.0" = { + "lodash.union-4.6.0" = { name = "lodash.union"; packageName = "lodash.union"; - version = "4.4.0"; + version = "4.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; - sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; }; }; - "lodash.uniq-4.3.0" = { + "lodash.uniq-4.5.0" = { name = "lodash.uniq"; packageName = "lodash.uniq"; - version = "4.3.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; - sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; + sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; }; }; - "lodash.without-4.2.0" = { + "lodash.without-4.4.0" = { name = "lodash.without"; packageName = "lodash.without"; - version = "4.2.0"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; - sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.4.0.tgz"; + sha1 = "3cd4574a00b67bae373a94b748772640507b7aac"; }; }; "npm-install-checks-3.0.0" = { @@ -14418,6 +14661,15 @@ let sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7"; }; }; + "opener-1.4.2" = { + name = "opener"; + packageName = "opener"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/opener/-/opener-1.4.2.tgz"; + sha1 = "b32582080042af8680c389a499175b4c54fff523"; + }; + }; "read-cmd-shim-1.0.1" = { name = "read-cmd-shim"; packageName = "read-cmd-shim"; @@ -14481,33 +14733,6 @@ let sha1 = "0f4659fbb09d75194fa9e2b88a6644d363c9fe26"; }; }; - "lodash._baseclone-4.5.7" = { - name = "lodash._baseclone"; - packageName = "lodash._baseclone"; - version = "4.5.7"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; - sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; - }; - }; - "lodash._baseflatten-4.2.1" = { - name = "lodash._baseflatten"; - packageName = "lodash._baseflatten"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; - sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; - }; - }; - "lodash._basedifference-4.5.0" = { - name = "lodash._basedifference"; - packageName = "lodash._basedifference"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; - sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; - }; - }; "unique-slug-2.0.0" = { name = "unique-slug"; packageName = "unique-slug"; @@ -14733,13 +14958,13 @@ let sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292"; }; }; - "npm-3.10.7" = { + "npm-3.10.8" = { name = "npm"; packageName = "npm"; - version = "3.10.7"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.7.tgz"; - sha1 = "c27556ddd52558d0a6fbf528503695fb83a54210"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; }; "npmi-2.0.1" = { @@ -14778,42 +15003,6 @@ let sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac"; }; }; - "lodash.clonedeep-4.4.1" = { - name = "lodash.clonedeep"; - packageName = "lodash.clonedeep"; - version = "4.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.4.1.tgz"; - sha1 = "8adb0621f7e69682af808fe8dbccaa2ba7a8b3ea"; - }; - }; - "lodash.union-4.5.0" = { - name = "lodash.union"; - packageName = "lodash.union"; - version = "4.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.5.0.tgz"; - sha1 = "d273848d9bc556780a6b4fcfed822a79a685a683"; - }; - }; - "lodash.uniq-4.4.0" = { - name = "lodash.uniq"; - packageName = "lodash.uniq"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.4.0.tgz"; - sha1 = "42cdcd09e35eb0a07abe1da9c06c850f6afa55c7"; - }; - }; - "lodash.without-4.3.0" = { - name = "lodash.without"; - packageName = "lodash.without"; - version = "4.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.3.0.tgz"; - sha1 = "b4e5c92c4e1fd1c2f4a9359993716e51ce12a2ba"; - }; - }; "airplayer-2.0.0" = { name = "airplayer"; packageName = "airplayer"; @@ -14913,13 +15102,13 @@ let sha1 = "1cbc691c45cdf6d6c1dc63bf368b2505f56ef839"; }; }; - "buffer-indexof-1.0.2" = { + "buffer-indexof-1.1.0" = { name = "buffer-indexof"; packageName = "buffer-indexof"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.0.2.tgz"; - sha1 = "7fff11985ce51fe9ff07c40121ad301781587cdf"; + url = "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.0.tgz"; + sha1 = "f54f647c4f4e25228baa656a2e57e43d5f270982"; }; }; "next-line-1.1.0" = { @@ -14931,13 +15120,13 @@ let sha1 = "fcae57853052b6a9bae8208e40dd7d3c2d304603"; }; }; - "single-line-log-1.1.1" = { + "single-line-log-1.1.2" = { name = "single-line-log"; packageName = "single-line-log"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.1.tgz"; - sha1 = "f87743dfdb5519b5fe1dda36edd68f35e3cb5de6"; + url = "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz"; + sha1 = "c2f83f273a3e1a16edb0995661da0ed5ef033364"; }; }; "array-flatten-2.1.0" = { @@ -14967,13 +15156,13 @@ let sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; }; }; - "multicast-dns-6.0.1" = { + "multicast-dns-6.1.0" = { name = "multicast-dns"; packageName = "multicast-dns"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.0.1.tgz"; - sha1 = "069da64a0b695e156ef47c86a94e69e1a17ff2c2"; + url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.1.0.tgz"; + sha1 = "8d91824b538556cd34f0adf6f27c60d94b5fb3bf"; }; }; "multicast-dns-service-types-1.1.0" = { @@ -15561,6 +15750,15 @@ let sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b"; }; }; + "request-2.67.0" = { + name = "request"; + packageName = "request"; + version = "2.67.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz"; + sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742"; + }; + }; "request-progress-2.0.1" = { name = "request-progress"; packageName = "request-progress"; @@ -15877,13 +16075,13 @@ let sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52"; }; }; - "openid-2.0.2" = { + "openid-2.0.6" = { name = "openid"; packageName = "openid"; - version = "2.0.2"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.2.tgz"; - sha1 = "10105d793ef59fad19501c51da942f63920875a1"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; + sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; "node-swt-0.1.1" = { @@ -16066,6 +16264,15 @@ let sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393"; }; }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; "path-to-regexp-0.1.6" = { name = "path-to-regexp"; packageName = "path-to-regexp"; @@ -16219,13 +16426,13 @@ let sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e"; }; }; - "uc.micro-1.0.2" = { + "uc.micro-1.0.3" = { name = "uc.micro"; packageName = "uc.micro"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.2.tgz"; - sha1 = "466f26316a0bb707def6682f91f50139b8b8d538"; + url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.3.tgz"; + sha1 = "7ed50d5e0f9a9fb0a573379259f2a77458d50192"; }; }; "htmlparser2-3.9.1" = { @@ -16543,6 +16750,15 @@ let sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86"; }; }; + "json-schema-0.2.2" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz"; + sha1 = "50354f19f603917c695f70b85afa77c3b0f23506"; + }; + }; "verror-1.3.3" = { name = "verror"; packageName = "verror"; @@ -16786,13 +17002,13 @@ let sha1 = "5ee747f1c7bd967658b683936430aee753955a34"; }; }; - "blueimp-md5-2.3.0" = { + "blueimp-md5-2.3.1" = { name = "blueimp-md5"; packageName = "blueimp-md5"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.0.tgz"; - sha1 = "a0a2207c53c3311fcd44c0ad95c019bf0ef53951"; + url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.3.1.tgz"; + sha1 = "992a6737733b9da1edd641550dc3acab2e9cfc5a"; }; }; "color-0.11.3" = { @@ -16984,13 +17200,13 @@ let sha1 = "e60432658a3387ff269c028eacde4a512e438dff"; }; }; - "color-convert-1.4.0" = { + "color-convert-1.5.0" = { name = "color-convert"; packageName = "color-convert"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-convert/-/color-convert-1.4.0.tgz"; - sha1 = "4ad8f531c31af5d8cbc5a4af2bb6000891d398e1"; + url = "https://registry.npmjs.org/color-convert/-/color-convert-1.5.0.tgz"; + sha1 = "7a2b4efb4488df85bca6443cb038b7100fbe7de1"; }; }; "color-string-0.3.0" = { @@ -17029,6 +17245,15 @@ let sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c"; }; }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; "send-0.13.1" = { name = "send"; packageName = "send"; @@ -17182,6 +17407,42 @@ let sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; }; }; + "lodash.clonedeep-4.3.2" = { + name = "lodash.clonedeep"; + packageName = "lodash.clonedeep"; + version = "4.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz"; + sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de"; + }; + }; + "lodash.union-4.4.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.4.0.tgz"; + sha1 = "22be23b4c84b49d0436e573949ad1d4a48c7fa38"; + }; + }; + "lodash.uniq-4.3.0" = { + name = "lodash.uniq"; + packageName = "lodash.uniq"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.3.0.tgz"; + sha1 = "dcad810876841447d8f3ec662323c86a6d938227"; + }; + }; + "lodash.without-4.2.0" = { + name = "lodash.without"; + packageName = "lodash.without"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.2.0.tgz"; + sha1 = "f89ec9a8ee2d7ec14f8a9cad72a3f5ee12c5a4a6"; + }; + }; "node-gyp-3.3.1" = { name = "node-gyp"; packageName = "node-gyp"; @@ -17191,6 +17452,60 @@ let sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0"; }; }; + "request-2.72.0" = { + name = "request"; + packageName = "request"; + version = "2.72.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.72.0.tgz"; + sha1 = "0ce3a179512620b10441f14c82e21c12c0ddb4e1"; + }; + }; + "retry-0.9.0" = { + name = "retry"; + packageName = "retry"; + version = "0.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz"; + sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d"; + }; + }; + "lodash._baseclone-4.5.7" = { + name = "lodash._baseclone"; + packageName = "lodash._baseclone"; + version = "4.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.7.tgz"; + sha1 = "ce42ade08384ef5d62fa77c30f61a46e686f8434"; + }; + }; + "lodash._baseflatten-4.2.1" = { + name = "lodash._baseflatten"; + packageName = "lodash._baseflatten"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.2.1.tgz"; + sha1 = "54acad5e6ef53532a5b8269c0ad725470cfd9208"; + }; + }; + "lodash._basedifference-4.5.0" = { + name = "lodash._basedifference"; + packageName = "lodash._basedifference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.5.0.tgz"; + sha1 = "56ea7d601367bfa46cd7de115dc3daeb18837938"; + }; + }; + "qs-6.1.0" = { + name = "qs"; + packageName = "qs"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz"; + sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26"; + }; + }; "lsmod-1.0.0" = { name = "lsmod"; packageName = "lsmod"; @@ -17353,6 +17668,15 @@ let sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d"; }; }; + "tmp-0.0.29" = { + name = "tmp"; + packageName = "tmp"; + version = "0.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz"; + sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; + }; + }; "follow-redirects-0.0.3" = { name = "follow-redirects"; packageName = "follow-redirects"; @@ -17380,13 +17704,13 @@ let sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b"; }; }; - "loader-utils-0.2.15" = { + "loader-utils-0.2.16" = { name = "loader-utils"; packageName = "loader-utils"; - version = "0.2.15"; + version = "0.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.15.tgz"; - sha1 = "c7df3342a9d4e2103dddc97d4060daccc246d6ac"; + url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz"; + sha1 = "f08632066ed8282835dff88dfb52704765adee6d"; }; }; "memory-fs-0.3.0" = { @@ -17548,10 +17872,10 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.9.1.tgz"; - sha1 = "f45de3859d1c84d539e247a98bb1b5356119338c"; + url = "https://registry.npmjs.org/alloy/-/alloy-1.9.2.tgz"; + sha1 = "b214d69a935cf28be68719813ed8a6865cb4654d"; }; dependencies = [ sources."colors-0.6.0-1" @@ -17598,14 +17922,15 @@ in }) sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.10" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."which-1.2.11" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."isexe-1.1.2" sources."xml2js-0.2.8" sources."sax-0.5.8" sources."is-0.3.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium MVC Framework"; homepage = "https://github.com/appcelerator/alloy#readme"; @@ -17616,10 +17941,10 @@ in azure-cli = nodeEnv.buildNodePackage { name = "azure-cli"; packageName = "azure-cli"; - version = "0.10.3"; + version = "0.10.5"; src = fetchurl { - url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.3.tgz"; - sha1 = "be426d6bd3b940e0e82e85e13381fd3f6372e8a6"; + url = "https://registry.npmjs.org/azure-cli/-/azure-cli-0.10.5.tgz"; + sha1 = "7e7490d92521818ab57c561f48e5d6058d9f1583"; }; dependencies = [ (sources."adal-node-0.1.21" // { @@ -17628,12 +17953,10 @@ in ]; }) sources."async-1.4.2" - (sources."azure-common-0.9.17" // { + (sources."azure-common-0.9.18" // { dependencies = [ sources."xml2js-0.2.7" - sources."request-2.72.0" sources."validator-3.22.2" - sources."node-uuid-1.4.7" ]; }) sources."azure-arm-authorization-2.0.0" @@ -17643,51 +17966,20 @@ in sources."azure-arm-hdinsight-0.2.0" sources."azure-arm-hdinsight-jobs-0.1.0" sources."azure-arm-insights-0.11.3" + sources."azure-arm-iothub-0.1.1" sources."azure-arm-servermanagement-0.1.2" - sources."azure-arm-network-0.13.2" + sources."azure-arm-network-0.17.0" sources."azure-arm-powerbiembedded-0.1.0" sources."azure-arm-trafficmanager-0.10.5" - sources."azure-arm-dns-0.10.1" - (sources."azure-arm-website-0.10.0" // { - dependencies = [ - sources."azure-common-0.9.12" - sources."moment-2.6.0" - sources."xml2js-0.2.7" - sources."request-2.45.0" - sources."validator-3.1.0" - sources."bl-0.9.5" - sources."caseless-0.6.0" - sources."forever-agent-0.5.2" - sources."qs-1.2.2" - sources."mime-types-1.0.2" - sources."node-uuid-1.4.7" - sources."form-data-0.1.4" - sources."http-signature-0.10.1" - sources."oauth-sign-0.4.0" - sources."hawk-1.1.1" - sources."aws-sign2-0.5.0" - sources."combined-stream-0.0.7" - sources."async-0.9.2" - sources."delayed-stream-0.0.5" - sources."assert-plus-0.1.5" - sources."asn1-0.1.11" - sources."hoek-0.9.1" - sources."boom-0.4.2" - sources."cryptiles-0.2.2" - sources."sntp-0.2.4" - ]; - }) + sources."azure-arm-dns-0.11.1" + sources."azure-arm-website-0.11.0" sources."azure-arm-rediscache-0.2.1" sources."azure-arm-datalake-analytics-0.4.3" sources."azure-arm-datalake-store-0.4.2" sources."azure-arm-devtestlabs-0.1.0" - sources."azure-graph-1.0.1" + sources."azure-graph-1.1.1" sources."azure-gallery-2.0.0-pre.18" - (sources."azure-keyvault-0.10.1" // { - dependencies = [ - sources."node-uuid-1.4.7" - ]; - }) + sources."azure-keyvault-0.10.2" sources."azure-asm-compute-0.17.0" sources."azure-asm-hdinsight-0.10.2" sources."azure-asm-trafficmanager-0.10.3" @@ -17697,17 +17989,20 @@ in sources."moment-2.6.0" ]; }) - sources."azure-asm-network-0.12.0" + sources."azure-asm-network-0.13.0" sources."azure-arm-resource-1.4.5-preview" sources."azure-arm-storage-0.13.1-preview" sources."azure-asm-sb-0.10.1" sources."azure-asm-sql-0.10.1" sources."azure-asm-storage-0.12.0" sources."azure-asm-subscription-0.10.1" - sources."azure-asm-website-0.10.4" - (sources."azure-storage-1.1.0" // { + (sources."azure-asm-website-0.10.4" // { + dependencies = [ + sources."moment-2.14.1" + ]; + }) + (sources."azure-storage-1.3.0" // { dependencies = [ - sources."extend-1.2.1" sources."node-uuid-1.4.7" sources."readable-stream-2.0.6" sources."validator-3.22.2" @@ -17716,7 +18011,8 @@ in ]; }) sources."azure-arm-batch-0.2.0" - sources."azure-batch-0.4.0" + sources."azure-batch-0.5.2" + sources."azure-servicefabric-0.1.4" sources."applicationinsights-0.15.12" sources."caller-id-0.1.0" sources."colors-1.1.2" @@ -17728,6 +18024,7 @@ in sources."fast-json-patch-0.5.6" sources."js2xmlparser-1.0.0" sources."jsonlint-1.6.2" + sources."jsonminify-0.4.1" sources."jsrsasign-4.8.2" (sources."kuduscript-1.0.8" // { dependencies = [ @@ -17735,15 +18032,8 @@ in sources."streamline-0.4.11" ]; }) - sources."moment-2.14.1" - (sources."ms-rest-1.15.0" // { - dependencies = [ - sources."request-2.74.0" - sources."node-uuid-1.4.7" - sources."qs-6.2.1" - sources."tough-cookie-2.3.1" - ]; - }) + sources."moment-2.15.1" + sources."ms-rest-1.15.0" (sources."ms-rest-azure-1.15.0" // { dependencies = [ sources."async-0.2.7" @@ -17767,19 +18057,15 @@ in ]; }) sources."readable-stream-1.0.34" - (sources."request-2.69.0" // { + (sources."request-2.74.0" // { dependencies = [ - sources."bl-1.0.3" + sources."extend-3.0.0" sources."node-uuid-1.4.7" - sources."qs-6.0.2" - sources."readable-stream-2.0.6" - sources."isarray-1.0.0" ]; }) (sources."ssh-key-to-pem-0.11.0" // { dependencies = [ sources."asn1-0.1.11" - sources."ctype-0.5.2" ]; }) sources."streamline-0.10.17" @@ -17788,6 +18074,7 @@ in sources."through-2.3.4" sources."tunnel-0.0.2" sources."underscore-1.4.4" + sources."user-home-2.0.0" sources."validator-5.2.0" (sources."winston-2.1.1" // { dependencies = [ @@ -17812,7 +18099,7 @@ in ]; }) sources."meow-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."core-util-is-1.0.2" sources."isarray-0.0.1" @@ -17825,8 +18112,8 @@ in sources."map-obj-1.0.1" sources."get-stdin-4.0.1" sources."repeating-1.1.3" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."buffer-equal-constant-time-1.0.1" sources."ecdsa-sig-formatter-1.0.7" sources."base64-url-1.3.2" @@ -17834,99 +18121,12 @@ in sources."envconf-0.0.4" sources."duplexer-0.1.1" sources."sax-0.5.2" - sources."aws-sign2-0.6.0" - sources."aws4-1.4.1" - (sources."bl-1.1.2" // { - dependencies = [ - sources."readable-stream-2.0.6" - sources."isarray-1.0.0" - ]; - }) - 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" // { - dependencies = [ - sources."async-2.0.1" - ]; - }) - (sources."har-validator-2.0.6" // { - dependencies = [ - sources."commander-2.9.0" - ]; - }) - 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.11" - sources."oauth-sign-0.8.2" - sources."qs-6.1.0" - sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" - sources."tunnel-agent-0.4.3" - sources."process-nextick-args-1.0.7" - sources."util-deprecate-1.0.2" - sources."delayed-stream-1.0.0" - sources."lodash-4.15.0" - sources."chalk-1.1.3" - sources."is-my-json-valid-2.13.1" - 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.0.0" - sources."graceful-readlink-1.0.1" - sources."generate-function-2.0.0" - sources."generate-object-property-1.2.0" - sources."jsonpointer-2.0.0" - sources."xtend-4.0.1" - sources."is-property-1.0.2" - sources."pinkie-2.0.4" - 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.0" - (sources."sshpk-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" - sources."verror-1.3.6" - sources."asn1-0.2.3" - (sources."dashdash-1.14.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."getpass-0.1.6" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."mime-1.2.11" - sources."ctype-0.5.3" + sources."extend-1.2.1" sources."browserify-mime-1.2.9" sources."json-edm-parser-0.1.2" sources."jsonparse-1.2.0" + sources."process-nextick-args-1.0.7" + sources."util-deprecate-1.0.2" sources."stack-trace-0.0.9" sources."keypress-0.1.0" sources."from-0.1.3" @@ -17937,13 +18137,13 @@ in (sources."nomnom-1.8.1" // { dependencies = [ sources."underscore-1.6.0" - sources."chalk-0.4.0" - sources."ansi-styles-1.0.0" - sources."strip-ansi-0.1.1" ]; }) sources."JSV-4.0.2" + sources."chalk-0.4.0" sources."has-color-0.1.7" + sources."ansi-styles-1.0.0" + sources."strip-ansi-0.1.1" sources."uuid-2.0.1" sources."debug-0.7.4" sources."q-0.9.7" @@ -17963,17 +18163,99 @@ in }) sources."ncp-0.4.2" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" + sources."isstream-0.1.2" + sources."aws-sign2-0.6.0" + sources."aws4-1.4.1" + (sources."bl-1.1.2" // { + dependencies = [ + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" + ]; + }) + sources."caseless-0.11.0" + sources."combined-stream-1.0.5" + sources."forever-agent-0.6.1" + (sources."form-data-1.0.1" // { + dependencies = [ + sources."async-2.0.1" + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + sources."chalk-1.1.3" + sources."commander-2.9.0" + sources."ansi-styles-2.2.1" + sources."strip-ansi-3.0.1" + ]; + }) + sources."hawk-3.1.3" + sources."http-signature-1.1.1" + sources."is-typedarray-1.0.0" + sources."json-stringify-safe-5.0.1" + sources."mime-types-2.1.12" + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tough-cookie-2.3.1" + sources."tunnel-agent-0.4.3" + sources."delayed-stream-1.0.0" + sources."lodash-4.16.2" + sources."is-my-json-valid-2.14.0" + sources."pinkie-promise-2.0.1" + sources."escape-string-regexp-1.0.5" + sources."has-ansi-2.0.0" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."graceful-readlink-1.0.1" + sources."generate-function-2.0.0" + sources."generate-object-property-1.2.0" + sources."jsonpointer-2.0.0" + sources."xtend-4.0.1" + sources."is-property-1.0.2" + sources."pinkie-2.0.4" + 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.1" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + sources."asn1-0.2.3" + (sources."dashdash-1.14.0" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + (sources."getpass-0.1.6" // { + dependencies = [ + sources."assert-plus-1.0.0" + ]; + }) + sources."jsbn-0.1.0" + sources."tweetnacl-0.14.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."ctype-0.5.2" sources."source-map-0.1.43" sources."fibers-1.0.14" sources."galaxy-0.1.12" @@ -17982,9 +18264,11 @@ in sources."then-request-2.2.0" sources."http-basic-2.5.1" sources."promise-7.1.1" - sources."asap-2.0.4" + sources."asap-2.0.5" + sources."os-homedir-1.0.2" sources."mute-stream-0.0.6" ]; + buildInputs = globalBuildInputs; meta = { description = "Microsoft Azure Cross Platform Command Line tool"; homepage = https://github.com/Azure/azure-xplat-cli; @@ -18000,6 +18284,7 @@ in url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz"; sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0"; }; + buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; homepage = http://bower.io/; @@ -18010,10 +18295,10 @@ in bower2nix = nodeEnv.buildNodePackage { name = "bower2nix"; packageName = "bower2nix"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + sha1 = "77cc8f966a3595686f5d6fae30ad9bd2cc20bfe3"; }; dependencies = [ sources."argparse-1.0.4" @@ -18023,7 +18308,7 @@ in sources."bower-logger-0.2.1" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."lodash-4.2.1" @@ -18060,7 +18345,7 @@ in sources."statuses-1.3.0" sources."timed-out-2.0.0" sources."end-of-stream-1.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."readable-stream-2.1.5" sources."stream-shift-1.0.0" sources."once-1.3.3" @@ -18082,8 +18367,8 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" - sources."array-find-index-1.0.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -18098,12 +18383,12 @@ in sources."pinkie-2.0.4" (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" ]; }) sources."parse-json-2.2.0" @@ -18115,18 +18400,22 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" sources."sort-keys-1.1.2" sources."is-plain-obj-1.1.0" sources."natives-1.1.0" - sources."jsonfile-2.3.1" + (sources."jsonfile-2.4.0" // { + dependencies = [ + sources."graceful-fs-4.1.9" + ]; + }) sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."rimraf-2.5.4" // { dependencies = [ - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) sources."fs.realpath-1.0.0" @@ -18143,8 +18432,9 @@ in ]; }) sources."ms-0.7.1" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; homepage = https://github.com/rvl/bower2nix; @@ -18161,7 +18451,7 @@ in sha1 = "d81a018e98dd7ca706ec04253d20f8a03b2af8ae"; }; dependencies = [ - sources."JSONStream-1.1.4" + sources."JSONStream-1.2.1" sources."assert-1.3.0" sources."browser-pack-6.0.1" sources."browser-resolve-1.11.2" @@ -18184,7 +18474,7 @@ in sources."has-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-0.0.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."insert-module-globals-7.0.1" (sources."labeled-stream-splicer-2.0.0" // { dependencies = [ @@ -18204,7 +18494,7 @@ in sources."shasum-1.0.2" sources."shell-quote-1.6.1" sources."stream-browserify-2.0.1" - sources."stream-http-2.3.1" + sources."stream-http-2.4.0" sources."string_decoder-0.10.31" sources."subarg-1.0.0" (sources."syntax-error-1.1.6" // { @@ -18224,7 +18514,11 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" sources."jsonparse-1.2.0" @@ -18236,7 +18530,7 @@ in sources."lodash.memoize-3.0.4" sources."source-map-0.5.6" sources."pako-0.2.9" - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."ieee754-1.1.6" sources."isarray-1.0.0" sources."typedarray-0.0.6" @@ -18250,30 +18544,30 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.8" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.1" + sources."elliptic-6.3.2" sources."parse-asn1-5.0.0" - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.8.0" + sources."asn1.js-4.8.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" sources."miller-rabin-4.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -18299,6 +18593,7 @@ in sources."querystring-0.2.0" sources."indexof-0.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "browser-side require() the node way"; homepage = "https://github.com/substack/node-browserify#readme"; @@ -18359,7 +18654,7 @@ in (sources."xml2js-0.4.17" // { dependencies = [ sources."xmlbuilder-4.2.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) sources."xtend-4.0.1" @@ -18405,8 +18700,8 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" - sources."array-find-index-1.0.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" @@ -18422,7 +18717,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -18432,8 +18727,8 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."airplay-js-0.2.16" sources."clivas-0.1.4" sources."inquirer-0.8.5" @@ -18464,6 +18759,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."parse-torrent-4.1.0" + sources."once-1.3.3" sources."magnet-uri-4.2.3" sources."parse-torrent-file-2.1.4" sources."thirty-two-0.0.2" @@ -18497,16 +18793,20 @@ in sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.4" sources."parse-torrent-file-4.0.0" - sources."simple-get-2.2.2" + sources."simple-get-2.2.3" sources."thirty-two-1.0.2" sources."uniq-1.0.1" sources."bencode-0.10.0" sources."simple-sha1-2.0.8" - sources."rusha-0.8.3" - sources."once-1.3.3" - sources."unzip-response-1.0.0" + sources."rusha-0.8.4" + sources."once-1.4.0" + sources."unzip-response-1.0.1" sources."wrappy-1.0.2" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."deep-extend-0.2.11" sources."strip-json-comments-0.1.3" sources."ini-1.1.0" @@ -18536,7 +18836,7 @@ in }) sources."randombytes-2.0.3" sources."run-parallel-1.1.6" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ip-1.1.3" sources."flatten-0.0.1" sources."fifo-0.1.4" @@ -18552,11 +18852,11 @@ in sources."isarray-0.0.1" sources."string_decoder-0.10.31" sources."cyclist-0.1.1" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -18571,7 +18871,7 @@ in ]; }) sources."re-emitter-1.1.3" - sources."buffer-equals-1.0.3" + sources."buffer-equals-1.0.4" sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ @@ -18650,6 +18950,7 @@ in sources."graceful-readlink-1.0.1" sources."sax-1.2.1" ]; + buildInputs = globalBuildInputs; meta = { description = "commandline chromecast player"; homepage = "https://github.com/xat/castnow#readme"; @@ -18660,11 +18961,12 @@ in coffee-script = nodeEnv.buildNodePackage { name = "coffee-script"; packageName = "coffee-script"; - version = "1.10.0"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz"; - sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0"; + url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.11.0.tgz"; + sha1 = "591e87f7447a53dfde33dc892db1d15b14ddd92d"; }; + buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; homepage = http://coffeescript.org/; @@ -18702,7 +19004,7 @@ in (sources."insight-0.8.3" // { dependencies = [ sources."async-1.5.2" - sources."request-2.74.0" + sources."request-2.75.0" ]; }) sources."aliasify-1.9.0" @@ -18711,7 +19013,7 @@ in dependencies = [ sources."q-1.4.1" sources."shelljs-0.7.4" - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) sources."cordova-js-4.1.4" @@ -18733,7 +19035,7 @@ in sources."glob-6.0.4" ]; }) - (sources."npm-2.15.10" // { + (sources."npm-2.15.11" // { dependencies = [ sources."glob-7.0.6" sources."nopt-3.0.6" @@ -18743,6 +19045,7 @@ in sources."semver-5.1.1" sources."tar-2.2.1" sources."isarray-1.0.0" + sources."form-data-1.0.1" ]; }) sources."opener-1.4.1" @@ -18796,10 +19099,10 @@ in sources."rechoir-0.6.2" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -18811,7 +19114,7 @@ in sources."minimatch-2.0.10" ]; }) - sources."JSONStream-1.1.4" + sources."JSONStream-1.2.1" sources."assert-1.3.0" (sources."browser-pack-4.0.4" // { dependencies = [ @@ -18880,7 +19183,11 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."xtend-4.0.1" sources."jsonparse-1.2.0" @@ -18906,23 +19213,23 @@ in sources."create-hash-1.1.2" sources."create-hmac-1.1.4" sources."diffie-hellman-5.0.2" - sources."pbkdf2-3.0.4" + sources."pbkdf2-3.0.8" sources."public-encrypt-4.0.0" sources."randombytes-2.0.3" sources."browserify-aes-1.0.6" sources."browserify-des-1.0.0" sources."evp_bytestokey-1.0.0" sources."buffer-xor-1.0.3" - sources."cipher-base-1.0.2" + sources."cipher-base-1.0.3" sources."des.js-1.0.0" sources."minimalistic-assert-1.0.0" sources."bn.js-4.11.6" sources."browserify-rsa-4.0.1" - sources."elliptic-6.3.1" + sources."elliptic-6.3.2" sources."parse-asn1-5.0.0" - sources."brorand-1.0.5" + sources."brorand-1.0.6" sources."hash.js-1.0.3" - sources."asn1.js-4.8.0" + sources."asn1.js-4.8.1" sources."ripemd160-1.0.1" sources."sha.js-2.4.5" sources."miller-rabin-4.0.0" @@ -18963,9 +19270,9 @@ in sources."debug-2.2.0" sources."on-headers-1.0.1" sources."vary-1.1.0" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.6.1" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."ms-0.7.1" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -18996,7 +19303,11 @@ in sources."forwarded-0.1.0" sources."ipaddr.js-1.1.1" sources."destroy-1.0.4" - sources."http-errors-1.5.0" + (sources."http-errors-1.5.0" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."mime-1.3.4" sources."setprototypeof-1.0.1" sources."media-typer-0.3.0" @@ -19019,7 +19330,7 @@ in sources."mute-stream-0.0.6" sources."json-parse-helpfulerror-1.0.3" sources."normalize-package-data-2.3.5" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."jju-1.3.0" sources."is-builtin-module-1.0.0" sources."builtin-modules-1.1.1" @@ -19048,7 +19359,7 @@ in sources."github-url-from-git-1.4.0" sources."github-url-from-username-repo-1.0.2" sources."ini-1.3.4" - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" sources."lru-cache-4.0.1" (sources."mkdirp-0.5.1" // { dependencies = [ @@ -19057,28 +19368,31 @@ in }) (sources."node-gyp-3.4.0" // { dependencies = [ - sources."glob-7.0.6" + sources."glob-7.1.0" sources."tar-2.2.1" ]; }) sources."normalize-git-url-3.0.2" sources."npm-cache-filename-1.0.2" sources."npm-install-checks-1.0.7" - (sources."npm-registry-client-7.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."retry-0.8.0" + sources."concat-stream-1.5.2" + sources."request-2.75.0" + sources."readable-stream-2.0.6" + sources."isarray-1.0.0" ]; }) sources."npm-user-validate-0.1.5" sources."npmlog-2.0.4" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-installed-4.0.3" sources."realize-package-specifier-3.0.3" - sources."retry-0.9.0" + sources."retry-0.10.0" (sources."rimraf-2.5.4" // { dependencies = [ - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) (sources."sha-2.0.1" // { @@ -19088,18 +19402,18 @@ in ]; }) sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" sources."umask-1.1.0" - sources."which-1.2.10" + sources."which-1.2.11" sources."write-file-atomic-1.1.4" sources."imurmurhash-0.1.4" sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."clone-1.0.2" sources."proto-list-1.2.4" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."iferr-0.1.5" sources."fstream-ignore-1.0.5" sources."pseudomap-1.0.2" @@ -19110,19 +19424,6 @@ in sources."d-0.1.1" sources."es5-ext-0.10.12" sources."es6-iterator-2.0.0" - sources."are-we-there-yet-1.1.2" - sources."gauge-1.2.7" - sources."delegates-1.0.0" - sources."has-unicode-2.0.1" - sources."lodash.pad-4.5.1" - sources."lodash.padend-4.6.1" - sources."lodash.padstart-4.6.1" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" - sources."debuglog-1.0.1" - sources."readdir-scoped-modules-1.0.2" - sources."util-extend-1.0.3" - sources."buffer-shims-1.0.0" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."aws-sign2-0.6.0" @@ -19137,7 +19438,7 @@ in 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.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -19150,10 +19451,9 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."graceful-readlink-1.0.1" sources."generate-function-2.0.0" @@ -19166,14 +19466,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -19187,14 +19487,25 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" + sources."are-we-there-yet-1.1.2" + sources."gauge-1.2.7" + sources."delegates-1.0.0" + sources."has-unicode-2.0.1" + sources."lodash.pad-4.5.1" + sources."lodash.padend-4.6.1" + sources."lodash.padstart-4.6.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."debuglog-1.0.1" + sources."readdir-scoped-modules-1.0.2" + sources."util-extend-1.0.3" + sources."buffer-shims-1.0.0" + sources."async-2.0.1" + sources."lodash-4.16.2" sources."isexe-1.1.2" (sources."xmlbuilder-4.0.0" // { dependencies = [ @@ -19208,7 +19519,7 @@ in sources."bplist-parser-0.0.6" sources."bplist-creator-0.0.4" sources."stream-buffers-0.2.6" - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" sources."configstore-1.4.0" sources."is-npm-1.0.0" sources."latest-version-1.0.1" @@ -19220,7 +19531,7 @@ in }) sources."string-length-1.0.1" sources."object-assign-4.1.0" - sources."uuid-2.0.2" + sources."uuid-2.0.3" sources."xdg-basedir-2.0.0" sources."package-json-1.2.0" (sources."got-3.3.1" // { @@ -19248,13 +19559,17 @@ in ]; }) sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" sources."rc-1.1.6" sources."deep-extend-0.4.1" sources."strip-json-comments-1.0.4" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" (sources."inquirer-0.10.1" // { dependencies = [ sources."lodash-3.10.1" @@ -19276,7 +19591,7 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."lodash._getnative-3.9.1" sources."osx-release-1.1.0" @@ -19286,12 +19601,33 @@ in ]; }) ]; + buildInputs = globalBuildInputs; meta = { description = "Cordova command line interface tool"; license = "Apache-2.0"; }; production = true; }; + csslint = nodeEnv.buildNodePackage { + name = "csslint"; + packageName = "csslint"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csslint/-/csslint-1.0.3.tgz"; + sha1 = "5dc024f13a1ff91c0dd08d01186ae1f6f9e92862"; + }; + dependencies = [ + sources."clone-1.0.2" + sources."parserlib-1.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CSSLint"; + homepage = http://csslint.net/; + license = "MIT"; + }; + production = true; + }; dnschain = nodeEnv.buildNodePackage { name = "dnschain"; packageName = "dnschain"; @@ -19371,9 +19707,9 @@ in sources."cookie-0.1.2" sources."merge-descriptors-0.0.2" sources."utils-merge-1.0.0" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.5.3" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."ms-0.7.0" sources."crc-3.2.1" sources."ee-first-1.1.0" @@ -19422,8 +19758,9 @@ in sources."delayed-stream-0.0.5" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" ]; + buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; homepage = https://github.com/okTurtles/dnschain; @@ -19443,13 +19780,13 @@ in sources."JSONStream-0.8.4" sources."basic-auth-1.0.4" sources."cookie-signature-1.0.6" - sources."cors-2.8.0" + sources."cors-2.8.1" sources."docker-parse-image-3.0.1" sources."end-of-stream-1.1.0" sources."from2-1.3.0" sources."fs-blob-store-5.2.1" sources."level-0.18.0" - (sources."level-sublevel-6.5.4" // { + (sources."level-sublevel-6.6.0" // { dependencies = [ (sources."levelup-0.19.1" // { dependencies = [ @@ -19514,7 +19851,7 @@ in sources."vary-1.1.0" sources."once-1.3.3" sources."wrappy-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."readable-stream-1.1.14" sources."core-util-is-1.0.2" sources."isarray-0.0.1" @@ -19560,6 +19897,7 @@ in sources."protein-0.5.0" sources."network-address-0.0.5" ]; + buildInputs = globalBuildInputs; meta = { description = "docker registry server implemented in node"; homepage = https://github.com/mafintosh/docker-registry-server; @@ -19580,10 +19918,10 @@ in sources."async-2.0.1" sources."aws4-1.4.1" sources."optimist-0.6.1" - sources."request-2.74.0" + sources."request-2.75.0" sources."jsonparse-1.2.0" sources."through-2.3.8" - sources."lodash-4.15.0" + sources."lodash-4.16.2" sources."wordwrap-0.0.3" sources."minimist-0.0.10" sources."aws-sign2-0.6.0" @@ -19592,14 +19930,14 @@ in 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.0.0" 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -19608,15 +19946,16 @@ in sources."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + 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."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.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -19636,14 +19975,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -19657,16 +19996,13 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" ]; + buildInputs = globalBuildInputs; meta = { description = "import and export tools for elasticsearch"; homepage = "https://github.com/taskrabbit/elasticsearch-dump#readme"; @@ -19674,46 +20010,136 @@ in }; production = true; }; + emoj = nodeEnv.buildNodePackage { + name = "emoj"; + packageName = "emoj"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/emoj/-/emoj-0.3.0.tgz"; + sha1 = "9b87917bc0a1abed65f52046e5e07912f7d8532c"; + }; + dependencies = [ + sources."chalk-1.1.3" + sources."got-6.5.0" + sources."has-ansi-2.0.0" + sources."lodash.debounce-4.0.8" + sources."log-update-1.0.2" + sources."mem-0.1.1" + sources."meow-3.7.0" + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + sources."strip-ansi-3.0.1" + sources."supports-color-2.0.0" + sources."ansi-regex-2.0.0" + sources."create-error-class-3.0.2" + sources."duplexer3-0.1.4" + sources."get-stream-2.3.1" + sources."is-redirect-1.0.0" + sources."is-retry-allowed-1.1.0" + sources."is-stream-1.1.0" + sources."lowercase-keys-1.0.0" + sources."node-status-codes-2.0.1" + sources."timed-out-2.0.0" + sources."unzip-response-2.0.1" + sources."url-parse-lax-1.0.0" + sources."capture-stack-trace-1.0.0" + sources."object-assign-4.1.0" + sources."pinkie-promise-2.0.1" + sources."pinkie-2.0.4" + sources."prepend-http-1.0.4" + sources."ansi-escapes-1.4.0" + sources."cli-cursor-1.0.2" + sources."restore-cursor-1.0.1" + sources."exit-hook-1.1.1" + sources."onetime-1.1.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."minimist-1.2.0" + sources."normalize-package-data-2.3.5" + 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."signal-exit-3.0.1" + sources."array-find-index-1.0.2" + sources."hosted-git-info-2.1.5" + sources."is-builtin-module-1.0.0" + sources."semver-5.3.0" + sources."validate-npm-package-license-3.0.1" + sources."builtin-modules-1.1.1" + sources."spdx-correct-1.0.2" + sources."spdx-expression-parse-1.0.3" + sources."spdx-license-ids-1.2.2" + sources."find-up-1.1.2" + sources."read-pkg-1.1.0" + sources."path-exists-2.1.0" + sources."load-json-file-1.1.0" + sources."path-type-1.1.0" + sources."graceful-fs-4.1.9" + sources."parse-json-2.2.0" + sources."pify-2.3.0" + sources."strip-bom-2.0.0" + sources."error-ex-1.3.0" + sources."is-arrayish-0.2.1" + sources."is-utf8-0.2.1" + sources."indent-string-2.1.0" + sources."strip-indent-1.0.1" + sources."repeating-2.0.1" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" + sources."get-stdin-4.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Find relevant emoji from text on the command-line"; + homepage = "https://github.com/sindresorhus/emoj#readme"; + license = "MIT"; + }; + production = true; + }; eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "3.4.0"; + version = "3.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-3.4.0.tgz"; - sha1 = "af5984007bd3f1fb1b3b6b01a0a22eda0ec7a9f4"; + url = "https://registry.npmjs.org/eslint/-/eslint-3.7.0.tgz"; + sha1 = "27499b403de70f8832815c3550330bad67292a57"; }; dependencies = [ sources."chalk-1.1.3" sources."concat-stream-1.5.2" sources."debug-2.2.0" - sources."doctrine-1.3.0" + sources."doctrine-1.4.0" sources."escope-3.6.0" - sources."espree-3.1.7" + sources."espree-3.3.2" sources."estraverse-4.2.0" sources."esutils-2.0.2" sources."file-entry-cache-2.0.0" - sources."glob-7.0.6" - sources."globals-9.9.0" + sources."glob-7.1.0" + sources."globals-9.10.0" sources."ignore-3.1.5" sources."imurmurhash-0.1.4" sources."inquirer-0.12.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."is-resolvable-1.0.0" sources."js-yaml-3.6.1" sources."json-stable-stringify-1.0.1" sources."levn-0.3.0" - sources."lodash-4.15.0" + sources."lodash-4.16.2" sources."mkdirp-0.5.1" sources."natural-compare-1.4.0" - sources."optionator-0.8.1" - sources."path-is-inside-1.0.1" + sources."optionator-0.8.2" + sources."path-is-inside-1.0.2" sources."pluralize-1.2.1" sources."progress-1.1.8" sources."require-uncached-1.0.2" sources."shelljs-0.6.1" sources."strip-bom-3.0.0" sources."strip-json-comments-1.0.4" - sources."table-3.7.8" + sources."table-3.8.0" sources."text-table-0.2.0" sources."user-home-2.0.0" sources."ansi-styles-2.2.1" @@ -19722,7 +20148,7 @@ in sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -19745,12 +20171,16 @@ in sources."es6-symbol-3.1.0" sources."event-emitter-0.3.4" sources."object-assign-4.1.0" - sources."acorn-3.3.0" - sources."acorn-jsx-3.0.1" + sources."acorn-4.0.3" + (sources."acorn-jsx-3.0.1" // { + dependencies = [ + sources."acorn-3.3.0" + ]; + }) sources."flat-cache-1.2.1" sources."circular-json-0.3.1" sources."del-2.2.2" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."write-0.2.1" sources."globby-5.0.0" sources."is-path-cwd-1.0.0" @@ -19766,8 +20196,8 @@ in sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -19784,17 +20214,17 @@ in sources."restore-cursor-1.0.1" sources."exit-hook-1.1.1" sources."onetime-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."mute-stream-0.0.5" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-2.0.0" sources."xtend-4.0.1" sources."is-property-1.0.2" sources."tryit-1.0.2" - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."jsonify-0.0.0" @@ -19803,16 +20233,17 @@ in sources."minimist-0.0.8" sources."deep-is-0.1.3" sources."wordwrap-1.0.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.5" sources."caller-path-0.1.0" sources."resolve-from-1.0.1" sources."callsites-0.2.0" - sources."bluebird-3.4.6" + sources."ajv-4.7.5" + sources."ajv-keywords-1.1.1" sources."slice-ansi-0.0.4" - sources."tv4-1.2.7" - sources."xregexp-3.1.1" - sources."os-homedir-1.0.1" + sources."co-4.6.0" + sources."os-homedir-1.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; homepage = http://eslint.org/; @@ -19820,6 +20251,21 @@ in }; production = true; }; + emojione = nodeEnv.buildNodePackage { + name = "emojione"; + packageName = "emojione"; + version = "2.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/emojione/-/emojione-2.2.6.tgz"; + sha1 = "67dec452937d5b14ee669207ea41cdb1f69fb8f6"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "Emoji One is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG and SVG formats provided for the emoji images."; + homepage = http://www.emojione.com/; + }; + production = true; + }; fetch-bower = nodeEnv.buildNodePackage { name = "fetch-bower"; packageName = "fetch-bower"; @@ -19833,11 +20279,12 @@ in sources."bower-logger-0.2.1" sources."bower-1.7.9" sources."glob-3.2.11" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-0.3.0" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Companion to bower2nix to be used in the fetchBower fixed-output derivation"; homepage = https://bitbucket.org/shlevy/fetch-bower; @@ -19875,7 +20322,7 @@ in sources."nssocket-0.5.3" sources."object-assign-3.0.0" sources."optimist-0.6.1" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" (sources."prettyjson-1.1.3" // { dependencies = [ sources."colors-1.1.2" @@ -19915,7 +20362,7 @@ in sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" (sources."readdirp-2.1.0" // { @@ -19952,13 +20399,13 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" 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.6.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."readable-stream-2.1.5" sources."set-immediate-shim-1.0.1" sources."brace-expansion-1.1.6" @@ -19983,11 +20430,15 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" @@ -20001,13 +20452,13 @@ in sources."aproba-1.0.4" sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -20023,18 +20474,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - ]; - }) + sources."form-data-2.0.0" 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -20042,10 +20489,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -20063,14 +20510,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -20084,23 +20531,19 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - (sources."glob-7.0.6" // { + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + (sources."glob-7.1.0" // { dependencies = [ sources."minimatch-3.0.3" ]; }) sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -20128,6 +20571,7 @@ in sources."i-0.3.5" sources."ncp-0.4.2" ]; + buildInputs = globalBuildInputs; meta = { description = "A simple CLI tool for ensuring that a given node script runs continuously (i.e. forever)"; homepage = "https://github.com/foreverjs/forever#readme"; @@ -20148,6 +20592,7 @@ in sources."tabtab-git+https://github.com/mixu/node-tabtab.git" sources."microee-0.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "A tool for managing multiple git repositories"; homepage = "https://github.com/mixu/gr#readme"; @@ -20170,16 +20615,17 @@ in sources."resolve-1.1.7" sources."glob-5.0.15" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."abbrev-1.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "The grunt command line interface"; homepage = "https://github.com/gruntjs/grunt-cli#readme"; @@ -20197,17 +20643,17 @@ in sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c"; }; dependencies = [ - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" sources."jade-1.11.0" (sources."q-2.0.3" // { dependencies = [ - sources."asap-2.0.4" + sources."asap-2.0.5" ]; }) sources."xml2js-0.4.17" sources."msgpack-1.0.2" sources."character-parser-1.2.1" - (sources."clean-css-3.4.19" // { + (sources."clean-css-3.4.20" // { dependencies = [ sources."commander-2.8.1" ]; @@ -20272,9 +20718,10 @@ in sources."weak-map-1.0.5" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" sources."nan-2.4.0" ]; + buildInputs = globalBuildInputs; meta = { description = "See a representation of the Guifi.net network in Google Earth."; homepage = https://github.com/jmendeth/guifi-earth; @@ -20355,8 +20802,8 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" - sources."array-find-index-1.0.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -20371,7 +20818,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -20381,8 +20828,8 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."time-stamp-1.0.1" sources."glogg-1.0.0" sources."sparkles-1.0.0" @@ -20403,7 +20850,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."xtend-4.0.1" sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" @@ -20456,7 +20903,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."glob-parent-2.0.0" @@ -20464,13 +20911,13 @@ in sources."is-primitive-2.0.0" sources."expand-tilde-1.2.2" sources."global-modules-0.2.3" - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" sources."global-prefix-0.1.4" sources."is-windows-0.2.0" sources."ini-1.3.4" sources."osenv-0.1.3" - sources."which-1.2.10" - sources."os-tmpdir-1.0.1" + sources."which-1.2.11" + sources."os-tmpdir-1.0.2" sources."isexe-1.1.2" sources."lodash.assignwith-4.2.0" sources."lodash.isempty-4.4.0" @@ -20531,6 +20978,7 @@ in sources."natives-1.1.0" sources."first-chunk-stream-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "The streaming build system"; homepage = http://gulpjs.com/; @@ -20551,8 +20999,9 @@ in sources."redis-0.10.3" sources."lru-cache-2.5.2" sources."minimist-0.0.8" - sources."eventemitter3-1.2.0" + sources."eventemitter3-2.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Complete high-scaled reverse-proxy solution"; homepage = https://github.com/dotcloud/hipache; @@ -20560,6 +21009,80 @@ in }; production = true; }; + htmlhint = nodeEnv.buildNodePackage { + name = "htmlhint"; + packageName = "htmlhint"; + version = "0.9.13"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlhint/-/htmlhint-0.9.13.tgz"; + sha1 = "08163cb1e6aa505048ebb0b41063a7ca07dc6c88"; + }; + dependencies = [ + sources."async-1.4.2" + sources."colors-1.0.3" + sources."commander-2.6.0" + sources."csslint-0.10.0" + sources."glob-5.0.15" + (sources."jshint-2.8.0" // { + dependencies = [ + sources."minimatch-2.0.10" + ]; + }) + sources."parse-glob-3.0.4" + sources."strip-json-comments-1.0.4" + sources."xml-1.0.0" + sources."parserlib-0.2.5" + sources."inflight-1.0.5" + sources."inherits-2.0.3" + sources."minimatch-3.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" + sources."wrappy-1.0.2" + sources."brace-expansion-1.1.6" + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + (sources."cli-0.6.6" // { + dependencies = [ + sources."glob-3.2.11" + sources."minimatch-0.3.0" + ]; + }) + sources."console-browserify-1.1.0" + sources."exit-0.1.2" + sources."htmlparser2-3.8.3" + sources."shelljs-0.3.0" + sources."lodash-3.7.0" + sources."lru-cache-2.7.3" + sources."sigmund-1.0.1" + sources."date-now-0.1.4" + sources."domhandler-2.3.0" + sources."domutils-1.5.1" + sources."domelementtype-1.3.0" + sources."readable-stream-1.1.14" + sources."entities-1.0.0" + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + sources."entities-1.1.1" + ]; + }) + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."glob-base-0.3.0" + sources."is-dotfile-1.0.2" + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + sources."glob-parent-2.0.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "A Static Code Analysis Tool for HTML"; + homepage = "https://github.com/yaniswang/HTMLHint#readme"; + license = "MIT"; + }; + production = true; + }; istanbul = nodeEnv.buildNodePackage { name = "istanbul"; packageName = "istanbul"; @@ -20586,25 +21109,25 @@ in ]; }) sources."nopt-3.0.6" - sources."once-1.3.3" + sources."once-1.4.0" sources."resolve-1.1.7" sources."supports-color-3.1.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wordwrap-1.0.0" sources."estraverse-1.9.3" sources."esutils-2.0.2" - sources."optionator-0.8.1" + sources."optionator-0.8.2" sources."source-map-0.2.0" sources."prelude-ls-1.1.2" sources."deep-is-0.1.3" sources."type-check-0.3.2" sources."levn-0.3.0" - sources."fast-levenshtein-1.1.4" + sources."fast-levenshtein-2.0.5" sources."amdefine-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -20639,11 +21162,12 @@ in sources."longest-1.0.1" sources."repeat-string-1.5.4" sources."is-buffer-1.1.4" - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."sprintf-js-1.0.3" sources."has-flag-1.0.0" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Yet another JS code coverage tool that computes statement, line, function and branch coverage with module loader hooks to transparently add coverage when running tests. Supports all JS coverage use cases including unit tests, server side functional tests "; homepage = "https://github.com/gotwarlost/istanbul#readme"; @@ -20662,6 +21186,7 @@ in dependencies = [ sources."when-3.4.6" ]; + buildInputs = globalBuildInputs; meta = { description = "A comprehensive JSON Schema validator for Node.js"; homepage = https://github.com/natesilva/jayschema; @@ -20686,12 +21211,12 @@ in sources."shelljs-0.3.0" sources."strip-json-comments-1.0.4" sources."lodash-3.7.0" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."inherits-2.0.3" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."date-now-0.1.4" sources."domhandler-2.3.0" @@ -20712,6 +21237,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; homepage = http://jshint.com/; @@ -20727,6 +21253,7 @@ in url = "https://registry.npmjs.org/json/-/json-9.0.4.tgz"; sha1 = "d0dbf2404c128572a935ecafadfc782ec81112ce"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging and processing JSON on the command line"; homepage = https://github.com/trentm/json; @@ -20741,6 +21268,7 @@ in url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz"; sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207"; }; + buildInputs = globalBuildInputs; meta = { description = "a 'json' command for massaging JSON on the command line"; homepage = https://github.com/trentm/json; @@ -20756,10 +21284,11 @@ in sha1 = "6e5fe67d8b205ce4d22fad05b7781e8dadcc4b30"; }; dependencies = [ - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" ]; + buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; homepage = https://github.com/nodeca/js-yaml; @@ -20770,22 +21299,22 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-1.2.0.tgz"; - sha1 = "6dca89ec25f4753f120f834c89398098040fd63e"; + url = "https://registry.npmjs.org/karma/-/karma-1.3.0.tgz"; + sha1 = "b2b94e8f499fadd0069d54f9aef4a4d48ec5cc1f"; }; dependencies = [ sources."bluebird-3.4.6" sources."body-parser-1.15.2" sources."chokidar-1.6.0" sources."colors-1.1.2" - (sources."combine-lists-1.0.0" // { + (sources."combine-lists-1.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) - sources."connect-3.4.1" + sources."connect-3.5.0" sources."core-js-2.4.1" sources."di-0.0.1" sources."dom-serialize-2.2.1" @@ -20797,9 +21326,9 @@ in sources."repeat-string-0.2.2" ]; }) - sources."glob-7.0.6" - sources."graceful-fs-4.1.6" - sources."http-proxy-1.14.0" + sources."glob-7.1.0" + sources."graceful-fs-4.1.9" + sources."http-proxy-1.15.1" sources."isbinaryfile-3.0.1" sources."lodash-3.10.1" (sources."log4js-0.6.38" // { @@ -20813,6 +21342,7 @@ in sources."minimatch-3.0.3" sources."optimist-0.6.1" sources."qjobs-1.1.5" + sources."range-parser-1.2.0" sources."rimraf-2.5.4" sources."socket.io-1.4.7" sources."source-map-0.5.6" @@ -20835,14 +21365,14 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.11" - sources."mime-db-1.23.0" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.0.14" sources."arrify-1.0.1" @@ -20873,7 +21403,7 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -20896,7 +21426,7 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."semver-5.3.0" sources."tar-2.2.1" sources."tar-pack-3.1.4" @@ -20911,13 +21441,13 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -20933,7 +21463,7 @@ in 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.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -20946,14 +21476,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - (sources."async-2.0.1" // { - dependencies = [ - sources."lodash-4.15.0" - ]; - }) + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -20971,14 +21497,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -20992,21 +21518,17 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."block-stream-0.0.9" sources."fstream-1.0.10" sources."fstream-ignore-1.0.5" sources."once-1.3.3" sources."uid-number-0.0.6" sources."wrappy-1.0.2" - sources."finalhandler-0.4.1" + sources."finalhandler-0.5.0" sources."parseurl-1.3.1" sources."utils-merge-1.0.0" sources."escape-html-1.0.3" @@ -21089,9 +21611,10 @@ in sources."yeast-0.1.2" sources."better-assert-1.0.2" sources."callsite-1.0.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."lru-cache-2.2.4" ]; + buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; homepage = http://karma-runner.github.io/; @@ -21205,9 +21728,9 @@ in sources."unpipe-1.0.0" sources."accepts-1.2.13" sources."compressible-2.0.8" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.5.3" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."ms-0.7.1" sources."csrf-3.0.3" sources."base64-url-1.2.2" @@ -21216,7 +21739,7 @@ in sources."uid-safe-2.1.1" sources."random-bytes-1.0.0" sources."crc-3.3.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."statuses-1.3.0" sources."readable-stream-1.1.14" sources."stream-counter-0.2.0" @@ -21239,8 +21762,9 @@ in sources."uid2-0.0.3" sources."sax-1.2.1" sources."xmlbuilder-4.2.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Hosts the latest kibana3 and elasticsearch behind Google OAuth2, Basic Auth or CAS Authentication"; license = "MIT"; @@ -21262,7 +21786,7 @@ in sources."readable-stream-2.0.6" sources."xtend-4.0.1" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -21271,14 +21795,14 @@ in sources."clone-stats-0.0.1" sources."replace-ext-0.0.1" sources."duplexify-3.4.5" - (sources."glob-stream-5.3.4" // { + (sources."glob-stream-5.3.5" // { dependencies = [ sources."through2-0.6.5" sources."readable-stream-1.0.34" sources."isarray-0.0.1" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."gulp-sourcemaps-1.6.0" sources."is-valid-glob-0.3.0" sources."lazystream-1.0.0" @@ -21296,29 +21820,43 @@ in sources."wrappy-1.0.2" sources."extend-3.0.0" sources."glob-5.0.15" - sources."glob-parent-2.0.0" - sources."micromatch-2.3.11" + sources."glob-parent-3.0.0" + (sources."micromatch-2.3.11" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."ordered-read-streams-0.3.0" sources."to-absolute-glob-0.1.1" sources."unique-stream-2.2.1" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."is-glob-2.0.1" - sources."is-extglob-1.0.0" + sources."is-glob-3.0.0" + sources."is-extglob-2.0.0" sources."arr-diff-2.0.0" sources."array-unique-0.2.1" sources."braces-1.8.5" sources."expand-brackets-0.1.5" - sources."extglob-0.3.2" + (sources."extglob-0.3.2" // { + dependencies = [ + sources."is-extglob-1.0.0" + ]; + }) sources."filename-regex-2.0.0" sources."kind-of-3.0.4" sources."normalize-path-2.0.1" sources."object.omit-2.0.0" - sources."parse-glob-3.0.4" + (sources."parse-glob-3.0.4" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."regex-cache-0.4.3" sources."arr-flatten-1.0.1" sources."expand-range-1.8.2" @@ -21333,8 +21871,14 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" - sources."glob-base-0.3.0" + sources."for-in-0.1.6" + (sources."glob-base-0.3.0" // { + dependencies = [ + sources."glob-parent-2.0.0" + sources."is-glob-2.0.1" + sources."is-extglob-1.0.0" + ]; + }) sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" sources."is-primitive-2.0.0" @@ -21347,6 +21891,7 @@ in sources."is-utf8-0.2.1" sources."first-chunk-stream-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; homepage = https://github.com/mweibel/lcov-result-merger; @@ -21382,6 +21927,7 @@ in sources."request-2.9.203" sources."stack-trace-0.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; homepage = https://bitbucket.org/aahmed/meat; @@ -21400,6 +21946,7 @@ in sources."optparse-1.0.5" sources."slasp-0.0.4" ]; + buildInputs = globalBuildInputs; meta = { description = "An internal DSL for the Nix package manager in JavaScript"; homepage = https://github.com/svanderburg/nijs; @@ -21410,10 +21957,10 @@ in node2nix = nodeEnv.buildNodePackage { name = "node2nix"; packageName = "node2nix"; - version = "1.0.1"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node2nix/-/node2nix-1.0.1.tgz"; - sha1 = "de96ccbd0228983e788d68b9792836964614548c"; + url = "https://registry.npmjs.org/node2nix/-/node2nix-1.1.0.tgz"; + sha1 = "7e27db0eb5102dc0f1a4667d84bd5d633e19d191"; }; dependencies = [ sources."optparse-1.0.5" @@ -21421,6 +21968,7 @@ in sources."npm-registry-client-7.1.2" (sources."npmconf-2.0.9" // { dependencies = [ + sources."once-1.3.3" sources."semver-4.3.6" ]; }) @@ -21440,7 +21988,7 @@ in sources."nijs-0.0.23" sources."chownr-1.0.1" sources."concat-stream-1.5.2" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."mkdirp-0.5.1" sources."normalize-package-data-2.3.5" (sources."npm-package-arg-4.2.0" // { @@ -21448,13 +21996,13 @@ in sources."semver-5.3.0" ]; }) - sources."once-1.3.3" - sources."request-2.74.0" + sources."once-1.4.0" + sources."request-2.75.0" sources."retry-0.8.0" sources."rimraf-2.5.4" sources."slide-1.1.6" sources."npmlog-3.1.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -21478,14 +22026,14 @@ in 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.0.0" 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -21493,11 +22041,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -21517,14 +22064,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -21538,20 +22085,16 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -21564,12 +22107,12 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."config-chain-1.1.10" sources."ini-1.3.4" sources."nopt-3.0.6" @@ -21577,8 +22120,8 @@ in sources."uid-number-0.0.5" sources."proto-list-1.2.4" sources."abbrev-1.0.9" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" (sources."fs-extra-0.6.4" // { @@ -21593,6 +22136,7 @@ in sources."forEachAsync-2.2.1" sources."sequence-2.2.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; homepage = https://github.com/svanderburg/node2nix; @@ -21609,24 +22153,24 @@ in }; dependencies = [ sources."fstream-1.0.10" - sources."glob-7.0.6" - sources."graceful-fs-4.1.6" + sources."glob-7.1.0" + sources."graceful-fs-4.1.9" sources."minimatch-3.0.3" sources."mkdirp-0.5.1" sources."nopt-3.0.6" sources."npmlog-3.1.2" sources."osenv-0.1.3" sources."path-array-1.0.1" - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."which-1.2.10" - sources."inherits-2.0.1" + sources."which-1.2.11" + sources."inherits-2.0.3" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -21649,16 +22193,16 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."array-index-1.0.0" sources."debug-2.2.0" sources."es6-symbol-3.1.0" @@ -21677,14 +22221,14 @@ in 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.0.0" 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -21692,11 +22236,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -21714,14 +22257,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -21735,18 +22278,15 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."block-stream-0.0.9" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon build tool"; homepage = "https://github.com/nodejs/node-gyp#readme"; @@ -21768,14 +22308,14 @@ in sources."debug-2.2.0" sources."express-4.14.0" sources."glob-5.0.15" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."rc-1.1.6" sources."semver-4.3.6" sources."serve-favicon-2.3.0" sources."strong-data-uri-1.0.4" sources."v8-debug-0.7.7" sources."v8-profiler-5.6.5" - sources."which-1.2.10" + sources."which-1.2.11" sources."ws-1.1.1" sources."yargs-3.32.0" sources."browser-launcher2-0.4.6" @@ -21797,8 +22337,8 @@ in }) sources."uid-0.0.2" sources."rimraf-2.2.8" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."base64-js-0.0.8" (sources."xmlbuilder-4.0.0" // { dependencies = [ @@ -21813,7 +22353,7 @@ in sources."bplist-parser-0.1.1" sources."meow-3.7.0" sources."untildify-2.1.0" - sources."big-integer-1.6.15" + sources."big-integer-1.6.16" sources."camelcase-keys-2.1.0" sources."decamelize-1.2.0" sources."loud-rejection-1.6.0" @@ -21825,8 +22365,8 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" - sources."array-find-index-1.0.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."validate-npm-package-license-3.0.1" @@ -21841,7 +22381,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -21851,8 +22391,8 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" - sources."number-is-nan-1.0.0" + sources."is-finite-1.0.2" + sources."number-is-nan-1.0.1" sources."get-stdin-4.0.1" sources."ms-0.7.1" sources."accepts-1.3.3" @@ -21880,9 +22420,9 @@ in sources."type-is-1.6.13" sources."utils-merge-1.0.0" sources."vary-1.1.0" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.6.1" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."statuses-1.3.0" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -21896,7 +22436,7 @@ in sources."media-typer-0.3.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -21910,17 +22450,18 @@ in dependencies = [ sources."rimraf-2.5.4" sources."semver-5.3.0" - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) sources."nopt-3.0.6" sources."npmlog-4.0.0" - sources."request-2.74.0" + sources."request-2.75.0" sources."tar-2.2.1" (sources."tar-pack-3.1.4" // { dependencies = [ + sources."once-1.3.3" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" ]; }) sources."abbrev-1.0.9" @@ -21941,7 +22482,7 @@ in sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" sources."ansi-regex-2.0.0" sources."aws-sign2-0.6.0" @@ -21955,12 +22496,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - sources."lodash-4.15.0" - ]; - }) + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -21973,9 +22509,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" 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.13.1" + sources."is-my-json-valid-2.14.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -21990,14 +22527,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22011,14 +22548,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."fs.realpath-1.0.0" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -22035,6 +22568,7 @@ in sources."lcid-1.0.0" sources."invert-kv-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; homepage = http://github.com/node-inspector/node-inspector; @@ -22058,11 +22592,15 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" @@ -22073,7 +22611,7 @@ in sources."readable-stream-2.1.5" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -22082,13 +22620,13 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -22104,14 +22642,14 @@ in 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.0.0" 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -22119,11 +22657,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22141,14 +22678,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22162,33 +22699,30 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."block-stream-0.0.9" sources."fstream-1.0.10" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."debug-2.2.0" sources."fstream-ignore-1.0.5" sources."uid-number-0.0.6" sources."ms-0.7.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Node.js native addon binary install tool"; homepage = "https://github.com/mapbox/node-pre-gyp#readme"; @@ -22207,7 +22741,7 @@ in dependencies = [ sources."chokidar-1.6.0" sources."debug-2.2.0" - sources."es6-promise-3.2.1" + sources."es6-promise-3.3.1" sources."ignore-by-default-1.0.1" sources."lodash.defaults-3.1.2" sources."minimatch-3.0.3" @@ -22222,10 +22756,10 @@ in sources."anymatch-1.3.0" sources."async-each-1.0.1" sources."glob-parent-2.0.0" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.0.14" sources."arrify-1.0.1" @@ -22256,13 +22790,13 @@ in sources."is-buffer-1.1.4" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" 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.6.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."readable-stream-2.1.5" sources."set-immediate-shim-1.0.1" sources."buffer-shims-1.0.0" @@ -22280,11 +22814,15 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."minimist-0.0.8" sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" @@ -22296,13 +22834,13 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -22318,14 +22856,14 @@ in 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.0.0" 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -22333,11 +22871,10 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22355,14 +22892,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -22376,19 +22913,15 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -22423,12 +22956,12 @@ in sources."repeating-1.1.3" sources."semver-diff-2.1.0" sources."string-length-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."osenv-0.1.3" - sources."uuid-2.0.2" + sources."uuid-2.0.3" sources."write-file-atomic-1.2.0" sources."xdg-basedir-2.0.0" - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" sources."imurmurhash-0.1.4" sources."slide-1.1.6" sources."package-json-1.2.0" @@ -22447,10 +22980,15 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" - sources."is-finite-1.0.1" + sources."is-finite-1.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; homepage = http://nodemon.io/; @@ -22507,12 +23045,13 @@ in sources."xml2js-0.4.17" sources."node-red-node-feedparser-0.1.5" sources."node-red-node-email-0.1.11" - (sources."node-red-node-twitter-0.1.6" // { + (sources."node-red-node-twitter-0.1.7" // { dependencies = [ - sources."request-2.67.0" - sources."bl-1.0.3" - sources."qs-5.2.1" + sources."request-2.75.0" + sources."bl-1.1.2" + sources."form-data-2.0.0" sources."http-signature-1.1.1" + sources."tough-cookie-2.3.1" sources."readable-stream-2.0.6" sources."isarray-1.0.0" sources."assert-plus-0.2.0" @@ -22539,8 +23078,8 @@ in sources."setprototypeof-1.0.1" sources."statuses-1.3.0" sources."ee-first-1.1.1" - sources."mime-types-2.1.11" - sources."mime-db-1.23.0" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" sources."css-select-1.0.0" sources."entities-1.1.1" (sources."htmlparser2-3.8.3" // { @@ -22569,7 +23108,7 @@ in sources."cookie-signature-1.0.6" sources."vary-1.1.0" sources."moment-timezone-0.3.1" - sources."moment-2.14.1" + sources."moment-2.15.1" sources."accepts-1.3.3" sources."array-flatten-1.1.1" sources."content-disposition-0.5.1" @@ -22594,16 +23133,16 @@ in sources."destroy-1.0.4" sources."mime-1.3.4" sources."stream-consume-0.1.0" - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -22621,7 +23160,11 @@ in sources."isarray-1.0.0" ]; }) - sources."end-of-stream-1.1.0" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."help-me-0.1.0" sources."minimist-1.2.0" sources."mqtt-connection-2.1.1" @@ -22667,6 +23210,7 @@ in dependencies = [ sources."end-of-stream-1.0.0" sources."readable-stream-2.1.5" + sources."once-1.3.3" sources."isarray-1.0.0" ]; }) @@ -22704,7 +23248,7 @@ in sources."sax-1.2.1" (sources."xmlbuilder-4.2.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) (sources."feedparser-1.1.3" // { @@ -22729,7 +23273,7 @@ in (sources."form-data-1.0.1" // { dependencies = [ sources."async-2.0.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) sources."json-stringify-safe-5.0.1" @@ -22754,7 +23298,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -22771,7 +23315,7 @@ in sources."nodemailer-1.11.0" sources."poplib-0.1.7" sources."mailparser-0.6.1" - sources."imap-0.8.17" + sources."imap-0.8.18" sources."libmime-1.2.0" sources."mailcomposer-2.1.0" sources."needle-0.11.0" @@ -22799,19 +23343,21 @@ in }) sources."encoding-0.1.12" sources."uue-3.0.0" - sources."utf7-1.0.0" + sources."utf7-1.0.2" sources."twitter-ng-0.6.2" sources."oauth-0.9.14" + sources."aws4-1.4.1" sources."is-typedarray-1.0.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."asynckit-0.4.0" + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."asn1-0.2.3" sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" (sources."dashdash-1.14.0" // { dependencies = [ @@ -22824,14 +23370,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" (sources."serialport-2.1.2" // { dependencies = [ sources."nan-2.2.1" @@ -22852,6 +23394,7 @@ in sources."tar-2.2.1" (sources."tar-pack-3.1.4" // { dependencies = [ + sources."once-1.3.3" sources."readable-stream-2.1.5" sources."isarray-1.0.0" ]; @@ -22865,12 +23408,12 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."deep-extend-0.4.1" sources."ini-1.3.4" sources."strip-json-comments-1.0.4" @@ -22884,6 +23427,7 @@ in sources."define-properties-1.1.2" sources."foreach-2.0.5" ]; + buildInputs = globalBuildInputs; meta = { description = "A visual tool for wiring the Internet of Things"; homepage = http://nodered.org/; @@ -22955,15 +23499,15 @@ in sources."bytes-0.2.0" sources."pause-0.0.1" sources."mime-1.2.6" - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" sources."vows-0.8.1" sources."eyes-0.1.8" sources."diff-1.0.8" sources."glob-4.0.6" sources."graceful-fs-3.0.11" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."natives-1.1.0" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" @@ -22984,16 +23528,16 @@ in sources."tinycolor-0.0.1" sources."options-0.0.6" sources."zeparser-0.0.5" - sources."mailcomposer-3.10.0" + sources."mailcomposer-3.12.0" sources."simplesmtp-0.3.35" sources."optimist-0.6.1" - sources."buildmail-3.8.0" - sources."libmime-2.0.3" + sources."buildmail-3.10.0" + sources."libmime-2.1.0" sources."addressparser-1.0.1" sources."libbase64-0.1.0" sources."libqp-1.1.0" - sources."nodemailer-fetch-1.4.0" - sources."nodemailer-shared-1.0.5" + sources."nodemailer-fetch-1.6.0" + sources."nodemailer-shared-1.1.0" sources."iconv-lite-0.4.13" sources."rai-0.1.12" sources."xoauth2-0.1.8" @@ -23009,6 +23553,7 @@ in sources."underscore-1.7.0" sources."underscore.string-2.4.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Remote monitoring for HTTP applications"; license = "MIT"; @@ -23018,10 +23563,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "3.10.6"; + version = "3.10.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-3.10.6.tgz"; - sha1 = "a2a3d39b9e93c2afb7ca1328e39ef72ba451dd1e"; + url = "https://registry.npmjs.org/npm/-/npm-3.10.8.tgz"; + sha1 = "8f76ff8c6da04b61dd371d554ce40a0b8916c15e"; }; dependencies = [ sources."abbrev-1.0.9" @@ -23029,7 +23574,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -23039,45 +23584,49 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - sources."fstream-npm-1.1.1" + sources."fstream-npm-1.2.0" sources."glob-7.0.6" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ sources."glob-6.0.4" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" sources."lodash._baseuniq-4.6.0" - sources."lodash.clonedeep-4.3.2" - sources."lodash.union-4.4.0" - sources."lodash.uniq-4.3.0" - sources."lodash.without-4.2.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" sources."mkdirp-0.5.1" - sources."node-gyp-3.4.0" + (sources."node-gyp-3.4.0" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) sources."nopt-3.0.6" sources."normalize-git-url-3.0.2" sources."normalize-package-data-2.3.5" 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.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."retry-0.8.0" + sources."npmlog-3.1.2" ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-3.1.2" - sources."once-1.3.3" - sources."opener-1.4.1" + sources."npmlog-4.0.0" + sources."once-1.4.0" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -23089,13 +23638,13 @@ in sources."read-package-tree-5.1.5" sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" - sources."request-2.72.0" - sources."retry-0.9.0" + sources."request-2.74.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" - sources."semver-5.1.1" + sources."semver-5.3.0" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -23104,9 +23653,9 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."ansi-regex-2.0.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" @@ -23128,16 +23677,25 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" - sources."lodash._baseclone-4.5.7" - sources."lodash._baseflatten-4.2.1" - sources."lodash.rest-4.0.5" - sources."lodash._basedifference-4.5.0" sources."minimist-0.0.8" sources."path-array-1.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" sources."array-index-1.0.0" sources."debug-2.2.0" sources."es6-symbol-3.1.0" @@ -23158,21 +23716,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."are-we-there-yet-1.1.2" - sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" - sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" - sources."string-width-1.0.2" - sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.6" sources."util-extend-1.0.3" sources."json-parse-helpfulerror-1.0.3" @@ -23196,19 +23741,19 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" - sources."qs-6.1.0" + sources."qs-6.2.1" sources."stringstream-0.0.5" - sources."tough-cookie-2.2.2" + sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" sources."async-2.0.1" - sources."lodash-4.15.0" + sources."lodash-4.16.2" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -23226,14 +23771,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23247,15 +23792,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" sources."builtins-0.0.7" @@ -23264,6 +23805,7 @@ in sources."spdx-expression-parse-1.0.3" sources."spdx-license-ids-1.2.2" ]; + buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; homepage = https://docs.npmjs.com/; @@ -23308,10 +23850,10 @@ in }) sources."fs.extra-1.3.2" sources."findit-1.2.0" - sources."coffee-script-1.10.0" + sources."coffee-script-1.11.0" sources."underscore-1.4.4" sources."underscore.string-2.3.3" - sources."request-2.74.0" + sources."request-2.75.0" sources."graceful-fs-2.0.3" sources."slide-1.1.6" sources."chownr-0.0.2" @@ -23327,14 +23869,14 @@ in 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.0.0" 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -23343,17 +23885,16 @@ in sources."tunnel-agent-0.4.3" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + 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."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -23373,14 +23914,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23394,21 +23935,17 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -23422,12 +23959,12 @@ in sources."has-color-0.1.7" sources."has-unicode-2.0.1" sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" (sources."config-chain-1.1.10" // { dependencies = [ sources."ini-1.3.4" @@ -23457,6 +23994,7 @@ in sources."jsonfile-1.0.1" sources."foreachasync-3.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; homepage = https://github.com/NixOS/npm2nix; @@ -23484,14 +24022,10 @@ in sources."lodash-3.10.1" (sources."node-alias-1.0.4" // { dependencies = [ - sources."lodash-4.15.0" - ]; - }) - (sources."npm-3.10.7" // { - dependencies = [ - sources."semver-5.1.1" + sources."lodash-4.16.2" ]; }) + sources."npm-3.10.8" (sources."npmi-2.0.1" // { dependencies = [ sources."semver-4.3.6" @@ -23519,7 +24053,7 @@ in sources."ansistyles-0.1.3" sources."aproba-1.0.4" sources."archy-1.0.0" - sources."asap-2.0.4" + sources."asap-2.0.5" sources."chownr-1.0.1" sources."cmd-shim-2.0.2" sources."columnify-1.5.4" @@ -23529,45 +24063,49 @@ in sources."fs-vacuum-1.2.9" sources."fs-write-stream-atomic-1.0.8" sources."fstream-1.0.10" - sources."fstream-npm-1.1.1" + sources."fstream-npm-1.2.0" sources."glob-7.0.6" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ini-1.3.4" (sources."init-package-json-1.9.4" // { dependencies = [ sources."glob-6.0.4" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" sources."lodash._baseuniq-4.6.0" - sources."lodash.clonedeep-4.4.1" - sources."lodash.union-4.5.0" - sources."lodash.uniq-4.4.0" - sources."lodash.without-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + sources."lodash.without-4.4.0" sources."mkdirp-0.5.1" - sources."node-gyp-3.4.0" + (sources."node-gyp-3.4.0" // { + dependencies = [ + sources."npmlog-3.1.2" + ]; + }) sources."nopt-3.0.6" sources."normalize-git-url-3.0.2" sources."normalize-package-data-2.3.5" 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.1.2" // { + (sources."npm-registry-client-7.2.1" // { dependencies = [ - sources."retry-0.8.0" + sources."npmlog-3.1.2" ]; }) sources."npm-user-validate-0.1.5" - sources."npmlog-3.1.2" - sources."once-1.3.3" - sources."opener-1.4.1" + sources."npmlog-4.0.0" + sources."once-1.4.0" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -23580,11 +24118,11 @@ in sources."readable-stream-2.1.5" sources."realize-package-specifier-3.0.3" sources."request-2.74.0" - sources."retry-0.9.0" + sources."retry-0.10.0" sources."rimraf-2.5.4" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" sources."uid-number-0.0.6" @@ -23592,9 +24130,9 @@ in sources."unique-filename-1.1.0" sources."unpipe-1.0.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wrappy-1.0.2" - sources."write-file-atomic-1.1.4" + sources."write-file-atomic-1.2.0" sources."debuglog-1.0.1" sources."imurmurhash-0.1.4" sources."lodash._baseindexof-3.1.0" @@ -23615,12 +24153,25 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" sources."minimist-0.0.8" sources."path-array-1.0.1" + sources."are-we-there-yet-1.1.2" + sources."console-control-strings-1.1.0" + sources."gauge-2.6.0" + sources."set-blocking-2.0.0" + sources."delegates-1.0.0" + sources."has-color-0.1.7" + sources."object-assign-4.1.0" + sources."signal-exit-3.0.1" + sources."string-width-1.0.2" + sources."wide-align-1.1.0" + sources."code-point-at-1.0.1" + sources."is-fullwidth-code-point-1.0.0" + sources."number-is-nan-1.0.1" sources."array-index-1.0.0" sources."debug-2.2.0" sources."es6-symbol-3.1.0" @@ -23641,21 +24192,8 @@ in sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" - sources."are-we-there-yet-1.1.2" - sources."console-control-strings-1.1.0" - sources."gauge-2.6.0" - sources."set-blocking-2.0.0" - sources."delegates-1.0.0" - sources."has-color-0.1.7" - sources."object-assign-4.1.0" - sources."signal-exit-3.0.0" - sources."string-width-1.0.2" - sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" - sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" - sources."os-homedir-1.0.1" - sources."os-tmpdir-1.0.1" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.6" sources."util-extend-1.0.3" sources."buffer-shims-1.0.0" @@ -23677,7 +24215,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -23687,10 +24225,10 @@ in sources."delayed-stream-1.0.0" (sources."async-2.0.1" // { dependencies = [ - sources."lodash-4.15.0" + sources."lodash-4.16.2" ]; }) - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."generate-function-2.0.0" sources."generate-object-property-1.2.0" sources."jsonpointer-2.0.0" @@ -23701,14 +24239,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -23722,15 +24260,11 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" sources."builtins-0.0.7" @@ -23744,7 +24278,7 @@ in sources."repeating-1.1.3" sources."semver-diff-2.1.0" sources."string-length-1.0.1" - sources."uuid-2.0.2" + sources."uuid-2.0.3" sources."xdg-basedir-2.0.0" sources."package-json-1.2.0" (sources."got-3.3.1" // { @@ -23762,7 +24296,11 @@ in sources."prepend-http-1.0.4" sources."read-all-stream-3.1.0" sources."timed-out-2.0.0" - sources."end-of-stream-1.0.0" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."stream-shift-1.0.0" (sources."rc-1.1.6" // { dependencies = [ @@ -23771,8 +24309,9 @@ in }) sources."deep-extend-0.4.1" sources."strip-json-comments-1.0.4" - sources."is-finite-1.0.1" + sources."is-finite-1.0.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; homepage = https://github.com/tjunnone/npm-check-updates; @@ -23826,6 +24365,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."parse-torrent-4.1.0" + sources."once-1.3.3" sources."magnet-uri-4.2.3" sources."parse-torrent-file-2.1.4" sources."thirty-two-0.0.2" @@ -23846,8 +24386,8 @@ in sources."plist-1.2.0" sources."reverse-http-1.2.0" sources."stream-buffers-2.2.0" - sources."big-integer-1.6.15" - sources."inherits-2.0.1" + sources."big-integer-1.6.16" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -23860,14 +24400,14 @@ in sources."xmldom-0.1.22" sources."lodash-3.10.1" sources."consume-http-header-1.0.0" - sources."once-1.3.3" + sources."once-1.4.0" sources."consume-until-1.0.0" sources."http-headers-3.0.1" - sources."buffer-indexof-1.0.2" + sources."buffer-indexof-1.1.0" sources."next-line-1.1.0" sources."wrappy-1.0.2" sources."chalk-1.1.3" - sources."single-line-log-1.1.1" + sources."single-line-log-1.1.2" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -23875,14 +24415,14 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" sources."string-width-1.0.2" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."array-flatten-2.1.0" sources."deep-equal-1.0.1" sources."dns-equal-1.0.0" sources."dns-txt-2.0.2" - sources."multicast-dns-6.0.1" + sources."multicast-dns-6.1.0" sources."multicast-dns-service-types-1.1.0" sources."dns-packet-1.1.0" sources."thunky-0.1.0" @@ -23899,8 +24439,8 @@ in sources."trim-newlines-1.0.0" sources."camelcase-2.1.1" sources."currently-unhandled-0.4.1" - sources."signal-exit-3.0.0" - sources."array-find-index-1.0.1" + sources."signal-exit-3.0.1" + sources."array-find-index-1.0.2" sources."hosted-git-info-2.1.5" sources."is-builtin-module-1.0.0" sources."semver-5.3.0" @@ -23916,7 +24456,7 @@ in sources."pinkie-2.0.4" sources."load-json-file-1.1.0" sources."path-type-1.1.0" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."parse-json-2.2.0" sources."pify-2.3.0" sources."strip-bom-2.0.0" @@ -23926,7 +24466,7 @@ in sources."indent-string-2.1.0" sources."strip-indent-1.0.1" sources."repeating-2.0.1" - sources."is-finite-1.0.1" + sources."is-finite-1.0.2" sources."get-stdin-4.0.1" sources."cli-width-1.1.1" sources."figures-1.7.0" @@ -23943,14 +24483,18 @@ in sources."blob-to-buffer-1.2.6" sources."magnet-uri-5.1.4" sources."parse-torrent-file-4.0.0" - sources."simple-get-2.2.2" + sources."simple-get-2.2.3" sources."thirty-two-1.0.2" sources."uniq-1.0.1" sources."bencode-0.10.0" sources."simple-sha1-2.0.8" - sources."rusha-0.8.3" - sources."unzip-response-1.0.0" - sources."end-of-stream-1.0.0" + sources."rusha-0.8.4" + sources."unzip-response-1.0.1" + (sources."end-of-stream-1.0.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."deep-extend-0.2.11" sources."strip-json-comments-0.1.3" sources."ini-1.1.0" @@ -23992,11 +24536,11 @@ in sources."speedometer-0.1.4" sources."utp-0.0.7" sources."cyclist-0.1.1" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -24012,7 +24556,7 @@ in }) sources."debug-2.2.0" sources."re-emitter-1.1.3" - sources."buffer-equals-1.0.3" + sources."buffer-equals-1.0.4" sources."k-bucket-0.6.0" (sources."k-rpc-3.7.0" // { dependencies = [ @@ -24037,6 +24581,7 @@ in sources."ultron-1.0.2" sources."ms-0.7.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; homepage = https://github.com/mafintosh/peerflix; @@ -24070,6 +24615,7 @@ in dependencies = [ sources."end-of-stream-0.1.5" sources."mkdirp-0.3.5" + sources."once-1.3.3" ]; }) sources."fluent-ffmpeg-2.1.0" @@ -24082,7 +24628,7 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."ee-first-1.1.0" sources."media-typer-0.3.0" sources."mime-types-2.0.14" @@ -24156,8 +24702,12 @@ in sources."keypress-0.1.0" sources."mime-1.2.11" sources."minimist-0.0.8" - sources."end-of-stream-1.1.0" - sources."once-1.3.3" + (sources."end-of-stream-1.1.0" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) + sources."once-1.4.0" sources."wrappy-1.0.2" sources."magnet-uri-2.0.1" (sources."parse-torrent-4.1.0" // { @@ -24176,7 +24726,7 @@ in sources."flatten-0.0.1" sources."bencode-0.7.0" sources."simple-sha1-2.0.8" - sources."rusha-0.8.3" + sources."rusha-0.8.4" sources."form-data-0.0.10" sources."hawk-0.10.2" sources."node-uuid-1.4.7" @@ -24244,7 +24794,7 @@ in sources."string2compact-1.2.2" sources."ms-0.7.1" sources."ip-regex-1.0.3" - sources."unzip-response-1.0.0" + sources."unzip-response-1.0.1" sources."ipaddr.js-1.2.0" sources."bn.js-1.3.0" sources."extend.js-0.0.2" @@ -24261,17 +24811,18 @@ in }) sources."fifo-0.1.4" sources."speedometer-0.1.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for node.js with web ui."; homepage = "https://github.com/asapach/peerflix-server#readme"; @@ -24295,12 +24846,12 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."mkdirp-0.5.0" sources."yauzl-2.4.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."typedarray-0.0.6" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" @@ -24311,16 +24862,16 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -24334,7 +24885,7 @@ 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -24349,17 +24900,17 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.0.1" - sources."lodash-4.15.0" - sources."mime-db-1.23.0" + sources."lodash-4.16.2" + sources."mime-db-1.24.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24373,14 +24924,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" @@ -24388,7 +24935,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -24404,6 +24951,7 @@ in sources."throttleit-1.0.0" sources."isexe-1.1.2" ]; + buildInputs = globalBuildInputs; meta = { description = "Headless WebKit with JS API"; homepage = https://github.com/Medium/phantomjs; @@ -24430,7 +24978,7 @@ in sources."commander-2.9.0" sources."detective-4.3.1" sources."glob-5.0.15" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."iconv-lite-0.4.13" sources."mkdirp-0.5.1" sources."private-0.1.6" @@ -24440,10 +24988,10 @@ in sources."acorn-1.2.2" sources."defined-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -24455,6 +25003,7 @@ in sources."base62-0.1.1" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; homepage = https://facebook.github.io/react; @@ -24525,15 +25074,15 @@ in sources."core-util-is-1.0.2" sources."isarray-0.0.1" sources."string_decoder-0.10.31" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."keypress-0.1.0" sources."mime-1.2.11" sources."ms-0.7.1" sources."oauth-https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master" sources."request-2.9.203" - (sources."openid-2.0.2" // { + (sources."openid-2.0.6" // { dependencies = [ - sources."request-2.74.0" + sources."request-2.75.0" sources."node-uuid-1.4.7" sources."qs-6.2.1" ]; @@ -24554,7 +25103,7 @@ in 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.0.0" (sources."har-validator-2.0.6" // { dependencies = [ sources."commander-2.9.0" @@ -24565,7 +25114,7 @@ in sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."oauth-sign-0.8.2" sources."stringstream-0.0.5" sources."tough-cookie-2.3.1" @@ -24573,10 +25122,9 @@ in sources."process-nextick-args-1.0.7" sources."util-deprecate-1.0.2" sources."delayed-stream-1.0.0" - sources."async-2.0.1" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -24596,14 +25144,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24617,17 +25165,14 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" sources."events.node-0.4.9" ]; + buildInputs = globalBuildInputs; meta = { }; production = true; @@ -24640,6 +25185,7 @@ in url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; }; + buildInputs = globalBuildInputs; meta = { description = "The semantic version parser used by npm."; homepage = "https://github.com/npm/node-semver#readme"; @@ -24682,7 +25228,7 @@ in sources."depd-1.1.0" ]; }) - (sources."request-2.74.0" // { + (sources."request-2.75.0" // { dependencies = [ sources."qs-6.2.1" ]; @@ -24697,11 +25243,12 @@ in sources."lunr-0.7.1" sources."render-readme-1.3.1" sources."jju-1.3.0" - sources."JSONStream-1.1.4" + sources."JSONStream-1.2.1" sources."mkdirp-0.5.1" sources."sinopia-htpasswd-0.4.5" (sources."http-errors-1.5.0" // { dependencies = [ + sources."inherits-2.0.1" sources."setprototypeof-1.0.1" sources."statuses-1.3.0" ]; @@ -24757,9 +25304,9 @@ in sources."type-is-1.6.13" sources."vary-1.0.1" sources."utils-merge-1.0.0" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."negotiator-0.5.3" - sources."mime-db-1.23.0" + sources."mime-db-1.24.0" sources."ms-0.7.1" sources."unpipe-1.0.0" sources."ee-first-1.1.1" @@ -24769,7 +25316,7 @@ in sources."destroy-1.0.3" sources."mime-1.3.4" sources."statuses-1.2.1" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."media-typer-0.3.0" sources."raw-body-1.3.4" sources."bytes-1.0.0" @@ -24777,7 +25324,7 @@ in sources."compressible-2.0.8" sources."on-headers-1.0.1" sources."graceful-readlink-1.0.1" - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."keygrip-1.0.1" @@ -24792,11 +25339,7 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - ]; - }) + sources."form-data-2.0.0" sources."har-validator-2.0.6" sources."hawk-3.1.3" sources."http-signature-1.1.1" @@ -24814,9 +25357,9 @@ in sources."string_decoder-0.10.31" sources."util-deprecate-1.0.2" sources."delayed-stream-1.0.0" - sources."lodash-4.15.0" + sources."asynckit-0.4.0" sources."chalk-1.1.3" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -24835,14 +25378,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -24856,20 +25399,16 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."lru-cache-2.7.3" sources."sigmund-1.0.1" sources."dtrace-provider-0.6.0" sources."mv-2.1.1" sources."safe-json-stringify-1.0.3" - sources."moment-2.14.1" + sources."moment-2.15.1" sources."nan-2.4.0" sources."ncp-2.0.0" sources."rimraf-2.4.5" @@ -24879,7 +25418,7 @@ in ]; }) sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" @@ -24898,7 +25437,7 @@ in sources."entities-1.1.1" sources."linkify-it-1.2.4" sources."mdurl-1.0.1" - sources."uc.micro-1.0.2" + sources."uc.micro-1.0.3" (sources."htmlparser2-3.9.1" // { dependencies = [ sources."readable-stream-2.1.5" @@ -24918,6 +25457,7 @@ in sources."through-2.3.8" sources."minimist-0.0.8" ]; + buildInputs = globalBuildInputs; meta = { description = "Private npm repository server"; homepage = https://github.com/rlidwka/sinopia; @@ -24943,7 +25483,7 @@ in sources."readdirp-2.1.0" sources."colors-1.0.3" sources."graceful-readlink-1.0.1" - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."minimatch-3.0.3" sources."readable-stream-2.1.5" sources."set-immediate-shim-1.0.1" @@ -24952,12 +25492,13 @@ in sources."concat-map-0.0.1" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + 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" ]; + buildInputs = globalBuildInputs; meta = { description = "sloc is a simple tool to count SLOC (source lines of code)"; homepage = "https://github.com/flosse/sloc#readme"; @@ -25011,6 +25552,7 @@ in }) sources."verror-1.1.0" sources."extsprintf-1.0.0" + sources."json-schema-0.2.2" ]; }) sources."cmdln-3.2.1" @@ -25031,7 +25573,7 @@ in sources."mime-1.3.4" sources."negotiator-0.5.3" sources."node-uuid-1.4.7" - sources."once-1.3.3" + sources."once-1.4.0" sources."qs-3.1.0" sources."semver-4.3.6" sources."spdy-1.32.5" @@ -25061,9 +25603,9 @@ in sources."minimist-0.0.8" sources."glob-6.0.4" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" @@ -25079,13 +25621,13 @@ in }) ]; }) - (sources."jsprim-1.3.0" // { + (sources."jsprim-1.3.1" // { dependencies = [ sources."extsprintf-1.0.2" sources."verror-1.3.6" ]; }) - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."readable-stream-2.1.5" sources."buffer-shims-1.0.0" sources."isarray-1.0.0" @@ -25097,6 +25639,7 @@ in sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Client SDK and CLI for the Joyent SmartDataCenter API"; homepage = "https://github.com/joyent/node-smartdc#readme"; @@ -25122,16 +25665,17 @@ in sources."ms-0.7.1" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."minimatch-3.0.3" - sources."once-1.3.3" - sources."path-is-absolute-1.0.0" + sources."once-1.4.0" + sources."path-is-absolute-1.0.1" sources."wrappy-1.0.2" sources."brace-expansion-1.1.6" sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Robust, expressive, and feature-rich CSS superset"; homepage = https://github.com/stylus/stylus; @@ -25142,10 +25686,10 @@ in svgo = nodeEnv.buildNodePackage { name = "svgo"; packageName = "svgo"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/svgo/-/svgo-0.7.0.tgz"; - sha1 = "51a95c5f7aaa98824f92857ac14c2cdbe81537aa"; + url = "https://registry.npmjs.org/svgo/-/svgo-0.7.1.tgz"; + sha1 = "287320fed972cb097e72c2bb1685f96fe08f8034"; }; dependencies = [ sources."sax-1.2.1" @@ -25156,7 +25700,7 @@ in sources."mkdirp-0.5.1" sources."csso-2.2.1" sources."q-1.4.1" - sources."argparse-1.0.7" + sources."argparse-1.0.9" sources."esprima-2.7.3" sources."sprintf-js-1.0.3" sources."minimist-0.0.8" @@ -25170,6 +25714,7 @@ in sources."supports-color-2.0.0" sources."ansi-regex-2.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; homepage = https://github.com/svg/svgo; @@ -25180,10 +25725,10 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.0.9"; + version = "5.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.0.9.tgz"; - sha1 = "113f5f986b5e39e92db0d5d0ba5b2b1f237504e7"; + url = "https://registry.npmjs.org/titanium/-/titanium-5.0.10.tgz"; + sha1 = "9bbae581957b33265a71774e8fd9f4766441bf1d"; }; dependencies = [ sources."async-1.4.2" @@ -25244,7 +25789,7 @@ in ]; }) sources."json-stringify-safe-5.0.1" - sources."mime-types-2.1.11" + sources."mime-types-2.1.12" sources."qs-4.0.0" sources."tunnel-agent-0.4.3" sources."tough-cookie-2.3.1" @@ -25258,13 +25803,13 @@ in sources."har-validator-1.8.0" sources."readable-stream-2.0.6" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + 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."lodash-4.15.0" - sources."mime-db-1.23.0" + sources."lodash-4.16.2" + sources."mime-db-1.24.0" sources."assert-plus-0.1.5" sources."asn1-0.1.11" sources."ctype-0.5.3" @@ -25276,7 +25821,7 @@ in sources."bluebird-2.11.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -25298,13 +25843,14 @@ in sources."camelcase-1.2.1" sources."decamelize-1.2.0" sources."window-size-0.1.0" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."rimraf-2.2.8" sources."cycle-1.0.3" sources."eyes-0.1.8" sources."pkginfo-0.3.1" sources."stack-trace-0.0.9" ]; + buildInputs = globalBuildInputs; meta = { description = "Appcelerator Titanium Command line"; homepage = "https://github.com/appcelerator/titanium#readme"; @@ -25315,11 +25861,12 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "1.8.10"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-1.8.10.tgz"; - sha1 = "b475d6e0dff0bf50f296e5ca6ef9fbb5c7320f1e"; + url = "https://registry.npmjs.org/typescript/-/typescript-2.0.3.tgz"; + sha1 = "33dec9eae86b8eee327dd419ca050c853cabd514"; }; + buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; homepage = http://typescriptlang.org/; @@ -25354,6 +25901,7 @@ in sources."repeat-string-1.5.4" sources."is-buffer-1.1.4" ]; + buildInputs = globalBuildInputs; meta = { description = "JavaScript parser, mangler/compressor and beautifier toolkit"; homepage = http://lisperator.net/uglifyjs; @@ -25372,7 +25920,7 @@ in dependencies = [ sources."async-2.0.1" sources."bluebird-3.3.5" - sources."blueimp-md5-2.3.0" + sources."blueimp-md5-2.3.1" sources."body-parser-1.15.2" sources."color-0.11.3" sources."cookie-parser-1.4.3" @@ -25421,11 +25969,11 @@ in }) (sources."npm-registry-client-7.1.2" // { dependencies = [ - sources."request-2.74.0" + sources."request-2.75.0" sources."retry-0.8.0" sources."combined-stream-1.0.5" sources."forever-agent-0.6.1" - sources."form-data-1.0.1" + sources."form-data-2.0.0" sources."hawk-3.1.3" sources."json-stringify-safe-5.0.1" sources."oauth-sign-0.8.2" @@ -25440,7 +25988,7 @@ in }) sources."octicons-3.5.0" sources."open-0.0.5" - sources."os-homedir-1.0.1" + sources."os-homedir-1.0.2" sources."passport-0.3.2" sources."passport-local-1.0.0" (sources."raven-0.11.0" // { @@ -25508,10 +26056,10 @@ in sources."ee-first-1.1.1" sources."unpipe-1.0.0" sources."media-typer-0.3.0" - sources."mime-types-2.1.11" - sources."mime-db-1.23.0" + sources."mime-types-2.1.12" + sources."mime-db-1.24.0" sources."clone-1.0.2" - sources."color-convert-1.4.0" + sources."color-convert-1.5.0" sources."color-string-0.3.0" sources."color-name-1.1.1" sources."cookie-0.3.1" @@ -25645,7 +26193,7 @@ in sources."minimatch-3.0.3" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."has-unicode-2.0.1" sources."hosted-git-info-2.1.5" sources."iferr-0.1.5" @@ -25656,7 +26204,7 @@ in sources."minimatch-3.0.3" ]; }) - sources."lockfile-1.0.1" + sources."lockfile-1.0.2" sources."lodash._baseuniq-4.6.0" sources."lodash.clonedeep-4.3.2" sources."lodash.union-4.4.0" @@ -25682,9 +26230,9 @@ in sources."npm-user-validate-0.1.5" sources."npmlog-2.0.4" sources."once-1.3.3" - sources."opener-1.4.1" + sources."opener-1.4.2" sources."osenv-0.1.3" - sources."path-is-inside-1.0.1" + sources."path-is-inside-1.0.2" sources."read-1.0.7" sources."read-cmd-shim-1.0.1" sources."read-installed-4.0.3" @@ -25700,7 +26248,7 @@ in sources."retry-0.9.0" sources."sha-2.0.1" sources."slide-1.1.6" - sources."sorted-object-2.0.0" + sources."sorted-object-2.0.1" sources."strip-ansi-3.0.1" sources."tar-2.2.1" sources."text-table-0.2.0" @@ -25708,7 +26256,7 @@ in sources."umask-1.1.0" sources."unique-filename-1.1.0" sources."validate-npm-package-name-2.2.2" - sources."which-1.2.10" + sources."which-1.2.11" sources."wrappy-1.0.2" sources."write-file-atomic-1.1.4" sources."ansi-regex-2.0.0" @@ -25725,7 +26273,7 @@ in sources."wcwidth-1.0.1" sources."defaults-1.0.3" sources."proto-list-1.2.4" - sources."asap-2.0.4" + sources."asap-2.0.5" (sources."fstream-ignore-1.0.5" // { dependencies = [ sources."minimatch-3.0.3" @@ -25735,7 +26283,7 @@ in sources."balanced-match-0.4.2" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."promzard-0.3.0" sources."lodash._createset-4.0.3" sources."lodash._root-3.0.1" @@ -25759,7 +26307,7 @@ in sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" sources."lodash.padstart-4.6.1" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."mute-stream-0.0.6" sources."util-extend-1.0.3" sources."json-parse-helpfulerror-1.0.3" @@ -25787,7 +26335,7 @@ in sources."tough-cookie-2.2.2" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -25801,14 +26349,14 @@ in sources."is-property-1.0.2" sources."pinkie-2.0.4" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -25822,14 +26370,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."block-stream-0.0.9" sources."unique-slug-2.0.0" sources."builtins-0.0.7" @@ -25843,6 +26387,7 @@ in ]; }) sources."typedarray-0.0.6" + sources."asynckit-0.4.0" sources."passport-strategy-1.0.0" sources."pause-0.0.1" sources."lsmod-1.0.0" @@ -25952,10 +26497,11 @@ in sources."is-utf8-0.2.1" sources."read-pkg-1.1.0" sources."path-type-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" ]; + buildInputs = globalBuildInputs; meta = { description = "Git made easy"; homepage = "https://github.com/FredrikNoren/ungit#readme"; @@ -25981,14 +26527,14 @@ in sources."kew-0.7.0" ]; }) - sources."tmp-0.0.28" + sources."tmp-0.0.29" sources."follow-redirects-0.0.3" (sources."config-chain-1.1.10" // { dependencies = [ sources."ini-1.3.4" ]; }) - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."once-1.3.3" sources."osenv-0.0.3" sources."nopt-2.2.1" @@ -26007,7 +26553,7 @@ in sources."progress-1.1.8" sources."request-2.67.0" sources."request-progress-2.0.1" - sources."which-1.2.10" + sources."which-1.2.11" sources."concat-stream-1.5.0" sources."debug-0.7.4" sources."yauzl-2.4.1" @@ -26021,12 +26567,12 @@ in sources."minimist-0.0.8" sources."fd-slicer-1.0.1" sources."pend-1.2.0" - sources."graceful-fs-4.1.6" - sources."jsonfile-2.3.1" + sources."graceful-fs-4.1.9" + sources."jsonfile-2.4.0" sources."klaw-1.3.0" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."rimraf-2.5.4" - sources."glob-7.0.6" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" sources."minimatch-3.0.3" @@ -26042,7 +26588,7 @@ 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."qs-5.2.1" sources."tunnel-agent-0.4.3" @@ -26057,17 +26603,17 @@ in sources."is-typedarray-1.0.0" sources."har-validator-2.0.6" sources."async-2.0.1" - sources."lodash-4.15.0" - sources."mime-db-1.23.0" + sources."lodash-4.16.2" + sources."mime-db-1.24.0" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -26081,14 +26627,10 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) + sources."bcrypt-pbkdf-1.0.0" sources."hoek-2.16.3" sources."boom-2.10.1" sources."cryptiles-2.0.5" @@ -26096,7 +26638,7 @@ in sources."delayed-stream-1.0.0" sources."chalk-1.1.3" sources."commander-2.9.0" - sources."is-my-json-valid-2.13.1" + sources."is-my-json-valid-2.14.0" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" sources."has-ansi-2.0.0" @@ -26111,9 +26653,10 @@ in sources."is-property-1.0.2" sources."throttleit-1.0.0" sources."isexe-1.1.2" - sources."os-tmpdir-1.0.1" + sources."os-tmpdir-1.0.2" sources."underscore-1.8.3" ]; + buildInputs = globalBuildInputs; meta = { description = "NPM wrapper for Selenium Webdriver including Chromedriver / IEDriver / IOSDriver / Ghostdriver"; homepage = https://github.com/uxebu/webdrvr; @@ -26139,7 +26682,7 @@ in }) sources."acorn-3.3.0" sources."interpret-0.6.6" - sources."loader-utils-0.2.15" + sources."loader-utils-0.2.16" sources."memory-fs-0.3.0" sources."mkdirp-0.5.1" (sources."node-libs-browser-0.6.0" // { @@ -26166,7 +26709,7 @@ in sources."source-map-0.4.4" ]; }) - sources."graceful-fs-4.1.6" + sources."graceful-fs-4.1.9" sources."big.js-3.1.3" sources."emojis-list-2.0.1" sources."json5-0.5.0" @@ -26176,7 +26719,7 @@ in sources."prr-0.0.0" sources."buffer-shims-1.0.0" sources."core-util-is-1.0.2" - sources."inherits-2.0.1" + sources."inherits-2.0.3" sources."isarray-1.0.0" sources."process-nextick-args-1.0.7" sources."string_decoder-0.10.31" @@ -26210,10 +26753,14 @@ in sources."punycode-1.3.2" ]; }) - sources."util-0.10.3" + (sources."util-0.10.3" // { + dependencies = [ + sources."inherits-2.0.1" + ]; + }) sources."vm-browserify-0.0.4" sources."pako-0.2.9" - sources."base64-js-1.1.2" + sources."base64-js-1.2.0" sources."ieee754-1.1.6" sources."date-now-0.1.4" sources."pbkdf2-compat-2.0.1" @@ -26249,7 +26796,7 @@ in sources."glob-parent-2.0.0" sources."is-binary-path-1.0.1" sources."is-glob-2.0.1" - sources."path-is-absolute-1.0.0" + sources."path-is-absolute-1.0.1" sources."readdirp-2.1.0" sources."fsevents-1.0.14" sources."arrify-1.0.1" @@ -26276,7 +26823,7 @@ in sources."is-posix-bracket-0.1.1" sources."for-own-0.1.4" sources."is-extendable-0.1.1" - sources."for-in-0.1.5" + sources."for-in-0.1.6" sources."glob-base-0.3.0" sources."is-dotfile-1.0.2" sources."is-equal-shallow-0.1.3" @@ -26296,11 +26843,15 @@ in sources."minimist-1.2.0" ]; }) - sources."request-2.74.0" + sources."request-2.75.0" sources."rimraf-2.5.4" sources."semver-5.3.0" sources."tar-2.2.1" - sources."tar-pack-3.1.4" + (sources."tar-pack-3.1.4" // { + dependencies = [ + sources."once-1.3.3" + ]; + }) sources."abbrev-1.0.9" sources."are-we-there-yet-1.1.2" sources."console-control-strings-1.1.0" @@ -26310,13 +26861,13 @@ in sources."aproba-1.0.4" sources."has-color-0.1.7" sources."has-unicode-2.0.1" - sources."signal-exit-3.0.0" + sources."signal-exit-3.0.1" sources."string-width-1.0.2" sources."strip-ansi-3.0.1" sources."wide-align-1.1.0" - sources."code-point-at-1.0.0" + sources."code-point-at-1.0.1" sources."is-fullwidth-code-point-1.0.0" - sources."number-is-nan-1.0.0" + sources."number-is-nan-1.0.1" sources."ansi-regex-2.0.0" sources."deep-extend-0.4.1" sources."ini-1.3.4" @@ -26332,18 +26883,14 @@ in sources."combined-stream-1.0.5" sources."extend-3.0.0" sources."forever-agent-0.6.1" - (sources."form-data-1.0.1" // { - dependencies = [ - sources."async-2.0.1" - ]; - }) + sources."form-data-2.0.0" 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.11" + sources."mime-types-2.1.12" sources."node-uuid-1.4.7" sources."oauth-sign-0.8.2" sources."qs-6.2.1" @@ -26351,14 +26898,14 @@ in sources."tough-cookie-2.3.1" sources."tunnel-agent-0.4.3" sources."delayed-stream-1.0.0" - sources."lodash-4.15.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.13.1" + sources."is-my-json-valid-2.14.0" sources."pinkie-promise-2.0.1" sources."ansi-styles-2.2.1" sources."escape-string-regexp-1.0.5" @@ -26375,14 +26922,14 @@ in sources."cryptiles-2.0.5" sources."sntp-1.0.9" sources."assert-plus-0.2.0" - sources."jsprim-1.3.0" - (sources."sshpk-1.10.0" // { + sources."jsprim-1.3.1" + (sources."sshpk-1.10.1" // { dependencies = [ sources."assert-plus-1.0.0" ]; }) sources."extsprintf-1.0.2" - sources."json-schema-0.2.2" + sources."json-schema-0.2.3" sources."verror-1.3.6" sources."asn1-0.2.3" (sources."dashdash-1.14.0" // { @@ -26396,19 +26943,15 @@ in ]; }) sources."jsbn-0.1.0" - sources."tweetnacl-0.13.3" + sources."tweetnacl-0.14.3" sources."jodid25519-1.0.2" sources."ecc-jsbn-0.1.1" - (sources."bcrypt-pbkdf-1.0.0" // { - dependencies = [ - sources."tweetnacl-0.14.3" - ]; - }) - sources."mime-db-1.23.0" - sources."glob-7.0.6" + sources."bcrypt-pbkdf-1.0.0" + sources."mime-db-1.24.0" + sources."glob-7.1.0" sources."fs.realpath-1.0.0" sources."inflight-1.0.5" - sources."once-1.3.3" + sources."once-1.4.0" sources."wrappy-1.0.2" sources."block-stream-0.0.9" sources."fstream-1.0.10" @@ -26419,6 +26962,7 @@ in sources."source-list-map-0.1.6" sources."amdefine-1.0.0" ]; + buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jade, coffee, css, less, ... and your custom stuff."; homepage = https://github.com/webpack/webpack; @@ -26434,6 +26978,7 @@ in url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz"; sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1"; }; + buildInputs = globalBuildInputs; meta = { description = "Extract content from websites using CSS Selectors and XPath"; homepage = "https://github.com/osener/wring#readme"; diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 650f2642013..1bd4014d35a 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -7,10 +7,13 @@ , "castnow" , "coffee-script" , "cordova" +, "csslint" , "dnschain" , "docker-registry-server" , "elasticdump" +, "emoj" , "eslint" +, "emojione" , "fetch-bower" , "forever" , "git-run" @@ -18,6 +21,7 @@ , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " } , "gulp" , "hipache" +, "htmlhint" , "istanbul" , "jayschema" , "jshint" diff --git a/pkgs/development/ocaml-modules/ansiterminal/default.nix b/pkgs/development/ocaml-modules/ansiterminal/default.nix index 615e1d1b673..7edd0ddda5e 100644 --- a/pkgs/development/ocaml-modules/ansiterminal/default.nix +++ b/pkgs/development/ocaml-modules/ansiterminal/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1j9kflv2i16vf9hy031cl6z8hv6791mjbhnd9bw07y1pswdlx1r6"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; diff --git a/pkgs/development/ocaml-modules/async/default.nix b/pkgs/development/ocaml-modules/async/default.nix index 2b84519036c..498315f9cbf 100644 --- a/pkgs/development/ocaml-modules/async/default.nix +++ b/pkgs/development/ocaml-modules/async/default.nix @@ -1,5 +1,5 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, - async_unix, async_extra, pa_ounit}: +{stdenv, buildOcaml, fetchurl, async_kernel_p4, + async_unix_p4, async_extra_p4, pa_ounit}: buildOcaml rec { name = "async"; @@ -12,7 +12,7 @@ buildOcaml rec { sha256 = "ecc4ca939ab098e689332921b110dbaacd06d9f8d8bf697023dfff3ca37dc1e9"; }; - propagatedBuildInputs = [ async_kernel async_unix async_extra pa_ounit ]; + propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 async_extra_p4 pa_ounit ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async; diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix index 2d1e1dea69c..80addcfc3bb 100644 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ b/pkgs/development/ocaml-modules/async_extra/default.nix @@ -1,6 +1,6 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, async_unix, - bin_prot, core, custom_printf, fieldslib, herelib, pa_ounit, - pipebang, pa_test, sexplib}: +{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix_p4, + bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit, + pipebang, pa_test, sexplib_p4}: buildOcaml rec { name = "async_extra"; @@ -14,8 +14,8 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel async_unix core bin_prot custom_printf - fieldslib herelib pipebang sexplib ]; + propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 core_p4 bin_prot_p4 custom_printf + fieldslib_p4 herelib pipebang sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_extra; diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix index ae10e931ce2..d0e89940433 100644 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ b/pkgs/development/ocaml-modules/async_find/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core, sexplib}: +{stdenv, buildOcaml, fetchurl, async_p4, core_p4, sexplib_p4}: buildOcaml rec { name = "async_find"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; }; - propagatedBuildInputs = [ async core sexplib ]; + propagatedBuildInputs = [ async_p4 core_p4 sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_find; diff --git a/pkgs/development/ocaml-modules/async_kernel/default.nix b/pkgs/development/ocaml-modules/async_kernel/default.nix index 8c0d8d7c851..43fde1631ac 100644 --- a/pkgs/development/ocaml-modules/async_kernel/default.nix +++ b/pkgs/development/ocaml-modules/async_kernel/default.nix @@ -1,6 +1,6 @@ -{stdenv, buildOcaml, fetchurl, core_kernel, - bin_prot, fieldslib, pa_ounit, pa_test, - sexplib, herelib}: +{stdenv, buildOcaml, fetchurl, core_kernel_p4, + bin_prot_p4, fieldslib_p4, pa_ounit, pa_test, + sexplib_p4, herelib}: buildOcaml rec { name = "async_kernel"; @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; + propagatedBuildInputs = [ core_kernel_p4 bin_prot_p4 fieldslib_p4 herelib sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_kernel; diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix index 75755833a5f..6b1e772bc7d 100644 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ b/pkgs/development/ocaml-modules/async_shell/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, async, core, core_extended}: +{stdenv, buildOcaml, fetchurl, async_p4, core_p4, core_extended_p4}: buildOcaml rec { name = "async_shell"; @@ -11,7 +11,7 @@ buildOcaml rec { sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; }; - propagatedBuildInputs = [ async core core_extended ]; + propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_shell; diff --git a/pkgs/development/ocaml-modules/async_ssl/default.nix b/pkgs/development/ocaml-modules/async_ssl/default.nix index 527d56ceaa0..2bace35aa8b 100644 --- a/pkgs/development/ocaml-modules/async_ssl/default.nix +++ b/pkgs/development/ocaml-modules/async_ssl/default.nix @@ -1,5 +1,5 @@ -{stdenv, buildOcaml, fetchurl, async, comparelib, core, ctypes, openssl, - fieldslib, herelib, pa_bench, pa_ounit, pipebang, pa_test, sexplib}: +{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"; @@ -13,8 +13,8 @@ buildOcaml rec { }; buildInputs = [ pa_bench pa_test ]; - propagatedBuildInputs = [ ctypes async comparelib core fieldslib pa_ounit - herelib pipebang sexplib openssl ]; + 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; diff --git a/pkgs/development/ocaml-modules/async_unix/default.nix b/pkgs/development/ocaml-modules/async_unix/default.nix index 81fbd6a9918..6119bcac876 100644 --- a/pkgs/development/ocaml-modules/async_unix/default.nix +++ b/pkgs/development/ocaml-modules/async_unix/default.nix @@ -1,6 +1,6 @@ -{stdenv, buildOcaml, fetchurl, async_kernel, - bin_prot, comparelib, core, fieldslib, herelib, pa_ounit, - pipebang, pa_test, sexplib}: +{stdenv, buildOcaml, fetchurl, async_kernel_p4, + bin_prot_p4, comparelib, core_p4, fieldslib_p4, herelib, pa_ounit, + pipebang, pa_test, sexplib_p4}: buildOcaml rec { name = "async_unix"; @@ -15,8 +15,8 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ async_kernel core bin_prot comparelib - fieldslib herelib pipebang pa_test sexplib ]; + propagatedBuildInputs = [ async_kernel_p4 core_p4 bin_prot_p4 comparelib + fieldslib_p4 herelib pipebang pa_test sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/async_unix; diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index aabb9f8a76a..8128dc1cb6f 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "2.0.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1nv55gwq5vaxmrcz9ja2s165b1p9fhcxszc1l76043gpa56qm4fs"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix index 0c01a946e5a..904a214c34f 100644 --- a/pkgs/development/ocaml-modules/batteries/default.nix +++ b/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, qtest }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, qtest }: let version = "2.5.2"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "01v7sp8vsqlfrmpji5pkrsjl43r3q8hk1a4z4lmyy9y2i0fqwl07"; }; - buildInputs = [ ocaml findlib qtest ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ]; configurePhase = "true"; # Skip configure diff --git a/pkgs/development/ocaml-modules/bolt/default.nix b/pkgs/development/ocaml-modules/bolt/default.nix index cf8b21edb50..5d1fe8aa0d1 100644 --- a/pkgs/development/ocaml-modules/bolt/default.nix +++ b/pkgs/development/ocaml-modules/bolt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, which, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, which, camlp4 }: let inherit (stdenv.lib) getVersion versionAtLeast; in @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "1c807wrpxra9sbb34lajhimwra28ldxv04m570567lh2b04n38zy"; }; - buildInputs = [ ocaml findlib which camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild which camlp4 ]; patchPhase = '' patch myocamlbuild.ml < install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/cohttp/default.nix b/pkgs/development/ocaml-modules/cohttp/default.nix index 9a30a5e4615..dcf3c8c13d7 100644 --- a/pkgs/development/ocaml-modules/cohttp/default.nix +++ b/pkgs/development/ocaml-modules/cohttp/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib, sexplib, conduit, +{stdenv, buildOcaml, fetchurl, cmdliner, re, uri, fieldslib_p4, sexplib_p4, conduit, stringext, base64, magic-mime, ounit, alcotest, lwt ? null, async ? null, async_ssl ? null}: @@ -14,7 +14,7 @@ buildOcaml rec { }; buildInputs = [ alcotest ]; - propagatedBuildInputs = [ cmdliner re uri fieldslib sexplib sexplib + propagatedBuildInputs = [ cmdliner re uri fieldslib_p4 sexplib_p4 sexplib_p4 conduit stringext base64 magic-mime ounit async async_ssl lwt ]; diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index dbb83f4c8cf..26accd99db6 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, sexplib, stringext, uri, cstruct, ipaddr, +{stdenv, buildOcaml, fetchurl, sexplib_p4, stringext, uri, cstruct, ipaddr, async ? null, async_ssl ? null, lwt ? null}: buildOcaml rec { @@ -10,7 +10,7 @@ buildOcaml rec { sha256 = "5cf1a46aa0254345e5143feebe6b54bdef96314e9987f44e69f24618d620faa1"; }; - propagatedBuildInputs = ([ sexplib stringext uri cstruct ipaddr ] + propagatedBuildInputs = ([ sexplib_p4 stringext uri cstruct ipaddr ] ++ stdenv.lib.optional (lwt != null) lwt ++ stdenv.lib.optional (async != null) async ++ stdenv.lib.optional (async_ssl != null) async_ssl); diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index fbbf0fc7414..4719cd300c1 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, cppo, gen, sequence, qtest, ounit, ocaml_oasis, result , qcheck }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation { sha256 = "169j8vqg8h70wbldjg610jqikfk23ggw8zypmpzv3piym5p1dfiw"; }; - buildInputs = [ ocaml findlib cppo gen sequence qtest ounit ocaml_oasis qcheck ]; + buildInputs = [ ocaml findlib ocamlbuild cppo gen sequence qtest ounit ocaml_oasis qcheck ]; propagatedBuildInputs = [ result ]; diff --git a/pkgs/development/ocaml-modules/core/default.nix b/pkgs/development/ocaml-modules/core/default.nix index 96fd80087d6..4da4d16df7d 100644 --- a/pkgs/development/ocaml-modules/core/default.nix +++ b/pkgs/development/ocaml-modules/core/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, - core_kernel, bin_prot, comparelib, custom_printf, enumerate, - fieldslib, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib, typerep, variantslib}: + core_kernel_p4, bin_prot_p4, comparelib, custom_printf, enumerate, + fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, + pipebang, sexplib_p4, typerep_p4, variantslib_p4}: buildOcaml rec { name = "core"; @@ -17,9 +17,9 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv core_kernel bin_prot comparelib - custom_printf enumerate fieldslib herelib - pipebang sexplib typerep variantslib ]; + propagatedBuildInputs = [ type_conv core_kernel_p4 bin_prot_p4 comparelib + custom_printf enumerate fieldslib_p4 herelib + pipebang sexplib_p4 typerep_p4 variantslib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core; diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix index f311aae3d30..fef4fd81158 100644 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ b/pkgs/development/ocaml-modules/core_extended/default.nix @@ -1,5 +1,5 @@ -{stdenv, buildOcaml, fetchurl, bin_prot, comparelib, core, custom_printf, - fieldslib, pa_bench, pa_ounit, pipebang, pa_test, textutils, re2, sexplib}: +{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, + fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils_p4, re2_p4, sexplib_p4}: buildOcaml rec { name = "core_extended"; @@ -14,8 +14,8 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [bin_prot comparelib core custom_printf fieldslib - pipebang textutils re2 sexplib ]; + propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 + pipebang textutils_p4 re2_p4 sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_extended; diff --git a/pkgs/development/ocaml-modules/core_kernel/default.nix b/pkgs/development/ocaml-modules/core_kernel/default.nix index 0fed12b195d..75b248a6a5e 100644 --- a/pkgs/development/ocaml-modules/core_kernel/default.nix +++ b/pkgs/development/ocaml-modules/core_kernel/default.nix @@ -1,7 +1,7 @@ {stdenv, buildOcaml, fetchurl, type_conv, - bin_prot, comparelib, custom_printf, enumerate, - fieldslib, herelib, pa_bench, pa_test, pa_ounit, - pipebang, sexplib, typerep, variantslib}: + bin_prot_p4, comparelib, custom_printf, enumerate, + fieldslib_p4, herelib, pa_bench, pa_test, pa_ounit, + pipebang, sexplib_p4, typerep_p4, variantslib_p4}: buildOcaml rec { name = "core_kernel"; @@ -17,9 +17,9 @@ buildOcaml rec { hasSharedObjects = true; buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ type_conv pa_bench bin_prot comparelib custom_printf - enumerate fieldslib herelib pipebang sexplib - typerep variantslib ]; + propagatedBuildInputs = [ type_conv pa_bench bin_prot_p4 comparelib custom_printf + enumerate fieldslib_p4 herelib pipebang sexplib_p4 + typerep_p4 variantslib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/core_kernel; diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix index 114aa7e5ffd..cb85ebce501 100644 --- a/pkgs/development/ocaml-modules/cryptgps/default.nix +++ b/pkgs/development/ocaml-modules/cryptgps/default.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, ocaml, findlib}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.2.1"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocaml-cryptgps-${version}"; + version = "0.2.1"; src = fetchurl { url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz"; diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index a2cf545e84c..461e2b88708 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,24 +1,21 @@ -{stdenv, fetchurl, zlib, ocaml, findlib, ncurses}: +{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, ncurses }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; - -stdenv.mkDerivation { - name = "cryptokit-1.10"; +stdenv.mkDerivation rec { + name = "cryptokit-${version}"; + version = "1.10"; src = fetchurl { url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz; sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; }; - buildInputs = [zlib ocaml findlib ncurses]; + buildInputs = [ zlib ocaml findlib ocamlbuild ncurses ]; buildFlags = "setup.data build"; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/cryptokit"; + preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/cryptokit"; meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; diff --git a/pkgs/development/ocaml-modules/cstruct/default.nix b/pkgs/development/ocaml-modules/cstruct/default.nix index 57a057e0eaa..c9f04918d17 100644 --- a/pkgs/development/ocaml-modules/cstruct/default.nix +++ b/pkgs/development/ocaml-modules/cstruct/default.nix @@ -1,5 +1,5 @@ -{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib, findlib, - async ? null, lwt ? null, camlp4}: +{stdenv, writeText, fetchurl, ocaml, ocplib-endian, sexplib_p4, findlib, + async_p4 ? null, lwt ? null, camlp4}: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; @@ -12,9 +12,9 @@ stdenv.mkDerivation { }; configureFlags = stdenv.lib.strings.concatStringsSep " " ((if lwt != null then ["--enable-lwt"] else []) ++ - (if async != null then ["--enable-async"] else [])); + (if async_p4 != null then ["--enable-async"] else [])); buildInputs = [ocaml findlib camlp4]; - propagatedBuildInputs = [ocplib-endian sexplib lwt async]; + propagatedBuildInputs = [ocplib-endian sexplib_p4 lwt async_p4]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix index 760b981dd2c..95199f16dcc 100644 --- a/pkgs/development/ocaml-modules/csv/default.nix +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "05s8py2qr3889c72g1q07r15pzch3j66xdphxi2sd93h5lvnpi4j"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/custom_printf/default.nix b/pkgs/development/ocaml-modules/custom_printf/default.nix index 05a8ecfe616..16c31fc3861 100644 --- a/pkgs/development/ocaml-modules/custom_printf/default.nix +++ b/pkgs/development/ocaml-modules/custom_printf/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv, sexplib, pa_ounit}: +{stdenv, buildOcaml, fetchurl, type_conv, sexplib_p4, pa_ounit}: buildOcaml rec { name = "custom_printf"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib ]; + propagatedBuildInputs = [ type_conv sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/custom_printf; diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 5987c53898f..31835316833 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "3.0"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index b579c073f29..1bdcae521dd 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ocaml, findlib}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "dypgen"; - version = "20120619-1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "20120619-1"; src = fetchurl { url = "http://dypgen.free.fr/dypgen-20120619-1.tar.bz2"; @@ -22,7 +21,7 @@ stdenv.mkDerivation { make ''; - makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + makeFlags = "BINDIR=$(out)/bin MANDIR=$(out)/usr/share/man/man1 DYPGENLIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib"; meta = { homepage = http://dypgen.free.fr; diff --git a/pkgs/development/ocaml-modules/enumerate/default.nix b/pkgs/development/ocaml-modules/enumerate/default.nix index a9475649ff6..557f2f88d8d 100644 --- a/pkgs/development/ocaml-modules/enumerate/default.nix +++ b/pkgs/development/ocaml-modules/enumerate/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, type_conv, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, camlp4 }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.00"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0b6mx5p01lcpimvak4wx6aj2119707wsfzd83rwgb91bhpgzh156"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ type_conv camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index ecfdb846ff1..ae264b657d8 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "0.3"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "19znk5w0qiw3wij4n6w3h5bcr221yy57jf815fr8k9m8kin710g3"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index efa239f6c33..c6027ce11ce 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchzip, ocaml, findlib, erm_xml, cryptokit, camlp4 }: +{ stdenv, fetchurl, fetchzip, ocaml, findlib, ocamlbuild, erm_xml, cryptokit, camlp4 }: let version = "0.2"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { patches = [ disable-tests ]; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ erm_xml cryptokit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix index b6ee0d192e3..5fcc317d940 100644 --- a/pkgs/development/ocaml-modules/expat/default.nix +++ b/pkgs/development/ocaml-modules/expat/default.nix @@ -1,8 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, ounit, expat}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.9.1"; pname = "ocaml-expat"; testcase = fetchurl { url = "http://www.w3.org/TR/1998/REC-xml-19980210.xml"; @@ -11,8 +9,9 @@ let in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.9.1"; src = fetchurl { url = "http://www.xs4all.nl/~mmzeeman/ocaml/${pname}-${version}.tar.gz"; @@ -29,7 +28,8 @@ stdenv.mkDerivation { substituteInPlace "unittest.ml" \ --replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}" substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \ - substituteInPlace Makefile --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \ + --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \ + --replace "gcc" "\$(CC)" ''; configurePhase = "true"; # Skip configure diff --git a/pkgs/development/ocaml-modules/ezjsonm/default.nix b/pkgs/development/ocaml-modules/ezjsonm/default.nix index fd8ce1c3389..4d63b0c3f95 100644 --- a/pkgs/development/ocaml-modules/ezjsonm/default.nix +++ b/pkgs/development/ocaml-modules/ezjsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib, lwt }: +{ stdenv, fetchzip, ocaml, findlib, jsonm, hex, sexplib_p4, lwt }: let version = "0.4.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ jsonm hex sexplib lwt ]; + propagatedBuildInputs = [ jsonm hex sexplib_p4 lwt ]; createFindlibDestdir = true; configureFlags = "--enable-lwt"; diff --git a/pkgs/development/ocaml-modules/fileutils/default.nix b/pkgs/development/ocaml-modules/fileutils/default.nix index 3ffcfada3d5..9dfffbf48c5 100644 --- a/pkgs/development/ocaml-modules/fileutils/default.nix +++ b/pkgs/development/ocaml-modules/fileutils/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ounit }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation { name = "ocaml-fileutils-0.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0xs96nlrrm335mcsgsxnqzspiqyfn26b0jjxm72br7c7ax534n47"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; configureFlags = "--enable-tests"; doCheck = true; diff --git a/pkgs/development/ocaml-modules/fix/default.nix b/pkgs/development/ocaml-modules/fix/default.nix index 77e2461bda0..76cb6d08844 100644 --- a/pkgs/development/ocaml-modules/fix/default.nix +++ b/pkgs/development/ocaml-modules/fix/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "1phlqcs1nb93x9cf0w0hnq2ck4dmn71zm4mxf60w96vb9yb9qzp0"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/frontc/default.nix b/pkgs/development/ocaml-modules/frontc/default.nix new file mode 100644 index 00000000000..ecf1ddc8fba --- /dev/null +++ b/pkgs/development/ocaml-modules/frontc/default.nix @@ -0,0 +1,35 @@ +{lib, buildOcaml, fetchurl}: + +buildOcaml rec { + name = "FrontC"; + version = "3.4"; + + src = fetchurl { + url = "http://www.irit.fr/recherches/ARCHI/MARCH/frontc/Frontc-${version}.tgz"; + sha256 = "16dz153s92dgbw1rrfwbhscy73did87kfmjwyh3qpvs748h1sc4g"; + }; + + meta = with lib; { + homepage = https://www.irit.fr/recherches/ARCHI/MARCH/rubrique.php3?id_rubrique=61; + description = "C Parsing Library"; + license = licenses.lgpl21; + maintainers = [ maintainers.maurer ]; + }; + + meta_file = fetchurl { + url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/META; + sha256 = "1flhvwr01crn7d094kby0418s1m4198np85ymjp3b4maz0n7m2mx"; + }; + + opam_patch = fetchurl { + url = https://raw.githubusercontent.com/ocaml/opam-repository/0f0e610f6499bdf0151e4170411b4f05e4d076d4/packages/FrontC/FrontC.3.4/files/opam.patch; + sha256 = "0xf83ixx0mf3mznwpwp2mjflii0njdzikhhfxpnms7vhnnmlfzy5"; + }; + + patches = [ opam_patch ]; + patchFlags = "-p4"; + + makeFlags = "PREFIX=$(out) OCAML_SITE=$(OCAMLFIND_DESTDIR)"; + + postInstall = "cp ${meta_file} $OCAMLFIND_DESTDIR/FrontC/META"; +} diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index 06a67e9cb8b..224f3537a2e 100644 --- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocurl, cryptokit, ocaml_extlib, yojson, ocamlnet, xmlm }: stdenv.mkDerivation rec { name = "gapi-ocaml-0.2.10"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "https://forge.ocamlcore.org/frs/download.php/1601/${name}.tar.gz"; sha256 = "0kg4j7dhr7jynpy8x53bflqjf78jyl14j414l6px34xz7c9qx5fl"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ocurl cryptokit ocaml_extlib yojson ocamlnet xmlm ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix index 90f74b2c602..c023b590f7a 100644 --- a/pkgs/development/ocaml-modules/gen/default.nix +++ b/pkgs/development/ocaml-modules/gen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, qtest, ounit }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.3"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0xrnkcfa5q86ammf49j5hynw5563x5sa2mk7vqf7g097j1szif72"; }; - buildInputs = [ ocaml findlib qtest ounit ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix index 9351bfa7520..0839ff361ae 100644 --- a/pkgs/development/ocaml-modules/gg/default.nix +++ b/pkgs/development/ocaml-modules/gg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "0czj41sr8jsivl3z8wyblf9k971j3kx2wc3s0c1nhzcc8allg9i2"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index f0a9387a537..0f1facd6518 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, ocaml, findlib, gdome2, libxslt, pkgconfig}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.2.6"; pname = "gmetadom"; - in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.2.6"; src = fetchurl { url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.gz"; @@ -20,7 +18,7 @@ stdenv.mkDerivation { dontDisableStatic = true; preConfigure='' - configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml_version}/site-lib" + configureFlags="--with-ocaml-lib-prefix=$out/lib/ocaml/${ocaml.version}/site-lib" ''; diff --git a/pkgs/development/ocaml-modules/ipaddr/default.nix b/pkgs/development/ocaml-modules/ipaddr/default.nix index 749b6a1d94e..cdc273d6ecf 100644 --- a/pkgs/development/ocaml-modules/ipaddr/default.nix +++ b/pkgs/development/ocaml-modules/ipaddr/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, sexplib}: +{stdenv, buildOcaml, fetchurl, sexplib_p4}: buildOcaml rec { name = "ipaddr"; @@ -9,7 +9,7 @@ buildOcaml rec { sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; }; - propagatedBuildInputs = [ sexplib ]; + propagatedBuildInputs = [ sexplib_p4 ]; configurePhase = '' ocaml setup.ml -configure --prefix $out diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index 0aad6f7b13b..8a11d22c2c1 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "0.2.4"; in @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; meta = { diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix new file mode 100644 index 00000000000..4a283cc9910 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-extra.nix @@ -0,0 +1,17 @@ +{stdenv, buildOcamlJane, fetchurl, async_kernel, async_unix, + bin_prot, core, ppx_custom_printf, fieldslib, herelib, + pipebang, sexplib, async_rpc_kernel}: + +buildOcamlJane rec { + name = "async_extra"; + hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; + propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf + fieldslib herelib pipebang sexplib async_rpc_kernel ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_extra; + description = "Jane Street Capital's asynchronous execution library (extra)"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/async-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix new file mode 100644 index 00000000000..4d7213a8603 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-kernel.nix @@ -0,0 +1,16 @@ +{stdenv, buildOcamlJane, fetchurl, core_kernel, + bin_prot, fieldslib, + sexplib, herelib, opam, js_build_tools, ocaml_oasis}: + +buildOcamlJane rec { + name = "async_kernel"; + hash = "1n6ifbrq6q6hq8bxh6b9vhg11mv9r6jgp1b7vfw7mh5s2nrd4b60"; + propagatedBuildInputs = [ core_kernel bin_prot fieldslib herelib sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_kernel; + description = "Jane Street Capital's asynchronous execution library (core) "; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix new file mode 100644 index 00000000000..1f5ff6b9646 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-rpc-kernel.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, async_kernel, bin_prot, core_kernel, + fieldslib, ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, + ppx_jane, sexplib, typerep, variantslib}: + +buildOcamlJane rec { + name = "async_rpc_kernel"; + hash = "0pvys7giqix1nfidw1f4i3r94cf03ba1mvhadpm2zpdir3av91sw"; + propagatedBuildInputs = [ async_kernel bin_prot core_kernel fieldslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane + sexplib typerep variantslib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_rpc_kernel; + description = "Platform-independent core of Async RPC library"; + license = licenses.asl20; + maintainers = [ maintainers.maurer ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/async-unix.nix b/pkgs/development/ocaml-modules/janestreet/async-unix.nix new file mode 100644 index 00000000000..5621d2ec704 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async-unix.nix @@ -0,0 +1,17 @@ +{stdenv, buildOcamlJane, fetchurl, async_kernel, + bin_prot, comparelib, core, fieldslib, herelib, + pipebang, sexplib}: + +buildOcamlJane rec { + name = "async_unix"; + hash = "03ng7f0s22wwzspakiqj442vs1a7yf834109jcj9r3g1awwfhcy7"; + propagatedBuildInputs = [ async_kernel core bin_prot comparelib + fieldslib herelib pipebang sexplib ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async_unix; + description = "Jane Street Capital's asynchronous execution library (unix)"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/async.nix b/pkgs/development/ocaml-modules/janestreet/async.nix new file mode 100644 index 00000000000..2e776e273be --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/async.nix @@ -0,0 +1,16 @@ +{stdenv, buildOcamlJane, fetchurl, async_kernel, + async_unix, async_extra}: + +buildOcamlJane rec { + name = "async"; + version = "113.33.03"; + hash = "0wyspkp8k833fh03r3h016nbfn6kjfhvb2bg42cly6agcak59fmr"; + propagatedBuildInputs = [ async_kernel async_unix async_extra ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/async; + description = "Jane Street Capital's asynchronous execution library"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/bin_prot.nix b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix new file mode 100644 index 00000000000..11e6189e6c1 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/bin_prot.nix @@ -0,0 +1,17 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + name = "bin_prot"; + version = "113.33.03"; + minimumSupportedOcamlVersion = "4.02"; + hash = "0jlarpfby755j0kikz6vnl1l6q0ga09b9zrlw6i84r22zchnqdsh"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/bin_prot; + description = "Binary protocol generator "; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix new file mode 100644 index 00000000000..6e988c4479a --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/buildOcamlJane.nix @@ -0,0 +1,35 @@ +{ buildOcaml, opam, js_build_tools, ocaml_oasis_46, fetchurl } : + +{ name, version ? "113.33.03", buildInputs ? [], + hash ? "", + minimumSupportedOcamlVersion ? "4.02", ... +}@args: + +buildOcaml (args // { + inherit name version minimumSupportedOcamlVersion; + src = fetchurl { + url = "https://github.com/janestreet/${name}/archive/${version}.tar.gz"; + sha256 = hash; + }; + + hasSharedObjects = true; + + buildInputs = [ ocaml_oasis_46 js_build_tools opam ] ++ buildInputs; + + dontAddPrefix = true; + + configurePhase = "./configure --prefix $out"; + + buildPhase = "OCAML_TOPLEVEL_PATH=`ocamlfind query findlib`/.. make"; + + installPhase = '' + opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` --stubsdir `ocamlfind printconf destdir`/${name} ${name}.install + if [ -d $out/lib/${name} ] + then if [ "$(ls -A $out/lib/${name})" ] + then mv $out/lib/${name}/* `ocamlfind printconf destdir`/${name} + fi + rmdir $out/lib/${name} + fi + ''; + +}) diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix new file mode 100644 index 00000000000..df7f6903cd2 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/core-extended.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcamlJane, fetchurl, + core, + bin_prot, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, + re2, textutils, + ocaml_oasis, opam, js_build_tools}: + +buildOcamlJane rec { + name = "core_extended"; + hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5"; + propagatedBuildInputs = + [ core bin_prot fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane + re2 textutils ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_extended; + description = "Jane Street Capital's standard library overlay"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/core.nix b/pkgs/development/ocaml-modules/janestreet/core.nix new file mode 100644 index 00000000000..05ea4d5d566 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/core.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcamlJane, fetchurl, + core_kernel, + bin_prot, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, + ocaml_oasis, opam, js_build_tools}: + +buildOcamlJane rec { + name = "core"; + hash = "0nz6d5glgymbpchvcpw77yis9jgi2bll32knzy9vx99wn83zdrmd"; + propagatedBuildInputs = + [ core_kernel bin_prot fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core; + description = "Jane Street Capital's standard library overlay"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/core_kernel.nix b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix new file mode 100644 index 00000000000..93fcdde5bb3 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/core_kernel.nix @@ -0,0 +1,19 @@ +{stdenv, buildOcamlJane, fetchurl, + bin_prot, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, + ocaml_oasis, opam, js_build_tools}: + +buildOcamlJane rec { + name = "core_kernel"; + hash = "13gamj056nlib04l7yh80lqpdx0pnswzlb52fkqa01awwp5nf3z6"; + propagatedBuildInputs = + [ bin_prot fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/core_kernel; + description = "Jane Street Capital's standard library overlay (kernel)"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/fieldslib.nix b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix new file mode 100644 index 00000000000..8823a0c8054 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/fieldslib.nix @@ -0,0 +1,19 @@ +{ stdenv, type_conv, buildOcamlJane }: + +buildOcamlJane rec { + name = "fieldslib"; + version = "113.33.03"; + + minimumSupportedOcamlVersion = "4.02"; + + hash = "0mkbix32f8sq32q81hb10z2q31bw5f431jxv0jafbdrif0vr6xqd"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch b/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch new file mode 100644 index 00000000000..8878b4be68b --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools-darwin.patch @@ -0,0 +1,11 @@ +--- a/ocamlbuild_goodies/jane_street_ocamlbuild_goodies.ml ++++ b/ocamlbuild_goodies/jane_street_ocamlbuild_goodies.ml +@@ -65,7 +65,7 @@ let track_external_deps = function + + let stat, md5sum = + match run_and_read "uname" |> String.trim with +- | "Darwin" -> ++ | "FreeBSD" | "NetBSD" -> + (S [A "stat"; A "-f"; A "%d:%i:%m"], + A "md5") + | _ -> diff --git a/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix new file mode 100644 index 00000000000..328ffc58bdc --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/js-build-tools.nix @@ -0,0 +1,29 @@ +{stdenv, buildOcaml, fetchurl, ocaml_oasis_46, opam}: + +buildOcaml rec { + name = "js-build-tools"; + version = "113.33.06"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/janestreet/${name}/archive/${version}.tar.gz"; + sha256 = "1nvgyp4gsnlnpix3li6kr90b12iin5ihichv298p03i6h2809dia"; + }; + + hasSharedObjects = true; + + buildInputs = [ ocaml_oasis_46 opam ]; + + dontAddPrefix = true; + configurePhase = "./configure --prefix $prefix"; + installPhase = "opam-installer -i --prefix $prefix --libdir `ocamlfind printconf destdir` ${name}.install"; + + patches = [ ./js-build-tools-darwin.patch ]; + + meta = with stdenv.lib; { + description = "Jane Street Build Tools"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix new file mode 100644 index 00000000000..b61874d3a7e --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-assert.nix @@ -0,0 +1,16 @@ +{stdenv, buildOcamlJane, + ppx_compare, ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools, ppx_type_conv, sexplib}: + +buildOcamlJane rec { + name = "ppx_assert"; + hash = "0n7fa1j79ykbkhp8xz0ksg5096asri5d0msshsaqhw5fz18chvz4"; + propagatedBuildInputs = + [ ppx_compare ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools + ppx_type_conv sexplib ]; + + meta = with stdenv.lib; { + description = "Assert-like extension nodes that raise useful errors on failure"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix new file mode 100644 index 00000000000..56a124c5b69 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bench.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_inline_test, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_bench"; + minimumSupportedOcamlVersion = "4.02"; + hash = "1l5jlwy1d1fqz70wa2fkf7izngp6nx3g4s9bmnd6ca4dx1x5bksk"; + + hasSharedObjects = true; + + propagatedBuildInputs = [ ppx_core ppx_driver ppx_inline_test ppx_tools ]; + + meta = with stdenv.lib; { + description = "Syntax extension for writing in-line benchmarks in ocaml code"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix new file mode 100644 index 00000000000..9dffbed6960 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-bin-prot.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv, bin_prot}: + +buildOcamlJane rec { + name = "ppx_bin_prot"; + hash = "0kwmrrrybdkmphqczsr3lg3imsxcjb8iy41syvn44s3kcjfyyzbz"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv bin_prot ]; + + meta = with stdenv.lib; { + description = "Generation of bin_prot readers and writers from types"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix new file mode 100644 index 00000000000..d70fe6ddd55 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-compare.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_tools, ppx_type_conv}: + +buildOcamlJane rec { + name = "ppx_compare"; + hash = "05cnwxfxm8201lpfmcqkcqfy6plh5c2151jbj4qsnxhlvvjli459"; + propagatedBuildInputs = + [ppx_core ppx_driver ppx_tools ppx_type_conv ]; + + meta = with stdenv.lib; { + description = "Generation of fast comparison functions from type expressions and definitions"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-core.nix b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix new file mode 100644 index 00000000000..4f5bb87b767 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-core.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_core"; + hash = "0df7vyai488lfkyh8szw2hvn22jsyrkfvq1b91j1s0g0y27nnfax"; + propagatedBuildInputs = + [ ppx_tools ]; + + meta = with stdenv.lib; { + description = "PPX standard library"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix new file mode 100644 index 00000000000..3fe78e3e7e2 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-custom-printf.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_sexp_conv, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_custom_printf"; + hash = "06y85m6ky376byja4w7gdwd339di5ag0xrf0czkylzjsnylhdr85"; + + propagatedBuildInputs = [ ppx_core ppx_driver ppx_sexp_conv ppx_tools ]; + + meta = with stdenv.lib; { + description = "Extensions to printf-style format-strings for user-defined string conversion"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix new file mode 100644 index 00000000000..7844756c7bf --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-driver.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_optcomp}: + +buildOcamlJane rec { + name = "ppx_driver"; + hash = "19cpfdn1n36vl5l9d6h7c61ffn0wmiipprn5by0354i5aywj8gpn"; + propagatedBuildInputs = + [ ppx_core ppx_optcomp ]; + + meta = with stdenv.lib; { + description = "A driver is an executable created from a set of OCaml AST transformers linked together with a command line frontend"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix new file mode 100644 index 00000000000..8dbf34ed232 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-enumerate.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv}: + +buildOcamlJane rec { + name = "ppx_enumerate"; + hash = "0m11921q2pjzkwckf21fynd2qfy83n9jjsgks23yagdai8a7ym16"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; + + meta = with stdenv.lib; { + description = "Generate a list containing all values of a finite type"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix new file mode 100644 index 00000000000..7e688a1dc1c --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-expect.nix @@ -0,0 +1,19 @@ +{stdenv, buildOcamlJane, + ppx_assert, ppx_compare, ppx_core, ppx_custom_printf, ppx_driver, + ppx_fields_conv, ppx_here, ppx_inline_test, ppx_sexp_conv, ppx_tools, + ppx_variants_conv, re, sexplib, variantslib, fieldslib}: + +buildOcamlJane rec { + name = "ppx_expect"; + hash = "0cwagb4cj3x1vsr19kyfa9pxlvaz9a5v863cahi5glinsh4mzgdx"; + propagatedBuildInputs = + [ ppx_assert ppx_compare ppx_core ppx_custom_printf ppx_driver + ppx_fields_conv ppx_here ppx_inline_test ppx_sexp_conv ppx_tools + ppx_variants_conv re sexplib variantslib fieldslib ]; + + meta = with stdenv.lib; { + description = "Cram-like framework for OCaml"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix new file mode 100644 index 00000000000..187d5db1999 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fail.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_here, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_fail"; + hash = "1ms5axpc0zg469zj4799nz3wwxi6rmmyvqj52dy03crmpj71s18l"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_tools ]; + + meta = with stdenv.lib; { + description = "Syntax extension that makes failwith include a position"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix new file mode 100644 index 00000000000..a05cf149b26 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-fields-conv.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv}: + +buildOcamlJane rec { + name = "ppx_fields_conv"; + hash = "11w9wfjgkv7yxv3rwlwi6m193zan6rhmi45q7n3ddi2s8ls3gra7"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv ]; + + meta = with stdenv.lib; { + description = "Generation of accessor and iteration functions for ocaml records"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-here.nix b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix new file mode 100644 index 00000000000..3aa157a68c5 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-here.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver}: + +buildOcamlJane rec { + name = "ppx_here"; + hash = "1mzdgn8k171zkwmbizf1a48l525ny0w3363c7gknpnifcinxniiw"; + propagatedBuildInputs = [ ppx_core ppx_driver ]; + + meta = with stdenv.lib; { + description = "A ppx rewriter that defines an extension node whose value is its source position"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix new file mode 100644 index 00000000000..cd16d7c3286 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-inline-test.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_inline_test"; + hash = "0ygapa54i0wwcj3jcqwiimrc6z0b7aafgjhbk37h6vvclnm5n7f6"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; + + meta = with stdenv.lib; { + description = "Syntax extension for writing in-line tests in ocaml code"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix new file mode 100644 index 00000000000..86394f228e9 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-jane.nix @@ -0,0 +1,22 @@ +{stdenv, buildOcamlJane, + ppx_assert, + ppx_bench, ppx_bin_prot, ppx_compare, ppx_custom_printf, ppx_driver, + ppx_enumerate, ppx_expect, ppx_fail, ppx_fields_conv, ppx_here, + ppx_inline_test, ppx_let, ppx_pipebang, ppx_sexp_conv, ppx_sexp_message, + ppx_sexp_value, ppx_typerep_conv, ppx_variants_conv}: + +buildOcamlJane rec { + name = "ppx_jane"; + hash = "1la0rp8fhzfglwb15gqh1pl1ld8ls4cnidaw9mjc5q1hb0yj1qd9"; + propagatedBuildInputs = + [ ppx_assert ppx_bench ppx_bin_prot ppx_compare ppx_custom_printf + ppx_driver ppx_enumerate ppx_expect ppx_fail ppx_fields_conv + ppx_here ppx_inline_test ppx_let ppx_pipebang ppx_sexp_conv + ppx_sexp_message ppx_sexp_value ppx_typerep_conv ppx_variants_conv ]; + + meta = with stdenv.lib; { + description = "A ppx_driver including all standard ppx rewriters"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-let.nix b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix new file mode 100644 index 00000000000..3498affeb09 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-let.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver}: + +buildOcamlJane rec { + name = "ppx_let"; + hash = "0whnfq4rgkq4apfqnvc100wlk25pmqdyvy6s21dsn3fcm9hff467"; + propagatedBuildInputs = [ ppx_core ppx_driver ]; + + meta = with stdenv.lib; { + description = "A ppx rewriter for monadic and applicative let bindings and match statements"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix new file mode 100644 index 00000000000..5dcfc97bfa3 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-optcomp.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_optcomp"; + hash = "09m2x2a5ics4bz1j29n5slhh1rlyhcwdfmf44v1jfxcby3f0riwd"; + propagatedBuildInputs = + [ ppx_core ppx_tools ]; + + meta = with stdenv.lib; { + description = "ppx_optcomp stands for Optional Compilation. It is a tool used to handle optional compilations of pieces of code depending of the word size, the version of the compiler, etc."; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix new file mode 100644 index 00000000000..f3f4bcdead5 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-pipebang.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_pipebang"; + hash = "0k25bhj9ziiw89xvs4svz7cgazbbmprba9wbic2llffg55fp7acc"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_tools ]; + + meta = with stdenv.lib; { + description = "A ppx rewriter that inlines reverse application operators |> and |!"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix new file mode 100644 index 00000000000..bf4a7b214de --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-conv.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv, sexplib}: + +buildOcamlJane rec { + name = "ppx_sexp_conv"; + hash = "1kgbmlc11w5jhbhmy5n0f734l44zwyry48342dm5qydi9sfzcgq2"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib]; + + meta = with stdenv.lib; { + description = "PPX syntax extension that generates code for converting OCaml types to and from s-expressions, as defined in the sexplib library"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix new file mode 100644 index 00000000000..e83aaa2c272 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-message.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_sexp_message"; + hash = "0inbff25qii868p141jb1y8n3vjfyz66jpnsl9nma6nkkyjkp05j"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; + + meta = with stdenv.lib; { + description = "Easy construction of S-Expressions"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix new file mode 100644 index 00000000000..a1a1080d73d --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-sexp-value.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_driver, ppx_here, ppx_sexp_conv, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_sexp_value"; + hash = "04602ppqfwx33ghjywam00hlqqzsz4d99r60k9q0v1mynk9pjhj0"; + propagatedBuildInputs = [ ppx_core ppx_driver ppx_here ppx_sexp_conv ppx_tools ]; + + meta = with stdenv.lib; { + description = "A ppx rewriter that simplifies building S-Expression from OCaml Values"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix new file mode 100644 index 00000000000..fc6d9ca0345 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-type-conv.nix @@ -0,0 +1,15 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_deriving, ppx_driver, ppx_tools}: + +buildOcamlJane rec { + name = "ppx_type_conv"; + hash = "0gv0mqwn97dwrfm6rj442565y8dz7kiq8s8vadnhywrl7j4znqyq"; + propagatedBuildInputs = + [ ppx_core ppx_deriving ppx_driver ppx_tools ]; + + meta = with stdenv.lib; { + description = "The type_conv library factors out functionality needed by different preprocessors that generate code from type specifications"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix new file mode 100644 index 00000000000..e6d23e0dbdd --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-typerep-conv.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv, typerep}: + +buildOcamlJane rec { + name = "ppx_typerep_conv"; + hash = "0dldlx73r07j6w0i7h4hxly0v678naa79na5rafsk2974gs5ih9g"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv typerep ]; + + meta = with stdenv.lib; { + description = "Automatic generation of runtime types from type definitions"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix new file mode 100644 index 00000000000..9bc1cbb59e4 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/ppx-variants-conv.nix @@ -0,0 +1,14 @@ +{stdenv, buildOcamlJane, + ppx_core, ppx_tools, ppx_type_conv, sexplib, variantslib}: + +buildOcamlJane rec { + name = "ppx_variants_conv"; + hash = "0kgal8b9yh7wrd75hllb9fyl6zbksfnr9k7pykpzdm3js98dirhn"; + propagatedBuildInputs = [ ppx_core ppx_tools ppx_type_conv sexplib variantslib ]; + + meta = with stdenv.lib; { + description = "Generation of accessor and iteration functions for ocaml variant types"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/re2.nix b/pkgs/development/ocaml-modules/janestreet/re2.nix new file mode 100644 index 00000000000..6604a8d012c --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/re2.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcamlJane, + bin_prot, core_kernel, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, + rsync}: + +buildOcamlJane rec { + name = "re2"; + hash = "0fw5jscb1i17aw8v4l965zw20kyimhfnmf4w83wqaaxkqy3l6fqw"; + buildInputs = [ rsync ]; + propagatedBuildInputs = + [ bin_prot core_kernel fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/re2; + description = "OCaml bindings for RE2"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/sexplib.nix b/pkgs/development/ocaml-modules/janestreet/sexplib.nix new file mode 100644 index 00000000000..4a785d199c8 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/sexplib.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + minimumSupportedOcamlVersion = "4.02"; + name = "sexplib"; + version = "113.33.03"; + + hash = "1klar4qw4s7bj47ig7kxz2m4j1q3c60pfppis4vxrxv15r0kfh22"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "Library for serializing OCaml values to and from S-expressions"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/textutils.nix b/pkgs/development/ocaml-modules/janestreet/textutils.nix new file mode 100644 index 00000000000..459743f055a --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/textutils.nix @@ -0,0 +1,18 @@ +{stdenv, buildOcamlJane, + bin_prot, core, fieldslib, sexplib, typerep, variantslib, + ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane}: + +buildOcamlJane rec { + name = "textutils"; + hash = "0mkjm9b3k7db7zzrq4403v8qbkgqgkjlz120vcbqh6z7d7ql65vb"; + propagatedBuildInputs = + [ bin_prot core fieldslib sexplib typerep variantslib + ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/textutils; + description = "Text output utilities"; + maintainers = [ maintainers.maurer ]; + license = licenses.asl20; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/typerep.nix b/pkgs/development/ocaml-modules/janestreet/typerep.nix new file mode 100644 index 00000000000..81e6c4be9cb --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/typerep.nix @@ -0,0 +1,20 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + name = "typerep"; + version = "113.33.03"; + + minimumSupportedOcamlVersion = "4.00"; + + hash = "1ss34nq20vfgx8hwi5sswpmn3my9lvrpdy5dkng746xchwi33ar7"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/typerep; + description = "Runtime types for OCaml (beta version)"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; + +} diff --git a/pkgs/development/ocaml-modules/janestreet/variantslib.nix b/pkgs/development/ocaml-modules/janestreet/variantslib.nix new file mode 100644 index 00000000000..d9acadbb615 --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/variantslib.nix @@ -0,0 +1,19 @@ +{stdenv, buildOcamlJane, type_conv}: + +buildOcamlJane rec { + name = "variantslib"; + version = "113.33.03"; + + minimumSupportedOcamlVersion = "4.00"; + + hash = "1hv0f75msrryxsl6wfnbmhc0n8kf7qxs5f82ry3b8ldb44s3wigp"; + + propagatedBuildInputs = [ type_conv ]; + + meta = with stdenv.lib; { + homepage = https://github.com/janestreet/variantslib; + description = "OCaml variants as first class values"; + license = licenses.asl20; + maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; + }; +} diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 894c93eba4d..c0b1c32553e 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib, camlp4}: + let pname = "javalib"; - version = "2.3"; webpage = "http://sawja.inria.fr/"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "2.3"; src = fetchurl { url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2"; @@ -28,7 +27,7 @@ stdenv.mkDerivation rec { preBuild = '' make ptrees; make installptrees; - export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH; + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH; ''; propagatedBuildInputs = [ camlzip extlib ]; diff --git a/pkgs/development/ocaml-modules/jsonm/default.nix b/pkgs/development/ocaml-modules/jsonm/default.nix index cc5de781bee..f473527c15c 100644 --- a/pkgs/development/ocaml-modules/jsonm/default.nix +++ b/pkgs/development/ocaml-modules/jsonm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, uutf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf }: let version = "0.9.1"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0wszqrmx8iqlwzvs76fjf4sqh15mv20yjrbyhkd348yq8nhdrm1z"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ uutf ]; unpackCmd = "tar xjf $src"; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index 7c273061bd1..c59f15c57ad 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgl"; - version = "1.05"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.05"; src = fetchurl { url = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/dist/lablgl-${version}.tar.gz"; @@ -22,8 +21,8 @@ stdenv.mkDerivation { preConfigure = '' substituteInPlace Makefile.config \ --subst-var-by BINDIR $out/bin \ - --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ - --subst-var-by DLLDIR $out/lib/ocaml/${ocaml_version}/site-lib/lablgl \ + --subst-var-by INSTALLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl \ + --subst-var-by DLLDIR $out/lib/ocaml/${ocaml.version}/site-lib/lablgl \ --subst-var-by TKINCLUDES "" \ --subst-var-by XINCLUDES "" ''; @@ -33,7 +32,7 @@ stdenv.mkDerivation { buildFlags = "lib libopt glut glutopt"; postInstall = '' - cp ./META $out/lib/ocaml/${ocaml_version}/site-lib/lablgl + cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix index bc4b490e853..ba966b68002 100644 --- a/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix +++ b/pkgs/development/ocaml-modules/lablgtk/2.14.0.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4 }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.14.0"; in stdenv.mkDerivation (rec { name = "${pname}-${version}"; + version = "2.14.0"; src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/561/${name}.tar.gz"; sha256 = "1fnh0amm7lwgyjdhmlqgsp62gwlar1140425yc1j6inwmgnsp0a9"; }; - buildInputs = [ ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4 ]; + buildInputs = [ ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4 ]; - configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib - export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH ''; meta = { diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index a4d4314cd02..93ebf4b9c92 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,28 +1,28 @@ -{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk, libgnomecanvas, libglade, gtksourceview, camlp4}: +{stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview, camlp4}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "lablgtk"; - version = "2.18.3"; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "2.18.3"; + src = fetchurl { url = https://forge.ocamlcore.org/frs/download.php/1479/lablgtk-2.18.3.tar.gz; sha256 = "1bybn3jafxf4cx25zvn8h2xj9agn1xjbn7j3ywxxqx6az7rfnnwp"; }; - buildInputs = [ocaml findlib pkgconfig gtk libgnomecanvas libglade gtksourceview camlp4]; + buildInputs = [ocaml findlib pkgconfig gtk2 libgnomecanvas libglade gtksourceview camlp4]; - configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml_version}/site-lib"; + configureFlags = "--with-libdir=$(out)/lib/ocaml/${ocaml.version}/site-lib"; buildFlags = "world"; preInstall = '' - mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib - export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib + export OCAMLPATH=$out/lib/ocaml/${ocaml.version}/site-lib/:$OCAMLPATH ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix index 299d4972f02..58e93b4f837 100644 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, pkgconfig, ocaml, findlib, gmetadom, gtkmathview, lablgtk }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.7.2"; pname = "lablgtkmathview"; - in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.7.2"; src = fetchurl { url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz"; @@ -22,7 +20,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [gtkmathview]; prePatch = '' - substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib" + substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib" ''; buildPhase = '' diff --git a/pkgs/development/ocaml-modules/lambda-term/1.6.nix b/pkgs/development/ocaml-modules/lambda-term/1.6.nix index 026f67d8ef4..4638748160a 100644 --- a/pkgs/development/ocaml-modules/lambda-term/1.6.nix +++ b/pkgs/development/ocaml-modules/lambda-term/1.6.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed, camlp4 }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed, camlp4 }: stdenv.mkDerivation rec { version = "1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; }; - buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild ocaml_lwt ocaml_react ]; propagatedBuildInputs = [ camlp4 zed ]; diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix index 60afad57b57..f66773d426a 100644 --- a/pkgs/development/ocaml-modules/lambda-term/default.nix +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed }: +{ stdenv, fetchurl, libev, ocaml, findlib, ocamlbuild, ocaml_lwt, ocaml_react, zed }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1kwpsqds51xmy3z3ddkam92hkl7arlzy9awhzsq62ysxcl91fb8m"; }; - buildInputs = [ libev ocaml findlib ocaml_react ]; + buildInputs = [ libev ocaml findlib ocamlbuild ocaml_react ]; propagatedBuildInputs = [ zed ocaml_lwt ]; diff --git a/pkgs/development/ocaml-modules/llvm/default.nix b/pkgs/development/ocaml-modules/llvm/default.nix index 2f58c41ba35..351a773a6f7 100644 --- a/pkgs/development/ocaml-modules/llvm/default.nix +++ b/pkgs/development/ocaml-modules/llvm/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { configurePhase = '' mkdir build cd build - ../configure CC=gcc CXX=g++ --disable-compiler-version-checks --prefix=$out \ + ../configure --disable-compiler-version-checks --prefix=$out \ --disable-doxygen --disable-docs --with-ocaml-libdir=$OCAMLFIND_DESTDIR/llvm \ --enable-static ''; diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 6c0d772650c..9eeed1285dc 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,27 +1,24 @@ -{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: +{ stdenv, fetchzip, which, cryptopp, ocaml, findlib, ocamlbuild, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib, camlp4, ppx_tools }: let - version = "2.5.2"; inherit (stdenv.lib) optional getVersion versionAtLeast; - ocaml_version = getVersion ocaml; in -stdenv.mkDerivation { - - +stdenv.mkDerivation rec { name = "ocaml-lwt-${version}"; + version = "2.5.2"; src = fetchzip { url = "https://github.com/ocsigen/lwt/archive/${version}.tar.gz"; sha256 = "0gmhm282r8yi0gwcv0g2s7qchkfjmhqbqf4j9frlyv665ink9kxl"; }; - buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib glib ncurses camlp4 ppx_tools ]; + buildInputs = [ ocaml_oasis pkgconfig which cryptopp ocaml findlib ocamlbuild glib ncurses camlp4 ppx_tools ]; propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text libev ]; configureFlags = [ "--enable-glib" "--enable-ssl" "--enable-react" "--enable-camlp4"] - ++ [ (if versionAtLeast ocaml_version "4.02" then "--enable-ppx" else "--disable-ppx") ]; + ++ [ (if versionAtLeast ocaml.version "4.02" then "--enable-ppx" else "--disable-ppx") ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/macaque/default.nix b/pkgs/development/ocaml-modules/macaque/default.nix index a24859892fa..3d015e26275 100644 --- a/pkgs/development/ocaml-modules/macaque/default.nix +++ b/pkgs/development/ocaml-modules/macaque/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, pgocaml, camlp4 }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, pgocaml, camlp4 }: stdenv.mkDerivation { name = "ocaml-macaque-0.7.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "14i0a8cndzndjmlkyhf31r451q99cnkndgxcj0id4qjqhdl4bmjv"; }; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ pgocaml ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/magic-mime/default.nix b/pkgs/development/ocaml-modules/magic-mime/default.nix index 9c42aed37df..9a8a6259a77 100644 --- a/pkgs/development/ocaml-modules/magic-mime/default.nix +++ b/pkgs/development/ocaml-modules/magic-mime/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild }: let version = "1.0.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "058d83hmxd5mjccxdm3ydchmhk2lca5jdg82jg0klsigmf4ida6v"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/markup/default.nix b/pkgs/development/ocaml-modules/markup/default.nix index d4a38d9bd9e..a177ae240d1 100644 --- a/pkgs/development/ocaml-modules/markup/default.nix +++ b/pkgs/development/ocaml-modules/markup/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, uutf, lwt }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, uutf, lwt }: stdenv.mkDerivation rec { pname = "ocaml-markup"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0d3wi22v7h0iqzq8dgl0g4fj2wb67gvmbzdckacifghinrx762k3"; }; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; installPhase = "make ocamlfind-install"; diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix index 5b2fd400cd7..839a49615cd 100644 --- a/pkgs/development/ocaml-modules/menhir/default.nix +++ b/pkgs/development/ocaml-modules/menhir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild , version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160526" else "20140422" }@args: diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix index c182d210049..9d4615a006b 100644 --- a/pkgs/development/ocaml-modules/menhir/generic.nix +++ b/pkgs/development/ocaml-modules/menhir/generic.nix @@ -1,4 +1,4 @@ -{ version, sha256, stdenv, fetchurl, ocaml, findlib }: +{ version, sha256, stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "menhir-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { inherit sha256; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/mlgmp/default.nix b/pkgs/development/ocaml-modules/mlgmp/default.nix index 78447796025..0c51fe71ce1 100644 --- a/pkgs/development/ocaml-modules/mlgmp/default.nix +++ b/pkgs/development/ocaml-modules/mlgmp/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ocaml, findlib, gmp, mpfr, ncurses }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "mlgmp"; - version = "20120224"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "20120224"; src = fetchurl { url = "http://www-verimag.imag.fr/~monniaux/download/${pname}_${version}.tar.gz"; @@ -15,7 +14,7 @@ stdenv.mkDerivation { }; makeFlags = [ - "DESTDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/gmp" + "DESTDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/gmp" ]; preConfigure = "make clean"; @@ -26,7 +25,7 @@ stdenv.mkDerivation { propagatedbuildInputs = [gmp mpfr ncurses]; postInstall = '' - cp ${./META} $out/lib/ocaml/${ocaml_version}/site-lib/gmp/META + cp ${./META} $out/lib/ocaml/${ocaml.version}/site-lib/gmp/META ''; meta = { diff --git a/pkgs/development/ocaml-modules/mysql/default.nix b/pkgs/development/ocaml-modules/mysql/default.nix index ce3487a80a0..9eafa055b24 100644 --- a/pkgs/development/ocaml-modules/mysql/default.nix +++ b/pkgs/development/ocaml-modules/mysql/default.nix @@ -5,13 +5,12 @@ # TODO: compilazione di moduli dipendenti da zip, ssl, tcl, gtk, gtk2 let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "ocaml-mysql"; - version = "1.1.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.1.1"; src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/870/${pname}-${version}.tar.gz"; @@ -20,7 +19,7 @@ stdenv.mkDerivation { configureFlags = [ "--prefix=$out" - "--libdir=$out/lib/ocaml/${ocaml_version}/site-lib/mysql" + "--libdir=$out/lib/ocaml/${ocaml.version}/site-lib/mysql" ]; buildInputs = [ocaml findlib camlp4 ]; diff --git a/pkgs/development/ocaml-modules/nocrypto/default.nix b/pkgs/development/ocaml-modules/nocrypto/default.nix index ed13a56955b..f8db935b612 100644 --- a/pkgs/development/ocaml-modules/nocrypto/default.nix +++ b/pkgs/development/ocaml-modules/nocrypto/default.nix @@ -1,14 +1,10 @@ { stdenv, fetchzip, ocaml, findlib, cstruct, type_conv, zarith, ounit }: -let - version = "0.5.1"; - ocaml_version = stdenv.lib.getVersion ocaml; -in +assert stdenv.lib.versionAtLeast ocaml.version "4.01"; -assert stdenv.lib.versionAtLeast ocaml_version "4.01"; - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocaml-nocrypto-${version}"; + version = "0.5.1"; src = fetchzip { url = "https://github.com/mirleft/ocaml-nocrypto/archive/${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix index f4076fbd95f..80ae140a3fc 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk, pango }: +{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, glib, gtk2, pango }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "ocaml-cairo"; - version = "1.2.0"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.2.0"; src = fetchurl { url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip"; @@ -17,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./META.patch ]; buildInputs = [ ocaml automake gnum4 autoconf unzip pkgconfig - findlib freetype lablgtk cairo gdk_pixbuf gtk pango ]; + findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ]; createFindlibDestdir = true; @@ -25,16 +24,16 @@ stdenv.mkDerivation { aclocal -I support autoconf export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`" - export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2 - cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/pango.ml ./src - cp ${lablgtk}/lib/ocaml/${ocaml_version}/site-lib/lablgtk2/gaux.ml ./src + export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2 + cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src + cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src ''; postInstall = '' - cp META $out/lib/ocaml/${ocaml_version}/site-lib/cairo/ + cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/ ''; - makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml_version}/site-lib/cairo"; + makeFlags = "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo"; meta = { homepage = http://cairographics.org/cairo-ocaml; diff --git a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix index 6b9f6f09ea3..5b902afcb6d 100644 --- a/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-cairo2/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, cairo, lablgtk, gtk, +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, pkgconfig, cairo, lablgtk, gtk2, enableGtkSupport ? true # Whether to compile with support for Gtk # integration (library file cairo2_gtk). Depends - # on lablgtk and gtk. + # on lablgtk and gtk2. }: let @@ -19,8 +19,8 @@ stdenv.mkDerivation { sha256 = "1lc1iv5yz49avbc0wbrw9nrx8dn0c35r7cykivjln1zc2fwscf7w"; }; - buildInputs = [ ocaml findlib pkgconfig cairo ] - ++ optionals enableGtkSupport [ gtk ]; + buildInputs = [ ocaml findlib ocamlbuild pkgconfig cairo ] + ++ optionals enableGtkSupport [ gtk2 ]; # lablgtk2 is marked as a propagated build input since loading the # cairo.lablgtk2 package from the toplevel tries to load lablgtk2 as diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix index 64e0bb5ba01..d90fda954ba 100644 --- a/pkgs/development/ocaml-modules/ocaml-text/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libiconv, ocaml, findlib, ncurses }: +{ stdenv, fetchzip, libiconv, ocaml, findlib, ocamlbuild, ncurses }: stdenv.mkDerivation rec { name = "ocaml-text-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "11jamdfn5s19a0yvl012q1xvdk1grkp4rkrn819imqrvdplqkn1y"; }; - buildInputs = [ocaml findlib ncurses libiconv]; + buildInputs = [ ocaml findlib ocamlbuild ncurses libiconv ]; configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure"; diff --git a/pkgs/development/ocaml-modules/ocamlfuse/default.nix b/pkgs/development/ocaml-modules/ocamlfuse/default.nix index eaf5c8c20f6..561d6ef0373 100644 --- a/pkgs/development/ocaml-modules/ocamlfuse/default.nix +++ b/pkgs/development/ocaml-modules/ocamlfuse/default.nix @@ -1,15 +1,12 @@ -{ stdenv, fetchgit, ocaml, camlidl, fuse, findlib }: - -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in +{ stdenv, fetchFromGitHub, ocaml, camlidl, fuse, findlib }: stdenv.mkDerivation rec { - name = "ocamlfuse-2.7-1"; - src = fetchgit { - url = "https://github.com/astrada/ocamlfuse"; - rev = "c436c16dbf458bc69b1166b08baf9ec0d6f9042d"; - sha256 = "0br9x3vsbg87sar5g6yi3xfszn5icy4fv71waarccc2dr79pvakz"; + name = "ocamlfuse-2.7-3"; + src = fetchFromGitHub { + owner = "astrada"; + repo = "ocamlfuse"; + rev = "a085349685758668854499ce6c1fc00c83a5c23b"; + sha256 = "1pyml2ay5wab1blwpzrv1r6lnycm000jk6aar8i9fkdnh15sa6c3"; }; buildInputs = [ocaml findlib]; diff --git a/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/pkgs/development/ocaml-modules/ocamlgraph/default.nix index bbef4e01015..579571ef625 100644 --- a/pkgs/development/ocaml-modules/ocamlgraph/default.nix +++ b/pkgs/development/ocaml-modules/ocamlgraph/default.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, ocaml, findlib, ocamlPackages }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.8.5"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocamlgraph-${version}"; + version = "1.8.5"; src = fetchurl { url = "http://ocamlgraph.lri.fr/download/ocamlgraph-${version}.tar.gz"; @@ -22,9 +18,9 @@ stdenv.mkDerivation { # * configure looked in the wrong path # * ocaml needs that directory and the stubs directory as -I flag postPatch = '' - sed -i 's@$(DESTDIR)$(OCAMLLIB)/ocamlgraph@$(DESTDIR)/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@$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 ''; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocamlnat/default.nix b/pkgs/development/ocaml-modules/ocamlnat/default.nix index 1aeb43b8cf4..29ee6535624 100644 --- a/pkgs/development/ocaml-modules/ocamlnat/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnat/default.nix @@ -1,10 +1,14 @@ -{stdenv, fetchurl, ocaml, findlib, ounit}: +{stdenv, lib, fetchurl, ocaml, findlib, ounit}: -stdenv.mkDerivation { - name = "ocamlnat-0.1.1"; +# https://github.com/bmeurer/ocamlnat/issues/3 +assert lib.versionOlder ocaml.version "4"; + +stdenv.mkDerivation rec { + name = "ocamlnat-${version}"; + version = "0.1.1"; src = fetchurl { - url = http://benediktmeurer.de/files/source/ocamlnat-0.1.1.tar.bz2; + url = "http://benediktmeurer.de/files/source/${name}.tar.bz2"; sha256 = "0dyvy0j6f47laxhnadvm71z1py9hz9zd49hamf6bij99cggb2ij1"; }; diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix index e67eebeb7a0..fc7640cc0c9 100644 --- a/pkgs/development/ocaml-modules/ocamlnet/default.nix +++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix @@ -1,16 +1,12 @@ { stdenv, fetchurl, pkgconfig, ncurses, ocaml, findlib, ocaml_pcre, camlzip , gnutls, nettle }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - stdenv.mkDerivation { - name = "ocamlnet-4.1.1"; + name = "ocamlnet-4.1.2"; src = fetchurl { - url = http://download.camlcity.org/download/ocamlnet-4.1.1.tar.gz; - sha256 = "1z0j542dfzfimsn4asw1ycb4ww561pv92cz6s6kxazvgx60c5rb1"; + url = http://download.camlcity.org/download/ocamlnet-4.1.2.tar.gz; + sha256 = "1n0l9zlq7dc5yr43bpa4a0b6bxj3iyjkadbb41g59zlwa8hkk34i"; }; buildInputs = [ ncurses ocaml findlib ocaml_pcre camlzip gnutls pkgconfig nettle ]; @@ -27,7 +23,7 @@ stdenv.mkDerivation { -enable-pcre -disable-gtk2 -with-nethttpd - -datadir $out/lib/ocaml/${ocaml_version}/ocamlnet + -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet ) ''; diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix index 8f2ffcaa9bc..a5fd2d5076d 100644 --- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix +++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix @@ -1,13 +1,12 @@ {stdenv, fetchurl, ocaml, pkgconfig, findlib, SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_gfx, lablgl }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "ocamlsdl"; - version = "0.9.1"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.9.1"; src = fetchurl { url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ocplib-endian/default.nix b/pkgs/development/ocaml-modules/ocplib-endian/default.nix index 351f667a8c9..b7d897b3853 100644 --- a/pkgs/development/ocaml-modules/ocplib-endian/default.nix +++ b/pkgs/development/ocaml-modules/ocplib-endian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, cppo }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, cppo }: let version = "0.8"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "12xjvzw245mj4s02dgi4k2sx5gam7wxi4mbxmz6k18zg64n48yjd"; }; - buildInputs = [ ocaml findlib cppo ]; + buildInputs = [ ocaml findlib ocamlbuild cppo ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index d711bae0f34..974779e473f 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -1,7 +1,7 @@ { stdenv, ocaml, findlib, fetchurl, curl, ncurses }: stdenv.mkDerivation rec { - name = "ocurl-0.7.5"; + name = "ocurl-0.7.8"; src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/1463/${name}.tar.bz2"; sha256 = "0yn7f3g5wva8nqxh76adpq9rihggc405jkqysfghzwnf3yymyqrr"; diff --git a/pkgs/development/ocaml-modules/odn/default.nix b/pkgs/development/ocaml-modules/odn/default.nix index b3c7ddb8433..f30fea2c419 100644 --- a/pkgs/development/ocaml-modules/odn/default.nix +++ b/pkgs/development/ocaml-modules/odn/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, type_conv, ounit, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, type_conv, ounit, camlp4 }: stdenv.mkDerivation { name = "ocaml-data-notation-0.0.11"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "09a8zdyifpc2nl4hdvg9206142y31cq95ajgij011s1qcg3z93lj"; }; - buildInputs = [ocaml findlib type_conv ounit camlp4]; + buildInputs = [ ocaml findlib ocamlbuild type_conv ounit camlp4 ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/optcomp/default.nix b/pkgs/development/ocaml-modules/optcomp/default.nix index 12075145415..7afbf3a4b40 100644 --- a/pkgs/development/ocaml-modules/optcomp/default.nix +++ b/pkgs/development/ocaml-modules/optcomp/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ocaml-optcomp-1.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; meta = { diff --git a/pkgs/development/ocaml-modules/otfm/default.nix b/pkgs/development/ocaml-modules/otfm/default.nix index a2047a0fe78..30946da1c0b 100644 --- a/pkgs/development/ocaml-modules/otfm/default.nix +++ b/pkgs/development/ocaml-modules/otfm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, uutf }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uutf }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1wgi9plf98gd7x3b7fzjxds089sivsap97bl1bw2lj73nxwnyb9c"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; propagatedBuildInputs = [ uutf ]; diff --git a/pkgs/development/ocaml-modules/ounit/default.nix b/pkgs/development/ocaml-modules/ounit/default.nix index d449296ab70..7179b8408a0 100644 --- a/pkgs/development/ocaml-modules/ounit/default.nix +++ b/pkgs/development/ocaml-modules/ounit/default.nix @@ -1,8 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, camlp4}: - -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: stdenv.mkDerivation { name = "ounit-2.0.0"; @@ -12,7 +8,7 @@ stdenv.mkDerivation { sha256 = "118xsadrx84pif9vaq13hv4yh22w9kmr0ypvhrs0viir1jr0ajjd"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/pa_test/default.nix b/pkgs/development/ocaml-modules/pa_test/default.nix index faf17e20dc1..5acf931b2ea 100644 --- a/pkgs/development/ocaml-modules/pa_test/default.nix +++ b/pkgs/development/ocaml-modules/pa_test/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib, herelib}: +{stdenv, buildOcaml, fetchurl, type_conv, pa_ounit, sexplib_p4, herelib}: buildOcaml rec { name = "pa_test"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_ounit ]; - propagatedBuildInputs = [ type_conv sexplib herelib ]; + propagatedBuildInputs = [ type_conv sexplib_p4 herelib ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/pa_test; diff --git a/pkgs/development/ocaml-modules/pgocaml/default.nix b/pkgs/development/ocaml-modules/pgocaml/default.nix index f1bc4849a7f..6b9ae97ad54 100644 --- a/pkgs/development/ocaml-modules/pgocaml/default.nix +++ b/pkgs/development/ocaml-modules/pgocaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4, calendar, csv, ocaml_pcre }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, calendar, csv, ocaml_pcre }: stdenv.mkDerivation { name = "ocaml-pgocaml-2.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0x0dhlz2rqxpwfdqi384f9fn0ng2irifadmxfm2b4gcz7y1cl9rh"; }; - buildInputs = [ ocaml findlib camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [ calendar csv ocaml_pcre ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/pprint/default.nix b/pkgs/development/ocaml-modules/pprint/default.nix index e28f85b475c..83732eb1f75 100644 --- a/pkgs/development/ocaml-modules/pprint/default.nix +++ b/pkgs/development/ocaml-modules/pprint/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0sc9q89dnyarcg24czyhr6ams0ylqvia3745s6rfwd2nldpygsdk"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/pkgs/development/ocaml-modules/ppx_deriving/default.nix new file mode 100644 index 00000000000..4b4056a69d7 --- /dev/null +++ b/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -0,0 +1,28 @@ +{stdenv, buildOcaml, fetchurl, + cppo, ppx_tools, result, ounit}: + +buildOcaml rec { + name = "ppx_deriving"; + version = "v3.3"; + + minimumSupportedOcamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/whitequark/${name}/archive/${version}.tar.gz"; + sha256 = "1j20c6r2v7h05a4v9m8z5m1yqgwif41yrp63mik14pf3dkrj8x3f"; + }; + + hasSharedObjects = true; + + buildInputs = [ cppo ounit ]; + propagatedBuildInputs = + [ ppx_tools result ]; + + installPhase = "OCAMLPATH=$OCAMLPATH:`ocamlfind printconf destdir` make install"; + + meta = with stdenv.lib; { + description = "deriving is a library simplifying type-driven code generation on OCaml >=4.02."; + maintainers = [ maintainers.maurer ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix index 377dc32751a..33bf180cd7f 100644 --- a/pkgs/development/ocaml-modules/ppx_tools/default.nix +++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix @@ -1,21 +1,30 @@ -{ stdenv, fetchzip, ocaml, findlib }: +{ stdenv, fetchFromGitHub, ocaml, findlib }: -stdenv.mkDerivation { - name = "ocaml-ppx_tools-5.0+4.02"; - src = fetchzip { - url = https://github.com/alainfrisch/ppx_tools/archive/5.0+4.02.0.tar.gz; - sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8"; - }; +let + version = + if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.03" then "5.0+4.03.0" else "5.0+4.02.0"; +in + stdenv.mkDerivation { + name = "ocaml-ppx_tools-${version}"; + src = fetchFromGitHub { + owner = "alainfrisch"; + repo = "ppx_tools"; + rev = version; + sha256 = if version == "5.0+4.03.0" + then "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg" + else "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8" + ; + }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ]; - createFindlibDestdir = true; + createFindlibDestdir = true; - meta = with stdenv.lib; { - description = "Tools for authors of ppx rewriters"; - homepage = http://www.lexifi.com/ppx_tools; - license = licenses.mit; - platforms = ocaml.meta.platforms or []; - maintainers = with maintainers; [ vbgl ]; - }; -} + meta = with stdenv.lib; { + description = "Tools for authors of ppx rewriters"; + homepage = http://www.lexifi.com/ppx_tools; + license = licenses.mit; + platforms = ocaml.meta.platforms or []; + maintainers = with maintainers; [ vbgl ]; + }; + } diff --git a/pkgs/development/ocaml-modules/qcheck/default.nix b/pkgs/development/ocaml-modules/qcheck/default.nix index 7d904e57633..158c69ef11a 100644 --- a/pkgs/development/ocaml-modules/qcheck/default.nix +++ b/pkgs/development/ocaml-modules/qcheck/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, oasis, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ounit }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0j2jdrfz8rrslgjihnfgg8yy12860z2vvf7hqzjbmfmf03hz4pgv"; }; - buildInputs = [ ocaml findlib oasis ounit ]; + buildInputs = [ ocaml findlib ocamlbuild oasis ounit ]; configureFlags = "--enable-tests --enable-ounit"; diff --git a/pkgs/development/ocaml-modules/qtest/default.nix b/pkgs/development/ocaml-modules/qtest/default.nix index f7e585b43b0..6d5f8ecc683 100644 --- a/pkgs/development/ocaml-modules/qtest/default.nix +++ b/pkgs/development/ocaml-modules/qtest/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchzip, ocaml, oasis, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: -let version = "2.0.1"; in +let version = "2.2"; in stdenv.mkDerivation { name = "ocaml-qtest-${version}"; src = fetchzip { url = "https://github.com/vincent-hugot/iTeML/archive/v${version}.tar.gz"; - sha256 = "00sir7q7z78s22w8fzrgw9gqm7r8ww0bgwqxrq6nsbbclgxj9c6i"; + sha256 = "1k68z8kby1f9s5j9xbn9bz8yhk59aalffz8gj5d1y5zhyalifrlz"; }; - buildInputs = [ ocaml oasis findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ounit ]; - buildPhase = "ocaml do.ml qtest build $out"; createFindlibDestdir = true; - installPhase = "ocaml do.ml qtest install $out"; + installFlags = [ "BIN=$(out)/bin" ]; + preInstall = "mkdir -p $out/bin"; meta = { description = "Inline (Unit) Tests for OCaml (formerly “qtest”)"; diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 072754fc60f..1ea2310bf9f 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ounit }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit }: stdenv.mkDerivation rec { name = "ocaml-re-1.5.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17avk7kwmgdjkri1sj5q4a59ykc9rj0bxj6ixxpl6i0n49br3f92"; }; - buildInputs = [ ocaml findlib ounit ]; + buildInputs = [ ocaml findlib ocamlbuild ounit ]; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/ocaml-modules/re2/default.nix b/pkgs/development/ocaml-modules/re2/default.nix index e89e28fe1e5..9b26c404095 100644 --- a/pkgs/development/ocaml-modules/re2/default.nix +++ b/pkgs/development/ocaml-modules/re2/default.nix @@ -1,5 +1,5 @@ -{stdenv, buildOcaml, fetchurl, ocaml, core, pa_ounit, pa_test, - bin_prot, comparelib, sexplib, rsync}: +{stdenv, buildOcaml, fetchurl, ocaml, core_p4, pa_ounit, pa_test, + bin_prot_p4, comparelib, sexplib_p4, rsync}: buildOcaml rec { name = "re2"; @@ -16,7 +16,7 @@ buildOcaml rec { else null; buildInputs = [ pa_ounit pa_test rsync ]; - propagatedBuildInputs = [ core bin_prot comparelib sexplib ]; + propagatedBuildInputs = [ core_p4 bin_prot_p4 comparelib sexplib_p4 ]; hasSharedObjects = true; diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index f9fe95b89dc..66c2533853e 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: stdenv.mkDerivation { name = "ocaml-react-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; unpackCmd = "tar xjf $src"; - buildInputs = [ocaml findlib opam]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/reactivedata/default.nix b/pkgs/development/ocaml-modules/reactivedata/default.nix index 4b335496500..cd64e6578c1 100644 --- a/pkgs/development/ocaml-modules/reactivedata/default.nix +++ b/pkgs/development/ocaml-modules/reactivedata/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, ocaml_react, camlp4, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_react, camlp4, opam }: let ocamlVersion = stdenv.lib.getVersion ocaml; @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "0rskcxnyjn8sxqnncdm6rh9wm99nha5m5sc83fywgzs64xfl43fq"; }; - buildInputs = [ocaml findlib opam camlp4 ]; + buildInputs = [ ocaml findlib ocamlbuild opam camlp4 ]; propagatedBuildInputs = [ocaml_react]; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; diff --git a/pkgs/development/ocaml-modules/safepass/default.nix b/pkgs/development/ocaml-modules/safepass/default.nix index 2f941b923e3..44a74b3fa2f 100644 --- a/pkgs/development/ocaml-modules/safepass/default.nix +++ b/pkgs/development/ocaml-modules/safepass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation { name = "ocaml-safepass-1.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0lb8xbpyc5d1zml7s7mmcr6y2ipwdp7qz73lkv9asy7dyi6cj15g"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix index c689aec1904..a87a13fd396 100644 --- a/pkgs/development/ocaml-modules/sequence/default.nix +++ b/pkgs/development/ocaml-modules/sequence/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, qtest, ounit }: +{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, qtest, ounit }: let version = "0.6"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { sha256 = "0mky5qas3br2x4y14dzcky212z624ydqnx8mw8w00x0c1xjpafkb"; }; - buildInputs = [ ocaml findlib qtest ounit ]; + buildInputs = [ ocaml findlib ocamlbuild qtest ounit ]; configureFlags = [ "--enable-tests" diff --git a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix index 40b95e09e8b..a8acee1c538 100644 --- a/pkgs/development/ocaml-modules/sexplib/108.08.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/108.08.00.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionOlder "3.12" ocaml_version; +assert stdenv.lib.versionOlder "3.12" ocaml.version; stdenv.mkDerivation { name = "ocaml-sexplib-108.08.00"; diff --git a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix index 55b09c3fdc3..a8724f23cfe 100644 --- a/pkgs/development/ocaml-modules/sexplib/111.25.00.nix +++ b/pkgs/development/ocaml-modules/sexplib/111.25.00.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, type_conv, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionOlder "4.00" ocaml_version; +assert stdenv.lib.versionOlder "4.00" ocaml.version; stdenv.mkDerivation { name = "ocaml-sexplib-111.25.00"; diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix index 804e33fc738..cfa90226678 100644 --- a/pkgs/development/ocaml-modules/sqlite3/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sqlite, ocaml, findlib, pkgconfig }: +{ stdenv, fetchurl, sqlite, ocaml, findlib, ocamlbuild, pkgconfig }: stdenv.mkDerivation rec { name = "ocaml-sqlite3-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0rwsx1nfa3xqmbygim2qx45jqm1gwf08m70wmcwkx50f1qk3l551"; }; - buildInputs = [ ocaml findlib pkgconfig sqlite ]; + buildInputs = [ ocaml findlib ocamlbuild pkgconfig sqlite ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix index a6ff9f44116..0a5c04ce7aa 100644 --- a/pkgs/development/ocaml-modules/sqlite3EZ/default.nix +++ b/pkgs/development/ocaml-modules/sqlite3EZ/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib, twt, ocaml_sqlite3 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, twt, ocaml_sqlite3 }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "8ed2c5d5914a65cbd95589ef11bfb8b38a020eb850cdd49b8adce7ee3a563748"; }; - buildInputs = [ ocaml findlib twt ]; + buildInputs = [ ocaml findlib ocamlbuild twt ]; propagatedBuildInputs = [ ocaml_sqlite3 ]; diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix index 6eb43d07b68..e25b17fb656 100644 --- a/pkgs/development/ocaml-modules/ssl/default.nix +++ b/pkgs/development/ocaml-modules/ssl/default.nix @@ -1,12 +1,8 @@ {stdenv, fetchurl, which, openssl, ocaml, findlib}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.5.2"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocaml-ssl-${version}"; + version = "0.5.2"; src = fetchurl { url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz"; diff --git a/pkgs/development/ocaml-modules/stringext/default.nix b/pkgs/development/ocaml-modules/stringext/default.nix index 05aa2c2da68..9eb9ad514f7 100644 --- a/pkgs/development/ocaml-modules/stringext/default.nix +++ b/pkgs/development/ocaml-modules/stringext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, ounit, qcheck +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, ounit, qcheck # Optionally enable tests; test script use OCaml-4.01+ features , doCheck ? stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01" }: @@ -13,7 +13,7 @@ stdenv.mkDerivation { sha256 = "1jp0x9rkss8a48z9wbnc4v5zvmnysin30345psl3xnxb2aqzwlii"; }; - buildInputs = [ ocaml findlib ounit qcheck ]; + buildInputs = [ ocaml findlib ocamlbuild ounit qcheck ]; configurePhase = "ocaml setup.ml -configure --prefix $out" + stdenv.lib.optionalString doCheck " --enable-tests"; diff --git a/pkgs/development/ocaml-modules/textutils/default.nix b/pkgs/development/ocaml-modules/textutils/default.nix index 377b94eff8b..6f35b970228 100644 --- a/pkgs/development/ocaml-modules/textutils/default.nix +++ b/pkgs/development/ocaml-modules/textutils/default.nix @@ -1,4 +1,4 @@ -{stdenv, buildOcaml, fetchurl, core, pa_ounit, pa_test, sexplib}: +{stdenv, buildOcaml, fetchurl, core_p4, pa_ounit, pa_test, sexplib_p4}: buildOcaml rec { name = "textutils"; @@ -12,7 +12,7 @@ buildOcaml rec { }; buildInputs = [ pa_test ]; - propagatedBuildInputs = [ core pa_ounit sexplib ]; + propagatedBuildInputs = [ core_p4 pa_ounit sexplib_p4 ]; meta = with stdenv.lib; { homepage = https://github.com/janestreet/textutils; diff --git a/pkgs/development/ocaml-modules/topkg/default.nix b/pkgs/development/ocaml-modules/topkg/default.nix index 4fd6589cfb5..1b1a127c536 100644 --- a/pkgs/development/ocaml-modules/topkg/default.nix +++ b/pkgs/development/ocaml-modules/topkg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, result, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, result, opam }: let ocaml-version = stdenv.lib.getVersion ocaml; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ opam ]; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ result ]; unpackCmd = "tar xjf ${src}"; diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 79a696632e1..d47d5d3169b 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ctypes, result, SDL2, pkgconfig, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ctypes, result, SDL2, pkgconfig, opam }: let inherit (stdenv.lib) getVersion; @@ -17,7 +17,7 @@ stdenv.mkDerivation { sha256 = "02x0wsy5nxagxrh07yb2h4yqqy1bxryp2gwrylds0j6ybqsv4shm"; }; - buildInputs = [ ocaml findlib result pkgconfig opam ]; + buildInputs = [ ocaml findlib ocamlbuild result pkgconfig opam ]; propagatedBuildInputs = [ SDL2 ctypes ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix index e014da8b66a..4a3d8c58f0b 100644 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionOlder "3.12" ocaml_version; +assert stdenv.lib.versionOlder "3.12" ocaml.version; stdenv.mkDerivation { name = "ocaml-type_conv-108.08.00"; diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix index b6747a48d95..ae2b62f6b36 100644 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix @@ -1,10 +1,6 @@ {stdenv, fetchurl, ocaml, findlib, camlp4}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionOlder "4.00" ocaml_version; +assert stdenv.lib.versionOlder "4.00" ocaml.version; stdenv.mkDerivation { name = "ocaml-type_conv-109.60.01"; diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 4f9644ea5be..b8c415b7566 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, ocaml_oasis, camlp4, uutf, markup, ppx_tools, re }: stdenv.mkDerivation rec { pname = "tyxml"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1rz0f48x8p1m30723rn5v85pp7rd0spr04sd7gzryy99vn3ianga"; }; - buildInputs = [ocaml findlib camlp4]; + buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; propagatedBuildInputs = [uutf re ppx_tools markup]; diff --git a/pkgs/development/ocaml-modules/ulex/0.8/default.nix b/pkgs/development/ocaml-modules/ulex/0.8/default.nix index eddc71aeace..288e9a6933e 100644 --- a/pkgs/development/ocaml-modules/ulex/0.8/default.nix +++ b/pkgs/development/ocaml-modules/ulex/0.8/default.nix @@ -1,14 +1,12 @@ {stdenv, fetchurl, ocaml, findlib, camlp5 }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.8"; pname = "ulex"; - in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "0.8"; src = fetchurl { url = "http://www.cduce.org/download/old/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 1e0632387e3..fa26b305da2 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -1,14 +1,12 @@ -{ stdenv, fetchurl, ocaml, findlib, camlp4 }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "1.1"; pname = "ulex"; - in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.1"; src = fetchurl { url = "http://www.cduce.org/download/${pname}-${version}.tar.gz"; @@ -17,7 +15,7 @@ stdenv.mkDerivation { createFindlibDestdir = true; - buildInputs = [ ocaml findlib ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ camlp4 ]; buildFlags = "all all.opt"; diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index dca989c88ef..a6335274f73 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, re, sexplib, stringext, ounit }: +{ stdenv, fetchzip, ocaml, findlib, re, sexplib_p4, stringext, ounit }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4"; @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = [ ocaml findlib ounit ]; - propagatedBuildInputs = [ re sexplib stringext ]; + propagatedBuildInputs = [ re sexplib_p4 stringext ]; configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; buildPhase = '' diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix index 2f19b2c17ef..73a0ccdacfe 100644 --- a/pkgs/development/ocaml-modules/uucd/default.nix +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -1,20 +1,19 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, xmlm, topkg }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, xmlm, topkg }: + let pname = "uucd"; - version = "4.0.0"; webpage = "http://erratique.ch/software/${pname}"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "4.0.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "11cjfwa4wjhsyvzq4wl9z44xi28n49drz8nbfpx754vyfzwj3yc6"; }; - buildInputs = [ ocaml findlib opam topkg ]; + buildInputs = [ ocaml findlib ocamlbuild opam topkg ]; createFindlibDestdir = true; @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; propagatedBuildInputs = [ xmlm ]; diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 4e4dd67e210..456fc8a1976 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1vm5f2ppdrnk19j0ppjiqz56qf5bzyk26gs0lz071s7iblk459jz"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix index 07ba10a74a9..0391cd5033f 100644 --- a/pkgs/development/ocaml-modules/uuidm/default.nix +++ b/pkgs/development/ocaml-modules/uuidm/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild }: stdenv.mkDerivation rec { version = "0.9.5"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { unpackCmd = "tar -xf $curSrc"; - buildInputs = [ocaml findlib]; + buildInputs = [ ocaml findlib ocamlbuild ]; configurePhase = "ocaml setup.ml -configure --prefix $prefix"; buildPhase = "ocaml setup.ml -build"; diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix index 4e5d73e4cb3..11ff9a36a41 100644 --- a/pkgs/development/ocaml-modules/uunf/default.nix +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -1,23 +1,21 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "uunf"; - version = "0.9.3"; webpage = "http://erratique.ch/software/${pname}"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "0.9.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/uuseg/default.nix b/pkgs/development/ocaml-modules/uuseg/default.nix index 5946fd2a70d..3c7a4ff5c58 100644 --- a/pkgs/development/ocaml-modules/uuseg/default.nix +++ b/pkgs/development/ocaml-modules/uuseg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocaml, findlib, opam, uucp, uutf, cmdliner }: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam, uucp, uutf, cmdliner }: let inherit (stdenv.lib) getVersion versionAtLeast; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "00n4zi8dyw2yzi4nr2agcrr33b0q4dr9mgnkczipf4c0gm5cm50h"; }; - buildInputs = [ ocaml findlib opam cmdliner ]; + buildInputs = [ ocaml findlib ocamlbuild opam cmdliner ]; propagatedBuildInputs = [ uucp uutf ]; createFindlibDestdir = true; diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix index 7c4cff57128..fda630114ed 100644 --- a/pkgs/development/ocaml-modules/uutf/default.nix +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -1,23 +1,21 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "uutf"; - version = "0.9.3"; webpage = "http://erratique.ch/software/${pname}"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "0.9.3"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix index 5dedfb396d5..d94a3eac873 100644 --- a/pkgs/development/ocaml-modules/xmlm/default.nix +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -1,23 +1,21 @@ -{stdenv, fetchurl, ocaml, findlib, opam}: +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, opam }: let pname = "xmlm"; - version = "1.2.0"; webpage = "http://erratique.ch/software/${pname}"; - ocaml_version = (builtins.parseDrvName ocaml.name).version; in -assert stdenv.lib.versionAtLeast ocaml_version "3.12"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12"; stdenv.mkDerivation rec { - name = "ocaml-${pname}-${version}"; + version = "1.2.0"; src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; }; - buildInputs = [ ocaml findlib opam ]; + buildInputs = [ ocaml findlib ocamlbuild opam ]; createFindlibDestdir = true; @@ -28,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' opam-installer --script --prefix=$out ${pname}.install > install.sh sh install.sh - ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml.version}/site-lib/ ''; meta = with stdenv.lib; { diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix index 10a3a1602ae..458ed1683e0 100644 --- a/pkgs/development/ocaml-modules/zarith/default.nix +++ b/pkgs/development/ocaml-modules/zarith/default.nix @@ -1,10 +1,6 @@ { stdenv, fetchurl, ocaml, findlib, pkgconfig, gmp, perl }: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; -in - -assert stdenv.lib.versionAtLeast ocaml_version "3.12.1"; +assert stdenv.lib.versionAtLeast ocaml.version "3.12.1"; stdenv.mkDerivation rec { name = "zarith-${version}"; @@ -22,9 +18,9 @@ stdenv.mkDerivation rec { substituteInPlace ./z_pp.pl --replace '/usr/bin/perl' '${perl}/bin/perl' ''; configurePhase = '' - ./configure -installdir $out/lib/ocaml/${ocaml_version}/site-lib + ./configure -installdir $out/lib/ocaml/${ocaml.version}/site-lib ''; - preInstall = "mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib"; + preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib"; meta = with stdenv.lib; { description = "Fast, arbitrary precision OCaml integers"; diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix index f9bf65cf814..410d5c0c612 100644 --- a/pkgs/development/ocaml-modules/zed/default.nix +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, ocaml, findlib, camomile, ocaml_react }: +{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, camomile, ocaml_react }: stdenv.mkDerivation rec { version = "1.4"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0d8qfy0qiydrrqi8qc9rcwgjigql6vx9gl4zp62jfz1lmjgb2a3w"; }; - buildInputs = [ ocaml findlib ocaml_react ]; + buildInputs = [ ocaml findlib ocamlbuild ocaml_react ]; propagatedBuildInputs = [ camomile ]; diff --git a/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch b/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch new file mode 100644 index 00000000000..34221c0d20c --- /dev/null +++ b/pkgs/development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch @@ -0,0 +1,34 @@ +From 0be0223422e6e5f4091c6e4e058d213623eed105 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Mon, 12 Sep 2016 14:40:44 +0200 +Subject: [PATCH] Skip preprocessor symbol only CURL_STRICTER +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +CURL_STRICTER leaked into curl-constants.c when building against +curl-7.50.2. This is a preprocessor only macro without a value. + +CPAN RT#117793 + +Signed-off-by: Petr Písař +--- + Makefile.PL | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.PL b/Makefile.PL +index f9170bb..ad2bd3d 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -127,7 +127,7 @@ if (!defined($curl_h)) { + close H; + + for my $e (sort @syms) { +- if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { ++ if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURL_STRICTER\z|_LAST\z|_LASTENTRY\z)/) { + next; + } + my ($group) = $e =~ m/^([^_]+_)/; +-- +2.7.4 + diff --git a/pkgs/development/perl-modules/dbiclassx-fix.patch b/pkgs/development/perl-modules/dbiclassx-fix.patch new file mode 100644 index 00000000000..a46ffaa7bd9 --- /dev/null +++ b/pkgs/development/perl-modules/dbiclassx-fix.patch @@ -0,0 +1,24 @@ +From adcc1df0049e0093cb94c867bd2be8c9fe242a61 Mon Sep 17 00:00:00 2001 +From: Peter Rabbitson +Date: Tue, 13 Sep 2016 17:15:48 +0200 +Subject: [PATCH] Fix for upcoming (not yet available via DBD::SQLite) + libsqlite version + +--- + Changes | 2 ++ + t/prefetch/grouped.t | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/t/prefetch/grouped.t b/t/prefetch/grouped.t +index 4aad6b1..c0d2224 100644 +--- a/t/prefetch/grouped.t ++++ b/t/prefetch/grouped.t +@@ -101,7 +101,7 @@ my @cdids = sort $cd_rs->get_column ('cdid')->all; + + # add an extra track to one of the cds, and then make sure we can get it on top + # (check if limit works) +- my $top_cd = $cd_rs->slice (1,1)->next; ++ my $top_cd = $cd_rs->search({}, { order_by => 'cdid' })->slice (1,1)->next; + $top_cd->create_related ('tracks', { + title => 'over the top', + }); diff --git a/pkgs/development/perl-modules/net-amazon-s3-credentials-provider.patch b/pkgs/development/perl-modules/net-amazon-s3-credentials-provider.patch deleted file mode 100644 index e24c44d7e15..00000000000 --- a/pkgs/development/perl-modules/net-amazon-s3-credentials-provider.patch +++ /dev/null @@ -1,291 +0,0 @@ -commit 4afa16864ac8ae23a450abf95db023b0c8bea698 -Author: Shea Levy -Date: Thu Aug 29 07:09:34 2013 -0400 - - Use CredentialsProviders à la the Java API - - Signed-off-by: Shea Levy - -diff --git a/lib/Net/Amazon/Auth/CredentialsProvider.pm b/lib/Net/Amazon/Auth/CredentialsProvider.pm -new file mode 100755 -index 0000000..527acae ---- /dev/null -+++ b/lib/Net/Amazon/Auth/CredentialsProvider.pm -@@ -0,0 +1,9 @@ -+package Net::Amazon::Auth::CredentialsProvider; -+ -+use Moose::Role 0.85; -+ -+requires 'get_credentials'; -+ -+sub refresh { } -+ -+1; -diff --git a/lib/Net/Amazon/Auth/CredentialsProviderChain.pm b/lib/Net/Amazon/Auth/CredentialsProviderChain.pm -new file mode 100755 -index 0000000..85cd8e0 ---- /dev/null -+++ b/lib/Net/Amazon/Auth/CredentialsProviderChain.pm -@@ -0,0 +1,41 @@ -+package Net::Amazon::Auth::CredentialsProviderChain; -+ -+use Moose 0.85; -+use MooseX::StrictConstructor 0.16; -+use Net::Amazon::Auth::EnvironmentVariableCredentialsProvider; -+use Net::Amazon::Auth::InstanceProfileCredentialsProvider; -+ -+with 'Net::Amazon::Auth::CredentialsProvider'; -+ -+has 'providers' => ( is => 'ro', isa => 'ArrayRef[Net::Amazon::Auth::CredentialsProvider]', required => 1 ); -+ -+sub refresh { -+ my $self = shift; -+ -+ map { $_->refresh } @{$self->providers}; -+} -+ -+sub get_credentials { -+ my $self = shift; -+ -+ foreach my $provider (@{$self->providers}) { -+ my $res = $provider->get_credentials; -+ if (defined $res->{access_key_id}) { -+ return $res; -+ } -+ } -+ -+ return {}; -+} -+ -+sub default_chain { -+ my $class = shift; -+ return $class->new(providers => [ -+ Net::Amazon::Auth::EnvironmentVariableCredentialsProvider->new, -+ Net::Amazon::Auth::InstanceProfileCredentialsProvider->new -+ ]); -+} -+ -+__PACKAGE__->meta->make_immutable; -+ -+1; -diff --git a/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm b/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm -new file mode 100755 -index 0000000..ac38a84 ---- /dev/null -+++ b/lib/Net/Amazon/Auth/EnvironmentVariableCredentialsProvider.pm -@@ -0,0 +1,26 @@ -+package Net::Amazon::Auth::EnvironmentVariableCredentialsProvider; -+ -+use Moose 0.85; -+use MooseX::StrictConstructor 0.16; -+ -+extends 'Net::Amazon::Auth::FixedCredentialsProvider'; -+ -+around BUILDARGS => sub { -+ my $orig = shift; -+ my $class = shift; -+ -+ my %args = ( -+ access_key_id => $ENV{AWS_ACCESS_KEY_ID}, -+ secret_access_key => $ENV{AWS_SECRET_ACCESS_KEY} -+ ); -+ -+ if (exists $ENV{AWS_SESSION_TOKEN}) { -+ $args{session_token} = $ENV{AWS_SESSION_TOKEN}; -+ } -+ -+ return $class->$orig(\%args); -+}; -+ -+__PACKAGE__->meta->make_immutable; -+ -+1; -diff --git a/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm b/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm -new file mode 100755 -index 0000000..21d56c7 ---- /dev/null -+++ b/lib/Net/Amazon/Auth/FixedCredentialsProvider.pm -@@ -0,0 +1,23 @@ -+package Net::Amazon::Auth::FixedCredentialsProvider; -+ -+use Moose 0.85; -+use MooseX::StrictConstructor 0.16; -+ -+with 'Net::Amazon::Auth::CredentialsProvider'; -+ -+has 'access_key_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); -+has 'secret_access_key' => ( is => 'ro', isa => 'Maybe[Str]', required => 1 ); -+has 'session_token' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 ); -+ -+sub get_credentials { -+ my $self = shift; -+ return { -+ access_key_id => $self->access_key_id, -+ secret_access_key => $self->secret_access_key, -+ session_token => $self->session_token -+ }; -+} -+ -+__PACKAGE__->meta->make_immutable; -+ -+1; -diff --git a/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm b/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm -new file mode 100755 -index 0000000..b9f826a ---- /dev/null -+++ b/lib/Net/Amazon/Auth/InstanceProfileCredentialsProvider.pm -@@ -0,0 +1,57 @@ -+package Net::Amazon::Auth::InstanceProfileCredentialsProvider; -+ -+use Moose 0.85; -+use MooseX::StrictConstructor 0.16; -+use HTTP::Date; -+use JSON; -+ -+with 'Net::Amazon::Auth::CredentialsProvider'; -+ -+has '_ua' => ( is => 'rw', isa => 'LWP::UserAgent', required => 0 ); -+has '_access_key_id' => ( is => 'rw', isa => 'Str', required => 0 ); -+has '_secret_access_key' => ( is => 'rw', isa => 'Str', required => 0 ); -+has '_session_token' => ( is => 'rw', isa => 'Str', required => 0 ); -+has '_expiration_date' => ( is => 'rw', isa => 'Int', required => 0, default => 0 ); -+ -+sub BUILD { -+ my $self = shift; -+ my $ua = LWP::UserAgent->new; -+ $ua->timeout(10); -+ $self->_ua($ua); -+} -+ -+sub refresh { -+ my $self = shift; -+ -+ my $role_name_response = -+ $self->_ua->get("http://169.254.169.254/latest/meta-data/iam/security-credentials/"); -+ if ($role_name_response->code == 200) { -+ my $credentials_response = $self->_ua->get("http://169.254.169.254/latest/meta-data/iam/security-credentials/" . $role_name_response->content); -+ -+ if ($credentials_response->code == 200) { -+ my $credentials = decode_json($credentials_response->content); -+ $self->_expiration_date(str2time($credentials->{Expiration})); -+ $self->_access_key_id($credentials->{AccessKeyId}); -+ $self->_secret_access_key($credentials->{SecretAccessKey}); -+ $self->_session_token($credentials->{Token}); -+ } -+ } -+} -+ -+sub get_credentials { -+ my $self = shift; -+ -+ if (time() - $self->_expiration_date > -5 * 60) { #Credentials available 5 minutes before expiry -+ $self->refresh; -+ } -+ -+ return { -+ access_key_id => $self->_access_key_id, -+ secret_access_key => $self->_secret_access_key, -+ session_token => $self->_session_token -+ }; -+} -+ -+__PACKAGE__->meta->make_immutable; -+ -+1; -diff --git a/lib/Net/Amazon/S3.pm b/lib/Net/Amazon/S3.pm -index 907113e..a369e4b 100755 ---- a/lib/Net/Amazon/S3.pm -+++ b/lib/Net/Amazon/S3.pm -@@ -133,9 +133,10 @@ use LWP::UserAgent::Determined; - use URI::Escape qw(uri_escape_utf8); - use XML::LibXML; - use XML::LibXML::XPathContext; -+use Net::Amazon::Auth::FixedCredentialsProvider; -+use Net::Amazon::Auth::CredentialsProviderChain; - --has 'aws_access_key_id' => ( is => 'ro', isa => 'Str', required => 1 ); --has 'aws_secret_access_key' => ( is => 'ro', isa => 'Str', required => 1 ); -+has 'credentials_provider' => ( is => 'ro', isa => 'Net::Amazon::Auth::CredentialsProvider', required => 0, default => sub { return Net::Amazon::Auth::CredentialsProviderChain->default_chain; } ); - has 'secure' => ( is => 'ro', isa => 'Bool', required => 0, default => 0 ); - has 'timeout' => ( is => 'ro', isa => 'Num', required => 0, default => 30 ); - has 'retry' => ( is => 'ro', isa => 'Bool', required => 0, default => 0 ); -@@ -144,7 +145,23 @@ has 'libxml' => ( is => 'rw', isa => 'XML::LibXML', required => 0 ); - has 'ua' => ( is => 'rw', isa => 'LWP::UserAgent', required => 0 ); - has 'err' => ( is => 'rw', isa => 'Maybe[Str]', required => 0 ); - has 'errstr' => ( is => 'rw', isa => 'Maybe[Str]', required => 0 ); --has 'aws_session_token' => ( is => 'ro', isa => 'Str', required => 0 ); -+ -+around BUILDARGS => sub { -+ my $orig = shift; -+ my $class = shift; -+ -+ my $args = $class->$orig(@_); -+ -+ if (exists $args->{aws_access_key_id}) { -+ $args->{credentials_provider} = Net::Amazon::Auth::FixedCredentialsProvider->new({ -+ access_key_id => $args->{aws_access_key_id}, -+ secret_access_key => $args->{aws_secret_access_key}, -+ session_token => $args->{aws_session_token} -+ }); -+ delete @{$args}{qw(aws_access_key_id aws_secret_access_key aws_session_token)}; -+ } -+ return $args; -+}; - - __PACKAGE__->meta->make_immutable; - -@@ -223,6 +240,24 @@ sub BUILD { - - $self->ua($ua); - $self->libxml( XML::LibXML->new ); -+ -+ die "No AWS credentials found!" unless defined $self->credentials_provider->get_credentials->{access_key_id}; -+} -+ -+# Backwards compatibility -+sub aws_access_key_id { -+ my $self = shift; -+ return $self->credentials_provider->get_credentials->{access_key_id}; -+} -+ -+sub aws_secret_access_key { -+ my $self = shift; -+ return $self->credentials_provider->get_credentials->{secret_access_key}; -+} -+ -+sub aws_session_token { -+ my $self = shift; -+ return $self->credentials_provider->get_credentials->{session_token}; - } - - =head2 buckets -diff --git a/lib/Net/Amazon/S3/HTTPRequest.pm b/lib/Net/Amazon/S3/HTTPRequest.pm -index 69c6327..d49e95b 100755 ---- a/lib/Net/Amazon/S3/HTTPRequest.pm -+++ b/lib/Net/Amazon/S3/HTTPRequest.pm -@@ -63,8 +63,9 @@ sub query_string_authentication_uri { - my $path = $self->path; - my $headers = $self->headers; - -- my $aws_access_key_id = $self->s3->aws_access_key_id; -- my $aws_secret_access_key = $self->s3->aws_secret_access_key; -+ my $creds = $self->s3->credentials_provider->get_credentials; -+ my $aws_access_key_id = $creds->{access_key_id}; -+ my $aws_secret_access_key = $creds->{secret_access_key}; - my $canonical_string - = $self->_canonical_string( $method, $path, $headers, $expires ); - my $encoded_canonical -@@ -86,9 +87,10 @@ sub query_string_authentication_uri { - - sub _add_auth_header { - my ( $self, $headers, $method, $path ) = @_; -- my $aws_access_key_id = $self->s3->aws_access_key_id; -- my $aws_secret_access_key = $self->s3->aws_secret_access_key; -- my $aws_session_token = $self->s3->aws_session_token; -+ my $creds = $self->s3->credentials_provider->get_credentials; -+ my $aws_access_key_id = $creds->{access_key_id}; -+ my $aws_secret_access_key = $creds->{secret_access_key}; -+ my $aws_session_token = $creds->{session_token}; - - if ( not $headers->header('Date') ) { - $headers->header( Date => time2str(time) ); diff --git a/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch b/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch deleted file mode 100644 index 3ac3f4e2a82..00000000000 --- a/pkgs/development/perl-modules/net-amazon-s3-moose-warning.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://github.com/pfig/net-amazon-s3/pull/42 - -From 116d73235d8243ec4427e6d7bf1f14f7fb9129aa Mon Sep 17 00:00:00 2001 -From: Jay Hannah -Date: Thu, 8 May 2014 02:29:14 +0000 -Subject: [PATCH] Patch for current versions of Moose: "Passing a list of - values to enum is deprecated. Enum values should be wrapped in an arrayref." - ---- - lib/Net/Amazon/S3/Client/Object.pm | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/Net/Amazon/S3/Client/Object.pm b/lib/Net/Amazon/S3/Client/Object.pm -index 08e48c6..106f2fd 100755 ---- a/lib/Net/Amazon/S3/Client/Object.pm -+++ b/lib/Net/Amazon/S3/Client/Object.pm -@@ -16,7 +16,7 @@ enum 'AclShort' => - [ qw(private public-read public-read-write authenticated-read) ]; - - enum 'StorageClass' => -- qw(standard reduced_redundancy); -+ [ qw(standard reduced_redundancy) ]; - - has 'client' => - ( is => 'ro', isa => 'Net::Amazon::S3::Client', required => 1 ); diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index bf53d330245..d27a6537556 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx }: +{ lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }: buildPythonPackage rec { name = "breathe-${version}"; @@ -6,11 +6,13 @@ buildPythonPackage rec { src = fetchurl { url = "mirror://pypi/b/breathe/${name}.tar.gz"; - md5 = "e35f6ce54485663857129370047f6057"; + sha256 = "0m3w8yx24nm01xxx6aj08cklnifwlzzmczc5b0ni40l63lhvm3lp"; }; propagatedBuildInputs = [ docutils six sphinx ]; + disabled = isPy3k; + meta = { homepage = https://github.com/michaeljones/breathe; license = lib.licenses.bsd3; diff --git a/pkgs/development/python-modules/buildout-nix/default.nix b/pkgs/development/python-modules/buildout-nix/default.nix index b450814b852..788c42ebf15 100644 --- a/pkgs/development/python-modules/buildout-nix/default.nix +++ b/pkgs/development/python-modules/buildout-nix/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, buildPythonPackage }: buildPythonPackage { - name = "zc.buildout-nix-2.5.0"; + name = "zc.buildout-nix-2.5.3"; src = fetchurl { - url = "mirror://pypi/z/zc.buildout/zc.buildout-2.5.0.tar.gz"; - sha256 = "721bd2231a9f01f2d5c14f3adccb3385f85b093ee05b18d15d0ff2b9f1f1bd02"; + url = "https://pypi.python.org/packages/e4/7b/63863f09bec5f5d7b9474209a6d4d3fc1e0bca02ecfb4c17f0cdd7b554b6/zc.buildout-2.5.3.tar.gz"; + sha256 = "3e5f3afcc64416604c5efc554c2fa0901b60657e012a710c320e2eb510efcfb9"; }; patches = [ ./nix.patch ]; diff --git a/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch new file mode 100644 index 00000000000..d75d8e7bd0a --- /dev/null +++ b/pkgs/development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch @@ -0,0 +1,22 @@ +diff -r ad8325924f04 pytest.ini +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/pytest.ini Fri Sep 30 12:28:39 2016 +0200 +@@ -0,0 +1,4 @@ ++[pytest] ++-norecursedirs = .git .* *.egg* old docs dist build ++-addopts = -rwv ++ +diff -r ad8325924f04 setup.cfg +--- a/setup.cfg Fri Sep 30 09:22:39 2016 +0200 ++++ b/setup.cfg Fri Sep 30 12:28:39 2016 +0200 +@@ -12,10 +12,6 @@ + pycodestyle >= 2.0.0, < 2.1.0 + mccabe >= 0.5.0, < 0.6.0 + +-[pytest] +-norecursedirs = .git .* *.egg* old docs dist build +-addopts = -rw +- + [egg_info] + tag_build = + tag_date = 0 diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix index cdf5a73768d..fa79cfa3be5 100644 --- a/pkgs/development/python-modules/libsexy/default.nix +++ b/pkgs/development/python-modules/libsexy/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, }: +{ stdenv, fetchurl, mkPythonDerivation, libsexy, pkgconfig, libxml2, pygtk, pango, gtk2, glib }: -stdenv.mkDerivation rec { - name = "python-libsexy-${version}"; +mkPythonDerivation rec { + name = "libsexy-${version}"; version = "0.1.9"; src = fetchurl { @@ -9,12 +9,10 @@ stdenv.mkDerivation rec { sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d"; }; - buildInputs = [ - pkgconfig pygtk - ]; + buildInputs = [ pkgconfig ]; propagatedBuildInputs = [ - libsexy gtk glib pango libxml2 + pygtk libsexy gtk2 glib pango libxml2 ]; postInstall = '' diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 7c1b8b503a3..5ba813deba6 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -18,11 +18,11 @@ assert enableTk -> (tcl != null) buildPythonPackage rec { name = "matplotlib-${version}"; - version = "1.5.1"; + version = "1.5.3"; src = fetchurl { url = "mirror://pypi/m/matplotlib/${name}.tar.gz"; - sha256 = "3ab8d968eac602145642d0db63dd8d67c85e9a5444ce0e2ecb2a8fedc7224d40"; + sha256 = "1g7bhr6v3wdxyx29rfxgf57l9w19s79cdlpyi0h4y0c5ywwxr9d0"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 5354d9750f4..7d0896c1fb8 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo +{ stdenv, fetchurl, python, pkgconfig, gtk2, pygobject2, pycairo , buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { @@ -14,7 +14,7 @@ buildPythonPackage rec { buildInputs = [ pkgconfig ] ++ stdenv.lib.optional (libglade != null) libglade; - propagatedBuildInputs = [ gtk pygobject pycairo ]; + propagatedBuildInputs = [ gtk2 pygobject2 pycairo ]; configurePhase = "configurePhase"; @@ -43,8 +43,8 @@ buildPythonPackage rec { postInstall = '' rm $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 - ln -s ${pygobject}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject.version}.pth \ + ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 + ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \ $out/lib/${python.libPrefix}/site-packages/${name}.pth ''; } diff --git a/pkgs/development/python-modules/pygtksourceview/default.nix b/pkgs/development/python-modules/pygtksourceview/default.nix index 1c248251a32..133cbdb34fd 100644 --- a/pkgs/development/python-modules/pygtksourceview/default.nix +++ b/pkgs/development/python-modules/pygtksourceview/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject, glib, pygtk, gnome2 }: +{ lib, fetchurl, python, mkPythonDerivation, pkgconfig, pygobject2, glib, pygtk, gnome2 }: let version = "2.10.1"; in @@ -12,7 +12,7 @@ mkPythonDerivation { patches = [ ./codegendir.patch ]; - buildInputs = [ python pkgconfig pygobject glib pygtk gnome2.gtksourceview ]; + buildInputs = [ python pkgconfig pygobject2 glib pygtk gnome2.gtksourceview ]; meta = { platforms = lib.platforms.unix; diff --git a/pkgs/development/python-modules/pypoppler-0.39.0.patch b/pkgs/development/python-modules/pypoppler-0.39.0.patch new file mode 100644 index 00000000000..b9e02242e00 --- /dev/null +++ b/pkgs/development/python-modules/pypoppler-0.39.0.patch @@ -0,0 +1,23 @@ +diff --git a/poppler.defs b/poppler.defs +index 8b12e03..2b8fc16 100644 +--- a/poppler.defs ++++ b/poppler.defs +@@ -570,18 +570,6 @@ + ) + ) + +-(define-enum Orientation +- (in-module "Poppler") +- (c-name "PopplerOrientation") +- (gtype-id "POPPLER_TYPE_ORIENTATION") +- (values +- '("portrait" "POPPLER_ORIENTATION_PORTRAIT") +- '("landscape" "POPPLER_ORIENTATION_LANDSCAPE") +- '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN") +- '("seascape" "POPPLER_ORIENTATION_SEASCAPE") +- ) +-) +- + (define-enum PageTransitionType + (in-module "Poppler") + (c-name "PopplerPageTransitionType") diff --git a/pkgs/development/python-modules/pypoppler-poppler.c.patch b/pkgs/development/python-modules/pypoppler-poppler.c.patch new file mode 100644 index 00000000000..1104097cd3e --- /dev/null +++ b/pkgs/development/python-modules/pypoppler-poppler.c.patch @@ -0,0 +1,12 @@ +diff --git a/poppler.c b/poppler.c +index 31b4489..16d0838 100644 +--- a/poppler.c ++++ b/poppler.c +@@ -4501,7 +4501,6 @@ py_poppler_add_constants(PyObject *module, const gchar *strip_prefix) + pyg_enum_add(module, "FormTextType", strip_prefix, POPPLER_TYPE_FORM_TEXT_TYPE); + pyg_enum_add(module, "FormChoiceType", strip_prefix, POPPLER_TYPE_FORM_CHOICE_TYPE); + pyg_enum_add(module, "Error", strip_prefix, POPPLER_TYPE_ERROR); +- pyg_enum_add(module, "Orientation", strip_prefix, POPPLER_TYPE_ORIENTATION); + pyg_enum_add(module, "PageTransitionType", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_TYPE); + pyg_enum_add(module, "PageTransitionAlignment", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_ALIGNMENT); + pyg_enum_add(module, "PageTransitionDirection", strip_prefix, POPPLER_TYPE_PAGE_TRANSITION_DIRECTION); diff --git a/pkgs/development/python-modules/rhpl/default.nix b/pkgs/development/python-modules/rhpl/default.nix index ee1d0ec1738..7ba1c79cd05 100644 --- a/pkgs/development/python-modules/rhpl/default.nix +++ b/pkgs/development/python-modules/rhpl/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archive.fedoraproject.org/fedora/linux/releases/10/Everything/source/SRPMS//rhpl-0.218-1.src.rpm; - md5 = "a72c6b66df782ca1d4950959d2aad292"; + sha256 = "0c3sc74cjzz5dmpr2gi5naxcc5p2qmzagz7k561xj07njn0ddg16"; }; inherit python; diff --git a/pkgs/development/python-modules/searx.patch b/pkgs/development/python-modules/searx.patch new file mode 100644 index 00000000000..1fd7dcbde6d --- /dev/null +++ b/pkgs/development/python-modules/searx.patch @@ -0,0 +1,26 @@ +diff --git a/requirements.txt b/requirements.txt +index 0d2f61b..46481b3 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -1,12 +1,12 @@ + certifi==2016.2.28 +-flask==0.11.1 +-flask-babel==0.11.1 +-lxml==3.6.0 +-ndg-httpsclient==0.4.1 ++flask==0.* ++flask-babel==0.* ++lxml==3.* ++ndg-httpsclient==0.4.* + pyasn1==0.1.9 + pyasn1-modules==0.0.8 +-pygments==2.1.3 ++pygments==2.* +-pyopenssl==0.15.1 ++pyopenssl==16.* +-python-dateutil==2.5.3 ++python-dateutil==2.* +-pyyaml==3.11 ++pyyaml==3.* +-requests[socks]==2.10.0 ++requests[socks]==2.* diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix index 18b92038194..50a425132a2 100644 --- a/pkgs/development/python-modules/stringtemplate/default.nix +++ b/pkgs/development/python-modules/stringtemplate/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchurl, python, antlr}: +{stdenv, fetchurl, buildPythonPackage, antlr, isPy3k}: -stdenv.mkDerivation rec { +buildPythonPackage rec { name = "PyStringTemplate-${version}"; version = "3.2b1"; @@ -9,13 +9,12 @@ stdenv.mkDerivation rec { sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; }; - propagatedBuildInputs = [python antlr]; + propagatedBuildInputs = [ antlr ]; - dontBuild = true; + disabled = isPy3k; - installPhase = '' - python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1 - ''; + # No tests included in archive + doCheck = false; meta = { homepage = "http://www.stringtemplate.org/"; diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md index 3a88f45b4cc..e384b375460 100644 --- a/pkgs/development/r-modules/README.md +++ b/pkgs/development/r-modules/README.md @@ -29,6 +29,30 @@ profile. The set of available libraries can be discovered by running the command `nix-env -f "" -qaP -A rPackages`. The first column from that output is the name that has to be passed to rWrapper in the code snipped above. +However, if you'd like to add a file to your project source to make the +environment available for other contributors, you can create a `default.nix` +file like so: +```nix +let + pkgs = import {}; + stdenv = pkgs.stdenv; +in with pkgs; { + myProject = stdenv.mkDerivation { + name = "myProject"; + version = "1"; + src = if pkgs.lib.inNixShell then null else nix; + + buildInputs = with rPackages; [ + R + ggplot2 + knitr + ]; + }; +} +``` +and then run `nix-shell .` to be dropped into a shell with those packages +available. + ## Updating the package set ```bash diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 99120a13cd0..5c05973095f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -266,6 +266,8 @@ let gmp = [ pkgs.gmp ]; graphscan = [ pkgs.gsl_1 ]; gsl = [ pkgs.gsl_1 ]; + h5 = [ pkgs.hdf5-cpp pkgs.which ]; + h5vc = [ pkgs.zlib.dev ]; HiCseg = [ pkgs.gsl_1 ]; iBMQ = [ pkgs.gsl_1 ]; igraph = [ pkgs.gmp ]; @@ -308,6 +310,7 @@ let rgl = [ pkgs.mesa pkgs.xlibsWrapper ]; Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2 ]; + rhdf5 = [ pkgs.zlib ]; Rhpc = [ pkgs.zlib pkgs.bzip2 pkgs.icu pkgs.lzma pkgs.openmpi pkgs.pcre ]; Rhtslib = [ pkgs.zlib ]; RJaCGH = [ pkgs.zlib ]; @@ -367,12 +370,12 @@ let bamsignals = [ pkgs.zlib ]; BitSeq = [ pkgs.zlib ]; DiffBind = [ pkgs.zlib ]; - ShortRead = [ pkgs.zlib ]; + ShortRead = [ pkgs.zlib.dev ]; oligo = [ pkgs.zlib ]; gmapR = [ pkgs.zlib ]; Rsubread = [ pkgs.zlib ]; - XVector = [ pkgs.zlib ]; - Rsamtools = [ pkgs.zlib ]; + XVector = [ pkgs.zlib.dev ]; + Rsamtools = [ pkgs.zlib.dev ]; rtracklayer = [ pkgs.zlib ]; affyio = [ pkgs.zlib ]; VariantAnnotation = [ pkgs.zlib ]; @@ -390,7 +393,7 @@ let qtpaint = [ pkgs.cmake ]; qtbase = [ pkgs.cmake pkgs.perl ]; gmatrix = [ pkgs.cudatoolkit ]; - RCurl = [ pkgs.curl ]; + RCurl = [ pkgs.curl.dev ]; R2SWF = [ pkgs.pkgconfig ]; rggobi = [ pkgs.pkgconfig ]; RGtk2 = [ pkgs.pkgconfig ]; @@ -1142,7 +1145,6 @@ let "proteoQC" # depends on broken package rTANDEM "PGA" # depends on broken package rTANDEM "MBESS" # depends on broken package OpenMx - "IONiseR" # depends on broken package rhdf5 "DOQTL" # depends on broken package rhdf5 "DmelSGI" # depends on broken package rhdf5 "flowDiv" # depends on broken package ncdfFlow @@ -1292,7 +1294,7 @@ let "DEGraph" # depends on broken package RCytoscape "destiny" # depends on broken package VIM "DiagTest3Grp" # depends on broken package nlopt - "diffHic" # depends on broken package rhdf5 + "diffHic" # depends on broken package edgeR "difR" # depends on broken package nlopt "DirichletMultinomial" # Build Is Broken "DistatisR" # depends on broken package nlopt @@ -1307,6 +1309,7 @@ let "easyanova" # depends on broken package nlopt "ecd" # depends on broken package polynom "edge" # depends on broken package nlopt + "edgeR" # broken url "eeptools" # depends on broken package nlopt "EffectLiteR" # depends on broken package nlopt "effects" # depends on broken package nlopt @@ -1356,7 +1359,6 @@ let "gcmr" # depends on broken package nlopt "GDAtools" # depends on broken package nlopt "gdtools" # broken build - "GENE_E" # depends on broken package rhdf5 "GENESIS" # broken build "genridge" # depends on broken package nlopt "geojsonio" # depends on broken package V8 @@ -1379,8 +1381,6 @@ let "GUIDE" # depends on broken package rpanel "GWAF" # depends on broken package nlopt "GWASTools" # broken build - "h5" # build is broken - "h5vc" # depends on broken package rhdf5 "hbsae" # depends on broken package nlopt "heplots" # depends on broken package nlopt "HiDimMaxStable" # broken build @@ -1407,7 +1407,6 @@ let "inSilicoMerging" # build is broken "INSPEcT" # depends on broken GenomicFeatures "interplot" # depends on broken arm - "IONiseR" # depends on broken rhdf5 "IsingFit" # depends on broken package nlopt "ITEMAN" # depends on broken package car "iteRates" # broken build @@ -1645,7 +1644,6 @@ let "REST" # depends on broken package nlopt "rgbif" # depends on broken package V8 "Rgnuplot" # broken build - "rhdf5" # build is broken "rjade" # depends on broken package V8 "rJPSGCS" # build is broken "rLindo" # build is broken diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix index c3c544d5268..bc2d51f7f26 100644 --- a/pkgs/development/ruby-modules/bundler/default.nix +++ b/pkgs/development/ruby-modules/bundler/default.nix @@ -4,8 +4,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "bundler"; - version = "1.12.5"; - sha256 = "1q84xiwm9j771lpmiply0ls9l2bpvl5axn3jblxjvrldh8di2pkc"; + version = "1.13.1"; + sha256 = "02gbjbv7wq33a17pzp83s36v4yg5r2l3rynkhrq1qlq6vc1n47yg"; dontPatchShebangs = true; postFixup = '' diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 683677d05fc..a9b16f0db2c 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -21,8 +21,8 @@ , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl -, libmsgpack, qt48, libsodium -}: +, libmsgpack, qt48, libsodium, snappy +}@args: let v8 = v8_3_16_14; @@ -145,6 +145,10 @@ in buildInputs = [ cmake pkgconfig openssl libssh2 zlib ]; }; + snappy = attrs: { + buildInputs = [ args.snappy ]; + }; + sqlite3 = attrs: { buildFlags = [ "--with-sqlite3-include=${sqlite.dev}/include" diff --git a/pkgs/development/ruby-modules/gem/default.nix b/pkgs/development/ruby-modules/gem/default.nix index 347c4a79c59..ade6659c400 100644 --- a/pkgs/development/ruby-modules/gem/default.nix +++ b/pkgs/development/ruby-modules/gem/default.nix @@ -184,6 +184,7 @@ stdenv.mkDerivation (attrs // { --install-dir "$GEM_HOME" \ --build-root '/' \ --backtrace \ + --no-env-shebang \ ${documentFlag} \ $gempkg $gemFlags -- $buildFlags diff --git a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb index 48ab5270c22..8eac766554e 100644 --- a/pkgs/development/ruby-modules/gem/nix-bundle-install.rb +++ b/pkgs/development/ruby-modules/gem/nix-bundle-install.rb @@ -6,6 +6,11 @@ require 'fileutils' require 'pathname' require 'tmpdir' +if defined?(Encoding.default_internal) + Encoding.default_internal = Encoding::UTF_8 + Encoding.default_external = Encoding::UTF_8 +end + # Options: # # name - the gem name diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 1913278368e..723c6eb26bb 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.30.0"; + version = "0.32.0"; name = "flow-${version}"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "1s6l3570r53qjyqs8ghqqgb51rb0skijwjgm6av43xi7b7knkd35"; + sha256 = "17v2qb9xsjv4lj62x553knnhb7z43y2frzvs0q1hvamw8wyp086h"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/frama-c/default.nix b/pkgs/development/tools/analysis/frama-c/default.nix index 2132d1e19b4..fc817a8e391 100644 --- a/pkgs/development/tools/analysis/frama-c/default.nix +++ b/pkgs/development/tools/analysis/frama-c/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { name = "frama-c-${version}"; - version = "20150201"; - slang = "Sodium"; + version = "20160501"; + slang = "Aluminium"; src = fetchurl { url = "http://frama-c.com/download/frama-c-${slang}-${version}.tar.gz"; - sha256 = "0zask160vj8bxgc07dzxj5hqbdp6gz5g00j6za5397961imxhxaq"; + sha256 = "02z4d1lg2cs4hgbjx74crfrabv39dyhdrq5lvhv0q3hx5c8w7p90"; }; why2 = fetchurl { @@ -49,22 +49,7 @@ stdenv.mkDerivation rec { substituteInPlace $file --replace '/usr/bin/' "" done - # find library paths - OCAMLGRAPH_HOME=`ocamlfind query ocamlgraph` - LABLGTK_HOME=`ocamlfind query lablgtk2` - - # patch search paths - # ensure that the tests against the ocamlgraph version succeeds - # filter out the additional search paths from ocamldep - substituteInPlace ./configure \ - --replace '$OCAMLLIB/ocamlgraph' "$OCAMLGRAPH_HOME" \ - --replace '$OCAMLLIB/lablgtk2' "$LABLGTK_HOME" \ - --replace '+ocamlgraph' "$OCAMLGRAPH_HOME" \ - substituteInPlace ./Makefile --replace '+lablgtk2' "$LABLGTK_HOME" \ - --replace '$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES))' \ - '$(patsubst /%,.,$(patsubst +%,.,$(INCLUDES) $(GUI_INCLUDES)))' - - substituteInPlace ./src/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba' + substituteInPlace ./src/plugins/aorai/aorai_register.ml --replace '"ltl2ba' '"${ltl2ba}/bin/ltl2ba' cd ../why* substituteInPlace ./frama-c-plugin/Makefile --replace 'shell frama-c' "shell $out/bin/frama-c" @@ -82,10 +67,10 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Frama-C is an extensible tool for source-code analysis of C software"; + description = "An extensible and collaborative platform dedicated to source-code analysis of C software"; homepage = http://frama-c.com/; license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [ thoughtpolice amiddelk ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/radare/default.nix b/pkgs/development/tools/analysis/radare/default.nix index d42227198ce..6b7ba2a81cb 100644 --- a/pkgs/development/tools/analysis/radare/default.nix +++ b/pkgs/development/tools/analysis/radare/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, pkgconfig, libusb, readline, lua, libewf, perl, -gtk ? null, vte ? null, gtkdialog ? null, +gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, useX11, rubyBindings, pythonBindings, luaBindings}: -assert useX11 -> (gtk != null && vte != null && gtkdialog != null); +assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [pkgconfig readline libusb perl] - ++ optional useX11 [gtkdialog vte gtk] + ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] ++ optional luaBindings [lua]; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 7e199c29aed..1c1dace284f 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,29 +1,29 @@ {stdenv, fetchurl, pkgconfig, libusb, readline, libewf, perl, zlib, openssl, -gtk ? null, vte ? null, gtkdialog ? null, +gtk2 ? null, vte ? null, gtkdialog ? null, python ? null, ruby ? null, lua ? null, useX11, rubyBindings, pythonBindings, luaBindings}: -assert useX11 -> (gtk != null && vte != null && gtkdialog != null); +assert useX11 -> (gtk2 != null && vte != null && gtkdialog != null); assert rubyBindings -> ruby != null; assert pythonBindings -> python != null; -let +let optional = stdenv.lib.optional; in stdenv.mkDerivation rec { - version = "0.9.7"; + version = "0.10.6"; name = "radare2-${version}"; src = fetchurl { url = "http://radare.org/get/${name}.tar.xz"; - sha256 = "01sdsnbvx1qzyradj03sg24rk2bi9x58m40r0aqj8skv92c87s7l"; + sha256 = "0icxd8zilygnggxc50lkk6jmcq8xl66rqxqhzqwpiprbn8k7b24f"; }; buildInputs = [pkgconfig readline libusb libewf perl zlib openssl] - ++ optional useX11 [gtkdialog vte gtk] + ++ optional useX11 [gtkdialog vte gtk2] ++ optional rubyBindings [ruby] ++ optional pythonBindings [python] ++ optional luaBindings [lua]; diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index 8cd38a152ec..7606705edd8 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python, pkgconfig, pythonPackages, which, procps, gdb }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, pkgconfig, python2Packages, which, procps, gdb }: stdenv.mkDerivation rec { version = "4.3.0"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patchShebangs . ''; - buildInputs = [ cmake libpfm zlib python pkgconfig pythonPackages.pexpect which procps gdb ]; + buildInputs = [ cmake libpfm zlib python2Packages.python pkgconfig python2Packages.pexpect which procps gdb ]; cmakeFlags = [ "-DCMAKE_C_FLAGS_RELEASE:STRING=" "-DCMAKE_CXX_FLAGS_RELEASE:STRING=" diff --git a/pkgs/development/tools/analysis/verasco/default.nix b/pkgs/development/tools/analysis/verasco/default.nix index 9b3ff8e570d..7f623e72dc3 100644 --- a/pkgs/development/tools/analysis/verasco/default.nix +++ b/pkgs/development/tools/analysis/verasco/default.nix @@ -1,7 +1,10 @@ -{ stdenv, fetchurl, coq, ocamlPackages +{ stdenv, lib, fetchurl +, coq, ocaml, findlib, menhir, zarith , tools ? stdenv.cc }: +assert lib.versionAtLeast ocaml.version "4.02"; + stdenv.mkDerivation rec { name = "verasco-1.3"; src = fetchurl { @@ -9,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0zvljrpwnv443k939zlw1f7ijwx18nhnpr8jl3f01jc5v66hr2k8"; }; - buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir zarith ]); + buildInputs = [ coq ocaml findlib menhir zarith ]; preConfigure = '' substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/development/tools/asn2quickder/default.nix new file mode 100644 index 00000000000..69051714ab4 --- /dev/null +++ b/pkgs/development/tools/asn2quickder/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, pythonPackages, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "asn2quickder"; + name = "${pname}-${version}"; + version = "0.7-RC1"; + + src = fetchFromGitHub { + sha256 = "0ynajhbml28m4ipbj5mscjcv6g1a7frvxfimxh813rhgl0w3sgq8"; + rev = "version-${version}"; + owner = "vanrein"; + repo = "${pname}"; + }; + + propagatedBuildInputs = with pythonPackages; [ pyparsing makeWrapper ]; + + patchPhase = with pythonPackages; '' + substituteInPlace Makefile \ + --replace '..' '..:$(DESTDIR)/${python.sitePackages}:${pythonPackages.pyparsing}/${python.sitePackages}' \ + ''; + + installPhase = '' + mkdir -p $out/${pythonPackages.python.sitePackages}/ + mkdir -p $out/bin $out/lib $out/sbin $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "An ASN.1 compiler with a backend for Quick DER"; + homepage = https://github.com/vanrein/asn2quickder; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index e49697084e4..5d57c9b4579 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -1,30 +1,70 @@ -{ stdenv, fetchFromGitHub, jdk, zip, zlib, protobuf2_5, pkgconfig, libarchive, unzip, which, makeWrapper }: +{ stdenv, fetchFromGitHub, buildFHSUserEnv, writeScript, jdk, zip, unzip, + which, makeWrapper, binutils }: -stdenv.mkDerivation rec { - name = "bazel-20150326.981b7bc1"; +let - src = fetchFromGitHub { - owner = "google"; - repo = "bazel"; - rev = "981b7bc1"; - sha256 = "0i9gxgqhfmix7hmkb15s7h9f8ssln08pixqm26pd1d20g0kfyxj7"; - }; + version = "0.3.2"; - buildInputs = [ pkgconfig protobuf2_5 zlib zip jdk libarchive unzip which makeWrapper ]; - - installPhase = '' - PROTOC=protoc bash compile.sh - mkdir -p $out/bin $out/share - cp -R output $out/share/bazel - ln -s $out/share/bazel/bazel $out/bin/bazel - wrapProgram $out/bin/bazel --set JAVA_HOME "${jdk.home}" - ''; - - meta = { - homepage = http://github.com/google/bazel/; + meta = with stdenv.lib; { + homepage = http://github.com/bazelbuild/bazel/; description = "Build tool that builds code quickly and reliably"; - license = stdenv.lib.licenses.asl20; - maintainers = [ stdenv.lib.maintainers.philandstuff ]; - platforms = [ "x86_64-linux" ]; + license = licenses.asl20; + maintainers = [ maintainers.philandstuff ]; + platforms = platforms.linux; }; -} + + bootstrapEnv = buildFHSUserEnv { + name = "bazel-bootstrap-env"; + + targetPkgs = pkgs: [ ]; + + inherit meta; + }; + + bazelBinary = stdenv.mkDerivation rec { + name = "bazel-${version}"; + + src = fetchFromGitHub { + owner = "bazelbuild"; + repo = "bazel"; + rev = version; + sha256 = "085cjz0qhm4a12jmhkjd9w3ic4a67035j01q111h387iklvgn6xg"; + }; + patches = [ ./java_stub_template.patch ]; + + packagesNotFromEnv = [ + stdenv.cc stdenv.cc.cc.lib jdk which zip unzip binutils ]; + buildInputs = packagesNotFromEnv ++ [ bootstrapEnv makeWrapper ]; + + buildTimeBinPath = stdenv.lib.makeBinPath packagesNotFromEnv; + buildTimeLibPath = stdenv.lib.makeLibraryPath packagesNotFromEnv; + + runTimeBinPath = stdenv.lib.makeBinPath [ jdk stdenv.cc.cc ]; + runTimeLibPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib ]; + + buildWrapper = writeScript "build-wrapper.sh" '' + #! ${stdenv.shell} -e + export PATH="${buildTimeBinPath}:$PATH" + export LD_LIBRARY_PATH="${buildTimeLibPath}:$LD_LIBRARY_PATH" + ./compile.sh + ''; + + buildPhase = '' + bazel-bootstrap-env ${buildWrapper} + ''; + + installPhase = '' + mkdir -p $out/bin + cp output/bazel $out/bin/ + wrapProgram $out/bin/bazel \ + --suffix PATH ":" "${runTimeBinPath}" \ + --suffix LD_LIBRARY_PATH ":" "${runTimeLibPath}" + ''; + + dontStrip = true; + dontPatchELF = true; + + inherit meta; + }; + +in bazelBinary diff --git a/pkgs/development/tools/build-managers/bazel/java_stub_template.patch b/pkgs/development/tools/build-managers/bazel/java_stub_template.patch new file mode 100644 index 00000000000..4e456a78d80 --- /dev/null +++ b/pkgs/development/tools/build-managers/bazel/java_stub_template.patch @@ -0,0 +1,16 @@ +commit 5525326e3287243e0e7417de96bf7d58d04b4c8b +Author: Irene Knapp +Date: Sat Oct 8 19:36:12 2016 -0700 + + Change #!/bin/bash to #!/usr/bin/env bash. + +diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +index f77051f..fbf367a 100644 +--- a/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt ++++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt +@@ -1,4 +1,4 @@ +-#!/bin/bash --posix ++#!/usr/bin/env bash + # Copyright 2014 The Bazel Authors. All rights reserved. + # + # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix deleted file mode 100644 index a5f86d105c3..00000000000 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv, buildPythonApplication, fetchurl, coreutils, twisted }: - -buildPythonApplication (rec { - name = "buildbot-slave-0.8.10"; - namePrefix = ""; - - src = fetchurl { - url = "mirror://pypi/b/buildbot-slave/${name}.tar.gz"; - sha256 = "09pncw44c7vqrl7zyn1nvfismiqi9s51axk9cqxn9gq7jhj38mpg"; - }; - - patchPhase = '' - substituteInPlace buildslave/scripts/logwatcher.py --replace /usr/bin/tail ${coreutils}/bin/tail - ''; - - propagatedBuildInputs = [ twisted ]; - - # What's up with this?! 'trial' should be 'test', no? - # - # running tests - # usage: setup.py [global_opts] cmd1 [cmd1_opts] [cmd2 [cmd2_opts] ...] - # or: setup.py --help [cmd1 cmd2 ...] - # or: setup.py --help-commands - # or: setup.py cmd --help - # - # error: invalid command 'trial' - doCheck = false; - - postInstall = '' - mkdir -p "$out/share/man/man1" - cp docs/buildslave.1 "$out/share/man/man1" - ''; - - meta = with stdenv.lib; { - homepage = http://buildbot.net/; - - license = stdenv.lib.licenses.gpl2Plus; - - description = "Continuous integration system that automates the build/test cycle"; - - longDescription = - '' The BuildBot is a system to automate the compile/test cycle - required by most software projects to validate code changes. By - automatically rebuilding and testing the tree each time something - has changed, build problems are pinpointed quickly, before other - developers are inconvenienced by the failure. The guilty - developer can be identified and harassed without human - intervention. By running the builds on a variety of platforms, - developers who do not have the facilities to test their changes - everywhere before checkin will at least know shortly afterwards - whether they have broken the build or not. Warning counts, lint - checks, image size, compile time, and other build parameters can - be tracked over time, are more visible, and are therefore easier - to improve. - - The overall goal is to reduce tree breakage and provide a platform - to run tests or code-quality checks that are too annoying or - pedantic for any human to waste their time with. Developers get - immediate (and potentially public) feedback about their changes, - encouraging them to be more careful about testing before checking - in code. - ''; - maintainers = with maintainers; [ bjornfor ]; - platforms = platforms.all; - }; -}) diff --git a/pkgs/development/tools/build-managers/buildbot/9.nix b/pkgs/development/tools/build-managers/buildbot/default.nix similarity index 63% rename from pkgs/development/tools/build-managers/buildbot/9.nix rename to pkgs/development/tools/build-managers/buildbot/default.nix index 0f33cd0c664..d16b83a2831 100644 --- a/pkgs/development/tools/build-managers/buildbot/9.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -1,16 +1,12 @@ -{ stdenv -, pythonPackages -, fetchurl -, plugins ? [] -}: +{ stdenv, pythonPackages, fetchurl, coreutils, plugins ? [] }: pythonPackages.buildPythonApplication (rec { name = "${pname}-${version}"; pname = "buildbot"; - version = "0.9.0rc2"; + version = "0.9.0rc4"; src = fetchurl { url = "mirror://pypi/b/${pname}/${name}.tar.gz"; - sha256 = "06xzbjzji3by4hldwr850fc989ymsfl2s8nil21klv2g00dgmcmk"; + sha256 = "16bnrr5qkfpnby9sw9azcagnw0ybi7d8bpdlga2a4c61jg2d5dnc"; }; buildInputs = with pythonPackages; [ @@ -59,17 +55,19 @@ pythonPackages.buildPythonApplication (rec { ] ++ plugins; preInstall = '' - # buildbot tries to import 'buildslaves' but does not - # include the module in it's package, so get rid of those references - sed -i.bak -e '66,$d' buildbot/test/__init__.py - sed -i.bak -e '506,$d' buildbot/test/unit/test_worker_base.py - sed -i.bak -e '648,$d' buildbot/test/unit/test_worker_ec2.py - sed -i.bak -e '289,$d' buildbot/test/unit/test_worker_libvirt.py - sed -i.bak -e '190,$d' buildbot/test/unit/test_worker_openstack.py - sed -i.bak -e '60,84d' buildbot/test/integration/test_configs.py - # writes out a file that can't be read properly sed -i.bak -e '69,84d' buildbot/test/unit/test_www_config.py + + # re-hardcode path to tail + sed -i.bak 's|/usr/bin/tail|${coreutils}/bin/tail|' buildbot/scripts/logwatcher.py + ''; + + postFixup = '' + mv -v $out/bin/buildbot $out/bin/.wrapped-buildbot + echo "#!/bin/sh" > $out/bin/buildbot + echo "export PYTHONPATH=$PYTHONPATH" >> $out/bin/buildbot + echo "exec $out/bin/.wrapped-buildbot \"\$@\"" >> $out/bin/buildbot + chmod -c 555 $out/bin/buildbot ''; meta = with stdenv.lib; { @@ -77,5 +75,6 @@ pythonPackages.buildPythonApplication (rec { description = "Continuous integration system that automates the build/test cycle"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/buildbot/plugins.nix b/pkgs/development/tools/build-managers/buildbot/plugins.nix index 177b7b3d946..09f8b1e750a 100644 --- a/pkgs/development/tools/build-managers/buildbot/plugins.nix +++ b/pkgs/development/tools/build-managers/buildbot/plugins.nix @@ -1,44 +1,40 @@ -{ stdenv -, fetchurl -, pythonPackages -}: +{ stdenv, fetchurl, pythonPackages }: let buildbot-pkg = pythonPackages.buildPythonPackage rec { - name = "buildbot-pkg-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot-pkg"; + version = "0.9.0rc4"; src = fetchurl { - url = "https://pypi.python.org/packages/95/47/1fef931d410cc24127564c2e193e7c1c184f5c5f481930f77c6d6840cfab/${name}.tar.gz"; - sha256 = "01wc9bmqq1rfayqnjm7rkjhbcj7h6ah4vv10s6hglnq9s4axvxp6"; + url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + sha256 = "0dfdyc3x0926dynzdl9w7z0p84w287l362mxdl3r6wl87gkisr10"; }; propagatedBuildInputs = with pythonPackages; [ setuptools ]; - # doesn't seem to break without this... - patchPhase = '' - sed -i.bak -e '/"setuptools >= 21.2.1",/d' setup.py - ''; - meta = with stdenv.lib; { homepage = http://buildbot.net/; description = "Buildbot Packaging Helper"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; in { www = pythonPackages.buildPythonPackage rec { - name = "buildbot_www-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot_www"; + version = "0.9.0rc4"; # NOTE: wheel is used due to buildbot circular dependency format = "wheel"; + src = fetchurl { - url = "https://pypi.python.org/packages/e0/d7/f1023cdb7340a15ee1fc9916e87c4d634405a87164a051e2c59bf9d51ef1/${name}-py2-none-any.whl"; - sha256 = "1006x56x4w4p2mbrzm7jy51c0xxz48lzhdwvx7j4hrjs07mapndj"; + url = "https://pypi.python.org/packages/78/45/b43bd85695cd0178f8bac9c3b394062e9eb46f489b655c11e950e54278a2/${name}-py2-none-any.whl"; + sha256 = "0ixi0y0jhbql55swsvy0jin1v6xf4q4mw9p5n9sll2h10lyp9h0p"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -48,16 +44,18 @@ in { description = "Buildbot UI"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; console-view = pythonPackages.buildPythonPackage rec { - name = "buildbot-console-view-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot-console-view"; + version = "0.9.0rc4"; src = fetchurl { - url = "https://pypi.python.org/packages/f4/51/e24cc1b596e5b262a272cba3687476a13ec7d9ea24bf1f4fd0cd72902bb6/${name}.tar.gz"; - sha256 = "0970gq1sxnfd0nlrnd3mj25i3cginlw2pj5ffqsd57n5hlqg48ib"; + url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + sha256 = "1fig635yg5dgn239g9wzfpw9wc3p91lcl9nnig9k7fijz85pwrva"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -67,16 +65,18 @@ in { description = "Buildbot Console View Plugin"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; waterfall-view = pythonPackages.buildPythonPackage rec { - name = "buildbot-waterfall-view-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot-waterfall-view"; + version = "0.9.0rc4"; src = fetchurl { - url = "https://pypi.python.org/packages/c2/21/3895355b05f91977a8b8e5435f85354e927c2ef547a25432a6bacf792a67/${name}.tar.gz"; - sha256 = "1zybrbbsyplv93zkin8cb3z1bqqr6px4p203ldcpn7lds5s9vk00"; + url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + sha256 = "08kh966grj9b4mif337vv7bqy5ixz8xz31ml63wysjb65djnjbk8"; }; propagatedBuildInputs = [ buildbot-pkg ]; @@ -86,6 +86,7 @@ in { description = "Buildbot Waterfall View Plugin"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }; } diff --git a/pkgs/development/tools/build-managers/buildbot/worker.nix b/pkgs/development/tools/build-managers/buildbot/worker.nix index 36b57a41aa7..01b2051aaa6 100644 --- a/pkgs/development/tools/build-managers/buildbot/worker.nix +++ b/pkgs/development/tools/build-managers/buildbot/worker.nix @@ -1,15 +1,13 @@ -{ stdenv -, fetchurl -, pythonPackages -}: +{ stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonApplication (rec { - name = "buildbot-worker-${version}"; - version = "0.9.0rc2"; + name = "${pname}-${version}"; + pname = "buildbot-worker"; + version = "0.9.0rc4"; src = fetchurl { - url = "https://pypi.python.org/packages/6a/be/ae80e5e87bc92ac813cd944c08d3b6168090145fc168e7a553e88c07067a/${name}.tar.gz"; - sha256 = "19l28s2fyzln6nv2ypbdg11xiz7lrjy0n64fzhngfalv61x2bp8j"; + url = "mirror://pypi/b/${pname}/${name}.tar.gz"; + sha256 = "1fv40pki1awv5f2z9vd7phjk7dlsy1cp4blsy2vdhqwbc7112a8c"; }; buildInputs = with pythonPackages; [ setuptoolsTrial mock ]; @@ -20,5 +18,6 @@ pythonPackages.buildPythonApplication (rec { description = "Buildbot Worker Daemon"; maintainers = with maintainers; [ nand0p ryansydnor ]; platforms = platforms.all; + license = licenses.gpl2; }; }) diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix index 919c80e7ce5..d824c3e2c96 100644 --- a/pkgs/development/tools/build-managers/cmake/2.8.nix +++ b/pkgs/development/tools/build-managers/cmake/2.8.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive +{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2 , useNcurses ? false, ncurses, useQt4 ? false, qt4, wantPS ? false, ps ? null }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj"; })] ++ # Don't search in non-Nix locations such as /usr, but do search in - # Nixpkgs' Glibc. + # Nixpkgs' Glibc. optional (stdenv ? glibc) ./search-path.patch ++ optional (stdenv ? cross) (fetchurl { name = "fix-darwin-cross-compile.patch"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv"; }); - buildInputs = [ curl expat zlib bzip2 libarchive ] + buildInputs = [ curl expat zlib bzip2 ] ++ optional useNcurses ncurses ++ optional useQt4 qt4; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { (concatMap (p: [ (p.dev or p) (p.out or p) ]) buildInputs); configureFlags = - "--docdir=/share/doc/${name} --mandir=/share/man --system-libs" + "--docdir=/share/doc/${name} --mandir=/share/man --system-libs --no-system-libarchive" + stdenv.lib.optionalString useQt4 " --qt-gui"; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix index 08dd0acb42b..ad855df7353 100644 --- a/pkgs/development/tools/build-managers/gnumake/3.80/default.nix +++ b/pkgs/development/tools/build-managers/gnumake/3.80/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = http://tarballs.nixos.org/make-3.80.tar.bz2; - md5 = "0bbd1df101bc0294d440471e50feca71"; + sha256 = "06rgz6npynr8whmf7rxgkyvcz0clf3ggwf4cyhj3fcscn3kkk6x9"; }; patches = [./log.patch]; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 86058e03e41..b995e76f63a 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -21,10 +21,10 @@ rec { let arch = if stdenv.is64bit then "amd64" else "i386"; in '' mkdir patching pushd patching - jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.10.jar + jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.11.jar patchelf --set-rpath "${stdenv.cc.cc.lib}/lib:${stdenv.cc.cc.lib}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so - jar cf native-platform-linux-${arch}-0.10.jar . - mv native-platform-linux-${arch}-0.10.jar $out/lib/gradle/lib/ + jar cf native-platform-linux-${arch}-0.11.jar . + mv native-platform-linux-${arch}-0.11.jar $out/lib/gradle/lib/ popd # The scanner doesn't pick up the runtime dependency in the jar. @@ -52,11 +52,11 @@ rec { }; gradle_latest = gradleGen rec { - name = "gradle-3.0"; + name = "gradle-3.1"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "103z2nzlpc6x3mav0mqardd84rj1si718f6wpnpl8i273aa0dj9r"; + sha256 = "1z0h60w0wvdg2rlxg5izcbhnrzdmr3mdgs7p09cm4lr28d139pn7"; }; }; diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 47c6e12a586..558b8acf70f 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -1,10 +1,11 @@ { lib, python3Packages, fetchurl }: python3Packages.buildPythonPackage rec { - name = "meson-0.32.0"; + version = "0.35.0"; + name = "meson-${version}"; src = fetchurl { url = "mirror://pypi/m/meson/${name}.tar.gz"; - sha256 = "1i5m4q53sr55aw8kx761kh0rsfwkpq0gfa0c0k3jf66y4aml6n54"; + sha256 = "0w4vian55cwcv2m5qzn73aznf9a0y24cszqb7dkpahrb9yrg25l3"; }; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/mk/default.nix b/pkgs/development/tools/build-managers/mk/default.nix index 98ddd9d34e9..f510752d385 100644 --- a/pkgs/development/tools/build-managers/mk/default.nix +++ b/pkgs/development/tools/build-managers/mk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "mk-2006-01-31"; src = fetchurl { url = http://tarballs.nixos.org/mk-20060131.tar.gz; - md5 = "167fd4e0eea4f49def01984ec203289b"; + sha256 = "0za8dp1211bdp4584xb59liqpww7w1ql0cmlv34p9y928nibcxsr"; }; builder = ./builder.sh; diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix new file mode 100644 index 00000000000..e09da0287c7 --- /dev/null +++ b/pkgs/development/tools/clang-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, makeWrapper, writeScript, llvmPackages }: + +let + clang = llvmPackages.clang-unwrapped; + version = stdenv.lib.getVersion clang; +in + +stdenv.mkDerivation { + name = "clang-tools-${version}"; + builder = writeScript "builder" '' + source $stdenv/setup + for tool in \ + clang-apply-replacements \ + clang-check \ + clang-format \ + clang-rename \ + clang-tidy + do + makeWrapper $clang/bin/$tool $out/bin/$tool --argv0 $tool + done + ''; + buildInputs = [ makeWrapper ]; + inherit clang; + meta = clang.meta // { + description = "Standalone command line tools for C++ development"; + maintainers = with stdenv.lib.maintainers; [ aherrmann ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix new file mode 100644 index 00000000000..6bef2d7b548 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -0,0 +1,66 @@ +{ lib, buildGoPackage, fetchFromGitLab, fetchurl, go-bindata }: + +let + version = "1.6.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 = "1ygc2ipprd5pr8b7y511id1af91zw15f8j28v3rx4vjapmbzpk8d"; + }; + + docker_arm = fetchurl { + url = "https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v${version}/docker/prebuilt-arm.tar.xz"; + sha256 = "0aw6cfh92f7fywzry0yswa635hpmzh6fqcav0ljc5vqs26wdmjc1"; + }; +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 = "10w222k4klxqyzk08c0j7nmhdbdnn70p6n1hfqy6h5mczlffqv61"; + }; + + 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 continous 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/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index e252362a059..cdc4e6db2c2 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-agent-${version}-${rev}"; - version = "16.7.0"; - rev = "3819"; + version = "16.9.0"; + rev = "4001"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-agent-${version}-${rev}.zip"; - sha256 = "24cc47099d2e9cc1d3983e1ab65957316770f791632e572189b1e6c0183403b7"; + sha256 = "1xcwwjf2khhng6v1y7dvi579y2j643al9n0x80m0c46qb9mzd04x"; }; meta = with stdenv.lib; { description = "A continuous delivery server specializing in advanced workflow modeling and visualization"; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 474bcba6c71..8982ca5f77a 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "gocd-server-${version}-${rev}"; - version = "16.7.0"; - rev = "3819"; + version = "16.9.0"; + rev = "4001"; src = fetchurl { url = "https://download.go.cd/binaries/${version}-${rev}/generic/go-server-${version}-${rev}.zip"; - sha256 = "3fae89741726eac69adab8dd64cd18918343188eeb43496e88d4f3abbe0998ad"; + sha256 = "0x5pmjbhrka6p27drkrca7872vgsjxaa5j0cbxsa2ds02wrn57a7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 471cc80663d..5c76fc69ac3 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -21,5 +21,5 @@ buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/deis/deps.json b/pkgs/development/tools/deis/deps.json deleted file mode 100644 index b28ce075e81..00000000000 --- a/pkgs/development/tools/deis/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/docopt/docopt-go", - "fetch": { - "type": "git", - "url": "https://github.com/docopt/docopt-go", - "rev": "784ddc588536785e7299f7272f39101f7faccc3f", - "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - } -] diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix new file mode 100644 index 00000000000..5a1b30a7e66 --- /dev/null +++ b/pkgs/development/tools/deis/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + fetch = { + type = "git"; + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } +] diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix index b080be846cd..b46b0be748a 100644 --- a/pkgs/development/tools/documentation/gtk-doc/default.nix +++ b/pkgs/development/tools/documentation/gtk-doc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0hpxcij9xx9ny3gs9p0iz4r8zslw8wqymbyababiyl7603a6x90y"; }; - outputDocdev = "out"; + outputDevdoc = "out"; # maybe there is a better way to pass the needed dtd and xsl files # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl" diff --git a/pkgs/development/tools/glide/default.nix b/pkgs/development/tools/glide/default.nix index c3d9104018d..66335412b49 100644 --- a/pkgs/development/tools/glide/default.nix +++ b/pkgs/development/tools/glide/default.nix @@ -1,16 +1,22 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { name = "glide-${version}"; - version = "0.10.2"; - rev = "${version}"; + version = "0.12.2"; goPackagePath = "github.com/Masterminds/glide"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "Masterminds"; repo = "glide"; - sha256 = "1qb2n5i04gabb2snnwfr8wv4ypcp1pdzvgga62m9xkhk4p2w6pwl"; + sha256 = "15cdrcslkiggd6sg5j40amflydpqz1s63f13mvlg309adfhsk4qz"; + }; + + meta = with stdenv.lib; { + homepage = https://glide.sh; + description = "Package management for Go"; + license = licenses.mit; + maintainers = [ maintainers.rushmorem ]; }; } diff --git a/pkgs/development/tools/glock/default.nix b/pkgs/development/tools/glock/default.nix new file mode 100644 index 00000000000..98813f143cb --- /dev/null +++ b/pkgs/development/tools/glock/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "glock-${version}"; + version = "20160816-${stdenv.lib.strings.substring 0 7 rev}"; + rev = "b8c84ff5ade15a6238ca61c20d3afc70d2e41276"; + + goPackagePath = "github.com/robfig/glock"; + + src = fetchFromGitHub { + inherit rev; + owner = "robfig"; + repo = "glock"; + sha256 = "10jwn3k71p340g8d43zjx7k1j534rcd7rss8pif09mpfrn9qndhh"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://github.com/robfig/glock; + description = "A command-line tool to lock Go dependencies to specific revisions"; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/development/tools/glock/deps.nix b/pkgs/development/tools/glock/deps.nix new file mode 100644 index 00000000000..b7392d757cf --- /dev/null +++ b/pkgs/development/tools/glock/deps.nix @@ -0,0 +1,21 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/agtorre/gocolorize"; + fetch = { + type = "git"; + url = "https://github.com/agtorre/gocolorize"; + rev = "f42b554bf7f006936130c9bb4f971afd2d87f671"; + sha256 = "1dj7s8bgw9qky344d0k9gz661c0m317a08a590184drw7m51hy9p"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; + sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; + }; + } +] diff --git a/pkgs/development/tools/go-repo-root/default.nix b/pkgs/development/tools/go-repo-root/default.nix index d6ae032f078..e47b84354d6 100644 --- a/pkgs/development/tools/go-repo-root/default.nix +++ b/pkgs/development/tools/go-repo-root/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1rlzp8kjv0a3dnfhyqcggny0ad648j5csr2x0siq5prahlp48mg4"; }; - buildInputs = [ gotools ]; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/go-repo-root/deps.nix b/pkgs/development/tools/go-repo-root/deps.nix new file mode 100644 index 00000000000..2554b3cad1a --- /dev/null +++ b/pkgs/development/tools/go-repo-root/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "golang.org/x/tools/go/vcs"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } + { + goPackagePath = "code.google.com/p/go.tools/go/vcs"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } +] diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index e0e9fe8c3fc..5a77ec7eaa6 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -3,7 +3,7 @@ buildGoPackage rec { name = "go2nix-${version}"; - version = "0.1.0"; + version = "1.1.1"; rev = "v${version}"; goPackagePath = "github.com/kamilchm/go2nix"; @@ -12,10 +12,10 @@ buildGoPackage rec { inherit rev; owner = "kamilchm"; repo = "go2nix"; - sha256 = "10nz7gva3n6wk01wphrjjb31sy33kf9ji03zr849x21a669fnmjf"; + sha256 = "1idxgn9yf8shw4mq4d7rhf8fvb2s1lli4r4ck0h8ddf1s9q8p63s"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ go-bindata goimports makeWrapper ]; preBuild = ''go generate ./...''; @@ -27,4 +27,11 @@ buildGoPackage rec { ''; allowGoReference = true; + + meta = with stdenv.lib; { + description = "Go apps packaging for Nix"; + homepage = https://github.com/kamilchm/go2nix; + license = licenses.mit; + maintainers = with maintainers; [ kamilchm ]; + }; } diff --git a/pkgs/development/tools/go2nix/deps.json b/pkgs/development/tools/go2nix/deps.json deleted file mode 100644 index ab9d0d39fce..00000000000 --- a/pkgs/development/tools/go2nix/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/Masterminds/vcs", - "fetch": { - "type": "git", - "url": "https://github.com/Masterminds/vcs", - "rev": "7af28b64c5ec41b1558f5514fd938379822c237c", - "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6" - } - }, - { - "goPackagePath": "github.com/jawher/mow.cli", - "fetch": { - "type": "git", - "url": "https://github.com/jawher/mow.cli", - "rev": "772320464101e904cd51198160eb4d489be9cc49", - "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j" - } - } -] diff --git a/pkgs/development/tools/go2nix/deps.nix b/pkgs/development/tools/go2nix/deps.nix new file mode 100644 index 00000000000..8fc784f4b7f --- /dev/null +++ b/pkgs/development/tools/go2nix/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/Masterminds/vcs"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/vcs"; + rev = "7af28b64c5ec41b1558f5514fd938379822c237c"; + sha256 = "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"; + }; + } + { + goPackagePath = "github.com/jawher/mow.cli"; + fetch = { + type = "git"; + url = "https://github.com/jawher/mow.cli"; + rev = "772320464101e904cd51198160eb4d489be9cc49"; + sha256 = "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"; + }; + } +] diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix new file mode 100644 index 00000000000..04c35f7b8bb --- /dev/null +++ b/pkgs/development/tools/goa/default.nix @@ -0,0 +1,45 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper }: + +buildGoPackage rec { + name = "goa-${version}"; + version = "1.0.0"; + + goPackagePath = "github.com/goadesign/goa"; + subPackages = [ "goagen" ]; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "goadesign"; + repo = "goa"; + sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1"; + }; + + buildInputs = [ makeWrapper ]; + + allowGoReference = true; + + outputs = [ "out" ]; + + preInstall = '' + export bin=$out + ''; + + postInstall = '' + # goagen needs GOPATH to be set + wrapProgram $out/bin/goagen \ + --prefix GOPATH ":" $out/share/go + + # and it needs access to all its dependancies + mkdir -p $out/share/go + cp -Rv $NIX_BUILD_TOP/go/{pkg,src} $out/share/go/ + ''; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://goa.design; + description = "A framework for building microservices in Go using a unique design-first approach"; + license = licenses.mit; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/development/tools/goa/deps.nix b/pkgs/development/tools/goa/deps.nix new file mode 100644 index 00000000000..14e9234be8a --- /dev/null +++ b/pkgs/development/tools/goa/deps.nix @@ -0,0 +1,111 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics"; + rev = "3df31a1ada83e310c2e24b267c8e8b68836547b4"; + sha256 = "1l99f1bzvdhyqhnsrpi1pd07bps0msilzilrd7m4w7i1m5kra529"; + }; + } + { + goPackagePath = "github.com/dimfeld/httppath"; + fetch = { + type = "git"; + url = "https://github.com/dimfeld/httppath"; + rev = "c8e499c3ef3c3e272ed8bdcc1ccf39f73c88debc"; + sha256 = "0452zvrzjvy8pk5q6ykivz2cks082r4lmh7hghscxfqw6gf3siwi"; + }; + } + { + goPackagePath = "github.com/dimfeld/httptreemux"; + fetch = { + type = "git"; + url = "https://github.com/dimfeld/httptreemux"; + rev = "96acf0909c0b45ebf4a25a816cedc6d317e63679"; + sha256 = "0f9qbm1b8l7b21i2v8vmjyzfwf1mgkvxlk5250bwkp5i8n4ml2r6"; + }; + } + { + goPackagePath = "github.com/goadesign/goa"; + fetch = { + type = "git"; + url = "https://github.com/goadesign/goa"; + rev = "ea323df387ea68f8ac9fd79336f523c25e12c92e"; + sha256 = "13401jf907z3qh11h9clb3z0i0fshwkmhx11fq9z6vx01x8x2in1"; + }; + } + { + goPackagePath = "github.com/manveru/faker"; + fetch = { + type = "git"; + url = "https://github.com/manveru/faker"; + rev = "717f7cf83fb78669bfab612749c2e8ff63d5be11"; + sha256 = "1p6laz0hnb2vhfvam83rz6vl2amajqa6nifnsj2lg3mcs9ga8c0f"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6"; + sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "9c28e4bbd74e5c3ed7aacbc552b2cab7cfdfe744"; + sha256 = "02bgp0yy9bi05k2in9axqi3db1c6mjffdsmki51pn9iryxz4zkh3"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/zach-klippenstein/goregen"; + fetch = { + type = "git"; + url = "https://github.com/zach-klippenstein/goregen"; + rev = "795b5e3961ea1912fde60af417ad85e86acc0d6a"; + sha256 = "113kx47ryhyb803v8ckizlrc34cmwcwb0h28v34bahd2mir8nq3l"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "71a035914f99bb58fe82eac0f1289f10963d876c"; + sha256 = "06m16c9vkwc8m2mcxcxa7p8mb26ikc810lgzd5m8k1r6lp3hc8wm"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "f1a397bba50dee815e8c73f3ec94ffc0e8df1a09"; + sha256 = "1wy8nn2vg70n98g80i1zrk49129phyfbzxbicj748bmf82rnaxzg"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f"; + sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h"; + }; + } +] diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 29e5b28ad57..c54a924a1a6 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/golint/deps.json b/pkgs/development/tools/golint/deps.json deleted file mode 100644 index 387adc6cf06..00000000000 --- a/pkgs/development/tools/golint/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/tools", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/tools", - "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc", - "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1" - } - } -] diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix new file mode 100644 index 00000000000..f03bf9b5b23 --- /dev/null +++ b/pkgs/development/tools/golint/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } +] diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index f00794a7eb0..3408c90cda6 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; preConfigure = '' # Make the builtin tools available here diff --git a/pkgs/development/tools/gotools/deps.json b/pkgs/development/tools/gotools/deps.json deleted file mode 100644 index 64ae72eb3ed..00000000000 --- a/pkgs/development/tools/gotools/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - } -] diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix new file mode 100644 index 00000000000..d4be771e8d6 --- /dev/null +++ b/pkgs/development/tools/gotools/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 030a59ed20c..92bb619be70 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/development/tools/gox/deps.json b/pkgs/development/tools/gox/deps.json deleted file mode 100644 index 3406194137c..00000000000 --- a/pkgs/development/tools/gox/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/mitchellh/iochan", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/iochan", - "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77", - "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b" - } - } -] diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix new file mode 100644 index 00000000000..d15b8e7c091 --- /dev/null +++ b/pkgs/development/tools/gox/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/mitchellh/iochan"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } +] diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix index 34a45fa0b84..1020ed864df 100644 --- a/pkgs/development/tools/grabserial/default.nix +++ b/pkgs/development/tools/grabserial/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchgit, buildPythonApplication, pythonPackages }: +{ stdenv, fetchgit, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "grabserial-20141120"; namePrefix = ""; diff --git a/pkgs/development/tools/haskell/tinc/default.nix b/pkgs/development/tools/haskell/tinc/default.nix index e8bd45dd4ae..81a3a20381e 100644 --- a/pkgs/development/tools/haskell/tinc/default.nix +++ b/pkgs/development/tools/haskell/tinc/default.nix @@ -7,12 +7,12 @@ }: mkDerivation { pname = "tinc"; - version = "20160511"; + version = "20160924"; src = fetchFromGitHub { owner = "sol"; repo = "tinc"; - rev = "405af997c182b89edfc9656612c32616e98c7862"; - sha256 = "0zryw3abp64922dnk6jss58lq4k7ijwbbn35zh5vbg3ns8307k6b"; + rev = "f5ba99264930a2af2f24770a23af2613acdac631"; + sha256 = "19mvswpjak9dxpd4w86fz1wv0zkn6ippc37gdkhyg4xcj9jn21a9"; }; isLibrary = false; isExecutable = true; diff --git a/pkgs/development/tools/hexio/default.nix b/pkgs/development/tools/hexio/default.nix new file mode 100644 index 00000000000..6d75c7256ee --- /dev/null +++ b/pkgs/development/tools/hexio/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, fetchurl, python, pcsclite, pth, glibc }: + +stdenv.mkDerivation rec { + pname = "hexio"; + name = "${pname}-${version}"; + version = "201605"; + + src = fetchFromGitHub { + sha256 = "08jxkdi0gjsi8s793f9kdlad0a58a0xpsaayrsnpn9bpmm5cgihq"; + rev = "f6f963bd0fcd2808977e0ad82dcb3100691cdd7c"; + owner = "vanrein"; + repo = "hexio"; + }; + + buildInputs = [ python pcsclite pth glibc ]; + + patchPhase = '' + substituteInPlace Makefile \ + --replace '-I/usr/local/include/PCSC/' '-I${pcsclite}/include/PCSC/' \ + --replace '-L/usr/local/lib/pth' '-I${pth}/lib/' + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib $out/sbin $out/man + make DESTDIR=$out PREFIX=/ all + make DESTDIR=$out PREFIX=/ install + ''; + + meta = with stdenv.lib; { + description = "Low-level I/O helpers for hexadecimal, tty/serial devices and so on"; + homepage = https://github.com/vanrein/hexio; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +} diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index 2620a5b7741..29d2f13ca9a 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk }: +{ stdenv, fetchzip, lib, makeWrapper, jdk, gtk2 }: stdenv.mkDerivation rec { name = "visualvm-1.3.8"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { # To get the native LAF, JVM needs to see GTK’s .so-s. wrapProgram $out/bin/visualvm \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk ]}" + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ gtk2 ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/jq/default.nix b/pkgs/development/tools/jq/default.nix index c509af87124..d79aa098000 100644 --- a/pkgs/development/tools/jq/default.nix +++ b/pkgs/development/tools/jq/default.nix @@ -1,33 +1,42 @@ -{stdenv, fetchurl, oniguruma}: -let - s = # Generated upstream information - rec { - baseName="jq"; - version="1.5"; - name="${baseName}-${version}"; - url="https://github.com/stedolan/jq/releases/download/jq-1.5/jq-1.5.tar.gz"; +{ stdenv, lib, fetchurl, fetchpatch, oniguruma }: + +stdenv.mkDerivation rec { + name = "jq-${version}"; + version="1.5"; + + src = fetchurl { + url="https://github.com/stedolan/jq/releases/download/jq-${version}/jq-${version}.tar.gz"; sha256="0g29kyz4ykasdcrb0zmbrp2jqs9kv1wz9swx849i2d1ncknbzln4"; }; - buildInputs = [ - oniguruma + + buildInputs = [ oniguruma ]; + + patches = [ + (fetchpatch { + name = "CVE-2015-8863.patch"; + url = https://github.com/stedolan/jq/commit/8eb1367ca44e772963e704a700ef72ae2e12babd.diff; + sha256 = "18bjanzvklfzlzzd690y88725l7iwl4f6wnr429na5pfmircbpvh"; + }) + (fetchpatch { + name = "CVE-2016-4074.patch"; + url = https://patch-diff.githubusercontent.com/raw/stedolan/jq/pull/1214.diff; + sha256 = "1w8bapnyp56di6p9casbfczfn8258rw0z16grydavdjddfm280l9"; + }) ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; + patchFlags = [ "-p2" ]; # `src` subdir was introduced after v1.5 was released # jq is linked to libjq: configureFlags = [ "LDFLAGS=-Wl,-rpath,\\\${libdir}" ]; + meta = { - inherit (s) version; description = ''A lightweight and flexible command-line JSON processor''; - license = stdenv.lib.licenses.mit ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ raskin ]; + platforms = with lib.platforms; linux ++ darwin; + downloadPage = "http://stedolan.github.io/jq/download/"; + updateWalker = true; + inherit version; }; } diff --git a/pkgs/development/tools/jq/default.upstream b/pkgs/development/tools/jq/default.upstream deleted file mode 100644 index 1ad914d717e..00000000000 --- a/pkgs/development/tools/jq/default.upstream +++ /dev/null @@ -1 +0,0 @@ -url http://stedolan.github.io/jq/download/ diff --git a/pkgs/development/tools/leaps/default.nix b/pkgs/development/tools/leaps/default.nix index d3e82076788..6db999eea54 100644 --- a/pkgs/development/tools/leaps/default.nix +++ b/pkgs/development/tools/leaps/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { fetchSubmodules = false; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = { description = "A pair programming tool and library written in Golang"; homepage = "https://github.com/jeffail/leaps/"; diff --git a/pkgs/development/tools/leaps/deps.json b/pkgs/development/tools/leaps/deps.json deleted file mode 100644 index 60141d5eeee..00000000000 --- a/pkgs/development/tools/leaps/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "07b51741c1d6423d4a6abab1c49940ec09cb1aaf", - "sha256": "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w" - } - } -] diff --git a/pkgs/development/tools/leaps/deps.nix b/pkgs/development/tools/leaps/deps.nix new file mode 100644 index 00000000000..0a6214a76d0 --- /dev/null +++ b/pkgs/development/tools/leaps/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; + sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; + }; + } +] diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix index f54b409efb6..ca8c2de9630 100644 --- a/pkgs/development/tools/mdk/default.nix +++ b/pkgs/development/tools/mdk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnu-mdk-1.2.9"; src = fetchurl { url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz; - md5 = "08c96baa4b99dd9d25190dd15fe415a5"; + sha256 = "0c24wzrzbk0l4z1p5nnxihaqra75amwmw59va44554infkfms9kc"; }; buildInputs = [ intltool pkgconfig glib ]; postInstall = '' diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix index fc97113bc47..80e8fe59c05 100644 --- a/pkgs/development/tools/misc/autoconf-archive/default.nix +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "autoconf-archive-${version}"; - version = "2016.03.20"; + version = "2016.09.16"; src = fetchurl { url = "mirror://gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; - sha256 = "0dz4fnc723jqn3by22ds5fys7g31apzm1r9allldvva0yvzjxyw8"; + sha256 = "10mxz9hfnfz66m1l9s28sbyfb9a04akz92wkyv9blhpq6p9fzwp8"; }; buildInputs = [ xz ]; diff --git a/pkgs/development/tools/misc/bsdbuild/default.nix b/pkgs/development/tools/misc/bsdbuild/default.nix index 0fd9f143ce9..359ab125be9 100644 --- a/pkgs/development/tools/misc/bsdbuild/default.nix +++ b/pkgs/development/tools/misc/bsdbuild/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, groff, ed }: +{ stdenv, fetchurl, perl, libtool, pkgconfig, gettext, mandoc, ed }: stdenv.mkDerivation rec { name = "bsdbuild-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1zrdjh7a6z4khhfw9zrp490afq306cpl5v8wqz2z55ys7k1n5ifl"; }; - buildInputs = [ perl groff ed ]; + buildInputs = [ perl mandoc ed ]; nativeBuildInputs = [ pkgconfig libtool gettext ]; prePatch = '' diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index f538c213892..99348e907a9 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }: +{ stdenv, fetchurl, fetchpatch, runCommand, zlib }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; @@ -15,43 +15,49 @@ let ccache = stdenv.mkDerivation rec { substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' ''; - doCheck = true; + doCheck = !stdenv.isDarwin; - passthru = { + passthru = let + unwrappedCC = stdenv.cc.cc; + in { # A derivation that provides gcc and g++ commands, but that # will end up calling ccache for the given cacheDir links = extraConfig: stdenv.mkDerivation rec { name = "ccache-links"; passthru = { - inherit gcc; - isGNU = true; + isClang = unwrappedCC.isClang or false; + isGNU = unwrappedCC.isGNU or false; }; - inherit (gcc.cc) lib; + inherit (unwrappedCC) lib; buildCommand = '' mkdir -p $out/bin - if [ -x "${gcc.cc}/bin/gcc" ]; then - cat > $out/bin/gcc << EOF - #!/bin/sh - ${extraConfig} - exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@" + + wrap() { + local cname="$1" + if [ -x "${unwrappedCC}/bin/$cname" ]; then + cat > $out/bin/$cname << EOF + #!/bin/sh + ${extraConfig} + exec ${ccache}/bin/ccache ${unwrappedCC}/bin/$cname "\$@" EOF - chmod +x $out/bin/gcc - fi - if [ -x "${gcc.cc}/bin/g++" ]; then - cat > $out/bin/g++ << EOF - #!/bin/sh - ${extraConfig} - exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@" - EOF - chmod +x $out/bin/g++ - fi - for executable in $(ls ${gcc.cc}/bin); do + chmod +x $out/bin/$cname + fi + } + + wrap cc + wrap c++ + wrap gcc + wrap g++ + wrap clang + wrap clang++ + + for executable in $(ls ${unwrappedCC}/bin); do if [ ! -x "$out/bin/$executable" ]; then - ln -s ${gcc.cc}/bin/$executable $out/bin/$executable + ln -s ${unwrappedCC}/bin/$executable $out/bin/$executable fi done - for file in $(ls ${gcc.cc} | grep -vw bin); do - ln -s ${gcc.cc}/$file $out/$file + for file in $(ls ${unwrappedCC} | grep -vw bin); do + ln -s ${unwrappedCC}/$file $out/$file done ''; }; @@ -63,7 +69,7 @@ let ccache = stdenv.mkDerivation rec { downloadPage = https://ccache.samba.org/download.html; license = licenses.gpl3Plus; maintainers = with maintainers; [ nckx ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; }; in ccache diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 4685787af5f..2dff98a212d 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -1,29 +1,28 @@ -{ fetchurl, stdenv, ncurses, pkgconfig, emacs}: +{ fetchurl, stdenv, ncurses +, emacsSupport ? true, emacs +}: stdenv.mkDerivation rec { - name = "cscope-15.8a"; + name = "cscope-15.8b"; src = fetchurl { url = "mirror://sourceforge/cscope/${name}.tar.gz"; - sha256 = "07jdhxvp3dv7acvp0pwsdab1g2ncxjlcf838lj7vxgjs1p26lwzb"; + sha256 = "1byk29rcpyygrnr03h5j3y8j0aqxldd9dr5ihi9q982sy28x12a8"; }; - preConfigure = '' - sed -i "contrib/xcscope/cscope-indexer" \ - -"es|^PATH=.*$|PATH=\"$out/bin:\$PATH\"|g" - sed -i "contrib/xcscope/xcscope.el" \ - -"es|\"cscope-indexer\"|\"$out/libexec/cscope/cscope-indexer\"|g"; - ''; - configureFlags = "--with-ncurses=${ncurses.dev}"; buildInputs = [ ncurses ]; - nativeBuildInputs = [ pkgconfig emacs ]; + nativeBuildInputs = stdenv.lib.optional emacsSupport emacs; - postInstall = '' - # Install Emacs mode. + postInstall = stdenv.lib.optionalString emacsSupport '' cd "contrib/xcscope" + sed -i "cscope-indexer" \ + -"es|^PATH=.*$|PATH=\"$out/bin:\$PATH\"|g" + sed -i "xcscope.el" \ + -"es|\"cscope-indexer\"|\"$out/libexec/cscope/cscope-indexer\"|g"; + mkdir -p "$out/libexec/cscope" cp "cscope-indexer" "$out/libexec/cscope" diff --git a/pkgs/development/tools/misc/d-feet/default.nix b/pkgs/development/tools/misc/d-feet/default.nix index 783607860de..2ada782563e 100644 --- a/pkgs/development/tools/misc/d-feet/default.nix +++ b/pkgs/development/tools/misc/d-feet/default.nix @@ -1,28 +1,27 @@ { stdenv, pkgconfig, fetchurl, itstool, intltool, libxml2, glib, gtk3 -, pep8, python, makeWrapper, gnome3, pygobject3, libwnck3 }: +, pythonPackages, makeWrapper, gnome3, libwnck3 }: let version = "${major}.11"; major = "0.3"; -in - -stdenv.mkDerivation rec { +in pythonPackages.mkPythonDerivation rec { name = "d-feet-${version}"; + namePrefix = ""; src = fetchurl { url = "mirror://gnome/sources/d-feet/${major}/d-feet-${version}.tar.xz"; sha256 = "a3dc940c66f84b996c328531e3034d475ec690d7ff639445ff7ca746aa8cb9c2"; }; - buildInputs = [ - pkgconfig libxml2 itstool intltool glib gtk3 pep8 python - gnome3.defaultIconTheme makeWrapper pygobject3 libwnck3 + buildInputs = [ pkgconfig libxml2 itstool intltool glib gtk3 + gnome3.defaultIconTheme makeWrapper libwnck3 ]; + propagatedBuildInputs = with pythonPackages; [ pygobject3 pep8 ]; + preFixup = '' wrapProgram $out/bin/d-feet \ - --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" ''; diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix index 7a2796b48ca..32e212a0921 100644 --- a/pkgs/development/tools/misc/distcc/default.nix +++ b/pkgs/development/tools/misc/distcc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand +{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk2, runCommand , gcc, autoconf, automake, which, procps, libiberty_static , sysconfDir ? "" # set this parameter to override the default value $out/etc , static ? false @@ -16,7 +16,7 @@ let sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6"; }; - buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps libiberty_static]; + buildInputs = [popt avahi pkgconfig python gtk2 autoconf automake pkgconfig which procps libiberty_static]; preConfigure = '' export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include) @@ -28,7 +28,7 @@ let ${if static then "LDFLAGS=-static" else ""} --with${if static == true || popt == null then "" else "out"}-included-popt --with${if avahi != null then "" else "out"}-avahi - --with${if gtk != null then "" else "out"}-gtk + --with${if gtk2 != null then "" else "out"}-gtk --without-gnome --enable-rfc2553 --disable-Werror # a must on gcc 4.6 diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 48e74cf2631..da0447c49da 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -12,7 +12,7 @@ let - basename = "gdb-7.11.1"; + basename = "gdb-7.12"; # Whether (cross-)building for GNU/Hurd. This is an approximation since # having `stdenv ? cross' doesn't tell us if we're building `crossDrv' and @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/gdb/${basename}.tar.xz"; - sha256 = "0w7wi1llznlqdqk2lmzygz2xylb2c9mh580s9i0rypkmwfj6s8g9"; + sha256 = "152g2qa8337cxif3lkvabjcxfd9jphfb2mza8f1p2c4bjk2z6kw3"; }; nativeBuildInputs = [ pkgconfig texinfo perl ] @@ -43,6 +43,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # darwin build fails with format hardening since v7.12 + hardeningDisable = stdenv.lib.optionals stdenv.isDarwin [ "format" ]; + configureFlags = with stdenv.lib; [ "--with-gmp=${gmp.dev}" "--with-mpfr=${mpfr.dev}" "--with-system-readline" "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.dev}" diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index 3d09bc92cd3..d609b3b664c 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "global-6.5.4"; + name = "global-${version}"; + version = "6.5.5"; src = fetchurl { url = "mirror://gnu/global/${name}.tar.gz"; - sha256 = "19hxajpwld6qx0faz4rzyh1hfs25ycjmws6bas8pavx4hskf05mg"; + sha256 = "0yyg91qw8399lnxfai4bxkh9yq71qdwp9kvadgzp05cdqni44nxw"; }; nativeBuildInputs = [ libtool makeWrapper ]; @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/global/; license = licenses.gpl3Plus; - maintainers = with maintainers; [ pSub ]; + maintainers = with maintainers; [ pSub peterhoeg ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/gpshell/default.nix b/pkgs/development/tools/misc/gpshell/default.nix index a4ed3a44f35..f552fe00566 100644 --- a/pkgs/development/tools/misc/gpshell/default.nix +++ b/pkgs/development/tools/misc/gpshell/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite }: +{ stdenv, fetchurl, pkgconfig, globalplatform, pcsclite, gppcscconnectionplugin +, makeWrapper +}: stdenv.mkDerivation rec { name = "gpshell-${version}"; @@ -9,7 +11,11 @@ stdenv.mkDerivation rec { sha256 = "19a77zvyf2vazbv17185s4pynhylk2ky8vhl4i8pg9zww29sicqi"; }; - buildInputs = [ pkgconfig globalplatform pcsclite ]; + buildInputs = [ pkgconfig globalplatform pcsclite makeWrapper ]; + + postFixup = '' + wrapProgram "$out/bin/gpshell" --prefix LD_LIBRARY_PATH : "${gppcscconnectionplugin}/lib" + ''; meta = with stdenv.lib; { homepage = https://sourceforge.net/p/globalplatform/wiki/Home/; diff --git a/pkgs/development/tools/misc/gtkdialog/default.nix b/pkgs/development/tools/misc/gtkdialog/default.nix index b9d03445286..2641a1ed04f 100644 --- a/pkgs/development/tools/misc/gtkdialog/default.nix +++ b/pkgs/development/tools/misc/gtkdialog/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, hicolor_icon_theme }: +{stdenv, fetchurl, gtk2, pkgconfig, hicolor_icon_theme }: stdenv.mkDerivation { name = "gtkdialog-0.8.3"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "ff89d2d7f1e6488e5df5f895716ac1d4198c2467a2a5dc1f51ab408a2faec38e"; }; - buildInputs = [ gtk pkgconfig hicolor_icon_theme ]; + buildInputs = [ gtk2 pkgconfig hicolor_icon_theme ]; meta = { homepage = http://gtkdialog.googlecode.com/; diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 6839335245f..8bf3db59147 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0miqq77ssk5rgsc9xlv7k5n2wk2c5wv2m1kh4zhbwrggfmjaycn2"; + sha256 = "0lvp4306f5nq08f3snffs5pp1zwv8l35z6f5g0dds51zs6bzdv6l"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; diff --git a/pkgs/development/tools/misc/intel-gpu-tools/default.nix b/pkgs/development/tools/misc/intel-gpu-tools/default.nix index 3d3e457781a..5ecc0421c36 100644 --- a/pkgs/development/tools/misc/intel-gpu-tools/default.nix +++ b/pkgs/development/tools/misc/intel-gpu-tools/default.nix @@ -2,11 +2,11 @@ , libX11, libXext, libXv, libXrandr, glib, bison, libunwind, python3 }: stdenv.mkDerivation rec { - name = "intel-gpu-tools-1.14"; + name = "intel-gpu-tools-1.16"; src = fetchurl { url = "http://xorg.freedesktop.org/archive/individual/app/${name}.tar.bz2"; - sha256 = "030g1akybk19y3jcxd8pp573ymrd4w7mmzxbspp064lwdv9y35im"; + sha256 = "1q9sfb15081zm1rq4z67sfj13ryvbdha4fa6pdzdsfd9261nvgn6"; }; buildInputs = [ pkgconfig libdrm libpciaccess cairo dri2proto udev libX11 diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 4ab9fa28491..e59e4c23776 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [(fetchpatch { name = "perl-5.22.patch"; url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" - + "/debian/patches/perl5.22-regex-fixes?revision=47255&view=co"; + + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co"; sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; })]; diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix index 3aeacd457dd..677ffa49c99 100644 --- a/pkgs/development/tools/misc/kibana/default.nix +++ b/pkgs/development/tools/misc/kibana/default.nix @@ -1,14 +1,27 @@ { stdenv, makeWrapper, fetchurl, nodejs, coreutils, which }: with stdenv.lib; - -stdenv.mkDerivation rec { +let + inherit (builtins) elemAt; + archOverrides = { + "i686" = "x86"; + }; + info = splitString "-" stdenv.system; + arch = (elemAt info 0); + elasticArch = archOverrides."${arch}" or arch; + plat = elemAt info 1; + shas = { + "x86_64-linux" = "1md3y3a8rxvf37lnfc56kbirv2rjl68pa5672yxhfmjngrr20rcw"; + "i686-linux" = "0d77a2v14pg5vr711hzbva8jjy0sxw9w889f2r1vhwngrhcfz4pf"; + "x86_64-darwin" = "1cajljx13h8bncmayzvlzsynwambz61cspjnsn2h19zghn2vj2c9"; + }; +in stdenv.mkDerivation rec { name = "kibana-${version}"; - version = "4.5.2"; + version = "4.6.0"; src = fetchurl { - url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz"; - sha256 = "1na8xh525znxaqjhxfvpx0q3rj85cjb6l9zlzd44dl31a9l117y4"; + url = "https://download.elastic.co/kibana/kibana/${name}-${plat}-${elasticArch}.tar.gz"; + sha256 = shas."${stdenv.system}"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/lsof/default.nix b/pkgs/development/tools/misc/lsof/default.nix index ed2f0f10165..37e5ae6f710 100644 --- a/pkgs/development/tools/misc/lsof/default.nix +++ b/pkgs/development/tools/misc/lsof/default.nix @@ -1,9 +1,11 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { name = "lsof-${version}"; version = "4.89"; + buildInputs = [ ncurses ]; + src = fetchurl { urls = ["ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${version}.tar.bz2"] @@ -11,19 +13,30 @@ stdenv.mkDerivation rec { # the tarball is moved after new version is released isOld: "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/" + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" - ) [ false true ]; + ) [ false true ] + ++ map ( + # the tarball is moved after new version is released + isOld: "http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/" + + "${stdenv.lib.optionalString isOld "OLD/"}lsof_${version}.tar.bz2" + ) [ false true ] + ; sha256 = "061p18v0mhzq517791xkjs8a5dfynq1418a1mwxpji69zp2jzb41"; }; unpackPhase = "tar xvjf $src; cd lsof_*; tar xvf lsof_*.tar; sourceRoot=$( echo lsof_*/); "; - - preBuild = "sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;';"; + + patches = [ ./dfile.patch ]; configurePhase = '' # Stop build scripts from searching global include paths - export LSOF_INCLUDE=/$(md5sum <(echo $name) | awk '{print $1}') + export LSOF_INCLUDE=${stdenv.cc.libc}/include ./Configure -n ${if stdenv.isDarwin then "darwin" else "linux"} ''; + + preBuild = '' + sed -i Makefile -e 's/^CFGF=/& -DHASIPv6=1/;' -e 's/-lcurses/-lncurses/' + ''; + installPhase = '' mkdir -p $out/bin $out/man/man8 diff --git a/pkgs/development/tools/misc/lsof/dfile.patch b/pkgs/development/tools/misc/lsof/dfile.patch new file mode 100644 index 00000000000..47202d5ebea --- /dev/null +++ b/pkgs/development/tools/misc/lsof/dfile.patch @@ -0,0 +1,18 @@ +--- lsof_4.89_src/dialects/darwin/libproc/dfile.c 2014-10-30 12:39:46.000000000 +0100 ++++ lsof_4.89_src/dialects/darwin/libproc/dfile_new.c 2016-10-04 13:44:58.000000000 +0200 +@@ -286,13 +286,13 @@ + + #if defined(PROC_FP_GUARDED) + if (extra > 1) +- putchar(`,'); ++ putchar(','); + if (lf->guardflags) { + struct pff_tab *tp; + long gf; + + (void) printf("guard="); +- tp = Pgf_tab; ++ tp = Pff_tab; + gf = lf->guardflags; + while (gf && !FsvFlagX) { + while (tp->nm) { diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix index 017b5fdc08d..e1741118fb0 100644 --- a/pkgs/development/tools/misc/luarocks/default.nix +++ b/pkgs/development/tools/misc/luarocks/default.nix @@ -1,16 +1,16 @@ -{stdenv, fetchurl, lua, curl, makeWrapper, which}: +{stdenv, fetchurl, lua, curl, makeWrapper, which, unzip}: let s = # Generated upstream information rec { baseName="luarocks"; - version="2.3.0"; + version="2.4.0"; name="${baseName}-${version}"; - hash="15zdchj3wkjdbypj68kwqswxhkhrfnw72nlks6df4lk0nvp8zqv8"; - url="http://luarocks.org/releases/luarocks-2.3.0-rc2.tar.gz"; - sha256="15zdchj3wkjdbypj68kwqswxhkhrfnw72nlks6df4lk0nvp8zqv8"; + hash="1hwpjj4nvy8m7hfmhf52vbhmlh7r3wfjjcc589yj8dnh528iqf24"; + url="http://luarocks.org/releases/luarocks-2.4.0.tar.gz"; + sha256="1hwpjj4nvy8m7hfmhf52vbhmlh7r3wfjjcc589yj8dnh528iqf24"; }; buildInputs = [ - lua curl makeWrapper which + lua curl makeWrapper which unzip ]; in stdenv.mkDerivation { diff --git a/pkgs/development/tools/misc/md2man/default.nix b/pkgs/development/tools/misc/md2man/default.nix new file mode 100644 index 00000000000..208f0ebd411 --- /dev/null +++ b/pkgs/development/tools/misc/md2man/default.nix @@ -0,0 +1,25 @@ +{ stdenv, lib, buildGoPackage, go, fetchFromGitHub }: + +with lib; + +buildGoPackage rec { + name = "go-md2man-${version}"; + version = "1.0.6"; + + goPackagePath = "github.com/cpuguy83/go-md2man"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "cpuguy83"; + repo = "go-md2man"; + sha256 = "1rm3zjrmfpzy0l3qp02xmd5pqzl77pdql9pbxhl0k1qw2vfzrjv6"; + }; + + meta = { + description = "Go tool to convert markdown to man pages"; + license = licenses.mit; + homepage = https://github.com/cpuguy83/go-md2man; + maintainers = with maintainers; [offline]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/tools/misc/patchelf/unstable.nix b/pkgs/development/tools/misc/patchelf/unstable.nix new file mode 100644 index 00000000000..5f434c13abc --- /dev/null +++ b/pkgs/development/tools/misc/patchelf/unstable.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + name = "patchelf-0.10-pre-20160920"; + + src = fetchFromGitHub { + owner = "NixOS"; + repo = "patchelf"; + rev = "327d80443672c397970738f9e216a7e86cbf3ad7"; + sha256 = "0nghzywda4jrj70gvn4dnrzasafgdp0basj04wfir1smvsi047zr"; + }; + + setupHook = [ ./setup-hook.sh ]; + + buildInputs = [ autoreconfHook ]; + + doCheck = true; + + meta = { + homepage = http://nixos.org/patchelf.html; + license = "GPL"; + description = "A small utility to modify the dynamic linker and RPATH of ELF executables"; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index cd027c7b08d..50e35928bba 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -6,7 +6,7 @@ # # In NixOS, simply add this package to services.udev.packages. -{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk, libXext, libXft +{ stdenv, fetchurl, unzip, glib, libSM, libICE, gtk2, libXext, libXft , fontconfig, libXrender, libXfixes, libX11, libXi, libXrandr, libXcursor , freetype, libXinerama, libxcb, zlib, pciutils , makeDesktopItem, xkeyboardconfig @@ -15,7 +15,7 @@ let libPath = stdenv.lib.makeLibraryPath [ - glib libSM libICE gtk libXext libXft fontconfig libXrender libXfixes libX11 + glib libSM libICE gtk2 libXext libXft fontconfig libXrender libXfixes libX11 libXi libXrandr libXcursor freetype libXinerama libxcb zlib stdenv.cc.cc.lib ]; diff --git a/pkgs/development/tools/misc/texinfo/6.1.nix b/pkgs/development/tools/misc/texinfo/6.3.nix similarity index 94% rename from pkgs/development/tools/misc/texinfo/6.1.nix rename to pkgs/development/tools/misc/texinfo/6.3.nix index e3001ffba7b..b75878b8d33 100644 --- a/pkgs/development/tools/misc/texinfo/6.1.nix +++ b/pkgs/development/tools/misc/texinfo/6.3.nix @@ -3,11 +3,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "texinfo-6.1"; + name = "texinfo-6.3"; src = fetchurl { url = "mirror://gnu/texinfo/${name}.tar.xz"; - sha256 = "1ll3d0l8izygdxqz96wfr2631kxahifwdknpgsx2090vw963js5c"; + sha256 = "0fpr9kdjjl6nj2pc50k2zr7134hvqz8bi8pfqa7131a9lpzz6v14"; }; buildInputs = [ perl xz ] diff --git a/pkgs/development/tools/misc/trv/default.nix b/pkgs/development/tools/misc/trv/default.nix index 606cc514647..4b83c12bed7 100644 --- a/pkgs/development/tools/misc/trv/default.nix +++ b/pkgs/development/tools/misc/trv/default.nix @@ -1,15 +1,12 @@ -{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core, async, async_unix, re2, - async_extra, sexplib, async_shell, core_extended, async_find, cohttp, uri, tzdata}: +{stdenv, fetchFromGitHub, ocaml, findlib, camlp4, core_p4, async_p4, async_unix_p4 +, re2_p4, async_extra_p4, sexplib_p4, async_shell, core_extended_p4, async_find +, cohttp, uri, tzdata}: -let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "0.1.3"; -in +assert stdenv.lib.versionOlder "4.02" ocaml.version; -assert stdenv.lib.versionOlder "4.02" ocaml_version; - -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "trv-${version}"; + version = "0.1.3"; src = fetchFromGitHub { owner = "afiniate"; @@ -20,9 +17,9 @@ stdenv.mkDerivation { buildInputs = [ ocaml findlib camlp4 ]; - propagatedBuildInputs = [ core async async_unix - async_extra sexplib async_shell core_extended - async_find cohttp uri re2 ]; + propagatedBuildInputs = [ core_p4 async_p4 async_unix_p4 + async_extra_p4 sexplib_p4 async_shell core_extended_p4 + async_find cohttp uri re2_p4 ]; createFindlibDestdir = true; dontStrip = true; diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index b511b7d1948..75d371b4ec8 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonApplication, makeWrapper +{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python; +in pythonPackages.mkPythonDerivation rec { name = "ycmd-2016-01-12"; + namePrefix = ""; src = fetchgit { url = "git://github.com/Valloric/ycmd.git"; @@ -10,13 +13,13 @@ stdenv.mkDerivation rec { sha256 = "1g0hivv3wla7z5dgnkcn3ny38p089pjfj36nx6k29zmprgmjinyr"; }; - buildInputs = [ python cmake boost makeWrapper ]; + buildInputs = [ cmake boost ]; propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ]; buildPhase = '' export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} - python build.py --clang-completer --system-boost + ${python.interpreter} build.py --clang-completer --system-boost ''; configurePhase = ":"; @@ -24,8 +27,6 @@ stdenv.mkDerivation rec { installPhase = with pythonPackages; '' mkdir -p $out/lib/ycmd/third_party $out/bin cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/ - wrapProgram $out/lib/ycmd/ycmd/__main__.py \ - --prefix PYTHONPATH : "$(toPythonPath ${waitress}):$(toPythonPath ${frozendict}):$(toPythonPath ${bottle})" ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd ''; diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix index 51fa9cad0d5..1382883e5a3 100644 --- a/pkgs/development/tools/nimble/default.nix +++ b/pkgs/development/tools/nimble/default.nix @@ -3,31 +3,29 @@ stdenv.mkDerivation rec { name = "nimble-${version}"; - version = "0.7.4"; + version = "0.7.8"; src = fetchFromGitHub { owner = "nim-lang"; repo = "nimble"; rev = "v${version}"; - sha256 = "1l477f1zlqpc738jg47pz599cwjasgy9jqdsplj3ywd12xfqpc96"; + sha256 = "12znxzj1j5fflw2mkkrns9n7qg6sf207652zrdyf7h2jdyzzb73x"; }; - buildInputs = [ nim ]; + buildInputs = [ nim openssl ]; patchPhase = '' substituteInPlace src/nimble.nim.cfg --replace "./vendor/nim" "${nim}/share" + echo "--clib:crypto" >> src/nimble.nim.cfg ''; buildPhase = '' - nim c src/nimble + cd src && nim c -d:release nimble ''; installPhase = '' mkdir -p $out/bin - cp src/nimble $out/bin - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.cc.libc openssl]}" \ - --add-needed libcrypto.so \ - "$out/bin/nimble" + cp nimble $out/bin ''; dontStrip = true; diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix index 1fcda13dab8..5028ac9580c 100644 --- a/pkgs/development/tools/node-webkit/nw11.nix +++ b/pkgs/development/tools/node-webkit/nw11.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap , libnotify}: let @@ -9,7 +9,7 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 18fdf7bca3b..30c40331a0f 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd, libcap , libnotify}: let @@ -9,7 +9,7 @@ let nwEnv = buildEnv { name = "nwjs-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix index db5d6ee6b6f..ba5d6c8e334 100644 --- a/pkgs/development/tools/node-webkit/nw9.nix +++ b/pkgs/development/tools/node-webkit/nw9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, buildEnv, makeWrapper -, xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig +, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd }: let bits = if stdenv.system == "x86_64-linux" then "x64" @@ -8,7 +8,7 @@ let nwEnv = buildEnv { name = "node-webkit-env"; paths = [ - xorg.libX11 xorg.libXrender glib gtk atk pango cairo gdk_pixbuf + xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc xorg.libXtst xorg.libXi diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 7a980c69c18..feedd883548 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -1,13 +1,12 @@ -{stdenv, fetchurl, makeWrapper, gcc, ocaml, ncurses}: +{ stdenv, fetchurl, makeWrapper, ocaml, ncurses }: + let - ocaml_version = (builtins.parseDrvName ocaml.name).version; pname = "camlidl"; - version = "1.05"; webpage = "http://caml.inria.fr/pub/old_caml_site/camlidl/"; in -stdenv.mkDerivation { - +stdenv.mkDerivation rec { name = "${pname}-${version}"; + version = "1.05"; src = fetchurl { url = "http://caml.inria.fr/pub/old_caml_site/distrib/bazar-ocaml/${pname}-${version}.tar.gz"; @@ -19,13 +18,13 @@ stdenv.mkDerivation { preBuild = '' mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out - substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml_version}/site-lib/camlidl - substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${gcc}/bin/cpp - mkdir -p $out/lib/ocaml/${ocaml_version}/site-lib/camlidl/caml + substituteInPlace config/Makefile --replace OCAMLLIB=/usr/local/lib/ocaml OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl + substituteInPlace config/Makefile --replace CPP=/lib/cpp CPP=${stdenv.cc}/bin/cpp + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml ''; postInstall = '' - cat >$out/lib/ocaml/${ocaml_version}/site-lib/camlidl/META <$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META <= 3.12.1 according to ./configure -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; +assert lib.versionAtLeast ocaml.version "3.12.1"; let srcs = { diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 0d765ec93bb..28d4724a162 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: +{ stdenv, lib, fetchgit, fetchurl, makeWrapper, + ocaml, unzip, ncurses, curl, + aspcudSupport ? !stdenv.isDarwin, aspcud +}: -assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12.1"; +assert lib.versionAtLeast ocaml.version "3.12.1"; let srcs = { @@ -45,7 +48,7 @@ in stdenv.mkDerivation rec { name = "opam-${version}"; version = "1.2.2"; - buildInputs = [ unzip curl ncurses ocaml ]; + buildInputs = [ unzip curl ncurses ocaml makeWrapper]; src = srcs.opam; @@ -69,6 +72,13 @@ in stdenv.mkDerivation rec { # Dirty, but apparently ocp-build requires a TERM makeFlags = ["TERM=screen"]; + postInstall = + if aspcudSupport then '' + wrapProgram $out/bin/opam \ + --suffix PATH : ${aspcud}/bin + '' + else ""; + doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index 45888924a2e..b8740bc3793 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -1,5 +1,5 @@ -{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper, - ocaml_react, camomile, zed, cppo, camlp4, ppx_tools +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4, ocaml_react +, lambdaTerm, ocaml_lwt, makeWrapper, camomile, zed, cppo, ppx_tools }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0hxybkqmrh0sz1yyyrgzdmxp46gda4vk22pv07s0qpfg2dpv56jh"; }; - buildInputs = [ ocaml findlib makeWrapper cppo camlp4 ppx_tools ]; + buildInputs = [ ocaml findlib ocamlbuild makeWrapper cppo camlp4 ppx_tools ]; propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix index 64d5f2f551b..7ee2e27e60a 100644 --- a/pkgs/development/tools/parsing/flex/default.nix +++ b/pkgs/development/tools/parsing/flex/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, bison, m4 }: stdenv.mkDerivation rec { - name = "flex-2.6.0"; + name = "flex-2.6.1"; src = fetchurl { - url = "mirror://sourceforge/flex/${name}.tar.bz2"; - sha256 = "1sdqx63yadindzafrq1w31ajblf9gl1c301g068s20s7bbpi3ri4"; + url = "https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.gz"; + sha256 = "0fy14c35yz2m1n1m4f02by3501fn0cca37zn7jp8lpp4b3kgjhrw"; }; buildInputs = [ bison ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { }; meta = { - homepage = http://flex.sourceforge.net/; + homepage = https://github.com/westes/flex; description = "A fast lexical analyser generator"; platforms = stdenv.lib.platforms.unix; }; diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index e3dc3d77abc..4be334e20ed 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, binutils -, pkgconfig, gtk, glib, pango, libglade }: +, pkgconfig, gtk2, glib, pango, libglade }: stdenv.mkDerivation rec { name = "sysprof-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1wb4d844rsy8qjg3z5m6rnfm72da4xwzrrkkb1q5r10sq1pkrw5s"; }; - buildInputs = [ binutils pkgconfig gtk glib pango libglade ]; + buildInputs = [ binutils pkgconfig gtk2 glib pango libglade ]; meta = { homepage = http://sysprof.com/; diff --git a/pkgs/development/tools/profiling/systemtap/default.nix b/pkgs/development/tools/profiling/systemtap/default.nix new file mode 100644 index 00000000000..b7872780245 --- /dev/null +++ b/pkgs/development/tools/profiling/systemtap/default.nix @@ -0,0 +1,52 @@ +{ fetchgit, pkgconfig, gettext, runCommand, makeWrapper +, elfutils, kernel, gnumake }: +let + ## fetchgit info + url = git://sourceware.org/git/systemtap.git; + rev = "a10bdceb7c9a7dc52c759288dd2e555afcc5184a"; + sha256 = "1kllzfnh4ksis0673rma5psglahl6rvy0xs5v05qkqn6kl7irmg1"; + version = "2016-09-16"; + + inherit (kernel) stdenv; + inherit (stdenv) lib; + + ## stap binaries + stapBuild = stdenv.mkDerivation { + name = "systemtap-${version}"; + src = fetchgit { inherit url rev sha256; }; + buildInputs = [ elfutils pkgconfig gettext ]; + enableParallelBuilding = true; + }; + + ## a kernel build dir as expected by systemtap + kernelBuildDir = runCommand "kbuild-${kernel.version}-merged" { } '' + mkdir -p $out + for f in \ + ${kernel}/System.map \ + ${kernel.dev}/vmlinux \ + ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build/{*,.*} + do + ln -s $(readlink -f $f) $out + done + ''; + +in runCommand "systemtap-${kernel.version}-${version}" { + inherit stapBuild kernelBuildDir; + buildInputs = [ makeWrapper ]; + meta = { + homepage = https://sourceware.org/systemtap/; + repositories.git = url; + description = "Provides a scripting language for instrumentation on a live kernel plus user-space"; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + }; +} '' + mkdir -p $out/bin + for bin in $stapBuild/bin/*; do # hello emacs */ + ln -s $bin $out/bin + done + rm $out/bin/stap + makeWrapper $stapBuild/bin/stap $out/bin/stap \ + --add-flags "-r $kernelBuildDir" \ + --prefix PATH : ${lib.makeBinPath [ stdenv.cc.cc elfutils gnumake ]} +'' diff --git a/pkgs/development/tools/pypi2nix/default.nix b/pkgs/development/tools/pypi2nix/default.nix index 01fe4b73d6c..229d680f835 100644 --- a/pkgs/development/tools/pypi2nix/default.nix +++ b/pkgs/development/tools/pypi2nix/default.nix @@ -2,19 +2,31 @@ }: let - deps = import ./deps.nix { inherit fetchurl; }; - version = "1.4.0"; + + version = "1.5.0"; + src = fetchurl { url = "https://github.com/garbas/pypi2nix/archive/v${version}.tar.gz"; - sha256 = "0w5f10p4d4ppwg2plbbrmqwmi1ycgpaidyajza11c9svka014zrb"; + sha256 = "0s79pp7gkgyk7discnv94m6z81fd67p66rdbd4cwk1ma0qljlh2k"; }; + + click = fetchurl { + url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-6.6.tar.gz"; + sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc"; + }; + + requests = fetchurl { + url = "https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad/requests-2.11.1.tar.gz"; + sha256 = "0cx1w7m4cpslxz9jljxv0l9892ygrrckkiwpp2hangr8b01rikss"; + }; + in stdenv.mkDerivation rec { name = "pypi2nix-${version}"; - srcs = with deps; [ + srcs = [ src click requests - ]; # six attrs effect ]; + ]; buildInputs = [ python zip makeWrapper ]; sourceRoot = "."; @@ -22,9 +34,6 @@ in stdenv.mkDerivation rec { mkdir -p $out/pkgs mv click-*/click $out/pkgs/click - # mv six-*/six.py $out/pkgs/ - # mv attrs-*/src/attr $out/pkgs/attrs - # mv effect-*/effect $out/pkgs/effect mv requests-*/requests $out/pkgs/ if [ "$IN_NIX_SHELL" != "1" ]; then diff --git a/pkgs/development/tools/pypi2nix/deps.nix b/pkgs/development/tools/pypi2nix/deps.nix deleted file mode 100644 index e67cb51c67c..00000000000 --- a/pkgs/development/tools/pypi2nix/deps.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ fetchurl -}: - -rec { - - pipVersion = "8.1.2"; - pipHash = "87083c0b9867963b29f7aba3613e8f4a"; - pipWhlHash = "0570520434c5b600d89ec95393b2650b"; - - setuptoolsVersion = "23.0.0"; - setuptoolsHash = "100a90664040f8ff232fbac02a4c5652"; - setuptoolsWhlHash = "a066fd7bfb8faaad763acbdbcb290199"; - - zcbuildoutVersion = "2.5.2"; - zcbuildoutHash = "06a21fb02528c07aa0db31de0389a244"; - - zcrecipeeggVersion = "2.0.3"; - zcrecipeeggHash = "69a8ce276029390a36008150444aa0b4"; - - buildoutrequirementsVersion = "0.2.2"; - buildoutrequirementsHash = "0b4e53d871b167eaac0846942221af00"; - - wheelVersion = "0.29.0"; - wheelHash = "555a67e4507cedee23a0deb9651e452f"; - - clickVersion = "6.6"; - clickHash = "d0b09582123605220ad6977175f3e51d"; - - sixVersion = "1.10.0"; - sixHash = "34eed507548117b2ab523ab14b2f8b55"; - - attrsVersion = "16.0.0"; - attrsHash = "5bcdd418f6e83e580434c63067c08a73"; - - effectVersion = "0.10.1"; - effectHash = "6a6fd28fb44179ce01a148d4e8bdbede"; - - requestsVersion = "2.10.0"; - requestsHash = "a36f7a64600f1bfec4d55ae021d232ae"; - - - # --- wheels used to bootstrap python environment --------------------------- - - pipWhl = fetchurl { - url = "https://pypi.python.org/packages/9c/32/004ce0852e0a127f07f358b715015763273799bd798956fa930814b60f39/pip-${pipVersion}-py2.py3-none-any.whl"; - md5 = pipWhlHash; - }; - - setuptoolsWhl = fetchurl { - url = "https://pypi.python.org/packages/74/7c/c75c4f4032a4627406db06b742cdc7ba24c4833cd423ea7e22882380abde/setuptools-${setuptoolsVersion}-py2.py3-none-any.whl"; - md5 = setuptoolsWhlHash; - }; - - - # --- python packages needed ------------------------------------------------ - - pip = fetchurl { - url = "https://pypi.python.org/packages/e7/a8/7556133689add8d1a54c0b14aeff0acb03c64707ce100ecd53934da1aa13/pip-${pipVersion}.tar.gz"; - md5 = pipHash; - }; - - setuptools = fetchurl { - url = "https://pypi.python.org/packages/45/5e/79ca67a0d6f2f42bfdd9e467ef97398d6ad87ee2fa9c8cdf7caf3ddcab1e/setuptools-${setuptoolsVersion}.tar.gz"; - md5 = setuptoolsHash; - }; - - zcbuildout = fetchurl { - url = "https://pypi.python.org/packages/ec/a1/60214738d5dcb199ad97034ecf349d18f3ab69659df827a5e182585bfe48/zc.buildout-${zcbuildoutVersion}.tar.gz"; - md5 = zcbuildoutHash; - }; - - zcrecipeegg = fetchurl { - url = "https://pypi.python.org/packages/08/5e/ade683d229d77ed457017145672f1be4fd98be60f1a5344109a4e66a7d54/zc.recipe.egg-${zcrecipeeggVersion}.tar.gz"; - md5 = zcrecipeeggHash; - }; - - buildoutrequirements = fetchurl { - url = "https://github.com/garbas/buildout.requirements/archive/1e2977e2d254184399401746736d2b17c912b350.tar.gz"; - md5 = buildoutrequirementsHash; - }; - - wheel = fetchurl { - url = "https://pypi.python.org/packages/c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/wheel-${wheelVersion}.tar.gz"; - md5 = wheelHash; - }; - - click = fetchurl { - url = "https://pypi.python.org/packages/7a/00/c14926d8232b36b08218067bcd5853caefb4737cda3f0a47437151344792/click-${clickVersion}.tar.gz"; - md5 = clickHash; - }; - - # six = fetchurl { - # url = "https://pypi.python.org/packages/b3/b2/238e2590826bfdd113244a40d9d3eb26918bd798fc187e2360a8367068db/six-${sixVersion}.tar.gz"; - # md5 = sixHash; - # }; - - # attrs = fetchurl { - # url = "https://pypi.python.org/packages/89/15/80d388d696c8c8ba14874635207aa698eb30ef1242dbb54d9eccf0e927ff/attrs-${attrsVersion}.tar.gz"; - # md5 = attrsHash; - # }; - - # effect = fetchurl { - # url = "https://pypi.python.org/packages/09/19/bd92fe0ba6080323caffd450db65ac7a5bb2d71d9b61fe6a2751a9c3292c/effect-${effectVersion}.tar.gz"; - # md5 = effectHash; - # }; - - requests = fetchurl { - url = "https://pypi.python.org/packages/49/6f/183063f01aae1e025cf0130772b55848750a2f3a89bfa11b385b35d7329d/requests-${requestsVersion}.tar.gz"; - md5 = requestsHash; - }; - -} diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 49de886654c..ecf919a9829 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with lib; { description = "Convert between TOML, YAML and JSON"; diff --git a/pkgs/development/tools/remarshal/deps.json b/pkgs/development/tools/remarshal/deps.json deleted file mode 100644 index 1cc264181c4..00000000000 --- a/pkgs/development/tools/remarshal/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - } -] diff --git a/pkgs/development/tools/remarshal/deps.nix b/pkgs/development/tools/remarshal/deps.nix new file mode 100644 index 00000000000..32f9f6eb0bb --- /dev/null +++ b/pkgs/development/tools/remarshal/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } +] diff --git a/pkgs/development/tools/rust/rainicorn/default.nix b/pkgs/development/tools/rust/rainicorn/default.nix new file mode 100644 index 00000000000..b6cbeb88402 --- /dev/null +++ b/pkgs/development/tools/rust/rainicorn/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper }: + +with rustPlatform; + +buildRustPackage rec { + name = "rainicorn-${version}"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "RustDT"; + repo = "Rainicorn"; + rev = "0f8594079a7f302f4940cc4320f5e4f39f95cdc4"; + sha256 = "07vh4g120sx569wkzclq91blkkd7q7z582pl8vz0li1l9ij8md01"; + }; + + depsSha256 = "1ckrf77s1glrqi0gvrv9wqmip4i97dk0arn0iz87jg4q2wfss85k"; + + meta = with stdenv.lib; { + description = "Rust IDEs. parse-analysis"; + homepage = https://github.com/RustDT/Rainicorn; + license = with licenses; [ mit asl20 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix index e93006b89ce..d573a6c5b60 100644 --- a/pkgs/development/tools/sauce-connect/default.nix +++ b/pkgs/development/tools/sauce-connect/default.nix @@ -4,27 +4,24 @@ with lib; stdenv.mkDerivation rec { name = "sauce-connect-${version}"; - version = "4.3.16"; + version = "4.4.0"; src = fetchurl ( if stdenv.system == "x86_64-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz"; - sha256 = "0i4nvb1yd9qnbgbfc8wbl7ghpmba2jr98hj4y4j4sbjfk65by3xw"; + sha256 = "19zgnw0qn5f775p581mq5ry086rhcnnhqc6x82hzmwfysbsyl7xs"; } else if stdenv.system == "i686-linux" then { url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz"; - sha256 = "1w9b1584kh1n4fw0wxbyslxp6w09if53fv4p9zz7vn4smm79ndfz"; + sha256 = "1m4nf1yidwkmlwald0ycwzvnsp5p93nc4bs1xh67phw0b2db99x9"; } else { url = "https://saucelabs.com/downloads/sc-${version}-osx.zip"; - sha256 = "1vhz2j30p285blspg7prr9bsah6f922p0mv7mhmk6xzgf6fgn764"; + sha256 = "1bpdpwqa9sw2n7vw2g8q4c1mzgh8wgwn4p7sbryc2ki90yz8ibga"; } ); buildInputs = [ unzip ]; - phases = [ "unpackPhase" ] - ++ (lib.optionals (stdenv.system != "x86_64-darwin") [ "patchPhase" ]) - ++ [ "installPhase " ]; - patchPhase = '' + patchPhase = stdenv.lib.optionalString stdenv.isLinux '' patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${makeLibraryPath [zlib]}" \ diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 295109cda47..a53cb4bc0bd 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, jre }: stdenv.mkDerivation rec { - version = "0.3.1"; + version = "0.4.2"; baseName = "scalafmt"; name = "${baseName}-${version}"; src = fetchurl { url = "https://github.com/olafurpg/scalafmt/releases/download/v${version}/${baseName}.tar.gz"; - sha256 = "08jbhwnmcqjq95a4c0wsw7vp2v9apys6czrpjjaw7x1q4vgcnjzv"; + sha256 = "087zj30jnd2zic9glfk7kl8r97bzv34y2qz56iyh75a69dcs6gnk"; }; unpackPhase = "tar xvzf $src"; diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 1f2153bf337..6a10f73cfe4 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib -, glibc, gtk, libX11, makeWrapper, nspr, nss, pango, unzip, gconf +, glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf , libXi, libXrender, libXext }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { mv chromedriver $out/bin patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver wrapProgram "$out/bin/chromedriver" \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib cairo fontconfig freetype gdk_pixbuf glib gtk2 libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH" ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/simavr/default.nix b/pkgs/development/tools/simavr/default.nix new file mode 100644 index 00000000000..823f93f9ac4 --- /dev/null +++ b/pkgs/development/tools/simavr/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, avrgcclibc, libelf, which, git, pkgconfig, freeglut +, mesa }: + +stdenv.mkDerivation rec { + name = "simavr-${version}"; + version = "1.3"; + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "buserror"; + repo = "simavr"; + rev = "51d5fa69f9bc3d62941827faec02f8fbc7e187ab"; + sha256 = "0k8xwzw9i6xsmf98q43fxhphq0wvflvmzqma1n4jd1ym9wi48lfx"; + }; + + buildFlags = "AVR_ROOT=${avrgcclibc}/avr SIMAVR_VERSION=${version}"; + installFlags = buildFlags + " DESTDIR=$(out)"; + + postFixup = '' + target="$out/bin/simavr" + patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target" + ''; + + buildInputs = [ which git avrgcclibc libelf pkgconfig freeglut mesa ]; + + meta = with stdenv.lib; { + description = "A lean and mean Atmel AVR simulator"; + homepage = https://github.com/buserror/simavr; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ goodrone ]; + }; + +} + diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 1228484fc65..ff06e5d4159 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.10.0"; + version="0.10.1"; name="${baseName}-${version}"; - hash="1yqs4f90bp8vxa7n8y1a3hi9hd7374hq9qa44xgfb4l5kn6h1f40"; - url="http://download.slimerjs.org/releases/0.10.0/slimerjs-0.10.0.zip"; - sha256="1yqs4f90bp8vxa7n8y1a3hi9hd7374hq9qa44xgfb4l5kn6h1f40"; + hash="14xfhn9v3mn4m7hfa36750vp7qgmnc5yfrdkjymzm8g9fz39ddx2"; + url="http://download.slimerjs.org/releases/0.10.1/slimerjs-0.10.1.zip"; + sha256="14xfhn9v3mn4m7hfa36750vp7qgmnc5yfrdkjymzm8g9fz39ddx2"; }; buildInputs = [ unzip zip @@ -34,7 +34,7 @@ stdenv.mkDerivation { echo 'export SLIMERJSLAUNCHER=${firefox}/bin/firefox' >> "$out/bin/slimerjs" echo "'$out/lib/slimerjs/slimerjs' \"\$@\"" >> "$out/bin/slimerjs" chmod a+x "$out/bin/slimerjs" - sed -e 's@MaxVersion=[34][0-9][.]@MaxVersion=50.@' -i "$out/lib/slimerjs/application.ini" + sed -e 's@MaxVersion=[3456][0-9][.]@MaxVersion=99.@' -i "$out/lib/slimerjs/application.ini" ''; meta = { inherit (s) version; diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 4caa659c17a..65c0bb8e41e 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; diff --git a/pkgs/development/tools/textql/deps.json b/pkgs/development/tools/textql/deps.json deleted file mode 100644 index 01c5de1cdc6..00000000000 --- a/pkgs/development/tools/textql/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - } -] diff --git a/pkgs/development/tools/textql/deps.nix b/pkgs/development/tools/textql/deps.nix new file mode 100644 index 00000000000..e166e73a61f --- /dev/null +++ b/pkgs/development/tools/textql/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix index a59d656b625..91a01edc23a 100644 --- a/pkgs/development/tools/thrust/default.nix +++ b/pkgs/development/tools/thrust/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk, atk +{ stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk , pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss , xorg, libcap, unzip }: @@ -7,7 +7,7 @@ let thrustEnv = buildEnv { name = "env-thrust"; paths = [ - stdenv.cc.cc glib dbus gtk atk pango freetype fontconfig gdk_pixbuf + stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk_pixbuf cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index 0a72e6bb91e..b2c96beeeb3 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -4,7 +4,7 @@ , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi , libXcomposite, libXext, libXrandr, libXtst, libSM, libICE, libxcb -, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp, chromium +, mono, libgnomeui, gnome_vfs, gnome-sharp, gtk-sharp-2_0, chromium }: let @@ -19,10 +19,10 @@ let binPath = lib.makeBinPath [ nodejs gnutar ]; developBinPath = lib.makeBinPath [ mono ]; developLibPath = lib.makeLibraryPath [ - glib libgnomeui gnome_vfs gnome-sharp gtk-sharp gtk-sharp.gtk + glib libgnomeui gnome_vfs gnome-sharp gtk-sharp-2_0 gtk-sharp-2_0.gtk ]; developDotnetPath = lib.concatStringsSep ":" [ - gnome-sharp gtk-sharp + gnome-sharp gtk-sharp-2_0 ]; ver = "5.3.5"; diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index c9987aea832..cf4f34cbdfe 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,7 +4,7 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let - version = "1.8.5"; + version = "1.8.6"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -13,8 +13,8 @@ let }; sha256 = { - "x86_64-linux" = "1na5hxm3ilx268hk68dpgkks1jjh9q7p3ksjx8ssiijq6df47vih"; - "i686-linux" = "16psr5s0azpzavizh74085z7wygkfs4ribsfalvbd96phkrkp2wp"; + "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; + "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; @@ -28,24 +28,11 @@ in stdenv.mkDerivation rec { inherit sha256; }; - # Remove the patchFlags/patches when 1.8.6 is released - patchFlags = [ - "-p1" - "-d ./opt/vagrant/embedded/gems/gems/vagrant-${version}" - ]; - patches = [ - (fetchpatch { - url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff"; - name = "fix_incorrect_ssh_keys_permissions.patch"; - sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf"; - }) - ]; - meta = with stdenv.lib; { description = "A tool for building complete development environments"; homepage = http://vagrantup.com; license = licenses.mit; - maintainers = with maintainers; [ lovek323 globin jgeerds ]; + maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ]; platforms = platforms.linux; }; diff --git a/pkgs/development/tools/valadoc/default.nix b/pkgs/development/tools/valadoc/default.nix new file mode 100644 index 00000000000..7d4e61c8799 --- /dev/null +++ b/pkgs/development/tools/valadoc/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchgit, gnome3, automake, autoconf, which, libtool, pkgconfig, graphviz, glib, gobjectIntrospection, expat}: +stdenv.mkDerivation rec { + version = "2016-10-09"; + name = "valadoc-unstable-${version}"; + + src = fetchgit { + url = "git://git.gnome.org/valadoc"; + rev = "37756970379d1363453562e9f2af2c354d172fb4"; + sha256 = "1s9sf6f0srh5sqqikswnb3bgwv5s1r9bd4n10hs2lzfmh7z227qb"; + }; + + nativeBuildInputs = [ automake autoconf which gnome3.vala libtool pkgconfig gobjectIntrospection ]; + buildInputs = [ graphviz glib gnome3.libgee expat ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "valadoc is a documentation generator for generating API documentation from Vala source code"; + homepage = http://valadoc.org; + license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ sternenseemann ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix index 58a857c2214..e0c897499d2 100644 --- a/pkgs/development/tools/winpdb/default.nix +++ b/pkgs/development/tools/winpdb/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, wxPython, makeDesktopItem }: +{ stdenv, fetchurl, pythonPackages, makeDesktopItem }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "winpdb-1.4.8"; namePrefix = ""; @@ -9,7 +9,7 @@ buildPythonApplication rec { sha256 = "0vkpd24r40j928vc04c721innv0168sbllg97v4zw10adm24d8fs"; }; - propagatedBuildInputs = [ wxPython ]; + propagatedBuildInputs = [ pythonPackages.wxPython ]; desktopItem = makeDesktopItem { name = "winpdb"; diff --git a/pkgs/development/tools/wp-cli/default.nix b/pkgs/development/tools/wp-cli/default.nix index 418e23eb0e7..a116e8b73e2 100644 --- a/pkgs/development/tools/wp-cli/default.nix +++ b/pkgs/development/tools/wp-cli/default.nix @@ -1,38 +1,40 @@ -{ stdenv, lib, writeText, bash, fetchurl, php }: +{ stdenv, lib, writeText, writeScript, fetchurl, php }: let + version = "0.24.1"; + name = "wp-cli-${version}"; + phpIni = writeText "wp-cli-php.ini" '' [Phar] phar.readonly = Off ''; -in stdenv.mkDerivation rec { - version = "0.23.1"; - name = "wp-cli-${version}"; + wpBin = writeScript "wp" '' + #! ${stdenv.shell} -e + exec ${php}/bin/php \ + -c ${phpIni} \ + -f ${src} "$@" + ''; src = fetchurl { url = "https://github.com/wp-cli/wp-cli/releases/download/v${version}/${name}.phar"; - sha256 = "1sjai8gjsx6j82lsxq9m827bczp4ajnldk6ibj4krcisn9pjva5f"; + sha256 = "027nclp8qbfr624ja6aixzcwnvb55d7dskk9l1i042bc86hmphfd"; }; - propagatedBuildInputs = [ php ]; +in stdenv.mkDerivation rec { + + inherit name; buildCommand = '' mkdir -p $out/bin - - cat >$out/bin/wp < $out/bin/AstroMenace << EOF - #!/bin/bash + cat > $out/bin/AstroMenace << EOF + #!${stdenv.shell} $out/AstroMenace --dir=$out EOF chmod 755 $out/bin/AstroMenace diff --git a/pkgs/games/brogue/default.nix b/pkgs/games/brogue/default.nix index 73a70f2f37e..814f4f6c82e 100644 --- a/pkgs/games/brogue/default.nix +++ b/pkgs/games/brogue/default.nix @@ -25,6 +25,9 @@ stdenv.mkDerivation rec { cp -r bin/fonts $out/share/brogue/ ''; + # fix crash; shouldn’t be a security risk because it’s an offline game + hardeningDisable = [ "stackprotector" "fortify" ]; + meta = with stdenv.lib; { description = "A roguelike game"; homepage = https://sites.google.com/site/broguegame/; diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix index 1d151b66920..47ab73ca269 100644 --- a/pkgs/games/ckan/default.nix +++ b/pkgs/games/ckan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk, curl }: +{ stdenv, fetchFromGitHub, makeWrapper, perl, mono, gtk2, curl }: stdenv.mkDerivation rec { name = "ckan-${version}"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; checkTarget = "test"; - libraries = stdenv.lib.makeLibraryPath [ gtk curl ]; + libraries = stdenv.lib.makeLibraryPath [ gtk2 curl ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/games/crack-attack/default.nix b/pkgs/games/crack-attack/default.nix index eb20c0b329e..2044782c1bd 100644 --- a/pkgs/games/crack-attack/default.nix +++ b/pkgs/games/crack-attack/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, freeglut, SDL, mesa, libXi, libXmu}: +{ stdenv, fetchurl, pkgconfig, gtk2, freeglut, SDL, mesa, libXi, libXmu}: stdenv.mkDerivation { name = "crack-attack-1.1.14"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1sakj9a2q05brpd7lkqxi8q30bccycdzd96ns00s6jbxrzjlijkm"; }; - buildInputs = [ pkgconfig gtk freeglut SDL mesa libXi libXmu ]; + buildInputs = [ pkgconfig gtk2 freeglut SDL mesa libXi libXmu ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 351e25388e1..9526512f15c 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -1,658 +1,64 @@ -{ stdenv, fetchurl, unzip, fullVariant ? false }: +{ stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "crafty-${version}"; - version = "23.4"; - + version = "25.0.1"; + src = fetchurl { - url = "http://www.craftychess.com/crafty-${version}.zip"; - sha256 = "0rhf4pfxcwj8hqd7bqj98fpdd80v6ss1jnc9kgwx2fw4ksdi37pl"; + url = "http://www.craftychess.com/downloads/source/crafty-${version}.zip"; + sha256 = "0aqgj2q7kdlgbha01qs869cwyja13bc7q2lh4nfhlba2pklknsm8"; }; bookBin = fetchurl { - url = http://www.craftychess.com/book.bin; - sha256 = "1j8f33iks4xf19bpv2mpvxrnlm5w1f5fbnxcrxasg9p7w600wyb8"; + url = http://www.craftychess.com/downloads/book/book.bin; + sha256 = "10rrgkr3hxm7pxdbc2jq8b5g74gfhzk4smahks3k8am1cmyq4p7r"; }; startPgn = fetchurl { - url = http://www.cis.uab.edu/hyatt/crafty/pgn/start.pgn; - sha256 = "08c066acqwgr19jkaizdbzdpcm3ld5nsixv5wp9pnc37b8w9f0vm"; + url = http://craftychess.com/downloads/book/start.pgn.gz; + sha256 = "12g70mgfifwssfvndzq94pin34dizlixhsga75vgj7dakysi2p7f"; }; - enormousPgn = stdenv.lib.optionalString fullVariant (fetchurl { - url = http://www.cis.uab.edu/hyatt/crafty/pgn/enormous.zip; - sha256 = "001574gz3881xfvhlc2wy6pg66c4sh0q2ms42swwvq0l80syz6y2"; - }); - - tableBases345 = - let root = http://www.cis.uab.edu/hyatt/crafty/TB/3-4-5/; - in stdenv.lib.optionals fullVariant (map fetchurl [ - { url = root + "kbbbk.nbb.emd"; - sha256 = "1yssskq32x22ki67ja7azvlglz0vgq6d6awdz4avj1k72nbcs90g"; } - { url = root + "kbbbk.nbw.emd"; - sha256 = "0n0hy09pnp0ldxkrvs1gz1ch7px0hzj1ni7iicfy7y9zhsqaky2r"; } - { url = root + "kbbk.nbb.emd"; - sha256 = "1gyd2p546rapisbzjpqm1kbdlsj77yw46lr5wx28sng11wkz8xnk"; } - { url = root + "kbbk.nbw.emd"; - sha256 = "1gvl0vw9k22wkas8mzdik2ynnykgiisp8smyf97i0v7h1y7bxsx5"; } - { url = root + "kbbkb.nbb.emd"; - sha256 = "0zk12q2d3xfbj7zv9jkk0p1gzj7n640jynx7nkcfhmpz9qvjz5d1"; } - { url = root + "kbbkb.nbw.emd"; - sha256 = "1kw68pbs12cjf0gg40j5b694zdyffprjblf56czgyj8xpfz219x9"; } - { url = root + "kbbkn.nbb.emd"; - sha256 = "0gibrw89zlz93sdi8bkhy0pkfcgl4sswbm3vg6fgp752cwsvksiv"; } - { url = root + "kbbkn.nbw.emd"; - sha256 = "0v781yid5g57y3raw5pqhr2cb8zm0rscim0zszypp4piz22pb60h"; } - { url = root + "kbbkp.nbb.emd"; - sha256 = "1y2nxqqd7fhk7x2fc3dxidqlcrgcbwd9gkk4bggay3xds9m5nhrg"; } - { url = root + "kbbkp.nbw.emd"; - sha256 = "0py5adrciqbs0cdwh1lz5q8ldkyvqbc7rx4995k6kvlq4nh95qam"; } - { url = root + "kbbkq.nbb.emd"; - sha256 = "141jkx0ifb91b5nwps4xssvvcm1fny8ng1zxqsjb1n9dgsigsna7"; } - { url = root + "kbbkq.nbw.emd"; - sha256 = "0iknfd1rjm4ar4gycg0yzw5dbf7hs3y1fnb3s9abypk8pkn8ga9d"; } - { url = root + "kbbkr.nbb.emd"; - sha256 = "0jpp1f0rgglrn7gc36v7y38rivwl68s6gr2p15lqdvngismmyp13"; } - { url = root + "kbbkr.nbw.emd"; - sha256 = "0gqs5bxg6kv4nw0sl0drfs9p043q10ic6d9il0rlvs6qds6d9bv0"; } - { url = root + "kbbnk.nbb.emd"; - sha256 = "0x7q6clkhfv3scqyyj42b8r7jkd99v396pmih2f10a4scca3glxc"; } - { url = root + "kbbnk.nbw.emd"; - sha256 = "1qry3mpl1rjsjasayfxhh6abnm7arfdljnz9q2n5v769kaqx1bx3"; } - { url = root + "kbbpk.nbb.emd"; - sha256 = "1y2vx6i351nbfrbg5qkjyp9ys8vkb45i5101gz8fx1w3pkxq9312"; } - { url = root + "kbbpk.nbw.emd"; - sha256 = "16jkjb1ljyck5k4mr3pwxasxb1l08h7mcc0iigjlgzrnvsc38nrb"; } - { url = root + "kbk.nbb.emd"; - sha256 = "162jy1dm8h35p5yxz9ii5y3bwspgf1xy4m0hhdxzqm3an8f2i7nr"; } - { url = root + "kbk.nbw.emd"; - sha256 = "1lks1fccaikrc455cadkw1h1012jk6nqfmqzi40ilmlckc3i7pnj"; } - { url = root + "kbkb.nbb.emd"; - sha256 = "1hvkp65jp5jd3j7rp9wivrfcwgr42kd4kbj9n2sk68nqbdw5j4h1"; } - { url = root + "kbkb.nbw.emd"; - sha256 = "1hvkp65jp5jd3j7rp9wivrfcwgr42kd4kbj9n2sk68nqbdw5j4h1"; } - { url = root + "kbkn.nbb.emd"; - sha256 = "1cwzqb64q7br94pc1wbp86k4fpcii14wcsj3f7l5n9mmgrzk3y9k"; } - { url = root + "kbkn.nbw.emd"; - sha256 = "17wnagdkc25d6daqa3cmr0923k4d98jjzpw1h4g70r19zrnczjn5"; } - { url = root + "kbkp.nbb.emd"; - sha256 = "05mcmbwwrp4iljlw0ba7d6vgh0w1pl5a1vsmvsg56k4npx6npc95"; } - { url = root + "kbkp.nbw.emd"; - sha256 = "1jsh96mrhshj07x9sv3prl4zzhpl2xmdr6znxshyr461481b6g7m"; } - { url = root + "kbnk.nbb.emd"; - sha256 = "0k6bn47hdj36szqcbh66wcbv3ygxv6cm0zj36rl9n1c7rc9j7p4g"; } - { url = root + "kbnk.nbw.emd"; - sha256 = "0rhkzsw9zw36zckjic6dd95psx90fr4d8rzbhkqskh8l945cyxky"; } - { url = root + "kbnkb.nbb.emd"; - sha256 = "10mblq1n0m0ipfs4zdnnay6dmwafshb8l5mynfrn5wiaf26jysvz"; } - { url = root + "kbnkb.nbw.emd"; - sha256 = "0h90b4a6m7pp0qfc1anm30ffqwmaj3h1zslsbivw4k8i0jnpfqax"; } - { url = root + "kbnkn.nbb.emd"; - sha256 = "009rw6czd9zagly7nz43rd9vq60h57mfrlzx02cchn1ydsr6cnj2"; } - { url = root + "kbnkn.nbw.emd"; - sha256 = "03harm479g91s2lb5ixk27n50kj15qjz8784nn1rmmcicisj4z7c"; } - { url = root + "kbnkp.nbb.emd"; - sha256 = "0y737si4zrf8ac9jmn9sbwylcd1yvcxn5ihn128p2kan3956fpdv"; } - { url = root + "kbnkp.nbw.emd"; - sha256 = "1902fn3pwrslxi4rv8lrahwq3hakz9kfq70b8c0hqshf44h06ggi"; } - { url = root + "kbnkq.nbb.emd"; - sha256 = "112chi9pw5fqrpv4q4a9p8jc5zld8wkiwd9y71rky09z7zng4vy5"; } - { url = root + "kbnkq.nbw.emd"; - sha256 = "1m1pdsq9zl9g2fs2gjp76za3qmdrv0k1ngxvz3cjyh3p08lixca0"; } - { url = root + "kbnkr.nbb.emd"; - sha256 = "13nkcvcn70g3q5fgrhbc8qs0i0fl7k78m5pxdgmijbkax52kpfgl"; } - { url = root + "kbnkr.nbw.emd"; - sha256 = "0kjplgzbza4wp8aqf7b4k9nqg0vzdj0q6nj90sg7ssiw2w95z1jz"; } - { url = root + "kbnnk.nbb.emd"; - sha256 = "1v3a5fi2fnh9mr9j59dv8jw2inx55jsfg9ypn92dgdmmlwg688yr"; } - { url = root + "kbnnk.nbw.emd"; - sha256 = "096l2zpi7ywrqsapkz47pcivkh2igsdmxb8szd9gq8ylylrsma37"; } - { url = root + "kbnpk.nbb.emd"; - sha256 = "1011x2w59fjn89nd8yqhvjcxdwla4chifwvx3hml2g82rfqgmw5r"; } - { url = root + "kbnpk.nbw.emd"; - sha256 = "1nvqwv6akdr5acs9cdcf1zircw351fmf433niyc7blzqa0nng7n1"; } - { url = root + "kbpk.nbb.emd"; - sha256 = "1bbyr59kapp6f2r4mn1b79668b6gf1j0pwh6f3fcym7xms7gg28k"; } - { url = root + "kbpk.nbw.emd"; - sha256 = "0bn70m7g225mpbs1s7vpw5swd12wwziryp25sv2z5xpg03y7zm10"; } - { url = root + "kbpkb.nbb.emd"; - sha256 = "0clwycpzqklasqw5igk74sm9w6wqwx6h8dbqajpccq3l6ipf2ylx"; } - { url = root + "kbpkb.nbw.emd"; - sha256 = "0w7sf6q3m2hn9ix7lyg1c8casz3qxnzqvfvsbsda46xx5chrp7wh"; } - { url = root + "kbpkn.nbb.emd"; - sha256 = "052fi7b56qq46pc4hvr5wpxkr0gv7wq0cnp5550qbr7an446nbri"; } - { url = root + "kbpkn.nbw.emd"; - sha256 = "1lbwj845qff7y51iw4fybqvpcbh9r5jlfphmhidzdkjhd2gflb0j"; } - { url = root + "kbpkp.nbb.emd"; - sha256 = "1ybzqw8fjqal6n6isy2m9rhhykd8g81slvc5m55ccald63zalk43"; } - { url = root + "kbpkp.nbw.emd"; - sha256 = "139dm4709pvzxn6aixfsbv88ly0cjn6dk7khr1sjf2x17c21mj69"; } - { url = root + "kbpkq.nbb.emd"; - sha256 = "0640xw9hasgif9cxyskpp397dzvhwnpkcfyn33d4vbi4r0cbdv81"; } - { url = root + "kbpkq.nbw.emd"; - sha256 = "13yhn55y65pl6bh67hlfjlwj3mm4w6gy1y34qypgc7kck0rrygn6"; } - { url = root + "kbpkr.nbb.emd"; - sha256 = "03avk4igjdyh6ayh3xm0ds8agmqhagyxmv3s8g8830qk3a6frkz3"; } - { url = root + "kbpkr.nbw.emd"; - sha256 = "0vqkywgxkys0dxnx0sv35kzx9fxhqzbnk4qskjzd1fw9ck21pnad"; } - { url = root + "kbppk.nbb.emd"; - sha256 = "0i4zgsp7izp789chl1vlp93dy567schz96my19vgki1y3ifx4wkz"; } - { url = root + "kbppk.nbw.emd"; - sha256 = "0ki9a0f5cp7ma9zrabjrz5alk6d3xihl388j1h9ii4g52g1zci3v"; } - { url = root + "knk.nbb.emd"; - sha256 = "162jy1dm8h35p5yxz9ii5y3bwspgf1xy4m0hhdxzqm3an8f2i7nr"; } - { url = root + "knk.nbw.emd"; - sha256 = "0irmycxkah9j5qf9inmrz6cvjv8i894vzg5378qmazkpgpmzvix8"; } - { url = root + "knkn.nbb.emd"; - sha256 = "0gwxp4q8wk9vsw4zprh3psrjdxkr3rjx0q3k3iqlf9y3rb6yy0hv"; } - { url = root + "knkn.nbw.emd"; - sha256 = "0gwxp4q8wk9vsw4zprh3psrjdxkr3rjx0q3k3iqlf9y3rb6yy0hv"; } - { url = root + "knkp.nbb.emd"; - sha256 = "1cfav9xgsmvs44j4irw1mx04phszlasz96i26ik8lw8wjdl8x6vx"; } - { url = root + "knkp.nbw.emd"; - sha256 = "0p560zfmixmcizy60f13lz5a3yd83w7bz06cac0nj0myv4m4s6yp"; } - { url = root + "knnk.nbb.emd"; - sha256 = "1w1dh6lmmrxjfi6srmznqvc7frzxhrs48f5g0jijb410y2c26y0l"; } - { url = root + "knnk.nbw.emd"; - sha256 = "1a9nvqk0w2xhwx5d2ia35z8g2xcsg2kh59ca1jwbvx9sh438b2xh"; } - { url = root + "knnkb.nbb.emd"; - sha256 = "1r8g6ml0hi6fxmff396wjnff76csrq47si1s0qsy1cdfkvax7yyn"; } - { url = root + "knnkb.nbw.emd"; - sha256 = "1v74lhr44s0plxab7qhn4crf55hhp4j7w2mr090sfxz0bzk7cb78"; } - { url = root + "knnkn.nbb.emd"; - sha256 = "1fy4ksqncjv0iqf0papy8hb353di0k39aq0jqh5jvshl9vmspz15"; } - { url = root + "knnkn.nbw.emd"; - sha256 = "1qgprlkaqfwfjkmc048faz2j8y1n46mqp3dfpdnn9ps1x3iqvs0f"; } - { url = root + "knnkp.nbb.emd"; - sha256 = "1xhsjq79nb7zgqgyjp0v6n0g8r37x2csa5svyz8ndsax9hrxc1r7"; } - { url = root + "knnkp.nbw.emd"; - sha256 = "08pxmb0sdppims2lfl0zi42rsh3dlrdbl7vq2rs8v0b470q4j5jx"; } - { url = root + "knnkq.nbb.emd"; - sha256 = "00y7vv6ajzr9kgwx8gk7wap7ncb9dg086iv3lwki6qcwvy14bxql"; } - { url = root + "knnkq.nbw.emd"; - sha256 = "09brsqvzwx4fmf7a6ljqcabx2isqfv1mmvsjb453wmhx98fkglj3"; } - { url = root + "knnkr.nbb.emd"; - sha256 = "01df21j4zdwb4dfngjrr4797b1ipdajs1730i4gajcbm4hqigi69"; } - { url = root + "knnkr.nbw.emd"; - sha256 = "0q0jxmqc57s22vlbk98dbb7c2zmzs6g6chlg42sw156j9414jdfb"; } - { url = root + "knnnk.nbb.emd"; - sha256 = "0jxlaqkbdxhw45p8y4g5ggryzc6l7s159fdlw0bi5ipcp40afpvg"; } - { url = root + "knnnk.nbw.emd"; - sha256 = "0782r7r4b4qmy3afrdmj5l0vlp5sgr33v0h0cigxghfmf19xhgdl"; } - { url = root + "knnpk.nbb.emd"; - sha256 = "0cxj1mxdz8hmjlzhnc7j4cdi5jkcj1l0xfrz4l4z4az7f4ad91ci"; } - { url = root + "knnpk.nbw.emd"; - sha256 = "13y2picx7c814hfsq3bb95js9s3bng85mblhhb7i12yqhddrzyx0"; } - { url = root + "knpk.nbb.emd"; - sha256 = "03xah0j9n427nvqwym0ay84zg831v26x3gnp1zkpg1072r78d2p2"; } - { url = root + "knpk.nbw.emd"; - sha256 = "10lv54gs3pgqqmndlihvjfbrfiqzgzfl7a127nchfyb12f9y91zz"; } - { url = root + "knpkb.nbb.emd"; - sha256 = "1jiihs0cd5jx2hwv99vb3n3iahqwz6ja60zk5nbr17cxzhw0g2ng"; } - { url = root + "knpkb.nbw.emd"; - sha256 = "19jxzp7v90hd1j6i109z03vdq81cndmlvmbb65fm2mc4ffrwms83"; } - { url = root + "knpkn.nbb.emd"; - sha256 = "1yqjxxhc0fq2jvsqifw8my8lzfs2fgn6z8c2lgvak8ag2mi57ka8"; } - { url = root + "knpkn.nbw.emd"; - sha256 = "1kh8sh9vscig0kkwvz79i3gk582xrgll8f4jlqw219f80ckh2ry6"; } - { url = root + "knpkp.nbb.emd"; - sha256 = "1sd46as18ciml1nyzwh8v5qm5slhchbv15yv4qhcaga7cmljy9w5"; } - { url = root + "knpkp.nbw.emd"; - sha256 = "0p8cwryphz16j2yihg7c1szx20s9mxzbgc7y6ddigvhafa19fc1d"; } - { url = root + "knpkq.nbb.emd"; - sha256 = "03vaswq917maa1wxfkilcxjxvm9srnwzmzq1sq36q3h3dlcv23mp"; } - { url = root + "knpkq.nbw.emd"; - sha256 = "1wmnipmacrbwggr1n63zdivvy9haqs96rkn458xswpmvks5fbyqj"; } - { url = root + "knpkr.nbb.emd"; - sha256 = "1ngpj8iaz6si5i3vxri8k8ajpaim71caldxal28djkpmw91yqil6"; } - { url = root + "knpkr.nbw.emd"; - sha256 = "1hqm6xp361iqdn7ayw6zvdk068iz2mwdz6sr087cr7gc0mim2ndw"; } - { url = root + "knppk.nbb.emd"; - sha256 = "1mphpswq01v7d0pxij12nd1lpiz683gp0zgwnz0nyninwsmpq08v"; } - { url = root + "knppk.nbw.emd"; - sha256 = "1m8l9jy96nxvqk48y73yj8b996q2gza1h448rrl00hjn1apbmjf3"; } - { url = root + "kpk.nbb.emd"; - sha256 = "1xgbahdym0nbj63rc6rwgiwzss8xw3ra4lg03z46666hwykx8gxp"; } - { url = root + "kpk.nbw.emd"; - sha256 = "1clkwzf3nb8lzrrs3gg4m9j5wh7z66ihra8gyz8majpjbhcz86an"; } - { url = root + "kpkp.nbb.emd"; - sha256 = "06jsna3795gjlymnrxmscgxnz9ic1i648hr6v5vfagf8lmqi9nq4"; } - { url = root + "kpkp.nbw.emd"; - sha256 = "1gplq6ksq4kvwramx137ncl6giwcm8rg3q8xmyqk1mq10dwcjfbp"; } - { url = root + "kppk.nbb.emd"; - sha256 = "11xlmyw2hx26mkca4bid4qg62yxd0pspgmb40l9kf6h0yjzq4q07"; } - { url = root + "kppk.nbw.emd"; - sha256 = "0j4dmlsm5i7rwrw7kkiq8j7zmcwvb6w38g41kfslm4sv6nm5mvjs"; } - { url = root + "kppkb.nbb.emd"; - sha256 = "0w2yzi0l3jdnr88my8gcsqy72crkm9ppyiy8wl629lpcbrwj75x6"; } - { url = root + "kppkb.nbw.emd"; - sha256 = "06f1h0x6rcsq9kag1fcz9z47hpffr4w9q171rkspd8ffpfzqq7za"; } - { url = root + "kppkn.nbb.emd"; - sha256 = "0wmkn2i8z7m4j93hid2z2ns31kg4yhn939lfkvglfdvrgqjn1kh9"; } - { url = root + "kppkn.nbw.emd"; - sha256 = "1ky4zcwyv5rn4g0h490s6l8vin6rwdv156ial7iczaq8hf70yhkm"; } - { url = root + "kppkp.nbb.emd"; - sha256 = "1ivfxjphcld71cg4rvvq9rvnkpidh6apd52jf2cv42fvx313d9mq"; } - { url = root + "kppkp.nbw.emd"; - sha256 = "1ymvp0z6jhrqi2hz87c81r54m9sdjpm91pvxwbx061yfbdpv230z"; } - { url = root + "kppkq.nbb.emd"; - sha256 = "018cy2q2dvhxjh80prjxg6fx1lal50qc5mzzbfy0xlkk1l1y4sk5"; } - { url = root + "kppkq.nbw.emd"; - sha256 = "0k4jlzcn213h8303jl3hkdapd9z8dhazsa22zac0bg52488r07gj"; } - { url = root + "kppkr.nbb.emd"; - sha256 = "187pjqvp7kzyxkncp51c3vi26khimabkw5b3nyaj498jqjjlfa23"; } - { url = root + "kppkr.nbw.emd"; - sha256 = "0mkrap8dizwxhhiij2xzlvbn8q9hrlsfvkcfcxajn8azaxnhx3ck"; } - { url = root + "kpppk.nbb.emd"; - sha256 = "10spzc39zks7pwa2qy8aps5hk0z4xsxq1lpfwd61qwm5hazci391"; } - { url = root + "kpppk.nbw.emd"; - sha256 = "1wx48xyb1xl5v7gjrahby8psig1gs9dipsj6iq44d052qr56513j"; } - { url = root + "kqbbk.nbb.emd"; - sha256 = "1zvacin043njqws2nwiylch5dan28yis3ybcjb3zvmkdxyy8qzrh"; } - { url = root + "kqbbk.nbw.emd"; - sha256 = "1s5likpps43bxplsv5yrqqnh2xzakibcknn6jh67xwdvl2v4jfz5"; } - { url = root + "kqbk.nbb.emd"; - sha256 = "1814l1cgfphzl4v7k3hnwi21ydzfzyr7xzbh05dw3mnm0dsg9gzk"; } - { url = root + "kqbk.nbw.emd"; - sha256 = "0xpmqr99qscrqjk5rzb7cgkjpcz4cmp6gngfsy8hq7530a4nknxk"; } - { url = root + "kqbkb.nbb.emd"; - sha256 = "1jpl4nx4ddwnz455433508ibxywsrccb098infn992gs7wqqjsi2"; } - { url = root + "kqbkb.nbw.emd"; - sha256 = "0krx6irqv0gvdy7hknhwa6gj2zwiv9rnjk2qlf2cy6xsldzn6af7"; } - { url = root + "kqbkn.nbb.emd"; - sha256 = "09xsg79xajh1g2d9nvms61pjgb13x6fc0nhw58nnfg28nbvjzz1n"; } - { url = root + "kqbkn.nbw.emd"; - sha256 = "0gb8pdsd77fmjd09h7ri1z8rrparqn5xa56dwi4yd4hhwsb8c4fq"; } - { url = root + "kqbkp.nbb.emd"; - sha256 = "07h1zzaic2qh2140wvcq0hvhmkv0j9h7rchm3avsk7m6ma98d7zi"; } - { url = root + "kqbkp.nbw.emd"; - sha256 = "13lffpplxis2a5949wnq998262idiydg2b2pz5np3mxyppc48r61"; } - { url = root + "kqbkq.nbb.emd"; - sha256 = "09l20wcjcvmncz97j4107q3ch81dgzmx7i86m6pzifhy8mrn2cll"; } - { url = root + "kqbkq.nbw.emd"; - sha256 = "0vra23shpwlsiyzd8wd2m2ayrs4ig2943l90ps9xh1p6igjv1n9d"; } - { url = root + "kqbkr.nbb.emd"; - sha256 = "0gmzhzr1m751djfp6b71yrah04r89lq41nshvw02qp531aqp1xyq"; } - { url = root + "kqbkr.nbw.emd"; - sha256 = "1zz0fdfn463xa76xd8hg2hz8a1kaljka9l01z64vsqvn73nkd5fm"; } - { url = root + "kqbnk.nbb.emd"; - sha256 = "1m7krpj5sd6mvrsks39jyxkg8mvz7g15rwnn55kql2flpsw481q4"; } - { url = root + "kqbnk.nbw.emd"; - sha256 = "1q6jvhxjzcani3ls402n3ylhhmf8kd482in19d2ny0q7pqcimvy7"; } - { url = root + "kqbpk.nbb.emd"; - sha256 = "1pdc8kd3q9f8vgfqxymar3vkg1h9qbsfr614lhgbmpmpmn4zxqdj"; } - { url = root + "kqbpk.nbw.emd"; - sha256 = "0dcyxa92200g0dgq7lk018grhvwxzrhh6wrwqdk6g3v02g63h38d"; } - { url = root + "kqk.nbb.emd"; - sha256 = "1f0cdqyakzck0ng11smhk9kdkch9hbm3azniqv2wjg2wp9aj9s1n"; } - { url = root + "kqk.nbw.emd"; - sha256 = "0gzxgkxzfnlri5ypvx67k2mwq4xnwkm4hn4n9mqpl7fjwdj733w2"; } - { url = root + "kqkb.nbb.emd"; - sha256 = "0j3w39l4mnwm5nrrw0zcd4icdj8hgds792nhick2mfn40injwna6"; } - { url = root + "kqkb.nbw.emd"; - sha256 = "0q30gjvlfmx1ld4i0x2xj97i4i3w6q1vhl2q91w8dd84bw1cy1k8"; } - { url = root + "kqkn.nbb.emd"; - sha256 = "15aivg3vpc6y1g3gcnmssjnww9l7npy3g5xxq3wq99ai1mbgik7p"; } - { url = root + "kqkn.nbw.emd"; - sha256 = "1qqi3r6a5d74108xgdxx9qx4cxv7fkr9jpkrcizirzv30dp3cb4z"; } - { url = root + "kqkp.nbb.emd"; - sha256 = "0hlsmjn9baa1bplnwygxvgnkfn15fm9fhc6k39bfiacy7ai0zkka"; } - { url = root + "kqkp.nbw.emd"; - sha256 = "0ibx6xp2v980626xffb7khz8lfnxb9577w5zc6mlc892kinaf4gf"; } - { url = root + "kqkq.nbb.emd"; - sha256 = "0kc2d1qwlib2v71fhx11frk2a06lx1mvvddw83mmvyzca108ggz3"; } - { url = root + "kqkq.nbw.emd"; - sha256 = "0kc2d1qwlib2v71fhx11frk2a06lx1mvvddw83mmvyzca108ggz3"; } - { url = root + "kqkr.nbb.emd"; - sha256 = "13fabjhiq5psyvg2a1cbx16471g35il0lm3fsfdy4dpl9zr2pw58"; } - { url = root + "kqkr.nbw.emd"; - sha256 = "0hwy21k0a3qa6b1093904krdqrqrz5iwqsb0qxqqnwljpz8kr1zl"; } - { url = root + "kqnk.nbb.emd"; - sha256 = "0dy9d9fwaqvmr3x796a7vq5ynqnpw8b4l0zsm7nkvvd5sak1blxj"; } - { url = root + "kqnk.nbw.emd"; - sha256 = "0zdzqhg0ww4b79w3w3hjpwfar0r8fhk2yc8jknwzcc9q9rv9a78n"; } - { url = root + "kqnkb.nbb.emd"; - sha256 = "04zvc8s2rwcgr9chx3rmvr3shs47i75pwh1wph9wiy33jx5gw846"; } - { url = root + "kqnkb.nbw.emd"; - sha256 = "1v22rln9plikvchdxqii4m9kh9s0mahrxnsqs6i2kzcfphiqp3ns"; } - { url = root + "kqnkn.nbb.emd"; - sha256 = "0kwz1390brs60ri0mrvf3f64ax0yncnp6kpaf7nrw5v29s5cxpyz"; } - { url = root + "kqnkn.nbw.emd"; - sha256 = "0gvsx71nf0bhggk338rsmvbpajwa6j1ja09gchny6i9gvg9l0frs"; } - { url = root + "kqnkp.nbb.emd"; - sha256 = "169llq4dv4fsh8hvvwwrbc2b1iwklnqwqmhzv77q862cxs8rbcsa"; } - { url = root + "kqnkp.nbw.emd"; - sha256 = "1b1mgfh7hgiqv9a0dv1f7vr180g1mjxcg3nlx4zmpj0mzgwka39g"; } - { url = root + "kqnkq.nbb.emd"; - sha256 = "02za7wp2z1h1sd55mmkaa6i0bh3piwiz5ybpdrxk2amm54kvjmsj"; } - { url = root + "kqnkq.nbw.emd"; - sha256 = "0s9c4zfw4slp7lv373nkhlyafn3hpw9pv4543mm69c6cdnl04xhk"; } - { url = root + "kqnkr.nbb.emd"; - sha256 = "0nffvkdfs17b6n2hmy9i7ha793dn8an7ff9nd97z62zxxm63gmyp"; } - { url = root + "kqnkr.nbw.emd"; - sha256 = "1jqmbna1i5wqahqz2lalviv61y6ak379fhjcc9xg651dxfnjnmwh"; } - { url = root + "kqnnk.nbb.emd"; - sha256 = "1dlhfqmv5g3f9lvfgvy4h7x0xfkbn9pcsplb9kjlqg7qhkimcvbg"; } - { url = root + "kqnnk.nbw.emd"; - sha256 = "0zlg34ff2bp88q8bws2isswwa8ls0qncpzyzc3d1j6avkprwkq2i"; } - { url = root + "kqnpk.nbb.emd"; - sha256 = "0i436sxh5093zy03v6rjf6r0ydjmkmfj5fkxqk2qjjps2gc6jwsn"; } - { url = root + "kqnpk.nbw.emd"; - sha256 = "0yf7il0maiw8c9gam9cvnjgvywjk5k3pjvmgcy377yf31hgi209g"; } - { url = root + "kqpk.nbb.emd"; - sha256 = "11vl1p9qwqsdbxdppqg3n73868kd69kqhl6h6q1p47a4dq9lqldy"; } - { url = root + "kqpk.nbw.emd"; - sha256 = "02ik15sm3mdhyn76rnx8jvg7fma1m7njm55h6mqqqgqgbji0zzvi"; } - { url = root + "kqpkb.nbb.emd"; - sha256 = "0s7k9dh87s6msmqpv43csax632i5w5gzc2s4ijiy38kg0d3cgz31"; } - { url = root + "kqpkb.nbw.emd"; - sha256 = "115y0gshq2g6p6mfclxag1lvba3pz2rlyw8b6d5rykkapm299yvb"; } - { url = root + "kqpkn.nbb.emd"; - sha256 = "1i3wx9c7dk1sdig6kv4h3pa2m9ir1gd6qz7jyan9q18wvrpag12l"; } - { url = root + "kqpkn.nbw.emd"; - sha256 = "0iqxrgr1x2k3mfvhgckz9dya92wj8vddpv746gz86yi6n05wp373"; } - { url = root + "kqpkp.nbb.emd"; - sha256 = "0ifxixayrfhdp3yq04h55kjcgbly4390ghrhpvllc3mf6yrcg3sh"; } - { url = root + "kqpkp.nbw.emd"; - sha256 = "1hf8b4lvci0lm4skvxsw83c521q2x1i7yij8ih9j8ijyg64fivp8"; } - { url = root + "kqpkq.nbb.emd"; - sha256 = "0vy9ihcl80q2ml7lilgi007d7zx4r9knsyn8f63fqfa8x3m5rs6b"; } - { url = root + "kqpkq.nbw.emd"; - sha256 = "0xqngdyq8anfz1xqyg24nvwds7k7027j1l5pjwl22x0ipi7hda98"; } - { url = root + "kqpkr.nbb.emd"; - sha256 = "1c3xbrvsmyjz0ydc3xpw5hcxky20742d2jqwf7rrx5q223y11mlv"; } - { url = root + "kqpkr.nbw.emd"; - sha256 = "0fsi0d0czwvi2az56v2a4r0k78drybyqdda264gqjs53j65h02bp"; } - { url = root + "kqppk.nbb.emd"; - sha256 = "0995h6li6ixljxfs4xxy1bvmzj589h675bg8pkhbrmvimhja2nrf"; } - { url = root + "kqppk.nbw.emd"; - sha256 = "18hh8080s90qdacy6svhymfs4nw27x0p0s8km8p090rwk5si860a"; } - { url = root + "kqqbk.nbb.emd"; - sha256 = "15n425kcfjypwbxj1ck9v4rzd24lmd36kczhsi1cp2y6955vz9vp"; } - { url = root + "kqqbk.nbw.emd"; - sha256 = "1mjkgcblgsga7vib0410mdcjqh3dkc3xq8nx17p1hapinj987w8s"; } - { url = root + "kqqk.nbb.emd"; - sha256 = "0ihmqjiqycybci4zczrdv4c3a1bdz7l2qln0g43rbzwbkjsplykx"; } - { url = root + "kqqk.nbw.emd"; - sha256 = "0m0359yb17azb8s482i63fvqqy1b9idgklrj82rpbidasz41gj0m"; } - { url = root + "kqqkb.nbb.emd"; - sha256 = "0b9hm4pw01dal7lazb1qakjbgg5wg3nrn2bdjmkabfjgbrnh4hbm"; } - { url = root + "kqqkb.nbw.emd"; - sha256 = "1msk54xzbn41rhlyx9qkragihmg7yw2r5jc97lkvb7d8lwg6s59r"; } - { url = root + "kqqkn.nbb.emd"; - sha256 = "18d8nc25h33gd1qr6jmsbka3qmd8xjb2q1545959x6b4ch93cbsy"; } - { url = root + "kqqkn.nbw.emd"; - sha256 = "0i2mzllfklvv8bw0g6rjjrjkw71mvn8hsvqg6m7hhdq8lg5ajhyp"; } - { url = root + "kqqkp.nbb.emd"; - sha256 = "14y51vjw0r605pbjz0gvhc0x2w14ijxn3nilvpd5sdcnfh79kaax"; } - { url = root + "kqqkp.nbw.emd"; - sha256 = "11m1034gb608czhzrrj3fgpixq4rlvr92bzv7ga5r8wypwwycbdp"; } - { url = root + "kqqkq.nbb.emd"; - sha256 = "1cxyavw61qqpy15vrq51a0sjsd2lhya60cf33nnh9vb370amwqj9"; } - { url = root + "kqqkq.nbw.emd"; - sha256 = "1lrv2757bivjs9bsyh7ghj53halg3jz29xhnx7xhjrf48rpv6nxw"; } - { url = root + "kqqkr.nbb.emd"; - sha256 = "1m2r0myc2piqn4pcd3b9ngivrjg1j5viwsi9740dlb730dbvkzna"; } - { url = root + "kqqkr.nbw.emd"; - sha256 = "1767n2993dw5akbd3h6w570nbs5bncd8qid1dhgzfs9yxxzjplns"; } - { url = root + "kqqnk.nbb.emd"; - sha256 = "047950dbkh0mzpfb1klm51lmqzx1d90w6j7r4z8mc1nw4knh5cpp"; } - { url = root + "kqqnk.nbw.emd"; - sha256 = "0yd35ra0s0qckqymzi634bxp127arbrqzyj3s3xww82qsn6lbm07"; } - { url = root + "kqqpk.nbb.emd"; - sha256 = "08wbdhpa8vna39i226hg71r8a7ydp2vd2gh5prskr39vqj0k5pa3"; } - { url = root + "kqqpk.nbw.emd"; - sha256 = "1vyd4pvb8mhbdkm85njnqxg755biw0y68ylxfbnar8wna4dl27ds"; } - { url = root + "kqqqk.nbb.emd"; - sha256 = "0l0ichgik395z90h37zj6x4kcxpf0121zw57s8s0y51iwz61ikg9"; } - { url = root + "kqqqk.nbw.emd"; - sha256 = "0jmkd9n96al6sggva1kmdax8vxqprai9hhkxxvsk35wivcp8akk8"; } - { url = root + "kqqrk.nbb.emd"; - sha256 = "02wahvwixy5l3q9h57ayr2mxqs79zg8m2qh8cv3mms39csa9axzh"; } - { url = root + "kqqrk.nbw.emd"; - sha256 = "05rypafy4lgb53x8zx2qlvdrjm91aqr61hc7iwlpfikqqcbiksiw"; } - { url = root + "kqrbk.nbb.emd"; - sha256 = "0bk77dvdg5qx86rss0q9v8zl079g85p7snfgjpr30jpfv2z0a6p6"; } - { url = root + "kqrbk.nbw.emd"; - sha256 = "0mgamh4fqr6g063ic5qapdjng6jw35f82f0wjq8j9gv5w83s0vqs"; } - { url = root + "kqrk.nbb.emd"; - sha256 = "0vsadlphh4b6cgs4pizw44nfw4lhpq65dws44fc9z74sf32q0ibr"; } - { url = root + "kqrk.nbw.emd"; - sha256 = "1qq8jqzqzkcarhnc7ad6xp3s2f8r4crrxgj0ajciz2pkyc98xdh6"; } - { url = root + "kqrkb.nbb.emd"; - sha256 = "0bxmkjmqx7gjdaz78d31sbk7v67crx24dpbhswfg6b3xkhi8cy3f"; } - { url = root + "kqrkb.nbw.emd"; - sha256 = "0hhz4yxrcwvvc4b36ixlh3g8gdm4krhvip80xazcy538dwl26b29"; } - { url = root + "kqrkn.nbb.emd"; - sha256 = "13h7qa2zy9akdrvrwl7wmlpncgljjamc7asa9vpd76bi5mp0wrap"; } - { url = root + "kqrkn.nbw.emd"; - sha256 = "0ihcp5wh61cgq439nh5rn3qqhpyjl5h4xz9ayyma298fm2xw7w89"; } - { url = root + "kqrkp.nbb.emd"; - sha256 = "1wjrcrjgq1gj0jqbw0mi8ah79qv80zp921bzjxsx9vjm35hdbbhl"; } - { url = root + "kqrkp.nbw.emd"; - sha256 = "0qwc76wyy60vicxyxx80gm6f40fw3izs6xndhhkfh86cj7sjl3l5"; } - { url = root + "kqrkq.nbb.emd"; - sha256 = "0drzfjrm6mh8q1vb36ycvfsipp6z4ij4a200zxypaxaimnxssq3x"; } - { url = root + "kqrkq.nbw.emd"; - sha256 = "0n12rixcd2k3bgm00k2z9cnlzx1av5y62r8adnx6h2grlgcyd26j"; } - { url = root + "kqrkr.nbb.emd"; - sha256 = "0zvzx89gp4saggjb062nafy3xncv01fmbymsmnlswmq80xdkcn4d"; } - { url = root + "kqrkr.nbw.emd"; - sha256 = "0by6f36850d4fdraqj8rqv7ryaplqxlmkm00prm0pcmlb3y5czc7"; } - { url = root + "kqrnk.nbb.emd"; - sha256 = "0z5599ci1n7qgpn3inch8zc3ciyy1b5gjbix78k3b5ig4ra2idv6"; } - { url = root + "kqrnk.nbw.emd"; - sha256 = "18a5bm0rlh4wf5im54acq0w0l6lnjjk4dxaxcph67q4smfbfacv3"; } - { url = root + "kqrpk.nbb.emd"; - sha256 = "10rbm2j3rz04jv0s70aink3y7h303zvnf29b9pim8b8pv23pwvy3"; } - { url = root + "kqrpk.nbw.emd"; - sha256 = "1jqvxfj3fnm456livvfbp3v750mm86js2qb7va5nq9wilif13chb"; } - { url = root + "kqrrk.nbb.emd"; - sha256 = "0h2g8v9i6ic2fmjgzwh1hcwaka2m8n8l28nvbbkq3447hrwl8sba"; } - { url = root + "kqrrk.nbw.emd"; - sha256 = "137iicxbws20rv93b5qas6dpk5a7qj18rcbj632117hkiw3ddjly"; } - { url = root + "krbbk.nbb.emd"; - sha256 = "1i0yjbvkrqz4m61qk6flz88zsb3nwskj6rrn3bz4fzv63m0yhcpk"; } - { url = root + "krbbk.nbw.emd"; - sha256 = "00rna709hpxw06sg5cnzn9xzgn2pib4n5yyffjz638sgivgh62k4"; } - { url = root + "krbk.nbb.emd"; - sha256 = "1xq45jiwg96084jm0qkacjmxl86v0mp1nrr6k85dpn99bmyzx5xw"; } - { url = root + "krbk.nbw.emd"; - sha256 = "0jnxrpwad8cpl6yp31bs5g0h89jjr8061lj69n8wdmmwhvjafvk0"; } - { url = root + "krbkb.nbb.emd"; - sha256 = "0gdwy9q7xf35fpb78g02jn07d969p7zzhnn4asbk5y3fmix209l2"; } - { url = root + "krbkb.nbw.emd"; - sha256 = "0kryfbjli1l05nqarz96q6fnviwzgjvmbljbmapirw40ma68nx4r"; } - { url = root + "krbkn.nbb.emd"; - sha256 = "01fll6vvqiyxpmn6qmwhrzd7f3j3irpbdvc2jn2hqzjdmsr0kz59"; } - { url = root + "krbkn.nbw.emd"; - sha256 = "13yipfw7v5w2hcgmnml3ka1rq1g5djcf81nkanrlmrkqaksxbc0m"; } - { url = root + "krbkp.nbb.emd"; - sha256 = "1bpa5x4zm9nap62hf3iiyzzwcp0fsh5bww0sdnvlzaclw9mbc1g8"; } - { url = root + "krbkp.nbw.emd"; - sha256 = "0y157ai66amm5lryigc7nizj79mfbcny925qqcsgbi8l2yhl7hk1"; } - { url = root + "krbkq.nbb.emd"; - sha256 = "199gckvazpsv1f3jkfxw9p3hyfshpvqm2i9wqjgzlm69dckbbj4x"; } - { url = root + "krbkq.nbw.emd"; - sha256 = "1m72pzaxlrppwpaqgdcxcjr9n5cnyxs8p0kxybgkl17vfvpc5jmw"; } - { url = root + "krbkr.nbb.emd"; - sha256 = "04wpcfq3y4nx1q57vina4z75lv3mrzljfzw5s73s5m0fhfq54i9v"; } - { url = root + "krbkr.nbw.emd"; - sha256 = "1wii5h5cyxxxgjp53ap43v0wnpj7amxyd8kg9bxsamcfz3wj1v70"; } - { url = root + "krbnk.nbb.emd"; - sha256 = "0s2jrbyjn4d2kik7ic4i1d4w6yx2841cdwb7lalpw3jf74ag2cv4"; } - { url = root + "krbnk.nbw.emd"; - sha256 = "1py0lnsahky21dvk5kdcfgbrca1cks7ihjslpvins91l58yzldh9"; } - { url = root + "krbpk.nbb.emd"; - sha256 = "1v3j61j125i9hbmqm11ay2ng65djq55mwxfr5v8173whqjk9cjc5"; } - { url = root + "krbpk.nbw.emd"; - sha256 = "1zvinpcr9mzm6jgicq6y6jfl6dsd7pyn648bfayszfgndyr2b125"; } - { url = root + "krk.nbb.emd"; - sha256 = "042qliismf63y6vims4bg31lj1w9r2y45p32frqxgk79hvb567yv"; } - { url = root + "krk.nbw.emd"; - sha256 = "1fam4n038dg4g1nc1zn55lyjagv4j4lkbq28rhiaz7mhj3z4r3zz"; } - { url = root + "krkb.nbb.emd"; - sha256 = "0y44rbly8ggzjg2i5vhxibia551ii28dnpyzls3b74a6078zy0wy"; } - { url = root + "krkb.nbw.emd"; - sha256 = "12bqs411yhv6k0b2jhil1l7hpk4cj3i8x0bcj168jnmikzhprvgq"; } - { url = root + "krkn.nbb.emd"; - sha256 = "1wcghsgr9g09pbyhak1hyxw3rvfis6zplc3zgzx3qphp69rivk3k"; } - { url = root + "krkn.nbw.emd"; - sha256 = "1jkwz4kjl91kxxascg21zj6c6qgx9s0k91jjbic6ybsmpv4wj4qc"; } - { url = root + "krkp.nbb.emd"; - sha256 = "1jmaansnxspb7x2ka8y44vssgk78wfcrmdczj60zyzg1bj3n5fl8"; } - { url = root + "krkp.nbw.emd"; - sha256 = "14yi4fsax0w9sd5bv463ajs6r4q0wxj3n19np9anc1zfvb3yk846"; } - { url = root + "krkr.nbb.emd"; - sha256 = "12y29sgqhxcvilg089766nn14scy8b0dxmla1isjmgq9qb4yi9vy"; } - { url = root + "krkr.nbw.emd"; - sha256 = "12y29sgqhxcvilg089766nn14scy8b0dxmla1isjmgq9qb4yi9vy"; } - { url = root + "krnk.nbb.emd"; - sha256 = "0gvm4y8p5a9769nqhgnx6xj6nlldgrh75k3z8c8hj2xd9cyj01pp"; } - { url = root + "krnk.nbw.emd"; - sha256 = "0p7j4x0xdq5krsvmj44qkcaqmww7rplrjdr08ix3jyjf31kk2x13"; } - { url = root + "krnkb.nbb.emd"; - sha256 = "0w9gybr4i7d8zjpbbyg1m4263bx2gpmnh91vd0xmpwi0ykrxrl57"; } - { url = root + "krnkb.nbw.emd"; - sha256 = "19wp8swng0q2wzxwx89km5fqlqfb4vcamky9h7pvas2sgh8frfmq"; } - { url = root + "krnkn.nbb.emd"; - sha256 = "0g3b48symag31lcgbimpmmqsqdmihsr6g9k5a15l0mfkisfwadlf"; } - { url = root + "krnkn.nbw.emd"; - sha256 = "1vryhaw1aj4bhv2ghb10zxyx930s2f4xqg7v9cxfnr9q5w2qv7xh"; } - { url = root + "krnkp.nbb.emd"; - sha256 = "13b8vahj7hj4f12kiaigx1nphdrf8z30j68zav9n617kpf5s35i0"; } - { url = root + "krnkp.nbw.emd"; - sha256 = "1qcnjwkg0pxp1hq4xws9dgq4bx6pxn0am3mcj1n837qcmv46mf7c"; } - { url = root + "krnkq.nbb.emd"; - sha256 = "150d9z4v6fk16sdxq1w96gl2pl9nsf0jimy8kdgc8a19i1ab1rjc"; } - { url = root + "krnkq.nbw.emd"; - sha256 = "13dn9hgk4i26axwymv0gvdkl0zr5shggvm5lpwa15gigmrva73bh"; } - { url = root + "krnkr.nbb.emd"; - sha256 = "14ja7chmg7aklg6swlc3lpik4akj8zv3x2qppsip0vi3j05lnqyv"; } - { url = root + "krnkr.nbw.emd"; - sha256 = "04qxh0kzk2p7m5zdrzg0faqva91qals4njnwf4vgfr65lmd4hyfn"; } - { url = root + "krnnk.nbb.emd"; - sha256 = "1f35pqprkf1clx0mzzkgx9mn8ncqdiyc2cbxcp5a4x1kzli7zp34"; } - { url = root + "krnnk.nbw.emd"; - sha256 = "16y28mqjl7fbl8rlwv51bn17sx0fpvfi0izyq1f5043l7fmpshfr"; } - { url = root + "krnpk.nbb.emd"; - sha256 = "097rmr9zb550qn41kn11c15qp8l5582wqncg5li46iq9mfxcskiw"; } - { url = root + "krnpk.nbw.emd"; - sha256 = "0hj3bhqvgdd64qa47irwx08nz4fqxhm0ddmpjq0jb757wlqw5f05"; } - { url = root + "krpk.nbb.emd"; - sha256 = "1qz218amn2ii66g2fr2ifq6csr0n5n9ip9jcjxkxgpmawiwjhcm1"; } - { url = root + "krpk.nbw.emd"; - sha256 = "19vh7k73gjyjwqzdpf0pv2i7zrqb2ns6a6r3n4jgwwd2n35inr1i"; } - { url = root + "krpkb.nbb.emd"; - sha256 = "1y6kknnkb0ikk7az6syc3drhp4v3avpffa5pghpr2pm6i8xzx3nm"; } - { url = root + "krpkb.nbw.emd"; - sha256 = "0fnbyhgjlnrnddkpbbyabyg31nmi61w9ra8ylicv6ysgyn4bcps4"; } - { url = root + "krpkn.nbb.emd"; - sha256 = "08cn0pa6y1hxq7clgj70hdxm13a6zi9c8z2mmf3qgsjjkrj2wgc5"; } - { url = root + "krpkn.nbw.emd"; - sha256 = "16ybnwl7sf832z546igrwclahhymp734dcg6rhrakxabrv0y144z"; } - { url = root + "krpkp.nbb.emd"; - sha256 = "125qzj83kc5y5rx6jn078pjj6lph1gslmglx24n5n399382kllkn"; } - { url = root + "krpkp.nbw.emd"; - sha256 = "1kbahpn99r37syb1yypabw55g4diwbp6q99nr6f6rn19wp0b44mk"; } - { url = root + "krpkq.nbb.emd"; - sha256 = "1wsxy8ycz8l6wn6c58w4n0gdsdb8lik6b046q132qjw8mnn07gv1"; } - { url = root + "krpkq.nbw.emd"; - sha256 = "0l8sg8sv6yy2wsrg7p9j2w5s61sd3jak09z1i347k0g0190m77m8"; } - { url = root + "krpkr.nbb.emd"; - sha256 = "1mv4jcgkilsw3d4m879r2cwslz71v0rg5hwk9r6lhpg22qam3kz1"; } - { url = root + "krpkr.nbw.emd"; - sha256 = "1nj906wq21h9xfzihc3wcp9s2bwgy7c68j4a6vlxq3zy1c8k53yx"; } - { url = root + "krppk.nbb.emd"; - sha256 = "0x63qm3zwp70y3a33s29bv7lhg1vjnvi4gkxxgh6s0590y7s8pj4"; } - { url = root + "krppk.nbw.emd"; - sha256 = "1z4nhf2gygbdgk6j3bdxhllx154ajkrrz3j0y715r20m0fxfl6x8"; } - { url = root + "krrbk.nbb.emd"; - sha256 = "0gxam25i89sqmmmd781yyk2k2zyj76l9w9hngqkzagiz0fhh9ycz"; } - { url = root + "krrbk.nbw.emd"; - sha256 = "1v7rfv5b4wjsgfy21fi3xyxbfj76mvkxhfz52612p4rnzp78bb56"; } - { url = root + "krrk.nbb.emd"; - sha256 = "0ms9cjndxiflssymcx7aakf6bjwb5043nz5i4jvix89wvp6lgfa1"; } - { url = root + "krrk.nbw.emd"; - sha256 = "18bh2y3v2ak6j1q1rlnkp02vijbbqr69i4cg1pvj943c83xz18l3"; } - { url = root + "krrkb.nbb.emd"; - sha256 = "0hdr8v5bgybma3sdl8mk0v3msjvdva89zs1wd52m6jbdgwb5hzca"; } - { url = root + "krrkb.nbw.emd"; - sha256 = "1g8bkyzq585az5rrglxd71ydj2fhhgqzdfmkgihbi7ncjym9kpw7"; } - { url = root + "krrkn.nbb.emd"; - sha256 = "0bz8np2sqj8viwszx4jj9wxj774kv548pjzrmc6xh11p0sfjx3rj"; } - { url = root + "krrkn.nbw.emd"; - sha256 = "1qf4d6zlvwlgrq0f732wafpznkqd3qnf7na4bgd4p1pb105ickg4"; } - { url = root + "krrkp.nbb.emd"; - sha256 = "1kw434r77f61b5agly6lqkvn4b1rwssd511lcv16mvvf56xlqnb4"; } - { url = root + "krrkp.nbw.emd"; - sha256 = "1yzqpp01gckk25zjy8j820y37m4vj6rgc6zpphwll45rn1ahwk0p"; } - { url = root + "krrkq.nbb.emd"; - sha256 = "1ynhjzzmjpd6yw0d2w5xhlms3sqjc8gksfqgq3wmx7ym23wya2qq"; } - { url = root + "krrkq.nbw.emd"; - sha256 = "01wil4pbcnrqynj1xpkglk2r36b36cz9gjr2g76rrz5xhdy5q8vj"; } - { url = root + "krrkr.nbb.emd"; - sha256 = "0iyqadmpddy9i330nv1qrsjfkk2vlkxfxjphx3q349lplq6a9s16"; } - { url = root + "krrkr.nbw.emd"; - sha256 = "1fg4byzzmjlzz8hs2vhpysmf8py9ylkf5pdw3rv88dxr4cp1wciq"; } - { url = root + "krrnk.nbb.emd"; - sha256 = "1jb8rq7sy28c9wr7yih8w5bi8jbcf4xzf8sccanz32qxp0159f0h"; } - { url = root + "krrnk.nbw.emd"; - sha256 = "17g7l0szgqczykjgxdhpihs5hh2snc35cy3hggnvah3j8bv6ksb4"; } - { url = root + "krrpk.nbb.emd"; - sha256 = "1q7vk3pawab9nbpdn3cw2kf205yx6lznr6gkd9qbjj3754s9zswh"; } - { url = root + "krrpk.nbw.emd"; - sha256 = "0wl23j0a67mm01655p4ivjrlsacvm7lxglhrg6cni61qkdqr6vqz"; } - { url = root + "krrrk.nbb.emd"; - sha256 = "1ggm5q38wc65rkp87n5d2l71kcl7nqjkvwa31hmlagq2735vd0gd"; } - { url = root + "krrrk.nbw.emd"; - sha256 = "1h7psv25a4wajg6ggk2q0cllf5mng4qjas3yi9nvi7kc766p85ax"; } - ]); - - patches = [ ./strcpy.patch ./malloc.patch ]; - buildInputs = [ unzip ]; - buildPhase = - if stdenv.isDarwin - then "make darwin" - else if stdenv.isLinux - then "make linux-amd64" - else "make"; + unpackPhase = '' + mkdir "craftysrc" + unzip $src -d craftysrc + gunzip -c $startPgn > "craftysrc/start.pgn" + ''; + + buildPhase = '' + cd craftysrc + make unix-gcc + ''; installPhase = '' + BUILDDIR="$PWD" mkdir -p $out/bin cp -p ./crafty $out/bin mkdir -p $out/share/crafty cd $out/share/crafty - $out/bin/crafty "books create ${startPgn} 60" + $out/bin/crafty "books create $BUILDDIR/start.pgn 60" rm -f *.001 - ${if fullVariant then '' - unzip ${enormousPgn} - $out/bin/crafty "book create enormous.pgn 60" - rm -f *.001 enormous.pgn - - mkdir -p $out/share/crafty/TB - ${stdenv.lib.fold - (tb: acc: acc + "\nln -s " - + toString tb - + " $out/share/crafty/TB/`echo " - + toString tb - + " | sed 's/.*-//'`") - "" - tableBases345} - '' - else '' - cp -p ${bookBin} $out/share/crafty/book.bin - ''} + cp -p ${bookBin} $out/share/crafty/book.bin mv $out/bin/crafty $out/bin/.crafty-wrapped + cat - > $out/bin/crafty < - #include - #if !defined(IPHONE) --# include -+# include - #endif - #include - #if !defined(TYPES_INCLUDED) diff --git a/pkgs/games/crafty/strcpy.patch b/pkgs/games/crafty/strcpy.patch deleted file mode 100644 index d4d424d23da..00000000000 --- a/pkgs/games/crafty/strcpy.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/utility.c -+++ b/utility.c -@@ -2144,7 +2144,7 @@ int ReadPGN(FILE * input, int option) { - char *skip; - - strcpy(temp, input_buffer); -- skip = strstr(input_buffer, buffer) + strlen(buffer); -+ skip = strstr(temp, buffer) + strlen(buffer); - if (skip) - strcpy(input_buffer, skip); - } -@@ -2241,7 +2241,7 @@ int ReadPGN(FILE * input, int option) { - } - } - strcpy(temp, input_buffer); -- skip = strstr(input_buffer, buffer) + strlen(buffer); -+ skip = strstr(temp, buffer) + strlen(buffer); - strcpy(input_buffer, skip); - } else { - int skip; - diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 7915822589c..bed3abccf9b 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, pkgconfig, gtk }: +{ stdenv, fetchurl, perl, pkgconfig, gtk2 }: stdenv.mkDerivation { name = "eboard-1.1.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { patches = [ ./eboard.patch ]; - buildInputs = [ gtk ]; + buildInputs = [ gtk2 ]; nativeBuildInputs = [ perl pkgconfig ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 69d87411da6..519b7c2ac24 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, flac, gtk, libvorbis, libvpx, makeDesktopItem, mesa, nasm +{ stdenv, fetchurl, flac, gtk2, libvorbis, libvpx, makeDesktopItem, mesa, nasm , pkgconfig, SDL2, SDL2_mixer }: let @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { sha256 = "1nlq5jbglg00c1z1vsyl627fh0mqfxvk5qyxav5vzla2b4svik2v"; }; - buildInputs = [ flac gtk libvorbis libvpx mesa SDL2 SDL2_mixer ] + buildInputs = [ flac gtk2 libvorbis libvpx mesa SDL2 SDL2_mixer ] ++ stdenv.lib.optional (stdenv.system == "i686-linux") nasm; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index f9ff7a5ae0c..7091b900b7e 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -7,10 +7,6 @@ stdenv.mkDerivation rec { sha256 = "0jq8q0agw7lgab9q2h8wcaakvg913l9j3a6ss0hn9661plkw2yb4"; }; - cmakeFlags = '' - -DCMAKE_BUILD_TYPE=Release - ''; - buildInputs = [ stdenv cmake mesa SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index bb6cffdb122..fe01667f531 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -10,7 +10,7 @@ assert releaseType == "alpha" || releaseType == "headless"; with stdenv.lib; let - version = "0.13.13"; + version = "0.13.20"; isHeadless = releaseType == "headless"; arch = if stdenv.system == "x86_64-linux" then { @@ -27,12 +27,12 @@ let url = "https://www.factorio.com/get-download/${version}/${releaseType}/${arch.inUrl}"; name = "factorio_${releaseType}_${arch.inTar}-${version}.tar.gz"; x64 = { - headless = fetchurl { inherit name url; sha256 = "1ip0h2kh16s07nk6xqpm0i0yb0x32zn306414j15gqg3j0j0mzpn"; }; - alpha = authenticatedFetch { inherit url; sha256 = "1hvj51cggp6cbxyndbl4z07kadzxxk3diiqkkv0jm9s0nrwvq9zr"; }; + headless = fetchurl { inherit name url; sha256 = "0nf1sxcgnbx52iwx7jgkjxass10lzz1iyskvgk0gq3ky9cg4ixfb"; }; + alpha = authenticatedFetch { inherit url; sha256 = "0rgjdxdcqf9m3ghzr076q3xi1g01ix14jldjwn6jgnvggzqkph9l"; }; }; i386 = { headless = abort "Factorio 32-bit headless binaries are not available for download."; - alpha = authenticatedFetch { inherit url; sha256 = "14dwlakn7z8jziy0hgm3nskr7chp7753z1dakxlymz9h5653cx8b"; }; + alpha = authenticatedFetch { inherit url; sha256 = "0hda2z1q22xanl328kic5q09ck59mr3aa5cy4dbjv86s4dx9kxfq"; }; }; }; @@ -114,6 +114,7 @@ let wrapProgram $out/bin/factorio \ --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \ --run "$out/share/factorio/update-config.sh" \ + --argv0 "" \ --add-flags "-c \$HOME/.factorio/config.cfg ${optionalString (mods != []) "--mod-directory=${modDir}"}" # TODO Currently, every time a mod is changed/added/removed using the diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index af785d0e4a9..b5619644bd8 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, zlib, bzip2, pkgconfig, curl, lzma, gettext , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth -, gtkClient ? false, gtk +, gtkClient ? false, gtk2 , server ? true, readline }: let @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ zlib bzip2 curl lzma gettext ] ++ optionals sdlClient [ SDL SDL_mixer SDL_image SDL_ttf SDL_gfx freetype fluidsynth ] - ++ optionals gtkClient [ gtk ] + ++ optionals gtkClient [ gtk2 ] ++ optional server readline; configureFlags = [] diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix index f6f52aabb6b..4269d3a74db 100644 --- a/pkgs/games/fsg/default.nix +++ b/pkgs/games/fsg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: +{ stdenv, fetchurl, gtk2, glib, pkgconfig, mesa, wxGTK, libX11, xproto }: stdenv.mkDerivation { name = "fsg-4.4"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; - buildInputs = [ gtk glib pkgconfig mesa wxGTK libX11 xproto ]; + buildInputs = [ gtk2 glib pkgconfig mesa wxGTK libX11 xproto ]; preBuild = '' sed -e ' diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index b3b56c03fa3..9aee664a50e 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -3,10 +3,10 @@ let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.2"; + version="6.2.3"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="1a41ag03q66pwy3pjrmbxxjpzi9fcaiiaiywd7m9v25mxqac2xkp"; + sha256="10hvnfhj9bkpz80x20jgxyqvgvrcgfdp8sfcbcrf1dgjn9v936bq"; }; buildInputs = [ flex diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix deleted file mode 100644 index 1c8f0334bf1..00000000000 --- a/pkgs/games/gsb/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ stdenv, config, requireFile -, curl3, SDL, SDL_image, libpng12, libjpeg62, libvorbis, libogg, openal, mesa -, libX11, libXext, libXft, fontconfig, zlib }: - -assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; - -stdenv.mkDerivation rec { - name = "gsb-1.56.0"; - - goBuyItNow = '' - We cannot download the full version automatically, as you require a license. - Once you bought a license, you need to add your downloaded version to the nix store. - You can do this by using "nix-prefetch-url file://gsb1324679796.tar.gz" in the - directory where you saved it. - ''; - - src = requireFile { - message = goBuyItNow; - name = "gsb1324679796.tar.gz"; - sha256 = "12jsz9v55w9zxwiz4kbm6phkv60q3c2kyv5imsls13385pzwcs8i"; - }; - - arch = if stdenv.system == "i686-linux" then "x86" else "x86_64"; - - phases = "unpackPhase installPhase"; - - # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [ SDL SDL_image libjpeg62 libpng12 mesa ] - + ":" + stdenv.lib.makeLibraryPath [ curl3 openal libvorbis libogg ] - + ":" + stdenv.lib.makeLibraryPath [ libX11 libXext libXft fontconfig zlib ] - + ":" + stdenv.cc.cc + "/lib64"; - - installPhase = '' - mkdir -p $out/libexec/positech/GSB/ - mkdir -p $out/bin - - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $libPath \ - ./GSB.bin.$arch - - cp -r * $out/libexec/positech/GSB/ - rm -rf $out/libexec/positech/GSB/lib64/ - rm -rf $out/libexec/positech/GSB/lib/ - - #makeWrapper doesn't do cd. :( - - cat > $out/bin/GSB << EOF - #!/bin/sh - cd $out/libexec/positech/GSB - exec ./GSB.bin.$arch - EOF - chmod +x $out/bin/GSB - ''; - - meta = with stdenv.lib; { - description = "Gratuitous Space Battles"; - longDescription = '' - a strategy / management / simulation game that does away with all the - base building and delays and gets straight to the meat and potatoes of - science-fiction games : The big space battles fought by huge spaceships with - tons of laser beams and things going 'zap!', 'ka-boom!' and 'ka-pow!'. In GSB - you put your ships together from modular components, arrange them into fleets, - give your ships orders of engagement and then hope they emerge victorious from - battle (or at least blow to bits in aesthetically pleasing ways). - ''; - homepage = http://www.positech.co.uk/gratuitousspacebattles/index.html; - license = licenses.unfree; - maintainers = with maintainers; [ jcumming ]; - platforms = [ "x86_64-linux" "i686-linux" ] ; - broken = true; - }; - -} diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix index a294128969c..57103bb9101 100644 --- a/pkgs/games/micropolis/default.nix +++ b/pkgs/games/micropolis/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation { cp -R $d $out/usr/share/games/micropolis done cp Micropolis $out/usr/share/games/micropolis - cat > $out/bin/micropolis << EOF - #!/bin/bash + cat > $out/bin/micropolis << EOF + #!${stdenv.shell} cd $out/usr/share/games/micropolis ./Micropolis EOF diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index abc19adf72a..ab2cd1090fb 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -7,10 +7,6 @@ stdenv.mkDerivation rec { sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a"; }; - cmakeFlags = '' - -DCMAKE_BUILD_TYPE=Release - ''; - buildInputs = [ cmake pkgconfig SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix new file mode 100644 index 00000000000..91b9b6fbb6d --- /dev/null +++ b/pkgs/games/openclonk/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, cmake, gnome3, pcre, freetype, glew, gtk3, libjpeg, libpng, + SDL, SDL_mixer, libupnp, xorg, pkgconfig, gtest, tinyxml, gmock, readline, + libxkbcommon, epoxy, at_spi2_core, dbus, libxml2, + enableSoundtrack ? false # Enable the "Open Clonk Soundtrack - Explorers Journey" by David Oerther +}: + +let + soundtrack_src = fetchurl { + url = "http://www.openclonk.org/download/Music.ocg"; + sha256 = "1ckj0dlpp5zsnkbb5qxxfxpkiq76jj2fgj91fyf3ll7n0gbwcgw5"; + }; +in stdenv.mkDerivation rec { + version = "7.0"; + name = "openclonk-${version}"; + + src = fetchurl { + url = "http://www.openclonk.org/builds/release/7.0/openclonk-${version}-src.tar.bz2"; + sha256 = "0ch71dqaaalg744pc1gvg6sj2yp2kgvy2m4yh6l7ljkpf8fj66mw"; + }; + + postInstall = '' + mv -v $out/games/openclonk $out/bin/ + '' + stdenv.lib.optionalString enableSoundtrack '' + cp -v ${soundtrack_src} $out/share/games/openclonk/Music.ocg + ''; + + enableParallelBuilding = true; + + buildInputs = [ + cmake gnome3.gtksourceview pcre freetype glew gtk3 libjpeg libpng SDL + SDL_mixer libupnp tinyxml xorg.libpthreadstubs libxkbcommon xorg.libXdmcp + pkgconfig gtest gmock readline epoxy at_spi2_core dbus libxml2 + ]; + + meta = with stdenv.lib; { + description = "Free multiplayer action game in which you control clonks, small but witty and nimble humanoid beings"; + homepage = "http://openclonk.org"; + license = if enableSoundtrack then licenses.unfreeRedistributable else licenses.isc; + platforms = platforms.all; + }; +} diff --git a/pkgs/games/openmw/default.nix b/pkgs/games/openmw/default.nix index 18e13b8be94..f9be01aa928 100644 --- a/pkgs/games/openmw/default.nix +++ b/pkgs/games/openmw/default.nix @@ -2,11 +2,7 @@ , giflib, libXt, pkgconfig }: let - openscenegraph_ = openscenegraph.override { - inherit ffmpeg giflib; - withApps = false; - }; - openscenegraph__ = openscenegraph_.overrideDerivation (self: { + openscenegraph_ = openscenegraph.overrideDerivation (self: { src = fetchFromGitHub { owner = "OpenMW"; repo = "osg"; @@ -15,19 +11,19 @@ let }; }); in stdenv.mkDerivation rec { - version = "0.39.0"; + version = "0.40.0"; name = "openmw-${version}"; src = fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; rev = name; - sha256 = "0haz8p0hwzgpj634q34if6x57rkc3zsndry5pz4a25m23sn1i72y"; + sha256 = "0mqd4gpwvczwqfkw5zvnw7cl1nzv9lkiqq2yc2a0qasaby8qv94w"; }; enableParallelBuilding = true; - buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph__ SDL2 unshield openal pkgconfig libXt ]; + buildInputs = [ cmake boost ffmpeg qt4 bullet mygui openscenegraph_ SDL2 unshield openal pkgconfig libXt ]; meta = with stdenv.lib; { description = "An unofficial open source engine reimplementation of the game Morrowind"; diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 143fa21ce2e..0438b687a1b 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -23,11 +23,14 @@ stdenv.mkDerivation rec { sed '1i#include ' -i Sources/Draw/SWFeatureLevel.h ''; - nativeBuildInputs = + nativeBuildInputs = [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] ++ lib.optional withOpenal openal; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; + cmakeFlags = [ + "-DOPENSPADES_INSTALL_BINARY=bin" + "-DOPENSPADES_RESOURCES=NO" + ]; enableParallelBuilding = true; diff --git a/pkgs/games/openspades/git.nix b/pkgs/games/openspades/git.nix index 7d76573f734..9e3d4ac5b64 100644 --- a/pkgs/games/openspades/git.nix +++ b/pkgs/games/openspades/git.nix @@ -16,12 +16,15 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include ' -i Sources/Client/{,Client}Player.cpp"; - nativeBuildInputs = + nativeBuildInputs = with stdenv.lib; [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ] ++ lib.optional withOpenal openal; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" "-DOPENSPADES_RESOURCES=NO" ]; + cmakeFlags = [ + "-DOPENSPADES_INSTALL_BINARY=bin" + "-DOPENSPADES_RESOURCES=NO" + ]; #enableParallelBuilding = true; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index c40337d54f5..0c129f8d556 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ SDL libpng xz zlib freetype fontconfig ] - ++ stdenv.lib.optional withFluidSynth [ fluidsynth soundfont-fluid ]; + ++ stdenv.lib.optionals withFluidSynth [ fluidsynth soundfont-fluid ]; prefixKey = "--prefix-dir="; diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index c435bbe5887..c91f9807581 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,21 +1,20 @@ -{stdenv, fetchhg, fetchurl, unzip, SDL, SDL_net}: +{stdenv, fetchurl, fetchzip, SDL, SDL_net}: stdenv.mkDerivation rec { name = "opentyrian-${version}"; - version = "0.0.955"; + version = "2.1.20130907"; - src = fetchhg { - url = "https://opentyrian.googlecode.com/hg/"; - rev = "13ef8ce47362"; - md5 = "95c8f9e7ff3d4207f1c692c7cec6c9b0"; + src = fetchurl { + url = "https://bitbucket.org/opentyrian/opentyrian/get/${version}.tar.gz"; + sha256 = "1jnrkq616pc4dhlbd4n30d65vmn25q84w6jfv9383l9q20cqf2ph"; }; - data = fetchurl { + data = fetchzip { url = http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip; - md5 = "2a3b206a6de25ed4b771af073f8ca904"; + sha256 = "1biz6hf6s7qrwn8ky0g6p8w7yg715w7yklpn6258bkks1s15hpdb"; }; - buildInputs = [SDL SDL_net unzip]; + buildInputs = [SDL SDL_net]; patchPhase = " substituteInPlace src/file.c --replace /usr/share $out/share @@ -25,12 +24,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp ./opentyrian $out/bin mkdir -p $out/share/opentyrian/data - unzip -j $data -d $out/share/opentyrian/data + cp -r $data/* $out/share/opentyrian/data "; meta = { description = ''Open source port of the game "Tyrian"''; - homepage = https://opentyrian.googlecode.com/; + homepage = https://bitbucket.org/opentyrian/opentyrian; # This does not account of Tyrian data. # license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/games/pioneers/default.nix b/pkgs/games/pioneers/default.nix index 3f1735c31aa..254b65cc4d9 100644 --- a/pkgs/games/pioneers/default.nix +++ b/pkgs/games/pioneers/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gtk, pkgconfig, intltool } : +{stdenv, fetchurl, gtk2, pkgconfig, intltool } : stdenv.mkDerivation rec { name = "pioneers-0.12.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { sha256 = "1yqypk5wmia8fqyrg9mn9xw6yfd0fpkxj1355csw1hgx8mh44y1d"; }; - buildInputs = [ gtk pkgconfig intltool ]; + buildInputs = [ gtk2 pkgconfig intltool ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 5e5da9497e5..bd7e1188928 100644 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -1,4 +1,4 @@ -{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk, glib, udev, alsaLib, atk +{ stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk , nspr, fontconfig, cairo, pango, nss, freetype, gnome3, gdk_pixbuf, curl, systemd, xorg }: # TODO: use dynamic attributes once Nix 1.7 is out @@ -34,9 +34,9 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" for f in $out/lib/*; do patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index 2eb3a916eb3..ca1721e8ed5 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, - gtk, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, + gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, libXmu, mesa, openal, pixman, pkgconfig, python27Full, SDL }: stdenv.mkDerivation { @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; buildInputs = - [ boost cmake ffmpeg freeglut glib gtk libjpeg libpng + [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal pixman pkgconfig python27Full SDL ]; diff --git a/pkgs/games/quake3/wrapper/builder.sh b/pkgs/games/quake3/wrapper/builder.sh deleted file mode 100644 index d5115baa7e6..00000000000 --- a/pkgs/games/quake3/wrapper/builder.sh +++ /dev/null @@ -1,18 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/baseq3 -for i in $paks; do - if test -d "$i/baseq3"; then - ln -s "$i/baseq3"/* $out/baseq3/ - fi -done - -# We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback -# software rendering. GCC is needed so that libgcc_s.so can be found -# when Mesa is used. -makeWrapper $game/ioquake3.* $out/bin/quake3 \ - --suffix-each LD_LIBRARY_PATH ':' "$mesa/lib $gcc/lib" \ - --add-flags "+set fs_basepath $out +set r_allowSoftwareGL 1" - -makeWrapper $game/ioq3ded.* $out/bin/quake3-server \ - --add-flags "+set fs_basepath $out" diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index ae0387ad290..5f65d26140c 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,22 +1,33 @@ -{ stdenv, fetchurl, mesa, ioquake3, makeWrapper }: +{ stdenv, buildEnv, lib, fetchurl, mesa_noglu, ioquake3, makeWrapper }: { paks, name ? (stdenv.lib.head paks).name, description ? "" }: -stdenv.mkDerivation { +let + libPath = lib.makeLibraryPath [ mesa_noglu stdenv.cc.cc ]; + env = buildEnv { + name = "quake3-env"; + paths = [ ioquake3 ] ++ paks; + }; + +in stdenv.mkDerivation { name = "${name}-${ioquake3.name}"; - builder = ./builder.sh; - nativeBuildInputs = [ makeWrapper ]; - - inherit paks mesa; - game = ioquake3; + buildCommand = '' + mkdir -p $out/bin - gcc = stdenv.cc.cc; + # We add Mesa to the end of $LD_LIBRARY_PATH to provide fallback + # software rendering. GCC is needed so that libgcc_s.so can be found + # when Mesa is used. + makeWrapper ${env}/ioquake3.* $out/bin/quake3 \ + --suffix-each LD_LIBRARY_PATH ':' "${libPath}" \ + --add-flags "+set fs_basepath ${env} +set r_allowSoftwareGL 1" + + makeWrapper ${env}/ioq3ded.* $out/bin/quake3-server \ + --add-flags "+set fs_basepath ${env}" + ''; - preferLocalBuild = true; - meta = { inherit description; }; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index 36c40f9bec5..e96cf5e5932 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] - ++ optional openglSupport [ mesa ]; + ++ optional openglSupport mesa; - configureFlags="--enable-all-engines"; + configureFlags = [ "--enable-all-engines" ]; meta = { description = "Interpreter for LucasArts' Lua-based 3D adventure games"; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index c4477ab01d9..ac658ee1367 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,5 +1,5 @@ { fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, mesa, boost, - pkgconfig, libuuid, openal, ogre, ois, curl, gtk, pixman, mygui, unzip, + pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost pkgconfig - libuuid openal ogre ois curl gtk mygui unzip angelscript + libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; meta = { diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix index 78b9e155642..6ba91feced8 100644 --- a/pkgs/games/spring/springlobby.nix +++ b/pkgs/games/spring/springlobby.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, wxGTK30, openal, pkgconfig, curl, libtorrentRasterbar -, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk, doxygen, spring +, libpng, libX11, gettext, bash, gawk, boost, libnotify, gtk2, doxygen, spring , makeWrapper, glib, minizip, alure, pcre, jsoncpp }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake wxGTK30 openal pkgconfig curl gettext libtorrentRasterbar pcre jsoncpp - boost libpng libX11 libnotify gtk doxygen makeWrapper glib minizip alure + boost libpng libX11 libnotify gtk2 doxygen makeWrapper glib minizip alure ]; patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed diff --git a/pkgs/games/steam/build-runtime.py b/pkgs/games/steam/build-runtime.py index 3f23d53b984..e0ff5cebd93 100644 --- a/pkgs/games/steam/build-runtime.py +++ b/pkgs/games/steam/build-runtime.py @@ -20,19 +20,11 @@ def parse_args(): return parser.parse_args() -def install_deb (basename, deb, md5, dest_dir): +def install_deb (basename, deb, dest_dir): installtag_dir=os.path.join(dest_dir, "installed") if not os.access(installtag_dir, os.W_OK): os.makedirs(installtag_dir) - # - # Write the tag file and checksum to the 'installed' subdirectory - # - with open(os.path.join(installtag_dir,basename),"w") as f: - subprocess.check_call(['dpkg-deb', '-c', deb], stdout=f) - with open(os.path.join(installtag_dir,basename+".md5"),"w") as f: - f.write("%s %s.deb\n" % (md5, basename)) - # # Unpack the package into the dest_dir # @@ -98,7 +90,7 @@ print ("Creating Steam Runtime in %s" % args.runtime) with open(args.input) as pkgfile: pkgs = json.load(pkgfile) for pkg in pkgs: - install_deb(pkg["name"], pkg["source"], pkg["md5"], args.runtime) + install_deb(pkg["name"], pkg["source"], args.runtime) fix_debuglinks() fix_symlinks() diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 9a766455055..8c86371ecab 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -51,6 +51,7 @@ in buildFHSUserEnv rec { gst_all_1.gstreamer gst_all_1.gst-plugins-ugly libdrm + mono (steamPackages.steam-runtime-wrapped.override { inherit nativeOnly runtimeOnly newStdcpp; diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 260b7a9b8d8..694274053bf 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -5,1747 +5,1747 @@ amd64 = [ rec { name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64"; - md5 = "cbbb1118a27ed0dfb126a109d1d265b3"; + sha256 = "03yfjxzsyf14zqwxb43piyh78xxap7yxh5f4gx649qv28h7ygfrm"; url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { name = "freeglut3_2.6.0-1ubuntu3+srt4_amd64"; - md5 = "c54e97c2023e1d1d5df16eb2c426c0be"; + sha256 = "1wi5fad0f7nqps55isvbb42njqssbhyzmd38q8413afjyhmm6icc"; url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "freeglut3.deb"; }; } rec { name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64"; - md5 = "1c719a43eb7fa0745eabcea972b0c473"; + sha256 = "1za8f7wkwcww4wacydqq3fvi5p1ivgcr2n3npirqir1gr25cbxaj"; url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { name = "gtk2-engines_2.20.2-1ubuntu1+srt4_amd64"; - md5 = "3870b0a51a7614f28bc40e3e58d39a9c"; + sha256 = "03y4239swznwlgdx6yc58sj6w5irqq7432hxcmcw8608m3w0m29h"; url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines.deb"; }; } rec { name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64"; - md5 = "607f89071971116adf22fe989408a395"; + sha256 = "1iwmgzkdxjvr2q2kz5bjz64r4qjqbcf6ynz3sy5y81dl254pjnmh"; url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - md5 = "ea6e6b0f99808a2cc8135036824bcfca"; + sha256 = "0md5vjz8wnayppcxkl5x7874w2z4w7pjz96gprv24hid4azmyci8"; url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { name = "libacl1_2.2.51-5ubuntu1+srt6_amd64"; - md5 = "5a11378ebba911b6e139c1dc3fee7990"; + sha256 = "02xwrfzspf58j9lr6b128jq1klkvd4b69lrclpqzwm9cqddg6mr5"; url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libacl1.deb"; }; } rec { name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64"; - md5 = "2ab7433f1e12be2d35c3916e2530b969"; + sha256 = "08m1w5mhzl613gbjg6lvf7wcm7bs00xddaaci8f1944icl8pdibb"; url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libappindicator1.deb"; }; } rec { name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "aaf2e682393b856d25619d05c44c2108"; + sha256 = "0m69ar6w3lzsggn79lyc3614p9rr2dy29vwqvl4w3gmshp6aqhs4"; url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64"; - md5 = "9e32b15b95be699bc9270dac78fd384c"; + sha256 = "1bh911nx5a2abn38h9sa90ji358r6is2n7ymm10v94yibdf63rwg"; url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2.deb"; }; } rec { name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64"; - md5 = "82b9f608c4e02ae70542466690ddb904"; + sha256 = "1l36hxgnml9pglrihm17vkgqp3jpqslicg1mpycixzz9cpgfyxbz"; url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { name = "libasyncns0_0.8-4+srt4_amd64"; - md5 = "f318986e6b639fd680117e27e60ab497"; + sha256 = "154bh8mpslr4xwf54h1xds4v2yjf8rbyvv1lc0azl9gnkan1y0an"; url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasyncns0.deb"; }; } rec { name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64"; - md5 = "36b951c9e4bb13126bd12f4a895c77ce"; + sha256 = "0kky7mfkx38lj4gafrv886z0vbf17xnpymq6qas59x8f35bzx742"; url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { name = "libattr1_2.4.46-5ubuntu1+srt4_amd64"; - md5 = "4bfcd91866196506d53c114d81b5bf90"; + sha256 = "11hn8q45pddm4khq0qp1qj19c1syfawscnvrl6cv1xmahpb3nm3i"; url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libattr1.deb"; }; } rec { name = "libavahi-client3_0.6.30-5ubuntu2+srt4_amd64"; - md5 = "e2f370e89883d69abdf4cae6151bb22d"; + sha256 = "0yrgvh80i1gpcq2w64hkqnmiymgrn7r2v67wyd1iijc2zyb4x0c3"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-client3.deb"; }; } rec { name = "libavahi-common3_0.6.30-5ubuntu2+srt4_amd64"; - md5 = "154923fce5cea989b98ca1c11fe35196"; + sha256 = "1r1rqpqdqmqxn3g1iifc77jgrhfkr5275s7d5h3p1hvkmlzyvwd2"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-common3.deb"; }; } rec { name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "6d9d47d9695b5ece354c5a6cbcde905d"; + sha256 = "09fwqr29dxhxkkf1gd9f9sph2jgv0qx3p7k6qxxwq3bg4lh2971n"; url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavcodec53.deb"; }; } rec { name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "f5d71b18f095842d8f881e3362d031ac"; + sha256 = "0fynn6g6mc4raj144hg9r7qbiz7b2s4p7aidjpy34xkbxcn2vq45"; url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavfilter2.deb"; }; } rec { name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "88181968144020fb0fbf90ae740456d8"; + sha256 = "0qdfr19xfxwab9q5w4bvwgv873cs8zgm4s10hwg6741xr6qifnhg"; url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavformat53.deb"; }; } rec { name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "790046586a22c706ab561ad5f3c94ac6"; + sha256 = "0pfgxnrf1jjlb7gvwklwn7m61n591yfzqfzzqb76gyr20r6v6dzw"; url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavutil51.deb"; }; } rec { name = "libbz2-1.0_1.0.6-1+srt4_amd64"; - md5 = "9e9dc9f5739feb34dbabc4e471317a5a"; + sha256 = "13rsp2cyayvnh2755kjbs6g6j85rdpl6cwlx22b97hid5pq5nk60"; url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { name = "libcairo2_1.10.2-6.1ubuntu3+srt4_amd64"; - md5 = "a474e80d3f221776d59084f2ac60ef00"; + sha256 = "0iv16gfc1b8n4p088jbask9i8i56agip8dd5b1r22r52hg28gi9y"; url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcairo2.deb"; }; } rec { name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "18a66b67dce65dad49c374965e0921f0"; + sha256 = "19gl25hjzxw375qqbckmgfr14qd48zaccnny4zbddlz8aj5w4wig"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "2b756be54454a87929c5d3a724297496"; + sha256 = "1kgq90l6rafqk7zfxafvzkh8msys5mlc95qr3rcv6l0f03w785dy"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64"; - md5 = "bc12bbc912b3d71dc8c6340e9f43136c"; + sha256 = "01x6y4gq1ivpdywglx418gr4m56qvm05nicmavwimnafxga3c5sk"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra0.deb"; }; } rec { name = "libcap2_2.22-1ubuntu3+srt4_amd64"; - md5 = "d8264c1c6f71865f4357d7f59062098f"; + sha256 = "1rhfhq1n45fq40p6c2aipkica2dw8w95w7bsdrxfby48gdppgzy7"; url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcap2.deb"; }; } rec { name = "libcg_3.0.0016-0ubuntu1+srt4_amd64"; - md5 = "c0c923294f11ba74f0ef566e1effb4e6"; + sha256 = "0yifiwr2hc7rvvd6snf530gma05v2qpiyl652drdc9rvcfjrj9zi"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcg.deb"; }; } rec { name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64"; - md5 = "12cd8bbe50da1b698d5280c8cd1efe38"; + sha256 = "1cll5iwdply1lz211j83n22aidsxfx2jvy09a02qa79a7g1qv6c3"; url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcomerr2.deb"; }; } rec { name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64"; - md5 = "bf3f1fd3fb7376ac8a4de5837d0b24a3"; + sha256 = "1xaxim0df5713hj4kq141rnf51zvyhvpv015q4q41c3nh4d9bz7w"; url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcups2.deb"; }; } rec { name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - md5 = "12acf5241daf7ff86e9dc23c64a2f71b"; + sha256 = "0vwdpkiisnbrm1j22qzjj2g5vsiv4wdja3j34j16pc30088f4c3i"; url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3.deb"; }; } rec { name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64"; - md5 = "0fddfa641103922bdc38ec71c61ba681"; + sha256 = "0rvrjcxpmnbq42aq6x31gxxglwiccm059r2q78hqiw82i86b7j28"; url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64"; - md5 = "5082143b56f4d6a72c21244c4b7bc653"; + sha256 = "1nkzsi04m1icwb3b1nky15d0frnc0hpfsyrm3xx1hriv02iqwgvw"; url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64"; - md5 = "28cf6b803847aa977ce557f479f52846"; + sha256 = "19xnslykd4y22ff5mfs2rg4rjppmcrmrbwynzx4v2rvxckvvq77f"; url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64"; - md5 = "85833a32196fb585db2bbb65fdd28c1d"; + sha256 = "1x1szx7m6y6i0d6ahffnrdhs693rk4wi4hrhbmmn2g1sizr9qhmb"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64"; - md5 = "ee79e60c712f7139a305d929c51974e1"; + sha256 = "0nrydq0mjjsx1v9gk78j5xcgdaay5dhxn5rj9ydkbkw7ih4xm2m1"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { name = "libexif12_0.6.20-2ubuntu0.1+srt4_amd64"; - md5 = "6234ec87a59fb9a534e53efb3978347a"; + sha256 = "09pjkyjykvsmddx20ji4wgr5gnqbshj1hpm77129ini9qp61wxig"; url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexif12.deb"; }; } rec { name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64"; - md5 = "a7148db45279001346cebc02a7d7c1af"; + sha256 = "0axky1v55yalkng9mn22ignmapv100gkcfb0xs82pllzaws32yhb"; url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexpat1.deb"; }; } rec { name = "libffi6_3.0.11~rc1-5+srt4_amd64"; - md5 = "522cb933493dd7ad25b35381325579aa"; + sha256 = "1brqpwjbf6dd6crvs32b7q73m11anlq1s1r1m0p5cv17sc89q3q4"; url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libffi6.deb"; }; } rec { name = "libflac8_1.2.1-6+srt4_amd64"; - md5 = "87dcbc179e3d5ba43629b3d3045d9253"; + sha256 = "1sdbbm4gdq0mw103z3nwhywvix1z21gdq6lc5xf4s12zpj1zq2gc"; url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libflac8.deb"; }; } rec { name = "libfltk1.1_1.1.10-10+srt4_amd64"; - md5 = "4d89126341f2e70a7a248e20dc024240"; + sha256 = "0x5xxxkkj7g5wyhxl1rv846irn3r8hh744fqyn8hgmbp4mdgils0"; url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfltk1.1.deb"; }; } rec { name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64"; - md5 = "d90eb7f1c85b5c1c256e87ae0f840986"; + sha256 = "0mcdd9x8dc153sk2dqixxy4rxvl9hvc7dz0msfwiywrgbilzfbl4"; url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfontconfig1.deb"; }; } rec { name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64"; - md5 = "06f7ccb54bba06c1e2673471866039a0"; + sha256 = "08x0fg01qbycdwdgqj3xal0fi676pnkkgsk0kbvxfg3i4ln944l1"; url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfreetype6.deb"; }; } rec { name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "a16aa8ab25b2d926085b686bdccfd31d"; + sha256 = "05pg02l16fj7fdv8gkx95jy4j4cikqwmdkyq65a8qf20in3qs04m"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcc1.deb"; }; } rec { name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64"; - md5 = "54e9d0b216e195c52491aa6714262abc"; + sha256 = "0mmgmnzyi9rlk7k6ir3f127brml366bbk7v5aq75y90z6qdp5h62"; url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64"; - md5 = "502feac74b4fdda9c2b4a12efd15c82e"; + sha256 = "0qpxrm37js3pgi8hwcfqyqgkipypb0gw6nvsbz5dd112hmnpkp37"; url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcrypt11.deb"; }; } rec { name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64"; - md5 = "6becfe1861ebea500d23273acece2eb7"; + sha256 = "00kq05jzlrvd4gx8pz54k1i8sm9v8l07vih4if6wanr45ifsjqlp"; url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { name = "libglew1.10_1.10.0-3+srt4_amd64"; - md5 = "f61ea5e775178ce123d40198c1157b9f"; + sha256 = "0ybry9jiyp0bgfm9b0bznf5qllyf7jc6avd8rcc20ai7yf719mwc"; url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.10.deb"; }; } rec { name = "libglew1.6_1.6.0-4+srt4_amd64"; - md5 = "bdff67db0a4d67674896f13bbc6effd3"; + sha256 = "1y4ywi4lp5df3nasxz8p5rmybl2vbv8bbww1s8alin5waidl7qav"; url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.6.deb"; }; } rec { name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64"; - md5 = "a1a4af8a6ecf974bfdac345319a2e953"; + sha256 = "1imdb4wyy7qndg8xmlrfnj0x3a6fg7dv0izn2rajp5q77ivry51v"; url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64"; - md5 = "170edcba12461120395cfae26db8ef39"; + sha256 = "1bgks33ck18asizisa5d7wj4wsv8hxccpshl0f2ihdvs6qgxgs76"; url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64"; - md5 = "ddae75bcd90b6e11cde2071ccb05799d"; + sha256 = "1la9938zrqrf8v4bcn5063xxxwwankhzh69m0sy8csixfg480c1a"; url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgmp10.deb"; }; } rec { name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64"; - md5 = "5393d7b8c652fcdb4bc7b0063e7bc595"; + sha256 = "1zrrprip93m9r2c7zd54pz8f5jvdgb0jir6ifvqbl60d521lfbl7"; url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgnutls26.deb"; }; } rec { name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "0a2b96a562ddf2e2e8018ee42fc44697"; + sha256 = "094y3af19hg7s0hklh9slhmb19h2hhbfl4fpfpqcvbagkh6gwxl1"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgomp1.deb"; }; } rec { name = "libgpg-error0_1.10-2ubuntu1+srt4_amd64"; - md5 = "2732fe5e798a8355f1f42ce803144b5e"; + sha256 = "0zw0zrl50y86y292zjcgpxiqjwyw0krnrmi28qvb0ba2ahp18f7v"; url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgpg-error0.deb"; }; } rec { name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "68cc7194070bc391898a2ac64f60238d"; + sha256 = "1mmd16fh58gnyyjwg9ac1br0xia670xc0ag65bfgxwnpfnkr7nyj"; url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "aec9eef24bdbf46a564a8c3a2e5e9996"; + sha256 = "063k09yyr9mn0lacp29cgwagpiix220p7ahs5shpyigkjk5bp174"; url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64"; - md5 = "d7d638c9706de787b067b90538f5d161"; + sha256 = "0r60n1xym2alg4jr1icgzvd8x614p7vky0zxfvn8x9qd2hzr8k5q"; url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64"; - md5 = "5b1d88d1613f8a15dbcf4721006a928e"; + sha256 = "0xynq7jgb0x8npb6apj58ag5zccl0gh4npyrfvs0ys4hzlv2fkmm"; url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64"; - md5 = "3967c473e9250f043ce694f0f0881b95"; + sha256 = "0zbsr09xam3sl5qpnl34hgiir98g3rcfg2nblzwp8yr9kkrsb7zk"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - md5 = "5a2f731bdac2bd089780af2f63635f7b"; + sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64"; - md5 = "042f301b15c2213e918332b827ed876e"; + sha256 = "1bv962vi9x8m41ss6g73q91xlxhf1pd733wsywflllkxa5qyabpl"; url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "c714f66ed7629e5ea8da89b301314dbf"; + sha256 = "1s67jx924c06arhf18dpqncphlih26a7frshzd4ndwzp8xp87xyc"; url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "adc4837d7e7a8bb59d1eff8dc009a787"; + sha256 = "0zchyajpd78rflfh4md3i0cvzd0gbkwf6l8kqcyavvib42mmdga8"; url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "c9832147e9399447d25db46b932009d5"; + sha256 = "0lz83zkg4f1rjhf0sigk09s4kbksm9j2lalf7k04bci1sxs2wj2y"; url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "ec9e8fc0b860a9e67a75965a684a1b10"; + sha256 = "0bcn57af9g4psxfiqqfsmfv7z3a713z86760lspgl63xfxlsm4d5"; url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { name = "libice6_1.0.7-2build1+srt4_amd64"; - md5 = "165e91c5ea7d2268e54c4483d6bfee21"; + sha256 = "0lygkw0my7diasqyw7m5a0rfcpp38pb8jq7iqks195j21sy95h0s"; url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libice6.deb"; }; } rec { name = "libidn11_1.23-2+steamrt1+srt4_amd64"; - md5 = "6039786cec09e8196f0344a0eaba4b35"; + sha256 = "0530ygdsq840kmqm1mlqk19a7wxpvwgrbary2dpflzqvclx4gfr1"; url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libidn11.deb"; }; } rec { name = "libindicator7_0.5.0-0ubuntu1+srt4_amd64"; - md5 = "e50b84332411dfe83f3cdb280a340659"; + sha256 = "0j89i9hgdh93a6m71ji3rrhlnyanjb7dbxy460shn38v4f3ax735"; url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libindicator7.deb"; }; } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64"; - md5 = "9e2fbb98f0a36c193b7de2e0aedf504c"; + sha256 = "0l7h8z8fx0pqkbdh5x3v6azz6ddxdlzchgs97h5babrknkfkiar4"; url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64"; - md5 = "214eaa463aeef6e881231c3bd902fb97"; + sha256 = "0z2df70v2ggw2la3yr4ll926wj6pc84li1x2bxwz9ysw7xsgalg0"; url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { name = "libjpeg62_6b1-2ubuntu1.1+srt4_amd64"; - md5 = "fc7df95d832fea01fa6ec6134518f785"; + sha256 = "0n6qsfk42nhwvg8r9win7a90zvb31ba7cp7jvbbc4bhv7ygxxm7f"; url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg62.deb"; }; } rec { name = "libjson0_0.9-1ubuntu1.1+srt2_amd64"; - md5 = "9181b67bd4b26368f29922a872998ad6"; + sha256 = "10r817kzxcviqvrajmi33pdbqss1qxpkmjxda7cclamnnawbcd17"; url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjson0.deb"; }; } rec { name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "14a85bce181c6fe78bd00c156bd71033"; + sha256 = "1xsl1nwsm6r1gjfkl7x71h8p9qkq7gi624277cj3k68b31qh3g4z"; url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libk5crypto3.deb"; }; } rec { name = "libkeyutils1_1.5.2-2+srt4_amd64"; - md5 = "cc6a001e351c3e4e0ece1f59c92fe9a9"; + sha256 = "0khwz7jqw9yq157r675sjii3bqk2i66dh6wn43b7vhh0wjz6nbdc"; url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkeyutils1.deb"; }; } rec { name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "6de94826e9407f5ebf3880ba4306e287"; + sha256 = "0lfhwqsxpzaapz71rldi2zhsxkdy55krcmfbli06qs4mqx9mf691"; url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "39ce748ff830b7e01f93e12e3829c90e"; + sha256 = "0aqwf07c818apd5md4gxwzx67xvbvv8s6fm890vibqhsrmymi621"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-3.deb"; }; } rec { name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64"; - md5 = "dda5082adc17603046892b6c9a6f8d96"; + sha256 = "04wacj307jcy8ykyq6w3xw9phmprmfz6cpwv1wyfarxf4gr7nyii"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5support0.deb"; }; } rec { name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64"; - md5 = "6aa3befa823b58e2ef17137c6ce4ed26"; + sha256 = "12kva7qrghlj65khzcmj6xqszij9186ly0iwjjqjs5xl5821aic4"; url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liblcms2-2.deb"; }; } rec { name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "736acf677d1bc728947297ae33d8d53c"; + sha256 = "1xnhh3s2cm4vjny964bsznnk2a6zj9n8ygkxfyrraib3wy61lidv"; url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { name = "libltdl7_2.4.2-1ubuntu1+srt4_amd64"; - md5 = "eeb2a0afa5eb25eb240a7a5aac1fc6eb"; + sha256 = "069s7km994c2z89jndwwrpspq0z7jyxr56ma057hbrilfpp4r7yd"; url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libltdl7.deb"; }; } rec { name = "libmikmod2_3.1.12-2+srt4_amd64"; - md5 = "aaf3c4e2d1c733dc9847d1b4b160faba"; + sha256 = "11flm0w3vwf66yi9mqf43ma3bc6jwg6xcz71h4a3jgqahsg3skfb"; url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libmikmod2.deb"; }; } rec { name = "libncurses5_5.9-4+srt4_amd64"; - md5 = "a1e80e9cb80e7de986ce7730ae0e27d9"; + sha256 = "08wb0y9dizj7ngsivl2rpikjfl246q1jib6r0nqg7c6r05h8k46m"; url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncurses5.deb"; }; } rec { name = "libncursesw5_5.9-4+srt4_amd64"; - md5 = "69f8d641d346520d794ed925961df35c"; + sha256 = "1gv0w7jrx9zd59zg7z38qzlcp48h7yyfj4jrbfsifl54ryn4fgwh"; url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncursesw5.deb"; }; } rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "f227e6607d7b84cbe99e3eaf7fa726c8"; + sha256 = "0f3h1hh4vn0ysr099lgwk8dx3462cpvmz3ig8r6d4vhxyzyh5a9z"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-glib4.deb"; }; } rec { name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64"; - md5 = "da911ace3dc8956ae2d776a9de38491c"; + sha256 = "1dlfym38qs8m3g38z776vvpxg77xx2mjab7qipsc0lnppjn8gnss"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-util2.deb"; }; } rec { name = "libnotify4_0.7.5-1+srt4_amd64"; - md5 = "d75b12a9714d3e5bf5513e43cfecb9e1"; + sha256 = "1d61w65qxs93hpn4a8awzhjqcv7yva96n65309630axsm48cqxbd"; url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnotify4.deb"; }; } rec { name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64"; - md5 = "189258c833f8ddf0eb22fe26ad3fa3b9"; + sha256 = "1k08330f3fhr7c6bpm4b5qdyc2kkmz8fa5bgk1a8psxqvfdlsyap"; url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnspr4.deb"; }; } rec { name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64"; - md5 = "9e73637724364e1e0f95df26ccee054a"; + sha256 = "1bxg7wk179gwi7s4xrn1bkl2amnbqrf11qsdw384cyq9c2hwfagr"; url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnss3.deb"; }; } rec { name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64"; - md5 = "bf9932f2354ee1026d636d3cb7026b05"; + sha256 = "0829hivgxzmhck0l16lg16qbphkhsrnqb2px4ksrzbspmg6b5rb1"; url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libogg0.deb"; }; } rec { name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64"; - md5 = "286033d0e031389e350644f2979f7b62"; + sha256 = "08gj208gfh37lfnxz1xksbmm1g78ax812z0rk12ahl4w72jm1yjy"; url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libopenal1.deb"; }; } rec { name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64"; - md5 = "838a5f35acfc6e454954ed9ae776ef7d"; + sha256 = "0pgiha65y3rrqm095vmwc27498drqcgadiqyh4zyq2h2zi2ki60j"; url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { name = "libp11-kit0_0.12-2ubuntu1+srt4_amd64"; - md5 = "5834045994d6e316a68568a01257bed9"; + sha256 = "1hsncmfp6h3ca5w2bhaxbr6y2ck8fpzp0zhjijgfnyaqvsjc6wwa"; url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libp11-kit0.deb"; }; } rec { name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64"; - md5 = "6f81b9ab5fa21dd99eae337be3ed546e"; + sha256 = "16hwn8a30ydarlw3rvpda48m0z0k5y1qw5vdg6syjaqcbwx15mll"; url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { name = "libpci3_3.1.8-2ubuntu5+srt4_amd64"; - md5 = "6ebc019119624fb5f776d9829ee49478"; + sha256 = "041hxfsk0r7rh02h16igcr0141gmci4ljadljcxsa1yiyn41b4rr"; url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpci3.deb"; }; } rec { name = "libpcre3_8.12-4+srt4_amd64"; - md5 = "134666c4e50fb2422a12018f061dc2ce"; + sha256 = "1m53qvhqbicybi43zjjblhaqxfnlvq1m61mkvdhwskcxh1y5zpic"; url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcre3.deb"; }; } rec { name = "libpcrecpp0_8.12-4+srt4_amd64"; - md5 = "f4beb4a2b0d24d1bf3a75f5794580d9a"; + sha256 = "0dv8a32dsvklrnvw66rxb7xim9ylhr9w4qvns527v6fl98rvg08l"; url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64"; - md5 = "52134e1b8190957f069268827f2bde74"; + sha256 = "0bljhrivr6dw181gisvy8dz6y9mjn0g9w3d5s2f5h8772g80mx7f"; url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64"; - md5 = "0e79e11954e9dd12b345de34ae9dda6d"; + sha256 = "00wis5q2xpdfh5z42rfl95j63lbsz5l3i5hvsyvim8r2h1r2nyn0"; url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpng12-0.deb"; }; } rec { name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64"; - md5 = "e5314b3129eda4940896d1cad7701a22"; + sha256 = "150gpmn1gb0ykd3cgggc9zkb070figgwrcdqx89qa2kwvkxlg6vl"; url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpulse0.deb"; }; } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "3cdc654725b6fd08c96eee54041b2ce3"; + sha256 = "07ldw9iyy9akp5zq2h7l85q3x8ggsx2hah51d0j41lfqrysyig63"; url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64"; - md5 = "d5ad690e85842798c27c8afb8c0c9d53"; + sha256 = "0lzgsydisj6z7dgjgkmr42mzv11j61r9wny1m31vgm990p5zkh7n"; url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "librtmp0.deb"; }; } rec { name = "libsamplerate0_0.1.8-4+srt4_amd64"; - md5 = "1680e147372fd0500aa6a27a9a557662"; + sha256 = "1g6nh8p3q8bsqw9w0ifpl86gql9lqqwxk7zn9bl62pq393h107mg"; url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsamplerate0.deb"; }; } rec { name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64"; - md5 = "d51e140f457c694957bc476128dfa965"; + sha256 = "0sp76gcpw1zgqpyq7bp3gmavlncflkrxiyg738nsf9mb65xy4v94"; url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsasl2-2.deb"; }; } rec { name = "libsdl-image1.2_1.2.10-3+srt4_amd64"; - md5 = "965cbe12d8b1b31eae47d0eb9651c72c"; + sha256 = "0jhlbn5jfap15d8nr2fz2hcwlv32ax29gddd5jg08vmfga767sqi"; url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64"; - md5 = "b60fff841525e6097f0bd3f9e224e8a1"; + sha256 = "0cb84d0x3fjsl3w48jmxjzc7xq9c6g73p99baxdg50vhqssr7dmw"; url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64"; - md5 = "30bd93bf4d524594021b8b3f9b35eb2c"; + sha256 = "1dqp16qi413xpv8nmyrbgx2x3dcxsyk2giifz7pa6jyvawcx7ghv"; url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64"; - md5 = "ea14d71381e1d55c59b5790f37531900"; + sha256 = "1zcy3njzkahd5rq4yh7i07q3x1wyfpzl6kzynbsqkx9cnf53342k"; url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { name = "libsdl2_2.0.4+steamrt2+srt1_amd64"; - md5 = "b648fbaea74b0d76b020c6abb78b46ce"; + sha256 = "04v4znqksg9qj4hnz20czwx4qy4i6p9csqql4yd299wvjl9k61j5"; url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2.deb"; }; } rec { name = "libsdl2-image_2.0.1+steamrt2+srt1_amd64"; - md5 = "7a16e55edbcc24311753260947eb2574"; + sha256 = "01kwm3yjq275j7hnd52hfjbhj5ijfz5wxmc1vpdp88q89zbkw227"; url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-image.deb"; }; } rec { name = "libsdl2-mixer_2.0.1+steamrt1+srt1_amd64"; - md5 = "00c0fceba317e355e52353f1b453419c"; + sha256 = "0bzv3spjksn504ma7haywyi3dlb5nl35wxp83if9n58i4850j6sd"; url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { name = "libsdl2-net_2.0.1+srt1_amd64"; - md5 = "9544e9d02e1aacdaaefcae68f57baa44"; + sha256 = "16zx9cj56m939x3zrvq1ypxsd26vnc81gmkpkg5j80jl2lwz6b6v"; url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-net.deb"; }; } rec { name = "libsdl2-ttf_2.0.14+srt1_amd64"; - md5 = "7bdbbba9e9150b8596a28afb4c49dd13"; + sha256 = "14sfnmb0zz0mhvl3jl45jqc2sci59gmzdn5kif08ai8ri2bk9sza"; url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { name = "libselinux1_2.1.0-4.1ubuntu1+srt4_amd64"; - md5 = "cb3455f005e98fd8eb7aa5d4a72e7458"; + sha256 = "1y2a5f9qsxgdhak7vf72jsd6drjim172qp6m897yx7xbbk8ikpnr"; url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libselinux1.deb"; }; } rec { name = "libsm6_1.2.0-2build1+srt4_amd64"; - md5 = "7682f5ffd1f30dc5818b3759be85e21a"; + sha256 = "0fjb9grh86vz58g6cb5d89hxnppqf7w5apivqb3h6sd5axkg2z1r"; url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsm6.deb"; }; } rec { name = "libsndfile1_1.0.25-4+srt4_amd64"; - md5 = "e7a184667cc034127615e7bc15bc050b"; + sha256 = "0fdv7ca60s23qc5azjsg7aaznqksx5xh0bngzc6sl8bqvnnc8z1g"; url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsndfile1.deb"; }; } rec { name = "libspeex1_1.2~rc1-3ubuntu2+srt4_amd64"; - md5 = "95acf2dbab5d8c6d7c0cd4b809025b87"; + sha256 = "1as44g6g5li8q6mdxwnwfbqg9f779vyjh2bqygv5xm339viaj510"; url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeex1.deb"; }; } rec { name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64"; - md5 = "38f8216be0d2b2dfd2850d87c7e306df"; + sha256 = "0rsrl5z379bls6bhb0nqc92ilkd7jkg7bdmxw0xg6vw9l66w78ln"; url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64"; - md5 = "1a9c37c32fa46f7d55a2e384cd6ce5a6"; + sha256 = "1x1byhdvr0zdfl9dj07qpndifbs9x416vxl7rpmig9g0makxvsmx"; url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64"; - md5 = "eabb32b42b50ae68d5a4b2ef0b323c95"; + sha256 = "11n8iwsc562i1glpisjs9xvlmz4a4xibq6axkhi0xnvv0pbfnxiw"; url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64"; - md5 = "c5d4ad341622e56660a5202500af4930"; + sha256 = "0fdmjsyl8a5n14gkwhvkr3xfcfr7q9djapsk8gj56d6r0ydg9yxc"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6.deb"; }; } rec { name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64"; - md5 = "0776afbc253637cb3491d08d65601a7e"; + sha256 = "1yn54vcd5hxx7rxzvshbfidfksl1c0pvl8xv427lkf7xni3jx0xb"; url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64"; - md5 = "0aac40ddee7040acf921dbacc2776bea"; + sha256 = "0y0k0glqnmsq69sbp3s47pw37vvf969n3chniv3jmrjkjghkp44h"; url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libswscale2.deb"; }; } rec { name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64"; - md5 = "6e092ebafe0cf5a49ee9319e2cf6f4fd"; + sha256 = "0kqv3ndnw1lcz5p190bxpq6rglpcxdsz44wyr6yl7w5wpfwcbs61"; url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtasn1-3.deb"; }; } rec { name = "libtbb2_4.0+r233-1+srt4_amd64"; - md5 = "ccd7521c751d0e3596ef200a3363df4b"; + sha256 = "1ngm0nkzk8w5s7dp01983lybd256130kdc8f4jmlyikhvyx0khgh"; url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtbb2.deb"; }; } rec { name = "libtdb1_1.2.9-4+srt4_amd64"; - md5 = "56b46df3ed2af08c54838cbe67c0b937"; + sha256 = "112dq62phrd3czhi27kdk4ra9is5phxpzbn26x4bis4y3ccm0cfm"; url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtdb1.deb"; }; } rec { name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64"; - md5 = "c1381636444b1d35be7898611fbc4150"; + sha256 = "01zvb8msi6pkjs85y4j78a110fzlmnjp69m7z7qwr2r7rr05w6r0"; url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtheora0.deb"; }; } rec { name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64"; - md5 = "7c44d58a6acf73b6c298cfa03e982e0f"; + sha256 = "13j4pqqba0bf2fq0871s8b4wkw8zyv0q80x0n07lkjiv7bvrrkcw"; url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtiff4.deb"; }; } rec { name = "libtinfo5_5.9-4+srt4_amd64"; - md5 = "708d85139b45dc5e93a3ca00990204ab"; + sha256 = "07pp7dgp33yjdk0i3s7q73qq0pd0ylfbpvr5jssjap0wsp3aqq66"; url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtinfo5.deb"; }; } rec { name = "libudev0_175-0ubuntu9.2+srt4_amd64"; - md5 = "89d4fbfa14053514448ecaff1d8cb2c4"; + sha256 = "07jvb8ghflb87f4dvgii5jv5qzz31g9s7c3k8wb9w9jp574y7079"; url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libudev0.deb"; }; } rec { name = "libusb-1.0-0_1.0.19-1+srt1_amd64"; - md5 = "3d2612fa64d30aa01a477e02886f9ea1"; + sha256 = "19f9mhbjm6r4yxdr3fvsn0ad8j7dm07y4bzwqf0n5i715jcc0qaf"; url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { name = "libuuid1_2.20.1-1ubuntu3+srt4_amd64"; - md5 = "0d0a1e7e54df9e10e758ee90e96a8f55"; + sha256 = "060wnsbhxl0aqyh1ymbcdma59v10b1vgi3h3xvvilzl869ivwr1p"; url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libuuid1.deb"; }; } rec { name = "libva-glx1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "21794fa4d2936f13999455ea16575df4"; + sha256 = "1v6n0ryr48d8f25vy06d9vh84z2zf3kmg6k8pg89j0s3spdyb44v"; url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-glx1.deb"; }; } rec { name = "libva-x11-1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "ebf9276cc75fddbc81958aa8e7a2f285"; + sha256 = "03s9kbprf6r48y4ycfixx96ga0n8vfjn7v74sv88kl0lrs8xzjy8"; url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-x11-1.deb"; }; } rec { name = "libva1_1.3.1-3+steamrt4+srt1_amd64"; - md5 = "6d8d1a89d63c536e4ba77cffb9af7df9"; + sha256 = "0700lprd2c636dhqs000amw0nkys77h8mb7698bg30j25yd5kqr4"; url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva1.deb"; }; } rec { name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64"; - md5 = "d31594fc832bfd0bc65c43f2e7f40ac5"; + sha256 = "0a519njbsdwpvc49pn08sya34z2wcd8hpl0j44plr4bd2df010g2"; url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvdpau1.deb"; }; } rec { name = "libvorbis0a_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "6acf08e8df17c93563dae9a381cc26ac"; + sha256 = "1jdvxgvlwnjcvg6009qfklr8mf3678ydrg855smgv8a0nd7v5qiv"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbis0a.deb"; }; } rec { name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "b6a1ab86060a3c4e1963d513ae68376b"; + sha256 = "1ysm1ika8cymh7gmd3p2hdfsnm3jrzyn4g2r12r4m9m6q3l9knz7"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64"; - md5 = "56218bd8b7278303574f6f4bc23fac1a"; + sha256 = "0y4r9s5cjcjxi6hy0svzfbqlkaxklb883vcsqn1j0kp9li3jpkbx"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { name = "libvpx1_1.0.0-1+srt4_amd64"; - md5 = "7ecb41c7e23f1caa6764abed122a2f6b"; + sha256 = "1275437ph91i67q6naigz4nhmw2a330q72mjv282slk7y187ana5"; url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvpx1.deb"; }; } rec { name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64"; - md5 = "4d9ac7966de8160a13817291206b51a4"; + sha256 = "18v5vbrvg6l9m768k4cb4xwbxahqrr7zspx1b5a8fv6bw8h3d9l4"; url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvulkan1.deb"; }; } rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64"; - md5 = "a1e5b4a8f8200feef82dab976f1b4e5d"; + sha256 = "02baqaxcpw306cgr5dvz5pcir7ys08r603m8ahk22bzgxpzl6xk4"; url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { name = "libwrap0_7.6.q-21+srt4_amd64"; - md5 = "52c3a2c8395cbba79e65c3d60a82e1fd"; + sha256 = "12wq77h9jczq974fh3c8n4fkqa876kbizvai96jizh7c90z94kvk"; url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwrap0.deb"; }; } rec { name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - md5 = "22ca2e28aa3f3d70b77632a8772a4a9d"; + sha256 = "0qp2q9q1z9sz0pyc7l1n6xa0bc22xsml3vf2yhdls71im3ks7bi9"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-6.deb"; }; } rec { name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - md5 = "c012bbc8654c3c012dc7b5901c486f4d"; + sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-data.deb"; }; } rec { name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64"; - md5 = "e94af0629e0b59f21c1ccc4f4d4088b5"; + sha256 = "1vsvf6ihz8jbnsarygnfrjb1y7pg44gpk89b8sk449p0c1kmv4yz"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { name = "libxau6_1.0.6-4+srt4_amd64"; - md5 = "a1de8ce9992f09ca56f20ab8327c34a2"; + sha256 = "1bm0jp69kfnirvlsyj7qxf7dg5b1n53875kxr9asdpw4aqmfj3a6"; url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxau6.deb"; }; } rec { name = "libxaw7_1.0.9-3ubuntu1+srt4_amd64"; - md5 = "57942d64120a191d0a1ca3bcb1fb2b8f"; + sha256 = "15r0f6zhjr13pca7mdxfhk0v48923q0kndp23kpxw8rz75nc15s7"; url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxaw7.deb"; }; } rec { name = "libxcb-composite0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ec25a999e0cd681955ef2f9b06161dfe"; + sha256 = "072z8vwk4gmbnyf5acn6y4rjiidk7rvi1k05za1j5hlqzlydb6x9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { name = "libxcb-damage0_1.10-2ubuntu1+srt4_amd64"; - md5 = "a34a6950609570a554e574b086b73c7f"; + sha256 = "1062g911skvvlvxr6ihxkb0inyg6xg1j4m4k5rfqs333rw4npc2i"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - md5 = "d4fd2c66b60ff1db1c87e6884d5ae093"; + sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-doc.deb"; }; } rec { name = "libxcb-dpms0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ba4c437f0ab6f71284dca7d61b0e6df0"; + sha256 = "1xq6zh8val8mc7wcry0jwdx11aagm4af383c6vs2z6a8vz97c6sj"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ea4e1ff16a644f136ae45c7e2b9849c8"; + sha256 = "1kipdyw3wgdywznr5qxbdl85igizc40hwjd3s5f3y5pvd8kprarz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64"; - md5 = "386ba46c8f015d642d9351d690f0a822"; + sha256 = "04bqidf71j55qp2b83bfjm26sa62gslidzhzg81knynlqi8kk00q"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { name = "libxcb-glx0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e2eeda427ea95e90068f4434a926fd25"; + sha256 = "03wndp2gkjw016rl6k4jhkcpbs1njg74flnb0ppk30j7nxnxqcm9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { name = "libxcb-present0_1.10-2ubuntu1+srt4_amd64"; - md5 = "0519bd96e7af25f6acf1a6cd63536d38"; + sha256 = "18f38c275h2y9221mn7x0s8ap5fhlry6rdz34lz0rr3pn83fhpvf"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-present0.deb"; }; } rec { name = "libxcb-randr0_1.10-2ubuntu1+srt4_amd64"; - md5 = "bc24264b0ca68cc209e66f1620aeb232"; + sha256 = "08c7fx2vc35l7s72f2z02j0wh0b728ibn3zf103jc0yri9pgfinz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { name = "libxcb-record0_1.10-2ubuntu1+srt4_amd64"; - md5 = "2ee93429107681f1afddcd932b55710b"; + sha256 = "1ddr52m5x9ah4j313fvq2ira96l13w8dd4qi0z38llarmrhw2p2y"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-record0.deb"; }; } rec { name = "libxcb-render0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ec46d80b43969cffd7aebbef27359897"; + sha256 = "07kyplilgxk0dj9gxk9zdf5l108d8ya9j4j1ji0frn0mk06i45kl"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-render0.deb"; }; } rec { name = "libxcb-res0_1.10-2ubuntu1+srt4_amd64"; - md5 = "74a13db70ec5ab4a0be7ea5afababa8b"; + sha256 = "0pxpgam9xjzf0m6hrqhl0679qa10qk91ami0p7k899b5b1573j6d"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-res0.deb"; }; } rec { name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e20c88e8b39404b5e60841ea24860c48"; + sha256 = "1i09z5nszbh9ikjpviwcixayicbq0v9rdg7gygxhs54zxxjccw8y"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { name = "libxcb-shape0_1.10-2ubuntu1+srt4_amd64"; - md5 = "64773ffa7219574d1356fa2b621d5f4f"; + sha256 = "02c87qhymk8ncywaw7zrs73spl1x1byklnafk2drfw76gpf2pa26"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { name = "libxcb-shm0_1.10-2ubuntu1+srt4_amd64"; - md5 = "d263f46ada805900e88deb8bd6e7016e"; + sha256 = "0yzk3yx3c20ms7np2g956m1j3y5xf241gnvpsv37z173a4j7hlhn"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { name = "libxcb-sync1_1.10-2ubuntu1+srt4_amd64"; - md5 = "df0ce39512e455f442268bf9f9c0c52e"; + sha256 = "1lkch9qhzlx8hpv6msvfa2nd7qqkx6xj86akxwgj1wbl10lbqv47"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { name = "libxcb-xevie0_1.10-2ubuntu1+srt4_amd64"; - md5 = "dfd64e3afb9c3eb4c2938bbf8288323a"; + sha256 = "0f4g04lrbyfjgcphv12zcmsvxa6krjk33kjn4lfdfq3440znvkig"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64"; - md5 = "09107ec941a6361acb73922f49905edf"; + sha256 = "11c6yh1kax9d5qp17znbvll41q953x4ymx5yvhkjx23z6ra8skbb"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64"; - md5 = "cf8ee2c9b5459dd229f2967ab28b7bba"; + sha256 = "0fhprxkv94sgyghcif81dzng5jwyrb6g1y8z78g0wrppjf0k2ixc"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64"; - md5 = "c418c00f009cdb7e4ed25a0fc4059a1e"; + sha256 = "0wbs15dy8zr45d1jqnky6kki6slv150hqlylglva5n0cs2ami0si"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { name = "libxcb-xkb1_1.10-2ubuntu1+srt4_amd64"; - md5 = "c06f25c1c69e78e0f0fe39f0e20ca796"; + sha256 = "1y6h2awv9h5h09xzhbfr9cd500928knx38ixc28q9v3r0xbw8i8k"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { name = "libxcb-xprint0_1.10-2ubuntu1+srt4_amd64"; - md5 = "760966200beff9f7c9ff0f4af224e65a"; + sha256 = "0ifmby85fzcazzlw36mliz8ylmbxdxxqbpibzlzn65dj3fmmkmhl"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { name = "libxcb-xtest0_1.10-2ubuntu1+srt4_amd64"; - md5 = "e2f30b8aaf1cdc0bf7d234db9bbbf50e"; + sha256 = "09ia0zfb63wmr7a7hlgyn5dnq2dv78apkd834150pzbz83yr00vz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { name = "libxcb-xv0_1.10-2ubuntu1+srt4_amd64"; - md5 = "d16c7873af0ffc0b370332ce1d562755"; + sha256 = "0r4yhw2h3clkscpxfg9vpl3x7sh89lxrqmddfvz2mwbqxs64i44q"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64"; - md5 = "ea26ad6eef4b71fff944008f542eed5d"; + sha256 = "0fjms3ram2zjg4b6njwqj37dyfw9m39syhw78w0p5q97my4vcrs2"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { name = "libxcb1_1.10-2ubuntu1+srt4_amd64"; - md5 = "93dbb1e6d32178cc1a2e994b6d87d8d3"; + sha256 = "18d9armijpdncqv8crz969dgrana0cw6f81di0clqwhx3sgmm29v"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb1.deb"; }; } rec { name = "libxcomposite1_0.4.3-2build1+srt4_amd64"; - md5 = "e817d11de4660b9fd4a66db90cdc2588"; + sha256 = "0xiqwrgsz6dfa0pd9and19gyvmpha8x2sgh5hg3j6kn04cza8523"; url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcomposite1.deb"; }; } rec { name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64"; - md5 = "7055ec097c7ed9cc6497f111311b4f75"; + sha256 = "0zzj3j8k1ci94y3kydyia61crfw31qg4gqj10lih0m86ci5asyyw"; url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcursor1.deb"; }; } rec { name = "libxdamage1_1.1.3-2build1+srt4_amd64"; - md5 = "2b3f144fdbd30408c25379a7409ba045"; + sha256 = "12bb67z98j857wixl51bjg0mgq59zid69ng5lkdjwl5a7cqjgl0f"; url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdamage1.deb"; }; } rec { name = "libxdmcp6_1.1.0-4+srt4_amd64"; - md5 = "201844de38f2d957a5ced6a28d2c80cb"; + sha256 = "1sw99jdxdafl57y67nssd0ninmiycfgmd8vbi7q3rpp545vc878p"; url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdmcp6.deb"; }; } rec { name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64"; - md5 = "b6dcf651f5b9dda20fd39912bf03a4c3"; + sha256 = "0z9jhx6jplin6fzbj4v11aq3d1wqvy2rb2p3g952kymi9372mnr3"; url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxext6.deb"; }; } rec { name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64"; - md5 = "a80bcd458215e445daddf4cf0d625758"; + sha256 = "0531x9n6p5b9n8isjwmfnr8kmwxyjp81mxrdkmxf6v0k4j0y9sgg"; url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxfixes3.deb"; }; } rec { name = "libxft2_2.2.0-3ubuntu2+srt4_amd64"; - md5 = "de249fadd51c61b98bada7eb7cff8d29"; + sha256 = "1bipk6d6dw57pdcybbyhvszjad68qckg4i8s9hkn3kn89d2s46bc"; url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxft2.deb"; }; } rec { name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64"; - md5 = "f25d86e540477fe044c0294670b5f1b5"; + sha256 = "0m9h9k5qbqjiay4003v51vbbm9i24j7g3nx6q901csndjk5aq6ss"; url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxi6.deb"; }; } rec { name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64"; - md5 = "44dc2b8d96d4d3db048e358174500584"; + sha256 = "03dqvmdvcdraw0p483qrqv6xchr6a96vpmbbni6qcdak1gic2xkb"; url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxinerama1.deb"; }; } rec { name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64"; - md5 = "cca32ece7e930886fc2667e6f4849af5"; + sha256 = "0c5acgsr7as7afjwvl6qbqbgn3wpima2k55awgga6prvhzkas60p"; url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxml2.deb"; }; } rec { name = "libxmu6_1.1.0-3+srt4_amd64"; - md5 = "8f6657584a244c039bcfa24ad8934e75"; + sha256 = "1l08mkf2kwgskhzh9s43g5vcl4v1qphn68ila8g9gfw05gq7r0j1"; url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxmu6.deb"; }; } rec { name = "libxpm4_3.5.9-4+srt4_amd64"; - md5 = "807b3e86250c3640175da4980db87ab5"; + sha256 = "1z72sbc802sanhagf0w26hkk3yw0zdahw7dk89hjcgp57qmyyb08"; url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxpm4.deb"; }; } rec { name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64"; - md5 = "bde5d98946e1bfd60a42482339e29787"; + sha256 = "1yqfa0nllfqk9rnwj65nx8ni5xy4pn2nfasbkhzs8cfcyfd96y4x"; url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrandr2.deb"; }; } rec { name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64"; - md5 = "6781fa18b873dc95da21e82cc61609d6"; + sha256 = "06v7qfp10gfzx04znksc1mhx5a90za29hi90vinjrzccv096ak99"; url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrender1.deb"; }; } rec { name = "libxss1_1.2.1-2+srt4_amd64"; - md5 = "3d034c5c118d8794e2b76207c52a198e"; + sha256 = "0w0idnk6i94klavy80bv83pvkg2m8qvjaa9w641995r6drm9nag7"; url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxss1.deb"; }; } rec { name = "libxt6_1.1.1-2ubuntu0.1+srt4_amd64"; - md5 = "e4d13d933531f436c56e3245c94be638"; + sha256 = "1blcs2ngp6k5g87y10f2wgshr7m44943ks1ykpb59ss1w5j6cmx6"; url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxt6.deb"; }; } rec { name = "libxtst6_1.2.0-4ubuntu0.1+srt4_amd64"; - md5 = "75a55367e5185eac420f89807e39faa2"; + sha256 = "0mff4swa68mldsv915hirllccybbgjn3i4j23bj4bf26hasr0m6x"; url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxtst6.deb"; }; } rec { name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64"; - md5 = "e8e91fa6a42cfce330883dc1286f3d78"; + sha256 = "0ahk7z05sshj649vanr2hvarwqp3aphqwbdzf3hjd5rb9cg061fm"; url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64"; - md5 = "d9d307b821b71b3cdd91cb8d2137c527"; + sha256 = "1sgjxdgx8fd780imrqwiwqlhwlmgrndam8km9visymcr431yjbnb"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64"; - md5 = "44a2bda05acf6d10aaad2216a69507db"; + sha256 = "12csbx3bzziygw2xa0w4d0i3gh7l2h1sc93npvsmqnjxs6qmwnnz"; url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zenity.deb"; }; } rec { name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64"; - md5 = "3370614dc8c2667679aefb4c1e4c07af"; + sha256 = "06l2s654sg4z16g2b1whrjkz2gwqd0mjgf9w3jzvwwdbprc71gmg"; url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zlib1g.deb"; }; } @@ -1753,1747 +1753,1747 @@ i386 = [ rec { name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386"; - md5 = "2ec67bae5e0c088d1ac13ba4eee194bf"; + sha256 = "0i6phg3gmiqx4in4ym5iv3l15x396d0gkrs57x5p7mw8ahb5fq7q"; url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "dconf-gsettings-backend.deb"; }; } rec { name = "freeglut3_2.6.0-1ubuntu3+srt4_i386"; - md5 = "8fc95adac306cc313523179824b43835"; + sha256 = "1vsm25lzylxf4mvqs5p171qrl8aspdi5rvlnpfhc35cx3vhkxg79"; url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "freeglut3.deb"; }; } rec { name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386"; - md5 = "499ec92726b0ce7115697d2553d0176d"; + sha256 = "1s7wvx23xnv3i3mw6a2pk9nr9s9wzpc99cr6rzgq3jxfmph78c4r"; url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gcc-4.6-base.deb"; }; } rec { name = "gtk2-engines_2.20.2-1ubuntu1+srt4_i386"; - md5 = "2c7feb2392d943f07c985d8cf83ed067"; + sha256 = "0rlhcsx8lvnmd6hx4iqh6z49jqxb2wlzl8n74qcbkx8vzg3jyffn"; url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines.deb"; }; } rec { name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386"; - md5 = "73bc5a4840f1ab72d715964721e97f75"; + sha256 = "1jkma0v5z7i7plamg49ljk0mhg3qf92k1disdj8yjjlgjf3d0isl"; url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-murrine.deb"; }; } rec { name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - md5 = "cf294afff2a4d5893e48beb4d308f7b8"; + sha256 = "00p0qi47nnzlh31ajwalfh5kimsmdzjicgl5lnfg4viwb0r07vmd"; url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "gtk2-engines-pixbuf.deb"; }; } rec { name = "libacl1_2.2.51-5ubuntu1+srt6_i386"; - md5 = "b335451ab178fabccf1ea5d3fc3bf17e"; + sha256 = "188r323k4y6jvq64qywhglllxfbcpji15zvws1qlicv4nrjh2yk2"; url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libacl1.deb"; }; } rec { name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386"; - md5 = "e1998f1e6dfd34d993ae2cb1a2621c05"; + sha256 = "049qhih0dl0z13ag1kradvwydwz90pllwriwnyjx78726fvcsa56"; url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libappindicator1.deb"; }; } rec { name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "49228f60eedb525d344a8f756ac18df0"; + sha256 = "0gp2falswr4hfcrfj7avp1g216mf5sargqflwyxl6ixxy1yxp22w"; url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasn1-8-heimdal.deb"; }; } rec { name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386"; - md5 = "b9712e5765c6dc66683e4c7f62090a71"; + sha256 = "0cy9s4wpnq2yd08shvip5mzg5a5mk76zmwyq68brqblaf1yqw907"; url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2.deb"; }; } rec { name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386"; - md5 = "eee45bd08e763a5e702707a87b2ee127"; + sha256 = "10qhsgcsabp0mrihssj7znw67kjfmw9kv2sbplpwl8bc52pxdz6z"; url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasound2-plugins.deb"; }; } rec { name = "libasyncns0_0.8-4+srt4_i386"; - md5 = "59ed0cdc4eb0cae2355c368dbdd5103b"; + sha256 = "1h2fs8azxz9z2wa45igxwvfaarp50pqx26jznyrv35ayxhnzsg8w"; url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libasyncns0.deb"; }; } rec { name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_i386"; - md5 = "7fbe2a86e8e8a547626b9dc42edd6c83"; + sha256 = "08sbk32cv4r0nmhp8ydbmjy8mcnsi4y2wjm606d1hrqqnvhlk1yi"; url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libatk1.0-0.deb"; }; } rec { name = "libattr1_2.4.46-5ubuntu1+srt4_i386"; - md5 = "cd9827abda30e1bf97c78a7d3dffc150"; + sha256 = "06ms0pfsb85y53l83fvs2zh39dqzh7bw0jh6zsf5wi9g47y2kzhd"; url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libattr1.deb"; }; } rec { name = "libavahi-client3_0.6.30-5ubuntu2+srt4_i386"; - md5 = "b62360b70b965c13c86536fbcd5c3dd2"; + sha256 = "0gsbwnc5s6hd412djs257fgy50ayjph5gg1jhmvgz0nf0wqqy60g"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-client3.deb"; }; } rec { name = "libavahi-common3_0.6.30-5ubuntu2+srt4_i386"; - md5 = "ef91c00328996a43243b7de90f60d145"; + sha256 = "0cfn660pngq7ackkcid410g8245grcs0izawwlmkhr6y19nma0jg"; url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavahi-common3.deb"; }; } rec { name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "4787c81afc9a17c9b9f7700249d42e9d"; + sha256 = "0dz4d63whrhlsylvd1mqzz5v3xpwf88cgga8qr8vgf2vaz7ns0k1"; url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavcodec53.deb"; }; } rec { name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "396ec91c52c5f3bd22d53c6f9ec58836"; + sha256 = "1rxbm4n09q4brhklaa5hwzaipv3y34a3jphrc724s29dg178bb6y"; url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavfilter2.deb"; }; } rec { name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "a0b3c36045eaa4b93ec0c8db5999e95c"; + sha256 = "0f38h7h4m1g63jh9lsnq9win2k5zvg8i5khsadwb154y4iragm2f"; url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavformat53.deb"; }; } rec { name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "21589331257b33edf01f06f2cea89494"; + sha256 = "05lh422gvhl990yvlp4a0l3mfqn4n0l41fdaq4m4r5i23izcl3s0"; url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libavutil51.deb"; }; } rec { name = "libbz2-1.0_1.0.6-1+srt4_i386"; - md5 = "6af7e943feae8691d7331c8e616ea402"; + sha256 = "1hh77sg2pan5qlvxg82my0h1dy53rxrgnl84bggn2kiz9i61ls2m"; url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libbz2-1.0.deb"; }; } rec { name = "libcairo2_1.10.2-6.1ubuntu3+srt4_i386"; - md5 = "33c0e1be296288e7681d88d5775cd3c1"; + sha256 = "141rbp47gkvzfqzrwg4j80m1ay2l573p4q3x2ym5nxzw3f9jb00a"; url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcairo2.deb"; }; } rec { name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "53b3f4d615e0571aefec5ba4990c246d"; + sha256 = "1mfv3q731b0sjl2axc5qf1drp4dfwsmg2i0c222bs3ccvk9m7bcr"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk-module.deb"; }; } rec { name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "af77180b67e083ca1c7c16f125d773d8"; + sha256 = "0iddn7f56g1lajd1f0s77s06qwh5nk0iv2ai2r5rcanhq693k3jp"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra-gtk0.deb"; }; } rec { name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386"; - md5 = "ffca46ec6dc8f075f3bd224ae0e4e535"; + sha256 = "0qpil9xifaq1kkmrga6v9sz4sl9dh78rp9kzm8p6c9hq2f4w5j4i"; url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcanberra0.deb"; }; } rec { name = "libcap2_2.22-1ubuntu3+srt4_i386"; - md5 = "21af02a5fe56b6ec332eb0c6f1e1d187"; + sha256 = "0llaf4hgb4v66hwkc6ibrhpadhjxkiz3frl00f6yagm9g6z2yxvy"; url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcap2.deb"; }; } rec { name = "libcg_3.0.0016-0ubuntu1+srt4_i386"; - md5 = "5d8b9bd239ea094bc25041c7437a60d7"; + sha256 = "0ka9z2sq315xvdbqmbqg76j3wknfa88hk41jg94svnqf4fbawbrz"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcg.deb"; }; } rec { name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386"; - md5 = "a7450fa3b218cc993b252f7f51b4f83a"; + sha256 = "0d0zpm7qx1p4zpi5xk585hxfirn6i3v53r0br7dlaiqfy0divv5z"; url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcomerr2.deb"; }; } rec { name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386"; - md5 = "134c7e63ef61bb469ebc61c26309e42e"; + sha256 = "1l49h8v8dgi4n2j32012zzxkyqgg7b9z7d9lxijj0cqwwjq6fzpx"; url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcups2.deb"; }; } rec { name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - md5 = "b2dc62a422bf1ebc4014073664d38b3b"; + sha256 = "0z5qnjgmz9c917vm6r1m3856a10brdwx3d0k4qcv9vlv1gj1ln0j"; url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3.deb"; }; } rec { name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386"; - md5 = "f95df746d4c7319e4cb83f082d39ab38"; + sha256 = "09bx2gxldswb63nql2b7x5mq55miaz7x5gbzscrc1kybnm0vvv75"; url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libcurl3-gnutls.deb"; }; } rec { name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386"; - md5 = "36d5b7a27a90cc6069c14317c5b182e8"; + sha256 = "1lp548l33i3c7wavq9q0n9jhxm44mg0jlrgi89ngfm705141zw4f"; url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-1-3.deb"; }; } rec { name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386"; - md5 = "4082582c368e35112478847ca5afad30"; + sha256 = "13dcsf3ipayvrzj1ksmxph31gk2zs3m0ghy5jh3aq648s5ql2jj9"; url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbus-glib-1-2.deb"; }; } rec { name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386"; - md5 = "593ce60da5a985932e8a43802e662237"; + sha256 = "14glmvc6923djpcn2a9kwhqm4myg1y9mp38n7gkby1wz6y63zvp5"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-glib4.deb"; }; } rec { name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386"; - md5 = "1982414c7f72db3106ab8446596cdbb9"; + sha256 = "19ijz82wkk9z8w4yjp628hga6dsv7qr7x37kr8j8fq430gbl5y8s"; url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libdbusmenu-gtk4.deb"; }; } rec { name = "libexif12_0.6.20-2ubuntu0.1+srt4_i386"; - md5 = "eb203ec5c79ed77e053efaa1bc8d65d4"; + sha256 = "1dh1idpqqh66l2awfim17vk94238wb073d3xj74ci8gxfp0rxkvr"; url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexif12.deb"; }; } rec { name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386"; - md5 = "44b8336cf9a2340a693528f2ebe19da2"; + sha256 = "0wv8iym5bhwlvnsljxfjwhl8z39wh5nba6li1i7nnzqj365hmdc4"; url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libexpat1.deb"; }; } rec { name = "libffi6_3.0.11~rc1-5+srt4_i386"; - md5 = "4a07d2ad9dc8e67ad6edaccad85170ae"; + sha256 = "1064kf252d1v8asi59m67bz7zg2k7fmgkqzbib872yb6qyrgj7p2"; url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libffi6.deb"; }; } rec { name = "libflac8_1.2.1-6+srt4_i386"; - md5 = "543202e74de54764bd9ca25548d4bd86"; + sha256 = "17hb02f5yapkfkasamx6whxm76p1gpjrz7nq7i59zv0lfxwgjry7"; url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libflac8.deb"; }; } rec { name = "libfltk1.1_1.1.10-10+srt4_i386"; - md5 = "8be404e25f342918fb99b40320f8bc4c"; + sha256 = "1vz2b02asscpr155v516zclawfi28m4yxf1ya33848ydg067iz35"; url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfltk1.1.deb"; }; } rec { name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386"; - md5 = "57d781f78fc1c75d947208e09a58a39b"; + sha256 = "1dm12wk4pj2h4y0ykyvv9fs6s0vix1iy3hkvz2fvqx8wdb8710n6"; url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfontconfig1.deb"; }; } rec { name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386"; - md5 = "2b1dd9e53e6a94443e9959de83d8621f"; + sha256 = "0661g4ghhynz49kkbr5kds1ms8prqmpm5rz0qv3c7cf62a2lb3x1"; url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libfreetype6.deb"; }; } rec { name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "61f4822f145d812c453b2fc5d71f5eae"; + sha256 = "19qracxc45irfmsbcn668zwdxx37avp1igj1z4c6xq8bmp6w685d"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcc1.deb"; }; } rec { name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_i386"; - md5 = "1c0863073b6fdbdbe5ff911ed3cc781d"; + sha256 = "1srwysvh165hwiqxyl0aac3j39zzg2v4g3alix51cbvc4s6yzhy3"; url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgconf-2-4.deb"; }; } rec { name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386"; - md5 = "a77e997aabfde09c5cdf4b5f5d8e305f"; + sha256 = "1cg2kps7cfmildp9hlijxsj7bc2j71xal6bm57ldz2vjcv6k06hl"; url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgcrypt11.deb"; }; } rec { name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386"; - md5 = "9108b1542d78b682f141c3b488f33821"; + sha256 = "1n5pyqw2v87xw32lj73aywhfgcmnzi2wvxxw2gqv52d56vzj254s"; url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgdk-pixbuf2.0-0.deb"; }; } rec { name = "libglew1.10_1.10.0-3+srt4_i386"; - md5 = "cbd2c842295be412d25bf35ad4329c7a"; + sha256 = "1aswani1ymq52jyr4yhw4vi42gzw6xqk5ygh1d7zycakgrfs179b"; url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.10.deb"; }; } rec { name = "libglew1.6_1.6.0-4+srt4_i386"; - md5 = "36344ae65699fdfac8d169c54f45dabf"; + sha256 = "0yxnfi8arnp3cphxdviyqslw7nxnd1mx11v9i5i2xnl907iyaxpq"; url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglew1.6.deb"; }; } rec { name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386"; - md5 = "2bb8b70952f8f6d724700e72db8bbef8"; + sha256 = "1lmxm2gfz0mkjafpw8f98y73f0lj5m5nfdarqlpbb8dqbmpabwvk"; url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglib2.0-0.deb"; }; } rec { name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386"; - md5 = "bbdb5055ac6164380a6c344bdca59a74"; + sha256 = "11sdfs3zphb8ks2cpb646z4vza6s4zpbfgaq99drn5z9b8d109zi"; url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libglu1-mesa.deb"; }; } rec { name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386"; - md5 = "669fcbbac0ba7510cb5df1ed7a4b58a8"; + sha256 = "1f6ss23vybyqkifjr9nam0y6va34m2vdpaxbwjmwi2z4wwj7pn9k"; url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgmp10.deb"; }; } rec { name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_i386"; - md5 = "360d15ec7d327371bcb69a8b51b1e556"; + sha256 = "0580r5n6z9s147q4bkkm75a2pwb1ganz9msbp440rwwh6xahrh56"; url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgnutls26.deb"; }; } rec { name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "d52479b3e735785256c8b6ba2a278ed3"; + sha256 = "04mywbz2lmxap8nq1rvj7aggkrvrgfz4869q41f0d6dnsmnbsj5k"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgomp1.deb"; }; } rec { name = "libgpg-error0_1.10-2ubuntu1+srt4_i386"; - md5 = "8cda79074a80e9c079251962c86cc5cf"; + sha256 = "0hjfgcmrjr02xk788chyafg7j8viwmp2vrqyfjdjf79kvpy0354s"; url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgpg-error0.deb"; }; } rec { name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "bba863478cbafe60780618b9e2e3ba39"; + sha256 = "06sqdxf38qm6cd76gdir6m9rvbg4xv70jhh36zshxxhi50lhpjcx"; url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi-krb5-2.deb"; }; } rec { name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "1160d5fb86160631a7e699d66f1d6805"; + sha256 = "015jb2j56ia3zvfmjlx72yjlvfv8z8bg0ff4z5nh1d25cambqcbs"; url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgssapi3-heimdal.deb"; }; } rec { name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386"; - md5 = "b3e0cb34c2b21fb68fe4fbde8ae640a7"; + sha256 = "14z4v2j7lc5xnzbfpf8b3b5qg0d2yg917v4ighxy2nydf2zy0mrs"; url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer-plugins-base0.10-0.deb"; }; } rec { name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386"; - md5 = "633c94c28db5caa2001fce91ca6a726f"; + sha256 = "06lp4ajhnczb5salf6njgi1q24zv3yrkqhgvbyq45dvsax76kafj"; url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgstreamer0.10-0.deb"; }; } rec { name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386"; - md5 = "a903c62e138ca58cc32aa7412ec4a3ec"; + sha256 = "0qhvr5pyjj0vh2c1658gmx9r7h194py8qbcx69qfca2czp9hhacs"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-0.deb"; }; } rec { name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all"; - md5 = "5a2f731bdac2bd089780af2f63635f7b"; + sha256 = "0xgh9nrvj1hf3wj9pqm9x3ykw95v9bsh5k2vgr3cr9135rrj0dp5"; url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgtk2.0-common.deb"; }; } rec { name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_i386"; - md5 = "a120c25c89a1136ef0daa25644387d26"; + sha256 = "0z8ncxaqxna0ihlp19i7b59k9vbkynak49kim821rwxsxvjqsfcd"; url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libgudev-1.0-0.deb"; }; } rec { name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "14714cd92839ae0a1716929840bd340f"; + sha256 = "195yrcwrw8bnai5kkvhdq7nnjv643af5dyc97qcnfnvnvs20az42"; url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhcrypto4-heimdal.deb"; }; } rec { name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "9be4a5f3f6735aa3b9153c8cb5ba4ff9"; + sha256 = "0g2dml08mw4yy9llnn2149x1niy97mqbz56rphw3g3zv5nivnbp3"; url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimbase1-heimdal.deb"; }; } rec { name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "363aac3460da3724144165325f29f52a"; + sha256 = "0dbs4gxbfdhn2sbzfny75fzxiab9k8l1vd3vm7i4zfkbkx3lbr2x"; url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libheimntlm0-heimdal.deb"; }; } rec { name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "5591041cf73d1593730ff40428b407dc"; + sha256 = "01z9qr5r7n7vfkkb95apmkcc35va43qxsf0nzxff8x1ll82l3n7a"; url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libhx509-5-heimdal.deb"; }; } rec { name = "libice6_1.0.7-2build1+srt4_i386"; - md5 = "ed56f05e4b1fcf06189374a60aa740eb"; + sha256 = "1gmykmbbxk9590snli45dcvj00v77xn2za8v8193v020qa8hvmik"; url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libice6.deb"; }; } rec { name = "libidn11_1.23-2+steamrt1+srt4_i386"; - md5 = "79c6f01961c13e74d48978fe94aecce3"; + sha256 = "1xmv6kqn3zpnls7nyqd2bjqzc03y4w2gp0xmq6l8wwi659dkr4vz"; url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libidn11.deb"; }; } rec { name = "libindicator7_0.5.0-0ubuntu1+srt4_i386"; - md5 = "a365d22a80311e9875bde88c9b7b5146"; + sha256 = "0j1v3ljb01wyy5v8a5ad8ar9wmx2hf6qd50k7cl95si60zs79bk6"; url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libindicator7.deb"; }; } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386"; - md5 = "c0e59176b50a2da0ec61d48902014ce5"; + sha256 = "06gz25p9qm0lbxaqzag2y2lhc0wx9cnkxz7zdm2yfdcx1y4vbymx"; url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjack-jackd2-0.deb"; }; } rec { name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386"; - md5 = "83c82f7924110b659b8786b54ca6fb27"; + sha256 = "1m1986mn0ad5basd8hlby4d6jxpps4v0ib2g2pwqxdlil39gmar5"; url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg-turbo8.deb"; }; } rec { name = "libjpeg62_6b1-2ubuntu1.1+srt4_i386"; - md5 = "5084441d1da0b2d77de32cfadc21ee5f"; + sha256 = "1fjbscq7qp895z5g5aw5l98rfj0qpr66rl5r4m0f1ilrjn83i96y"; url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjpeg62.deb"; }; } rec { name = "libjson0_0.9-1ubuntu1.1+srt2_i386"; - md5 = "358ed87729682d1d5a44b04a99f9cca8"; + sha256 = "0nlhsclyxqa1s05hnzid6j8h0986v9viv6dysg22bc16gfdg9i1j"; url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libjson0.deb"; }; } rec { name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "09e0b933d71e0b842906f22334845104"; + sha256 = "0h2iv7p0w5ydd9nqfwmm4avjhcnki7nl000gpsdnrpfjrbv4rnlb"; url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libk5crypto3.deb"; }; } rec { name = "libkeyutils1_1.5.2-2+srt4_i386"; - md5 = "77b6a1fdfe5d2976650e882df68f1bb7"; + sha256 = "1v9b3dg1s3ykj5abi4y2392m12dw2n7zrays6sv1n2dw46f2lj4k"; url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkeyutils1.deb"; }; } rec { name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "94eb595546d5b421504c6df661d29975"; + sha256 = "0h4mnxfsf8j12g33lca2nlrcma9d8gdchxckzr916yp4snzjk0bb"; url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-26-heimdal.deb"; }; } rec { name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "4efd6dd3da5e989b7aaf990cb5dae9a4"; + sha256 = "1ay1g283y3y6czm56r7wiibarwv267bg707ncaq4m7a9bxa0fmy2"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5-3.deb"; }; } rec { name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386"; - md5 = "ce8372e9411aa5d734ef44773820cd3b"; + sha256 = "031qjg6aajyrdj7ny9dl2v6p9syyngqfrdy277351814zcclhm1l"; url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libkrb5support0.deb"; }; } rec { name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386"; - md5 = "aea8d6beda7f992becfdbb3880b5b3c6"; + sha256 = "03ix9r3mxvgq5i5qv7zhjmmg8bki8gvgg4n8r79az5zbp4nxmi4f"; url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liblcms2-2.deb"; }; } rec { name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386"; - md5 = "770471a9c33a9b708427dfa5d8b944b4"; + sha256 = "0aycpf6xkr4fxr72np52jg6y384sy5b2r68kmmnzixqifykgc7jx"; url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libldap-2.4-2.deb"; }; } rec { name = "libltdl7_2.4.2-1ubuntu1+srt4_i386"; - md5 = "ab9d4dabd065bcc31430d839a04a5844"; + sha256 = "1kjphpfqjr5zsa1z1zq4dibxwhm5861vardc3xic4izqf05vd6nj"; url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libltdl7.deb"; }; } rec { name = "libmikmod2_3.1.12-2+srt4_i386"; - md5 = "fb5286eb01a90318bb95bdd671c6c512"; + sha256 = "1rm18888n955wgh75srgrfhm0zgxz0n5sr030zc4lpp3bx4x2pfd"; url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libmikmod2.deb"; }; } rec { name = "libncurses5_5.9-4+srt4_i386"; - md5 = "f3343e67c571b9f279ca0f9ce27f8981"; + sha256 = "1lc9s9rapyq6ld0xzlagqi5ah07gh59lixg0sh4xxm4sz75z6h21"; url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncurses5.deb"; }; } rec { name = "libncursesw5_5.9-4+srt4_i386"; - md5 = "aa693feffb52a101beda0d578de71db3"; + sha256 = "1j5r17ph0z43npv4nh5xgz0fdw9magas5ryr6qpi2pcqf5x9pp9r"; url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libncursesw5.deb"; }; } rec { name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - md5 = "361fba889b4a4fb66c7fc59f7e837f6e"; + sha256 = "1jr5nysd947lvk39ki1lx1y8csyaw10vlm9db7djrn20b1a6dsns"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-glib4.deb"; }; } rec { name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386"; - md5 = "39d620f28e9ecee9dc25e7ac4e679a81"; + sha256 = "01gf2wf722mc28hyfh3g45p2qq0v04nrhkhz96xd8mwa7jdx0cb9"; url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnm-util2.deb"; }; } rec { name = "libnotify4_0.7.5-1+srt4_i386"; - md5 = "a4207e3d76879a94430cb641fe2001be"; + sha256 = "00nfvgckkdfal6qfbj4hcp5jc0rs57ksl48ciy87v46inxgp67z5"; url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnotify4.deb"; }; } rec { name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386"; - md5 = "6d15e2401761ea09428c7170381a3ff3"; + sha256 = "00di7dw9a124ahc04m1rs8w3mdx1kpjhf696zvgxprn8qrwwp84n"; url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnspr4.deb"; }; } rec { name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386"; - md5 = "bc611346e46985b47d0cf7fe0464e4af"; + sha256 = "1n46ln69sny735q75sn8g7sp23ahdav277bp0d0bl62k11xa3fnm"; url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libnss3.deb"; }; } rec { name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386"; - md5 = "bc3afb09d1ea93764c808c7a268c1cd2"; + sha256 = "0bnsrk44pwzwjs7yw44kzbr5b10kq3jsvrskzxxr2sv12ljhxmrj"; url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libogg0.deb"; }; } rec { name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386"; - md5 = "2548d953611d999a85463581df4efac5"; + sha256 = "18g56z1s8yyxhklqmpy6l22zcbzkvws26v6b1xgg4w3k33hbcjng"; url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libopenal1.deb"; }; } rec { name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386"; - md5 = "d2cd63e1f984b45561128d7d4d67bd06"; + sha256 = "0yfqakir28jnn873xxqdickf54mnlpp25946fi1malvxadjcqjll"; url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "liborc-0.4-0.deb"; }; } rec { name = "libp11-kit0_0.12-2ubuntu1+srt4_i386"; - md5 = "e5dacb77c07e97db660bc5312387a9d6"; + sha256 = "1f97dfd0z1fzk1l4zphdabxq7q02pdql03ifc265chzq4zpaghbh"; url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libp11-kit0.deb"; }; } rec { name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386"; - md5 = "dbc50fdd82e6df45bb9bb8ce18f1fe2c"; + sha256 = "0xda2k934wpfq01lrc9yw6fy6bispnfyyp5k0iszzh8awfjghrjj"; url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpango1.0-0.deb"; }; } rec { name = "libpci3_3.1.8-2ubuntu5+srt4_i386"; - md5 = "cdf2a41b3ba93c2061f196920420b99d"; + sha256 = "1zi4g80r8cgy4zawdddfkklp6q98xm3qlad1a27rfw6zlg66a028"; url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpci3.deb"; }; } rec { name = "libpcre3_8.12-4+srt4_i386"; - md5 = "d4134108e9b21b6e623eafeaaa84e37f"; + sha256 = "1v1jj9vwsd6k0f6l9a72pbx3idlnjs32zxd1gci2fanma7fsp4vj"; url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcre3.deb"; }; } rec { name = "libpcrecpp0_8.12-4+srt4_i386"; - md5 = "e1bd40c3840669cbfb0b12e6dd07629d"; + sha256 = "01qklrzg9mprb45mn0bj9r5p5d3lmrz0mhiqwjxg07w533gycyr6"; url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpcrecpp0.deb"; }; } rec { name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386"; - md5 = "630fa4416398e12dfae1816acdac1d89"; + sha256 = "004abdax9r66z0a359rik8dqc9bsx177m8z5ygjsh40yv7fjgc9g"; url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpixman-1-0.deb"; }; } rec { name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_i386"; - md5 = "978502e6116df1c98dd985dd07bc1022"; + sha256 = "0ahap0mzqdl51ia615j09yaawi36khv9bj9z5bd0wspfyjls0a74"; url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpng12-0.deb"; }; } rec { name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386"; - md5 = "4591d057af7dc6709d1960c5ce590560"; + sha256 = "1gwsfmr80r59y7ic21shbflf505wl0izsm1mvld3yif80vfz4hdn"; url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libpulse0.deb"; }; } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "cc8d8e5b7a4e002de9e86633b2c53804"; + sha256 = "0lfzgjyp4gxs6ns3v0xx82gpr784b7rwnhh37njq9zmhaq7mxpn6"; url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libroken18-heimdal.deb"; }; } rec { name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386"; - md5 = "3ccb52ce883b4c1885857c80cbd11e56"; + sha256 = "0x6dkzfc9bdcjr0sq6dl0vk0sjjm9pwp4hb2m8wjynykpinbzbxi"; url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "librtmp0.deb"; }; } rec { name = "libsamplerate0_0.1.8-4+srt4_i386"; - md5 = "e218128429da602e392c047940b62a23"; + sha256 = "10dm5k8c6f8q6vgk0ab52kvikbrgiflbmkflbix42rm5l44bz8hd"; url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsamplerate0.deb"; }; } rec { name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386"; - md5 = "963632ad4d1477ef230dc4c68dc7ffa2"; + sha256 = "19pkr848bjg2zg43z2l5npx97ydx4jgf7c5n33ckj6wbgxvzbn1s"; url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsasl2-2.deb"; }; } rec { name = "libsdl-image1.2_1.2.10-3+srt4_i386"; - md5 = "1adfd99b505fe3ff6fd08a2919277780"; + sha256 = "1d3m36a58iwpykc442axj4bd6s4h7f9qq269qfv07i6cyfp2j87l"; url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-image1.2.deb"; }; } rec { name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386"; - md5 = "8687aaa0fb6981d674ade4062884ff52"; + sha256 = "0wij7i9d5g9bbjq4xrvrbzqcsdpjn6dhj1pjn997lpgxsfwyl0nd"; url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-mixer1.2.deb"; }; } rec { name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386"; - md5 = "887ac0bbaa344b203d9effdd32dd072a"; + sha256 = "1ih95dgbaksgj12x6p7528hywm4zqalv0zyg7k5mp3yfgdxi37xr"; url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl-ttf2.0-0.deb"; }; } rec { name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386"; - md5 = "7b4319a41a9dcb24aab37be255579ce7"; + sha256 = "1qsmhdzs2rr13vgagma0yn39x4njx2gixw82l3zmp6b0rp8x0ff9"; url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl1.2debian.deb"; }; } rec { name = "libsdl2_2.0.4+steamrt2+srt1_i386"; - md5 = "e56c66c0719d067589f7f13e01815274"; + sha256 = "1xxj20q6kv4n8g1d1f5pbg1qaqdaq4nigqi2sq4lzmnvzkm8nj91"; url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2.deb"; }; } rec { name = "libsdl2-image_2.0.1+steamrt2+srt1_i386"; - md5 = "076b0df6aff11c3a828eb5978be1ff66"; + sha256 = "0s7gyc3d0acddzipc4pc89k5cdyjl8ik7pk1znrq0292rnmnwbk4"; url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-image.deb"; }; } rec { name = "libsdl2-mixer_2.0.1+steamrt1+srt1_i386"; - md5 = "1883cd445c1e5d3ad12bbb7f8d1932cc"; + sha256 = "0hqqxqnh8pyvaqhb9rhk20qnf4plrmh3w0n80sfzcn1vjrdcg8mr"; url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-mixer.deb"; }; } rec { name = "libsdl2-net_2.0.1+srt1_i386"; - md5 = "f97097f7e4594a691f7e866e1f4bd6d4"; + sha256 = "14cn8v8bnllkbj88qy2chlj44m4qrdd6h1x705plwy10qma18iln"; url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-net.deb"; }; } rec { name = "libsdl2-ttf_2.0.14+srt1_i386"; - md5 = "6b4c6e4c15de54d5222da1ccab849b69"; + sha256 = "06r8vsji64dcswd7mwy9yyacp6pkza8lsa3dwz07yqyb49md9xrv"; url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsdl2-ttf.deb"; }; } rec { name = "libselinux1_2.1.0-4.1ubuntu1+srt4_i386"; - md5 = "f96dd8143f7f3bb2600d761f5fb6e854"; + sha256 = "19vfb4zlpv25x5428zfm5mkwqgdc229mc3saq32pas3b2faxfan7"; url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libselinux1.deb"; }; } rec { name = "libsm6_1.2.0-2build1+srt4_i386"; - md5 = "fcdebe0131ecd0b0777e52b06ad99055"; + sha256 = "0c1rca5w1m1cqi2a5g9k7zpvkvky6da9hkfg1ar5c8xw4ilw304j"; url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsm6.deb"; }; } rec { name = "libsndfile1_1.0.25-4+srt4_i386"; - md5 = "0a2518a2d66430e20d660883c71b84a2"; + sha256 = "0pbb7yv86am1x1fd2s15s7ybyz3q1xjlxij8in9dal1bkpj6yhsj"; url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsndfile1.deb"; }; } rec { name = "libspeex1_1.2~rc1-3ubuntu2+srt4_i386"; - md5 = "f34f05ac30f3c11bde9b20cdc219c676"; + sha256 = "1n2146dh1famhl58i1s4cdp0gyfz89w8vj5msh8hsdjjr8csa83s"; url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeex1.deb"; }; } rec { name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386"; - md5 = "239a3b273c387ca41ecff1e371b90d41"; + sha256 = "0gk0b28d9f7zya9vbmg1kj5xm3k3339ky2n16id3w6aks7lc5y8w"; url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libspeexdsp1.deb"; }; } rec { name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386"; - md5 = "6653a03901b263af6fce56e6c394e9b3"; + sha256 = "160pzj7hmqm5hkixj002q81gcqybkv7xn8z8746dw7h90cvlyvrh"; url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libsqlite3-0.deb"; }; } rec { name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386"; - md5 = "abed18b597fc44363a47caf1f4d760c4"; + sha256 = "142c6vwq852mra2i2jp802wfsprd5jia80xn09ms0rxxa1aa7xsk"; url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libssl1.0.0.deb"; }; } rec { name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386"; - md5 = "76c7adc814605b316426ef1d9ffab195"; + sha256 = "187nknssd0x7r0qsw71f3d06pvwbkqanajah4f7a01xk3hc8cxh1"; url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6.deb"; }; } rec { name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386"; - md5 = "2a5142925aeb5054395edd56112e83a9"; + sha256 = "1j2wsczzlh5jpqyr8k6j72107kmhxa3hdiqm0s648i0fyrks54wp"; url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libstdc++6-4.6-pic.deb"; }; } rec { name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386"; - md5 = "facd5280993d266f3f1f1809138e6cd2"; + sha256 = "0x3xbbzf643mia8cx9py8vrn9d8c5njxh7x233ylmh8lybac9z5x"; url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libswscale2.deb"; }; } rec { name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386"; - md5 = "c24dd57cc16746dbead2fbfa571f978a"; + sha256 = "050w4qc87h9kvniknk62jxpx2i40pl8djbmzbhj2w2lmjbzr7g83"; url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtasn1-3.deb"; }; } rec { name = "libtbb2_4.0+r233-1+srt4_i386"; - md5 = "99dd92dba5e3f93e0e349ee9f3ebe22a"; + sha256 = "1ava8m0iv62cb1gi28l486nibd981lsnjbx08b7cg7dd8hjw5lnj"; url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtbb2.deb"; }; } rec { name = "libtdb1_1.2.9-4+srt4_i386"; - md5 = "8d165fc985106bb4b3df301bda4a8c22"; + sha256 = "17q687bsc7v2jkcvp1y85mnzdq8kdxwlvxib0h5i6v6qvwrj01hn"; url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtdb1.deb"; }; } rec { name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386"; - md5 = "966fee9cbc71519350a2730e34a1d8e6"; + sha256 = "0viaqm59q9qbj23s5b4s4mq99imyfv799b6ph78cz2yi6l94qvqx"; url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtheora0.deb"; }; } rec { name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386"; - md5 = "8374a1fc7909c42faa5ee585eb967b20"; + sha256 = "1zyggf4hp7xxd7jn2rahg27vxk1pxpwcvjlrmc3lnp4d2krnf0pq"; url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtiff4.deb"; }; } rec { name = "libtinfo5_5.9-4+srt4_i386"; - md5 = "9c5ab1104d91b8bd6cd2fd21c06eb9ee"; + sha256 = "0iy5lalmyr9lv8vm7mc5zdis70ir3x82aav798s4dvwmhzw7a45a"; url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libtinfo5.deb"; }; } rec { name = "libudev0_175-0ubuntu9.2+srt4_i386"; - md5 = "f2dfa9304cacc609abce0c85f984b48f"; + sha256 = "1wxkfv34nqch3zi4hyshmwbg9s33q7inlz8zl396p22m1q5m5sfx"; url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libudev0.deb"; }; } rec { name = "libusb-1.0-0_1.0.19-1+srt1_i386"; - md5 = "f4328e5fa069f3b43d301992719b2d8e"; + sha256 = "0mmn9l99i595l4fd446jjyh301airh17wbc4wfiigsmz4b4mylb0"; url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libusb-1.0-0.deb"; }; } rec { name = "libuuid1_2.20.1-1ubuntu3+srt4_i386"; - md5 = "d5ef9ef9c92b5b7edfd2bac2853d00ad"; + sha256 = "1hcrpngalirqbzqfn209akkizqnm4qpkhp42mcys78xx0i0p5kxr"; url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libuuid1.deb"; }; } rec { name = "libva-glx1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "6ef48bb25671111d17d696ff4db2c684"; + sha256 = "0g7vra6wlgrvpn1cqx1xnckfxn7r2lzh8bk2gs32cdxc4qy7w22r"; url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-glx1.deb"; }; } rec { name = "libva-x11-1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "90e2e7271ca563cd66993ea4652018c3"; + sha256 = "0m5p4ciafgdvm4a29z07bcy8gx5n9vr634bwg1x2fj8z5w1y2bnx"; url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva-x11-1.deb"; }; } rec { name = "libva1_1.3.1-3+steamrt4+srt1_i386"; - md5 = "dfc1877ecc94d01b4cdae6b527bee3a9"; + sha256 = "1k44nikbgll3zh94p0zgnajjwkaxc0lzc1ss24frq1pzj76jgg54"; url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libva1.deb"; }; } rec { name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386"; - md5 = "61cd2560476f54dc11b3e859e104daec"; + sha256 = "0yya462g7ar6k54bb8aw9qw6zcnzqlzrqjni9w77pm5vbiy1r0yp"; url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvdpau1.deb"; }; } rec { name = "libvorbis0a_1.3.2-1ubuntu3+srt4_i386"; - md5 = "03077bd7302ea56045c0548c6b2cb983"; + sha256 = "0s2m9sa8gyqk56icsb8y65fhfnmbay56a8gy8znz690l8aq6fcvl"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbis0a.deb"; }; } rec { name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_i386"; - md5 = "6efe364cedbc437ddb1446cb846ad532"; + sha256 = "1848325zzklbdc03a738jvs0jpgypjd11sw80qv47i73zmc0wnfz"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisenc2.deb"; }; } rec { name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_i386"; - md5 = "7521e4dcb5378621ee56ea860f0f00ca"; + sha256 = "0p63wgif2h9q6pd61mfpl63qa1m12344d5nkrd6daq47hmldfibw"; url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvorbisfile3.deb"; }; } rec { name = "libvpx1_1.0.0-1+srt4_i386"; - md5 = "97cc2ca1fd5a0e8134d33884fbd8decd"; + sha256 = "1dkpqaaclks24kw4wdbzfnkdbsf4yz3j8ygfl6w0y3w2sxwcxldl"; url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvpx1.deb"; }; } rec { name = "libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386"; - md5 = "de2c787fcc443fb989b1862367a2e0c7"; + sha256 = "1fir2kw66z14pfs6zqa5i620c9rli075dk9mj9802d723hr78ylh"; url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.0.3~git20160215-0.1+steamos5+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libvulkan1.deb"; }; } rec { name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386"; - md5 = "6265aab9d541aea8aad3496ebcc5908e"; + sha256 = "06vhdm7d6h7cihk97v5bf2b8mb5z1ncca1yfahcxmgykm0amq89w"; url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwind0-heimdal.deb"; }; } rec { name = "libwrap0_7.6.q-21+srt4_i386"; - md5 = "a0ac6fa38ef4664b1dc1e3255788852c"; + sha256 = "07qszw3j351x9vwz5q6qvzanp291xn27zif1ir5khdwidr5lb58b"; url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libwrap0.deb"; }; } rec { name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - md5 = "cc208840d2883eec6f9770b623c24b9d"; + sha256 = "0wsr47fjfvjxz0ks07va0mqs8d6b8prll5512hvivj6hf6x8cngm"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-6.deb"; }; } rec { name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all"; - md5 = "c012bbc8654c3c012dc7b5901c486f4d"; + sha256 = "17mygha6q5480ajgv1f4wmgwr3l3zxh92yagh4qfsm6r1j2a5dma"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-data.deb"; }; } rec { name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386"; - md5 = "2ef2ffe569708f8433cfb36e754526ec"; + sha256 = "11fhyqvfbs0jf71cnmld09q23abvnrzgp20zabrvi2r5vk0ai6f9"; url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libx11-xcb1.deb"; }; } rec { name = "libxau6_1.0.6-4+srt4_i386"; - md5 = "9274a9813575848a1646d67b44e10bac"; + sha256 = "0pw507i7nfr1zqjf8ysjzqgml053bwlac2jxv78b2rp3l3xky4sp"; url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxau6.deb"; }; } rec { name = "libxaw7_1.0.9-3ubuntu1+srt4_i386"; - md5 = "70fa4b78b06a4d4b194cfb6baf1cdef1"; + sha256 = "172kg32mck6v60cy7bxb3wpmhn09jay6lg0mghb65f57bkqb539v"; url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxaw7.deb"; }; } rec { name = "libxcb-composite0_1.10-2ubuntu1+srt4_i386"; - md5 = "a72a94bc35581c25ef827023f643489d"; + sha256 = "0m28k3pwgscxzbp4vhrncv12l0940s22qc8lrgzb0vi5ha4vb1zk"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-composite0.deb"; }; } rec { name = "libxcb-damage0_1.10-2ubuntu1+srt4_i386"; - md5 = "50f4656bbcb193c3a3047c45db06a4f7"; + sha256 = "0z180s301vq0bpnv18hqad3n5hsipv6svjgiwacq9c4srryn22af"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-damage0.deb"; }; } rec { name = "libxcb-doc_1.10-2ubuntu1+srt4_all"; - md5 = "d4fd2c66b60ff1db1c87e6884d5ae093"; + sha256 = "0zq3xcrlr2wjp3386bf5h1z63hapmkpnw45l1fz17chdngcmj358"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-doc.deb"; }; } rec { name = "libxcb-dpms0_1.10-2ubuntu1+srt4_i386"; - md5 = "f805af07ee88d28de1fd06209aa42fc8"; + sha256 = "1k66jz8ms3mwbmkfdg9xb9wn77igwrkhjrvg6lw847c2f5rrxwp7"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dpms0.deb"; }; } rec { name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_i386"; - md5 = "85812dd4c61ff7d99060c495f4d17669"; + sha256 = "00r0pcda8hc7sq1nj93621p55743dys424fi3n26hdmdky9j0rks"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri2-0.deb"; }; } rec { name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_i386"; - md5 = "70e2618de627e6e8308e4afda77b0966"; + sha256 = "0lgg6b8sxd6s22vn7vwiyb9vz39v124y9w74g6krxqmfvbkfva2x"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-dri3-0.deb"; }; } rec { name = "libxcb-glx0_1.10-2ubuntu1+srt4_i386"; - md5 = "850f3cb9ed1d79a9bdec55960a74611c"; + sha256 = "142f73f4mkvad2l238kyf0xl4kwzgcpcww33ah3rx4qjz7q3ails"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-glx0.deb"; }; } rec { name = "libxcb-present0_1.10-2ubuntu1+srt4_i386"; - md5 = "e86ec58c992441124622921b38685d01"; + sha256 = "0rlnxwazwrp7kpgh6d6dbfzk5cjvlqp31qxgifd4b8fryjnan91f"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-present0.deb"; }; } rec { name = "libxcb-randr0_1.10-2ubuntu1+srt4_i386"; - md5 = "4acaa6b473aba1684731f529506e2ff8"; + sha256 = "0qg20vdidpbl6jar9w4n65jfmg907fkqrk2nwh6qj0l3xd90pm61"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-randr0.deb"; }; } rec { name = "libxcb-record0_1.10-2ubuntu1+srt4_i386"; - md5 = "1e28443a65256cd013b2dc0c937badcd"; + sha256 = "1kyjdazkvykcg76yp3gyy2pgj07nwbjld7q0ci96q1zka3a3m4sz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-record0.deb"; }; } rec { name = "libxcb-render0_1.10-2ubuntu1+srt4_i386"; - md5 = "b6362e8ca7da70c873c08e9849ac79ca"; + sha256 = "1r77z60hz0bblg07szl6yir6ll697w0w1y37bd66wv9n4cdlijqd"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-render0.deb"; }; } rec { name = "libxcb-res0_1.10-2ubuntu1+srt4_i386"; - md5 = "1bd0d0e0f5134651c350ba4955463b02"; + sha256 = "1xnnyczipj30kzkyrwngkra2m3xc8jchzd88a3afgy4m6cy6qyyy"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-res0.deb"; }; } rec { name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_i386"; - md5 = "8b51441ce72d20a788a8e12149ea2cf8"; + sha256 = "155m47mnjbn9b5p895syyfxk9pk1sh76qj614k554rf77nwdx8rq"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-screensaver0.deb"; }; } rec { name = "libxcb-shape0_1.10-2ubuntu1+srt4_i386"; - md5 = "470deea0b247279c51c2c76265263980"; + sha256 = "0wm9mm8xyh70zdc7iz8j3y89n2c5yhd72kq68nbxqpnwrz3kyzcz"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shape0.deb"; }; } rec { name = "libxcb-shm0_1.10-2ubuntu1+srt4_i386"; - md5 = "abb2fe37023253653d404dd6116829a0"; + sha256 = "0ifvwv0jq4crsgzfpbssa4p9r1jk7mck4wlpfq5j11aiijyw5fq6"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-shm0.deb"; }; } rec { name = "libxcb-sync1_1.10-2ubuntu1+srt4_i386"; - md5 = "3bf95ebc0bd67e4200f754b7282c4608"; + sha256 = "0wsf356qiv9frxky8c503bb7nsksrgn9zii7h2yp7v5wsxpi20p5"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-sync1.deb"; }; } rec { name = "libxcb-xevie0_1.10-2ubuntu1+srt4_i386"; - md5 = "e0a5eda95251b20499a85f4bcec888a5"; + sha256 = "1qynissbyb4ihyyy61nhlm4nqsm5akyfkdfyw38id6qiyh1hnml9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xevie0.deb"; }; } rec { name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386"; - md5 = "1b227b824b6270407594b25b2dc12769"; + sha256 = "013mhdbavmaqvw99k52p45lzfri1fhyclg6hdzb3xgswzilq1wn4"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xf86dri0.deb"; }; } rec { name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_i386"; - md5 = "c0170a7d5ae40f1c0a4b4680991bc4ff"; + sha256 = "0szrbzqjks1g77x572r3dvkv791k1c8lckcgk6a7wl4pygsksd3m"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xfixes0.deb"; }; } rec { name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_i386"; - md5 = "4de2e06a592ac634b109affebc31fb07"; + sha256 = "0h01rmw1h93xd1vhz06v7ckjzy89ingi6c6b2sl6sxdd7ii9fkni"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xinerama0.deb"; }; } rec { name = "libxcb-xkb1_1.10-2ubuntu1+srt4_i386"; - md5 = "2e154033ce7657e58f3a8e18d35ff5e3"; + sha256 = "07yq1khdrisvgkpbvl39kq1f3kwaqxvyn6jfcib2lcg6w5cbk9n8"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xkb1.deb"; }; } rec { name = "libxcb-xprint0_1.10-2ubuntu1+srt4_i386"; - md5 = "ca610d0695befd4442145e037f6a6f94"; + sha256 = "13dxk56nga9imkx07fb1s4fmgki0dnhcbb41pzr1r0ybxg6crnk9"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xprint0.deb"; }; } rec { name = "libxcb-xtest0_1.10-2ubuntu1+srt4_i386"; - md5 = "813f01d8e7012bd8f58df239c2df47b0"; + sha256 = "11ajwd0456dr4nwhkib31zwgk7xpyzir86pvjrgpydnh6yj3dic0"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xtest0.deb"; }; } rec { name = "libxcb-xv0_1.10-2ubuntu1+srt4_i386"; - md5 = "1ccea01cd8c2549e5cb5b13b90d986d6"; + sha256 = "0xkj414c0svlndqck1ghddc424a7mpxwaw44sdjw25iwsidzqi7i"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xv0.deb"; }; } rec { name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_i386"; - md5 = "4cbe887cb4ed19e79970ea076cc171c8"; + sha256 = "109bkl63vbsmhflqw3ivjdas96jamq5jjh67rf4lvpgxnlscxsgw"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb-xvmc0.deb"; }; } rec { name = "libxcb1_1.10-2ubuntu1+srt4_i386"; - md5 = "5fcdea3958e6f0d60b841ecec606c3c0"; + sha256 = "1n3ppygmfjy4hwgi4lq2xlm1ldlp47g67ksafbs3zd06a7lyq2rb"; url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcb1.deb"; }; } rec { name = "libxcomposite1_0.4.3-2build1+srt4_i386"; - md5 = "dce0aac7322e5d9e7d74ca464c5db1f5"; + sha256 = "1ga6g4mdz02p4m6l3q7fa8404243qhqfrvvcwinbm9hj8fyshliz"; url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcomposite1.deb"; }; } rec { name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_i386"; - md5 = "97a5238d1048e8b005d535b14720039e"; + sha256 = "0nalkn0hql9v13b48685jrlcx607n5bn6gk5vmhbq0zpcs2ww709"; url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxcursor1.deb"; }; } rec { name = "libxdamage1_1.1.3-2build1+srt4_i386"; - md5 = "3d1d3d865c89c97e5cf980df806966ec"; + sha256 = "0qysvz8hwcra2kr8sd9iyk1x73wawfnhsq5yspjphq08kg2k5gmq"; url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdamage1.deb"; }; } rec { name = "libxdmcp6_1.1.0-4+srt4_i386"; - md5 = "eeefcc12cc694b069acec7937e4a6650"; + sha256 = "0hxixf0y2l3wc6flfg2gwlfc3fp40rg570lwkr0r6hwj1z0zwyf8"; url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxdmcp6.deb"; }; } rec { name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386"; - md5 = "7f18f7c6fb6bca8a033e243ca4222057"; + sha256 = "0s6jc1zw6n2m3bmis62pr3mkzd64migzrj5wcl9hmq5yrnc46shs"; url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxext6.deb"; }; } rec { name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386"; - md5 = "25d8be35a5e5a6bac479d4bdce8dceba"; + sha256 = "0y5fb7nrnydlxbflhxqw065qz337m2i87sdn4730pd8y693sinyz"; url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxfixes3.deb"; }; } rec { name = "libxft2_2.2.0-3ubuntu2+srt4_i386"; - md5 = "44bf95c720b8634f0ea8419fa939f71e"; + sha256 = "087wclc31napmxc7l09gc73dgjczdkcyrld6zdcq6jq8jm1aq4vk"; url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxft2.deb"; }; } rec { name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386"; - md5 = "5f82357fd11b009d7fee5020e8ff2c8a"; + sha256 = "0zx652d5gr6dvviwpn5v0mhd9812pcha7xs9z7il3s01d75qcysk"; url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxi6.deb"; }; } rec { name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_i386"; - md5 = "eb23a3d322ff57ff5cad1ae062201b89"; + sha256 = "16dci5p6amsj1d474ih3avpjc1kc406wz6ywb9f6m44qrnm96w9m"; url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxinerama1.deb"; }; } rec { name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386"; - md5 = "426d497ed13c731342e5af754975e6ef"; + sha256 = "0gld5pbh1qh93nafvw6fx319av0hpfxp54pg3w4svi1cg7hj9rk2"; url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxml2.deb"; }; } rec { name = "libxmu6_1.1.0-3+srt4_i386"; - md5 = "8e7fae57eec7ef0eae90c7573bde46a9"; + sha256 = "0vvxp9fr2rykqny2r1qz6h5vqw26zv5lkh9nyw8jvrv9gx01rma0"; url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxmu6.deb"; }; } rec { name = "libxpm4_3.5.9-4+srt4_i386"; - md5 = "dc095202dcca66b471d2619af7164135"; + sha256 = "0s7pxkhfx84axldwpznv1wj9z05zm90fpp11702lm3qic6829sk1"; url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxpm4.deb"; }; } rec { name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386"; - md5 = "659bfe8b731e831f32b047e66643ae05"; + sha256 = "08392ac5sqsdq4r4p8n88c3d2nn0078y510grdrxp9z006f89846"; url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrandr2.deb"; }; } rec { name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386"; - md5 = "e5ea9172d234d61d6a31d86465428b05"; + sha256 = "08dj2kx2kr50jxcyfdj9y9gajkz1lnm6jn9z2pvqf43hzfa4pmp2"; url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxrender1.deb"; }; } rec { name = "libxss1_1.2.1-2+srt4_i386"; - md5 = "83aeab12e6c75d38be99d9df3ad1b632"; + sha256 = "1zf5ifqq8s6xr3iiwhjk3g2ifrb9srwanffsdjab28jzfpsb4a9h"; url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxss1.deb"; }; } rec { name = "libxt6_1.1.1-2ubuntu0.1+srt4_i386"; - md5 = "a15335885d70016c10c88b20e65ac677"; + sha256 = "1f01dzslhcm0r89p6wzs1pv32gaqxhxs3jim4jbzrkv18d4pyyc6"; url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxt6.deb"; }; } rec { name = "libxtst6_1.2.0-4ubuntu0.1+srt4_i386"; - md5 = "60cf7b25685a4bce2bbf031778831468"; + sha256 = "0w64xxfakharkmh0w9y6pg5446a7zypqhs3wgj6dbsa7clly8ir8"; url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxtst6.deb"; }; } rec { name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386"; - md5 = "7b97be0b67b400eba70eec57f50a92ac"; + sha256 = "1xbxlzmhl8j64k2aayrmpdz9bxn7b6jirdk84qibwh96fna4gd2x"; url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "libxxf86vm1.deb"; }; } rec { name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386"; - md5 = "65ed88dfc8eaa02cd5373308826f540b"; + sha256 = "1m4r0mp1i44rlddjjrmmbqi1phg2ksdn5zb4bxjrf55m2zfkgkx3"; url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "nvidia-cg-toolkit.deb"; }; } rec { name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386"; - md5 = "58ba7752e14f61f59698ce4aba860cd8"; + sha256 = "162554nhfmpjyyf1pzc35gsbawz4f6n1bm4s8n0923g1hmafpf6g"; url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zenity.deb"; }; } rec { name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386"; - md5 = "c2c51ba06c022ea81a6af843f27b34b0"; + sha256 = "0gcw3qr6w418idwd69i12hjr90ixnab81d1p3wi7d0rwl1227ihv"; url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb"; source = fetchurl { - inherit url md5; + inherit url sha256; name = "zlib1g.deb"; }; } diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index 1f643c5194a..2cdbfb096e2 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -22,6 +22,7 @@ let xlibs.libXcursor xlibs.libXrender xlibs.libXScrnSaver + xlibs.libXxf86vm xlibs.libXi xlibs.libSM xlibs.libICE diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py index 0292e725cea..c225d6bf8ad 100755 --- a/pkgs/games/steam/update-runtime.py +++ b/pkgs/games/steam/update-runtime.py @@ -36,13 +36,13 @@ def parse_args(): def download_file(file_base, file_name, file_url): file_shortname = file_base + ".deb" - md5 = subprocess.check_output(["nix-prefetch-url", "--type", "md5", "--name", file_shortname, file_url]) + sha256 = subprocess.check_output(["nix-prefetch-url", "--type", "sha256", "--name", file_shortname, file_url]) out.write(" rec {\n") out.write(" name = \"%s\";\n" % file_name) - out.write(" md5 = \"%s\";\n" % md5.strip()) + out.write(" sha256 = \"%s\";\n" % sha256.strip()) out.write(" url = \"%s\";\n" % file_url.replace(REPO, "mirror://steamrt", 1)) out.write(" source = fetchurl {\n") - out.write(" inherit url md5;\n") + out.write(" inherit url sha256;\n") out.write(" name = \"%s\";\n" % file_shortname) out.write(" };\n") out.write(" }\n") diff --git a/pkgs/games/super-tux/default.nix b/pkgs/games/super-tux/default.nix deleted file mode 100644 index 1981d3474d1..00000000000 --- a/pkgs/games/super-tux/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image, SDL2_mixer -, curl, gettext, libogg, libvorbis, mesa, openal, physfs, boost, glew -, libiconv }: - -stdenv.mkDerivation rec { - name = "supertux-${version}"; - version = "0.4.0"; - - src = fetchurl { - url = https://github.com/SuperTux/supertux/releases/download/v0.4.0/supertux-0.4.0.tar.bz2; - sha256 = "10ppmy6w77lxj8bdzjahc9bidgl4qgzr9rimn15rnqay84ydx3fi"; - }; - - buildInputs = [ pkgconfig cmake SDL2 SDL2_image SDL2_mixer curl gettext - libogg libvorbis mesa openal physfs boost glew libiconv ]; - - postInstall = '' - mkdir $out/bin - ln -s $out/games/supertux2 $out/bin - ''; - - meta = with stdenv.lib; { - description = "Classic 2D jump'n run sidescroller game"; - homepage = http://supertux.github.io/; - license = licenses.gpl2; - maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix new file mode 100644 index 00000000000..043861b6166 --- /dev/null +++ b/pkgs/games/supertux/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl +, libogg, libvorbis, mesa, openal, boost, glew +}: + +stdenv.mkDerivation rec { + name = "supertux-${version}"; + version = "0.5.0"; + + src = fetchurl { + url = "https://github.com/SuperTux/supertux/releases/download/v${version}/SuperTux-v${version}-Source.tar.gz"; + sha256 = "0fx7c7m6mfanqy7kln7yf6abb5l3r68picf32js2yls11jj0vbng"; + }; + + nativeBuildInputs = [ pkgconfig cmake ]; + + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis mesa openal boost glew ]; + + cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; + + postInstall = '' + mkdir $out/bin + ln -s $out/games/supertux2 $out/bin + ''; + + meta = with stdenv.lib; { + description = "Classic 2D jump'n run sidescroller game"; + homepage = http://supertux.github.io/; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/games/tinyfugue/default.nix b/pkgs/games/tinyfugue/default.nix new file mode 100644 index 00000000000..dcae182ed17 --- /dev/null +++ b/pkgs/games/tinyfugue/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, ncurses, zlib +, openssl ? null +, sslSupport ? true +}: + +with stdenv.lib; + +assert sslSupport -> openssl != null; + +stdenv.mkDerivation rec { + name = "tinyfugue-${version}"; + version = "50b8"; + verUrl = "5.0%20beta%208"; + + src = fetchurl { + url = "mirror://sourceforge/project/tinyfugue/tinyfugue/${verUrl}/tf-${version}.tar.gz"; + sha256 = "12fra2fdwqj6ilv9wdkc33rkj343rdcf5jyff4yiwywlrwaa2l1p"; + }; + + configureFlags = optional (!sslSupport) "--disable-ssl"; + + buildInputs = + [ ncurses zlib ] + ++ optional sslSupport openssl; + + meta = { + homepage = http://tinyfugue.sourceforge.net/; + description = "A terminal UI, screen-oriented MUD client"; + longDescription = '' + TinyFugue, aka "tf", is a flexible, screen-oriented MUD client, for use + with any type of text MUD. + ''; + license = licenses.gpl2; + platforms = ncurses.meta.platforms; + maintainers = [ maintainers.KibaFox ]; + }; +} diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 1b1e877d274..1ea94a5d2ce 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,13 +1,13 @@ { fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, -libpng, zlib, bash }: +libpng, zlib, bash, makeWrapper }: stdenv.mkDerivation rec { - name = "torcs-1.3.5"; + name = "torcs-1.3.7"; src = fetchurl { url = "mirror://sourceforge/torcs/${name}.tar.bz2"; - sha256 = "170ff98smkkv1sk4nbz9w0alhmmbr32djmgbc08lcfhf0lj2ni38"; + sha256 = "0kdq0sc7dsfzlr0ggbxggcbkivc6yp30nqwjwcaxg9295s3b06wa"; }; patchPhase = '' @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ mesa freeglut libX11 plib openal freealut libXrandr xproto - libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis ]; + libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; nativeBuildInputs = [ bash ]; @@ -23,6 +23,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + postInstall = '' + wrapProgram $out/bin/torcs \ + --prefix LD_LIBRARY_PATH : ${mesa}/lib + ''; + meta = { description = "Car racing game"; homepage = http://torcs.sourceforge.net/; diff --git a/pkgs/games/ut2004/default.nix b/pkgs/games/ut2004/default.nix new file mode 100644 index 00000000000..3f306ac6eb5 --- /dev/null +++ b/pkgs/games/ut2004/default.nix @@ -0,0 +1,9 @@ +{ callPackage }: + +{ + ut2004-demo = callPackage ./demo.nix { }; + + ut2004 = gamePacks: callPackage ./wrapper.nix { + inherit gamePacks; + }; +} diff --git a/pkgs/games/ut2004/demo.nix b/pkgs/games/ut2004/demo.nix new file mode 100644 index 00000000000..f5fcdc088c8 --- /dev/null +++ b/pkgs/games/ut2004/demo.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl }: + +let + arch = + if stdenv.system == "x86_64-linux" then "amd64" + else if stdenv.system == "i686-linux" then "x86" + else throw "Unsupported architecture"; + +in stdenv.mkDerivation rec { + name = "ut2004-demo-${version}"; + version = "3334"; + + src = fetchurl { + url = "http://treefort.icculus.org/ut2004/UT2004-LNX-Demo${version}.run.gz"; + sha256 = "0d5f84qz8l1rg16yzx2k4ikr46n9iwj68na1bqi87wrww7ck6jh7"; + }; + + buildCommand = '' + cat $src | gunzip > setup.run + chmod +x setup.run + ./setup.run --noexec --target . + mkdir $out + tar -xaf ut2004demo.tar.bz2 -C $out + tar -xaf linux-${arch}.tar.bz2 -C $out + + rm $out/System/libSDL-1.2.so.0 + rm $out/System/openal.so + ''; + + dontStrip = true; + dontPatchELF = true; + + meta = with stdenv.lib; { + description = "A first-person shooter video game developed by Epic Games and Digital Extreme -- demo version"; + homepage = "http://www.unrealtournament2004.com"; + license = licenses.unfree; + maintainers = with maintainers; [ abbradar ]; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/pkgs/games/ut2004/wrapper.nix b/pkgs/games/ut2004/wrapper.nix new file mode 100644 index 00000000000..31d0763be4d --- /dev/null +++ b/pkgs/games/ut2004/wrapper.nix @@ -0,0 +1,46 @@ +{ stdenv, lib, runCommand, buildEnv, makeWrapper, makeDesktopItem, gamePacks, libstdcxx5, SDL, openal }: + +let + game = buildEnv { + name = "ut2004-game"; + paths = gamePacks; + ignoreCollisions = true; + pathsToLink = [ "/" "/System" ]; + postBuild = '' + ln -s ${lib.getLib SDL}/lib/libSDL-1.2.so.0 $out/System + ln -s ${lib.getLib openal}/lib/libopenal.so $out/System/openal.so + for i in $out/System/*-bin; do + path="$(readlink -f "$i")" + rm "$i" + cp "$path" "$i" + chmod +w "$i" + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath "$out/System:${lib.makeLibraryPath [ libstdcxx5 ]}" \ + "$i" + done + ''; + }; + + desktop = makeDesktopItem { + name = "ut2004"; + desktopName = "Unreal Tournament 2004"; + comment = "A first-person shooter video game developed by Epic Games and Digital Extreme"; + genericName = "First-person shooter"; + categories = "Application;Game;"; + exec = "ut2004"; + }; + +in runCommand "ut2004" { + nativeBuildInputs = [ makeWrapper ]; +} '' + mkdir -p $out/bin + for i in ${game}/System/*-bin; do + name="$(basename "$i")" + makeWrapper $i $out/bin/''${name%-bin} \ + --run "cd ${game}/System" + done + + mkdir -p $out/share/applications + ln -s ${desktop}/share/applications/* $out/share/applications +'' diff --git a/pkgs/games/ut2004demo/builder.sh b/pkgs/games/ut2004demo/builder.sh deleted file mode 100644 index ca6b4fe1092..00000000000 --- a/pkgs/games/ut2004demo/builder.sh +++ /dev/null @@ -1,29 +0,0 @@ -source $stdenv/setup - -skip=7976 - -bunzip2 < $src | (dd bs=1 count=$skip of=/dev/null && dd bs=1M) | tar xvf - ut2004demo.tar - -mkdir $out - -(cd $out && tar xvf -) < ut2004demo.tar - - -# Patch the executable from ELF OS/ABI type `Linux' (3) to `SVR4' (0). -# This doesn't seem to matter to ld-linux.so.2 at all, except that it -# refuses to load `Linux' executables when invokes explicitly, that -# is, when we do `ld-linux.so.2 $out/System/ut2004-bin', which we need -# to override the hardcoded ELF interpreter with our own. - -# This is a horrible hack, of course. A better solution would be to -# patch Glibc so it accepts the `Linux' ELF type as well (why doesn't -# it?); or to use FreeBSD's `brandelf' program to set to ELF type -# (which is a bit cleaner than patching using `dd' :-) ). - -#(cd $out/System && (echo -en "\000" | dd bs=1 seek=7 of=ut2004-bin conv=notrunc)) - - -# Set the ELF interpreter to our own Glibc. -for i in "$out/System/ucc-bin" "$out/System/ut2004-bin"; do - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" -done diff --git a/pkgs/games/ut2004demo/default.nix b/pkgs/games/ut2004demo/default.nix deleted file mode 100644 index 27b81edf630..00000000000 --- a/pkgs/games/ut2004demo/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{stdenv, fetchurl, xorg, mesa}: - -assert stdenv.system == "i686-linux"; - -let { - - raw = stdenv.mkDerivation { - name = "ut2004-demo-3120"; - src = fetchurl { - urls = [ - ("http://store.node-10.ds-servers.com/file/BcFLgoIgAADQA7kw0qZctDAF+4cj" - + "mbnDMFOJTAyM0-cejkEIuDvQ6Uv9ZbvcWMnRmXXxhA0LyvzoKdvsnXne0D1DGTLiR0" - + "I1CmM2M-E5ryH-tD3yweCXyNyH1WGI3Wh09ja29mHtzGF1rxEyhRfQ7ggCKdfCrhvz" - + "H9oTJXSCAtGuSKdVDhe6tNtrqa151MIircZtRLPxQcGmJ+n3-iUeWYgHuqbmrK4ur7" - + "Qcy6QrAhYa+e5jcfYjgPF3VGsw4qx+0ilxJUCiuYCX2H8A6X3rxJILa26w3O425W2G" - + "kHPiQWrhFT8cIOyqSr8+dMO5Xi5-/ut2004-lnx-demo-3120.run.bz2") - http://ftp.gameaholic.com/pub/demos/ut2004-lnx-demo-3120.run.bz2 - ]; - sha256 = "1lravfkb1gsallqqird5dcbz42vwjg36m1qk76nmmnyyyghwqnli"; - }; - builder = ./builder.sh; - }; - - body = stdenv.mkDerivation { - name = raw.name; - builder = ./make-wrapper.sh; - inherit raw mesa; - inherit (xorg) libX11 libXext; - }; - -} - -# http://mirror1.icculus.org/ut2004/ut2004-lnxpatch3204.tar.bz2 -# 5f659552095b878a029b917d216d9664 diff --git a/pkgs/games/ut2004demo/make-wrapper.sh b/pkgs/games/ut2004demo/make-wrapper.sh deleted file mode 100644 index 53ef90a615b..00000000000 --- a/pkgs/games/ut2004demo/make-wrapper.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -mkdir -p $out/bin - -cat > $out/bin/ut2004demo < override useragent + curlOpts = "-A ''"; + url = "http://cdn.kyostatics.net/dlc/ru/driver/all/linuxdrv_1_1203_fs-1x2xmfp.-downloadcenteritem-Single-File.downloadcenteritem.tmp/LinuxDrv_1.1203_FS-1x2xMFP.zip"; + sha256 = "0z1pbgidkibv4j21z0ys8cq1lafc6687syqa07qij2qd8zp15wiz"; + }; + + installPhase = '' + tar -xvf ${platform}/Global/English.tar.gz + install -Dm755 English/rastertokpsl $out/lib/cups/filter/rastertokpsl + patchelf \ + --set-rpath ${libPath} \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/lib/cups/filter/rastertokpsl + + mkdir -p $out/share/cups/model/Kyocera + cd English + for i in *.ppd; do + sed -i $i -e \ + "s,/usr/lib/cups/filter/rastertokpsl,$out/lib/cups/filter/rastertokpsl,g" + cp $i $out/share/cups/model/Kyocera + done; + ''; + + meta = with lib; { + description = "CUPS drivers for several Kyocera FS-{1020,1025,1040,1060,1120,1125} printers"; + homepage = "https://www.kyoceradocumentsolutions.ru/index/service_support/download_center.false.driver.FS1040._.EN.html#"; + license = licenses.unfree; + maintainers = [ maintainers.vanzef ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcj470dw/default.nix b/pkgs/misc/cups/drivers/mfcj470dw/default.nix deleted file mode 100644 index b8458ae0af3..00000000000 --- a/pkgs/misc/cups/drivers/mfcj470dw/default.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ stdenv, fetchurl, cups, dpkg, ghostscript, patchelf, a2ps, coreutils, gnused, gawk, file }: - -stdenv.mkDerivation rec { - name = "mfcj470dw-cupswrapper-${version}"; - version = "3.0.0-1"; - - srcs = - [ (fetchurl { - url = "http://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb"; - sha256 = "7202dd895d38d50bb767080f2995ed350eed99bc2b7871452c3c915c8eefc30a"; - }) - (fetchurl { - url = "http://download.brother.com/welcome/dlf006845/mfcj470dwcupswrapper-${version}.i386.deb"; - sha256 = "92af9024e821159eccd78a8925fc77fb92b4f247f2d2c824ca303004077076a7"; - }) - ]; - - buildInputs = [ cups ghostscript dpkg a2ps ]; - - unpackPhase = "true"; - - installPhase = '' - for s in $srcs; do dpkg-deb -x $s $out; done - - substituteInPlace $out/opt/brother/Printers/mfcj470dw/cupswrapper/cupswrappermfcj470dw \ - --replace /opt "$out/opt" \ - --replace /usr "$out/usr" \ - --replace /etc "$out/etc" - - substituteInPlace $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw \ - --replace /opt "$out/opt" \ - --replace file "${file}/bin/file" \ - --replace sed "${gnused}/bin/sed" \ - --replace mktemp "${coreutils}/bin/mktemp" \ - --replace cat "${coreutils}/bin/cat" \ - --replace rm "${coreutils}/bin/rm" - - sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2 - substituteInPlace $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2 \ - --replace awk "${gawk}/bin/awk" \ - --replace cat "${coreutils}/bin/cat" \ - --replace mktemp "${coreutils}/bin/mktemp" \ - --replace sed "${gnused}/bin/sed" \ - --replace expr "${coreutils}/bin/expr" \ - --replace rm "${coreutils}/bin/rm" - - patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter - patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1 - - mkdir -p $out/lib/cups/filter/ - ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw - ''; - - meta = { - homepage = http://www.brother.com/; - description = "A driver for brother mfcj470dw printers to print over WiFi and USB"; - license = stdenv.lib.licenses.unfree; - platforms = stdenv.lib.platforms.linux; - downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; - }; -} diff --git a/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix new file mode 100644 index 00000000000..5a828c265b5 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcj470dwcupswrapper/default.nix @@ -0,0 +1,56 @@ +{ stdenv, fetchurl, mfcj470dwlpr, makeWrapper}: + +stdenv.mkDerivation rec { + name = "mfcj470dw-cupswrapper-${version}"; + version = "3.0.0-1"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf006866/mfcj470dw_cupswrapper_GPL_source_${version}.tar.gz"; + sha256 = "b88f9b592723a00c024129560367f40a560ca3cba06fd99512ab368dd6855853"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ mfcj470dwlpr ]; + + patchPhase = '' + WRAPPER=cupswrapper/cupswrappermfcj470dw + + substituteInPlace $WRAPPER \ + --replace /opt "${mfcj470dwlpr}/opt" \ + --replace /usr "${mfcj470dwlpr}/usr" \ + --replace /etc "$out/etc" + + substituteInPlace $WRAPPER \ + --replace "\`cp " "\`cp -p " \ + --replace "\`mv " "\`cp -p " + ''; + + buildPhase = '' + cd brcupsconfpt1 + make all + cd .. + ''; + + installPhase = '' + TARGETFOLDER=$out/opt/brother/Printers/mfcj470dw/cupswrapper/ + mkdir -p $out/opt/brother/Printers/mfcj470dw/cupswrapper/ + + cp brcupsconfpt1/brcupsconfpt1 $TARGETFOLDER + cp cupswrapper/cupswrappermfcj470dw $TARGETFOLDER/ + cp PPD/brother_mfcj470dw_printer_en.ppd $TARGETFOLDER/ + ''; + + cleanPhase = '' + cd brcupsconfpt1 + make clean + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother MFC-J470DW CUPS wrapper driver"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; + maintainers = [ stdenv.lib.maintainers.yochai ]; + }; +} diff --git a/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix new file mode 100644 index 00000000000..c80009bd844 --- /dev/null +++ b/pkgs/misc/cups/drivers/mfcj470dwlpr/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, cups, dpkg, ghostscript, patchelf, a2ps, coreutils, gnused, gawk, file, makeWrapper }: + +stdenv.mkDerivation rec { + name = "mfcj470dw-cupswrapper-${version}"; + version = "3.0.0-1"; + + src = fetchurl { + url = "http://download.brother.com/welcome/dlf006843/mfcj470dwlpr-${version}.i386.deb"; + sha256 = "7202dd895d38d50bb767080f2995ed350eed99bc2b7871452c3c915c8eefc30a"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ cups ghostscript dpkg a2ps ]; + + unpackPhase = "true"; + + installPhase = '' + dpkg-deb -x $src $out + + substituteInPlace $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw \ + --replace /opt "$out/opt" \ + + sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2 + + patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter + + mkdir -p $out/lib/cups/filter/ + ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw + + wrapProgram $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2 \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ gnused coreutils gawk ] } + + wrapProgram $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw \ + --prefix PATH ":" ${ stdenv.lib.makeBinPath [ ghostscript a2ps file gnused coreutils ] } + ''; + + meta = { + homepage = http://www.brother.com/; + description = "Brother MFC-J470DW LPR driver"; + license = stdenv.lib.licenses.unfree; + platforms = stdenv.lib.platforms.linux; + downloadPage = http://support.brother.com/g/b/downloadlist.aspx?c=us&lang=en&prod=mfcj470dw_us_eu_as&os=128; + maintainers = [ stdenv.lib.maintainers.yochai ]; + }; +} diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch index 78d278f186b..fb546b6a25b 100644 --- a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch +++ b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch @@ -1,5 +1,5 @@ diff --git a/configure b/configure_new -index 3d6f68c..c2b10ff 100755 +index 699bcb5..89a1832 100755 --- a/configure +++ b/configure_new @@ -11585,55 +11585,8 @@ else diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix index 2f126a9cfe4..3f86d4e725d 100644 --- a/pkgs/misc/drivers/epson-escpr/default.nix +++ b/pkgs/misc/drivers/epson-escpr/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, cups }: let - version = "1.6.5"; + version = "1.6.8"; in stdenv.mkDerivation { name = "epson-escpr-${version}"; src = fetchurl { - url = "https://download3.ebz.epson.net/dsc/f/03/00/04/54/27/b73564748bfde7b7ce625e20d4a3257d447bec79/epson-inkjet-printer-escpr-1.6.5-1lsb3.2.tar.gz"; - sha256 = "1cd9e0506bf181e1476bd8305f1c6b8dbc4354eab9415d0d5529850856129e4c"; + url = "https://download3.ebz.epson.net/dsc/f/03/00/05/10/61/125006df4ffc84861395c1158a02f1f73e6f1753/epson-inkjet-printer-escpr-1.6.8-1lsb3.2.tar.gz"; + sha256 = "02v8ljzw6xhfkz1x8m50mblcckgfbpa89fc902wcmi2sy8fihgh4"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix index 298cba88a9f..ae96a946e79 100644 --- a/pkgs/misc/drivers/hplip/3.15.9.nix +++ b/pkgs/misc/drivers/hplip/3.15.9.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { pythonPath = with pythonPackages; [ dbus pillow - pygobject + pygobject2 recursivePthLoader reportlab usbutils diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 74204cd4e54..bf0af6b806f 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -40,7 +40,7 @@ let hplipArch = hplipPlatforms."${stdenv.system}" or (throw "HPLIP not supported on ${stdenv.system}"); - pluginArches = [ "x86_32" "x86_64" ]; + pluginArches = [ "x86_32" "x86_64" "arm32" ]; in @@ -71,7 +71,7 @@ stdenv.mkDerivation { pythonPath = with pythonPackages; [ dbus pillow - pygobject + pygobject2 recursivePthLoader reportlab usbutils diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix index 13ca367734c..04930a5e573 100644 --- a/pkgs/misc/emulators/cdemu/gui.nix +++ b/pkgs/misc/emulators/cdemu/gui.nix @@ -1,9 +1,11 @@ -{ callPackage, python, pygobject3, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: -let pkg = import ./base.nix { - version = "3.0.1"; - pkgName = "gcdemu"; - pkgSha256 = "1dlng1bvhns7f0ff5p89npsm2nznfqnaspr0alfh4fl0f11cvnfr"; -}; +{ callPackage, pythonPackages, gtk3, glib, libnotify, intltool, makeWrapper, gobjectIntrospection, gnome3, gdk_pixbuf, librsvg }: +let + pkg = import ./base.nix { + version = "3.0.1"; + pkgName = "gcdemu"; + pkgSha256 = "1dlng1bvhns7f0ff5p89npsm2nznfqnaspr0alfh4fl0f11cvnfr"; + }; + inherit (pythonPackages) python pygobject3; in callPackage pkg { buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper gnome3.defaultIconTheme gdk_pixbuf librsvg ]; diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index bbd25f2b3de..bb5b12038f8 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True ''; diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 4d8b8ac0eb6..990870d35d6 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DCMAKE_BUILD_TYPE=Release -DENABLE_LTO=True ''; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 0f85331bdd5..f7d94bcad47 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,24 +1,18 @@ { stdenv, fetchurl, pkgconfig -, gettext, gtk, SDL, zlib, glib, openal, mesa, lua, freetype }: +, gettext, gtk2, SDL2, zlib, glib, openal, mesa, lua, freetype, libmpeg2, zip }: with stdenv.lib; -stdenv.mkDerivation rec{ +stdenv.mkDerivation rec { name = "fs-uae-${version}"; - version = "2.4.3"; + version = "2.8.0"; src = fetchurl { - urls = [ "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz" ]; - sha256 = "05wngvpqj8kj4wzi5jzzhvs19iljb3m6ba1l2hk4rz68b400ndv6"; + url = "http://fs-uae.net/fs-uae/stable/${version}/${name}.tar.gz"; + sha256 = "1cvvlkzhh4rrpax7505bngw990rx86l1nhad174zpqc9ah93il25"; }; - buildInputs = [ pkgconfig gettext gtk SDL zlib glib openal mesa lua freetype ]; - - phases = "unpackPhase buildPhase installPhase"; - - # Strange: the docs recommend SDL2, but it does compile only with SDL1 - buildPhase = "make sdl=1"; - installPhase = "make install prefix=$out"; + buildInputs = [ pkgconfig gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; @@ -30,9 +24,8 @@ stdenv.mkDerivation rec{ ''; license = licenses.gpl2Plus; homepage = http://fs-uae.net; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with stdenv.lib; [ maintainers.AndersonTorres ]; platforms = stdenv.lib.platforms.linux; }; } # TODO: testing and Python GUI support -# TODO: SDL2 support diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 217468c5bd2..34507a25252 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, SDL, nasm, zlib, libpng, mesa }: +{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, mesa }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833"; }; - buildInputs = [ pkgconfig gtk SDL nasm zlib libpng mesa ]; + buildInputs = [ pkgconfig gtk2 SDL nasm zlib libpng mesa ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index b8acf36cfd0..8d3537b0ee6 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -4,7 +4,7 @@ , udev , mesa, SDL , libao, openal, libpulseaudio -, gtk, gtksourceview +, gtk2, gtksourceview }: with stdenv.lib; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include ' -i higan/fc/ppu/ppu.cpp"; buildInputs = - [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk gtksourceview ]; + [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk2 gtksourceview ]; unpackPhase = '' 7z x $src diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 990f1e7106e..8f232a6023c 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk, GConf, mesa +{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, mesa , expat, zlib }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; buildInputs = - [ unzip pkgconfig SDL gtk GConf mesa expat zlib ]; + [ unzip pkgconfig SDL gtk2 GConf mesa expat zlib ]; installPhase = '' diff --git a/pkgs/misc/emulators/mgba/default.nix b/pkgs/misc/emulators/mgba/default.nix index a38576dcbe4..7724d3d8d1b 100644 --- a/pkgs/misc/emulators/mgba/default.nix +++ b/pkgs/misc/emulators/mgba/default.nix @@ -1,21 +1,20 @@ -{ stdenv, fetchgit +{ stdenv, fetchFromGitHub , pkgconfig, cmake, libzip, epoxy, ffmpeg, imagemagick, SDL2 , qtbase, qtmultimedia }: stdenv.mkDerivation rec { - name = "mgba-git-${version}"; - version = "20160325"; + name = "mgba-${version}"; + version = "0.5.1"; - src = fetchgit { - url = "https://github.com/mgba-emu/mgba.git"; - rev = "be2641c77b4a438e0db487bc82b43bc27a26e0c2"; - sha256 = "1wxywfbkgqvb0j9cyz4nwsfzhxrdjcmvz1k7rljmy4bz1pjcglj1"; + src = fetchFromGitHub { + owner = "mgba-emu"; + repo = "mgba"; + rev = version; + sha256 = "1ysxyy888qdwjbgsh3xdzsx8f3a5yd1gqx54xvndpv9v3zqgr2jf"; }; - buildInputs = [ - pkgconfig cmake libzip epoxy ffmpeg imagemagick SDL2 - qtbase qtmultimedia - ]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ libzip epoxy ffmpeg imagemagick SDL2 qtbase qtmultimedia ]; meta = with stdenv.lib; { homepage = https://mgba.io; diff --git a/pkgs/misc/emulators/mupen64plus/default.nix b/pkgs/misc/emulators/mupen64plus/default.nix index 07174d76e4e..0e3c156c16a 100644 --- a/pkgs/misc/emulators/mupen64plus/default.nix +++ b/pkgs/misc/emulators/mupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}: +{stdenv, fetchurl, which, pkgconfig, SDL, gtk2, mesa, SDL_ttf}: stdenv.mkDerivation { name = "mupen64plus-1.5"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq"; }; - buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ]; + buildInputs = [ which pkgconfig SDL gtk2 mesa SDL_ttf ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 99de1ae0d17..c6f4df1e5c0 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: +{stdenv, fetchurl, nasm, SDL, zlib, libpng, ncurses, mesa, intltool, gtk2, pkgconfig, libxml2, xlibsWrapper, libpulseaudio}: stdenv.mkDerivation rec { name = "snes9x-gtk-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "9f7c5d2d0fa3fe753611cf94e8879b73b8bb3c0eab97cdbcb6ab7376efa78dc3"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk pkgconfig libxml2 xlibsWrapper libpulseaudio]; + buildInputs = [ nasm SDL zlib libpng ncurses mesa intltool gtk2 pkgconfig libxml2 xlibsWrapper libpulseaudio]; sourceRoot = "snes9x-${version}-src/gtk"; diff --git a/pkgs/misc/emulators/uae/default.nix b/pkgs/misc/emulators/uae/default.nix index ceafc714381..ca1881bdd5f 100644 --- a/pkgs/misc/emulators/uae/default.nix +++ b/pkgs/misc/emulators/uae/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, gtk, alsaLib, SDL}: +{stdenv, fetchurl, pkgconfig, gtk2, alsaLib, SDL}: stdenv.mkDerivation rec { name = "uae-0.8.29"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-sdl" "--with-sdl-sound" "--with-sdl-gfx" "--with-alsa" ]; - buildInputs = [ pkgconfig gtk alsaLib SDL ]; + buildInputs = [ pkgconfig gtk2 alsaLib SDL ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index dd2c2380a8e..6251282aae3 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11 -, pkgconfig, gtk, SDL, autoreconfHook, makeDesktopItem +, pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl libpng giflib libjpeg alsaLib readline mesa - pkgconfig gtk SDL autoreconfHook ]; + pkgconfig gtk2 SDL autoreconfHook ]; configureFlags = "--with-sdl --enable-fullscreen --enable-gnomeui"; desktopItem = makeDesktopItem { diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index e35e319a57f..66ea152b274 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optional pulseaudioSupport pkgs.libpulseaudio ++ lib.optional xineramaSupport pkgs.xorg.libXinerama ++ lib.optionals gstreamerSupport (with pkgs.gst_all; [ gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly gst-ffmpeg ]) - ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.gnome.glib ] + ++ lib.optionals gtkSupport [ pkgs.gtk3 pkgs.glib ] ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.opencl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 92ed55be2de..40845a0988c 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -6,57 +6,57 @@ let fetchurl = args@{url, sha256, ...}: in rec { stable = fetchurl rec { - version = "1.8.3"; - url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "0v3sq5zzj3z5pw1aicn7i03pgf41cr9fr0vg1sazwfxrmbvwvknp"; + version = "1.8.4"; + url = "https://dl.winehq.org/wine/source/1.8/wine-${version}.tar.bz2"; + sha256 = "0yahh1n3s3y0bp1a1sr3zpna56749jdgr85hwmpq393pjx1i0pai"; ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { version = "2.40"; - url = "mirror://sourceforge/wine/wine_gecko-${version}-x86.msi"; + url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s"; }; gecko64 = fetchurl rec { version = "2.40"; - url = "mirror://sourceforge/wine/wine_gecko-${version}-x86_64.msi"; + url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3"; }; ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "4.5.6"; - url = "mirror://sourceforge/wine/wine-mono-${version}.msi"; - sha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c"; + version = "4.6.3"; + url = "http://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}.msi"; + sha256 = "1f98xwgv665zb9cwc5zphcdbffyh3sm26h62hzca6zlcwy5fi0zq"; }; }; unstable = fetchurl rec { - version = "1.9.16"; - url = "mirror://sourceforge/wine/wine-${version}.tar.bz2"; - sha256 = "010gjib4nhrn9j9q12v5irda8df8xp17a6v6qqskkadd79kxc871"; + version = "1.9.20"; + url = "https://dl.winehq.org/wine/source/1.9/wine-${version}.tar.bz2"; + sha256 = "1pvrlawp079qg74q348v9p2qzlj4aqibxxwn4vqid69j883g6s97"; inherit (stable) mono; gecko32 = fetchurl rec { - version = "2.44"; + version = "2.47"; url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi"; - sha256 = "0fbd8pxkihhfxs5mcx8n0rcygdx43qdrp2x8hq1s1cvifp8lm9kp"; + sha256 = "0fk4fwb4ym8xn0i5jv5r5y198jbpka24xmxgr8hjv5b3blgkd2iv"; }; gecko64 = fetchurl rec { - version = "2.44"; + version = "2.47"; url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi"; - sha256 = "0qb6zx4ycj37q26y2zn73w49bxifdvh9n4riy39cn1kl7c6mm3k2"; + sha256 = "0zaagqsji6zaag92fqwlasjs8v9hwjci5c2agn9m7a8fwljylrf5"; }; }; staging = fetchFromGitHub rec { inherit (unstable) version; - sha256 = "0rcy0i36jxv2akczd4sfrdmlsqxmj5v0wzvqb3xl8p2mldk9i8yl"; + sha256 = "1hk20axv0hppi5rqgslibwfjmcpjks3xa2dxi5v1y27qqhphvxpl"; owner = "wine-compholio"; repo = "wine-staging"; rev = "v${version}"; }; winetricks = fetchFromGitHub rec { - version = "20160622"; - sha256 = "0xh7mc5xby0zxx2g3q1ky18s20y6s7wp3vzvgxydwzhhwf32189q"; + version = "20160724"; + sha256 = "0nl8gnmsqwwrc8773q8py64kv3r5836xjxsnxjv91n4hhmvgyrzs"; owner = "Winetricks"; repo = "winetricks"; rev = version; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index 8ad0ca39b07..02f93eb931d 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, fetchpatch, nasm, SDL, zlib, libpng, ncurses, mesa +{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, mesa , makeDesktopItem }: let @@ -15,35 +15,22 @@ let in stdenv.mkDerivation { name = "zsnes-1.51"; - src = fetchurl { - url = mirror://sourceforge/zsnes/zsnes151src.tar.bz2; - sha256 = "08s64qsxziv538vmfv38fg1rfrz5k95dss5zdkbfxsbjlbdxwmi8"; + src = fetchFromGitHub { + owner = "emillon"; + repo = "zsnes"; + rev = "fc160b2538738995f600f8405d23a66b070dac02"; + sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v"; }; - patches = [ (fetchpatch { - url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0003-gcc-4.3-ftbfs.patch"; - sha256 = "1rlqjxnx21iz03414bamqrpysaxbvmfacfnk111233yxjd4vhq89"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0009-hat-events.patch"; - sha256 = "1az5vxjff22hqlsv0nmliax3ziwcr9kc75na805v9f66s8fmj5rf"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0010-Fix-build-with-libpng-1.5.patch"; - sha256 = "1vjfraxjw6f496j3w8r581m3lbn16s0nx3hskzj14hl9ycfskhnr"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/0012-Fix-build-with-gcc-4.7.patch"; - sha256 = "1d8m0vxi8wf9z4wfjx2cc48p1wy2qadgvcm88dg1jncg334jwfrg"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/emillon/zsnes/fc160b2538738995f600f8405d23a66b070dac02/debian/patches/zsnes-linux-resume-freeze-fix.patch"; - sha256 = "0gvf6gsqxxfah1s80ya2l5yils2kv9xa6faajdyby7xipzkc6qc7"; - }) - ]; - buildInputs = [ nasm SDL zlib libpng ncurses mesa ]; + prePatch = '' + for i in $(cat debian/patches/series); do + echo "applying $i" + patch -p1 < "debian/patches/$i" + done + ''; + preConfigure = '' cd src sed -i "/^STRIP/d" configure diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 3540119e665..276c311fa45 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 -, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false }: stdenv.mkDerivation rec { - version = "5.35"; + version = "5.36"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "08kbb0ry7ih436ab4i5g6lnhaaz13zkcdmbdibrn4j5gm5qq8v0y"; + sha256 = "0v60mdhvv42jla5hljp77igng11kxpah5fs9j7ci65kz0hw552vb"; }; buildInputs = - [ pkgconfig bc perl libjpeg mesa gtk libxml2 libglade pam + [ pkgconfig bc perl libjpeg mesa gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle ]; diff --git a/pkgs/misc/screensavers/xss-lock/default.nix b/pkgs/misc/screensavers/xss-lock/default.nix index a2599d5ebee..7aada471145 100644 --- a/pkgs/misc/screensavers/xss-lock/default.nix +++ b/pkgs/misc/screensavers/xss-lock/default.nix @@ -13,10 +13,6 @@ stdenv.mkDerivation { buildInputs = [ cmake pkgconfig docutils glib libpthreadstubs libXau libXdmcp xcbutil ]; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - ]; - meta = with stdenv.lib; { description = "Use external locker (such as i3lock) as X screen saver"; license = licenses.mit; diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix index db1c94d7a86..8e9083d9922 100644 --- a/pkgs/misc/solfege/default.nix +++ b/pkgs/misc/solfege/default.nix @@ -1,10 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, python, pygtk, gettext, texinfo +{ stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo , ghostscript, pysqlite, librsvg, gdk_pixbuf, txt2man, timidity, mpg123 , alsaUtils, vorbis-tools, csound, lilypond , makeWrapper }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) python pygtk; +in stdenv.mkDerivation rec { name = "solfege-3.22.2"; src = fetchurl { diff --git a/pkgs/misc/themes/arc/default.nix b/pkgs/misc/themes/arc/default.nix index 025ef0913be..b7ff36c0917 100644 --- a/pkgs/misc/themes/arc/default.nix +++ b/pkgs/misc/themes/arc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk, gtk-engine-murrine }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gnome3, gtk-engine-murrine }: stdenv.mkDerivation rec { version = "2016-06-06"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { preferLocalBuild = true; - configureFlags = "--with-gnome=${gnome3.version}"; + configureFlags = "--with-gnome=${gnome3.version} "; meta = with stdenv.lib; { description = "A flat theme with transparent elements for GTK 3, GTK 2 and Gnome-Shell"; diff --git a/pkgs/misc/themes/flat-plat/default.nix b/pkgs/misc/themes/flat-plat/default.nix index da28f1892df..342fc1277c9 100644 --- a/pkgs/misc/themes/flat-plat/default.nix +++ b/pkgs/misc/themes/flat-plat/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A Material Design-like flat theme for GTK3, GTK2, and GNOME Shell"; homepage = https://github.com/nana-4/Flat-Plat; - licence = licenses.gpl2; + license = licenses.gpl2; maintainers = [ maintainers.mounium ]; platforms = platforms.all; }; diff --git a/pkgs/misc/themes/greybird/default.nix b/pkgs/misc/themes/greybird/default.nix index 05fc2ab6103..6adedcb0d8d 100644 --- a/pkgs/misc/themes/greybird/default.nix +++ b/pkgs/misc/themes/greybird/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, autoreconfHook, sass, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }: stdenv.mkDerivation rec { - pname = "Greybird"; - version = "2016-08-16"; name = "${pname}-${version}"; + pname = "Greybird"; + version = "2016-09-13"; src = fetchFromGitHub { repo = "${pname}"; owner = "shimmerproject"; - rev = "fcaa400df68b1a29bb9dc8eb9c772a241f17c9ea"; - sha256 = "02f2zlkhi2als39ajq3v91iik708g5a9iyl3cvd65n80gr4jifmr"; + rev = "1942afc8732f904a1139fd41d7afd74263b87887"; + sha256 = "0qawc7rx5s3mnk5awvlbp6k5m9aj5krb1lasmgl2cb9fk09khf2v"; }; nativeBuildInputs = [ autoreconfHook sass glib libxml2 gdk_pixbuf librsvg ]; @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { meta = { description = "Grey and blue theme (Gtk, Xfce, Emerald, Metacity, Mutter, Unity)"; - homepage = http://shimmerproject.org/our-projects/greybird/; + homepage = https://github.com/shimmerproject/Greybird; license = with stdenv.lib.licenses; [ gpl2Plus cc-by-nc-sa-30 ]; - maintainers = [ stdenv.lib.maintainers.romildo ]; platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.romildo ]; }; } diff --git a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix index 100b280ef57..ad13b5f17ab 100644 --- a/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix +++ b/pkgs/misc/themes/gtk2/oxygen-gtk/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, - cmake, dbus_glib, glib, gtk, gdk_pixbuf, pkgconfig, xorg }: + cmake, dbus_glib, glib, gtk2, gdk_pixbuf, pkgconfig, xorg }: stdenv.mkDerivation rec { version = "1.4.6"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "09mz4szsz3yswbj0nbw6qzlc5bc4id0f9r6ifm60b5nc8x1l72d2"; }; - buildInputs = [ cmake dbus_glib glib gtk gdk_pixbuf + buildInputs = [ cmake dbus_glib glib gtk2 gdk_pixbuf pkgconfig xorg.libXau xorg.libXdmcp xorg.libpthreadstubs xorg.libxcb xorg.pixman ]; diff --git a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix b/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix index 905e26998a0..bea08bcdf14 100644 --- a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix +++ b/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { version = "5.0.7"; diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index f71a2e21a4d..d2eee8c2cac 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost -{ fetchurl, bash, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip -, which, fetchgit, fetchFromGitHub, fetchhg, fetchzip, llvmPackages, zip -, vim_configurable, vimPlugins, xkb_switch, git, rustracerd, fzf +{ fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip +, which, fetchgit, llvmPackages +, xkb_switch, rustracerd, fzf , Cocoa ? null }: @@ -80,7 +80,9 @@ rec { neosnippet = neosnippet-vim; nerdcommenter = The_NERD_Commenter; nerdtree = The_NERD_tree; + polyglot = vim-polyglot; quickrun = vim-quickrun; + repeat = vim-repeat; signature = vim-signature; stylish-haskell = vim-stylish-haskell; stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 @@ -92,6 +94,7 @@ rec { tmux-navigator = vim-tmux-navigator; tmuxNavigator = tmux-navigator; # backwards compat, added 2014-10-18 tslime = tslime-vim; + unite = unite-vim; vimproc = vimproc-vim; vimshell = vimshell-vim; watchdogs = vim-watchdogs; @@ -101,7 +104,7 @@ rec { fzfWrapper = buildVimPluginFrom2Nix { name = fzf.name; - src = "${fzf}/share/go/src/github.com/junegunn/fzf"; + src = fzf.src; dependencies = []; }; @@ -174,11 +177,11 @@ rec { }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2016-07-21"; + name = "Syntastic-2016-10-04"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "663fea9dc9371d574f1a4a6ba15cc9e60ebbe510"; - sha256 = "1y37m1iikki13y6rpzfgdyadd565q9zixg6xkly34bgbp1yrq5g0"; + rev = "75b1095586b1cb685ccb0e69004bcd4ae75b37da"; + sha256 = "1hlw6ahlfm4k837zy079acv4lih2r2l9d8fwzb8d970r55p6qffb"; }; dependencies = []; @@ -196,44 +199,44 @@ rec { }; Tagbar = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Tagbar-2015-06-19"; + name = "Tagbar-2016-09-25"; src = fetchgit { url = "git://github.com/majutsushi/tagbar"; - rev = "7b36c46d17d57db34fdb0adac9ba6382d0bb5e66"; - sha256 = "10n1c55r2arj89man01hq9dlp2lwya9gma2jh8lhhy8p9zfl95w6"; + rev = "2955f71856536d503c79c15daab3de890a6d83e9"; + sha256 = "16hz3mvfz4q4sxg2vq2m2gkmpwhchql14yxw1ws05qqnyy0jbxk2"; }; dependencies = []; }; The_NERD_Commenter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_Commenter-2016-07-14"; + name = "The_NERD_Commenter-2016-08-31"; src = fetchgit { url = "git://github.com/scrooloose/nerdcommenter"; - rev = "c3d6a2069bb0286c9633fbbffb4983797f7b8822"; - sha256 = "0xwnx8ggqpik9jnyb4a69v7z789ffrfnxc3frl644x7bhndgaa1v"; + rev = "fdc611c8f4dbb5bed57fe95d076cf82e9bcb5e7d"; + sha256 = "0qdryph7mjny3vcb6255q75fykxps7wvyzibfb3lxrkvqv6i1dlr"; }; dependencies = []; }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2016-06-23"; + name = "The_NERD_tree-2016-10-04"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "2e2b649232d6ae4d02d74793e5da0ee08480ad8d"; - sha256 = "1rfm6w60bk168y1l9hjjxd4840j1jr1h0s77lsdjr9wxpxbw59ml"; + rev = "f26eaf83551631e683e339f00e2c97bd6e8356d7"; + sha256 = "0vljxnnlm7sdhb61z4114lzjy6gi59y3ym5fynplvccsbv0s47r2"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2016-07-07"; + name = "UltiSnips-2016-09-19"; src = fetchgit { url = "git://github.com/SirVer/ultisnips"; - rev = "e8c485eb3c7e2c4c3ddc62beb79011f026a3ca04"; - sha256 = "03cdpz136ry6v7h0sddlyvgxwvp3bl1ir7451v3sd6q867ywvbs7"; + rev = "97a280417b9ebcd098283b46ba9f144c6344bb8d"; + sha256 = "030n4f5mwxlq6qfizh82s5h8zlfm3qdh0lc3rc01p0nwbgpvyrg3"; }; dependencies = []; @@ -289,16 +292,33 @@ rec { }; ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-py-matcher-2016-06-22"; + name = "ctrlp-py-matcher-2016-09-02"; src = fetchgit { url = "git://github.com/FelikZ/ctrlp-py-matcher"; - rev = "fb831ff903d5622b39f400fc8ba80f9bbd225307"; - sha256 = "0zamyhxn910q6yyja6ypc92pxr47n28yzb6h90x20z0q2wka5842"; + rev = "3624f3a085681f787f1f9b7a8a24d4bed395acf1"; + sha256 = "1126gphnhfvba5xzvqj4s582k61xsvi5hn86zag42v14v5csgw9d"; }; dependencies = []; }; + ctrlp-cmatcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-cmatcher-2016-09-22"; + src = fetchgit { + url = "git://github.com/JazzCore/ctrlp-cmatcher"; + rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; + sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; + }; + dependencies = []; + + buildInputs = [ python ]; + + buildPhase = '' + patchShebangs . + ./install.sh + ''; + }; + ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "ctrlp-z-2015-10-17"; src = fetchgit { @@ -322,11 +342,11 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2016-07-06"; + name = "fugitive-2016-08-08"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "c00ebd75ac23f4080c0d0bf9453b16304a3fb316"; - sha256 = "0j8vy6n70m02k2iq4y4nbpc0jnzk1ag51qnnbxj7aad4hkn8hban"; + rev = "aac85a268e89a6c8be79341e130ac90256fadbd6"; + sha256 = "1hsq8lgw1gn99y0rr214bcc9vlw0kx8yajci7dimwhbh817kq5v4"; }; dependencies = []; @@ -344,44 +364,44 @@ rec { }; vim-auto-save = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-auto-save-2016-07-20"; + name = "vim-auto-save-2016-09-12"; src = fetchgit { url = "git://github.com/907th/vim-auto-save"; - rev = "ef54e6c66c5a2ffeb39b45db731f00e1811f7334"; - sha256 = "03kbphnkcxvbvvanzj22j0rkhp19dbbmqqsgypdz7avx9bra3nxw"; + rev = "28300c8a7b8cea137c065a48fd9bcc2348f08707"; + sha256 = "0n3xbp8vf3xsh6y6f855q313scldqm9593bhxydyszy1parvxwb5"; }; dependencies = []; }; vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-autoformat-2016-07-08"; + name = "vim-autoformat-2016-09-09"; src = fetchgit { url = "git://github.com/Chiel92/vim-autoformat"; - rev = "06251ab31789b6c478358306ab0e476c7d03b0d5"; - sha256 = "0q749lbz1zzajdwyyznyg7h4mf2sdd0sq77dr24szs4f937zy007"; + rev = "f6fabad46f34afd75ae74995c10813eab7021bbf"; + sha256 = "1n9ij49npiksdhzdkv2wn6cx2kyn62f3j2ins0ng85kzgh83a0jc"; }; dependencies = []; }; vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nix-2016-05-31"; + name = "vim-nix-2016-08-07"; src = fetchgit { url = "git://github.com/LnL7/vim-nix"; - rev = "9ac8876e5beb824018b9a09d4640f7efc2fbc8ae"; - sha256 = "0whdf56c63vp4c3b2jfl1x5c0dxxrzwvxkfm5951qzpfy6xwg27x"; + rev = "a61495a762feacc00f24cab4392b09cc3250decf"; + sha256 = "0icq9nawm6s4qzb9q62y3fdq4ixbfwmmgk141fnfqzq6ya1azxac"; }; dependencies = []; }; deoplete-nvim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-nvim-2016-07-26"; + name = "deoplete-nvim-2016-10-01"; src = fetchgit { url = "git://github.com/Shougo/deoplete.nvim"; - rev = "cd52ac6c076720541c6b9a82581622f597778e97"; - sha256 = "0rd9hdhk800nj5sz52zabxb2im75ckq2jmrqhff0n5dlmc61hdd2"; + rev = "0e663c022a8f9b318ad494de4246754ad34effb3"; + sha256 = "1w3riv8x8x4hgdyhabcis25f1scapgw9r4xzlnfrz809l25wwxds"; }; dependencies = []; @@ -410,22 +430,22 @@ rec { }; vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-css-color-2016-07-21"; + name = "vim-css-color-2016-09-06"; src = fetchgit { url = "git://github.com/ap/vim-css-color"; - rev = "e2017678257fa8a175e4ab1191f9cfbe8cab39b2"; - sha256 = "1179kcm44sssw09lj38p9n3h8lrnfraxn6hf9x7azl0kx0v4jjry"; + rev = "499a3767d5d5af8cd427007d2a38623d339f2f85"; + sha256 = "026n85pi85jx5ph1v2ss2fhzm2x02v9kx7w97367p3vmd2cggba3"; }; dependencies = []; }; neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neomake-2016-07-23"; + name = "neomake-2016-10-03"; src = fetchgit { url = "git://github.com/benekastah/neomake"; - rev = "ab22f656cd3ce77a7092568c412b7422c15889e8"; - sha256 = "1x26srp0grvjna7cvzsncjnzynvzg22rwn96dc90zn4qlrnnhw1s"; + rev = "4771be7bee6023568f80dc21fdda071693b81cca"; + sha256 = "1bkn98iwfx6fhccnwxjh694w2yjfvczkrbm7h6mjkl8n8zka93kc"; }; dependencies = []; @@ -443,33 +463,44 @@ rec { }; vim-tmux-navigator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-tmux-navigator-2016-07-17"; + name = "vim-tmux-navigator-2016-09-03"; src = fetchgit { url = "git://github.com/christoomey/vim-tmux-navigator"; - rev = "caf4c48141f9088632b457f488fb797af77c3ce1"; - sha256 = "0gj6klb296jqq8zi40q7ryparpbv85dx4ahx6gpfv85452zn7rml"; + rev = "e79d4c0c24c43d3ada283b1f5a1b8fa6cf820a70"; + sha256 = "1p4kb8ja86pa3l9jh8yfjvdvdik4fwnpbpl34npjwbga52pawn65"; }; dependencies = []; }; spacevim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "spacevim-2016-07-19"; + name = "spacevim-2016-09-15"; src = fetchgit { url = "git://github.com/ctjhoa/spacevim"; - rev = "59864e305977fa47e032529d20d9dfb589c06659"; - sha256 = "0d99bnrb2yz3d40kr9gdxwp369b18d6vn3jm3d3fz2n55k6xp9ww"; + rev = "b90e12ebc43fdc4cf6b75004d319c25b29efdf8f"; + sha256 = "1hz84amsl9374mdsgg6szrsnf15kmqa3n2hmcagy5xmbj7fz1msc"; }; dependencies = []; }; ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ctrlp-vim-2016-07-08"; + name = "ctrlp-vim-2016-10-02"; src = fetchgit { url = "git://github.com/ctrlpvim/ctrlp.vim"; - rev = "b9fa920b4abbb54799927a3bc57869fdd556321a"; - sha256 = "1h8cm9mihd3jngmb6x60hxyr0g3swg6xhq8jw36xskb1ygdvbxzp"; + rev = "c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2"; + sha256 = "0m23yrmgbwaj35yh38sj43r16q090l4vbgijpyv1danmf7ws6q1f"; + }; + dependencies = []; + + }; + + agda-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "agda-vim-2016-09-06"; + src = fetchgit { + url = "git://github.com/derekelkins/agda-vim"; + rev = "03e8cc9a8c7a58c431a32f50e80fe0fefe0c3f41"; + sha256 = "0qkfxyddp3j14hz1vmm499dnkrgqzr2xsaxi6dz61alq65r4xbl9"; }; dependencies = []; @@ -497,23 +528,34 @@ rec { }; + acp = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "acp-2013-02-05"; + src = fetchgit { + url = "git://github.com/eikenb/acp"; + rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e"; + sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg"; + }; + dependencies = []; + + }; + elm-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "elm-vim-2016-07-25"; + name = "elm-vim-2016-10-02"; src = fetchgit { url = "git://github.com/elmcast/elm-vim"; - rev = "abc998a113a77a729bf8c2b918978c8e43e60847"; - sha256 = "1byma9dyh59b4mnmr0nmjmy0ribgn9l8m2gddbc0hfgcwbzjxy5y"; + rev = "7760aed9f258cf6a7d2c56d547dd3ea45f832025"; + sha256 = "1f1z2929aka2shkwb8z2ky26cvw2cgx7wdcikw9mljpgc1s7nl5d"; }; dependencies = []; }; vim-localvimrc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-localvimrc-2016-06-06"; + name = "vim-localvimrc-2016-08-18"; src = fetchgit { url = "git://github.com/embear/vim-localvimrc"; - rev = "f104384cd9127b5a75ed889b551fd7f46faeb74a"; - sha256 = "0k1ava8nhshkm7llhmagpsmvgwy8xcc0mn3chdk6hz8gzz9755py"; + rev = "2d4c622da0bd04669cd149c6f424d0771708e8d6"; + sha256 = "0j5344riafqr330q9jiglcqaffmcppq6r1512866cmkk000r6lc0"; }; dependencies = []; @@ -542,22 +584,22 @@ rec { }; vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-go-2016-07-26"; + name = "vim-go-2016-10-04"; src = fetchgit { url = "git://github.com/fatih/vim-go"; - rev = "b7ac76ad7ef469d45aa44d2209a3a61b46cb3b1a"; - sha256 = "0dx7zqh6hq4lgjqc8jvjaa1yjc46yfcbfpj8cs4qd06zafzqf8wf"; + rev = "1f8e10cebdacfd7a6809741a9eb04b5e1c3bc6ec"; + sha256 = "1iyqa0pklba5badxmak8b8wp0xryk9fi8qky1fj9m8lchv7s69nn"; }; dependencies = []; }; vim-colorschemes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-colorschemes-2016-03-18"; + name = "vim-colorschemes-2016-08-01"; src = fetchgit { url = "git://github.com/flazz/vim-colorschemes"; - rev = "189f5182bb70fd35d0f56fee451c3f22a2a80135"; - sha256 = "1j3r99av9rzdrp8w0c86n0r4kgiv8xry5xdghc1871kvz77sq5d4"; + rev = "b8dff40f69f1873effbed97c759a8452ecb240ed"; + sha256 = "1mb08l2crl5mal0jllh9s099w2bqcb88vfjw3z5zj1jn8bbpniaj"; }; dependencies = []; @@ -575,77 +617,77 @@ rec { }; psc-ide-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "psc-ide-vim-2016-07-06"; + name = "psc-ide-vim-2016-09-07"; src = fetchgit { url = "git://github.com/frigoeu/psc-ide-vim"; - rev = "8704b993fe7dced73aa871244fbf7cd2fbafb759"; - sha256 = "1wvs5v59aai3q2lgavaav073gz609944j8xbck34xyyq2naqmhaq"; + rev = "3c376289d368b7175cb6c10e2960f08830ee4cb4"; + sha256 = "0mzczy73asw66qz3zqbf48i95qfjrv1rhky9zyl5qcwlay1gyfvj"; }; dependencies = []; }; vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-jsonnet-2016-05-10"; + name = "vim-jsonnet-2016-10-01"; src = fetchgit { url = "git://github.com/google/vim-jsonnet"; - rev = "9cde81ff3f1afb64f8e6b51e8ebba25b074e26f8"; - sha256 = "156lbh1xgw3vrgbdfax3mhyfdm2r6r0ak42bs001ykpqmn6dxbrx"; + rev = "fb99d65bb42438fa65fb46051243bbae20a75e31"; + sha256 = "19c2jwpabsx16m23mzfspazlj565ra3xzsibm9283k46dlax9mwh"; }; dependencies = []; }; vim-leader-guide = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-leader-guide-2016-05-17"; + name = "vim-leader-guide-2016-10-03"; src = fetchgit { url = "git://github.com/hecal3/vim-leader-guide"; - rev = "333bd74c6f6ad18d653061f469342f9a37664256"; - sha256 = "07y4rq9d45vak5gm0hm1aazsh8r0k631aa9d0q9v9iz9k3v7irgw"; + rev = "0d08f2f5603d61b0099d2323e0ca4ab30f8a4d49"; + sha256 = "0035yzgswqfamcvrbxcjbxs5lywcg5vsrddlnawx8x0rzm4az5nh"; }; dependencies = []; }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2016-07-15"; + name = "idris-vim-2016-07-29"; src = fetchgit { url = "git://github.com/idris-hackers/idris-vim"; - rev = "aeca73e9432c21da6eb35fceaef957f191b3d56a"; - sha256 = "1q38sf4dabirhrr3i89p271ixap90im0x3pf39s3fc9jmb3m2jm8"; + rev = "7ef7a2ed9135d69a0dea6b571a20ddf2b0bf7a90"; + sha256 = "0py7vyg38yn6bl7pwyyhylpqp14smqjzbfj7rjzjfnlq33v7ysij"; }; dependencies = []; }; calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "calendar-vim-2016-07-18"; + name = "calendar-vim-2016-09-20"; src = fetchgit { url = "git://github.com/itchyny/calendar.vim"; - rev = "a61af2bf6d8919d75e9ab48776316f1b3e11c336"; - sha256 = "0zxdx1q3x541ddm1d5qlwx8rl37gqhm3bgrsl1kmkn14az8nyy7k"; + rev = "38b2cf96acf2cb1dc033de4b499f5b223adebacd"; + sha256 = "1yi16vj3if5l55f7pava75fd412skj7nmj4r73dpkqa36dg0xljw"; }; dependencies = []; }; lightline-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "lightline-vim-2016-06-12"; + name = "lightline-vim-2016-10-05"; src = fetchgit { url = "git://github.com/itchyny/lightline.vim"; - rev = "430ce2cb063b39a0c7950cafd617e333acb6759a"; - sha256 = "0336c17vkfh60cvj86y35lqz1xcd80csrlb985k1hyd5s7cayp42"; + rev = "9e8d9f68dfe9b19eba343f796ffd16933a4dc77d"; + sha256 = "02sc5sv0clm79b0p0ayk20j750c6gmw0akg6k9lz9dp9aryx8r9i"; }; dependencies = []; }; thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "thumbnail-vim-2016-03-17"; + name = "thumbnail-vim-2016-09-06"; src = fetchgit { url = "git://github.com/itchyny/thumbnail.vim"; - rev = "4afdc473b47d162610965fa5ed15fa855cca65d4"; - sha256 = "1z5a9dqb788ll5j8gg3hdjjggwpx0b073v5dr8zlrk1zjwah56gw"; + rev = "d697fb7a73a53275390c20040faab87b54f12f84"; + sha256 = "112hkblw30ym7bpv8454fylalv9kn0l3268gpkh9a5qdr2kf99b1"; }; dependencies = []; @@ -707,11 +749,11 @@ rec { }; vim-nerdtree-tabs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-nerdtree-tabs-2014-09-25"; + name = "vim-nerdtree-tabs-2016-09-19"; src = fetchgit { url = "git://github.com/jistr/vim-nerdtree-tabs"; - rev = "0decec122e9bb3e9328b01fa20a9650e79cc6ca7"; - sha256 = "0m51vpxq0d3mxy9i18hczsbqsqi7vlzwgjnpryb8gb5wmy999d6l"; + rev = "5a91230193fea7f9c8d792cb5c635998d868337d"; + sha256 = "08g587bnd8n61nj44ghjadwqpbbqya4hig56afna6rhs341zwlpm"; }; dependencies = []; @@ -751,11 +793,11 @@ rec { }; fzf-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fzf-vim-2016-07-21"; + name = "fzf-vim-2016-09-30"; src = fetchgit { url = "git://github.com/junegunn/fzf.vim"; - rev = "491ff9942f1bc18919176b781f0acc8bfb1ae73d"; - sha256 = "05g07gji55rb35hfiisbjwbnkfz7msxq6xsjajvwdl6g2v4nmfyl"; + rev = "7d1b007cb234d181fd09a50e40e50cb49642861b"; + sha256 = "1011n55n6anfd5cc4cafr1clkdbb2yd9lyzpk7yb4jzmvjvsx64b"; }; dependencies = []; @@ -773,11 +815,11 @@ rec { }; vim-peekaboo = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-peekaboo-2016-07-25"; + name = "vim-peekaboo-2016-08-05"; src = fetchgit { url = "git://github.com/junegunn/vim-peekaboo"; - rev = "3a7c48bd8f2ab0d30485e9d64f930f3d99b46088"; - sha256 = "0g1lhxzqf4mddm82nilff46pgcpkzcv5yb7yxkisy06byw18vbnq"; + rev = "9c8415c022ab24ce51af13aa43255d5a7c7ef670"; + sha256 = "10c8j4wcg7g3i3vyvlcc21j0a3xmbl5ii5fl5k27iy2icf5rm018"; }; dependencies = []; @@ -817,11 +859,11 @@ rec { }; vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimtex-2016-08-19"; + name = "vimtex-2016-10-03"; src = fetchgit { url = "git://github.com/lervag/vimtex"; - rev = "5bc5b14ae213deeafd2b6d8702ac11cefd4c0e8b"; - sha256 = "0gqjxwjln82ar8dnv0dpmkhmycznxk2r0g06sddaq12y4r6bw5s9"; + rev = "abf50a3f04dff85e2e1fb7f8f5123e54dce32706"; + sha256 = "0vln1y2w13fjsvqd5pqjkqx62q3gbhmgkx49i5rdx9vblmg77n7y"; }; dependencies = []; @@ -838,6 +880,17 @@ rec { }; + rainbow = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "rainbow-2016-08-08"; + src = fetchgit { + url = "git://github.com/luochen1990/rainbow"; + rev = "eeb35ccece20f2648b44580c484c6e57eec3c92b"; + sha256 = "0s1ygjm5czzj1idrw4f13gg60zljznb6bs7fps4i3wl2mbmw5641"; + }; + dependencies = []; + + }; + vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-xkbswitch-2016-01-31"; src = fetchgit { @@ -909,11 +962,11 @@ rec { }; haskell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "haskell-vim-2016-07-06"; + name = "haskell-vim-2016-09-08"; src = fetchgit { url = "git://github.com/neovimhaskell/haskell-vim"; - rev = "a9ceb3d812488c1cee8a2b763cca0e4a48bfd14c"; - sha256 = "022ckyc85i8f6r32z2grn41s9g4fg1a7fqprzbgs2kbi9k2igqni"; + rev = "962d39f9ef24b9f7af65f10058fd4fff31eb26b4"; + sha256 = "159lr2cl27chpcicdisaz8fk0iy8lz5c0p9mi2lw1advinjxz3zb"; }; dependencies = []; @@ -931,121 +984,132 @@ rec { }; vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-watchdogs-2016-06-26"; + name = "vim-watchdogs-2016-09-05"; src = fetchgit { url = "git://github.com/osyo-manga/vim-watchdogs"; - rev = "7c89466b2b7fd9b87e0189e4ac66b84f2cfbc842"; - sha256 = "09swjrfrqvciw7blqd1ssklxs09x0sd7ixphy07az7cxfmpdpi4r"; + rev = "96ee0ce968da8da8ace48457665c7d5c942dd49d"; + sha256 = "16dk0wsikqmcywgm04vwv76p2sc6jw0krq4cg02zdpgyb4xxgp3n"; }; dependencies = []; }; vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-racer-2016-07-14"; + name = "vim-racer-2016-10-01"; src = fetchgit { url = "git://github.com/racer-rust/vim-racer"; - rev = "ea2a41ddc3e1e504a542f6add0f6f2c10d97a099"; - sha256 = "1vwxs9mqcvp3haqyx0si5hiw61vg2s2hm1alipb5s69sb38f047s"; + rev = "78774aee6be126f5dcf576042ac4872e04a1a3a7"; + sha256 = "10rv21g72pkaakxqr016l9r42hjiys1rhhhbnv3pmmfqv38ifx0a"; }; dependencies = []; }; purescript-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "purescript-vim-2016-01-04"; + name = "purescript-vim-2016-08-31"; src = fetchgit { url = "git://github.com/raichoo/purescript-vim"; - rev = "92dd6bc647b45444e9d5e0550bdc3c56928f9762"; - sha256 = "090vpff58lzzhqp28p27am5s8s6ngjxw6j4y46zaixcxxx7wqzha"; + rev = "2c55bcefd63bc40ed2aa9d6ce9d89a590dfa3477"; + sha256 = "1y96w8p865gd6zr29wpxn1qwsk833y06x1qp586gylgi0jp1ybzv"; + }; + dependencies = []; + + }; + + vim-grammarous = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-grammarous-2016-09-28"; + src = fetchgit { + url = "git://github.com/rhysd/vim-grammarous"; + rev = "580785b4313613c1fd47ac291d92e1458f3ac2e3"; + sha256 = "0fxnzyb0svmgb3jc9dh6kfxli59kx3289hgwzcclfcff0m9df7q0"; }; dependencies = []; }; rust-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "rust-vim-2016-07-16"; + name = "rust-vim-2016-09-30"; src = fetchgit { url = "git://github.com/rust-lang/rust.vim"; - rev = "a4d6fb2ab526ccc93a6a321a2425a234f9f7665f"; - sha256 = "1i2sf5p4d9gfr3hk6nrjar0rz85dmhwgf82d5yfqqmlgil0bljds"; + rev = "2030019e1a5d0593dc662a0c37f3d06c4de8c252"; + sha256 = "1d53aw4lprvf7qmk87jar8w7dkqara8k3hdm3qjhjlc1a7qv6i9v"; }; dependencies = []; }; neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neoformat-2016-07-20"; + name = "neoformat-2016-09-23"; src = fetchgit { url = "git://github.com/sbdchd/neoformat"; - rev = "3ce811e317512bbdfa4be8bc5c78c253301854c5"; - sha256 = "07ycc0n1y9qrgv17ykid2nnrw984hwswisjijhpnfmpqkjrxg662"; + rev = "c15243abdbfef8d0c6d626d6f3676f3694e13131"; + sha256 = "18qsw1z98mg0x3rdvd0j95vyl0n4kacxz4viv600aiisv20s30i3"; }; dependencies = []; }; vim-polyglot = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-polyglot-2016-07-26"; + name = "vim-polyglot-2016-09-11"; src = fetchgit { url = "git://github.com/sheerun/vim-polyglot"; - rev = "3019afa721b893ebfe130eb4f955bc4c0c20ec23"; - sha256 = "1f463w66k6brzq3qa8a3xhz2n6xgkri451fclrz2qp41x0bdwjic"; + rev = "74652b465d7eff97070001317a4ea5557717378d"; + sha256 = "18bw8fdpq5riqfy656kw4a9hmrk8s967qx36lq0s16sbyqxm15ag"; }; dependencies = []; }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2016-07-23"; + name = "neocomplete-vim-2016-09-30"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "8d2a574c1708080ef1fac3336c99d2d9e1898fce"; - sha256 = "10c885hjp0w50ry1s72zziw7ddvzkri5dbjxa3wnfhisqw7awb8h"; + rev = "16d650348538f780d282863ecbdcc45319d36522"; + sha256 = "0var0md485r6kfrsdbd9zmmid6z7zvqhl5n71q8fjnvsgsb9v6a6"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2016-07-14"; + name = "neosnippet-snippets-2016-09-26"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "4d25b4352738ecf34e56701d0172d80daa3bd287"; - sha256 = "01lai1gvf30iagh9f7av69ywfzw43vy2igwil882rgnri84y4zjb"; + rev = "be02928b14cae1effbe4388da4d5a75215344ba6"; + sha256 = "1r3v229plm8qizy0m83rrl0y4b5m2lawc3c22q4zpm9l28hxk084"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2016-07-10"; + name = "neosnippet-vim-2016-09-11"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "9492fbb7e9016243af3c1987b91f0bffcf4cc8e7"; - sha256 = "0p2d762z0s9ayrc4kcqr7s1hmcghd04z818szqdn6v6rsr9lyln8"; + rev = "a1508f88729e1c5912dd12417553f178494c4dd2"; + sha256 = "14pjz6grz56ab65al2h9vn9nlqr6r9cqa8qghdg3rj0sy40lyz7a"; }; dependencies = []; }; unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "unite-vim-2016-07-26"; + name = "unite-vim-2016-09-30"; src = fetchgit { url = "git://github.com/shougo/unite.vim"; - rev = "47daeed4a6934fbcc418fda8ce19ac702904520f"; - sha256 = "0nl57spp8pbhbad259s5xnihjpnh38sw0rqgg6i80vzmjziy9wiv"; + rev = "504edce8c33207c522d6fe8f7864e0c25f25757f"; + sha256 = "0nn3h8nj258s55qwgsskcw028lnsl66x32mq0k6yyklwljplfn1s"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2016-07-10"; + name = "vimproc-vim-2016-08-06"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "b2255c66a3dc04fba1adbda3e380facff45fe6ec"; - sha256 = "09fabq1j3grd8d8xz0y9i5y756mqzs9n7icvnlmi6hbjzkv1rkx6"; + rev = "25cb83f24edec4aec1e9f1329302235e7a7a7fe0"; + sha256 = "19nl21623cv05j6ljyn35qm38pw3680nch2by1gapqmxazp99i20"; }; dependencies = []; buildInputs = [ which ]; @@ -1060,11 +1124,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2016-07-15"; + name = "vimshell-vim-2016-09-05"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "c71ffb48b9ea2c718facd2eaad431f59503e58aa"; - sha256 = "0yvj0a50gmss56yb2vkh6f9pyarnv9cnvrrai8pyrb2jxhl3ipv6"; + rev = "371f0774907713959fedbdb37973a55e60428f42"; + sha256 = "0jgfqsk2g6hlmks7c5ig0wlpzmdv6dlf91kdiiqfnli9xsfaq0i8"; }; dependencies = [ "vimproc-vim" ]; }; @@ -1114,11 +1178,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2016-07-02"; + name = "vim-quickrun-2016-09-22"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "5149ecd1502b7fc2583cb8799ac1a0c72c41f828"; - sha256 = "1y32s42wgcq8qssm7yr578vvamvlb4kkdb1k5mhp0hmwskj2v7xp"; + rev = "25b23f3519aabf2515fa4c70390bbea507516377"; + sha256 = "1rb1i8bv2g95l5pp5rmaf4xidqjbkk05dz8kb6b9fdzjnskr0mca"; }; dependencies = []; @@ -1136,11 +1200,22 @@ rec { }; vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-eunuch-2016-04-16"; + name = "vim-eunuch-2016-09-07"; src = fetchgit { url = "git://github.com/tpope/vim-eunuch"; - rev = "5ee2b82b565e6c6d80f1cb7735c78f66a159b198"; - sha256 = "108v98qy49w2pgzndmqc9nydmsql2bnbcc849wshvkxgca349ixc"; + rev = "7eeb681ff3caedc1c01e50966bc293951f7b3e21"; + sha256 = "0hk4p1qjmplddmwrpp6b2x776z1298pkcgp855kgigib53w5srmc"; + }; + dependencies = []; + + }; + + vim-repeat = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-repeat-2015-05-09"; + src = fetchgit { + url = "git://github.com/tpope/vim-repeat"; + rev = "7a6675f092842c8f81e71d5345bd7cdbf3759415"; + sha256 = "0p8g5y3vyl1765lj1r8jpc06l465f9bagivq6k8ndajbg049brl7"; }; dependencies = []; @@ -1169,11 +1244,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2016-09-01"; + name = "youcompleteme-2016-10-04"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "e332cdb2a0c8599dead1d362b87bb9fb79c9a955"; - sha256 = "0lqmdbv2z3rhm6a9c62rhfl3i30mvpg2f7k0cjan7jvrln9588k9"; + rev = "c1cd62dc3c522d49b1989aceb64566326db2fcf2"; + sha256 = "01bqgg7zlfhyri0cwx24mf2rbvr063c7sm5fz1kkccpqr77xiz7h"; }; dependencies = []; buildInputs = [ @@ -1212,22 +1287,22 @@ rec { }; vim-airline-themes = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-themes-2016-07-19"; + name = "vim-airline-themes-2016-10-03"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline-themes"; - rev = "8b58708ec4318cee43a878ea74f7dedb61c8f07a"; - sha256 = "0wfh8ayrvcl1ysshkfad1kqwgzad35nlxffljb542z3f23n84g86"; + rev = "3e8ecba0dea8b4ea35e81780a9aa00f2ca6823e8"; + sha256 = "0dcf5pbysbfwrjf0ypnavw25h4k78y990l2j1ks1zbv6mpgg0kkw"; }; dependencies = []; }; vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-2016-07-11"; + name = "vim-pandoc-2016-09-13"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc"; - rev = "18461740f6915540e4833a71ab54a8205c9898b8"; - sha256 = "00mawpl3wwj223g7bcmx4ghfysvxg9d3iqk1h8azykgccp6wg7p6"; + rev = "035d0154fc9d5c974f810ee88a4b223c7e8bec31"; + sha256 = "00hrwdm5p5bjgwi29xv3hs84sxajwzy9iql6yg02qw3pgzyfa7gv"; }; dependencies = []; @@ -1245,11 +1320,11 @@ rec { }; vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-pandoc-syntax-2016-07-23"; + name = "vim-pandoc-syntax-2016-07-27"; src = fetchgit { url = "git://github.com/vim-pandoc/vim-pandoc-syntax"; - rev = "e9fb38706fa676320191975abf32b9f25f14b049"; - sha256 = "18423bdw49w4pncl4ivh1fdw41wqdlcgwa3l3c66br1ja917ria7"; + rev = "34339e2a5fe936549fa758546c40d7a906537a4b"; + sha256 = "0mwhl2dn3hzj8275kaf01yjn401qb7nhi12lkdj7bdzmq856i1y1"; }; dependencies = []; @@ -1266,6 +1341,17 @@ rec { }; + Rename = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Rename-2011-08-30"; + src = fetchgit { + url = "git://github.com/vim-scripts/Rename"; + rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34"; + sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r"; + }; + dependencies = []; + + }; + a-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "a-vim-2010-11-06"; src = fetchgit { @@ -1333,11 +1419,11 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2016-07-06"; + name = "vim-wakatime-2016-09-17"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "31b1a5d78244605fcab024edc20e6a0c059e449f"; - sha256 = "0k5bnckv1882r9445p74a4iqys72imy23w87c1shq1gxps47cwms"; + rev = "927ba8d2299a65ddab3e79644c48d06386dac2d5"; + sha256 = "1qlzp5gdchvzvnjshh2sz2933wwhky8jdvg3j0rv6yyr95n14zff"; }; dependencies = []; buildInputs = [ python ]; @@ -1360,12 +1446,23 @@ rec { ''; }; + vim-easytags = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easytags-2015-07-01"; + src = fetchgit { + url = "git://github.com/xolox/vim-easytags"; + rev = "72a8753b5d0a951e547c51b13633f680a95b5483"; + sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i"; + }; + dependencies = ["vim-misc"]; + + }; + deoplete-jedi = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "deoplete-jedi-2016-07-18"; + name = "deoplete-jedi-2016-10-04"; src = fetchgit { url = "git://github.com/zchee/deoplete-jedi"; - rev = "47992e47ff420d9779c1dc4e951dce48a1ae84a4"; - sha256 = "0cirfir1n4c86d82z7lw4wg6i92qzzbjad35imr3f2kkf2fqbn72"; + rev = "9df866cdf35eee085a3531c838659246ede686e9"; + sha256 = "1qi91q0znz5qfq4f0rs07nkf5mf4x55gwb8fkk0hlfnly0qgba80"; }; dependencies = []; @@ -1438,11 +1535,11 @@ rec { }; sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "sensible-2016-03-18"; + name = "sensible-2016-09-05"; src = fetchgit { url = "git://github.com/tpope/vim-sensible"; - rev = "9e91be7e0fb42949831fe3161ef583363648aa58"; - sha256 = "1g1l3v33g9229r4g4kcx8m1yrh397yf3fn6bxis57n3lg6lmb6wm"; + rev = "4b7535921819a5b2e39be68f81109ea684232503"; + sha256 = "0ghds721dawm8mcd8cp23hfqpgiznh811z73zxlqrm1sg2fmdq1s"; }; dependencies = []; @@ -1460,11 +1557,11 @@ rec { }; snipmate = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "snipmate-2016-06-15"; + name = "snipmate-2016-09-01"; src = fetchgit { url = "git://github.com/garbas/vim-snipmate"; - rev = "ee433e43c76c768c95ad6d9af67c4cd4b40f7eac"; - sha256 = "0rfis0rck0rk69nfzkrj6fm00hhdj75mvp809nw8vr14ldj2bvs7"; + rev = "31986191ac9923afcd53bf6425c9b6c35fdbb214"; + sha256 = "1l48h5xmkx412bm29mvl6kz11n7xbkk37ph8v5vgdws380d0fiag"; }; dependencies = ["vim-addon-mw-utils" "tlib"]; @@ -1493,11 +1590,11 @@ rec { }; table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "table-mode-2016-07-11"; + name = "table-mode-2016-09-28"; src = fetchgit { url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "96236638a80fe73fa649824c9df25831a0042373"; - sha256 = "1c5xnm63hqw0jycwakdljs0f3mp26rjvd4llijrznpr9z2cvki8f"; + rev = "441c30c35aec9d5c2de1d58a77a7d22aa8d93b06"; + sha256 = "04fdd2hgrcrgqqflzlvv7j9c53m8f2divi075p75g6grkxxyninv"; }; dependencies = []; @@ -1525,11 +1622,11 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2016-07-25"; + name = "tlib-2016-08-07"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "e5526d34f36e5b84792a9b866f532e1221b95e33"; - sha256 = "1dmhi4jr0vq879dzs584c01c6g6grk733cfdvq0gcyd20xc9lhn1"; + rev = "8c74564396e368788a5cb901b0e8017a3166cee9"; + sha256 = "15bh6q8g7p1giz2lybqhdf7a7xisqwpr751gprqx3vmh97drry5z"; }; dependencies = []; @@ -1756,22 +1853,22 @@ rec { }; vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-airline-2016-07-25"; + name = "vim-airline-2016-09-28"; src = fetchgit { url = "git://github.com/vim-airline/vim-airline"; - rev = "4b5441a8f7276689fcd41e3c706eb6a2b68064a3"; - sha256 = "1ckdx8qgdkmx7k7m0wpyrhm6ms574kdykikfdqvbyyin5dg015px"; + rev = "2be9a044e09f68bef0eb4dff27af7d22405968fe"; + sha256 = "0n9p2pdh9cw6lfhf43nh71g8r73smnq65c0kadr88ywa54y92bxg"; }; dependencies = []; }; vim-coffee-script = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-coffee-script-2016-06-29"; + name = "vim-coffee-script-2016-09-19"; src = fetchgit { url = "git://github.com/kchmck/vim-coffee-script"; - rev = "0f4bd9776cfd0fd2a394a4b1991630698e4fdc2d"; - sha256 = "18n1xbs59s71zvavjcg7an8y5dhq6agrb2rc2j6y48y7na0kf8sf"; + rev = "b91dbe92ad794a85a03b089f384fa324ff4e0c3d"; + sha256 = "0rkv0n9r3rczx1269i9nf4xs3q934n7iqnrykhnlqbl255s5agd4"; }; dependencies = []; @@ -1789,22 +1886,22 @@ rec { }; vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gista-2016-04-11"; + name = "vim-gista-2016-09-21"; src = fetchgit { url = "git://github.com/lambdalisue/vim-gista"; - rev = "7ff4d24f242d406ff71d9a65691357aee80f37f7"; - sha256 = "0hm4lnf2mxvdvc13b67cwvyp7griir5lpacnb1sgjx4dxr0w4fzz"; + rev = "8f27e74bd1f8edb3ca5711864b34cb4c526d9947"; + sha256 = "0zymx6ww6yc9h06k373z7mbv07jmi66zv1cm15ip2qnik1nr80p7"; }; dependencies = []; }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2016-07-12"; + name = "vim-gitgutter-2016-09-30"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "26c6b549f287b8ae348eda083e7c77f79f4de28b"; - sha256 = "1jrz0vqd580y7psszq31jk4v4jdh2cvqvxgcy347simpc5ap16hs"; + rev = "4f9c5b0f3e2a20081edc1ec60a79640f7d55e3e0"; + sha256 = "1bd7vvljgrbs6phwa8axpzzfhf4kcczmp0i1wwv3rn35sklnqc47"; }; dependencies = []; @@ -1832,6 +1929,17 @@ rec { }; + vim-misc = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-misc-2015-05-21"; + src = fetchgit { + url = "git://github.com/xolox/vim-misc"; + rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; + sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; + }; + dependencies = []; + + }; + vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-multiple-cursors-2016-06-03"; src = fetchgit { @@ -1855,33 +1963,33 @@ rec { }; vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-signify-2016-07-21"; + name = "vim-signify-2016-09-28"; src = fetchgit { url = "git://github.com/mhinz/vim-signify"; - rev = "472668fbd286c8f8f3db0024a02056d4c25524b1"; - sha256 = "1lmap4amfrqngqdbp87kf9fhqnpshdacikkr9nkfry8l9mhhyqb9"; + rev = "faf7a0307180ec10418fa0eae85e68b526eed267"; + sha256 = "18wklbvx632d106wbnkh06qpvkkh6zdxsgp5cvrqwfk73scwkgh5"; }; dependencies = []; }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2016-07-25"; + name = "vim-snippets-2016-10-04"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "8b054b0957c3c17aa458e549c5259ed84604f976"; - sha256 = "0mvawc4kr1r50jvl5khcd9443mnq85nansh0vj7ic4zz4rias8h4"; + rev = "0acb605c5fa6058403fb2510c807b17b9a27d460"; + sha256 = "0jdjcqigsv6dsvpc4zbavpwhx71f1g84zmwysgvsyraiqdiakq7z"; }; dependencies = []; }; vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-webdevicons-2016-07-23"; + name = "vim-webdevicons-2016-10-01"; src = fetchgit { url = "git://github.com/ryanoasis/vim-devicons"; - rev = "87ee171b566cfd82bb9bfa3885c8020d83e699aa"; - sha256 = "081srlbxd3aw6hl818i7l31g85w4hsfkz67ga9ihhwjkd94sib4s"; + rev = "77bf4cef436955fb40719526746f3ba718c6fa36"; + sha256 = "0i3rdz08xs8nia0n0m9xd2hdipnb8khrr9zb3bxvhvzd32rfqfv5"; }; dependencies = []; @@ -1921,11 +2029,11 @@ rec { }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2016-02-26"; + name = "vundle-2016-08-05"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "4984767509e3d05ca051e253c8a8b37de784be45"; - sha256 = "15450wz15pwv9sbvnmb60z5nshsssw4y1xy8smp332605b53kski"; + rev = "fef1c2f31862c44cf5295ef86c086efba4af20a9"; + sha256 = "18prk9axxj418hjh1yflijww39bgbvf3vq7z6a1501wq88d7z8zs"; }; dependencies = []; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6cef8885ce0..1e04ab99221 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -2,6 +2,7 @@ "CheckAttach" "Gist" "Hoogle" +"Rename" "Solarized" "Supertab" "Syntastic" @@ -15,6 +16,7 @@ "YankRing" "commentary" "ctrlp-py-matcher" +"ctrlp-cmatcher" "ctrlp-z" "extradite" "fugitive" @@ -31,8 +33,10 @@ "github:christoomey/vim-tmux-navigator" "github:ctjhoa/spacevim" "github:ctrlpvim/ctrlp.vim" +"github:derekelkins/agda-vim" "github:digitaltoad/vim-jade" "github:eagletmt/neco-ghc" +"github:eikenb/acp" "github:elmcast/elm-vim" "github:embear/vim-localvimrc" "github:enomsg/vim-haskellConcealPlus" @@ -64,6 +68,7 @@ "github:lepture/vim-jinja" "github:lervag/vimtex" "github:lokaltog/vim-easymotion" +"github:luochen1990/rainbow" "github:lyokha/vim-xkbswitch" "github:mhinz/vim-startify" "github:mkasa/lushtags" @@ -75,6 +80,7 @@ "github:osyo-manga/vim-watchdogs" "github:racer-rust/vim-racer" "github:raichoo/purescript-vim" +"github:rhysd/vim-grammarous" "github:rust-lang/rust.vim" "github:sbdchd/neoformat" "github:sheerun/vim-polyglot" @@ -91,6 +97,7 @@ "github:thinca/vim-quickrun" "github:tomasr/molokai" "github:tpope/vim-eunuch" +"github:tpope/vim-repeat" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" "github:valloric/youcompleteme" @@ -107,6 +114,7 @@ "github:vim-scripts/wombat256.vim" "github:wakatime/vim-wakatime" "github:wincent/command-t" +"github:xolox/vim-easytags" "github:zchee/deoplete-jedi" "goyo" "matchit.zip" diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix index 27d2360a980..aac213bb804 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix @@ -56,9 +56,40 @@ appleDerivation rec { # The startup object files cp ${Csu}/lib/* $out/lib - # OMG impurity - ln -s /usr/lib/libSystem.B.dylib $out/lib/libSystem.B.dylib - ln -s /usr/lib/libSystem.dylib $out/lib/libSystem.dylib + # Narrowly speaking, these would work if we re-exported libsystem_c and libsystem_kernel, + # but we also need to run the original central libsystem constructor (which initializes + # a ton of crap for its consitutent libraries) so we link against the central library here. + mkdir -p $out/lib/system + ld -macosx_version_min 10.7 -arch x86_64 -dylib \ + -o $out/lib/system/libsystem_c.dylib \ + /usr/lib/libSystem.dylib \ + -reexported_symbols_list ${./system_c_symbols} + + ld -macosx_version_min 10.7 -arch x86_64 -dylib \ + -o $out/lib/system/libsystem_kernel.dylib \ + /usr/lib/libSystem.dylib \ + -reexported_symbols_list ${./system_kernel_symbols} + + libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') + + + for i in $libs; do + if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then + args="$args -reexport_library $i" + fi + done + + ld -macosx_version_min 10.7 \ + -arch x86_64 \ + -dylib \ + -o $out/lib/libSystem.B.dylib \ + -compatibility_version 1.0 \ + -current_version 1226.10.1 \ + -reexport_library $out/lib/system/libsystem_c.dylib \ + -reexport_library $out/lib/system/libsystem_kernel.dylib \ + $args + + ln -s libSystem.B.dylib $out/lib/libSystem.dylib # Set up links to pretend we work like a conventional unix (Apple's design, not mine!) for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols index 0c814899c3c..e298ae47f72 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_c_symbols @@ -1,14 +1,3 @@ -_NSGetNextSearchPathEnumeration -_NSStartSearchPathEnumeration -_OSAtomicAdd32 -_OSAtomicAdd32Barrier -_OSAtomicAnd32 -_OSAtomicDequeue -_OSAtomicEnqueue -_OSSpinLockLock -_OSSpinLockUnlock -__Block_copy -__Block_release __CurrentRuneLocale __DefaultRuneLocale __Exit @@ -62,20 +51,18 @@ ___bt_setcur ___bt_split ___bt_sync ___buf_free -___bzero ___cVersionNumber ___cVersionString ___call_hash -___chmod_extended ___cleanup ___cmp_D2A ___collate_equiv_match ___collate_load_error ___collate_lookup -___commpage_gettimeofday ___copybits_D2A ___cxa_atexit ___cxa_finalize +___cxa_finalize_ranges ___cxa_thread_atexit ___d2b_D2A ___dbpanic @@ -85,34 +72,21 @@ ___default_utx ___delpair ___diff_D2A ___dtoa -___error -___exit ___expand_table -___fchmod_extended -___fcntl -___fcntl_nocancel ___fflush ___fgetwc ___find_bigpair ___find_last_page ___fix_locale_grouping_str -___fork -___fpclassifyd -___fpclassifyl ___fread ___free_ovflpage ___freedtoa -___fstat64_extended -___fstat_extended ___gdtoa ___gdtoa_locks ___get_buf ___get_page -___getdirentries64 ___gethex_D2A -___getlogin ___getonlyClocaleconv -___gettimeofday ___hash_open ___hdtoa ___hexdig_D2A @@ -126,14 +100,11 @@ ___increment_D2A ___isctype ___istype ___istype_l -___kill ___ldtoa ___libc_init ___lo0bits_D2A ___log2 ___lshift_D2A -___lstat64_extended -___lstat_extended ___maskrune ___maskrune_l ___match_D2A @@ -143,22 +114,15 @@ ___memccpy_chk ___memcpy_chk ___memmove_chk ___memset_chk -___mkdir_extended -___mkfifo_extended ___mult_D2A ___multadd_D2A ___nrv_alloc_D2A -___open -___open_extended -___open_nocancel ___opendir2 ___opendir2$INODE64 ___ovfl_delete ___ovfl_get ___ovfl_put ___pow5mult_D2A -___pthread_sigmask -___pthread_workqueue_setkill ___put_page ___quorem_D2A ___ratio_D2A @@ -179,29 +143,19 @@ ___rec_sync ___rec_vmap ___rec_vpipe ___reclaim_buf -___recvfrom -___recvfrom_nocancel ___rshift_D2A ___rv_alloc_D2A ___s2b_D2A ___sF ___sclose ___sdidinit -___semwait_signal -___semwait_signal_nocancel -___sendto -___sendto_nocancel ___set_ones_D2A -___setlogin ___setonlyClocaleconv -___settimeofday ___sflags ___sflush ___sfp ___sfvwrite ___sglue -___sigaction -___sigaltstack ___sinit ___slbexpand ___smakebuf @@ -214,8 +168,6 @@ ___srget ___sseek ___stack_chk_fail ___stack_chk_guard -___stat64_extended -___stat_extended ___stderrp ___stdinp ___stdoutp @@ -237,7 +189,6 @@ ___swbuf ___swhatbuf ___swrite ___swsetup -___sysctl ___tens_D2A ___tinytens_D2A ___tolower @@ -246,31 +197,25 @@ ___toupper ___toupper_l ___trailz_D2A ___ulp_D2A -___umask_extended ___ungetc ___ungetwc -___unix_conforming ___vsnprintf_chk ___vsprintf_chk -___wait4 -___wait4_nocancel ___wcwidth ___wcwidth_l __allocenvstate +__atexit_receipt __c_locale __cleanup __closeutx __copyenv __cthread_init_routine __deallocenvstate -__dyld_register_func_for_add_image __endutxent -__exit __flockfile_debug_stub __fseeko __ftello __fwalk -__get_cpu_capabilities __getenvp __getutxent __getutxid @@ -279,34 +224,18 @@ __inet_aton_check __init_clock_port __int_to_time __libc_fork_child +__libc_initializer __long_to_time __mkpath_np __mktemp __openutx -__os_alloc_once -__os_alloc_once_table __os_assert_log __os_assert_log_ctx __os_assumes_log __os_assumes_log_ctx __os_avoid_tail_call -__osx_assert_log -__osx_assert_log_ctx -__osx_assumes_log -__osx_assumes_log_ctx -__osx_avoid_tail_call -__platform_bzero -__platform_memccpy -__platform_memchr -__platform_memcmp -__platform_memmove -__platform_memset -__platform_memset_pattern16 -__platform_memset_pattern4 -__platform_memset_pattern8 -__platform_strchr -__platform_strcmp -__platform_strncmp +__os_debug_log +__os_debug_log_error_str __putenvp __pututxline __rand48_add @@ -322,20 +251,7 @@ __setutxent __sigaction_nobind __sigintr __signal_nobind -__sigtramp __sigvec_nobind -__simple_asl_log -__simple_asl_log_prog -__simple_asl_msg_new -__simple_asl_msg_set -__simple_asl_send -__simple_dprintf -__simple_salloc -__simple_sappend -__simple_sfree -__simple_sprintf -__simple_string -__simple_vsprintf __sread __sseek __swrite @@ -345,14 +261,11 @@ __time_to_int __time_to_long __time_to_time32 __time_to_time64 -__tlv_atexit -__tlv_exit __unsetenvp __utmpxname _a64l _abort _abs -_access _acl_add_flag_np _acl_add_perm _acl_calc_mask @@ -416,12 +329,6 @@ _arc4random_uniform _ascii2addr _asctime _asctime_r -_asl_get -_asl_new -_asl_open -_asl_send -_asl_set -_asl_set_query _asprintf _asprintf_l _asxprintf @@ -442,8 +349,6 @@ _backtrace_symbols_fd _basename _bcmp _bcopy -_bootstrap_parent -_bootstrap_port _brk _bsd_signal _bsearch @@ -451,7 +356,6 @@ _bsearch_b _btowc _btowc_l _bzero -_calloc _catclose _catgets _catopen @@ -471,17 +375,12 @@ _cgetnum _cgetset _cgetstr _cgetustr -_chdir -_chflags -_chmod _chmodx_np _clearerr _clearerr_unlocked _clock -_clock_get_time _clock_port _clock_sem -_close$NOCANCEL _closedir _compat_mode _confstr @@ -514,19 +413,13 @@ _digittoint _digittoint_l _dirfd _dirname -_dispatch_get_global_queue _div -_dladdr -_dlsym _dprintf _dprintf_l _drand48 -_dup2 _duplocale _dxprintf _dxprintf_exec -_dyld_get_program_sdk_version -_dyld_get_sdk_version _ecvt _encrypt _endttyent @@ -545,26 +438,22 @@ _execle _execlp _execv _execvP -_execve _execvp _exit _f_prealloc -_fchdir _fchmodx_np _fclose -_fcntl$NOCANCEL _fcvt _fdopen _fdopen$DARWIN_EXTSN -_fegetenv +_fdopendir +_fdopendir$INODE64 _feof _feof_unlocked _ferror _ferror_unlocked -_fesetenv _fflagstostr _fflush -_ffsctl _fgetc _fgetln _fgetpos @@ -586,7 +475,6 @@ _filesec_query_property _filesec_set_property _filesec_unset_property _flockfile -_flsl _fmtcheck _fmtmsg _fnmatch @@ -606,33 +494,24 @@ _fputwc_l _fputws _fputws_l _fread -_free _free_printf_comp _free_printf_domain -_freeifaddrs _freelocale _freopen _fscanf _fscanf_l -_fsctl _fseek _fseeko _fsetpos -_fstat -_fstat$INODE64 -_fstatfs -_fstatfs$INODE64 _fstatvfs _fstatx64_np _fstatx_np _fstatx_np$INODE64 -_fsync$NOCANCEL _fsync_volume_np _ftell _ftello _ftime _ftok -_ftruncate _ftrylockfile _fts_children _fts_children$INODE64 @@ -660,7 +539,6 @@ _fwscanf_l _fxprintf _fxprintf_exec _gcvt -_getattrlist _getbsize _getc _getc_unlocked @@ -670,22 +548,11 @@ _getcwd _getdate _getdate_err _getdelim -_getdirentries _getdiskbyname -_getdtablesize _getenv -_geteuid -_getfsstat -_getfsstat$INODE64 -_getfsstat64 -_getgrgid -_getgrnam -_getgroupcount -_getgrouplist _getgroups$DARWIN_EXTSN _gethostid _gethostname -_getifaddrs _getipv4sourcefilter _getlastlogx _getlastlogxbyname @@ -703,24 +570,13 @@ _getopt_long_only _getpagesize _getpass _getpeereid -_getpgrp -_getpid -_getpriority _getprogname -_getpwnam -_getpwuid -_getpwuid_r -_getrlimit -_getrusage _gets -_getsectiondata -_getsockopt _getsourcefilter _getsubopt _gettimeofday _getttyent _getttynam -_getuid _getusershell _getutmp _getutmpx @@ -753,9 +609,7 @@ _hcreate _hdestroy _heapsort _heapsort_b -_host_get_clock_service _hsearch -_if_nametoindex _imaxabs _imaxdiv _index @@ -777,7 +631,6 @@ _inet_ntop6 _inet_pton _initstate _insque -_ioctl _isalnum _isalnum_l _isalpha @@ -808,7 +661,6 @@ _ispunct _ispunct_l _isrune _isrune_l -_issetugid _isspace _isspace_l _isspecial @@ -857,7 +709,7 @@ _iswxdigit_l _isxdigit _isxdigit_l _jrand48 -_kill +_kOSThermalNotificationPressureLevelName _killpg _l64a _labs @@ -882,26 +734,13 @@ _logout _logwtmp _lrand48 _lsearch -_lseek -_lstat -_lstat$INODE64 _lstatx64_np _lstatx_np _lstatx_np$INODE64 _lutimes -_mach_absolute_time -_mach_error_string -_mach_host_self -_mach_port_deallocate -_mach_task_self_ -_mach_timebase_info -_malloc _mblen _mblen_l _mbmb -_mbr_gid_to_uuid -_mbr_uid_to_uuid -_mbr_uuid_to_id _mbrlen _mbrlen_l _mbrrune @@ -931,7 +770,6 @@ _memset_pattern8 _memset_s _mergesort _mergesort_b -_mkdir _mkdirx_np _mkdtemp _mkfifox_np @@ -940,7 +778,6 @@ _mkstemp _mkstemps _mktemp _mktime -_mmap _monaddition _moncontrol _moncount @@ -957,10 +794,6 @@ _mpool_open _mpool_put _mpool_sync _mrand48 -_munmap -_nan -_nanf -_nanl _nanosleep _nanosleep$NOCANCEL _new_printf_comp @@ -973,16 +806,10 @@ _nftw$INODE64 _nice _nl_langinfo _nl_langinfo_l -_notify_cancel -_notify_check -_notify_monitor_file -_notify_post -_notify_register_check _nrand48 _off32 _off64 _offtime -_open$NOCANCEL _opendev _opendir _opendir$INODE64 @@ -993,60 +820,21 @@ _opterr _optind _optopt _optreset -_pathconf _pause _pause$NOCANCEL _pclose _perror -_pipe _popen _popen$DARWIN_EXTSN _posix2time _posix_openpt -_posix_spawn -_posix_spawn_file_actions_addclose -_posix_spawn_file_actions_adddup2 -_posix_spawn_file_actions_destroy -_posix_spawn_file_actions_init -_posix_spawnattr_destroy -_posix_spawnattr_init -_posix_spawnattr_setflags -_posix_spawnattr_setsigdefault -_posix_spawnattr_setsigmask _posix_spawnp -_pread$NOCANCEL _printf _printf_l -_proc_name -_pselect -_pselect$1050 -_pselect$DARWIN_EXTSN -_pselect$DARWIN_EXTSN$NOCANCEL -_pselect$NOCANCEL _psignal _psort _psort_b _psort_r -_pthread_get_stackaddr_np -_pthread_get_stacksize_np -_pthread_getspecific -_pthread_key_create -_pthread_key_init_np -_pthread_kill -_pthread_mutex_destroy -_pthread_mutex_init -_pthread_mutex_lock -_pthread_mutex_trylock -_pthread_mutex_unlock -_pthread_once -_pthread_rwlock_destroy -_pthread_rwlock_rdlock -_pthread_rwlock_unlock -_pthread_rwlock_wrlock -_pthread_self -_pthread_setspecific -_pthread_sigmask -_pthread_testcancel _ptsname _putc _putc_unlocked @@ -1060,7 +848,6 @@ _putwc _putwc_l _putwchar _putwchar_l -_pwrite$NOCANCEL _qsort _qsort_b _qsort_r @@ -1078,14 +865,11 @@ _rb_tree_init _rb_tree_insert_node _rb_tree_iterate _rb_tree_remove_node -_read$NOCANCEL _readdir _readdir$INODE64 _readdir_r _readdir_r$INODE64 -_readlink _readpassphrase -_realloc _reallocf _realpath _realpath$DARWIN_EXTSN @@ -1113,7 +897,6 @@ _rewind _rewinddir _rewinddir$INODE64 _rindex -_rmdir _sbrk _scandir _scandir$INODE64 @@ -1124,15 +907,8 @@ _scanf_l _seed48 _seekdir _seekdir$INODE64 -_select -_select$1050 -_select$DARWIN_EXTSN -_select$DARWIN_EXTSN$NOCANCEL -_select$NOCANCEL -_semaphore_create _send _send$NOCANCEL -_setattrlist _setbuf _setbuffer _setenv @@ -1140,24 +916,16 @@ _sethostid _sethostname _setinvalidrune _setipv4sourcefilter -_setitimer _setkey _setlinebuf _setlocale _setlogin _setmode -_setpgid _setpgrp -_setpriority _setprogname -_setregid -_setreuid _setrgid -_setrlimit _setruid _setrunelocale -_setsid -_setsockopt _setsourcefilter _setstate _settimeofday @@ -1180,12 +948,9 @@ _sigismember _signal _sigpause _sigpause$NOCANCEL -_sigprocmask _sigrelse _sigset _sigsetmask -_sigsuspend -_sigsuspend$NOCANCEL _sigvec _skip _sl_add @@ -1197,10 +962,6 @@ _sleep$NOCANCEL _snprintf _snprintf_l _sockatmark -_socket -_socketpair -_spin_lock -_spin_unlock _sprintf _sprintf_l _sradixsort @@ -1211,9 +972,6 @@ _srandom _srandomdev _sscanf _sscanf_l -_stat -_stat$INODE64 -_statfs$INODE64 _statvfs _statx64_np _statx_np @@ -1306,10 +1064,8 @@ _sysconf _sysctl _sysctlbyname _sysctlnametomib -_syslog _system _system$NOCANCEL -_task_set_special_port _tcdrain _tcdrain$NOCANCEL _tcflow @@ -1346,6 +1102,23 @@ _towlower _towlower_l _towupper _towupper_l +_tre_ast_new_catenation +_tre_ast_new_iter +_tre_ast_new_literal +_tre_ast_new_node +_tre_ast_new_union +_tre_compile +_tre_fill_pmatch +_tre_free +_tre_mem_alloc_impl +_tre_mem_destroy +_tre_mem_new_impl +_tre_parse +_tre_stack_destroy +_tre_stack_new +_tre_stack_num_objects +_tre_tnfa_run_backtrack +_tre_tnfa_run_parallel _tsearch _ttyname _ttyname_r @@ -1356,13 +1129,11 @@ _tzset _tzsetwall _ualarm _ulimit -_umask _umaskx_np _uname _ungetc _ungetwc _ungetwc_l -_unlink _unlockpt _unsetenv _unvis @@ -1370,7 +1141,6 @@ _uselocale _usleep _usleep$NOCANCEL _utime -_utimes _utmpxname _uuid_clear _uuid_compare @@ -1407,7 +1177,6 @@ _vfwscanf_l _vfxprintf _vfxprintf_exec _vis -_vm_allocate _vprintf _vprintf_l _vscanf @@ -1436,7 +1205,6 @@ _vxprintf_exec _wait _wait$NOCANCEL _wait3 -_wait4 _waitpid _waitpid$NOCANCEL _warn @@ -1519,12 +1287,9 @@ _wordexp _wordfree _wprintf _wprintf_l -_write$NOCANCEL -_writev$NOCANCEL _wscanf _wscanf_l _wtmpxname _xprintf _xprintf_exec -dyld_stub_binder mcount diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols index 9d53dea7025..ff9073157a5 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols +++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/system_kernel_symbols @@ -9,17 +9,20 @@ ___access_extended ___aio_suspend_nocancel ___bind ___bsdthread_create +___bsdthread_ctl ___bsdthread_register ___bsdthread_terminate ___carbon_delete ___chmod ___chmod_extended -___chud ___close_nocancel +___coalition +___coalition_info ___commpage_gettimeofday ___connect ___connect_nocancel ___copyfile +___csrctl ___delete ___disable_threadsignal ___error @@ -29,7 +32,6 @@ ___fchmod_extended ___fcntl ___fcntl_nocancel ___fork -___fsgetpath ___fstat64_extended ___fstat_extended ___fsync_nocancel @@ -37,7 +39,6 @@ ___get_remove_counter ___getattrlist ___getdirentries64 ___gethostuuid -___getlcid ___getlogin ___getpeername ___getpid @@ -47,6 +48,7 @@ ___getsockname ___gettid ___gettimeofday ___getwgroups +___guarded_open_dprotected_np ___guarded_open_np ___identitysvc ___inc_remove_counter @@ -54,11 +56,13 @@ ___initgroups ___ioctl ___iopolicysys ___kdebug_trace +___kdebug_trace64 ___kernelVersionNumber ___kernelVersionString ___kill ___lchown ___libkernel_init +___libkernel_voucher_init ___listen ___lseek ___lstat64_extended @@ -66,8 +70,6 @@ ___lstat_extended ___mac_execve ___mac_get_fd ___mac_get_file -___mac_get_lcid -___mac_get_lctx ___mac_get_link ___mac_get_mount ___mac_get_pid @@ -76,7 +78,6 @@ ___mac_getfsstat ___mac_mount ___mac_set_fd ___mac_set_file -___mac_set_lctx ___mac_set_link ___mac_set_proc ___mac_syscall @@ -96,6 +97,8 @@ ___open ___open_dprotected_np ___open_extended ___open_nocancel +___openat +___openat_nocancel ___pipe ___poll_nocancel ___posix_spawn @@ -131,6 +134,7 @@ ___recvfrom_nocancel ___recvmsg ___recvmsg_nocancel ___rename +___renameat ___rmdir ___sandbox_me ___sandbox_mm @@ -149,8 +153,8 @@ ___sendmsg_nocancel ___sendto ___sendto_nocancel ___setattrlist -___setlcid ___setlogin +___setpriority ___setregid ___setreuid ___setrlimit @@ -159,6 +163,8 @@ ___settid ___settid_with_pid ___settimeofday ___setwgroups +___sfi_ctl +___sfi_pidctl ___shared_region_check_np ___shared_region_map_and_slide_np ___shm_open @@ -171,16 +177,18 @@ ___sigsuspend ___sigsuspend_nocancel ___sigwait ___socketpair -___stack_snapshot ___stat64_extended ___stat_extended ___syscall ___syscall_logger ___sysctl +___sysctlbyname ___telemetry ___thread_selfid +___thread_selfusage ___umask_extended ___unlink +___unlinkat ___vfork ___wait4 ___wait4_nocancel @@ -238,6 +246,7 @@ __kernelrpc_mach_port_set_attributes __kernelrpc_mach_port_set_context __kernelrpc_mach_port_set_mscount __kernelrpc_mach_port_set_seqno +__kernelrpc_mach_port_space_basic_info __kernelrpc_mach_port_space_info __kernelrpc_mach_port_type __kernelrpc_mach_port_unguard @@ -253,6 +262,9 @@ __kernelrpc_mach_vm_protect_trap __kernelrpc_mach_vm_read __kernelrpc_mach_vm_remap __kernelrpc_task_set_port_space +__kernelrpc_thread_policy +__kernelrpc_thread_policy_set +__kernelrpc_thread_set_policy __kernelrpc_vm_map __kernelrpc_vm_read __kernelrpc_vm_remap @@ -304,11 +316,18 @@ _clock_sleep _clock_sleep_trap _close _close$NOCANCEL +_coalition_create +_coalition_info_resource_usage +_coalition_reap +_coalition_terminate _connect _connect$NOCANCEL _connectx _csops _csops_audittoken +_csr_check +_csr_get_active_config +_denap_boost_assertion_token _disconnectx _dup _dup2 @@ -321,10 +340,13 @@ _exception_raise_state _exception_raise_state_identity _exchangedata _execve +_faccessat _fchdir _fchflags _fchmod +_fchmodat _fchown +_fchownat _fcntl _fcntl$NOCANCEL _fdatasync @@ -344,6 +366,9 @@ _fsetxattr _fstat _fstat$INODE64 _fstat64 +_fstatat +_fstatat$INODE64 +_fstatat64 _fstatfs _fstatfs$INODE64 _fstatfs64 @@ -353,6 +378,8 @@ _ftruncate _futimes _get_dp_control_port _getattrlist +_getattrlistat +_getattrlistbulk _getaudit _getaudit_addr _getauid @@ -387,7 +414,12 @@ _getwgroups_np _getxattr _guarded_close_np _guarded_kqueue_np +_guarded_open_dprotected_np _guarded_open_np +_guarded_pwrite_np +_guarded_write_np +_guarded_writev_np +_host_create_mach_voucher _host_default_memory_manager _host_get_UNDServer _host_get_boot_info @@ -406,6 +438,8 @@ _host_processor_set_priv _host_processor_sets _host_processors _host_reboot +_host_register_mach_voucher_attr_manager +_host_register_well_known_mach_voucher_attr_manager _host_request_notification _host_security_create_task_token _host_security_set_task_token @@ -426,6 +460,7 @@ _internal_catch_exc_subsystem _ioctl _issetugid _kas_info +_kdebug_trace _kevent _kevent64 _kext_request @@ -438,6 +473,7 @@ _kqueue _lchown _ledger _link +_linkat _lio_listio _listen _listxattr @@ -454,6 +490,7 @@ _lstat _lstat$INODE64 _lstat64 _mach_absolute_time +_mach_approximate_time _mach_error _mach_error_full_diag _mach_error_string @@ -510,6 +547,7 @@ _mach_port_set_attributes _mach_port_set_context _mach_port_set_mscount _mach_port_set_seqno +_mach_port_space_basic_info _mach_port_space_info _mach_port_type _mach_port_unguard @@ -540,6 +578,12 @@ _mach_vm_region_recurse _mach_vm_remap _mach_vm_wire _mach_vm_write +_mach_voucher_attr_command +_mach_voucher_deallocate +_mach_voucher_debug_info +_mach_voucher_extract_all_attr_recipes +_mach_voucher_extract_attr_content +_mach_voucher_extract_attr_recipe _mach_wait_until _mach_zone_force_gc _mach_zone_info @@ -565,6 +609,7 @@ _mk_timer_cancel _mk_timer_create _mk_timer_destroy _mkdir +_mkdirat _mkfifo _mknod _mlock @@ -573,6 +618,7 @@ _mmap _modwatch _mount _mprotect +_mremap_encrypted _msg_receive _msg_rpc _msg_send @@ -588,6 +634,7 @@ _msync$NOCANCEL _munlock _munlockall _munmap +_necp_match_policy _netname_check_in _netname_check_out _netname_look_up @@ -599,12 +646,17 @@ _normal_boost_assertion_token _open _open$NOCANCEL _open_dprotected_np +_openat +_openat$NOCANCEL +_openbyid_np _panic _panic_init _pathconf _peeloff _pid_for_task +_pid_hibernate _pid_resume +_pid_shutdown_sockets _pid_suspend _pipe _poll @@ -621,6 +673,7 @@ _posix_spawn_file_actions_addopen _posix_spawn_file_actions_destroy _posix_spawn_file_actions_init _posix_spawnattr_destroy +_posix_spawnattr_get_qos_clamp_np _posix_spawnattr_getbinpref_np _posix_spawnattr_getcpumonitor _posix_spawnattr_getflags @@ -632,8 +685,10 @@ _posix_spawnattr_getsigdefault _posix_spawnattr_getsigmask _posix_spawnattr_init _posix_spawnattr_set_importancewatch_port_np +_posix_spawnattr_set_qos_clamp_np _posix_spawnattr_setauditsessionport_np _posix_spawnattr_setbinpref_np +_posix_spawnattr_setcoalition_np _posix_spawnattr_setcpumonitor _posix_spawnattr_setcpumonitor_default _posix_spawnattr_setexceptionports_np @@ -648,7 +703,10 @@ _posix_spawnattr_setspecialport_np _pread _pread$NOCANCEL _proc_clear_delayidlesleep +_proc_clear_dirty _proc_clear_vmpressure +_proc_denap_assertion_begin_with_msg +_proc_denap_assertion_complete _proc_disable_apptype _proc_disable_cpumon _proc_disable_wakemon @@ -671,19 +729,23 @@ _proc_pid_rusage _proc_pidfdinfo _proc_pidfileportinfo _proc_pidinfo +_proc_pidoriginatorinfo _proc_pidpath _proc_regionfilename _proc_rlimit_control _proc_set_cpumon_defaults _proc_set_cpumon_params +_proc_set_cpumon_params_fatal _proc_set_delayidlesleep _proc_set_dirty _proc_set_owner_vmpressure _proc_set_wakemon_defaults _proc_set_wakemon_params _proc_setpcontrol +_proc_setthread_cpupercent _proc_suppress _proc_terminate +_proc_trace_log _proc_track_dirty _proc_uuid_policy _processor_assign @@ -704,6 +766,11 @@ _processor_set_statistics _processor_set_tasks _processor_set_threads _processor_start +_pselect +_pselect$1050 +_pselect$DARWIN_EXTSN +_pselect$DARWIN_EXTSN$NOCANCEL +_pselect$NOCANCEL _pthread_getugid_np _pthread_setugid_np _ptrace @@ -714,6 +781,7 @@ _quotactl _read _read$NOCANCEL _readlink +_readlinkat _readv _readv$NOCANCEL _reboot @@ -721,8 +789,11 @@ _recvfrom _recvfrom$NOCANCEL _recvmsg _recvmsg$NOCANCEL +_recvmsg_x _removexattr _rename +_rename_ext +_renameat _revoke _rmdir _searchfs @@ -764,6 +835,7 @@ _semsys _sendfile _sendmsg _sendmsg$NOCANCEL +_sendmsg_x _sendto _sendto$NOCANCEL _set_dp_control_port @@ -790,6 +862,10 @@ _setsockopt _setuid _setwgroups_np _setxattr +_sfi_get_class_offtime +_sfi_process_get_flags +_sfi_process_set_flags +_sfi_set_class_offtime _shm_open _shm_unlink _shmat @@ -815,10 +891,13 @@ _swapon _swtch _swtch_pri _symlink +_symlinkat _sync _syscall _syscall_thread_switch +_system_get_sfi_window _system_override +_system_set_sfi_window _task_assign _task_assign_default _task_create @@ -826,6 +905,7 @@ _task_for_pid _task_get_assignment _task_get_emulation_vector _task_get_exception_ports +_task_get_mach_voucher _task_get_special_port _task_get_state _task_info @@ -843,6 +923,7 @@ _task_set_emulation _task_set_emulation_vector _task_set_exception_ports _task_set_info +_task_set_mach_voucher _task_set_phys_footprint_limit _task_set_policy _task_set_port_space @@ -852,6 +933,7 @@ _task_set_state _task_suspend _task_suspend2 _task_swap_exception_ports +_task_swap_mach_voucher _task_terminate _task_threads _task_zone_info @@ -864,6 +946,7 @@ _thread_create_running _thread_depress_abort _thread_get_assignment _thread_get_exception_ports +_thread_get_mach_voucher _thread_get_special_port _thread_get_state _thread_info @@ -874,11 +957,13 @@ _thread_resume _thread_sample _thread_self_trap _thread_set_exception_ports +_thread_set_mach_voucher _thread_set_policy _thread_set_special_port _thread_set_state _thread_suspend _thread_swap_exception_ports +_thread_swap_mach_voucher _thread_switch _thread_terminate _thread_wire @@ -886,6 +971,7 @@ _truncate _umask _undelete _unlink +_unlinkat _unmount _utimes _vfork @@ -917,6 +1003,10 @@ _vm_region_recurse_64 _vm_remap _vm_wire _vm_write +_voucher_mach_msg_adopt +_voucher_mach_msg_clear +_voucher_mach_msg_revert +_voucher_mach_msg_set _vprintf_stderr_func _wait4 _waitevent diff --git a/pkgs/os-specific/darwin/apple-source-releases/default.nix b/pkgs/os-specific/darwin/apple-source-releases/default.nix index d7710abf291..2ebb8868a2e 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/default.nix @@ -10,37 +10,36 @@ let dtrace = "168"; xnu = "3248.60.10"; libpthread = "138.10.4"; + libiconv = "44"; + Libnotify = "150.40.1"; + objc4 = "680"; + eap8021x = "222.40.1"; + dyld = "360.22"; + architecture = "268"; + CommonCrypto = "60075.50.1"; + copyfile = "127"; + Csu = "85"; + ppp = "809.50.2"; + libclosure = "65"; + Libinfo = "477.50.4"; + removefile = "41"; + libresolv = "60"; + + # Their release page is a bit of a mess here, so I'm going to lie a bit and say this version + # is the right one, even though it isn't. The version I have here doesn't appear to be linked + # to any OS releases, but Apple also doesn't mention mDNSResponder from 10.11 to 10.11.6, and + # neither of those versions are publicly available. + mDNSResponder = "625.41.2"; + + libutil = "43"; + libunwind = "35.3"; }; "osx-10.11.5" = { Libc = "1082.50.1"; # 10.11.6 still unreleased :/ }; "osx-10.10.5" = { adv_cmds = "158"; - architecture = "266"; - CF = "1153.18"; - CommonCrypto = "60061.30.1"; - copyfile = "118.1.2"; - Csu = "85"; - dyld = "353.2.3"; - eap8021x = "198.30.1"; - libauto = "186"; - Libc = "1044.40.1"; - libclosure = "65"; - libdispatch = "442.1.4"; - libiconv = "42"; - Libinfo = "459.40.1"; - Libnotify = "133.1.1"; - libpthread = "105.40.1"; - libresolv = "57"; - Libsystem = "1213"; - libunwind = "35.3"; - libutil = "38"; - mDNSResponder = "576.30.4"; - objc4 = "647"; - ppp = "786.40.2"; - removefile = "35"; Security = "57031.40.6"; - xnu = "2782.40.9"; IOAudioFamily = "203.3"; IOFireWireFamily = "458"; @@ -62,15 +61,11 @@ let CF = "855.17"; launchd = "842.92.1"; libauto = "185.5"; - Libc = "997.90.3"; + Libc = "997.90.3"; # We use this, but not from here libdispatch = "339.92.1"; - libiconv = "41"; - Libnotify = "121.20.1"; Libsystem = "1197.1.1"; - objc4 = "551.1"; Security = "55471.14.18"; security_dotmac_tp = "55107.1"; - xnu = "2422.115.4"; IOStorageFamily = "172"; }; @@ -178,21 +173,20 @@ let packages = { inherit (adv_cmds) ps locale; - architecture = applePackage "architecture" "osx-10.10.5" "0fc9s1f4mnzaixrmkkq9y8276g8i5grryh2dggi4h347i33kd097" {}; + architecture = applePackage "architecture" "osx-10.11.6" "1pbpjcd7is69hn8y29i98ci0byik826if8gnp824ha92h90w0fq3" {}; bootstrap_cmds = applePackage "bootstrap_cmds" "dev-tools-7.0" "1v5dv2q3af1xwj5kz0a5g54fd5dm6j4c9dd2g66n4kc44ixyrhp3" {}; bsdmake = applePackage "bsdmake" "dev-tools-3.2.6" "11a9kkhz5bfgi1i8kpdkis78lhc6b5vxmhd598fcdgra1jw4iac2" {}; CarbonHeaders = applePackage "CarbonHeaders" "osx-10.6.2" "1zam29847cxr6y9rnl76zqmkbac53nx0szmqm9w5p469a6wzjqar" {}; CF = applePackage "CF" "osx-10.9.5" "1sadmxi9fsvsmdyxvg2133sdzvkzwil5fvyyidxsyk1iyfzqsvln" {}; - CommonCrypto = applePackage "CommonCrypto" "osx-10.10.5" "0rm1r552i3mhyik2y3309dw90ap6vlhk583237jxfmdkip4c6mdr" {}; + CommonCrypto = applePackage "CommonCrypto" "osx-10.11.6" "0vllfpb8f4f97wj2vpdd7w5k9ibnsbr6ff1zslpp6q323h01n25y" {}; configd = applePackage "configd" "osx-10.8.5" "1gxakahk8gallf16xmhxhprdxkh3prrmzxnmxfvj0slr0939mmr2" {}; - copyfile = applePackage "copyfile" "osx-10.10.5" "1s90wv9jsi6ismdnc1my3rxaa83k3s5ialrs5xlrmyb7s0pgvz7j" {}; + copyfile = applePackage "copyfile" "osx-10.11.6" "1rkf3iaxmjz5ycgrmf0g971kh90jb2z1zqxg5vlqz001s4y457gs" {}; CoreOSMakefiles = applePackage "CoreOSMakefiles" "osx-10.5" "0kxp53spbn7109l7cvhi88pmfsi81lwmbws819b6wr3hm16v84f4" {}; - Csu = applePackage "Csu" "osx-10.10.5" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; - dtrace = applePackage "dtrace" "osx-10.10.5" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wcf" {}; - dtracen = applePackage "dtrace" "osx-10.11.6" "04mi0jy8gy0w59rk9i9dqznysv6fzz1v5mq779s41cp308yi0h1c" {}; - dyld = applePackage "dyld" "osx-10.10.5" "167f74ln8pmfimwn6kwh199ylvy3fw72fd15da94mf34ii0zar6k" {}; - eap8021x = applePackage "eap8021x" "osx-10.10.5" "1f37dpbcgrd1b14nrv2lpqrkap74myjbparz9masx92df6kcn7l2" {}; - IOKit = applePackage "IOKit" "osx-10.10.5" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x0m" { inherit IOKitSrcs; }; + Csu = applePackage "Csu" "osx-10.11.6" "0yh5mslyx28xzpv8qww14infkylvc1ssi57imhi471fs91sisagj" {}; + dtrace = applePackage "dtrace" "osx-10.11.6" "0pp5x8dgvzmg9vvg32hpy2brm17dpmbwrcr4prsmdmfvd4767wc0" {}; + dyld = applePackage "dyld" "osx-10.11.6" "0qkjmjazm2zpgvwqizhandybr9cm3gz9pckx8rmf0py03faafc08" {}; + eap8021x = applePackage "eap8021x" "osx-10.11.6" "15bbgjhi8l7hbib41gqcldzbf3hf6105jbwc745hp1gmrscw4zch" {}; + IOKit = applePackage "IOKit" "osx-10.11.6" "0kcbrlyxcyirvg5p95hjd9k8a01k161zg0bsfgfhkb90kh2s8x00" { inherit IOKitSrcs; }; launchd = applePackage "launchd" "osx-10.9.5" "0w30hvwqq8j5n90s3qyp0fccxflvrmmjnicjri4i1vd2g196jdgj" {}; libauto = applePackage "libauto" "osx-10.9.5" "17z27yq5d7zfkwr49r7f0vn9pxvj95884sd2k6lq6rfaz9gxqhy3" {}; Libc = applePackage "Libc" "osx-10.11.5" "1qv7r0dgz06jy9i5agbqzxgdibb0m8ylki6g5n5pary88lzrawfd" { @@ -202,35 +196,24 @@ let }; }; Libc_old = applePackage "Libc/825_40_1.nix" "osx-10.8.5" "0xsx1im52gwlmcrv4lnhhhn9dyk5ci6g27k6yvibn9vj8fzjxwcf" {}; - libclosure = applePackage "libclosure" "osx-10.10.5" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; + libclosure = applePackage "libclosure" "osx-10.11.6" "1zqy1zvra46cmqv6vsf1mcsz3a76r9bky145phfwh4ab6y15vjpq" {}; libdispatch = applePackage "libdispatch" "osx-10.9.5" "1lc5033cmkwxy3r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; - libiconv = applePackage "libiconv" "osx-10.9.5" "0sni1gx6i2h7r4r4hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {}; - Libinfo = applePackage "Libinfo" "osx-10.10.5" "19n72s652rrqnc9hzlh4xq3h7xsfyjyklmcgyzyj0v0z68ww3z6h" {}; + libiconv = applePackage "libiconv" "osx-10.11.6" "11h6lfajydri4widis62q8scyz7z8l6msqyx40ly4ahsdlbl0981" {}; + Libinfo = applePackage "Libinfo" "osx-10.11.6" "0qjgkd4y8sjvwjzv5wwyzkb61pg8wwg95bkp721dgzv119dqhr8x" {}; Libm = applePackage "Libm" "osx-10.7.4" "02sd82ig2jvvyyfschmb4gpz6psnizri8sh6i982v341x6y4ysl7" {}; - Libnotify = applePackage "Libnotify" "osx-10.9.5" "164rx4za5z74s0mk9x0m1815r1m9kfal8dz3bfaw7figyjd6nqad" {}; + Libnotify = applePackage "Libnotify" "osx-10.11.6" "14rhhfzb75r9jf3kyj8fzd01n09n7km1fsdj3dzl3lkkp1sir78m" {}; libpthread = applePackage "libpthread" "osx-10.11.6" "1kbw738cmr9pa7pz1igmajs307clfq7gv2vm1sqdzhcnnjxbl28w" {}; - libresolv = applePackage "libresolv" "osx-10.10.5" "0nvssf4qaqgs1dxwayzdy66757k99969f6c7n68n58n2yh6f5f6a" {}; + libresolv = applePackage "libresolv" "osx-10.11.6" "09flfdi3dlzq0yap32sxidacpc4nn4va7z12a6viip21ix2xb2gf" {}; Libsystem = applePackage "Libsystem" "osx-10.9.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim1gw43x4lvz4qydpp5kg2rh" {}; - libutil = applePackage "libutil" "osx-10.10.5" "12gsvmj342n5d81kqwba68bmz3zf2757442g1sz2y5xmcapa3g5f" {}; - libunwind = applePackage "libunwind" "osx-10.10.5" "0miffaa41cv0lzf8az5k1j1ng8jvqvxcr4qrlkf3xyj479arbk1b" {}; - mDNSResponder = applePackage "mDNSResponder" "osx-10.10.5" "1h4jin7ya1ih7v0hksi7gfmbv767pv8wsyyv1qfy2xw36x8wnds7" {}; - objc4 = applePackage "objc4" "osx-10.9.5" "1jrdb6yyb5jwwj27c1r0nr2y2ihqjln8ynj61mpkvp144c1cm5bg" {}; - ppp = applePackage "ppp" "osx-10.10.5" "01v7i0xds185glv8psvlffylfcfhbx1wgsfg74kx5rh3lyrigwrb" {}; - removefile = applePackage "removefile" "osx-10.10.5" "1f2jw5irq6fz2jv5pag1w2ivfp8659v74f0h8kh0yx0rqw4asm33" {}; + libutil = applePackage "libutil" "osx-10.11.6" "1gmgmcyqdyc684ih7dimdmxdljnq7mzjy5iqbf589wc0pa8h5abm" {}; + libunwind = applePackage "libunwind" "osx-10.11.6" "16nhx2pahh9d62mvszc88q226q5lwjankij276fxwrm8wb50zzlx" {}; + mDNSResponder = applePackage "mDNSResponder" "osx-10.11.6" "069incq28a78yh1bnr17h9cd5if5mwqpq8ahnkyxxx25fkaxgzcf" {}; + objc4 = applePackage "objc4" "osx-10.11.6" "00b7vbgxni8frrqyi69b4njjihlwydzjd9zj9x4z5dbx8jabkvrj" {}; + ppp = applePackage "ppp" "osx-10.11.6" "1dql6r1v0vbcs04958nn2i6p31yfsxyy51jca63bm5mf0gxalk3f" {}; + removefile = applePackage "removefile" "osx-10.11.6" "1b6r74ry3k01kypvlaclf33fha15pcm0kzx9zrymlg66wg0s0i3r" {}; Security = applePackage "Security" "osx-10.9.5" "1nv0dczf67dhk17hscx52izgdcyacgyy12ag0jh6nl5hmfzsn8yy" {}; xnu = applePackage "xnu" "osx-10.11.6" "0yhziq4dqqcbjpf6vyqn8xhwva2zb525gndkx8cp8alzwp76jnr9" {}; - # Pending work... we can't change the above packages in place because the bootstrap depends on them, so we detach the expressions - # here so we can work on them. - CF_new = applePackage "CF/new.nix" "osx-10.10.5" "1sadmxi9fsvsmdyxvg2133sdzvkzwil50vyyidxsyk1iyfzqsvln" {}; - Libc_new = applePackage "Libc/new.nix" "osx-10.10.5" "1jz5bx9l4q484vn08c6n9b28psja3rpxiqbj6zwrwvlndzmq1yz5" {}; - libdispatch_new = applePackage "libdispatch/new.nix" "osx-10.10.5" "1lc5033cmkwxy0r26gh9plimxshxfcbgw6i0j7mgjlnpk86iy5bk" {}; - libiconv_new = applePackage "libiconv/new.nix" "osx-10.10.5" "0sni1gx6i2h7r404hhwbxdir45cp039m4wi74izh4l0pfw7gywad" {}; - Libnotify_new = applePackage "Libnotify/new.nix" "osx-10.10.5" "0sni1gx6i2h7r404hhwbxdir45cp039m4wi70izh4l0pfw7gywad" {}; - Libsystem_new = applePackage "Libsystem/new.nix" "osx-10.10.5" "1yfj2qdrf9vrzs7p9m4wlb7zzxcrim10w43x4lvz4qydpp5kg2rh" {}; - objc4_new = applePackage "objc4/new.nix" "osx-10.10.5" "0r0797ckmgv19if4i14dzyjh7i5klkm9jpacjif9v3rpycyyx1n3" {}; - xnu_new = applePackage "xnu/new.nix" "osx-10.11.2" "1ax280jblz7laqam8fcwrffrrz26am10p1va9mlg9mklvbqarhqh" {}; - libsecurity_apple_csp = libsecPackage "libsecurity_apple_csp" "osx-10.7.5" "1ngyn1ik27n4x981px3kfd1z1n8zx7r5w812b6qfjpy5nw4h746w" {}; libsecurity_apple_cspdl = libsecPackage "libsecurity_apple_cspdl" "osx-10.7.5" "1svqa5fhw7p7njzf8bzg7zgc5776aqjhdbnlhpwmr5hmz5i0x8r7" {}; libsecurity_apple_file_dl = libsecPackage "libsecurity_apple_file_dl" "osx-10.7.5" "1dfqani3n135i3iqmafc1k9awmz6s0a78zifhk15rx5a8ps870bl" {}; diff --git a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix index 5b82835d3e6..f5feee48e07 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/libiconv/default.nix @@ -7,9 +7,10 @@ appleDerivation { mv $out/lib/libiconv.dylib $out/lib/libiconv-nocharset.dylib install_name_tool -id $out/lib/libiconv-nocharset.dylib $out/lib/libiconv-nocharset.dylib - ld -dylib -o $out/lib/libiconv.dylib \ - -reexport_library $out/lib/libiconv-nocharset.dylib \ - -reexport_library $out/lib/libcharset.dylib \ - -dylib_compatibility_version 7.0.0 + # re-export one useless symbol; ld will reject a dylib that only reexports other dylibs + echo 'void dont_use_this(){}' | clang -dynamiclib -x c - -current_version 2.4.0 \ + -compatibility_version 7.0.0 -current_version 7.0.0 -o $out/lib/libiconv.dylib \ + -Wl,-reexport_library -Wl,$out/lib/libiconv-nocharset.dylib \ + -Wl,-reexport_library -Wl,$out/lib/libcharset.dylib ''; } diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index bc6492f243f..af713bf61dd 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -6,13 +6,13 @@ let baseParams = rec { name = "cctools-port-${version}"; - version = "877.5"; + version = "886"; src = fetchFromGitHub { owner = "tpoechtrager"; repo = "cctools-port"; - rev = "7d405492b09fa27546caaa989b8493829365deab"; - sha256 = "0nj1q5bqdx5jm68dispybxc7wnkb6p8p2igpnap9q6qyv2r9p07w"; + rev = "02f0b8ecd87a3951653d838a321ae744815e21a5"; + sha256 = "0bzyabzr5dvbxglr74d0kbrk2ij5x7s5qcamqi1v546q1had1wz1"; }; buildInputs = [ autoconf automake libtool_2 openssl libuuid ] ++ diff --git a/pkgs/os-specific/darwin/usr-include/default.nix b/pkgs/os-specific/darwin/usr-include/default.nix new file mode 100644 index 00000000000..c5f7e3acce7 --- /dev/null +++ b/pkgs/os-specific/darwin/usr-include/default.nix @@ -0,0 +1,21 @@ +{stdenv, darwin}: + +/* + * This is needed to build GCC on Darwin. + * + * These are the collection of headers that would normally be available under + * /usr/include in OS X machines with command line tools installed. They need + * to be in one folder for gcc to use them correctly. + */ + +stdenv.mkDerivation { + name = "darwin-usr-include"; + buildInputs = [ darwin.CF stdenv.libc ]; + buildCommand = '' + mkdir -p $out + cd $out + ln -sf ${stdenv.libc}/include/* . + mkdir CoreFoundation + ln -sf ${darwin.CF}/Library/Frameworks/CoreFoundation.framework/Headers/* CoreFoundation + ''; +} diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index f0352530480..51a60a27431 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, alsaLib, pkgconfig, gtk, gtk3, fltk13 }: +{ stdenv, fetchurl, alsaLib, pkgconfig, gtk2, gtk3, fltk13 }: +# Comes from upstream as as bundle of several tools, +# some use gtk2, some gtk3 (and some even fltk13). stdenv.mkDerivation rec { name = "alsa-tools-${version}"; @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "0ldbaz3qr7z0639xg37ba7cmrb512rrjavap6r5jjl0ab665ad3x"; }; - buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ]; + buildInputs = [ alsaLib pkgconfig gtk2 gtk3 fltk13 ]; patchPhase = '' export tools="as10k1 hda-verb hdspmixer echomixer hdajackretask hdspconf hwmixvolume mixartloader rmedigicontrol sscape_ctl vxloader envy24control hdajacksensetest hdsploader ld10k1 pcxhrloader sb16_csp us428control" diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix new file mode 100644 index 00000000000..17a06664041 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -0,0 +1,155 @@ +{ stdenv, fetchurl, elfutils, mesa_noglu +, xorg, patchelf, openssl, libdrm, libudev +, libxcb, libxshmfence, epoxy, perl, zlib +, libsOnly ? false, kernel ? null +}: + +assert (!libsOnly) -> kernel != null; + +with stdenv.lib; + +let + + kernelDir = if libsOnly then null else kernel.dev; + + inherit (mesa_noglu) driverLink; + + bitness = if stdenv.is64bit then "64" else "32"; + + libArch = + if stdenv.system == "i686-linux" then + "i386-linux-gnu" + else if stdenv.system == "x86_64-linux" then + "x86_64-linux-gnu" + else throw "amdgpu-pro is Linux only. Sorry. The build was stopped."; + + libReplaceDir = "/usr/lib/${libArch}"; + +in stdenv.mkDerivation rec { + + version = "16.30"; + pname = "amdgpu-pro"; + build = "16.30.3-315407"; + + libCompatDir = "/run/lib/${libArch}"; + + name = pname + "-" + version + (optionalString (!libsOnly) "-${kernelDir.version}"); + + src = fetchurl { + url = + "https://www2.ati.com/drivers/linux/amdgpu-pro_${build}.tar.xz"; + sha256 = "97d6fb64617cf2cefe780e5fb83b29d8ee4e3e7886b71fe3d92b0113847b2354"; + curlOpts = "--referer http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx"; + }; + + hardeningDisable = [ "pic" "format" ]; + + inherit libsOnly; + + postUnpack = '' + cd $sourceRoot + mkdir root + cd root + for deb in ../*.deb; do echo $deb; ar p $deb data.tar.xz | tar -xJ; done + sourceRoot=. + ''; + + modulePatches = [ + ./patches/0001-add-OS-detection-for-arch.patch + ./patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch + ./patches/0003-add-kcl_drm_gem_object_lookup.patch + ./patches/0004-paging-changes-for-linux-4.6.patch + ./patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch + ./patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch + ./patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch + ./patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch + ./patches/0009-disable-dal-by-default.patch + ./patches/0010-remove-dependency-on-System.map.patch + ]; + + patchPhase = optionalString (!libsOnly) '' + pushd usr/src/amdgpu-pro-${build} + for patch in $modulePatches; do echo $patch; patch -p1 < $patch; done + popd + ''; + + preBuild = optionalString (!libsOnly) '' + makeFlags="$makeFlags M=$(pwd)/usr/src/amdgpu-pro-${build}" + ''; + + postBuild = optionalString (!libsOnly) '' + xz usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko + ''; + + makeFlags = optionalString (!libsOnly) + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build modules"; + + depLibPath = makeLibraryPath [ + stdenv.cc.cc.lib xorg.libXext xorg.libX11 xorg.libXdamage xorg.libXfixes zlib + xorg.libXxf86vm libxcb libxshmfence epoxy openssl libdrm elfutils libudev + ]; + + installPhase = '' + mkdir -p $out + cp -r usr/bin $out/bin + cp -r etc $out/etc + cp -r usr/include $out/include + cp -r usr/lib/${libArch} $out/lib + mv $out/lib/amdgpu-pro/* $out/lib/ + rmdir $out/lib/amdgpu-pro + cp -r usr/share $out/share + '' + optionalString (!libsOnly) '' + if [ -d $out/lib/xorg ]; then + rm $out/lib/xorg + mv $out/lib/1.18 $out/lib/xorg + rm -r $out/lib/1.* + fi + cp -r lib/firmware $out/lib/firmware + mkdir -p $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz + cp usr/src/amdgpu-pro-${build}/amd/amdgpu/amdgpu.ko.xz $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/amd/amdgpu/amdgpu.ko.xz + '' + '' + interpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" + libPath="$out/lib:$out/lib/gbm:$depLibPath" + echo patching with $interpreter $libPath + for prog in "$out"/bin/*; do + echo patching program $prog + patchelf --interpreter "$interpreter" --set-rpath "$libPath" "$prog" + done + for lib in `find "$out/lib/" -name '*.so*'`; do + echo patching library $lib + patchelf --set-rpath "$libPath" "$lib" + done + ''; + + postFixup = assert (stringLength libReplaceDir == stringLength libCompatDir); '' + libPath="$out/lib:$out/lib/gbm:$depLibPath" + for lib in libgbm.so.1.0.0 ${optionalString (!libsOnly) "xorg/modules/drivers/amdgpu_drv.so"} amdvlk${bitness}.so vdpau/libvdpau_amdgpu.so; do + if [ -e "$out/lib/$lib" ]; then + patchelf --set-rpath "$libPath" "$out/lib/$lib" + fi + done + for lib in libEGL.so.1 libGL.so.1.2 ${optionalString (!libsOnly) "xorg/modules/extensions/libglx.so"} dri/amdgpu_dri.so; do + if [ -e "$out/lib/$lib" ]; then + perl -pi -e 's:${libReplaceDir}:${libCompatDir}:g' "$out/lib/$lib" + fi + done + substituteInPlace "$out/etc/vulkan/icd.d/amd_icd${bitness}.json" --replace "/usr/lib/${libArch}" "$out/lib" + ''; + + buildInputs = [ + patchelf + perl + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "AMDGPU-PRO drivers"; + homepage = http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-Beta-Driver-for-Vulkan-Release-Notes.aspx ; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ corngood ]; + # Copied from the nvidia default.nix to prevent a store collision. + priority = 4; + }; +} diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch new file mode 100644 index 00000000000..46302ae0ea8 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0001-add-OS-detection-for-arch.patch @@ -0,0 +1,26 @@ +From e78ede724fff53fc0220999f6381242142ce8c33 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:30:25 -0300 +Subject: [PATCH 1/8] add OS detection for arch + +--- + amd/backport/Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index 0c285ef..6447a15 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -17,6 +17,9 @@ else ifeq ("ubuntu",$(OS_NAME)) + ccflags-y += -DOS_NAME_UBUNTU + else ifeq ("steamos",$(OS_NAME)) + ccflags-y += -DOS_NAME_STEAMOS ++else ifeq ("arch",$(OS_NAME)) ++ccflags-y += -DOS_NAME_ARCH ++OS_VERSION = "0.0" + else + ccflags-y += -DOS_NAME_UNKNOWN + endif +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch new file mode 100644 index 00000000000..4101662a4eb --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0002-update-kcl_ttm_bo_reserve-for-linux-4.7.patch @@ -0,0 +1,25 @@ +From d84bd62a10308efb6a414e8f6582a7b1e9860638 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:31:12 -0300 +Subject: [PATCH 2/8] update kcl_ttm_bo_reserve for linux-4.7 + +--- + amd/backport/include/kcl/kcl_ttm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/backport/include/kcl/kcl_ttm.h b/amd/backport/include/kcl/kcl_ttm.h +index 3575004..0d1560d 100644 +--- a/amd/backport/include/kcl/kcl_ttm.h ++++ b/amd/backport/include/kcl/kcl_ttm.h +@@ -84,7 +84,7 @@ static inline int kcl_ttm_bo_reserve(struct ttm_buffer_object *bo, + bool interruptible, bool no_wait, + struct ww_acquire_ctx *ticket) + { +-#if defined(BUILD_AS_DKMS) ++#if defined(BUILD_AS_DKMS) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0) + return ttm_bo_reserve(bo, interruptible, no_wait, false, ticket); + #else + return ttm_bo_reserve(bo, interruptible, no_wait, ticket); +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch new file mode 100644 index 00000000000..214b8effd9d --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0003-add-kcl_drm_gem_object_lookup.patch @@ -0,0 +1,204 @@ +From 2637dfe990e4c277bc724f6ba48e6661506805ec Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:37:34 -0300 +Subject: [PATCH 3/8] add kcl_drm_gem_object_lookup + +--- + amd/amdgpu/amdgpu_atpx_handler.c | 4 ++++ + amd/amdgpu/amdgpu_bo_list.c | 2 +- + amd/amdgpu/amdgpu_cs.c | 2 +- + amd/amdgpu/amdgpu_display.c | 2 +- + amd/amdgpu/amdgpu_gem.c | 10 +++++----- + amd/amdgpu/dce_v10_0.c | 2 +- + amd/amdgpu/dce_v11_0.c | 2 +- + amd/amdgpu/dce_v8_0.c | 2 +- + amd/backport/include/kcl/kcl_drm.h | 11 +++++++++++ + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 2 +- + 10 files changed, 27 insertions(+), 12 deletions(-) + +diff --git a/amd/amdgpu/amdgpu_atpx_handler.c b/amd/amdgpu/amdgpu_atpx_handler.c +index cc9b998..7e47478 100644 +--- a/amd/amdgpu/amdgpu_atpx_handler.c ++++ b/amd/amdgpu/amdgpu_atpx_handler.c +@@ -565,7 +565,11 @@ void amdgpu_register_atpx_handler(void) + if (!r) + return; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ vga_switcheroo_register_handler(&amdgpu_atpx_handler, 0); ++#else + vga_switcheroo_register_handler(&amdgpu_atpx_handler); ++#endif + } + + /** +diff --git a/amd/amdgpu/amdgpu_bo_list.c b/amd/amdgpu/amdgpu_bo_list.c +index 35d0856..1d163ec 100644 +--- a/amd/amdgpu/amdgpu_bo_list.c ++++ b/amd/amdgpu/amdgpu_bo_list.c +@@ -106,7 +106,7 @@ static int amdgpu_bo_list_set(struct amdgpu_device *adev, + struct amdgpu_bo *bo; + struct mm_struct *usermm; + +- gobj = drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); ++ gobj = kcl_drm_gem_object_lookup(adev->ddev, filp, info[i].bo_handle); + if (!gobj) { + r = -ENOENT; + goto error_free; +diff --git a/amd/amdgpu/amdgpu_cs.c b/amd/amdgpu/amdgpu_cs.c +index d16ed26..b0390b5 100644 +--- a/amd/amdgpu/amdgpu_cs.c ++++ b/amd/amdgpu/amdgpu_cs.c +@@ -92,7 +92,7 @@ static int amdgpu_cs_user_fence_chunk(struct amdgpu_cs_parser *p, + { + struct drm_gem_object *gobj; + +- gobj = drm_gem_object_lookup(p->adev->ddev, p->filp, ++ gobj = kcl_drm_gem_object_lookup(p->adev->ddev, p->filp, + data->handle); + if (gobj == NULL) + return -EINVAL; +diff --git a/amd/amdgpu/amdgpu_display.c b/amd/amdgpu/amdgpu_display.c +index 46326b3..9b5441f 100644 +--- a/amd/amdgpu/amdgpu_display.c ++++ b/amd/amdgpu/amdgpu_display.c +@@ -594,7 +594,7 @@ amdgpu_user_framebuffer_create(struct drm_device *dev, + struct amdgpu_framebuffer *amdgpu_fb; + int ret; + +- obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); ++ obj = kcl_drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]); + if (obj == NULL) { + dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, " + "can't create framebuffer\n", mode_cmd->handles[0]); +diff --git a/amd/amdgpu/amdgpu_gem.c b/amd/amdgpu/amdgpu_gem.c +index 0069aec..d10c282 100644 +--- a/amd/amdgpu/amdgpu_gem.c ++++ b/amd/amdgpu/amdgpu_gem.c +@@ -397,7 +397,7 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, + struct drm_gem_object *gobj; + struct amdgpu_bo *robj; + +- gobj = drm_gem_object_lookup(dev, filp, handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); + if (gobj == NULL) { + return -ENOENT; + } +@@ -461,7 +461,7 @@ int amdgpu_gem_wait_idle_ioctl(struct drm_device *dev, void *data, + int r = 0; + long ret; + +- gobj = drm_gem_object_lookup(dev, filp, handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, handle); + if (gobj == NULL) { + return -ENOENT; + } +@@ -495,7 +495,7 @@ int amdgpu_gem_metadata_ioctl(struct drm_device *dev, void *data, + int r = -1; + + DRM_DEBUG("%d \n", args->handle); +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) + return -ENOENT; + robj = gem_to_amdgpu_bo(gobj); +@@ -643,7 +643,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, + return -EINVAL; + } + +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) + return -ENOENT; + rbo = gem_to_amdgpu_bo(gobj); +@@ -705,7 +705,7 @@ int amdgpu_gem_op_ioctl(struct drm_device *dev, void *data, + struct amdgpu_bo *robj; + int r; + +- gobj = drm_gem_object_lookup(dev, filp, args->handle); ++ gobj = kcl_drm_gem_object_lookup(dev, filp, args->handle); + if (gobj == NULL) { + return -ENOENT; + } +diff --git a/amd/amdgpu/dce_v10_0.c b/amd/amdgpu/dce_v10_0.c +index 7554dd7..6d38754 100644 +--- a/amd/amdgpu/dce_v10_0.c ++++ b/amd/amdgpu/dce_v10_0.c +@@ -2594,7 +2594,7 @@ static int dce_v10_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v11_0.c b/amd/amdgpu/dce_v11_0.c +index d9c9b88..93dbc1a 100644 +--- a/amd/amdgpu/dce_v11_0.c ++++ b/amd/amdgpu/dce_v11_0.c +@@ -2604,7 +2604,7 @@ static int dce_v11_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/amdgpu/dce_v8_0.c b/amd/amdgpu/dce_v8_0.c +index 7a027ce..c56a298 100644 +--- a/amd/amdgpu/dce_v8_0.c ++++ b/amd/amdgpu/dce_v8_0.c +@@ -2501,7 +2501,7 @@ static int dce_v8_0_crtc_cursor_set2(struct drm_crtc *crtc, + return -EINVAL; + } + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + if (!obj) { + DRM_ERROR("Cannot find cursor object %x for crtc %d\n", handle, amdgpu_crtc->crtc_id); + return -ENOENT; +diff --git a/amd/backport/include/kcl/kcl_drm.h b/amd/backport/include/kcl/kcl_drm.h +index a65ee25..5a8a7b3 100644 +--- a/amd/backport/include/kcl/kcl_drm.h ++++ b/amd/backport/include/kcl/kcl_drm.h +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + #if defined(BUILD_AS_DKMS) + extern int drm_pcie_get_max_link_width(struct drm_device *dev, u32 *mlw); +@@ -123,4 +124,14 @@ static inline int kcl_drm_universal_plane_init(struct drm_device *dev, struct dr + #endif + } + ++static inline struct drm_gem_object *kcl_drm_gem_object_lookup(struct drm_device *dev, ++ struct drm_file *filp, ++ u32 handle) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ return drm_gem_object_lookup(filp, handle); ++#else ++ return drm_gem_object_lookup(dev, filp, handle); ++#endif ++} ++ + #endif /* AMDGPU_BACKPORT_KCL_DRM_H */ +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index 3f357a5..2e2d2e6 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -152,7 +152,7 @@ static int dm_crtc_pin_cursor_bo_new( + + amdgpu_crtc = to_amdgpu_crtc(crtc); + +- obj = drm_gem_object_lookup(crtc->dev, file_priv, handle); ++ obj = kcl_drm_gem_object_lookup(crtc->dev, file_priv, handle); + + if (!obj) { + DRM_ERROR( +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch new file mode 100644 index 00000000000..54394b7879b --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0004-paging-changes-for-linux-4.6.patch @@ -0,0 +1,42 @@ +From 2bd83488ccea22bb9e399986c171cccc3b6beb93 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:40:32 -0300 +Subject: [PATCH 4/8] paging changes for linux-4.6 + +--- + amd/amdgpu/amdgpu_ttm.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 7bdebde..8b676c2 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -548,8 +548,12 @@ int amdgpu_ttm_tt_get_user_pages(struct ttm_tt *ttm, struct page **pages) + list_add(&guptask.list, >t->guptasks); + spin_unlock(>t->guptasklock); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ r = get_user_pages(userptr, num_pages, write, 0, p, NULL); ++#else + r = get_user_pages(current, current->mm, userptr, num_pages, +- write, 0, p, NULL); ++ write, 0, p, NULL); ++#endif + + spin_lock(>t->guptasklock); + list_del(&guptask.list); +@@ -625,7 +629,11 @@ static void amdgpu_ttm_tt_unpin_userptr(struct ttm_tt *ttm) + set_page_dirty(page); + + mark_page_accessed(page); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0) ++ put_page(page); ++#else + page_cache_release(page); ++#endif + } + + sg_free_table(ttm->sg); +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch new file mode 100644 index 00000000000..6da3e46a3ee --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0005-LRU-stuff-isn-t-available-until-4.7.x.patch @@ -0,0 +1,48 @@ +From c41c15fa04e363c41272e7b5d767710170691347 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Mon, 4 Jul 2016 19:19:45 +0100 +Subject: [PATCH 5/8] LRU stuff isn't available until >= 4.7.x + +--- + amd/amdgpu/amdgpu_ttm.c | 4 ++-- + amd/backport/kcl_ttm.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/amd/amdgpu/amdgpu_ttm.c b/amd/amdgpu/amdgpu_ttm.c +index 8b676c2..752d065 100644 +--- a/amd/amdgpu/amdgpu_ttm.c ++++ b/amd/amdgpu/amdgpu_ttm.c +@@ -907,7 +907,7 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, + return flags; + } + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + + static void amdgpu_ttm_lru_removal(struct ttm_buffer_object *tbo) + { +@@ -969,7 +969,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = { + .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify, + .io_mem_reserve = &amdgpu_ttm_io_mem_reserve, + .io_mem_free = &amdgpu_ttm_io_mem_free, +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + .lru_removal = &amdgpu_ttm_lru_removal, + .lru_tail = &amdgpu_ttm_lru_tail, + .swap_lru_tail = &amdgpu_ttm_swap_lru_tail, +diff --git a/amd/backport/kcl_ttm.c b/amd/backport/kcl_ttm.c +index 24f7a83..1a2cb7b 100644 +--- a/amd/backport/kcl_ttm.c ++++ b/amd/backport/kcl_ttm.c +@@ -7,7 +7,7 @@ static int _kcl_ttm_bo_del_from_lru(struct ttm_buffer_object *bo) + { + int put_count = 0; + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) + struct ttm_bo_device *bdev = bo->bdev; + + if (bdev->driver->lru_removal) +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch new file mode 100644 index 00000000000..5be5acad00d --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0006-Change-name-of-vblank_disable_allowed-to-vblank_disa.patch @@ -0,0 +1,29 @@ +From 5b90b8d8ab44637c707623b25ee98aa4ebded308 Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Mon, 4 Jul 2016 19:30:08 +0100 +Subject: [PATCH 6/8] Change name of vblank_disable_allowed to + vblank_disable_immediate under 4.7.x. + +--- + amd/amdgpu/amdgpu_irq.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/amdgpu/amdgpu_irq.c b/amd/amdgpu/amdgpu_irq.c +index d13865a..5cfa69f 100644 +--- a/amd/amdgpu/amdgpu_irq.c ++++ b/amd/amdgpu/amdgpu_irq.c +@@ -240,7 +240,11 @@ int amdgpu_irq_init(struct amdgpu_device *adev) + INIT_WORK(&adev->hotplug_work, + amdgpu_hotplug_work_func); + } ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ adev->ddev->vblank_disable_immediate = true; ++#else + adev->ddev->vblank_disable_allowed = true; ++#endif + + INIT_WORK(&adev->reset_work, amdgpu_irq_reset_work_func); + +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch new file mode 100644 index 00000000000..13d4a282ac8 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0007-Remove-connector-parameter-from-__drm_atomic_helper_.patch @@ -0,0 +1,29 @@ +From 27ef2ce0d4d8eeb3bca32ddeae503f0a334832aa Mon Sep 17 00:00:00 2001 +From: "Luke A. Guest" +Date: Mon, 4 Jul 2016 19:41:08 +0100 +Subject: [PATCH 7/8] Remove connector parameter from + __drm_atomic_helper_connector_destroy_state for 4.7.x kernels. + +--- + amd/dal/amdgpu_dm/amdgpu_dm_types.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/amd/dal/amdgpu_dm/amdgpu_dm_types.c b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +index 2e2d2e6..cd34607 100644 +--- a/amd/dal/amdgpu_dm/amdgpu_dm_types.c ++++ b/amd/dal/amdgpu_dm/amdgpu_dm_types.c +@@ -1205,7 +1205,11 @@ void amdgpu_dm_connector_atomic_destroy_state( + struct dm_connector_state *dm_state = + to_dm_connector_state(state); + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) ++ __drm_atomic_helper_connector_destroy_state(state); ++#else + __drm_atomic_helper_connector_destroy_state(connector, state); ++#endif + + kfree(dm_state); + } +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch new file mode 100644 index 00000000000..693ad8b2f40 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0008-fix-apparent-typo-in-bandwidth_calcs-causing-array-e.patch @@ -0,0 +1,25 @@ +From c9f2501131da0d9173e21f7e8ff5741a7fcfedb6 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Sun, 21 Aug 2016 16:58:45 -0300 +Subject: [PATCH 8/8] fix apparent typo in bandwidth_calcs causing array error + +--- + amd/dal/dc/calcs/bandwidth_calcs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/dal/dc/calcs/bandwidth_calcs.c b/amd/dal/dc/calcs/bandwidth_calcs.c +index 8a19139..c4ededd 100644 +--- a/amd/dal/dc/calcs/bandwidth_calcs.c ++++ b/amd/dal/dc/calcs/bandwidth_calcs.c +@@ -3181,7 +3181,7 @@ static void calculate_bandwidth( + bw_int_to_fixed( + 2), + vbios->mcifwrmc_urgent_latency), +- results->dmif_burst_time[i][j]), ++ results->dmif_burst_time[results->y_clk_level][results->sclk_level]), + results->mcifwr_burst_time[results->y_clk_level][results->sclk_level])), + results->dispclk), + bw_int_to_fixed( +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch new file mode 100644 index 00000000000..05bcbf8bd06 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0009-disable-dal-by-default.patch @@ -0,0 +1,25 @@ +From 49d45957ddaafe13a9cc7bacd1b9665fe9c517ac Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Thu, 25 Aug 2016 22:17:06 -0300 +Subject: [PATCH] disable dal by default + +--- + amd/amdgpu/amdgpu_drv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/amd/amdgpu/amdgpu_drv.c b/amd/amdgpu/amdgpu_drv.c +index 793528b..9a4dfcc 100644 +--- a/amd/amdgpu/amdgpu_drv.c ++++ b/amd/amdgpu/amdgpu_drv.c +@@ -79,7 +79,7 @@ int amdgpu_vm_block_size = -1; + int amdgpu_vm_fault_stop = 0; + int amdgpu_vm_debug = 0; + int amdgpu_exp_hw_support = 0; +-int amdgpu_dal = -1; ++int amdgpu_dal = 0; + int amdgpu_sched_jobs = 32; + int amdgpu_sched_hw_submission = 2; + int amdgpu_powerplay = -1; +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch new file mode 100644 index 00000000000..ec8f2c5a599 --- /dev/null +++ b/pkgs/os-specific/linux/amdgpu-pro/patches/0010-remove-dependency-on-System.map.patch @@ -0,0 +1,112 @@ +From fbc0d704f47526ca38f518b60237962cc6b08305 Mon Sep 17 00:00:00 2001 +From: David McFarland +Date: Thu, 25 Aug 2016 23:08:02 -0300 +Subject: [PATCH] remove dependency on System.map + +--- + amd/backport/Makefile | 3 +-- + amd/backport/kcl_fence.c | 10 ++++++++-- + amd/backport/symbols | 3 --- + dkms.conf | 1 - + pre-build.sh | 32 -------------------------------- + 5 files changed, 9 insertions(+), 40 deletions(-) + delete mode 100644 amd/backport/symbols + delete mode 100755 pre-build.sh + +diff --git a/amd/backport/Makefile b/amd/backport/Makefile +index 6447a15..4682e0f 100644 +--- a/amd/backport/Makefile ++++ b/amd/backport/Makefile +@@ -53,10 +53,9 @@ ccflags-y += -DOS_NAME_RHEL_7 + endif + endif + +-BACKPORT_OBJS = symbols.o + endif + +-BACKPORT_OBJS += kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o ++BACKPORT_OBJS = kcl_drm.o kcl_ttm.o kcl_amdgpu.o kcl_fence.o kcl_mn.o + + amdgpu-y += $(addprefix ../backport/,$(BACKPORT_OBJS)) + +diff --git a/amd/backport/kcl_fence.c b/amd/backport/kcl_fence.c +index 2141eef..ceef1fe 100644 +--- a/amd/backport/kcl_fence.c ++++ b/amd/backport/kcl_fence.c +@@ -22,8 +22,14 @@ struct default_wait_cb { + struct task_struct *task; + }; + +-extern void +-(*fence_default_wait_cb)(struct fence *fence, struct fence_cb *cb); ++static void ++fence_default_wait_cb(struct fence *fence, struct fence_cb *cb) ++{ ++ struct default_wait_cb *wait = ++ container_of(cb, struct default_wait_cb, base); ++ ++ wake_up_process(wait->task); ++} + + signed long + _kcl_fence_wait_any_timeout(struct fence **fences, uint32_t count, +diff --git a/amd/backport/symbols b/amd/backport/symbols +deleted file mode 100644 +index 2d3f2ee..0000000 +--- a/amd/backport/symbols ++++ /dev/null +@@ -1,3 +0,0 @@ +-SYMS="" +- +-SYMS+="fence_default_wait_cb" +diff --git a/dkms.conf b/dkms.conf +index 9ca148e..36be480 100644 +--- a/dkms.conf ++++ b/dkms.conf +@@ -4,4 +4,3 @@ BUILT_MODULE_NAME[0]="amdgpu" + BUILT_MODULE_LOCATION[0]="amd/amdgpu" + DEST_MODULE_LOCATION[0]="/extra" + AUTOINSTALL="yes" +-PRE_BUILD="pre-build.sh $kernelver" +\ No newline at end of file +diff --git a/pre-build.sh b/pre-build.sh +deleted file mode 100755 +index 88ec680..0000000 +--- a/pre-build.sh ++++ /dev/null +@@ -1,32 +0,0 @@ +-#!/bin/bash +- +-KERNELVER=$1 +-KERNELVER_BASE=${KERNELVER%%-*} +- +-version_lt () { +- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) +- [ "$1" != "$newest" ] +-} +- +-version_ge () { +- newest=$((echo "$1"; echo "$2") | sort -V | tail -n1) +- [ "$1" = "$newest" ] +-} +- +-version_gt () { +- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) +- [ "$1" != "$oldest" ] +-} +- +-version_le () { +- oldest=$((echo "$1"; echo "$2") | sort -V | head -n1) +- [ "$1" = "$oldest" ] +-} +- +-source amd/backport/symbols +- +-echo '// auto generated by DKMS pre-build.sh' > amd/backport/symbols.c +-for sym in $SYMS; do +- addr=$(grep $sym /boot/System.map-$KERNELVER | awk -F' ' '{print $1}') +- echo "void *$sym = (void *)0x$addr;" >> amd/backport/symbols.c +-done +-- +2.9.3 + diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 902f0e37e35..3bfd59de7ed 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -73,8 +73,11 @@ stdenv.mkDerivation rec { ./patches/15.9-kcl_str.patch ./patches/15.9-mtrr.patch ./patches/15.9-preempt.patch - ./patches/15.9-sep_printf.patch - ]; + ./patches/15.9-sep_printf.patch ] + ++ optionals ( kernel != null && + (builtins.compareVersions kernel.version "4.6") >= 0 ) + [ ./patches/kernel-4.6-get_user_pages.patch + ./patches/kernel-4.6-page_cache_release-put_page.patch ]; buildInputs = [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch new file mode 100644 index 00000000000..1e7209ed5ed --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-get_user_pages.patch @@ -0,0 +1,25 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index 9c70211..b2242af 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -3220,7 +3220,7 @@ int ATI_API_CALL KCL_LockUserPages(unsigned long vaddr, unsigned long* page_list + int ret; + + down_read(¤t->mm->mmap_sem); +- ret = get_user_pages(current, current->mm, vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); ++ ret = get_user_pages(vaddr, page_cnt, 1, 0, (struct page **)page_list, NULL); + up_read(¤t->mm->mmap_sem); + + return ret; +@@ -3238,7 +3238,7 @@ int ATI_API_CALL KCL_LockReadOnlyUserPages(unsigned long vaddr, unsigned long* p + int ret; + + down_read(¤t->mm->mmap_sem); +- ret = get_user_pages(current, current->mm, vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); ++ ret = get_user_pages(vaddr, page_cnt, 0, 0, (struct page **)page_list, NULL); + up_read(¤t->mm->mmap_sem); + + return ret; +-- +2.9.2 + diff --git a/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch new file mode 100644 index 00000000000..28820790e49 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/patches/kernel-4.6-page_cache_release-put_page.patch @@ -0,0 +1,16 @@ +diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c +index b2242af..586129c 100755 +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c +@@ -3249,7 +3249,7 @@ void ATI_API_CALL KCL_UnlockUserPages(unsigned long* page_list, unsigned int pag + unsigned int i; + for (i=0; i-busybox". This is necessary when it's run from the Nix store as -busybox during stdenv bootstrap. -diff -ru -x '*~' busybox-1.22.1-orig/libbb/appletlib.c busybox-1.22.1/libbb/appletlib.c ---- busybox-1.22.1-orig/libbb/appletlib.c 2014-01-09 19:15:44.000000000 +0100 -+++ busybox-1.22.1/libbb/appletlib.c 2014-10-29 09:53:01.232052068 +0100 -@@ -764,7 +764,7 @@ +--- busybox-1.24.2-orig/libbb/appletlib.c 2016-03-17 21:35:49.000000000 +0100 ++++ busybox-1.24.2/libbb/appletlib.c 2016-09-25 08:48:18.293104041 +0200 +@@ -779,7 +779,7 @@ int applet = find_applet_by_name(name); if (applet >= 0) run_applet_no_and_exit(applet, argv); -- if (strncmp(name, "busybox", 7) == 0) +- if (is_prefixed_with(name, "busybox")) + if (strstr(name, "busybox") != 0) exit(busybox_main(argv)); } diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index a33a0584a20..2563c442822 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -26,11 +26,11 @@ let in stdenv.mkDerivation rec { - name = "busybox-1.23.2"; + name = "busybox-1.24.2"; src = fetchurl { url = "http://busybox.net/downloads/${name}.tar.bz2"; - sha256 = "16ii9sqracvh2r1gfzhmlypl269nnbkpvrwa7270k35d3bigk9h5"; + sha256 = "0mf8f6ly8yi1fbr15jkyv6hxwh2x800x661rcd11rwsnqqzga7p7"; }; hardeningDisable = [ "format" ] ++ lib.optional enableStatic [ "fortify" ]; diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 37ad34d8b64..66069f7c982 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { ++ optional weatherXoapSupport libxml2 ; - cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ] + cmakeFlags = [] ++ optional docsSupport "-DMAINTAINER_MODE=ON" ++ optional curlSupport "-DBUILD_CURL=ON" ++ optional (!ibmSupport) "-DBUILD_IBM=OFF" diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix new file mode 100644 index 00000000000..87cf7c18caf --- /dev/null +++ b/pkgs/os-specific/linux/displaylink/default.nix @@ -0,0 +1,70 @@ +{ stdenv, lib, fetchurl, fetchFromGitHub, unzip, kernel, utillinux, libdrm, libusb1, makeWrapper }: + +let + arch = + if stdenv.system == "x86_64-linux" then "x64" + else if stdenv.system == "i686-linux" then "x86" + else throw "Unsupported architecture"; + libPath = lib.makeLibraryPath [ stdenv.cc.cc utillinux libusb1 ]; + +in stdenv.mkDerivation rec { + name = "displaylink-${version}"; + version = "1.1.62"; + + src = fetchFromGitHub { + owner = "DisplayLink"; + repo = "evdi"; + rev = "fe779940ff9fc7b512019619e24a5b22e4070f6a"; + sha256 = "02hw83f6lscms8hssjzf30hl9zly3b28qcxwmxvnqwfhx1q491z9"; + }; + + daemon = fetchurl { + name = "displaylink.zip"; + url = "http://www.displaylink.com/downloads/file?id=607"; + sha256 = "0jky3xk4dfzbzg386qya9l9952i4m8zhf55fdl06pi9r82k2iijx"; + }; + + nativeBuildInputs = [ unzip makeWrapper ]; + + buildInputs = [ kernel libdrm ]; + + buildCommand = '' + unpackPhase + cd $sourceRoot + unzip $daemon + chmod +x displaylink-driver-${version}.run + ./displaylink-driver-${version}.run --target daemon --noexec + + ( cd module + export makeFlags="$makeFlags KVER=${kernel.modDirVersion} KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + export hardeningDisable="pic format" + buildPhase + install -Dm755 evdi.ko $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/gpu/drm/evdi/evdi.ko + ) + + ( cd library + buildPhase + install -Dm755 libevdi.so $out/lib/libevdi.so + ) + + fixupPhase + + ( cd daemon + install -Dt $out/lib/displaylink *.spkg + install -Dm755 ${arch}/DisplayLinkManager $out/bin/DisplayLinkManager + patchelf \ + --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \ + --set-rpath $out/lib:${libPath} \ + $out/bin/DisplayLinkManager + wrapProgram $out/bin/DisplayLinkManager \ + --run "cd $out/lib/displaylink" + ) + ''; + + meta = with stdenv.lib; { + description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; + platforms = [ "x86_64-linux" "i686-linux" ]; + license = licenses.unfree; + homepage = "http://www.displaylink.com/"; + }; +} diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 8d2f368bc99..d3db8ca7d43 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.eelco ]; platforms = lib.platforms.linux; + broken = kernel.features.chromiumos or false; }; } diff --git a/pkgs/os-specific/linux/fanctl/default.nix b/pkgs/os-specific/linux/fanctl/default.nix index f60951f5541..5cc875f5c90 100644 --- a/pkgs/os-specific/linux/fanctl/default.nix +++ b/pkgs/os-specific/linux/fanctl/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "fanctl-${version}"; - version = "0.9.0"; + version = "0.12.0"; src = fetchurl { url = "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-fan_${version}.tar.xz"; - sha256 = "03dv5zzb8fkl9kkbhznxm48d6j3fjms74fn0s1zip2gz53l1s14n"; + sha256 = "0lj7371n06sg5mlbbfgvm0qhzgp464n6v55rgs7kmmx4d37gb5fl"; }; # The Ubuntu package creates a number of state/config directories upon diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index ce2f860efc8..30fdbadd87b 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,10 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.42-rc1"; + version="0.9.42"; name="${baseName}-${version}"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42~rc1.tar.bz2"; - sha256="11br6xp86bxs1ic2x683hbvg1hk8v2wp8cw6blj0zz3cdl0pcjqf"; + hash="0iwv97c0ygxrgxg997618a7cq3hl1l3b0njx7bqzv11vjzpcwfsg"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.42.tar.xz"; + sha256="0iwv97c0ygxrgxg997618a7cq3hl1l3b0njx7bqzv11vjzpcwfsg"; }; buildInputs = [ which diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix index bfcef1d9c1a..c87023bf336 100644 --- a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix +++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { description = "Firmware for Intel 2200BG cards"; homepage = http://ipw2200.sourceforge.net/firmware.php; license = stdenv.lib.licenses.unfreeRedistributableFirmware; - maintainers = with maintainers; [ lukasepple ]; + maintainers = with maintainers; [ sternenseemann ]; platforms = with platforms; linux; }; } diff --git a/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix b/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix new file mode 100644 index 00000000000..673ef686e48 --- /dev/null +++ b/pkgs/os-specific/linux/firmware/rtlwifi_new-firmware/default.nix @@ -0,0 +1,23 @@ +{ stdenv, lib, linuxPackages }: + +with lib; + +stdenv.mkDerivation rec { + name = "rtlwifi_new-firmware-${linuxPackages.rtlwifi_new.version}"; + inherit (linuxPackages.rtlwifi_new) src; + + dontBuild = true; + + installPhase = '' + mkdir -p "$out/lib/firmware" + cp -rf firmware/rtlwifi/ "$out/lib/firmware" + ''; + + meta = { + description = "Firmware for the newest Realtek rtlwifi codes"; + inherit (src.meta) homepage; + license = licenses.unfreeRedistributableFirmware; + platforms = with platforms; linux; + maintainers = with maintainers; [ tvorog ]; + }; +} diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix index d86eb2a9756..46f242b2ea0 100644 --- a/pkgs/os-specific/linux/fuse/default.nix +++ b/pkgs/os-specific/linux/fuse/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, utillinux }: +{ stdenv, fetchFromGitHub, utillinux + ,autoconf, automake, libtool, gettext }: stdenv.mkDerivation rec { - name = "fuse-2.9.5"; + name = "fuse-${version}"; + + version = "2.9.7"; #builder = ./builder.sh; - src = fetchurl { - url = "https://github.com/libfuse/libfuse/releases/download/fuse_2_9_5/${name}.tar.gz"; - sha256 = "1dfvbi1p57svbv2sfnbqwpnsk219spvjnlapf35azhgzqlf3g7sp"; + src = fetchFromGitHub { + owner = "libfuse"; + repo = "libfuse"; + rev = name; + sha256 = "1wyjjfb7p4jrkk15zryzv33096a5fmsdyr2p4b00dd819wnly2n2"; }; - buildInputs = [ utillinux ]; + buildInputs = [ utillinux autoconf automake libtool gettext ]; inherit utillinux; @@ -26,12 +31,15 @@ stdenv.mkDerivation rec { export NIX_CFLAGS_COMPILE="-DFUSERMOUNT_DIR=\"/var/setuid-wrappers\"" sed -e 's@/bin/@${utillinux}/bin/@g' -i lib/mount_util.c + sed -e 's@CONFIG_RPATH=/usr/share/gettext/config.rpath@CONFIG_RPATH=${gettext}/share/gettext/config.rpath@' -i makeconf.sh + + ./makeconf.sh ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = http://fuse.sourceforge.net/; + homepage = https://github.com/libfuse/libfuse; description = "Kernel module and library that allows filesystems to be implemented in user space"; platforms = platforms.linux; maintainers = [ maintainers.mornfall ]; diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 40af8c8553a..5385651030b 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { portaudio udev gsl - ] ++ stdenv.lib.optional pulseaudioSupport [ libpulseaudio ]; + ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; meta = { description = "A simple interface for devices supported by the linux UVC driver"; diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix index a83d4a2ad9f..505468d849a 100644 --- a/pkgs/os-specific/linux/iotop/default.nix +++ b/pkgs/os-specific/linux/iotop/default.nix @@ -1,15 +1,14 @@ -{ stdenv, fetchurl, buildPythonApplication, pythonPackages }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "iotop-0.6"; - namePrefix = ""; src = fetchurl { url = "http://guichaz.free.fr/iotop/files/${name}.tar.bz2"; sha256 = "0nzprs6zqax0cwq8h7hnszdl3d2m4c2d4vjfxfxbnjfs9sia5pis"; }; - pythonPath = [ pythonPackages.curses ]; + propagatedBuildInputs = [ pythonPackages.curses ]; doCheck = false; diff --git a/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch b/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch index ca91b816000..e0c8278d488 100644 --- a/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch +++ b/pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch @@ -57,7 +57,7 @@ Index: iproute2-4.1.1/ip/link_iptnl.c + + if (addr) + fprintf(f, "underlay %s ", -+ format_host(AF_INET, 4, &addr, s1, sizeof(s1))); ++ format_host_r(AF_INET, 4, &addr, s1, sizeof(s1))); + } + if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) { diff --git a/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch b/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch index a940b341ea0..634daa0de29 100644 --- a/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch +++ b/pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch @@ -111,9 +111,9 @@ Index: iproute2-4.1.1/ip/link_iptnl.c + p = RTA_PAYLOAD(i); + m = RTA_DATA(i); + fprintf(f, "%s/%d:%s/%d ", -+ rt_addr_n2a(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN), ++ rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN), + m->overlay_prefix, -+ rt_addr_n2a(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN), ++ rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN), + m->underlay_prefix); + } +} diff --git a/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch b/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch index 2ddc2840bdd..070023d0b92 100644 --- a/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch +++ b/pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch @@ -6,9 +6,9 @@ Index: iproute2-4.3.0/include/linux/if_link.h --- iproute2-4.3.0.orig/include/linux/if_link.h +++ iproute2-4.3.0/include/linux/if_link.h @@ -392,6 +392,7 @@ enum { - IFLA_VXLAN_GBP, - IFLA_VXLAN_REMCSUM_NOPARTIAL, IFLA_VXLAN_COLLECT_METADATA, + IFLA_VXLAN_LABEL, + IFLA_VXLAN_GPE, + IFLA_VXLAN_FAN_MAP = 33, __IFLA_VXLAN_MAX }; @@ -88,9 +88,9 @@ Index: iproute2-4.3.0/ip/iplink_vxlan.c struct nlmsghdr *n) { @@ -201,6 +243,10 @@ static int vxlan_parse_opt(struct link_u - udp6zerocsumrx = 0; - } else if (!matches(*argv, "gbp")) { gbp = 1; + } else if (!matches(*argv, "gpe")) { + gpe = 1; + } else if (!matches(*argv, "fan-map")) { + NEXT_ARG(); + if (fan_parse_map(&argc, &argv, n)) @@ -117,9 +117,9 @@ Index: iproute2-4.3.0/ip/iplink_vxlan.c + p = RTA_PAYLOAD(i); + m = RTA_DATA(i); + fprintf(f, "%s/%d:%s/%d ", -+ rt_addr_n2a(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN), ++ rt_addr_n2a_r(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN), + m->overlay_prefix, -+ rt_addr_n2a(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN), ++ rt_addr_n2a_r(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN), + m->underlay_prefix); + } +} diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 6813b5bcf1b..6f6c0c66cc3 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "iproute2-4.5.0"; + name = "iproute2-${version}"; + version = "4.7.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz"; - sha256 = "0jj9phsi8m2sbnz7bbh9cf9vckm67hs62ab5srdwnrg4acpjj59z"; + sha256 = "14kvpdlxq8204f5ayfdfb6mc0423mbf3px9q0spdly9sng7xnq4g"; }; patches = lib.optionals enableFan [ @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { "LIBDIR=$(out)/lib" "SBINDIR=$(out)/sbin" "MANDIR=$(out)/share/man" + "BASH_COMPDIR=$(out)/share/bash-completion/completions" "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs ]; diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix index 8fb37ed1c5b..c8775eee48c 100644 --- a/pkgs/os-specific/linux/jool/cli.nix +++ b/pkgs/os-specific/linux/jool/cli.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation { buildInputs = [ autoreconfHook pkgconfig libnl ]; + postPatch = '' + chmod u+w -R ../common + ''; + meta = with stdenv.lib; { homepage = https://www.jool.mx/; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools"; diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix index 274d0cc4139..79094ebb3e3 100644 --- a/pkgs/os-specific/linux/jool/default.nix +++ b/pkgs/os-specific/linux/jool/default.nix @@ -28,7 +28,5 @@ stdenv.mkDerivation { description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules"; platforms = platforms.linux; maintainers = with maintainers; [ fpletz ]; - # kernel version 4.3 is the most recent supported version - broken = builtins.compareVersions kernel.version "4.3" == 1; }; } diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix index 60415c0d009..0f2038fb2e3 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.4.4"; + version = "3.5.0"; src = fetchzip { url = "https://github.com/NICMx/releases/raw/master/Jool/Jool-${version}.zip"; - sha256 = "1k5iyfzjdzl5q64234r806pf6b3qdflvjpw06pnwl0ycj05p5frr"; + sha256 = "06jp6gpfryn66q0z4w3gwkvfr17bcrjvys597nj49pxfiz4vczb2"; }; } diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 54e6b7822f9..bdc243a149e 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -270,6 +270,13 @@ with stdenv.lib; SQUASHFS_LZ4 y ''} + # Native Language Support modules, needed by some filesystems + NLS y + NLS_DEFAULT utf8 + NLS_UTF8 m + NLS_CODEPAGE_437 m # VFAT default for the codepage= mount option + 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 @@ -277,6 +284,7 @@ with stdenv.lib; RANDOMIZE_BASE? y STRICT_DEVMEM y # Filter access to /dev/mem SECURITY_SELINUX_BOOTPARAM_VALUE 0 # Disable SELinux by default + SECURITY_YAMA? y # Prevent processes from ptracing non-children processes DEVKMEM n # Disable /dev/kmem ${if versionOlder version "3.14" then '' CC_STACKPROTECTOR? y # Detect buffer overflows on the stack @@ -388,7 +396,7 @@ with stdenv.lib; # Linux containers. NAMESPACES? y # Required by 'unshare' used by 'nixos-install' - RT_GROUP_SCHED? y + RT_GROUP_SCHED n CGROUP_DEVICE? y MEMCG y MEMCG_SWAP y @@ -505,9 +513,15 @@ with stdenv.lib; TRANSPARENT_HUGEPAGE_MADVISE? y # zram support (e.g for in-memory compressed swap). - ZSMALLOC y ZRAM m ZSWAP? y + ZBUD? y + ${optionalString (versionOlder version "3.18") '' + ZSMALLOC y + ''} + ${optionalString (versionAtLeast version "3.18") '' + ZSMALLOC m + ''} # Enable PCIe and USB for the brcmfmac driver BRCMFMAC_USB? y diff --git a/pkgs/os-specific/linux/kernel/gcc5-link-apm.patch b/pkgs/os-specific/linux/kernel/gcc5-link-apm.patch deleted file mode 100644 index e415c2d9f2b..00000000000 --- a/pkgs/os-specific/linux/kernel/gcc5-link-apm.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 54c2f3fdb941204cad136024c7b854b7ad112ab6 Mon Sep 17 00:00:00 2001 -From: Andi Kleen -Date: Mon, 5 Aug 2013 15:02:45 -0700 -Subject: x86, asmlinkage, apm: Make APM data structure used from assembler - visible - -Signed-off-by: Andi Kleen -Link: http://lkml.kernel.org/r/1375740170-7446-12-git-send-email-andi@firstfloor.org -Signed-off-by: H. Peter Anvin ---- - arch/x86/kernel/apm_32.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c -index 53a4e27..3ab0343 100644 ---- a/arch/x86/kernel/apm_32.c -+++ b/arch/x86/kernel/apm_32.c -@@ -392,7 +392,7 @@ static struct cpuidle_device apm_cpuidle_device; - /* - * Local variables - */ --static struct { -+__visible struct { - unsigned long offset; - unsigned short segment; - } apm_bios_entry; --- -cgit v0.12 - diff --git a/pkgs/os-specific/linux/kernel/gcc5-link-lguest.patch b/pkgs/os-specific/linux/kernel/gcc5-link-lguest.patch deleted file mode 100644 index b2474f572ae..00000000000 --- a/pkgs/os-specific/linux/kernel/gcc5-link-lguest.patch +++ /dev/null @@ -1,46 +0,0 @@ -From cdd77e87eae52b7251acc5990207a1c4500a84ce Mon Sep 17 00:00:00 2001 -From: Andi Kleen -Date: Tue, 5 Nov 2013 21:22:28 +1030 -Subject: x86, asmlinkage, lguest: Pass in globals into assembler statement - -Tell the compiler that the inline assembler statement -references lguest_entry. - -This fixes compile problems with LTO where the variable -and the assembler code may end up in different files. - -Cc: x86@kernel.org -Cc: rusty@rustcorp.com.au -Signed-off-by: Andi Kleen -Signed-off-by: Rusty Russell ---- - drivers/lguest/x86/core.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c -index 5169239..922a1ac 100644 ---- a/drivers/lguest/x86/core.c -+++ b/drivers/lguest/x86/core.c -@@ -157,7 +157,7 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages) - * stack, then the address of this call. This stack layout happens to - * exactly match the stack layout created by an interrupt... - */ -- asm volatile("pushf; lcall *lguest_entry" -+ asm volatile("pushf; lcall *%4" - /* - * This is how we tell GCC that %eax ("a") and %ebx ("b") - * are changed by this routine. The "=" means output. -@@ -169,7 +169,9 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages) - * physical address of the Guest's top-level page - * directory. - */ -- : "0"(pages), "1"(__pa(cpu->lg->pgdirs[cpu->cpu_pgd].pgdir)) -+ : "0"(pages), -+ "1"(__pa(cpu->lg->pgdirs[cpu->cpu_pgd].pgdir)), -+ "m"(lguest_entry) - /* - * We tell gcc that all these registers could change, - * which means we don't have to save and restore them in --- -cgit v0.12 - diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index e5fa780c6e7..5574cc937af 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -91,17 +91,17 @@ sub runConfig { print STDERR "CHOICE: $1, ANSWER: $answer\n" if $debug; print OUT "$answer\n" if $1 =~ /-/; } - + # Some questions lack the option name ("bla bla [Y/n/m/...] "). elsif ($line =~ /(.*) \[(.*)\] ###$/) { print OUT "\n"; } - + else { warn "don't know how to answer this question: $line\n"; print OUT "\n"; } - + $line = ""; %choices = (); } @@ -124,7 +124,10 @@ my %config; open CONFIG, "<.config" or die; while () { chomp; - if (/^CONFIG_([A-Za-z0-9_]+)=(.*)$/) { + if (/^CONFIG_([A-Za-z0-9_]+)="(.*)"$/) { + # String options have double quotes, e.g. 'CONFIG_NLS_DEFAULT="utf8"' and allow escaping. + ($config{$1} = $2) =~ s/\\([\\"])/$1/g; + } elsif (/^CONFIG_([A-Za-z0-9_]+)=(.*)$/) { $config{$1} = $2; } elsif (/^# CONFIG_([A-Za-z0-9_]+) is not set$/) { $config{$1} = "n"; @@ -136,6 +139,6 @@ foreach my $name (sort (keys %answers)) { my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1" ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; }; &$f("unused option: $name\n") unless defined $config{$name}; - &$f("option not set correctly: $name\n") + &$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n") if $config{$name} && $config{$name} ne $answers{$name}; } diff --git a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix index 4c81cd5b6ad..2193dabd0bc 100644 --- a/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix +++ b/pkgs/os-specific/linux/kernel/grsecurity-nixos-config.nix @@ -3,42 +3,56 @@ with stdenv.lib; '' -GRKERNSEC y -PAX y - +# Auto configuration with these constraints will enable most of the +# important features (RAP, UDEREF, ASLR, memory sanitization). GRKERNSEC_CONFIG_AUTO y GRKERNSEC_CONFIG_DESKTOP y -GRKERNSEC_CONFIG_VIRT_HOST y -GRKERNSEC_CONFIG_VIRT_EPT y -GRKERNSEC_CONFIG_VIRT_KVM y GRKERNSEC_CONFIG_PRIORITY_SECURITY y -PAX_SOFTMODE y +# We specify virt guest rather than host here, the latter deselects e.g., +# paravirtualization. +GRKERNSEC_CONFIG_VIRT_GUEST y +# Note: assumes platform supports CPU-level virtualization (so no pentium 4) +GRKERNSEC_CONFIG_VIRT_EPT y +GRKERNSEC_CONFIG_VIRT_KVM y +# PaX control +PAX_SOFTMODE y PAX_PT_PAX_FLAGS y PAX_XATTR_PAX_FLAGS y PAX_EI_PAX n -GRKERNSEC_PROC_GID 0 - -PAX_LATENT_ENTROPY n - -GRKERNSEC_HIDESYM n -GRKERNSEC_RANDSTRUCT n -GRKERNSEC_PROC n -GRKERNSEC_SYSFS_RESTRICT n -GRKERNSEC_KMEM n -GRKERNSEC_MODHARDEN n -GRKERNSEC_NO_SIMULT_CONNECT n - +# The bts instrumentation method is compatible with binary only modules. +# +# Note: if platform supports SMEP, we could do without this PAX_KERNEXEC_PLUGIN_METHOD_BTS y -GRKERNSEC_ACL_HIDEKERN y +# Additional grsec hardening not implied by auto constraints GRKERNSEC_IO y +# Disable protections rendered useless by redistribution +GRKERNSEC_HIDESYM n +GRKERNSEC_RANDSTRUCT n + +# Disable protections covered by vanilla mechanisms +GRKERNSEC_DMESG n +GRKERNSEC_KMEM n +GRKERNSEC_PROC n + +# Disable protections that are inappropriate for a general-purpose kernel +GRKERNSEC_NO_SIMULT_CONNECT n + +# Enable additional audititing +GRKERNSEC_AUDIT_MOUNT y GRKERNSEC_AUDIT_PTRACE y GRKERNSEC_FORKFAIL y +# Wishlist: support trusted path execution +GRKERNSEC_TPE n + +# Wishlist: enable this, but breaks user initiated module loading +GRKERNSEC_MODHARDEN n + GRKERNSEC_SYSCTL y GRKERNSEC_SYSCTL_DISTRO y GRKERNSEC_SYSCTL_ON y diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 27b97054d1a..a46a75c01ca 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.102"; + version = "3.10.103"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0hvymhmbvpmpz1jk0xwhxyskijdh6bzakqj7k0gaa2y0wdj33pxi"; + sha256 = "008dz40zig0fhkm3hjmcn0kn5b1sfvpxb7dc4fbsddb6gifrh44v"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 3d98da9526b..e14d722ad5d 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.62"; + version = "3.12.63"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0a9vghq3z5xhr9xssfivb78d3i74h4kn15wqgls1cw5qzyhc1wb0"; + sha256 = "0srg7xd68n10b28c3l5qa4dx5qr84ci7fdn48wcj79y7h2s0367x"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix deleted file mode 100644 index fdc5cc802a1..00000000000 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, fetchurl, perl, buildLinux, ... } @ args: - -import ./generic.nix (args // rec { - version = "3.14.77"; - extraMeta.branch = "3.14"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1v3cc3ddla2b8gkwbms4x3lbjygw87r13150nikf1gc0hf64rqp0"; - }; - - kernelPatches = args.kernelPatches; - - features.iwlwifi = true; - features.efiBootStub = true; - features.needsCifsUtils = true; - features.canDisableNetfilterConntrackHelpers = true; - features.netfilterRPFilter = true; -} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix index 98151295d1b..75f5d6de631 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.18.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "3.18.40"; + version = "3.18.42"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0x94lp4vkw1472m8sq308r8aw96nirkwppkjvqi2240ayw89d5jb"; + sha256 = "0ymimvy8kp2a2x0h31m3sipwx1h80576ws04k3cl49wgcgjwpwn4"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix index 1f89edecfe6..43b69196b8c 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.1.31"; + version = "4.1.33"; extraMeta.branch = "4.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0madbh1sdkf8gk6ns0zacygvfrpzrl1vd1a4qw8py7slg1bpk79n"; + sha256 = "15ms5mvvf0wpmscv8l5irp4j7j3l6k61hcjx9ln41pz6si00zj3l"; }; 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 6f6a720b412..246068f09ea 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.20"; + version = "4.4.24"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1ammaspil0xxw32c5j4mznkhfbpz1i14rm4n148d0fa1m5qbqcfj"; + sha256 = "0yhs1742wrl0ip9wsayparjpr7vccljnhfjimgy4fjp3w6aync1k"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.7.nix b/pkgs/os-specific/linux/kernel/linux-4.7.nix index ff47e1758c7..139ae20d8c9 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.7.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.7.3"; + version = "4.7.7"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rr5nj78jh1l46baa0qgzbw44slyqw5ivfn1y7dcxrgb17bvrqc"; + sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-4.6.nix b/pkgs/os-specific/linux/kernel/linux-4.8.nix similarity index 78% rename from pkgs/os-specific/linux/kernel/linux-4.6.nix rename to pkgs/os-specific/linux/kernel/linux-4.8.nix index 6bca1bfe718..d7164d72940 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.8.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, buildLinux, ... } @ args: import ./generic.nix (args // rec { - version = "4.6.7"; - extraMeta.branch = "4.6"; + version = "4.8.1"; + extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "107acpq6jk48ng25jlyv905zslrrv77yxwr46mqbq5lxg8rdg7fh"; + sha256 = "0rcqgi91jz5iyx1nrd4qjmvh0sgqjpqj94bwjh56c21nkxxiahg6"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-grsecurity.nix b/pkgs/os-specific/linux/kernel/linux-grsecurity.nix index ff47e1758c7..139ae20d8c9 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.7.3"; + version = "4.7.7"; extraMeta.branch = "4.7"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "16rr5nj78jh1l46baa0qgzbw44slyqw5ivfn1y7dcxrgb17bvrqc"; + sha256 = "079gvv91a0mymzxx1h9bbn4snk6xz0cyk1bf8pjkhdyyad90v17d"; }; kernelPatches = args.kernelPatches; diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix index b39514d45dd..52a52562d60 100644 --- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix +++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix @@ -29,12 +29,12 @@ import ./generic.nix (args // rec { # ... but use none by default. # The default is safer if source policy routing is not setup. DEFAULT_DUMMY y - DEFAULT_MPTCP_PM "default" + DEFAULT_MPTCP_PM default # MPTCP scheduler selection. # Disabled as the only non-default is the useless round-robin. MPTCP_SCHED_ADVANCED n - DEFAULT_MPTCP_SCHED "default" + DEFAULT_MPTCP_SCHED default # Smarter TCP congestion controllers TCP_CONG_LIA m diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 7b4284028ed..6b13b45d1ad 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.8-rc4"; - modDirVersion = "4.8.0-rc4"; + version = "4.8-rc6"; + modDirVersion = "4.8.0-rc6"; extraMeta.branch = "4.8"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz"; - sha256 = "0is4pzmci1i59fxw9b645c8710zjnx19dfl20m4k06kxdbbs01wg"; + sha256 = "122qn2r3q85xqcb56lgpkiv06yrd5w742fcdjk1sribqcvl1xlqr"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 53e7196c5c3..29d622cd3c3 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -38,16 +38,6 @@ in rec { - link_lguest = - { name = "gcc5-link-lguest"; - patch = ./gcc5-link-lguest.patch; - }; - - link_apm = - { name = "gcc5-link-apm"; - patch = ./gcc5-link-apm.patch; - }; - bridge_stp_helper = { name = "bridge-stp-helper"; patch = ./bridge-stp-helper.patch; @@ -95,14 +85,10 @@ rec { sha256 = "00b1rqgd4yr206dxp4mcymr56ymbjcjfa4m82pxw73khj032qw3j"; }; - grsecurity_3_14 = throw "grsecurity stable is no longer supported"; - - grsecurity_4_4 = throw "grsecurity stable is no longer supported"; - grsecurity_testing = grsecPatch - { kver = "4.7.3"; - grrev = "201609072139"; - sha256 = "0c70nfsa1bk07z6sivy645d9w0qkq23pwpwdm28160kfy7dampyh"; + { kver = "4.7.7"; + grrev = "201610101902"; + sha256 = "18x8grxj03bh9gqlm3sfgjl8vy5gpyrjr8nmdnrnas6ycmbvyjx4"; }; # This patch relaxes grsec constraints on the location of usermode helpers, @@ -153,4 +139,13 @@ rec { }; cpu-cgroup-v2 = import ./cpu-cgroup-v2-patches; + + lguest_entry-linkage = + { name = "lguest-asmlinkage.patch"; + patch = fetchpatch { + url = "https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git" + + "/patch/drivers/lguest/x86/core.c?id=cdd77e87eae52"; + sha256 = "04xlx6al10cw039av6jkby7gx64zayj8m1k9iza40sw0fydcfqhc"; + }; + }; } diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 4b1120afa4e..9e572498457 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -1,11 +1,11 @@ { lib, stdenv, kernel, elfutils, python, perl, newt, slang, asciidoc, xmlto , docbook_xsl, docbook_xml_dtd_45, libxslt, flex, bison, pkgconfig, libunwind, binutils -, libiberty -, zlib, withGtk ? false, gtk ? null }: +, libiberty, libaudit +, zlib, withGtk ? false, gtk2 ? null }: with lib; -assert withGtk -> gtk != null; +assert withGtk -> gtk2 != null; assert versionAtLeast kernel.version "3.12"; stdenv.mkDerivation { @@ -24,9 +24,9 @@ stdenv.mkDerivation { # perf refers both to newt and slang # binutils is required for libbfd. nativeBuildInputs = [ asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt - flex bison libiberty ]; + flex bison libiberty libaudit ]; buildInputs = [ elfutils python perl newt slang pkgconfig libunwind binutils zlib ] ++ - stdenv.lib.optional withGtk gtk; + stdenv.lib.optional withGtk gtk2; # Note: we don't add elfutils to buildInputs, since it provides a # bad `ld' and other stuff. diff --git a/pkgs/os-specific/linux/kmod/aggregator.nix b/pkgs/os-specific/linux/kmod/aggregator.nix index 88069ba4bf1..9bd7c8480c1 100644 --- a/pkgs/os-specific/linux/kmod/aggregator.nix +++ b/pkgs/os-specific/linux/kmod/aggregator.nix @@ -17,10 +17,12 @@ buildEnv { echo "kernel version is $kernelVersion" + shopt -s extglob + # Regenerate the depmod map files. Be sure to pass an explicit # kernel version number, otherwise depmod will use `uname -r'. if test -w $out/lib/modules/$kernelVersion; then - rm -f $out/lib/modules/$kernelVersion/modules.* + rm -f $out/lib/modules/$kernelVersion/modules.!(builtin*|order*) ${kmod}/bin/depmod -b $out -a $kernelVersion fi ''; diff --git a/pkgs/os-specific/linux/latencytop/default.nix b/pkgs/os-specific/linux/latencytop/default.nix index 163ac189050..8c2badc3d68 100644 --- a/pkgs/os-specific/linux/latencytop/default.nix +++ b/pkgs/os-specific/linux/latencytop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk }: +{ stdenv, fetchurl, ncurses, glib, pkgconfig, gtk2 }: stdenv.mkDerivation rec { name = "latencytop-0.5"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1vq3j9zdab6njly2wp900b3d5244mnxfm88j2bkiinbvxbxp4zwy"; }; - buildInputs = [ ncurses glib pkgconfig gtk ]; + buildInputs = [ ncurses glib pkgconfig gtk2 ]; meta = { homepage = http://latencytop.org; diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index ecbb2a0ec46..3021ce20b46 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -13,7 +13,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ flex ]; - NIX_CFLAGS_COMPILE = "-fstack-protector-all"; + # Temporary work-around for problems after flex security update: + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835542 + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; preBuild = '' makeFlagsArray+=("PREFIX=$out") diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 10551c08077..083362489ad 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.bjornfor ]; broken = (builtins.compareVersions kernel.version "3.18" == -1) || - (kernel.features.grsecurity or false); + (kernel.features.grsecurity or false) || + (kernel.features.chromiumos or false); }; } diff --git a/pkgs/os-specific/linux/mba6x_bl/default.nix b/pkgs/os-specific/linux/mba6x_bl/default.nix index 2a0e53b3925..350915c55b5 100644 --- a/pkgs/os-specific/linux/mba6x_bl/default.nix +++ b/pkgs/os-specific/linux/mba6x_bl/default.nix @@ -6,13 +6,14 @@ let pkgName = "mba6x_bl"; in stdenv.mkDerivation rec { - name = "${pkgName}-2016-02-12"; + name = "${pkgName}-${version}"; + version = "2016-04-22"; src = fetchFromGitHub { owner = "patjak"; repo = pkgName; - rev = "9c2de8a24e7d4e8506170a19d32d6f11f380a142"; - sha256 = "1zaypai8lznqcaszb6an643amsvr5qjnqj6aq6jkr0qk37x0fjff"; + rev = "d05c125efe182376ddab30d486994ec00e144650"; + sha256 = "15h90z3ijq4lv37nmx70xqggcvn21vr7mki2psk1jyj88in3j3xn"; }; enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/nvidia-x11/365.35-kernel-4.7.patch b/pkgs/os-specific/linux/nvidia-x11/365.35-kernel-4.7.patch deleted file mode 100644 index 8d1436c5094..00000000000 --- a/pkgs/os-specific/linux/nvidia-x11/365.35-kernel-4.7.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-fb.c NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-fb.c ---- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-fb.c 2016-07-31 19:07:06.595038290 -0400 -+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-fb.c 2016-07-31 19:09:18.532197060 -0400 -@@ -114,7 +114,7 @@ - * We don't support any planar format, pick up first buffer only. - */ - -- gem = drm_gem_object_lookup(dev, file, cmd->handles[0]); -+ gem = drm_gem_object_lookup(file, cmd->handles[0]); - - if (gem == NULL) - { -diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-gem.c NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-gem.c ---- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-drm/nvidia-drm-gem.c 2016-07-31 19:07:06.595038290 -0400 -+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-drm/nvidia-drm-gem.c 2016-07-31 19:08:56.187492736 -0400 -@@ -408,7 +408,7 @@ - - mutex_lock(&dev->struct_mutex); - -- gem = drm_gem_object_lookup(dev, file, handle); -+ gem = drm_gem_object_lookup(file, handle); - - if (gem == NULL) - { -diff -Naur NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-uvm/uvm_linux.h NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-uvm/uvm_linux.h ---- NVIDIA-Linux-x86_64-367.35-no-compat32-upstream/kernel/nvidia-uvm/uvm_linux.h 2016-07-31 19:07:06.600038448 -0400 -+++ NVIDIA-Linux-x86_64-367.35-no-compat32/kernel/nvidia-uvm/uvm_linux.h 2016-07-31 19:08:06.506926763 -0400 -@@ -554,12 +554,6 @@ - INIT_RADIX_TREE(tree, GFP_NOWAIT); - } - --static bool radix_tree_empty(struct radix_tree_root *tree) --{ -- void *dummy; -- return radix_tree_gang_lookup(tree, &dummy, 0, 1) == 0; --} -- - - #if !defined(NV_USLEEP_RANGE_PRESENT) - static void __sched usleep_range(unsigned long min, unsigned long max) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index f561c0addc8..ae05e583061 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences +, gtk2, atk, pango, glib, gdk_pixbuf, cairo, nukeReferences , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -12,28 +12,30 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "367.35"; + versionNumber = "367.57"; # Policy: use the highest stable version as the default (on our master). inherit (stdenv.lib) makeLibraryPath; + nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; + in stdenv.mkDerivation { - name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; + name = "nvidia-x11-${versionNumber}${nameSuffix}"; builder = ./builder.sh; src = if stdenv.system == "i686-linux" then fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "05g36bxcfk21ab8b0ay3zy21k5nd71468p9y1nbflx7ghpx25jrq"; + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "1fw87nvbf8dmy7clwmm7jwp842c78mkz9bcb060wbihsywkfkm23"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0m4k8f0212l63h22wk6hgi8fbfsgxqih5mizsw4ixqqmjd75av4a"; + url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}.run"; + sha256 = "0lc87bgr29l9idhy2a4bsplkwx9r0dz9kjhcc5xq2xqkkyr5sqd1"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -52,10 +54,10 @@ stdenv.mkDerivation { allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; gtkPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf cairo ] ); + [ gtk2 atk pango glib gdk_pixbuf cairo ] ); programPath = makeLibraryPath [ xorg.libXv ]; - patches = if (!libsOnly) && (versionAtLeast kernel.dev.version "4.7") then [ ./365.35-kernel-4.7.patch ] else []; + buildInputs = [ perl nukeReferences ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 27c963f4bd9..d1f6d36a6a7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, kernel, xorg, zlib, gtk, atk, pango, glib, gdk_pixbuf}: +{stdenv, fetchurl, kernel, xorg, zlib, gtk2, atk, pango, glib, gdk_pixbuf}: let @@ -36,7 +36,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; - programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xorg.libXv ]; + programPath = stdenv.lib.makeLibraryPath [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ]; meta = { homepage = http://www.nvidia.com/object/unix.html; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 65cf42333e0..63da39e0c23 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf +, gtk2, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -41,7 +41,7 @@ stdenv.mkDerivation { cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); + [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index 0682954d558..e34aaf3c908 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, kernel ? null, xorg, zlib, perl -, gtk, atk, pango, glib, gdk_pixbuf +, gtk2, atk, pango, glib, gdk_pixbuf , # Whether to build the libraries only (i.e. not the kernel module or # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. @@ -52,7 +52,7 @@ stdenv.mkDerivation { allLibPath = makeLibraryPath [xorg.libXext xorg.libX11 xorg.libXrandr zlib stdenv.cc.cc]; programPath = optionalString (!libsOnly) (makeLibraryPath - [ gtk atk pango glib gdk_pixbuf xorg.libXv ] ); + [ gtk2 atk pango glib gdk_pixbuf xorg.libXv ] ); buildInputs = [ perl ]; diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix new file mode 100644 index 00000000000..94fc9ca05e7 --- /dev/null +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -0,0 +1,23 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "nvme-cli-${version}"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "linux-nvme"; + repo = "nvme-cli"; + rev = "v${version}"; + sha256 = "16n0gg1zx4fgadcq94kx6bgysqw60jvybjwynk7mj3fzdbvzrqyh"; + }; + + makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "NVM-Express user space tooling for Linux"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ tavyc ]; + }; +} diff --git a/pkgs/os-specific/linux/pam_usb/default.nix b/pkgs/os-specific/linux/pam_usb/default.nix index a96e951bf9b..baf24b27562 100644 --- a/pkgs/os-specific/linux/pam_usb/default.nix +++ b/pkgs/os-specific/linux/pam_usb/default.nix @@ -1,6 +1,32 @@ -{stdenv, fetchurl, makeWrapper, useSetUID, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages}: +{ stdenv, fetchurl, makeWrapper, dbus, libxml2, pam, pkgconfig, pmount, pythonPackages, writeScript }: let + + # Search in the environment if the same program exists with a set uid or + # set gid bit. If it exists, run the first program found, otherwise run + # the default binary. + useSetUID = drv: path: + let + name = baseNameOf path; + bin = "${drv}${path}"; + in assert name != ""; + writeScript "setUID-${name}" '' + #!${stdenv.shell} + inode=$(stat -Lc %i ${bin}) + for file in $(type -ap ${name}); do + case $(stat -Lc %a $file) in + ([2-7][0-7][0-7][0-7]) + if test -r "$file".real; then + orig=$(cat "$file".real) + if test $inode = $(stat -Lc %i "$orig"); then + exec "$file" "$@" + fi + fi;; + esac + done + exec ${bin} "$@" + ''; + pmountBin = useSetUID pmount "/bin/pmount"; pumountBin = useSetUID pmount "/bin/pumount"; inherit (pythonPackages) python dbus-python; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index b591c3b002c..3ce9617ec5b 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, dpdk, libpcap, utillinux , pkgconfig -, gtk, withGtk ? false +, gtk2, withGtk ? false }: stdenv.mkDerivation rec { @@ -16,14 +16,12 @@ stdenv.mkDerivation rec { buildInputs = [ dpdk libpcap ] - ++ stdenv.lib.optionals withGtk [gtk]; + ++ stdenv.lib.optionals withGtk [gtk2]; RTE_SDK = "${dpdk}"; RTE_TARGET = "x86_64-native-linuxapp-gcc"; GUI = stdenv.lib.optionalString withGtk "true"; - enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = [ "-march=core2" ]; postPatch = '' diff --git a/pkgs/os-specific/linux/pommed/default.nix b/pkgs/os-specific/linux/pommed/default.nix index 6318654742e..1cdf9044b8f 100644 --- a/pkgs/os-specific/linux/pommed/default.nix +++ b/pkgs/os-specific/linux/pommed/default.nix @@ -7,7 +7,7 @@ , alsaLib , audiofile , pkgconfig -, gtk +, gtk2 , gettext , libXpm }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { audiofile dbus_glib pkgconfig - gtk + gtk2 gettext libXpm ]; diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 59083a8b040..4d81126af44 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -8,17 +8,19 @@ stdenv.mkDerivation rec { sha256 = "0nlwazxbnn0k6q5f5b09wdhw0f194lpzkp3l7vxansqhfczmcyx8"; }; - buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext libnl ncurses pciutils zlib ]; postPatch = '' substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe" substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset" ''; - meta = { + meta = with stdenv.lib; { description = "Analyze power consumption on Intel-based laptops"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.chaoflow ]; - platforms = stdenv.lib.platforms.linux; + homepage = https://01.org/powertop; + license = licenses.gpl2; + maintainers = with maintainers; [ chaoflow fpletz ]; + platforms = platforms.linux; }; } diff --git a/pkgs/os-specific/linux/rtkit/default.nix b/pkgs/os-specific/linux/rtkit/default.nix index fe392fb0841..dd6f9ec42af 100644 --- a/pkgs/os-specific/linux/rtkit/default.nix +++ b/pkgs/os-specific/linux/rtkit/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, dbus, libcap }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, dbus, libcap }: stdenv.mkDerivation rec { name = "rtkit-0.11"; - + src = fetchurl { url = "http://0pointer.de/public/${name}.tar.xz"; sha256 = "1l5cb1gp6wgpc9vq6sx021qs6zb0nxg3cn1ba00hjhgnrw4931b8"; @@ -12,6 +12,20 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ]; + patches = [ + # Drop removed ControlGroup stanza + (fetchpatch { + url = "http://git.0pointer.net/rtkit.git/patch/?id=6c28e20c0be2f616a025059fda0ffac84e7f4f17"; + sha256 = "0lsxk5nv08i1wjb4xh20i5fcwg3x0qq0k4f8bc0r9cczph2sv7ck"; + }) + + # security patch: Pass uid of caller to polkit + (fetchpatch { + url = "http://git.0pointer.net/rtkit.git/patch/?id=88d4082ef6caf6b071d749dca1c50e7edde914cc"; + sha256 = "0hp1blbi359qz8fmr6nj4w9yc0jf3dd176f8pn25wdj38n13qkix"; + }) + ]; + buildInputs = [ pkgconfig dbus libcap ]; meta = { diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index c38fa8843f4..56f14b30acd 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; - version = "4.2.2-1"; + version = "4.3.20"; src = fetchFromGitHub { - owner = "csssuf"; - repo = "rtl8812au"; - rev = "874906aec694c800bfc29b146737b88dae767832"; - sha256 = "14ifhplawipfd6971mxw76dv3ygwc0n8sbz2l3f0vvkin6x88bsj"; + owner = "Grawp"; + repo = "rtl8812au_rtl8821au"; + rev = "9c5b2978ab079081dd1e981353be681a1cf495de"; + sha256 = "0bx1vgs2qldwwhdgklbqz2vy9x4jg7cj3d6w6cpkndkcr7h0m5vz"; }; hardeningDisable = [ "pic" ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = { description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod"; - homepage = "https://github.com/csssuf/rtl8812au"; + homepage = "https://github.com/Grawp/rtl8812au_rtl8821au"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; broken = (kernel.features.grsecurity or false); diff --git a/pkgs/os-specific/linux/rtlwifi_new/default.nix b/pkgs/os-specific/linux/rtlwifi_new/default.nix new file mode 100644 index 00000000000..0c7cb24e465 --- /dev/null +++ b/pkgs/os-specific/linux/rtlwifi_new/default.nix @@ -0,0 +1,38 @@ +{ stdenv, lib, fetchFromGitHub, kernel }: + +with lib; + +let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wireless/realtek/rtlwifi"; + +in stdenv.mkDerivation rec { + name = "rtlwifi_new-${version}"; + version = "2016-09-12"; + + src = fetchFromGitHub { + owner = "lwfinger"; + repo = "rtlwifi_new"; + rev = "7a1b37d2121e8ab1457f002b2729fc23e6ff3e10"; + sha256 = "0z8grf0fak2ryxwzapp9di77c4bghzkv8lffv76idkcnxgq6sclv"; + }; + + hardeningDisable = [ "pic" "format" ]; + + makeFlags = "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + + enableParallelBuilding = true; + + installPhase = '' + mkdir -p ${modDestDir} + find . -name '*.ko' -exec cp --parents {} ${modDestDir} \; + find ${modDestDir} -name '*.ko' -exec xz -f {} \; + ''; + + meta = { + description = "The newest Realtek rtlwifi codes"; + inherit (src.meta) homepage; + license = stdenv.lib.licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ tvorog ]; + priority = -1; + }; +} diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index bed1d517e56..c86efe22f6e 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -17,13 +17,13 @@ assert buildKernel -> kernel != null; stdenv.mkDerivation rec { name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.7"; + version = "0.6.5.8"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "spl"; rev = "spl-${version}"; - sha256 = "0i9ak4wqn444i6362xq5xl0msvcck8qqypp0fynrxq8mddzypwps"; + sha256 = "000yvaccqlkrq15sdz0734fp3lkmx58182cdcfpm4869i0q7rf0s"; }; patches = [ ./const.patch ./install_prefix.patch ]; @@ -59,11 +59,7 @@ stdenv.mkDerivation rec { homepage = http://zfsonlinux.org/; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with maintainers; [ jcumming wizeman wkennington ]; - broken = buildKernel - && (kernel.features.grsecurity or - # spl marked as broken until following patch is released - # https://github.com/zfsonlinux/spl/commit/fdbc1ba99d1f4d3958189079eee9b6c957e0264b - (versionAtLeast kernel.version "4.7")); + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ]; + broken = buildKernel && (kernel.features.grsecurity or false); }; } diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7fdebc5c1e8..8939f854870 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "124564dd451349ec12673a7d4836b4a7a2f8fb4e"; - sha256 = "021b7filp1dlhic1iv54b821w7mj5595njvzns939pmn636ry4m5"; + rev = "3b11791d323cf2d0e00a156967021e1ae9119de2"; + sha256 = "1xzldwd6407jdg6z36smd49d961nmqykpay969i4xfdldcgyjdv0"; }; patches = [ diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 0cc7a8a4548..f8461113903 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: +{ lib, stdenv, fetchurl, pkgconfig, zlib, libseccomp, fetchpatch, autoreconfHook, ncurses ? null, perl ? null, pam, systemd, minimal ? false }: stdenv.mkDerivation rec { name = "util-linux-${version}"; @@ -14,11 +14,13 @@ stdenv.mkDerivation rec { patches = [ ./rtcwake-search-PATH-for-shutdown.patch - ]; + (fetchpatch { + name = "CVE-2016-2779.diff"; + url = https://github.com/karelzak/util-linux/commit/8e4925016875c6a4f2ab4f833ba66f0fc57396a2.patch; + sha256 = "0kmigkq4s1b1ijrq8vcg2a5cw4qnm065m7cb1jn1q1f4x99ycy60"; + })]; - outputs = [ "bin" "out" "man" ]; # TODO: $bin is kept the first for now - # due to lots of ${utillinux}/bin occurences and headers being rather small - outputDev = "bin"; + outputs = [ "bin" "dev" "out" "man" ]; #FIXME: make it also work on non-nixos? postPatch = '' @@ -52,9 +54,11 @@ stdenv.mkDerivation rec { makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin"; - nativeBuildInputs = [ pkgconfig ]; + # autoreconfHook is required for CVE-2016-2779 + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + # libseccomp is required for CVE-2016-2779 buildInputs = - [ zlib pam ] + [ zlib pam libseccomp ] ++ lib.optional (ncurses != null) ncurses ++ lib.optional (systemd != null) systemd ++ lib.optional (perl != null) perl; diff --git a/pkgs/os-specific/linux/virtualbox/default.nix b/pkgs/os-specific/linux/virtualbox/default.nix new file mode 100644 index 00000000000..593c4400b7f --- /dev/null +++ b/pkgs/os-specific/linux/virtualbox/default.nix @@ -0,0 +1,23 @@ +{ stdenv, virtualbox, kernel, strace }: + +stdenv.mkDerivation { + name = "virtualbox-modules-${virtualbox.version}-${kernel.version}"; + src = virtualbox.modsrc; + hardeningDisable = [ + "fortify" "pic" "stackprotector" + ]; + + makeFlags = [ + "-C ${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" + "INSTALL_MOD_PATH=$(out)" + ]; + preBuild = "makeFlagsArray+=(\"M=$(pwd)\")"; + buildFlags = [ "modules" ]; + installTargets = [ "modules_install" ]; + + enableParallelBuilding = true; + + meta = virtualbox.meta // { + description = virtualbox.meta.description + " (kernel modules)"; + }; +} diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index a885d40658b..a8556fdbe07 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -8,11 +8,11 @@ assert kernel != null -> !(kernel.features.grsecurity or false); let name = "wireguard-unstable-${version}"; - version = "2016-08-08"; + version = "2016-10-01"; src = fetchurl { - url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20160808.tar.xz"; - sha256 = "0z9s9xi8dzkmjnki7ialf2haxb0mn2x5676sjwmjij1jfi9ypxhw"; + url = "https://git.zx2c4.com/WireGuard/snapshot/WireGuard-experimental-0.0.20161001.tar.xz"; + sha256 = "1j1s276lgp17yrlc46bgsbpwp635cvvv6b3ap49aq5h7jixvnfmc"; }; meta = with stdenv.lib; { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 4b5d7e35dae..f2cf9eca4dc 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null; stdenv.mkDerivation rec { name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}"; - version = "0.6.5.7"; + version = "0.6.5.8"; src = fetchFromGitHub { owner = "zfsonlinux"; repo = "zfs"; rev = "zfs-${version}"; - sha256 = "17mshxyp8k7i9a7ys0rznhkz83f6650pby9ka48d6gzgcwv9nnsm"; + sha256 = "0qccz1832p3i80qlrrrypypspb9sy9hmpgcfx9vmhnqmkf0yri4a"; }; patches = [ ./nix-build.patch ]; @@ -109,6 +109,6 @@ stdenv.mkDerivation rec { homepage = http://zfsonlinux.org/; license = licenses.cddl; platforms = platforms.linux; - maintainers = with maintainers; [ jcumming wizeman wkennington ]; + maintainers = with maintainers; [ jcumming wizeman wkennington fpletz ]; }; } diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix old mode 100755 new mode 100644 diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index d9bb0fd70eb..ed772e7b247 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "13.6.0"; src = fetchurl { - url = "http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-${version}.tar.gz"; + url = "http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-${version}.tar.gz"; sha256 = "0nh0fnqx84as92kk9d73s0386cndd17l06y1c72jl2bdjhyba0ca"; }; @@ -57,5 +57,8 @@ stdenv.mkDerivation rec { homepage = http://www.asterisk.org/; license = licenses.gpl2; maintainers = with maintainers; [ auntie ]; + # Marked as broken due to needing an update for security issues. + # See: https://github.com/NixOS/nixpkgs/issues/18856 + broken = true; }; } diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix new file mode 100644 index 00000000000..302ff47bc20 --- /dev/null +++ b/pkgs/servers/atlassian/confluence.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "atlassian-confluence-${version}"; + version = "5.10.4"; + + src = fetchurl { + url = "https://www.atlassian.com/software/confluence/downloads/binary/${name}.tar.gz"; + sha256 = "07v31lr2jyh90ynjv6f61jh8wkry6lx02nm3yra02920k4y0w22a"; + }; + + phases = [ "unpackPhase" "buildPhase" "installPhase" ]; + + buildPhase = '' + echo "confluence.home=/run/confluence/home" > confluence/WEB-INF/classes/confluence-init.properties + mv conf/server.xml conf/server.xml.dist + ln -sf /run/confluence/home/deploy conf/Standalone + ln -sf /run/confluence/server.xml conf/server.xml + rm -r logs; ln -sf /run/confluence/logs/ . + rm -r work; ln -sf /run/confluence/work/ . + rm -r temp; ln -sf /run/confluence/temp/ . + ''; + + installPhase = '' + cp -rva . $out + patchShebangs $out/bin + ''; + + meta = with stdenv.lib; { + description = "Team collaboration software written in Java and mainly used in corporate environments"; + homepage = https://www.atlassian.com/software/confluence; + license = licenses.unfree; + maintainers = with maintainers; [ fpletz globin ]; + }; +} diff --git a/pkgs/servers/atlassian/crowd.nix b/pkgs/servers/atlassian/crowd.nix new file mode 100644 index 00000000000..d84ddd00882 --- /dev/null +++ b/pkgs/servers/atlassian/crowd.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, home ? "/var/lib/crowd" }: + +stdenv.mkDerivation rec { + name = "atlassian-crowd-${version}"; + version = "2.10.1"; + + src = fetchurl { + url = "https://www.atlassian.com/software/crowd/downloads/binary/${name}.tar.gz"; + sha256 = "1pl4wyqvzqb97ql23530amslrrsysi0fmmnzpihhgqhvhwf57sc6"; + }; + + phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; + + buildPhase = '' + mv apache-tomcat/conf/server.xml apache-tomcat/conf/server.xml.dist + ln -s /run/atlassian-crowd/server.xml apache-tomcat/conf/server.xml + + rm -rf apache-tomcat/work + ln -s /run/atlassian-crowd/work apache-tomcat/work + + substituteInPlace apache-tomcat/bin/startup.sh --replace start run + + echo "crowd.home=${home}" > crowd-webapp/WEB-INF/classes/crowd-init.properties + ''; + + installPhase = '' + cp -rva . $out + ''; + + meta = with stdenv.lib; { + description = "Single sign-on and identity management tool"; + homepage = https://www.atlassian.com/software/crowd; + license = licenses.unfree; + maintainers = with maintainers; [ fpletz globin ]; + }; +} diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix new file mode 100644 index 00000000000..7921e78a47f --- /dev/null +++ b/pkgs/servers/atlassian/jira.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "atlassian-jira-${version}"; + version = "7.2.2"; + + src = fetchurl { + url = "https://downloads.atlassian.com/software/jira/downloads/atlassian-jira-software-${version}.tar.gz"; + sha256 = "0qrxiyljcz3lv3jp29mhrfkj77r7ahfm68hvwwjl4z7424mwg9zn"; + }; + + phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ]; + + buildPhase = '' + mv conf/server.xml conf/server.xml.dist + ln -sf /run/atlassian-jira/server.xml conf/server.xml + rm -r logs; ln -sf /run/atlassian-jira/logs/ . + rm -r work; ln -sf /run/atlassian-jira/work/ . + rm -r temp; ln -sf /run/atlassian-jira/temp/ . + ''; + + installPhase = '' + cp -rva . $out + ''; + + meta = with stdenv.lib; { + description = "Proprietary issue tracking product, also providing project management functions"; + homepage = https://www.atlassian.com/software/jira; + license = licenses.unfree; + maintainers = with maintainers; [ fpletz globin ]; + }; +} diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 51b4694b630..bf0b40e1d7b 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "v0.9.1"; + version = "0.9.2"; goPackagePath = "github.com/mholt/caddy"; @@ -11,8 +11,8 @@ buildGoPackage rec { src = fetchFromGitHub { owner = "mholt"; repo = "caddy"; - rev = version; - sha256 = "0slh4nf5pd42mgj1j9hzywqpc3p6d211dm6pdlhb6lyn8f6nprgp"; + rev = "v${version}"; + sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33"; }; buildFlagsArray = '' @@ -20,5 +20,12 @@ buildGoPackage rec { -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version} ''; - goDeps = ./deps.json; + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://caddyserver.com; + description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; + license = licenses.asl20; + maintainers = [ maintainers.rushmorem ]; + }; } diff --git a/pkgs/servers/caddy/deps.json b/pkgs/servers/caddy/deps.json deleted file mode 100644 index 6a6638b44b4..00000000000 --- a/pkgs/servers/caddy/deps.json +++ /dev/null @@ -1,182 +0,0 @@ -[ - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "99064174e013895bbd9b025c31100bd1d9b590ca", - "sha256": "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", - "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" - } - }, - { - "goPackagePath": "github.com/flynn/go-shlex", - "fetch": { - "type": "git", - "url": "https://github.com/flynn/go-shlex", - "rev": "3f9db97f856818214da2e1057f8ad84803971cff", - "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a69d25be2fe2923a97c2af6849b2f52426f68fc0", - "sha256": "1z09mff5yfdrw8vbylrgrick5m5hczjy8m2x6swdq8v062s45g3v" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "315de0c1920b18b942603ffdc2229e2af4803c17", - "sha256": "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6" - } - }, - { - "goPackagePath": "github.com/jimstudt/http-authentication", - "fetch": { - "type": "git", - "url": "https://github.com/jimstudt/http-authentication", - "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012", - "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/aes12", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/aes12", - "rev": "5a3c52721c1e81aa8162601ac2342486525156d5", - "sha256": "16z4h752na2d4sskjvbgi9bpwx874lpnzn6i13n33xjz599nps4y" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/fnv128a", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/fnv128a", - "rev": "393af48d391698c6ae4219566bfbdfef67269997", - "sha256": "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/quic-go", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/quic-go", - "rev": "c2af049b8af811a546bfa6b11f362c9c1e706343", - "sha256": "178w1qzpkyrkcnix093lj6dhgg5nylxg0aqmiff6f9ww2xknlw47" - } - }, - { - "goPackagePath": "github.com/lucas-clemente/quic-go-certificates", - "fetch": { - "type": "git", - "url": "https://github.com/lucas-clemente/quic-go-certificates", - "rev": "4904164a1a6479e3b509f616ccd31a7b0e705d52", - "sha256": "1kpl8j4lqwq1xqkyikbczq8dwrybbgz4m9ny21a88v0da6r2bcfk" - } - }, - { - "goPackagePath": "github.com/mholt/caddy", - "fetch": { - "type": "git", - "url": "https://github.com/mholt/caddy", - "rev": "c5aa5843d92a27eaf521e28684111030135d9cdc", - "sha256": "0slh4nf5pd42mgj1j9hzywqpc3p6d211dm6pdlhb6lyn8f6nprgp" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "db96a2b759cdef4f11a34506a42eb8d1290c598e", - "sha256": "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6" - } - }, - { - "goPackagePath": "github.com/russross/blackfriday", - "fetch": { - "type": "git", - "url": "https://github.com/russross/blackfriday", - "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8", - "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2" - } - }, - { - "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", - "fetch": { - "type": "git", - "url": "https://github.com/shurcooL/sanitized_anchor_name", - "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", - "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" - } - }, - { - "goPackagePath": "github.com/xenolf/lego", - "fetch": { - "type": "git", - "url": "https://github.com/xenolf/lego", - "rev": "823436d61175269716a88cd6627bfa603812f10c", - "sha256": "1j6nkw00d09ys0p4i7k4xad1fxczg3klvnw4x48wr1zaygnpaw7q" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "b3cc7317554b3e708b116d997899e612bab100d6", - "sha256": "1mcrgsvqmghhvf9z99prm15flx9l3irpm20z2zmdmhsprhc0nr5v" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "7394c112eae4dba7e96bfcfe738e6373d61772b4", - "sha256": "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7" - } - }, - { - "goPackagePath": "gopkg.in/natefinch/lumberjack.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/natefinch/lumberjack.v2", - "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738", - "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82" - } - }, - { - "goPackagePath": "gopkg.in/square/go-jose.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/square/go-jose.v1", - "rev": "a3927f83df1b1516f9e9dec71839c93e6bcf1db0", - "sha256": "0zbsy6hbv3p0ahcf4hviyv1vnpdywyf1hdspz8l6vj897myd019f" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "e4d366fc3c7938e2958e662b4258c7a89e1f0e3e", - "sha256": "1himz6569rcgn27q6sdrwvdldx45q2spgjb5cfihgb80zww8di8x" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix new file mode 100644 index 00000000000..d7c974ecb16 --- /dev/null +++ b/pkgs/servers/caddy/deps.nix @@ -0,0 +1,201 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; + sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f856818214da2e1057f8ad84803971cff"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "2d1e4548da234d9cb742cc3628556fef86aafbac"; + sha256 = "0n7af8pjjmg5rhb3104lyvn966l1p4dfblmy3g9b0plsmnzrz6g5"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "315de0c1920b18b942603ffdc2229e2af4803c17"; + sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; + sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; + }; + } + { + goPackagePath = "github.com/jimstudt/http-authentication"; + fetch = { + type = "git"; + url = "https://github.com/jimstudt/http-authentication"; + rev = "3eca13d6893afd7ecabe15f4445f5d2872a1b012"; + sha256 = "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/aes12"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/aes12"; + rev = "8ee5b5610baca43b60ecfad586b3c40d92a96e0c"; + sha256 = "1lnzrr7f6cyb10gqji6433fvwi8zid0k019m694xyppv4pzgrc93"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/fnv128a"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/fnv128a"; + rev = "393af48d391698c6ae4219566bfbdfef67269997"; + sha256 = "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/quic-go"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/quic-go"; + rev = "8f7a96dfafd8b03eae5679702a837ed5bdf91327"; + sha256 = "12qc7y8v3g16q3klh852f3v4yvbcp6h8am1q98ds2c1zay9jl50n"; + }; + } + { + goPackagePath = "github.com/lucas-clemente/quic-go-certificates"; + fetch = { + type = "git"; + url = "https://github.com/lucas-clemente/quic-go-certificates"; + rev = "d2f86524cced5186554df90d92529757d22c1cb6"; + sha256 = "033099nv0y9pbv0v292x6g0mvwr2w02jf4vvpwx6sjpwbla4xjxd"; + }; + } + { + goPackagePath = "github.com/mholt/caddy"; + fetch = { + type = "git"; + url = "https://github.com/mholt/caddy"; + rev = "73916ccc3069de4720a77b6b817b0bb77bda6b44"; + sha256 = "1nmimyykbjfnwbrka50z15d11z0fc6abpkr0cjbj678d5r9wpz33"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e"; + sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"; + }; + } + { + goPackagePath = "github.com/naoina/go-stringutil"; + fetch = { + type = "git"; + url = "https://github.com/naoina/go-stringutil"; + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + }; + } + { + goPackagePath = "github.com/naoina/toml"; + fetch = { + type = "git"; + url = "https://github.com/naoina/toml"; + rev = "751171607256bb66e64c9f0220c00662420c38e9"; + sha256 = "07ivrcdd62y7jj5isrz7jhkqqc29s0wsn005mn0yxain51f8h7ly"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "35eb537633d9950afc8ae7bdf0edb6134584e9fc"; + sha256 = "1hwi1nq5kkpcci7lf4fwhs8jj0mf6xcbdz1vgijpfyyd0zr6mphc"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "1dba4b3954bc059efc3991ec364f9f9a35f597d2"; + sha256 = "0pwap8lp79pldd95a1qi3xhlsa17m8zddpgc5jzvk6d1cjpsm6qg"; + }; + } + { + goPackagePath = "github.com/xenolf/lego"; + fetch = { + type = "git"; + url = "https://github.com/xenolf/lego"; + rev = "82ac43327b01319544c050d5d78a4edeff9565d2"; + sha256 = "0zs1l4dm0srkx78a7rqq1g8g4yn84c07177zbaa286jqpzgijahi"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "6ab629be5e31660579425a738ba8870beb5b7404"; + sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6"; + sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/natefinch/lumberjack.v2"; + rev = "514cbda263a734ae8caac038dadf05f8f3f9f738"; + sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v1"; + rev = "139276ceb5afbf13e636c44e9382f0ca75c12ba3"; + sha256 = "1f46qka0xzzkbsg01r9c9fi9zlzai7h83mp9hlwg9m5s73h8gzwj"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "31c299268d302dd0aa9a0dcf765a3d58971ac83f"; + sha256 = "14jkpa8g0s448n2x5qdi05m59ncsdscby1wy2p089zxl9nqavm8h"; + }; + } +] diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index 6ae8e410bf2..311d707e9c5 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, curl, python, munge, perl, pam, openssl -, ncurses, mysql, gtk, lua, hwloc, numactl +, ncurses, mysql, gtk2, lua, hwloc, numactl }: stdenv.mkDerivation rec { @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - curl python munge perl pam openssl mysql.lib ncurses gtk lua hwloc numactl + curl python munge perl pam openssl mysql.lib ncurses gtk2 lua hwloc numactl ]; configureFlags = [ "--with-munge=${munge}" "--with-ssl=${openssl.dev}" "--sysconfdir=/etc/slurm" - ] ++ stdenv.lib.optional (gtk == null) "--disable-gtktest"; + ] ++ stdenv.lib.optional (gtk2 == null) "--disable-gtktest"; preConfigure = '' substituteInPlace ./doc/html/shtml2html.py --replace "/usr/bin/env python" "${python.interpreter}" diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 5254aa8e94b..f0501fa57d6 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "consul-${version}"; - version = "0.6.4"; + version = "0.7.0"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/consul"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "consul"; inherit rev; - sha256 = "0p6m2rl0d30w418n4fzc4vymqs3vzfa468czmy4znkjmxdl5vp5a"; + sha256 = "04h5y5vixjh9np9lsrk02ypbqwcq855h7l1jlnl1vmfq3sfqjds7"; }; # Keep consul.ui for backward compatability diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 58f1ee6a316..e55b3eeb18b 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -1,21 +1,23 @@ -{ stdenv, fetchurl, openssl, libtool, perl, libxml2 }: +{ stdenv, fetchurl, openssl, libtool, perl, libxml2 +, libseccomp ? null }: -let version = "9.10.4"; in +let version = "9.10.4-P3"; in stdenv.mkDerivation rec { name = "bind-${version}"; src = fetchurl { url = "http://ftp.isc.org/isc/bind9/${version}/${name}.tar.gz"; - sha256 = "0mmhzi4483mkak47wj255a36g3v0yilxwfwlbckr1hssinri5m7q"; + sha256 = "1vxs29w4hnl7jcd7sknga58xv1qk2rcpsxyich7cpp7xi77faxd0"; }; - outputs = [ "bin" "dev" "out" "man" ]; + outputs = [ "bin" "lib" "dev" "out" "man" "dnsutils" "host" ]; patches = [ ./dont-keep-configure-flags.patch ./remove-mkdir-var.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-openssl-linking-fix.patch; - buildInputs = [ openssl libtool perl libxml2 ]; + buildInputs = [ openssl libtool perl libxml2 ] ++ + stdenv.lib.optional stdenv.isLinux libseccomp; configureFlags = [ "--localstatedir=/var" @@ -31,13 +33,23 @@ stdenv.mkDerivation rec { "--without-pkcs11" "--without-purify" "--without-python" + "--enable-seccomp" ]; postInstall = '' moveToOutput bin/bind9-config $dev moveToOutput bin/isc-config.sh $dev - for f in $out/lib/*.la; do + moveToOutput bin/host $host + ln -sf $host/bin/host $bin/bin + + moveToOutput bin/dig $dnsutils + moveToOutput bin/nslookup $dnsutils + moveToOutput bin/nsupdate $dnsutils + ln -sf $dnsutils/bin/{dig,nslookup,nsupdate} $bin/bin + ln -sf $host/bin/host $dnsutils/bin + + for f in "$out/lib/"*.la; do sed -i $f -e 's|-L${openssl.dev}|-L${openssl.out}|g' done ''; diff --git a/pkgs/servers/dns/coredns/default.nix b/pkgs/servers/dns/coredns/default.nix new file mode 100644 index 00000000000..1955cce2a9f --- /dev/null +++ b/pkgs/servers/dns/coredns/default.nix @@ -0,0 +1,27 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "coredns-${version}"; + version = "001"; + + goPackagePath = "github.com/miekg/coredns"; + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "miekg"; + repo = "coredns"; + rev = "v${version}"; + sha256 = "1ybi0v40bsndiffm41hak3b3w22l1in392zcy75bpf2mklxywnak"; + }; + + patches = [ ./pull-278.patch ]; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://coredns.io; + description = "A DNS server that runs middleware"; + license = licenses.asl20; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/servers/dns/coredns/deps.nix b/pkgs/servers/dns/coredns/deps.nix new file mode 100644 index 00000000000..2aa442a8fef --- /dev/null +++ b/pkgs/servers/dns/coredns/deps.nix @@ -0,0 +1,453 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "0a9baebe991e5ff35dd9f35578eb002cf07d229c"; + sha256 = "18palgdg1ldfmjqm4almlcymx9f0kf6vy9lfspl0iwkv3wsnvfb6"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/purell"; + rev = "8a290539e2e8629dbc4e6bad948158f790ec31f4"; + sha256 = "1qhsy1nm96b9kb63svkvkqmmw15xg6irwcysisxdgzk64adfwqv1"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + fetch = { + type = "git"; + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5bd2802263f21d8788851d5305584c82a5c75d7e"; + sha256 = "15y5r3asvm7196m3nza5xvdvlc2k11p6lfs6hi917hl7r9vgi6mp"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "60ec3488bfea7cca02b021d106d9911120d25fe9"; + sha256 = "19pli07y5592g4dyjyj0jq5rn548vc3fz0qg3624vm1j5828p1c2"; + }; + } + { + goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry-incubator/candiedyaml"; + rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf"; + sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "c016325647ff1837d8e9695bc79837ff7549d31f"; + sha256 = "0jm0kas8c2zhkaqibvzbx7bqfg67b9yb9cs0q8g9r0b9rxjr5prk"; + }; + } + { + goPackagePath = "github.com/coreos/go-oidc"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-oidc"; + rev = "fe7346e2e6855bda769d5b3db7d917f159c5613c"; + sha256 = "141h47s2z56pff8fi926m7wzswkr34kj7hzwib8w5s8zxgdp0wld"; + }; + } + { + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef"; + sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "6d212800a42e8ab5c146b8ace3490ee17e5225f9"; + sha256 = "01i0n1s4j7khb7n6mz2wymniz37q0vbzkgfv7rbi6p9hpg227q93"; + }; + } + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "431cfa3179d9b3766e39f6a74283db8bb5a13209"; + sha256 = "0hwqlqns0igaa3hg1dvz2grgy46q0v8wixyzfsmxsr5xb4ggpf32"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "c795848f1d7f574bbf767a8f17c7357e4003fed6"; + sha256 = "0abnk4055kcz57v3f5d15pd5dvvlkg7bwfy1f22rmsqwzs44ixmz"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + fetch = { + type = "git"; + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f856818214da2e1057f8ad84803971cff"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "f12c6236fe7b5cf6bcf30e5935d08cb079d78334"; + sha256 = "1h5s03y6b17qj12p8fpm5pdijnsbfvaq38z7b2hfjn5qp45h02xb"; + }; + } + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "aa0c862057666179de291b67d9f093d12b5a8473"; + sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonpointer"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonpointer"; + rev = "46af16f9f7b149af66e5d1bd010e3574dc06de98"; + sha256 = "0w0fphmdycjzbsm1vppdcjc9aqinkcdzcq3pxikdvdqh5p791gsc"; + }; + } + { + goPackagePath = "github.com/go-openapi/jsonreference"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/jsonreference"; + rev = "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"; + sha256 = "1fh4xcl9ijww4bdq656sx981d57w2c9zx5148jsxlsg4bsvxmwis"; + }; + } + { + goPackagePath = "github.com/go-openapi/spec"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/spec"; + rev = "2433d2f0fc794728337e0c5d65716e79e163f04d"; + sha256 = "14kdzfzjs06c2050fsg9vc0mn12b6i72gj45964mzxa5a6i09ph6"; + }; + } + { + goPackagePath = "github.com/go-openapi/swag"; + fetch = { + type = "git"; + url = "https://github.com/go-openapi/swag"; + rev = "0e04f5e499b19bf51031c01a00f098f25067d8dc"; + sha256 = "0kbqrfargkx3yb6gj0k5rpi728pcgjyvy1as9x79sh3sgvnrq15f"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "a31fa025390fe54d2af14a04199ed08dea5dc2fd"; + sha256 = "141059khzlkfjx5qsgzryqhl1mgilb13ha7syjm1297m54ch749c"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "1f49d83d9aa00e6ce4fc8258c71cc7786aec968a"; + sha256 = "0ny3nvjrsczihzmng2s0awvhq8k389l4lzl3vwgifi6ng34fszbj"; + }; + } + { + goPackagePath = "github.com/google/cadvisor"; + fetch = { + type = "git"; + url = "https://github.com/google/cadvisor"; + rev = "418c181ebad0d592828bd53c5704ed9af9a7c5a6"; + sha256 = "1k3r7a333a6x53fs0anvraf8n93dyanjfwp396sng1zxchb07dk3"; + }; + } + { + goPackagePath = "github.com/google/gofuzz"; + fetch = { + type = "git"; + url = "https://github.com/google/gofuzz"; + rev = "fd52762d25a41827db7ef64c43756fd4b9f7e382"; + sha256 = "1yxmmr73h0lq7ryf3q9a7pcm2x5xrg4d5bxkq8n5pxwxwyq26kw8"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "315de0c1920b18b942603ffdc2229e2af4803c17"; + sha256 = "1z0kinqp8hbl7hw856jhx41ys97rc6hflcgwrkfyxj5fdx60xis6"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "26c6e1184fd5255fa5f5289d0b789a4819c203a4"; + sha256 = "00fd4pa2dq8fala5sc6ics2721hnkh69p7d35w5lb2zf1i41l6dq"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "50d4dbd4eb0e84778abe37cefef140271d96fade"; + sha256 = "06z52vri1ymb0s8nk2qr4xmw068s4abh6b66qj4w92whjxmxsvnh"; + }; + } + { + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "bcac9884e7502bb2b474c0339d889cb981a2f27f"; + sha256 = "1a732411y26arr0pq9j5rfkyql7rqxbkanjs4m59hil8cx8mb068"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "77ed1c8a01217656d2080ad51981f6e99adaa177"; + sha256 = "1r7xdl3bpdzny4d05fpm229864ipghqwv5lplv5im5b4vhv9ryp7"; + }; + } + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "e978125a7e335d8f4db746a9ac5b44643f27416b"; + sha256 = "1if7bzxs9ibq1a1d8z96djixqrxnwc2wplcbc67ddk071anrbs8w"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/mholt/caddy"; + fetch = { + type = "git"; + url = "https://github.com/mholt/caddy"; + rev = "bbf954cbf2801bc32f4378fe5059eb16de3ae4d3"; + sha256 = "1i5p9xz3lhir5k070a580mi77n4vbjlbglzi92qbn0mxrdvd13lr"; + }; + } + { + goPackagePath = "github.com/miekg/coredns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/coredns.git"; + rev = "a8fb01bfd28e8b57f6d7b7d33f8282d807b2457d"; + sha256 = "1ybi0v40bsndiffm41hak3b3w22l1in392zcy75bpf2mklxywnak"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "db96a2b759cdef4f11a34506a42eb8d1290c598e"; + sha256 = "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6"; + }; + } + { + goPackagePath = "github.com/patrickmn/go-cache"; + fetch = { + type = "git"; + url = "https://github.com/patrickmn/go-cache"; + rev = "1881a9bccb818787f68c52bfba648c6cf34c34fa"; + sha256 = "1nd0kqijx6mrxb8wlh20bx73mwj0fqzla2sr68y6j6lz3fsy1fw2"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "b984ec7fa9ff9e428bd0cf0abf429384dfbe3e37"; + sha256 = "0y4nxc0kzlmqfqi3w3m7r9h508bx80vxbzj4qn0mksp40mfhjxyv"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "5636dc67ae776adf5590da7349e70fbb9559972d"; + sha256 = "0fb4w52zp0jk8218gwk4wgbhpj7d4hp6n00dvm8s0ajbysbx524d"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "9a94032291f2192936512bab367bc45e77990d6a"; + sha256 = "10ligvvdh6v5l7i1khirnhhfdhnlasxrqq39b3hxpnz9fq0fibg5"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; + sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "c7e63cf4530bcd3ba943729cee0efeff2ebea63f"; + sha256 = "197mlkgb01zk86fxfl8r8maymcxsspqblg7hmngjxf7ivdid1i1l"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "b7eff9abce531d6aeda923e759ae668e56601d21"; + sha256 = "0w84jwpiq0knspc9pp8dfvr5z6h7yl3qdq59ihvlfixl3kczw5k4"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "6ab629be5e31660579425a738ba8870beb5b7404"; + sha256 = "1pk98j3wcxkns9whgazhid3if0dnaf57hmq0h6byq75aj9xbncxj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "f4fe4abe3c785295ddf81c7f1823bcd3bad391b6"; + sha256 = "0l50x533pj0sj3gnr30zxgm51y4x5a5fwc515zj93iy1z0pyf9cn"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "3c3a985cb79f52a3190fbc056984415ca6763d01"; + sha256 = "0c7x8wkya56z03j2qfm61932npsddgqyggi75hkla9755d1inqlv"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9"; + sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "2df9074612f50810d82416d2229398a1e7188c5c"; + sha256 = "0ibg4pr9hxlvc5m4zn5hl4nsb6v5i0yfr9japsnjm010318df885"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "k8s.io/client-go"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/client-go"; + rev = "93fcd402979cfad8a7151f96e016416947c6a3cb"; + sha256 = "1v0kyav7i40wrahg9ng1vfq87xcp8r8hi4y7bspyfg35np6j8wdj"; + }; + } + { + goPackagePath = "k8s.io/kubernetes"; + fetch = { + type = "git"; + url = "https://github.com/kubernetes/kubernetes"; + rev = "313ef63993017597bd28f5efd23677820274cb58"; + sha256 = "1rl2mwhg20h5ay3crg5jqiwabfwgn8amp4dps6qmzyy3pcrjvsa8"; + }; + } +] diff --git a/pkgs/servers/dns/coredns/pull-278.patch b/pkgs/servers/dns/coredns/pull-278.patch new file mode 100644 index 00000000000..1323f898c78 --- /dev/null +++ b/pkgs/servers/dns/coredns/pull-278.patch @@ -0,0 +1,153 @@ +From 1158d4cb3a3cd43f1d0a72bd35c6dea9b1de345e Mon Sep 17 00:00:00 2001 +From: Manuel de Brito Fontes +Date: Wed, 21 Sep 2016 14:16:52 -0300 +Subject: [PATCH] Fix k8s build + +--- + contrib/kubernetes/testscripts/00_run_k8s.sh | 2 +- + contrib/kubernetes/testscripts/10_setup_kubectl.sh | 2 +- + middleware/kubernetes/controller.go | 38 ++++++++-------------- + middleware/kubernetes/kubernetes.go | 9 +++-- + 4 files changed, 20 insertions(+), 31 deletions(-) + +diff --git a/contrib/kubernetes/testscripts/00_run_k8s.sh b/contrib/kubernetes/testscripts/00_run_k8s.sh +index ef98a8e..7ff6811 100755 +--- a/contrib/kubernetes/testscripts/00_run_k8s.sh ++++ b/contrib/kubernetes/testscripts/00_run_k8s.sh +@@ -5,7 +5,7 @@ set -e + # Based on instructions at: http://kubernetes.io/docs/getting-started-guides/docker/ + + #K8S_VERSION=$(curl -sS https://storage.googleapis.com/kubernetes-release/release/latest.txt) +-K8S_VERSION="v1.2.4" ++K8S_VERSION="v1.3.7" + + ARCH="amd64" + +diff --git a/contrib/kubernetes/testscripts/10_setup_kubectl.sh b/contrib/kubernetes/testscripts/10_setup_kubectl.sh +index 1778671..a7cfc1e 100755 +--- a/contrib/kubernetes/testscripts/10_setup_kubectl.sh ++++ b/contrib/kubernetes/testscripts/10_setup_kubectl.sh +@@ -10,7 +10,7 @@ cd ${BASEDIR} + echo "Setting up kubectl..." + + if [ ! -e kubectl ]; then +- curl -O http://storage.googleapis.com/kubernetes-release/release/v1.2.4/bin/linux/amd64/kubectl ++ curl -O http://storage.googleapis.com/kubernetes-release/release/v1.3.7/bin/linux/amd64/kubectl + chmod u+x kubectl + fi + +diff --git a/middleware/kubernetes/controller.go b/middleware/kubernetes/controller.go +index 126d415..c7f9e9e 100644 +--- a/middleware/kubernetes/controller.go ++++ b/middleware/kubernetes/controller.go +@@ -55,12 +55,15 @@ func newdnsController(kubeClient *client.Client, resyncPeriod time.Duration, lse + }, + &api.Endpoints{}, resyncPeriod, cache.ResourceEventHandlerFuncs{}) + +- dns.svcLister.Store, dns.svcController = cache.NewInformer( ++ dns.svcLister.Indexer, dns.svcController = cache.NewIndexerInformer( + &cache.ListWatch{ + ListFunc: serviceListFunc(dns.client, namespace, dns.selector), + WatchFunc: serviceWatchFunc(dns.client, namespace, dns.selector), + }, +- &api.Service{}, resyncPeriod, cache.ResourceEventHandlerFuncs{}) ++ &api.Service{}, ++ resyncPeriod, ++ cache.ResourceEventHandlerFuncs{}, ++ cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) + + dns.nsLister.Store, dns.nsController = cache.NewInformer( + &cache.ListWatch{ +@@ -163,47 +166,34 @@ func (dns *dnsController) GetNamespaceList() *api.NamespaceList { + return &nsList + } + +-func (dns *dnsController) GetServiceList() *api.ServiceList { +- svcList, err := dns.svcLister.List() ++func (dns *dnsController) GetServiceList() []*api.Service { ++ svcs, err := dns.svcLister.List(labels.Everything()) + if err != nil { +- return &api.ServiceList{} ++ return []*api.Service{} + } +- +- return &svcList ++ return svcs + } + + // GetServicesByNamespace returns a map of + // namespacename :: [ kubernetesService ] + func (dns *dnsController) GetServicesByNamespace() map[string][]api.Service { + k8sServiceList := dns.GetServiceList() +- if k8sServiceList == nil { +- return nil +- } +- +- items := make(map[string][]api.Service, len(k8sServiceList.Items)) +- for _, i := range k8sServiceList.Items { ++ items := make(map[string][]api.Service, len(k8sServiceList)) ++ for _, i := range k8sServiceList { + namespace := i.Namespace +- items[namespace] = append(items[namespace], i) ++ items[namespace] = append(items[namespace], *i) + } +- + return items + } + + // GetServiceInNamespace returns the Service that matches + // servicename in the namespace + func (dns *dnsController) GetServiceInNamespace(namespace string, servicename string) *api.Service { +- svcKey := fmt.Sprintf("%v/%v", namespace, servicename) +- svcObj, svcExists, err := dns.svcLister.Store.GetByKey(svcKey) +- ++ svcObj, err := dns.svcLister.Services(namespace).Get(servicename) + if err != nil { + // TODO(...): should return err here + return nil + } + +- if !svcExists { +- // TODO(...): should return err here +- return nil +- } +- +- return svcObj.(*api.Service) ++ return svcObj + } +diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go +index 0bd1dc7..eddc58b 100644 +--- a/middleware/kubernetes/kubernetes.go ++++ b/middleware/kubernetes/kubernetes.go +@@ -183,14 +183,14 @@ func (k *Kubernetes) Get(namespace string, nsWildcard bool, servicename string, + + var resultItems []api.Service + +- for _, item := range serviceList.Items { ++ for _, item := range serviceList { + if symbolMatches(namespace, item.Namespace, nsWildcard) && symbolMatches(servicename, item.Name, serviceWildcard) { + // If namespace has a wildcard, filter results against Corefile namespace list. + // (Namespaces without a wildcard were filtered before the call to this function.) + if nsWildcard && (len(k.Namespaces) > 0) && (!util.StringInSlice(item.Namespace, k.Namespaces)) { + continue + } +- resultItems = append(resultItems, item) ++ resultItems = append(resultItems, *item) + } + } + +@@ -216,12 +216,11 @@ func isKubernetesNameError(err error) bool { + } + + func (k *Kubernetes) getServiceRecordForIP(ip, name string) []msg.Service { +- svcList, err := k.APIConn.svcLister.List() ++ svcList, err := k.APIConn.svcLister.List(labels.Everything()) + if err != nil { + return nil + } +- +- for _, service := range svcList.Items { ++ for _, service := range svcList { + if service.Spec.ClusterIP == ip { + return []msg.Service{msg.Service{Host: ip}} + } diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index 48dd535382d..368f95b3a18 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -13,11 +13,11 @@ }: stdenv.mkDerivation rec { - name = "nsd-4.1.9"; + name = "nsd-4.1.12"; src = fetchurl { url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz"; - sha256 = "1wn8jm5kpp81m88c77j97850mnmd87yaw8qp3xsdwcakcd6j44dq"; + sha256 = "fd1979dff1fba55310fd4f439dc9f3f4701d435c0ec4fb9af533e12c7f27d5de"; }; buildInputs = [ libevent openssl ]; diff --git a/pkgs/servers/dns/powerdns/default.nix b/pkgs/servers/dns/powerdns/default.nix new file mode 100644 index 00000000000..6eec9c3b305 --- /dev/null +++ b/pkgs/servers/dns/powerdns/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, pkgconfig, + boost, libyamlcpp, libsodium, sqlite, protobuf, + libmysql, postgresql, lua, openldap, geoip, curl +}: + +stdenv.mkDerivation rec { + name = "powerdns-${version}"; + version = "4.0.1"; + + src = fetchurl { + url = "http://downloads.powerdns.com/releases/pdns-${version}.tar.bz2"; + sha256 = "1mzdj5077cn6cip51sxknz5hx0cyqlsrix39b7l30i36lvafx4fi"; + }; + + buildInputs = [ boost libmysql postgresql lua openldap sqlite protobuf geoip libyamlcpp pkgconfig libsodium curl ]; + + # nix destroy with-modules arguments, when using configureFlags + preConfigure = '' + configureFlagsArray=( + "--with-modules=bind gmysql geoip gpgsql gsqlite3 ldap lua pipe random remote" + --with-sqlite3 + --with-socketdir=/var/lib/powerdns + --enable-libsodium + --enable-tools + --disable-dependency-tracking + --disable-silent-rules + --enable-reproducible + --enable-unit-tests + ) + ''; + checkPhase = "make check"; + + meta = with stdenv.lib; { + description = "Authoritative DNS server"; + homepage = http://www.powerdns.com/; + platforms = platforms.linux; + # cannot find postgresql libs on macos x + license = licenses.gpl2; + maintainers = [ maintainers.mic92 maintainers.nhooyr ]; + }; +} diff --git a/pkgs/servers/emby/default.nix b/pkgs/servers/emby/default.nix index 14c4873beb4..0a6bcdc72af 100644 --- a/pkgs/servers/emby/default.nix +++ b/pkgs/servers/emby/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, pkgs, ... }: +{ stdenv, fetchurl, pkgs, makeWrapper, mono, ffmpeg, ... }: stdenv.mkDerivation rec { name = "emby-${version}"; - version = "3.0.6400"; + version = "3.0.7300"; src = fetchurl { url = "https://github.com/MediaBrowser/Emby/archive/${version}.tar.gz"; - sha256 = "08zwqqilfs3y2kjqfan4ya0s9pns6g1pgh6wciabjzv2v2ra9kq3"; + sha256 = "0xm3jw8ll49akr4fxa5qjbsglcgb6fq6nc54zppannxdlfkqj5jk"; }; + buildInputs = with pkgs; [ + makeWrapper + ]; propagatedBuildInputs = with pkgs; [ mono sqlite @@ -23,6 +26,9 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r MediaBrowser.Server.Mono/bin/Release\ Mono/* $out/bin/ + + makeWrapper "${mono}/bin/mono" $out/bin/MediaBrowser.Server.Mono \ + --add-flags "$out/bin/MediaBrowser.Server.Mono.exe -ffmpeg ${ffmpeg}/bin/ffmpeg -ffprobe ${ffmpeg}/bin/ffprobe" ''; meta = { diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 3d301a6a35b..16189fb4723 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ libpcap ]; diff --git a/pkgs/servers/etcd/deps.json b/pkgs/servers/etcd/deps.json deleted file mode 100644 index 6ba22a78b7c..00000000000 --- a/pkgs/servers/etcd/deps.json +++ /dev/null @@ -1,335 +0,0 @@ -[ - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9", - "sha256": "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt", - "rev": "583e8937c61f1af6513608ccc75c97b6abdf4ff9", - "sha256": "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay" - } - }, - { - "goPackagePath": "github.com/cloudfoundry-incubator/candiedyaml", - "fetch": { - "type": "git", - "url": "https://github.com/cloudfoundry-incubator/candiedyaml", - "rev": "99c3df83b51532e3615f851d8c2dbb638f5313bf", - "sha256": "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs" - } - }, - { - "goPackagePath": "github.com/cockroachdb/cmux", - "fetch": { - "type": "git", - "url": "https://github.com/cockroachdb/cmux", - "rev": "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d", - "sha256": "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh" - } - }, - { - "goPackagePath": "github.com/coreos/etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/etcd.git", - "rev": "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0", - "sha256": "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75" - } - }, - { - "goPackagePath": "github.com/coreos/go-semver", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-semver", - "rev": "8ab6407b697782a06568d4b7f1db25550ec2e4c6", - "sha256": "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2", - "sha256": "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk" - } - }, - { - "goPackagePath": "github.com/coreos/pkg", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/pkg", - "rev": "3ac0863d7acf3bc44daf49afef8919af12f704ef", - "sha256": "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l" - } - }, - { - "goPackagePath": "github.com/ghodss/yaml", - "fetch": { - "type": "git", - "url": "https://github.com/ghodss/yaml", - "rev": "aa0c862057666179de291b67d9f093d12b5a8473", - "sha256": "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf", - "rev": "f20a1444730c7d9949b880a0309e737d007def25", - "sha256": "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "f592bd283e9ef86337a432eb50e592278c3d534d", - "sha256": "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb" - } - }, - { - "goPackagePath": "github.com/google/btree", - "fetch": { - "type": "git", - "url": "https://github.com/google/btree", - "rev": "7d79101e329e5a3adf994758c578dab82b90c017", - "sha256": "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0" - } - }, - { - "goPackagePath": "github.com/grpc-ecosystem/grpc-gateway", - "fetch": { - "type": "git", - "url": "https://github.com/grpc-ecosystem/grpc-gateway", - "rev": "5e0e028ba0a015710eaebf6e47af18812c9f2767", - "sha256": "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk" - } - }, - { - "goPackagePath": "github.com/jonboulle/clockwork", - "fetch": { - "type": "git", - "url": "https://github.com/jonboulle/clockwork", - "rev": "e3653ace2d63753697e0e5b07b9393971c0bba9d", - "sha256": "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "c12348ce28de40eed0136aa2b644d0ee0650e56c", - "sha256": "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "c5b7fccd204277076155f10851dad72b76a49317", - "sha256": "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common", - "rev": "ebdfc6da46522d58825777cf1f90490a5b1ef1d8", - "sha256": "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5", - "sha256": "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws" - } - }, - { - "goPackagePath": "github.com/spf13/cobra", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cobra", - "rev": "7c674d9e72017ed25f6d2b5e497a1368086b6a6f", - "sha256": "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr" - } - }, - { - "goPackagePath": "github.com/spf13/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/pflag", - "rev": "6454a84b6da0ea8b628d5d8a26759f62c6c161b4", - "sha256": "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2", - "sha256": "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx" - } - }, - { - "goPackagePath": "github.com/xiang90/probing", - "fetch": { - "type": "git", - "url": "https://github.com/xiang90/probing", - "rev": "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2", - "sha256": "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "88d0005bf4c3ec17306ecaca4281a8d8efd73e91", - "sha256": "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "7394c112eae4dba7e96bfcfe738e6373d61772b4", - "sha256": "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7" - } - }, - { - "goPackagePath": "google.golang.org/grpc", - "fetch": { - "type": "git", - "url": "https://github.com/grpc/grpc-go", - "rev": "0032a855ba5c8a3c8e0d71c2deef354b70af1584", - "sha256": "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67" - } - }, - { - "goPackagePath": "github.com/urfave/cli", - "fetch": { - "type": "git", - "url": "https://github.com/urfave/cli", - "rev": "168c95418e66e019fe17b8f4f5c45aa62ff80e23", - "sha256": "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "daf2955e742cf123959884fdff4685aa79b63135", - "sha256": "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203" - } - }, - { - "goPackagePath": "github.com/dustin/go-humanize", - "fetch": { - "type": "git", - "url": "https://github.com/dustin/go-humanize", - "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", - "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" - } - }, - { - "goPackagePath": "github.com/bgentry/speakeasy", - "fetch": { - "type": "git", - "url": "https://github.com/bgentry/speakeasy", - "rev": "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da", - "sha256": "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01" - } - }, - { - "goPackagePath": "github.com/kr/pty", - "fetch": { - "type": "git", - "url": "https://github.com/kr/pty", - "rev": "ce7fa45920dc37a92de8377972e52bc55ffa8d57", - "sha256": "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk" - } - }, - { - "goPackagePath": "github.com/golang/groupcache", - "fetch": { - "type": "git", - "url": "https://github.com/golang/groupcache", - "rev": "a6b377e3400b08991b80d6805d627f347f983866", - "sha256": "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2" - } - }, - { - "goPackagePath": "gopkg.in/cheggaaa/pb.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/cheggaaa/pb.v1", - "rev": "9453b2db37f4d8bc63751daca63bbe7049eb5e74", - "sha256": "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "23def4e6c14b4da8ac2ed8007337bc5eb5007998", - "sha256": "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30" - } - }, - { - "goPackagePath": "github.com/spacejam/loghisto", - "fetch": { - "type": "git", - "url": "https://github.com/spacejam/loghisto", - "rev": "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7", - "sha256": "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1" - } - }, - { - "goPackagePath": "github.com/akrennmair/gopcap", - "fetch": { - "type": "git", - "url": "https://github.com/akrennmair/gopcap", - "rev": "00e11033259acb75598ba416495bb708d864a010", - "sha256": "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix new file mode 100644 index 00000000000..2c07817a980 --- /dev/null +++ b/pkgs/servers/etcd/deps.nix @@ -0,0 +1,335 @@ +[ +{ + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"; + sha256 = "1hrybsql68xw57brzj805xx2mghydpdiysv3gbhr7f5wlxj2514y"; + }; +} +{ + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "583e8937c61f1af6513608ccc75c97b6abdf4ff9"; + sha256 = "0cp5v9iypg9ysiq40k3h3lg7aisxplnmxshha7nama6b170izyay"; + }; +} +{ + goPackagePath = "github.com/cloudfoundry-incubator/candiedyaml"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry-incubator/candiedyaml"; + rev = "99c3df83b51532e3615f851d8c2dbb638f5313bf"; + sha256 = "106nibg7423642gbkg88c5x2jxfz6nmxbribhwb8cr1rn9vpjaxs"; + }; +} +{ + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d"; + sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh"; + }; +} +{ + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd.git"; + rev = "9efa00d1030d4bf62eb8e5ec130023aeb1b8e2d0"; + sha256 = "163qji360y21nr1wnl16nbvvgdgqgbny4c3v3igp87q9p78sdf75"; + }; +} +{ + goPackagePath = "github.com/coreos/go-semver"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-semver"; + rev = "8ab6407b697782a06568d4b7f1db25550ec2e4c6"; + sha256 = "1gghi5bnqj50hfxhqc1cxmynqmh2yk9ii7ab9gsm75y5cp94ymk0"; + }; +} +{ + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "5c49e4850c879a0ddc061e8f4adcf307de8a8bc2"; + sha256 = "1w16bnrgfjb5rwha7g8rdjhpgjf8bzmlzhrda5bfvc9ymj3qjibk"; + }; +} +{ + goPackagePath = "github.com/coreos/pkg"; + fetch = { + type = "git"; + url = "https://github.com/coreos/pkg"; + rev = "3ac0863d7acf3bc44daf49afef8919af12f704ef"; + sha256 = "0l5ans1ls2gknkrnhymgc0zbgg5nqjbjbqc51r611adcr0m6gg8l"; + }; +} +{ + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "aa0c862057666179de291b67d9f093d12b5a8473"; + sha256 = "0cbc78n8l7h1gdzhrvahplcvr4v7n8v23vkgskfp843rcx5h6isr"; + }; +} +{ + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "f20a1444730c7d9949b880a0309e737d007def25"; + sha256 = "12wa3r2cb2v1m65phbkh692ldlklk459z4x6avpc6im0zkr6r73c"; + }; +} +{ + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "f592bd283e9ef86337a432eb50e592278c3d534d"; + sha256 = "01gxhzn9m6jz6ihwxfycnx39zf5pmkan61l278cnynsb8mibdpvb"; + }; +} +{ + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "7d79101e329e5a3adf994758c578dab82b90c017"; + sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; + }; +} +{ + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "5e0e028ba0a015710eaebf6e47af18812c9f2767"; + sha256 = "00s4wxzs6lz5al7y2hxi6r4bxhx5b0ajk5rwxrnb4a4mhlaii8pk"; + }; +} +{ + goPackagePath = "github.com/jonboulle/clockwork"; + fetch = { + type = "git"; + url = "https://github.com/jonboulle/clockwork"; + rev = "e3653ace2d63753697e0e5b07b9393971c0bba9d"; + sha256 = "1avzqhks12a8x2yzpvjsf3k0gv9cy7zx2z88hn0scacnxkphisvc"; + }; +} +{ + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; +} +{ + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "c5b7fccd204277076155f10851dad72b76a49317"; + sha256 = "1xqny3147g12n4j03kxm8s9mvdbs3ln6i56c655mybrn9jjy48kd"; + }; +} +{ + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; +} +{ + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"; + sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq"; + }; +} +{ + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "abf152e5f3e97f2fafac028d2cc06c1feb87ffa5"; + sha256 = "0cp8lznv1b4zhi3wnbjkfxwzhkqd3wbmiy6mwgjanip8l9l3ykws"; + }; +} +{ + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f"; + sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr"; + }; +} +{ + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "6454a84b6da0ea8b628d5d8a26759f62c6c161b4"; + sha256 = "06rfi73jhkncn8gxy6klgmba5947k9gpwdswipdpz680yxczcwna"; + }; +} +{ + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "4a1cb5252a6951f715a85d0e4be334c2a2dbf2a2"; + sha256 = "0izpijk3piihl4fnqg8ncnp5ivbq41pg3xf7iagg4fbg5id4pxbx"; + }; +} +{ + goPackagePath = "github.com/xiang90/probing"; + fetch = { + type = "git"; + url = "https://github.com/xiang90/probing"; + rev = "07dd2e8dfe18522e9c447ba95f2fe95262f63bb2"; + sha256 = "0r8rq27yigz72mk8z7p61yjfan8id021dnp1v421ln9byzpvabn2"; + }; +} +{ + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "88d0005bf4c3ec17306ecaca4281a8d8efd73e91"; + sha256 = "1d3x0rwfd4cml06ka8gy74wxrw94m2z7qgz6ky0rgmxcr7p5iikz"; + }; +} +{ + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "7394c112eae4dba7e96bfcfe738e6373d61772b4"; + sha256 = "1p8wsxnbsp2lq6hbza2n0zgv4sgpxzzjjlrmcngkhxj47kp3hin7"; + }; +} +{ + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "0032a855ba5c8a3c8e0d71c2deef354b70af1584"; + sha256 = "0qkynp65jwk6jk932k7kwxs5v6fzlfsb1fay71a00dwr36f44s67"; + }; +} +{ + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "168c95418e66e019fe17b8f4f5c45aa62ff80e23"; + sha256 = "1gdvvim2f1zigcmbpcgypgn7nvpnlr87grbg7lw13fbpy6fnlw2n"; + }; +} +{ + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; +} +{ + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "daf2955e742cf123959884fdff4685aa79b63135"; + sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203"; + }; +} +{ + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; + sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + }; +} +{ + goPackagePath = "github.com/bgentry/speakeasy"; + fetch = { + type = "git"; + url = "https://github.com/bgentry/speakeasy"; + rev = "a1ccbf2c40dfc8ce514b5c5c6e6d1429ea6880da"; + sha256 = "0xqpc1qhdcs5blp1mkrppfb1x0rcv4a445mj0yzdwshbzkw5di01"; + }; +} +{ + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "ce7fa45920dc37a92de8377972e52bc55ffa8d57"; + sha256 = "0mdlr2mmwjznw2id0l4200xjajq9dh1kxn3z7d3ksn0b5fwinzmk"; + }; +} +{ + goPackagePath = "github.com/golang/groupcache"; + fetch = { + type = "git"; + url = "https://github.com/golang/groupcache"; + rev = "a6b377e3400b08991b80d6805d627f347f983866"; + sha256 = "125a6zdaxj916yp2rlrkg8xw00vjf5ga9xwdg4clby8wj4fysma2"; + }; +} +{ + goPackagePath = "gopkg.in/cheggaaa/pb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/cheggaaa/pb.v1"; + rev = "9453b2db37f4d8bc63751daca63bbe7049eb5e74"; + sha256 = "0py7dxvm3ydxcw260x7r7xbjww1vkil3rhyy3f9njmjydyb303rb"; + }; +} +{ + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b4da8ac2ed8007337bc5eb5007998"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; +} +{ + goPackagePath = "github.com/spacejam/loghisto"; + fetch = { + type = "git"; + url = "https://github.com/spacejam/loghisto"; + rev = "9d1d8c1fd2a4ac852bf2e312f2379f553345fda7"; + sha256 = "0r31y4ci35pp11wqdyarimdq5a703byk3cf6d67adsa4nw0ysfm1"; + }; +} +{ + goPackagePath = "github.com/akrennmair/gopcap"; + fetch = { + type = "git"; + url = "https://github.com/akrennmair/gopcap"; + rev = "00e11033259acb75598ba416495bb708d864a010"; + sha256 = "0xfw7x5a36w0g76imjvgk055360xg0nva42qhmflfvll7ldxq96a"; + }; +} +] diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 3e258ee6d3f..18d8bf5cd19 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, libedit, ncurses, automake, autoconf, libtool -, +, # icu = null: use icu which comes with firebird # icu = pkgs.icu => you may have trouble sharing database files with windows @@ -38,7 +38,7 @@ */ stdenv.mkDerivation rec { - version = "2.5.2.26540-0"; + version = "2.5.6.27020-0"; name = "firebird-${version}"; # enableParallelBuilding = false; build fails diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 50d3f0d53ad..cbafe16623e 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -15,6 +15,7 @@ , withRedis ? false , libmysql , withMysql ? false +, json_c , withJson ? false , libyubikey , withYubikey ? false @@ -42,16 +43,16 @@ stdenv.mkDerivation rec { version = "3.0.11"; buildInputs = [ autoreconfHook openssl talloc finger_bsd perl ] - ++ optional withLdap [ openldap ] - ++ optional withSqlite [ sqlite ] - ++ optional withPcap [ libpcap ] - ++ optional withCap [ libcap ] - ++ optional withMemcached [ libmemcached ] - ++ optional withRedis [ hiredis ] - ++ optional withMysql [ libmysql ] - ++ optional withJson [ pkgs."json-c" ] - ++ optional withYubikey [ libyubikey ] - ++ optional withCollectd [ collectd ]; + ++ optional withLdap openldap + ++ optional withSqlite sqlite + ++ optional withPcap libpcap + ++ optional withCap libcap + ++ optional withMemcached libmemcached + ++ optional withRedis hiredis + ++ optional withMysql libmysql + ++ optional withJson json_c + ++ optional withYubikey libyubikey + ++ optional withCollectd collectd; # NOTE: are the --with-{lib}-lib-dir and --with-{lib}-include-dir necessary with buildInputs ? diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index b8718898f4b..28ca858440b 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "Share your terminal as a web application"; diff --git a/pkgs/servers/gotty/deps.json b/pkgs/servers/gotty/deps.json deleted file mode 100644 index 81983165dcd..00000000000 --- a/pkgs/servers/gotty/deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/kr/pty", - "fetch": { - "type": "git", - "url": "https://github.com/kr/pty", - "rev": "67e2db24c831afa6c64fc17b4a143390674365ef", - "sha256": "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d" - } - }, - { - "goPackagePath": "github.com/braintree/manners", - "fetch": { - "type": "git", - "url": "https://github.com/braintree/manners", - "rev": "cab36f97339b1925cd89e158632728025557e550", - "sha256": "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "71f57d300dd6a780ac1856c005c4b518cfd498ec", - "sha256": "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3" - } - }, - { - "goPackagePath": "github.com/elazarl/go-bindata-assetfs", - "fetch": { - "type": "git", - "url": "https://github.com/elazarl/go-bindata-assetfs", - "rev": "d5cac425555ca5cf00694df246e04f05e6a55150", - "sha256": "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17" - } - }, - { - "goPackagePath": "github.com/fatih/structs", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/structs", - "rev": "a9f7daa9c2729e97450c2da2feda19130a367d8f", - "sha256": "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50" - } - }, - { - "goPackagePath": "github.com/hashicorp/hcl", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/hcl", - "rev": "54864211433d45cb780682431585b3e573b49e4a", - "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-multierror", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-multierror", - "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5", - "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r" - } - } -] diff --git a/pkgs/servers/gotty/deps.nix b/pkgs/servers/gotty/deps.nix new file mode 100644 index 00000000000..4f59dc414c4 --- /dev/null +++ b/pkgs/servers/gotty/deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + goPackagePath = "github.com/braintree/manners"; + fetch = { + type = "git"; + url = "https://github.com/braintree/manners"; + rev = "cab36f97339b1925cd89e158632728025557e550"; + sha256 = "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "71f57d300dd6a780ac1856c005c4b518cfd498ec"; + sha256 = "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "d5cac425555ca5cf00694df246e04f05e6a55150"; + sha256 = "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + fetch = { + type = "git"; + url = "https://github.com/fatih/structs"; + rev = "a9f7daa9c2729e97450c2da2feda19130a367d8f"; + sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/hcl"; + rev = "54864211433d45cb780682431585b3e573b49e4a"; + sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-multierror"; + rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; + sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + }; + } +] diff --git a/pkgs/servers/gpsd/default.nix b/pkgs/servers/gpsd/default.nix index 596176d939d..b8d2498b71e 100644 --- a/pkgs/servers/gpsd/default.nix +++ b/pkgs/servers/gpsd/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ]; pythonPath = [ - pythonPackages.pygobject + pythonPackages.pygobject2 pythonPackages.pygtk ]; diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 8f75461070f..549c401fec7 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null; assert enableMysql -> mysql != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.40"; + name = "lighttpd-1.4.41"; src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "13agkmxii11kyary7pmv8kw4w1rp15swx800d98nqkb0yzy0sic0"; + sha256 = "0v3b6hp8hfwg7kmmxs64hdn9iqkql5qjv2389wl7pp6nyqz3ik2b"; }; buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index 3991e2b99d5..c0aed4655b3 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix (args // { - version = "1.11.3"; - sha256 = "042689m88bjhf7gsly4kl4gjyqdabcnizshxvdlp14gkz507yrja"; + version = "1.11.4"; + sha256 = "0fvb09ycxz3xnyynav6ybj6miwh9kv8jcb2vzrmvqhzn8cgiq8h6"; }) diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix index 35ac3623e31..00aaff899dc 100644 --- a/pkgs/servers/http/tomcat/default.nix +++ b/pkgs/servers/http/tomcat/default.nix @@ -5,12 +5,12 @@ let common = { versionMajor, versionMinor, sha256 } @ args: stdenv.mkDerivation (rec { name = "apache-tomcat-${version}"; version = "${versionMajor}.${versionMinor}"; - + src = fetchurl { url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz"; inherit sha256; }; - + outputs = [ "out" "webapps" ]; installPhase = '' @@ -19,7 +19,7 @@ let mkdir -p $webapps/webapps mv $out/webapps $webapps/ ''; - + meta = { homepage = https://tomcat.apache.org/; description = "An implementation of the Java Servlet and JavaServer Pages technologies"; @@ -39,8 +39,8 @@ in { tomcat7 = common { versionMajor = "7"; - versionMinor = "0.70"; - sha256 = "0x4chqb7kkmadmhf2hlank856hw2vpgjl14fak74ybimlcb3dwqk"; + versionMinor = "0.72"; + sha256 = "1nx5pmz3bq3n20fdspqh8ljqy1nj67rwi1vsqjpkrvd996x7p73p"; }; tomcat8 = common { @@ -54,11 +54,11 @@ in { versionMinor = "5.5"; sha256 = "0idfxjrw5q45f531gyjnv6xjkbj9nhy2v1w4z7558z96230a0fqj"; }; - + tomcatUnstable = common { versionMajor = "9"; versionMinor = "0.0.M10"; sha256 = "0p3pqwz9zjvr9w73divsyaa53mbazf0icxfs06wvgxsvkbgj5gq9"; }; - + } diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 5842495e323..82ed92084df 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; nativeBuildInputs = [ sudo ]; buildFlags = [ "-tags textsecure" ]; diff --git a/pkgs/servers/interlock/deps.json b/pkgs/servers/interlock/deps.json deleted file mode 100644 index 10bb3106c5c..00000000000 --- a/pkgs/servers/interlock/deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/agl/ed25519", - "fetch": { - "type": "git", - "url": "https://github.com/agl/ed25519", - "rev": "278e1ec8e8a6e017cd07577924d6766039146ced", - "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/janimo/textsecure", - "fetch": { - "type": "git", - "url": "https://github.com/janimo/textsecure", - "rev": "c38f429e48d6b2776d17b4171f216f132185b0f6", - "sha256": "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - } -] diff --git a/pkgs/servers/interlock/deps.nix b/pkgs/servers/interlock/deps.nix new file mode 100644 index 00000000000..be5c0529573 --- /dev/null +++ b/pkgs/servers/interlock/deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + fetch = { + type = "git"; + url = "https://github.com/agl/ed25519"; + rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; + sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/janimo/textsecure"; + fetch = { + type = "git"; + url = "https://github.com/janimo/textsecure"; + rev = "c38f429e48d6b2776d17b4171f216f132185b0f6"; + sha256 = "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix index 51630b4231c..2e2923e17c3 100644 --- a/pkgs/servers/kippo/default.nix +++ b/pkgs/servers/kippo/default.nix @@ -25,16 +25,48 @@ # # Use this package at your own risk. -{stdenv, pkgs, config, fetchurl, ... }: +{stdenv, fetchurl, pythonPackages }: -stdenv.mkDerivation rec { +let + + twisted_13 = pythonPackages.buildPythonPackage rec { + # NOTE: When updating please check if new versions still cause issues + # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) + disabled = pythonPackages.isPy3k; + + name = "Twisted-13.2.0"; + src = fetchurl { + url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; + sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; + }; + + propagatedBuildInputs = with pythonPackages; [ zope_interface ]; + + # Generate Twisted's plug-in cache. Twited users must do it as well. See + # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 + # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for + # details. + postInstall = "$out/bin/twistd --help > /dev/null"; + + meta = with stdenv.lib; { + homepage = http://twistedmatrix.com/; + description = "Twisted, an event-driven networking engine written in Python"; + longDescription = '' + Twisted is an event-driven networking engine written in Python + and licensed under the MIT license. + ''; + license = licenses.mit; + }; + }; + +in stdenv.mkDerivation rec { name = "kippo-${version}"; version = "0.8"; src = fetchurl { url = "https://kippo.googlecode.com/files/kippo-${version}.tar.gz"; sha1 = "f57a5cf88171cb005afe44a4b33cb16f825c33d6"; }; - buildInputs = with pkgs.pythonPackages; [ pycrypto pyasn1 twisted_11 ]; + buildInputs = with pythonPackages; [ pycrypto pyasn1 twisted_13 ]; installPhase = '' substituteInPlace ./kippo.tac --replace "kippo.cfg" "$out/src/kippo.cfg" substituteInPlace ./kippo.cfg --replace "log_path = log" "log_path = /var/log/kippo" \ @@ -51,6 +83,8 @@ stdenv.mkDerivation rec { mv $out/src/utils/* $out/bin ''; + passthru.twisted = twisted_13; + meta = with stdenv.lib; { homepage = https://code.google.com/p/kippo; description = "SSH Honeypot"; diff --git a/pkgs/servers/ldap/389/default.nix b/pkgs/servers/ldap/389/default.nix index c5f7a45cefe..8d719bec4f5 100644 --- a/pkgs/servers/ldap/389/default.nix +++ b/pkgs/servers/ldap/389/default.nix @@ -2,14 +2,14 @@ , svrcore, icu, net_snmp, kerberos, pcre, perlPackages }: let - version = "1.3.3.9"; + version = "1.3.5.4"; in stdenv.mkDerivation rec { name = "389-ds-base-${version}"; src = fetchurl { url = "http://directory.fedoraproject.org/binaries/${name}.tar.bz2"; - sha256 = "1qqwv5j60f38hz4xpbzn4pixhkj07yjzbp7kz7cvfkgvdwy9jqxx"; + sha256 = "1f1r4wky8x39jdabnd277f6m0snnzh9f0wvsr8x4rnvkckjphbx8"; }; buildInputs = [ diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index d55425779e6..2be20323f25 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -62,6 +62,7 @@ stdenv.mkDerivation rec { "--with-lucene" "--with-icu" ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ++ lib.optional (stdenv.isDarwin) "--enable-static" ++ lib.optional withMySQL "--with-mysql" ++ lib.optional withPgSQL "--with-pgsql" ++ lib.optional withSQLite "--with-sqlite"; @@ -70,6 +71,6 @@ stdenv.mkDerivation rec { homepage = "http://dovecot.org/"; description = "Open source IMAP and POP3 email server written with security primarily in mind"; maintainers = with stdenv.lib.maintainers; [viric peti rickynils]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/servers/mail/mailman/default.nix b/pkgs/servers/mail/mailman/default.nix index 933b0fabc4b..b18ab016c44 100644 --- a/pkgs/servers/mail/mailman/default.nix +++ b/pkgs/servers/mail/mailman/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, pythonPackages }: stdenv.mkDerivation rec { - name = "mailman-2.1.18"; + name = "mailman-2.1.23"; src = fetchurl { url = "mirror://gnu/mailman/${name}.tgz"; - sha256 = "0jc360crakvpz71msl0h11zv3849fqzlj9jfh1g7x3j4459n07fw"; + sha256 = "0s9ywix4m3n7qa0baws744ildg48hsa87jahpsfiqqilhmpwl8mh"; }; buildInputs = [ python pythonPackages.dns ]; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 46fc9bc00f2..b5ea7acb9d2 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.9.2p1"; + version = "6.0.0p1"; nativeBuildInputs = [ autoconf automake libtool bison ]; buildInputs = [ libasr libevent zlib openssl db pam ]; src = fetchurl { - url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "07d7f1m5sxyz6mkk228rcm7fsf7350994ayvmhgph333q5rz48im"; + url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "07gq21bx62w367512d0bbp9hm3pfgqh3kksg2by7n574kxc7jzm9"; }; patches = [ ./proc_path.diff ]; diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix index f73a22e130a..978ccec503d 100644 --- a/pkgs/servers/mail/postfix/pflogsumm.nix +++ b/pkgs/servers/mail/postfix/pflogsumm.nix @@ -28,6 +28,7 @@ buildPerlPackage rec { meta = { homepage = "http://jimsun.linxnet.com/postfix_contrib.html"; + maintainers = with stdenv.lib.maintainers; [ schneefux ]; description = "Postfix activity overview"; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/servers/mail/postgrey/default.nix b/pkgs/servers/mail/postgrey/default.nix new file mode 100644 index 00000000000..7fdf0edb096 --- /dev/null +++ b/pkgs/servers/mail/postgrey/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, perl, perlPackages, lib, runCommand, postfix }: + +let + mk-perl-flags = inputs: lib.concatStringsSep " " (map (dep: "-I ${dep}/lib/perl5/site_perl") inputs); + postgrey-flags = mk-perl-flags (with perlPackages; [ + NetServer BerkeleyDB DigestSHA1 NetAddrIP IOMultiplex + ]); + policy-test-flags = mk-perl-flags (with perlPackages; [ + ParseSyslog + ]); + version = "1.36"; + name = "postgrey-${version}"; +in runCommand name { + src = fetchurl { + url = "http://postgrey.schweikert.ch/pub/${name}.tar.gz"; + sha256 = "09jzb246ki988389r9gryigriv9sravk40q75fih5n0q4p2ghax2"; + }; + meta = with stdenv.lib; { + description = "A postfix policy server to provide greylisting"; + homepage = "https://postgrey.schweikert.ch/"; + platforms = postfix.meta.platforms; + licenses = licenses.gpl2; + }; +} '' + mkdir -p $out/bin + cd $out + tar -xzf $src --strip-components=1 + mv postgrey policy-test bin + sed -i -e "s,#!/usr/bin/perl -T,#!${perl}/bin/perl -T ${postgrey-flags}," \ + -e "s#/etc/postfix#$out#" \ + bin/postgrey + sed -i -e "s,#!/usr/bin/perl,#!${perl}/bin/perl ${policy-test-flags}," \ + bin/policy-test +'' diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 57abffa601f..0367b0b8350 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,6 +1,6 @@ -{ lib, pkgs, stdenv, buildPythonApplication, pythonPackages, fetchurl, fetchFromGitHub }: +{ lib, pkgs, stdenv, pythonPackages, fetchurl, fetchFromGitHub }: let - matrix-angular-sdk = buildPythonApplication rec { + matrix-angular-sdk = pythonPackages.buildPythonApplication rec { name = "matrix-angular-sdk-${version}"; version = "0.6.8"; @@ -9,16 +9,15 @@ let sha256 = "0gmx4y5kqqphnq3m7xk2vpzb0w2a4palicw7wfdr1q2schl9fhz2"; }; }; -in -buildPythonApplication rec { +in pythonPackages.buildPythonApplication rec { name = "matrix-synapse-${version}"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "synapse"; rev = "v${version}"; - sha256 = "04wl6lznffxhvfq52cmbg2amkl03454wyaqc17i0zlc6b0p14dli"; + sha256 = "1wvamw5crncz5ic6waq7v1bw54zg93af1lmw4y45w3r0vzyfxp68"; }; patches = [ ./matrix-synapse.patch ]; @@ -28,7 +27,7 @@ buildPythonApplication rec { pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2 service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml matrix-angular-sdk bleach netaddr jinja2 psycopg2 python.modules.curses - ldap3 psutil + ldap3 psutil msgpack ]; # Checks fail because of Tox. diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 86944c036e4..53c87745e67 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -17,5 +17,5 @@ buildGoPackage rec { sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/mesos-dns/deps.json b/pkgs/servers/mesos-dns/deps.json deleted file mode 100644 index 4df002888c4..00000000000 --- a/pkgs/servers/mesos-dns/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf", - "rev": "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4", - "sha256": "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f", - "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8" - } - }, - { - "goPackagePath": "github.com/mesos/mesos-go", - "fetch": { - "type": "git", - "url": "https://github.com/mesos/mesos-go", - "rev": "aaa5b2fecf0e2db463f4f996c89617d6766b2969", - "sha256": "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk" - } - }, - { - "goPackagePath": "github.com/pmezard/go-difflib", - "fetch": { - "type": "git", - "url": "https://github.com/pmezard/go-difflib", - "rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d", - "sha256": "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper", - "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4", - "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z" - } - }, - { - "goPackagePath": "github.com/stretchr/objx", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/objx", - "rev": "cbeaeb16a013161a98496fad62933b1d21786672", - "sha256": "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew", - "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d", - "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk" - } - }, - { - "goPackagePath": "github.com/emicklei/go-restful", - "fetch": { - "type": "git", - "url": "https://github.com/emicklei/go-restful", - "rev": "892402ba11a2e2fd5e1295dd633481f27365f14d", - "sha256": "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x" - } - }, - { - "goPackagePath": "github.com/stretchr/testify", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/testify", - "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff", - "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p" - } - } -] diff --git a/pkgs/servers/mesos-dns/deps.nix b/pkgs/servers/mesos-dns/deps.nix new file mode 100644 index 00000000000..00f0f245f6b --- /dev/null +++ b/pkgs/servers/mesos-dns/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4"; + sha256 = "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; + }; + } + { + goPackagePath = "github.com/mesos/mesos-go"; + fetch = { + type = "git"; + url = "https://github.com/mesos/mesos-go"; + rev = "aaa5b2fecf0e2db463f4f996c89617d6766b2969"; + sha256 = "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + fetch = { + type = "git"; + url = "https://github.com/emicklei/go-restful"; + rev = "892402ba11a2e2fd5e1295dd633481f27365f14d"; + sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "089c7181b8c728499929ff09b62d3fdd8df8adff"; + sha256 = "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"; + }; + } +] diff --git a/pkgs/servers/monitoring/cadvisor/default.nix b/pkgs/servers/monitoring/cadvisor/default.nix index c0126fda572..881a14b1117 100644 --- a/pkgs/servers/monitoring/cadvisor/default.nix +++ b/pkgs/servers/monitoring/cadvisor/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "cadvisor-${version}"; - version = "0.10.1"; + version = "0.23.8"; src = fetchFromGitHub { owner = "google"; repo = "cadvisor"; - rev = "${version}"; - sha256 = "0k0qfhw755k3ripsfkhml0ixaglhy64hdzxrjvlmbgc50s3j37vh"; + rev = "v${version}"; + sha256 = "0wan6a4rpyh5fflq88saznyf2kiic9nmj8sil1s49nh3c3y4yxcj"; }; buildInputs = [ go ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 884785699a6..de9f75b87cc 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,8 +1,8 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "3.1.0"; - ts = "1468321182"; + version = "3.1.1"; + ts = "1470047149"; name = "grafana-v${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -10,12 +10,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1p3qp3p4wsb7m2lvdcrc1wz5mxqwqsj5xfqp28hkbfdqh3lblh42"; + sha256 = "066qypjl9i0yl9jgqxh2fk6m4scrf84sfdl7b1jxgyq3c7zdzyvk"; }; srcStatic = fetchurl { url = "https://grafanarel.s3.amazonaws.com/builds/grafana-${version}-${ts}.linux-x64.tar.gz"; - sha256 = "174w0bx5cqriy77dyk9xsnmdskykzmgbyjczwb5kkp6j8vp7b0fs"; + sha256 = "0zywijk9lg7pzql28r8vswyjixkljfjznbqy7lp5wlq1mmihmxr0"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix index 71095ce3583..d4f22ab81ee 100644 --- a/pkgs/servers/monitoring/longview/default.nix +++ b/pkgs/servers/monitoring/longview/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper, glibc }: stdenv.mkDerivation rec { - version = "1.1.5pre"; + version = "1.1.5"; name = "longview-${version}"; src = fetchFromGitHub { owner = "linode"; repo = "longview"; - rev = "5bcc9b60896b72de2d14f046f911477c26eb70ba"; - sha256 = "1i6va44bx2zfgbld7znf1slph0iqidlahq2xh3kd8q4lhvbrjn02"; + rev = "v${version}"; + sha256 = "1i9lli8iw8sb1bd633i82fzhx5gz85ma9d1hra41pkv2p3h823pa"; }; patches = [ diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix index 21bc242ec46..39bd3f12e95 100644 --- a/pkgs/servers/monitoring/prometheus/cli.nix +++ b/pkgs/servers/monitoring/prometheus/cli.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; }; - goDeps = ./cli_deps.json; + goDeps = ./cli_deps.nix; meta = with stdenv.lib; { description = "Command line tool for querying the Prometheus HTTP API"; diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.json b/pkgs/servers/monitoring/prometheus/cli_deps.json deleted file mode 100644 index 57384dba31c..00000000000 --- a/pkgs/servers/monitoring/prometheus/cli_deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.nix b/pkgs/servers/monitoring/prometheus/cli_deps.nix new file mode 100644 index 00000000000..192b6917bf0 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/cli_deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index dc9b6fd843e..6c703e5fa7b 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; }; - goDeps = ./collectd-exporter_deps.json; + goDeps = ./collectd-exporter_deps.nix; meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json deleted file mode 100644 index 1ff93e411f8..00000000000 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix new file mode 100644 index 00000000000..92523d69937 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index f2afd2aa273..ec63d5e6352 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1jkijdawmnj5yps0yaj47nyfmcah0krwmqsjvicm3sl0dhwmac4w"; }; - goDeps = ./haproxy-exporter_deps.json; + goDeps = ./haproxy-exporter_deps.nix; meta = with stdenv.lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json deleted file mode 100644 index 1ff93e411f8..00000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json +++ /dev/null @@ -1,65 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix new file mode 100644 index 00000000000..92523d69937 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix @@ -0,0 +1,65 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ddd7a17364b..42ff2496df1 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; - goDeps = ./mesos-exporter_deps.json; + goDeps = ./mesos-exporter_deps.nix; meta = with stdenv.lib; { description = "Export Mesos metrics to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json deleted file mode 100644 index a0b80e0ff14..00000000000 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f", - "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/antonlindstrom/mesos_stats", - "fetch": { - "type": "git", - "url": "https://github.com/antonlindstrom/mesos_stats", - "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920", - "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix new file mode 100644 index 00000000000..e8fdcc95da2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/antonlindstrom/mesos_stats"; + fetch = { + type = "git"; + url = "https://github.com/antonlindstrom/mesos_stats"; + rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; + sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 64a9e6cc28e..5a274435e3d 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0pwf2vii9n9zgad1lxgw28c2743yc9c3qc03516fiwvlqc1cpddr"; }; - goDeps = ./mysqld-exporter_deps.json; + goDeps = ./mysqld-exporter_deps.nix; meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json deleted file mode 100644 index 77d4c301bf8..00000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/go-sql-driver/mysql", - "fetch": { - "type": "git", - "url": "https://github.com/go-sql-driver/mysql", - "rev": "fb7299726d2e68745a8805b14f2ff44b5c2cfa84", - "sha256": "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix new file mode 100644 index 00000000000..4910832a62c --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84"; + sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 9adfdda1d07..280f7e0abd0 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; }; - goDeps = ./nginx-exporter_deps.json; + goDeps = ./nginx-exporter_deps.nix; meta = with stdenv.lib; { description = "Metrics relay from nginx stats to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json deleted file mode 100644 index 2a86511ef99..00000000000 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/prometheus/log", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/log", - "rev": "439e5db48fbb50ebbaf2c816030473a62f505f55", - "sha256": "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix new file mode 100644 index 00000000000..26b2bcaa8d2 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/prometheus/log"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/log"; + rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; + sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 19148ec1cb4..788fe863396 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; }; - goDeps = ./prom2json_deps.json; + goDeps = ./prom2json_deps.nix; meta = with stdenv.lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.json b/pkgs/servers/monitoring/prometheus/prom2json_deps.json deleted file mode 100644 index b716d41b2c1..00000000000 --- a/pkgs/servers/monitoring/prometheus/prom2json_deps.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.nix b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix new file mode 100644 index 00000000000..20cabe3d385 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix @@ -0,0 +1,38 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 65dda2403fc..6a742796f30 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1bj0s4s3gbcnlp2z2yx7jf3jx14cdg2v4pr0yciai0g6jwwg63hd"; }; - goDeps = ./pushgateway_deps.json; + goDeps = ./pushgateway_deps.nix; buildInputs = [ go-bindata ]; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json b/pkgs/servers/monitoring/prometheus/pushgateway_deps.json deleted file mode 100644 index c5ece41a52e..00000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/julienschmidt/httprouter", - "fetch": { - "type": "git", - "url": "https://github.com/julienschmidt/httprouter", - "rev": "6aacfd5ab513e34f7e64ea9627ab9670371b34e7", - "sha256": "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix new file mode 100644 index 00000000000..33795927ed9 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; + sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index 935692bfa2e..0ff1386074b 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1gg9v224n05khcwy27637w3rwh0cymm7hx6bginfxd7730rmpp2r"; }; - goDeps = ./statsd-bridge_deps.json; + goDeps = ./statsd-bridge_deps.nix; meta = with stdenv.lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json deleted file mode 100644 index 4c0bc142c88..00000000000 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/howeyc/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6", - "sha256": "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9" - } - } -] diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix new file mode 100644 index 00000000000..fd11ab5a7ea --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/howeyc/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6"; + sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"; + }; + } +] diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix new file mode 100644 index 00000000000..40f580ffddf --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -0,0 +1,27 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "telegraf-${version}"; + version = "1.0.1"; + + goPackagePath = "github.com/influxdata/telegraf"; + + excludedPackages = "test"; + + src = fetchFromGitHub { + owner = "influxdata"; + repo = "telegraf"; + rev = "${version}"; + sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434"; + }; + + goDeps = ./. + builtins.toPath "/deps-${version}.nix"; + + meta = with lib; { + description = "The plugin-driven server agent for collecting & reporting metrics."; + license = licenses.mit; + homepage = https://www.influxdata.com/time-series-platform/telegraf/; + maintainers = with maintainers; [ mic92 roblabla ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix b/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix new file mode 100644 index 00000000000..29652a200f1 --- /dev/null +++ b/pkgs/servers/monitoring/telegraf/deps-1.0.1.nix @@ -0,0 +1,624 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/Shopify/sarama"; + fetch = { + type = "git"; + url = "https://github.com/Shopify/sarama"; + rev = "8aadb476e66ca998f2f6bb3c993e9a2daa3666b9"; + sha256 = "1ndaddqcll9r22jg9x36acanxv5ds3xwahrm4b6nmmg06670gksv"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "219c8cb75c258c552e999735be6df753ffc7afdc"; + sha256 = "04v55846v1535dplldyjhr0yqxl6n1mr4kiy2vz3ragv92xpshr6"; + }; + } + { + goPackagePath = "github.com/aerospike/aerospike-client-go"; + fetch = { + type = "git"; + url = "https://github.com/aerospike/aerospike-client-go"; + rev = "45863b7fd8640dc12f7fdd397104d97e1986f25a"; + sha256 = "0cnsq8waah9m8m6y6cjz2sppac38aq8gsykw6d8zps0w4rjgf1aw"; + }; + } + { + goPackagePath = "github.com/amir/raidman"; + fetch = { + type = "git"; + url = "https://github.com/amir/raidman"; + rev = "53c1b967405155bfc8758557863bf2e14f814687"; + sha256 = "08a6zz4akkm7lk02w53vfhkxdf0ikv32x41rc4jyi2qaf0wyw6b4"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "13a12060f716145019378a10e2806c174356b857"; + sha256 = "09yl85kk2y4ayk44af5rbnkq4vy82vbh2z5ac4vpl2vgv7zyh46h"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3ac7bf7a47d159a033b107610db8a1b6575507a4"; + sha256 = "1qc3l4r818xpvrhshh1sisc5lvl9479qspcfcdbivdyh0apah83r"; + }; + } + { + goPackagePath = "github.com/cenkalti/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenkalti/backoff"; + rev = "4dc77674aceaabba2c7e3da25d4c823edfb73f99"; + sha256 = "0icf4vrgzksr0g8h6y00rd92h1mym6waf3mbqpf890bkw60gnm0w"; + }; + } + { + goPackagePath = "github.com/couchbase/go-couchbase"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/go-couchbase"; + rev = "cb664315a324d87d19c879d9cc67fda6be8c2ac1"; + sha256 = "1dfw1apwrlfwl7bahb6dy5g9z2vs431l4lpaj3k9bnm13p0awivr"; + }; + } + { + goPackagePath = "github.com/couchbase/gomemcached"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/gomemcached"; + rev = "a5ea6356f648fec6ab89add00edd09151455b4b2"; + sha256 = "00x57qqdv9ciyxiw2y6p4s65sfgi4cs6zi39qlqlw90nh133xnwi"; + }; + } + { + goPackagePath = "github.com/couchbase/goutils"; + fetch = { + type = "git"; + url = "https://github.com/couchbase/goutils"; + rev = "5823a0cbaaa9008406021dc5daf80125ea30bba6"; + sha256 = "15v5ps2i2y2hczwxs2ci4c2w4p3pn3bl7vc5wlaqnc7i14f9285c"; + }; + } + { + goPackagePath = "github.com/dancannon/gorethink"; + fetch = { + type = "git"; + url = "https://github.com/dancannon/gorethink"; + rev = "e7cac92ea2bc52638791a021f212145acfedb1fc"; + sha256 = "0f9gwsqf93qzvfpdwgam7vcfzrrkcj2s9ms4p056kcyxv9snwq3g"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + }; + } + { + goPackagePath = "github.com/docker/engine-api"; + fetch = { + type = "git"; + url = "https://github.com/docker/engine-api"; + rev = "8924d6900370b4c7e7984be5adc61f50a80d7537"; + sha256 = "1klimc3d1a2vfgl14a7js20ricpghq5jzvh8l46kf87ycjwc0q4n"; + }; + } + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "f549a9393d05688dff0992ef3efd8bbe6c628aeb"; + sha256 = "0k1yf4bimmwxc0qiz997nagfmddbm8nwb0c1q16387m8lgw1gbwg"; + }; + } + { + goPackagePath = "github.com/docker/go-units"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-units"; + rev = "5d2041e26a699eaca682e2ea41c8f891e1060444"; + sha256 = "0hn8xdbaykp046inc4d2mwig5ir89ighma8hk18dfkm8rh1vvr8i"; + }; + } + { + goPackagePath = "github.com/eapache/go-resiliency"; + fetch = { + type = "git"; + url = "https://github.com/eapache/go-resiliency"; + rev = "b86b1ec0dd4209a588dc1285cdd471e73525c0b3"; + sha256 = "1kzv95bh3nidm2cr7iv9lk3s2qiw1i17n8gyl2x6xk6qv8b0bc21"; + }; + } + { + goPackagePath = "github.com/eapache/queue"; + fetch = { + type = "git"; + url = "https://github.com/eapache/queue"; + rev = "ded5959c0d4e360646dc9e9908cff48666781367"; + sha256 = "0inclypw0kln8hsn34c5ww34h0qa9fcqwak93lac5dp59rz5430n"; + }; + } + { + goPackagePath = "github.com/eclipse/paho.mqtt.golang"; + fetch = { + type = "git"; + url = "https://github.com/eclipse/paho.mqtt.golang"; + rev = "0f7a459f04f13a41b7ed752d47944528d4bf9a86"; + sha256 = "13l6mrx9z859r4r7kpa9rsbf4ni7dn6xgz8iyv2xnz53pqffanjh"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "1fca743146605a172a266e1654e01e5cd5669bee"; + sha256 = "02vbq8j4r3skg3fmiv1wvjqh1542dr515w8f3d42b5lpwc1fsn38"; + }; + } + { + goPackagePath = "github.com/gobwas/glob"; + fetch = { + type = "git"; + url = "https://github.com/gobwas/glob"; + rev = "49571a1557cd20e6a2410adc6421f85b66c730b5"; + sha256 = "16j7pdxajqrl20a737p7kgsngr2f7gkkpgqxxmfkrmgckgkc8cvk"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "552c7b9542c194800fd493123b3798ef0a832032"; + sha256 = "1zaw1xxnvgsvfcrv5xkn1f7p87vyh9i6mc44csl11fgc2hvqp6xm"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy"; + rev = "427fb6fc07997f43afa32f35e850833760e489a7"; + sha256 = "1hgk9zhkfdvxrz13k0glqwlz414803zkrzd01mv6fjhpsjmcx53b"; + }; + } + { + goPackagePath = "github.com/gonuts/go-shellquote"; + fetch = { + type = "git"; + url = "https://github.com/gonuts/go-shellquote"; + rev = "e842a11b24c6abfb3dd27af69a17f482e4b483c2"; + sha256 = "19lbz7wl241bsyzsv2ai40b2vnj8c9nl107b6jf9gid3i6h0xydg"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"; + sha256 = "1nh1nzxcsgd215x4xn59wc4cbqfa8zvhvnnx5p8fkrn4bj1cgak4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "c9e326e2bdec29039a3761c07bece13133863e1e"; + sha256 = "1bplp6v14isjdfpf8328k8bvkn35n451axkxlm822d9h5ccg47g6"; + }; + } + { + goPackagePath = "github.com/hailocab/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/hailocab/go-hostpool"; + rev = "e80d13ce29ede4452c43dea11e79b9bc8a15b478"; + sha256 = "05ld4wp3illkbgl043yf8jq9y1ld0zzvrcg8jdij129j50xgfxny"; + }; + } + { + goPackagePath = "github.com/hashicorp/consul"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/consul"; + rev = "5aa90455ce78d4d41578bafc86305e6e6b28d7d2"; + sha256 = "1xas814kkhwnjg5ghhlkgygcgi5p7h6dczmpbrzzh3yygbfdzxgw"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "b2940955ab8b26e19d43a43c4da0475dd81bdb56"; + sha256 = "1x266pdfvcymsbdrdsns06qq5qfjb62z6h4512ylhakbm64qkn4s"; + }; + } + { + goPackagePath = "github.com/influxdata/config"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/config"; + rev = "b79f6829346b8d6e78ba73544b1e1038f1f1c9da"; + sha256 = "0k4iywy83n3kq2f58a41rjinj03wp1di67aacpf04p25qmf46c4z"; + }; + } + { + goPackagePath = "github.com/influxdata/influxdb"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/influxdb"; + rev = "e094138084855d444195b252314dfee9eae34cab"; + sha256 = "0vv243lqwl4rwgg1zaxlw42zfjjad4vcafaiisvvkyamnndzlkla"; + }; + } + { + goPackagePath = "github.com/influxdata/telegraf"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/telegraf"; + rev = "215f1b57d06845708e0867b11b9c853a56b00d81"; + sha256 = "1qn90rybdb2ybdyfk2f2yqpsgrya95bgiglmxnf2x1fapjpm7434"; + }; + } + { + goPackagePath = "github.com/influxdata/toml"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/toml"; + rev = "af4df43894b16e3fd2b788d01bd27ad0776ef2d0"; + sha256 = "1faf51s89sk1z41qfsazmddgwll7jq9xna67k3h3vry86c4vs2j4"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "bd40a432e4c76585ef6b72d3fd96fb9b6dc7b68d"; + sha256 = "1kgzwiyqn24ba9kgpjxlq1h746gnyby0psbjj9mp2yx0h1i0kc4z"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/kardianos/service"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/service"; + rev = "5e335590050d6d00f3aa270217d288dda1c94d0a"; + sha256 = "1g10qisgywfqj135yyiq63pnbjgr201gz929ydlgyzqq6yk3bn3h"; + }; + } + { + goPackagePath = "github.com/klauspost/crc32"; + fetch = { + type = "git"; + url = "https://github.com/klauspost/crc32"; + rev = "19b0b332c9e4516a6370a0456e6182c3b5036720"; + sha256 = "0fcnsf1m0bzplgp28dz8skza6l7rc65s180x85rzbdl9l3zzi43r"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "e182dc4027e2ded4b19396d638610f2653295f36"; + sha256 = "1636v3snixapjf7rbjq0xn1sbym7hwckqfla0dm5cr4a5q4fw5cj"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "d0c3fe89de86839aecf2e0579c40ba3bb336a453"; + sha256 = "0jkjgpi1s8l9bdbf14fh8050757jqy36kn1l1hxxlb2fjn1pcg0r"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "cce6c130cdb92c752850880fd285bea1d64439dd"; + sha256 = "098gadhfjiijlgq497gbccvf26xrmjvln1fws56m0ljcgszq3jdx"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-snappystream"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-snappystream"; + rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; + }; + } + { + goPackagePath = "github.com/naoina/go-stringutil"; + fetch = { + type = "git"; + url = "https://github.com/naoina/go-stringutil"; + rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; + sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; + }; + } + { + goPackagePath = "github.com/nats-io/nats"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nats"; + rev = "b13fc9d12b0b123ebc374e6b808c6228ae4234a3"; + sha256 = "08cj053v0v7i9k7pn7c54hn3pm1c8g53gjhiv969hf4mk2h75q1i"; + }; + } + { + goPackagePath = "github.com/nats-io/nuid"; + fetch = { + type = "git"; + url = "https://github.com/nats-io/nuid"; + rev = "4f84f5f3b2786224e336af2e13dba0a0a80b76fa"; + sha256 = "18ckzxmlg6ihjqd3r6ds8blgga58zibk52xp3lz5c7kv0hf6xa8y"; + }; + } + { + goPackagePath = "github.com/nsqio/go-nsq"; + fetch = { + type = "git"; + url = "https://github.com/nsqio/go-nsq"; + rev = "0b80d6f05e15ca1930e0c5e1d540ed627e299980"; + sha256 = "1zi9jazjfzilp2g0xy30dlx9nd9g47cjqrnqxallly97mz9n01xr"; + }; + } + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "89ab7f2ccc1e45ddf6485eaa802c35dcf321dfc8"; + sha256 = "1rnaqcsww7plr430r4ksv9si4l91l25li0bwa1b03g3sn2shirk1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "18acf9993a863f4c4b40612e19cdd243e7c86831"; + sha256 = "1gyjvwnvgyl0fs4hd2vp5hj1dsafhwb2h55w8zgzdpshvhwrpmhv"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "e8eabff8812b05acf522b45fdcd725a785188e37"; + sha256 = "08magd2aw7dqaa8bbv85404zvy120ify61msfpy75az5rdl5anxq"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "406e5b7bfd8201a36e2bb5f7bdae0b03380c2ce8"; + sha256 = "0yla9hz15pg63394ygs9iiwzsqyv29labl8p424hijwsc9z9nka8"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "218e9c81c0dd8b3b18172b2bbfad92cc7d6db55f"; + sha256 = "1v0m6wn83v4pbqz6hs7z1h5hbjk7k6npkpl7icvcxdcjd7rmyjp2"; + }; + } + { + goPackagePath = "github.com/shirou/gopsutil"; + fetch = { + type = "git"; + url = "https://github.com/shirou/gopsutil"; + rev = "4d0c402af66c78735c5ccf820dc2ca7de5e4ff08"; + sha256 = "1wkp7chzpz6brq2y0k2mvsf0iaknns279wfsjn5gm6gvih49lqni"; + }; + } + { + goPackagePath = "github.com/soniah/gosnmp"; + fetch = { + type = "git"; + url = "https://github.com/soniah/gosnmp"; + rev = "eb32571c2410868d85849ad67d1e51d01273eb84"; + sha256 = "0f6r3q2lhnjz506blygml6mfnp22fjy586zwiixrzch0jbwl4yf6"; + }; + } + { + goPackagePath = "github.com/sparrc/aerospike-client-go"; + fetch = { + type = "git"; + url = "https://github.com/sparrc/aerospike-client-go"; + rev = "d4bb42d2c2d39dae68e054116f4538af189e05d5"; + sha256 = "0z2d3k1k6qh60aq81dr9g8y2mb19wwlx5isy0nqg0gzx3jb7v7xz"; + }; + } + { + goPackagePath = "github.com/streadway/amqp"; + fetch = { + type = "git"; + url = "https://github.com/streadway/amqp"; + rev = "b4f3ceab0337f013208d31348b578d83c0064744"; + sha256 = "1whcg2l6w2q7xrkk8q5y95i90ckq72bpgksii9ibrpyixbx7p5xp"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "1f4a1643a57e798696635ea4c126e9127adb7d3c"; + sha256 = "0nam9d68rn8ha8ldif22kkgv6k6ph3y88fp26159wdrs63ca3bzl"; + }; + } + { + goPackagePath = "github.com/vjeantet/grok"; + fetch = { + type = "git"; + url = "https://github.com/vjeantet/grok"; + rev = "83bfdfdfd1a8146795b28e547a8e3c8b28a466c2"; + sha256 = "03zdcg9gy482gbasa7sw4cpw1k1n3dr2q06q80qnkqn268p7hp80"; + }; + } + { + goPackagePath = "github.com/wvanbergen/kafka"; + fetch = { + type = "git"; + url = "https://github.com/wvanbergen/kafka"; + rev = "46f9a1cf3f670edec492029fadded9c2d9e18866"; + sha256 = "1czmbilprffdbwnrq4wcllaqknbq91l6p0ni6b55fkaggnwck694"; + }; + } + { + goPackagePath = "github.com/wvanbergen/kazoo-go"; + fetch = { + type = "git"; + url = "https://github.com/wvanbergen/kazoo-go"; + rev = "0f768712ae6f76454f987c3356177e138df258f8"; + sha256 = "1paaayg03nknbnl3kdl0ybqv4llz7iwry7f29i0bh9srb6c87x16"; + }; + } + { + goPackagePath = "github.com/yuin/gopher-lua"; + fetch = { + type = "git"; + url = "https://github.com/yuin/gopher-lua"; + rev = "bf3808abd44b1e55143a2d7f08571aaa80db1808"; + sha256 = "02m7ly5yzc3snvxlfl9j4ggwd7v0kpvy3pqgqbfr7scdjxdap4nm"; + }; + } + { + goPackagePath = "github.com/zensqlmonitor/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/zensqlmonitor/go-mssqldb"; + rev = "ffe5510c6fa5e15e6d983210ab501c815b56b363"; + sha256 = "079x8ms8lv5p6253ppaxva37k6w04xnd38y8763rr2giswxqzlkl"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "5dc8cb4b8a8eb076cbb5a06bc3b8682c15bdbbd3"; + sha256 = "18c1vpqlj10z1id66hglgnv51d9gwphgsdvxgghc6mcm01f1g5xj"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "6acef71eb69611914f7a30939ea9f6e194c78172"; + sha256 = "1fcsv50sbq0lpzrhx3m9jw51wa255fsbqjwsx9iszq4d0gysnnvc"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9"; + sha256 = "04va4pqygfzr89fx873k44bmivk7nybqalybi6q96lnn45h2scbr"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "a71fd10341b064c10f4a81ceac72bcf70f26ea34"; + sha256 = "1igxqrgnnb6983fl0yck0xal2hwnkcgbslr7cxyrg7a65vawd0q1"; + }; + } + { + goPackagePath = "gopkg.in/dancannon/gorethink.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/dancannon/gorethink.v1"; + rev = "7d1af5be49cb5ecc7b177bf387d232050299d6ef"; + sha256 = "0036hcadshka19bcqmq4mm9ssl9qhsx1n96lj1y24mh9g1api8fi"; + }; + } + { + goPackagePath = "gopkg.in/fatih/pool.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/fatih/pool.v2"; + rev = "cba550ebf9bce999a02e963296d4bc7a486cb715"; + sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "d90005c5262a3463800497ea5a89aed5fe22c886"; + sha256 = "1z81k6mnfk07hkrkw31l16qycyiwa6wzyhysmywgkh58sm5dc9m7"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } +] diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d656e8ded3a..4b26b92cdb2 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, systemd, boost +{ stdenv, fetchurl, pkgconfig, glib, systemd, boost, darwin , alsaSupport ? true, alsaLib , flacSupport ? true, flac , vorbisSupport ? true, libvorbis @@ -30,18 +30,19 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "15"; + minor = "19"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.xz"; - sha256 = "12wvqb5r3q77x78wigmrsz3vv8rykcfnavffcvlqq0sbi4is5f8c"; + sha256 = "07af1m2lgblyiq0gcs26zv8n22wrhrpmf49xsm338h1n87d6r1dw"; }; patches = stdenv.lib.optionals stdenv.isDarwin ./darwin-enable-cxx-exceptions.patch; buildInputs = [ pkgconfig glib boost ] + ++ opt stdenv.isDarwin darwin.apple_sdk.frameworks.CoreAudioKit ++ opt stdenv.isLinux systemd ++ opt (stdenv.isLinux && alsaSupport) alsaLib ++ opt flacSupport flac diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index be7947a03d6..a136c94aa57 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libuuid, cmake }: +{ stdenv, fetchurl, openssl, libuuid, cmake, libwebsockets }: stdenv.mkDerivation rec { pname = "mosquitto"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1imw5ps0cqda41b574k8hgz9gdr8yy58f76fg8gw14pdnvf3l7sr"; }; - buildInputs = [ openssl libuuid ] + buildInputs = [ openssl libuuid libwebsockets ] ++ stdenv.lib.optional stdenv.isDarwin cmake; makeFlags = [ @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace config.mk \ --replace "/usr/local" "" + substituteInPlace config.mk \ + --replace "WITH_WEBSOCKETS:=no" "WITH_WEBSOCKETS:=yes" + ''; meta = { diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 665e2ee8ed5..e3e3de36575 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ autoreconfHook pkgconfig systemd glib dbus libnl pythonPackages.python pythonPackages.wrapPython ]; - pythonPath = [ pythonPackages.pygobject pythonPackages.dbus-python pythonPackages.pygtk ]; + pythonPath = [ pythonPackages.pygobject2 pythonPackages.dbus-python pythonPackages.pygtk ]; configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix new file mode 100644 index 00000000000..5024f00caee --- /dev/null +++ b/pkgs/servers/nextcloud/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, fetchpatch }: + +stdenv.mkDerivation rec { + name= "nextcloud-${version}"; + version = "10.0.1"; + + src = fetchurl { + url = "https://download.nextcloud.com/server/releases/${name}.tar.bz2"; + sha256 = "09cbjxsr6sdjrq37rmwmg6r1x3625bqcrd37ja6cmmrgy0l2lh9r"; + }; + + installPhase = '' + mkdir -p $out/ + cp -R ./* $out/ + ''; + + meta = { + description = "Sharing solution for files, calendars, contacts and more"; + homepage = https://nextcloud.com; + maintainers = with stdenv.lib.maintainers; [ schneefux ]; + license = stdenv.lib.licenses.agpl3Plus; + platforms = with stdenv.lib.platforms; unix; + }; +} diff --git a/pkgs/servers/nextcloud/news-updater.nix b/pkgs/servers/nextcloud/news-updater.nix new file mode 100644 index 00000000000..c2b913a5b37 --- /dev/null +++ b/pkgs/servers/nextcloud/news-updater.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, python3Packages, php }: + +python3Packages.buildPythonApplication rec { + name = "nextcloud-news-updater-${version}"; + version = "9.0.2"; + + src = fetchurl { + url = "mirror://pypi/n/nextcloud_news_updater/nextcloud_news_updater-${version}.tar.gz"; + sha256 = "1m6g4591zyvjl2fji4iwl9api02racgc9rqa0gf0mfsqwdr77alw"; + }; + + doCheck = false; + + propagatedBuildInputs = [ php ]; + + meta = { + description = "Fast parallel feed updater for the Nextcloud news app"; + homepage = "https://github.com/nextcloud/news-updater"; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ schneefux ]; + }; +} diff --git a/pkgs/servers/nosql/cassandra/generic.nix b/pkgs/servers/nosql/cassandra/generic.nix index 5e364ba3e68..7541f76b40e 100644 --- a/pkgs/servers/nosql/cassandra/generic.nix +++ b/pkgs/servers/nosql/cassandra/generic.nix @@ -4,7 +4,13 @@ let libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]; - binPath = stdenv.lib.makeBinPath [ bash getopt gawk procps which jre ]; + binPath = with stdenv.lib; makeBinPath ([ + bash + getopt + gawk + which + jre + ] ++ stdenv.lib.optional stdenv.isLinux procps); in stdenv.mkDerivation rec { @@ -42,7 +48,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://cassandra.apache.org/; description = "A massively scalable open source NoSQL database"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.asl20; maintainers = with maintainers; [ nckx rushmorem cransom ]; }; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 20c4d699dd4..1614049bf22 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -11,7 +11,7 @@ buildGoPackage rec { # Generated with the `gdm2nix.rb` script and the `Godeps` file from the # influxdb repo root. - goDeps = ./. + builtins.toPath "/deps-${version}.json"; + goDeps = ./. + builtins.toPath "/deps-${version}.nix"; meta = with lib; { description = "An open-source distributed time series database"; diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.json b/pkgs/servers/nosql/influxdb/deps-0.13.0.json deleted file mode 100644 index 33388cc0fb7..00000000000 --- a/pkgs/servers/nosql/influxdb/deps-0.13.0.json +++ /dev/null @@ -1,200 +0,0 @@ -[ - { - "goPackagePath": "collectd.org", - "fetch": { - "type": "git", - "url": "https://github.com/collectd/go-collectd.git", - "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98", - "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml.git", - "rev": "a4eecd407cf4129fc902ece859a0114e4cf1a7f4", - "sha256": "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf" - } - }, - { - "goPackagePath": "github.com/armon/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-metrics.git", - "rev": "345426c77237ece5dab0e1605c3e4b35c3f54757", - "sha256": "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5" - } - }, - { - "goPackagePath": "github.com/bmizerany/pat", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/pat.git", - "rev": "b8a35001b773c267eb260a691f4e5499a3531600", - "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt.git", - "rev": "2f846c3551b76d7710f159be840d66c3d064abbe", - "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew.git", - "rev": "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c", - "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bits", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bits.git", - "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e", - "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bitstream", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bitstream.git", - "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92", - "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf.git", - "rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06", - "sha256": "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy.git", - "rev": "5979233c5d6225d4a8e438cdd0b411888449ddab", - "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-msgpack", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-msgpack.git", - "rev": "fa3f63826f7c23912c15263591e65d54d080b458", - "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft.git", - "rev": "8fd9a2fdfd154f4b393aa24cff91e3c317efe839", - "sha256": "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft-boltdb", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft-boltdb.git", - "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee", - "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia" - } - }, - { - "goPackagePath": "github.com/influxdata/usage-client", - "fetch": { - "type": "git", - "url": "https://github.com/influxdata/usage-client.git", - "rev": "475977e68d79883d9c8d67131c84e4241523f452", - "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy" - } - }, - { - "goPackagePath": "github.com/jwilder/encoding", - "fetch": { - "type": "git", - "url": "https://github.com/jwilder/encoding.git", - "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37", - "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq" - } - }, - { - "goPackagePath": "github.com/kimor79/gollectd", - "fetch": { - "type": "git", - "url": "https://github.com/kimor79/gollectd.git", - "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc", - "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs" - } - }, - { - "goPackagePath": "github.com/paulbellamy/ratecounter", - "fetch": { - "type": "git", - "url": "https://github.com/paulbellamy/ratecounter.git", - "rev": "5a11f585a31379765c190c033b6ad39956584447", - "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner.git", - "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f", - "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04" - } - }, - { - "goPackagePath": "github.com/rakyll/statik", - "fetch": { - "type": "git", - "url": "https://github.com/rakyll/statik.git", - "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", - "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://github.com/golang/crypto.git", - "rev": "1f22c0103821b9390939b6776727195525381532", - "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m" - } - }, - { - "goPackagePath": "golang.org/x/tools", - "fetch": { - "type": "git", - "url": "https://github.com/golang/tools.git", - "rev": "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180", - "sha256": "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8" - } - }, - { - "goPackagePath": "gopkg.in/fatih/pool.v2", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/pool.git", - "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", - "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.json.nix new file mode 100644 index 00000000000..e69de29bb2d diff --git a/pkgs/servers/nosql/influxdb/deps-0.13.0.nix b/pkgs/servers/nosql/influxdb/deps-0.13.0.nix new file mode 100644 index 00000000000..1b8885a1a0f --- /dev/null +++ b/pkgs/servers/nosql/influxdb/deps-0.13.0.nix @@ -0,0 +1,200 @@ +[ +{ + goPackagePath = "collectd.org"; + fetch = { + type = "git"; + url = "https://github.com/collectd/go-collectd.git"; + rev = "9fc824c70f713ea0f058a07b49a4c563ef2a3b98"; + sha256 = "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"; + }; +} +{ + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml.git"; + rev = "a4eecd407cf4129fc902ece859a0114e4cf1a7f4"; + sha256 = "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf"; + }; +} +{ + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics.git"; + rev = "345426c77237ece5dab0e1605c3e4b35c3f54757"; + sha256 = "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5"; + }; +} +{ + goPackagePath = "github.com/bmizerany/pat"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/pat.git"; + rev = "b8a35001b773c267eb260a691f4e5499a3531600"; + sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"; + }; +} +{ + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt.git"; + rev = "2f846c3551b76d7710f159be840d66c3d064abbe"; + sha256 = "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5"; + }; +} +{ + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew.git"; + rev = "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c"; + sha256 = "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232"; + }; +} +{ + goPackagePath = "github.com/dgryski/go-bits"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-bits.git"; + rev = "86c69b3c986f9d40065df5bd8f765796549eef2e"; + sha256 = "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b"; + }; +} +{ + goPackagePath = "github.com/dgryski/go-bitstream"; + fetch = { + type = "git"; + url = "https://github.com/dgryski/go-bitstream.git"; + rev = "27cd5973303fde7d914860be1ea4b927a6be0c92"; + sha256 = "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6"; + }; +} +{ + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf.git"; + rev = "74b6e9deaff6ba6da1389ec97351d337f0d08b06"; + sha256 = "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b"; + }; +} +{ + goPackagePath = "github.com/golang/snappy"; + fetch = { + type = "git"; + url = "https://github.com/golang/snappy.git"; + rev = "5979233c5d6225d4a8e438cdd0b411888449ddab"; + sha256 = "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s"; + }; +} +{ + goPackagePath = "github.com/hashicorp/go-msgpack"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-msgpack.git"; + rev = "fa3f63826f7c23912c15263591e65d54d080b458"; + sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"; + }; +} +{ + goPackagePath = "github.com/hashicorp/raft"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/raft.git"; + rev = "8fd9a2fdfd154f4b393aa24cff91e3c317efe839"; + sha256 = "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f"; + }; +} +{ + goPackagePath = "github.com/hashicorp/raft-boltdb"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/raft-boltdb.git"; + rev = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee"; + sha256 = "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia"; + }; +} +{ + goPackagePath = "github.com/influxdata/usage-client"; + fetch = { + type = "git"; + url = "https://github.com/influxdata/usage-client.git"; + rev = "475977e68d79883d9c8d67131c84e4241523f452"; + sha256 = "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"; + }; +} +{ + goPackagePath = "github.com/jwilder/encoding"; + fetch = { + type = "git"; + url = "https://github.com/jwilder/encoding.git"; + rev = "b421ab402545ef5a119f4f827784c6551d9bfc37"; + sha256 = "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq"; + }; +} +{ + goPackagePath = "github.com/kimor79/gollectd"; + fetch = { + type = "git"; + url = "https://github.com/kimor79/gollectd.git"; + rev = "61d0deeb4ffcc167b2a1baa8efd72365692811bc"; + sha256 = "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"; + }; +} +{ + goPackagePath = "github.com/paulbellamy/ratecounter"; + fetch = { + type = "git"; + url = "https://github.com/paulbellamy/ratecounter.git"; + rev = "5a11f585a31379765c190c033b6ad39956584447"; + sha256 = "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"; + }; +} +{ + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner.git"; + rev = "82a939e738b0ee23e84ec7a12d8e216f4d95c53f"; + sha256 = "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04"; + }; +} +{ + goPackagePath = "github.com/rakyll/statik"; + fetch = { + type = "git"; + url = "https://github.com/rakyll/statik.git"; + rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465"; + sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"; + }; +} +{ + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://github.com/golang/crypto.git"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; + }; +} +{ + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://github.com/golang/tools.git"; + rev = "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180"; + sha256 = "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8"; + }; +} +{ + goPackagePath = "gopkg.in/fatih/pool.v2"; + fetch = { + type = "git"; + url = "https://github.com/fatih/pool.git"; + rev = "cba550ebf9bce999a02e963296d4bc7a486cb715"; + sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"; + }; +} +] diff --git a/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json b/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json deleted file mode 100644 index fe72249ea26..00000000000 --- a/pkgs/servers/nosql/influxdb/deps-1.0.0-beta3.json +++ /dev/null @@ -1,155 +0,0 @@ -[ - { - "goPackagePath": "collectd.org", - "fetch": { - "type": "git", - "url": "https://github.com/collectd/go-collectd.git", - "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98", - "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml.git", - "rev": "a4eecd407cf4129fc902ece859a0114e4cf1a7f4", - "sha256": "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf" - } - }, - { - "goPackagePath": "github.com/bmizerany/pat", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/pat.git", - "rev": "b8a35001b773c267eb260a691f4e5499a3531600", - "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt.git", - "rev": "2f846c3551b76d7710f159be840d66c3d064abbe", - "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew.git", - "rev": "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c", - "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232" - } - }, - { - "goPackagePath": "github.com/dgrijalva/jwt-go", - "fetch": { - "type": "git", - "url": "https://github.com/dgrijalva/jwt-go.git", - "rev": "a2c85815a77d0f951e33ba4db5ae93629a1530af", - "sha256": "1m7011hdr4qa400awbdagj2m5zwfbvhinq8p5hq7ysn14xpaq5vw" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bits", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bits.git", - "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e", - "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bitstream", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bitstream.git", - "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92", - "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf.git", - "rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06", - "sha256": "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy.git", - "rev": "5979233c5d6225d4a8e438cdd0b411888449ddab", - "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s" - } - }, - { - "goPackagePath": "github.com/influxdata/usage-client", - "fetch": { - "type": "git", - "url": "https://github.com/influxdata/usage-client.git", - "rev": "475977e68d79883d9c8d67131c84e4241523f452", - "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy" - } - }, - { - "goPackagePath": "github.com/jwilder/encoding", - "fetch": { - "type": "git", - "url": "https://github.com/jwilder/encoding.git", - "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37", - "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq" - } - }, - { - "goPackagePath": "github.com/kimor79/gollectd", - "fetch": { - "type": "git", - "url": "https://github.com/kimor79/gollectd.git", - "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc", - "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs" - } - }, - { - "goPackagePath": "github.com/paulbellamy/ratecounter", - "fetch": { - "type": "git", - "url": "https://github.com/paulbellamy/ratecounter.git", - "rev": "5a11f585a31379765c190c033b6ad39956584447", - "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner.git", - "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f", - "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04" - } - }, - { - "goPackagePath": "github.com/rakyll/statik", - "fetch": { - "type": "git", - "url": "https://github.com/rakyll/statik.git", - "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", - "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://github.com/golang/crypto.git", - "rev": "1f22c0103821b9390939b6776727195525381532", - "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/deps-1.0.2.nix b/pkgs/servers/nosql/influxdb/deps-1.0.2.nix new file mode 100644 index 00000000000..f1c8103db33 --- /dev/null +++ b/pkgs/servers/nosql/influxdb/deps-1.0.2.nix @@ -0,0 +1,164 @@ +[ + { + goPackagePath= "collectd.org"; + fetch= { + type= "git"; + url= "https://github.com/collectd/go-collectd.git"; + rev= "9fc824c70f713ea0f058a07b49a4c563ef2a3b98"; + sha256= "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"; + }; + } + { + goPackagePath= "github.com/BurntSushi/toml"; + fetch= { + type= "git"; + url= "https://github.com/BurntSushi/toml.git"; + rev= "99064174e013895bbd9b025c31100bd1d9b590ca"; + sha256= "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9"; + }; + } + { + goPackagePath= "github.com/bmizerany/pat"; + fetch= { + type= "git"; + url= "https://github.com/bmizerany/pat.git"; + rev= "c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c"; + sha256= "02ayddkp2b22rixw5jldw3kb6762zzkg5zhxwcv9v9yp0x39qw6r"; + }; + } + { + goPackagePath= "github.com/boltdb/bolt"; + fetch= { + type= "git"; + url= "https://github.com/boltdb/bolt.git"; + rev= "5cc10bbbc5c141029940133bb33c9e969512a698"; + sha256= "0m3icjqymqr9hmsss61fl9lmvspq8kv0bhynkqfwpdgc9wbb1a4n"; + }; + } + { + goPackagePath= "github.com/davecgh/go-spew"; + fetch= { + type= "git"; + url= "https://github.com/davecgh/go-spew.git"; + rev= "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + sha256= "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + }; + } + { + goPackagePath= "github.com/dgrijalva/jwt-go"; + fetch= { + type= "git"; + url= "https://github.com/dgrijalva/jwt-go.git"; + rev= "9b486c879bab3fde556ce8c27d9a2bb05d5b2c60"; + sha256= "0rpinzvbhdy27b1rs7yxwsiqp5j5yd4lw8kbyrd0f5z2q1frchk3"; + }; + } + { + goPackagePath= "github.com/dgryski/go-bits"; + fetch= { + type= "git"; + url= "https://github.com/dgryski/go-bits.git"; + rev= "2ad8d707cc05b1815ce6ff2543bb5e8d8f9298ef"; + sha256= "08mxwa4c77dgpvz2ygwd0pc929qxwff95y680mjjgbvj8yifiag2"; + }; + } + { + goPackagePath= "github.com/dgryski/go-bitstream"; + fetch= { + type= "git"; + url= "https://github.com/dgryski/go-bitstream.git"; + rev= "7d46cd22db7004f0cceb6f7975824b560cf0e486"; + sha256= "1k9l16y7l2mkfvnp2ydv9cqly8179wqd20am4zy0q77qcsawkksx"; + }; + } + { + goPackagePath= "github.com/gogo/protobuf"; + fetch= { + type= "git"; + url= "https://github.com/gogo/protobuf.git"; + rev= "6abcf94fd4c97dcb423fdafd42fe9f96ca7e421b"; + sha256= "0w5ln92b57mnc26jwm3bsa320gzgis78l2x9bhrbfs99d45079rf"; + }; + } + { + goPackagePath= "github.com/golang/snappy"; + fetch= { + type= "git"; + url= "https://github.com/golang/snappy.git"; + rev= "d9eb7a3d35ec988b8585d4a0068e462c27d28380"; + sha256= "0wynarlr1y8sm9y9l29pm9dgflxriiialpwn01066snzjxnpmbyn"; + }; + } + { + goPackagePath= "github.com/influxdata/usage-client"; + fetch= { + type= "git"; + url= "https://github.com/influxdata/usage-client.git"; + rev= "475977e68d79883d9c8d67131c84e4241523f452"; + sha256= "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"; + }; + } + { + goPackagePath= "github.com/jwilder/encoding"; + fetch= { + type= "git"; + url= "https://github.com/jwilder/encoding.git"; + rev= "ac74639f65b2180a2e5eb5ff197f0c122441aed0"; + sha256= "1zp0l4wlb8ngz8bsgzf2rhxfd0n3qj6149yjwwpwpj3mzz5rvspi"; + }; + } + { + goPackagePath= "github.com/kimor79/gollectd"; + fetch= { + type= "git"; + url= "https://github.com/kimor79/gollectd.git"; + rev= "61d0deeb4ffcc167b2a1baa8efd72365692811bc"; + sha256= "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"; + }; + } + { + goPackagePath= "github.com/paulbellamy/ratecounter"; + fetch= { + type= "git"; + url= "https://github.com/paulbellamy/ratecounter.git"; + rev= "5a11f585a31379765c190c033b6ad39956584447"; + sha256= "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"; + }; + } + { + goPackagePath= "github.com/peterh/liner"; + fetch= { + type= "git"; + url= "https://github.com/peterh/liner.git"; + rev= "8975875355a81d612fafb9f5a6037bdcc2d9b073"; + sha256= "17l7p6lxhlnna1w1drgh7g8afxcxxd5j472givm2g7l9v8yg4f17"; + }; + } + { + goPackagePath= "github.com/rakyll/statik"; + fetch= { + type= "git"; + url= "https://github.com/rakyll/statik.git"; + rev= "274df120e9065bdd08eb1120e0375e3dc1ae8465"; + sha256= "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"; + }; + } + { + goPackagePath= "github.com/retailnext/hllpp"; + fetch= { + type= "git"; + url= "https://github.com/retailnext/hllpp.git"; + rev= "38a7bb71b483e855d35010808143beaf05b67f9d"; + sha256= "0zpq5yjqprzdw9ll6g9sqp8nzwkhjh4ngzhx5mxahmpajgnzz7a8"; + }; + } + { + goPackagePath= "golang.org/x/crypto"; + fetch= { + type= "git"; + url= "https://github.com/golang/crypto.git"; + rev= "c197bcf24cde29d3f73c7b4ac6fd41f4384e8af6"; + sha256= "1y2bbghi594m8p4pcm9pwrzql06179xj6zvhaghwcc6y0l48rbgp"; + }; + } +] diff --git a/pkgs/servers/nosql/influxdb/gdm2nix.rb b/pkgs/servers/nosql/influxdb/gdm2nix.rb index 4c49c8a538f..4feb78f54bb 100755 --- a/pkgs/servers/nosql/influxdb/gdm2nix.rb +++ b/pkgs/servers/nosql/influxdb/gdm2nix.rb @@ -5,12 +5,17 @@ require "json" redirects = { "collectd.org" => "github.com/collectd/go-collectd", + "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git" => "github.com/eclipse/paho.mqtt.golang", + "golang.org/x/net" => "github.com/golang/net", "golang.org/x/crypto" => "github.com/golang/crypto", + "golang.org/x/text" => "github.com/golang/text", "golang.org/x/tools" => "github.com/golang/tools", "gopkg.in/fatih/pool.v2" => "github.com/fatih/pool", } -deps = File.read("Godeps").lines.map do |line| +godeps = ARGV[0] || "Godeps" + +deps = File.read(godeps).lines.map do |line| (name, rev) = line.split(" ") host = redirects.fetch(name, name) @@ -18,7 +23,7 @@ deps = File.read("Godeps").lines.map do |line| url = "https://#{host}.git" xxx = JSON.load(`nix-prefetch-git #{url} #{rev}`) - + { goPackagePath: name, fetch: { @@ -30,4 +35,5 @@ deps = File.read("Godeps").lines.map do |line| } end +#TODO: move to deps.nix in NIXON format File.write("deps.json", JSON.pretty_generate(deps)) diff --git a/pkgs/servers/nosql/influxdb/v1.nix b/pkgs/servers/nosql/influxdb/v1.nix index f50d38180e9..57d62a596e3 100644 --- a/pkgs/servers/nosql/influxdb/v1.nix +++ b/pkgs/servers/nosql/influxdb/v1.nix @@ -2,12 +2,12 @@ import ./default.nix (args // rec { - version = "1.0.0-beta3"; + version = "1.0.2"; src = fetchFromGitHub { owner = "influxdata"; repo = "influxdb"; rev = "v${version}"; - sha256 = "1hj9wl2bfd1llc11jrv8bq18wl2y9n6fl3w6052wb530j7gsivsq"; + sha256 = "0z8y995gm2hpxny7l5nx5fjc5c26hfgvghwmzva8d1mrlnapcsyc"; }; }) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index ab4524e6959..ee373878cb6 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre-cpp, snappy -, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger +, zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger, Security }: # Note: @@ -22,8 +22,8 @@ let version = "3.2.9"; buildInputs = [ sasl boost gperftools pcre-cpp snappy - zlib libyamlcpp sasl openssl libpcap - ]; # ++ optional stdenv.is64bit wiredtiger; + zlib libyamlcpp sasl openssl.dev openssl.out libpcap + ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; other-args = concatStringsSep " " ([ "--ssl" @@ -80,6 +80,11 @@ in stdenv.mkDerivation rec { substituteInPlace src/third_party/s2/s2cap.cc --replace drem remainder substituteInPlace src/third_party/s2/s2latlng.cc --replace drem remainder substituteInPlace src/third_party/s2/s2latlngrect.cc --replace drem remainder + '' + stdenv.lib.optionalString stdenv.isi686 '' + + # don't fail by default on i686 + substituteInPlace src/mongo/db/storage/storage_options.h \ + --replace 'engine("wiredTiger")' 'engine("mmapv1")' ''; buildPhase = '' diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index 334b78c9128..fa78c876c1e 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/nsq/deps.json b/pkgs/servers/nsq/deps.json deleted file mode 100644 index c6a8392d919..00000000000 --- a/pkgs/servers/nsq/deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "github.com/mreiferson/go-snappystream", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-snappystream", - "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504", - "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6" - } - }, - { - "goPackagePath": "github.com/bitly/go-nsq", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-nsq", - "rev": "22a8bd48c443ec23bb559675b6df8284bbbdab29", - "sha256": "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46" - } - }, - { - "goPackagePath": "github.com/bitly/go-simplejson", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-simplejson", - "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a", - "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "9bf7bff48b0388cb75991e58c6df7d13e982f1f2", - "sha256": "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7" - } - }, - { - "goPackagePath": "github.com/bmizerany/perks", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/perks", - "rev": "6cb9d9d729303ee2628580d9aec5db968da3a607", - "sha256": "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/bitly/go-hostpool", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-hostpool", - "rev": "d0e59c22a56e8dadfed24f74f452cea5a52722d2", - "sha256": "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g" - } - }, - { - "goPackagePath": "github.com/bitly/timer_metrics", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/timer_metrics", - "rev": "afad1794bb13e2a094720aeb27c088aa64564895", - "sha256": "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-options", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-options", - "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52", - "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm" - } - } -] diff --git a/pkgs/servers/nsq/deps.nix b/pkgs/servers/nsq/deps.nix new file mode 100644 index 00000000000..751a18ca92d --- /dev/null +++ b/pkgs/servers/nsq/deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "github.com/mreiferson/go-snappystream"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-snappystream"; + rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; + }; + } + { + goPackagePath = "github.com/bitly/go-nsq"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-nsq"; + rev = "22a8bd48c443ec23bb559675b6df8284bbbdab29"; + sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "9bf7bff48b0388cb75991e58c6df7d13e982f1f2"; + sha256 = "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7"; + }; + } + { + goPackagePath = "github.com/bmizerany/perks"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/perks"; + rev = "6cb9d9d729303ee2628580d9aec5db968da3a607"; + sha256 = "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/bitly/go-hostpool"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-hostpool"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; + }; + } + { + goPackagePath = "github.com/bitly/timer_metrics"; + fetch = { + type = "git"; + url = "https://github.com/bitly/timer_metrics"; + rev = "afad1794bb13e2a094720aeb27c088aa64564895"; + sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-options"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-options"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + }; + } +] diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 3e3bcea46a2..b58fc342ded 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/oauth2_proxy/deps.json b/pkgs/servers/oauth2_proxy/deps.json deleted file mode 100644 index 56f27b6b4e5..00000000000 --- a/pkgs/servers/oauth2_proxy/deps.json +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/fsnotify.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fsnotify.v1", - "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", - "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/bitly/go-simplejson", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-simplejson", - "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a", - "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-options", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-options", - "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52", - "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm" - } - }, - { - "goPackagePath": "google.golang.org/api", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/google-api-go-client", - "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80", - "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8" - } - }, - { - "goPackagePath": "google.golang.org/cloud", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/gocloud", - "rev": "6335269abf9002cf5a84613c13cda6010842b834", - "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf" - } - }, - { - "goPackagePath": "golang.org/x/oauth2", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/oauth2", - "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a", - "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8" - } - }, - { - "goPackagePath": "github.com/18F/hmacauth", - "fetch": { - "type": "git", - "url": "https://github.com/18F/hmacauth", - "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd", - "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1" - } - } -] diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix new file mode 100644 index 00000000000..37ddbbde64e --- /dev/null +++ b/pkgs/servers/oauth2_proxy/deps.nix @@ -0,0 +1,83 @@ +[ + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + fetch = { + type = "git"; + url = "https://github.com/bitly/go-simplejson"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-options"; + fetch = { + type = "git"; + url = "https://github.com/mreiferson/go-options"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + }; + } + { + goPackagePath = "google.golang.org/api"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/google-api-go-client"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + fetch = { + type = "git"; + url = "https://code.googlesource.com/gocloud"; + rev = "6335269abf9002cf5a84613c13cda6010842b834"; + sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/oauth2"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + }; + } + { + goPackagePath = "github.com/18F/hmacauth"; + fetch = { + type = "git"; + url = "https://github.com/18F/hmacauth"; + rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd"; + sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"; + }; + } +] diff --git a/pkgs/servers/owncloud/default.nix b/pkgs/servers/owncloud/default.nix index 296a6144532..ada198a171a 100644 --- a/pkgs/servers/owncloud/default.nix +++ b/pkgs/servers/owncloud/default.nix @@ -38,28 +38,33 @@ in { }; owncloud70 = common { - versiona = "7.0.12"; - sha256 = "d1a0f73f5094ec1149b50e2409b5fea0a9bebb16d663789d4b8f98fed341aa91"; + versiona = "7.0.15"; + sha256 = "1b2a0fccxlkqyyzsymx7qw8qbhsks3i6h1ybvxv8nn8hgw33nqv7"; }; owncloud80 = common { - versiona = "8.0.12"; - sha256 = "04n8r9kya5w1vlib4rbchf0qcl1mrsrrjml9010a9zhh2kajg1g0"; + versiona = "8.0.15"; + sha256 = "18042jkp4p3b6xh394zm80126975g94r4ka8gzwhyvgfwpgxrx84"; }; owncloud81 = common { - versiona = "8.1.7"; - sha256 = "0xl67axyh7pblsjb1j86vjd8ic42ga1f7yl3ghxy8rk2xrs8cii7"; + versiona = "8.1.10"; + sha256 = "1vspsd3l86mrhhddmyafwdr961f4dy6ln2j4dds2h45wf6296c63"; }; owncloud82 = common { - versiona = "8.2.4"; - sha256 = "03br4lsjz9zxd083lqa0ag3f29224l1ksz59r4fdnnbafj9ixv0s"; + versiona = "8.2.8"; + sha256 = "0k10b3gfpfk3imxhkra0vn6a004xmcma09lw6pgxnalpmpbm8jiy"; }; owncloud90 = common { - versiona = "9.0.2"; - sha256 = "845c43fe981fa0fd07fc3708f41f1ea15ecb11c2a15c65a4de191fc85b237c74"; + versiona = "9.0.5"; + sha256 = "1igpjc4rfaxqrkf2dln85wvdii54nrmwlh17fq3g0232l3vw9hn8"; + }; + + owncloud91 = common { + versiona = "9.1.1"; + sha256 = "1fd73ggzj2v43j284is2c6936gwkmz1inr5fm88rmq5pxcqkbgx6"; }; } diff --git a/pkgs/servers/ps3netsrv/default.nix b/pkgs/servers/ps3netsrv/default.nix new file mode 100644 index 00000000000..6aaaf95fae1 --- /dev/null +++ b/pkgs/servers/ps3netsrv/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchgit }: + +stdenv.mkDerivation rec { + name = "ps3netsrv-${version}"; + version = "1.1.0"; + + enableParallelBuilding = true; + + src = fetchgit { + url = "https://github.com/dirkvdb/ps3netsrv--"; + fetchSubmodules = true; + rev = "e54a66cbf142b86e2cffc1701984b95adb921e81"; + sha256 = "09hvmfzqy2jckpsml0z1gkcnar8sigmgs1q66k718fph2d3g54sa"; + }; + + buildPhase = "make CXX=$CXX"; + installPhase = '' + mkdir -p $out/bin + cp ps3netsrv++ $out/bin + ''; + + meta = { + description = "C++ implementation of the ps3netsrv server"; + homepage = https://github.com/dirkvdb/ps3netsrv--; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/servers/radicale/default.nix b/pkgs/servers/radicale/default.nix new file mode 100644 index 00000000000..47bdad75343 --- /dev/null +++ b/pkgs/servers/radicale/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "radicale-${version}"; + version = "1.1.1"; + + src = fetchurl { + url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz"; + sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2"; + }; + + propagatedBuildInputs = [ + pythonPackages.flup + pythonPackages.ldap + pythonPackages.sqlalchemy + ]; + + doCheck = true; + + meta = with stdenv.lib; { + homepage = http://www.radicale.org/; + description = "CalDAV CardDAV server"; + longDescription = '' + The Radicale Project is a complete CalDAV (calendar) and CardDAV + (contact) server solution. Calendars and address books are available for + both local and remote access, possibly limited through authentication + policies. They can be viewed and edited by calendar and contact clients + on mobile phones or computers. + ''; + license = licenses.gpl3Plus; + platform = platforms.all; + maintainers = with maintainers; [ edwtjo pSub ]; + }; +} diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh deleted file mode 100644 index c446891d8dc..00000000000 --- a/pkgs/servers/sabnzbd/builder.sh +++ /dev/null @@ -1,13 +0,0 @@ -source $stdenv/setup - -tar xvfz $src -mv SABnzbd-* $out - -mkdir $out/bin -echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd -chmod +x $out/bin/sabnzbd - -wrapPythonProgramsIn $out/bin "$pythonPath" -wrapProgram $out/bin/.sabnzbd-wrapped --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin" - -echo $out diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index ee2176ae49a..14f28c37696 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,24 +1,33 @@ -{stdenv, fetchurl, python, pythonPackages, par2cmdline, unzip, unrar}: +{stdenv, fetchurl, python, par2cmdline, unzip, unrar, p7zip, makeWrapper}: -stdenv.mkDerivation rec { - version = "0.7.20"; +let + pythonEnv = python.withPackages(ps: with ps; [ pyopenssl python.modules.sqlite3 cheetah]); + path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; +in stdenv.mkDerivation rec { + version = "1.1.0"; name = "sabnzbd-${version}"; src = fetchurl { - url = "mirror://sourceforge/sabnzbdplus/SABnzbd-${version}-src.tar.gz"; - sha256 = "0hl7mwgyvm4d68346s7vlv0qlibfh2p2idpyzpjfvk8f79hs9cr0"; + url = "https://github.com/sabnzbd/sabnzbd/archive/${version}.tar.gz"; + sha256 = "16srhknmjx5x2zsg1m0w9bipcv9b3b96bvb27fkf4dc2aswwcsc7"; }; - pythonPath = with pythonPackages; [ pyopenssl sqlite3 cheetah ]; - buildInputs = with pythonPackages; [wrapPython]; - inherit python par2cmdline unzip unrar; + buildInputs = [ pythonEnv makeWrapper ]; - builder = ./builder.sh; + installPhase = '' + mkdir -p $out + cp -R * $out/ + mkdir $out/bin + echo "${pythonEnv}/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd + chmod +x $out/bin/sabnzbd + wrapProgram $out/bin/sabnzbd --set PATH ${path} + ''; meta = with stdenv.lib; { description = "Usenet NZB downloader, par2 repairer and auto extracting server"; homepage = http://sabnzbd.org; license = licenses.gpl2Plus; platforms = platforms.linux; + maintainers = with stdenv.lib.maintainers; [ fridh ]; }; } diff --git a/pkgs/servers/samba/3.x.nix b/pkgs/servers/samba/3.x.nix index e2818a1f648..858f60b3885 100644 --- a/pkgs/servers/samba/3.x.nix +++ b/pkgs/servers/samba/3.x.nix @@ -25,6 +25,12 @@ stdenv.mkDerivation rec { sha256 = "0l9pz2m67vf398q3c2dwn8jwdxsjb20igncf4byhv6yq5dzqlb4g"; }; + patches = [(fetchurl { + url = "https://download.samba.org/pub/samba/patches/security/" + + "samba-3.6.25-security-2015-12-16.patch"; + sha256 = "00dcjcn577825mfdwdp76jfy5kcrqw3s4d5c41gqdq5gfcdbmqdb"; + })]; + buildInputs = [ readline pam openldap popt iniparser libunwind fam acl cups ] ++ stdenv.lib.optional useKerberos kerberos; diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 2368ba18a49..a3bb2d44216 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, python, pkgconfig, perl, libxslt, docbook_xsl -, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc, ntdb, tdb, tevent -, ldb, popt, iniparser, libbsd, libarchive, libiconv, gettext +, docbook_xml_dtd_42, docbook_xml_dtd_45, readline, talloc +, popt, iniparser, libbsd, libarchive, libiconv, gettext , kerberos, zlib, openldap, cups, pam, avahi, acl, libaio, fam, libceph, glusterfs , gnutls, libgcrypt, libgpgerror , ncurses, libunwind, libibverbs, librdmacm, systemd @@ -18,13 +18,15 @@ with lib; stdenv.mkDerivation rec { - name = "samba-4.3.8"; + name = "samba-4.3.11"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "041b5frh4ikcka922aqhqjvlv4w2s7jycyykpvsknj0a79ncd79p"; + sha256 = "1v2grwivm6rasz1ganbybs0ikz1lydaniy65kxf1v8rl1qqngach"; }; + outputs = [ "out" "dev" "man" ]; + patches = [ ./4.x-no-persistent-install.patch ./4.x-fix-ctdb-deps.patch @@ -32,7 +34,7 @@ stdenv.mkDerivation rec { buildInputs = [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /* - docbook_xml_dtd_45 */ readline talloc ntdb tdb tevent ldb popt iniparser + docbook_xml_dtd_45 */ readline talloc popt iniparser libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos ] ++ optionals stdenv.isLinux [ libaio pam systemd ] @@ -60,9 +62,6 @@ stdenv.mkDerivation rec { "--enable-fhs" "--sysconfdir=/etc" "--localstatedir=/var" - "--bundled-libraries=NONE" - "--private-libraries=NONE" - "--builtin-libraries=NONE" ] ++ optional (!enableDomainController) "--without-ad-dc" ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ]; diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix index a9f12594188..b45d66fd141 100644 --- a/pkgs/servers/search/elasticsearch/2.x.nix +++ b/pkgs/servers/search/elasticsearch/2.x.nix @@ -3,12 +3,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.4"; + version = "2.4.0"; name = "elasticsearch-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz"; - sha256 = "0vphyqhna510y8bcihlmz3awzszgyfpmzrfcy548a2pd9mghq7ip"; + sha256 = "1jglmj1dnh1n2niyds6iyrpf6x6ppqgkivzy6qabkjvvmr013q1s"; }; patches = [ ./es-home-2.x.patch ]; diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 7025ddbc12b..8587134ad39 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "groonga-${version}"; - version = "6.0.8"; + version = "6.0.9"; src = fetchurl { url = "http://packages.groonga.org/source/groonga/${name}.tar.gz"; - sha256 = "05mp6zkavxj87nbx0jr48rpjjcf7fzdczxa93sxp4zq2dsnn5s5r"; + sha256 = "1n7kf25yimgy9wy04hv5qvp4rzdzdr0ar92lhwms812qkhp3i4mq"; }; buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++ @@ -24,6 +24,10 @@ stdenv.mkDerivation rec { ${optionalString lz4Support "--with-lz4"} ''; + doInstallCheck = true; + + installCheckPhase = "$out/bin/groonga --version"; + meta = with stdenv.lib; { homepage = http://groonga.org/; description = "An open-source fulltext search engine and column store"; diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 4a37213846a..44c766d35d0 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/serf/deps.json b/pkgs/servers/serf/deps.json deleted file mode 100644 index ffd872c6287..00000000000 --- a/pkgs/servers/serf/deps.json +++ /dev/null @@ -1,137 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/armon/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-metrics", - "rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25", - "sha256": "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck" - } - }, - { - "goPackagePath": "github.com/mattn/go-isatty", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-isatty", - "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449", - "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj" - } - }, - { - "goPackagePath": "github.com/hashicorp/logutils", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/logutils", - "rev": "0dc08b1671f34c4250ce212759ebd880f743d883", - "sha256": "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r" - } - }, - { - "goPackagePath": "github.com/armon/go-radix", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-radix", - "rev": "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93", - "sha256": "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", - "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" - } - }, - { - "goPackagePath": "github.com/hashicorp/memberlist", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/memberlist", - "rev": "6025015f2dc659ca2c735112d37e753bda6e329d", - "sha256": "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7" - } - }, - { - "goPackagePath": "github.com/mitchellh/mapstructure", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/mapstructure", - "rev": "281073eb9eb092240d33ef253c404f1cca550309", - "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh" - } - }, - { - "goPackagePath": "github.com/armon/circbuf", - "fetch": { - "type": "git", - "url": "https://github.com/armon/circbuf", - "rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf", - "sha256": "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s" - } - }, - { - "goPackagePath": "github.com/hashicorp/mdns", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/mdns", - "rev": "2b439d37011456df8ff83a70ffd1cd6046410113", - "sha256": "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96" - } - }, - { - "goPackagePath": "github.com/mitchellh/cli", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/cli", - "rev": "8102d0ed5ea2709ade1243798785888175f6e415", - "sha256": "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2" - } - }, - { - "goPackagePath": "github.com/ryanuber/columnize", - "fetch": { - "type": "git", - "url": "https://github.com/ryanuber/columnize", - "rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a", - "sha256": "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-msgpack", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/hashicorp/go.net", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go.net", - "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29", - "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf" - } - } -] diff --git a/pkgs/servers/serf/deps.nix b/pkgs/servers/serf/deps.nix new file mode 100644 index 00000000000..bc5b960d147 --- /dev/null +++ b/pkgs/servers/serf/deps.nix @@ -0,0 +1,137 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/armon/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-metrics"; + rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25"; + sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + } + { + goPackagePath = "github.com/hashicorp/logutils"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/logutils"; + rev = "0dc08b1671f34c4250ce212759ebd880f743d883"; + sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + fetch = { + type = "git"; + url = "https://github.com/armon/go-radix"; + rev = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93"; + sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-syslog"; + rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; + sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; + }; + } + { + goPackagePath = "github.com/hashicorp/memberlist"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/memberlist"; + rev = "6025015f2dc659ca2c735112d37e753bda6e329d"; + sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/armon/circbuf"; + fetch = { + type = "git"; + url = "https://github.com/armon/circbuf"; + rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; + sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; + }; + } + { + goPackagePath = "github.com/hashicorp/mdns"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/mdns"; + rev = "2b439d37011456df8ff83a70ffd1cd6046410113"; + sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"; + }; + } + { + goPackagePath = "github.com/mitchellh/cli"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/cli"; + rev = "8102d0ed5ea2709ade1243798785888175f6e415"; + sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"; + }; + } + { + goPackagePath = "github.com/ryanuber/columnize"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/columnize"; + rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; + sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-msgpack"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/hashicorp/go.net"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go.net"; + rev = "104dcad90073cd8d1e6828b2af19185b60cf3e29"; + sha256 = "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"; + }; + } +] diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 657352634ef..ccb174371e0 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/servers/skydns/deps.json b/pkgs/servers/skydns/deps.json deleted file mode 100644 index 5706ab2fc95..00000000000 --- a/pkgs/servers/skydns/deps.json +++ /dev/null @@ -1,128 +0,0 @@ -[ - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1", - "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common", - "rev": "40456948a47496dc22168e6af39297a2f8fbf38c", - "sha256": "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/coreos/go-etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-etcd", - "rev": "9847b93751a5fbaf227b893d172cee0104ac6427", - "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/stathat/go", - "fetch": { - "type": "git", - "url": "https://github.com/stathat/go", - "rev": "91dfa3a59c5b233fef9a346a1460f6e2bc889d93", - "sha256": "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - } -] diff --git a/pkgs/servers/skydns/deps.nix b/pkgs/servers/skydns/deps.nix new file mode 100644 index 00000000000..a4f4eb12045 --- /dev/null +++ b/pkgs/servers/skydns/deps.nix @@ -0,0 +1,128 @@ +[ + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; + sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "40456948a47496dc22168e6af39297a2f8fbf38c"; + sha256 = "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; + sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/stathat/go"; + fetch = { + type = "git"; + url = "https://github.com/stathat/go"; + rev = "91dfa3a59c5b233fef9a346a1460f6e2bc889d93"; + sha256 = "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + fetch = { + type = "hg"; + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index 91e292944a6..a86862a14a5 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.4230"; + version = "2.0.0.4326"; src = fetchurl { url = "http://download.sonarr.tv/v2/master/mono/NzbDrone.master.${version}.mono.tar.gz"; - sha256 = "16nx0v5hpqlwna2hzpcpzvm7qc361yjxbqnwz5bfnnkb0h7ik5m6"; + sha256 = "1lrfwwy5bjsmrq6zpx0kadmlacafmj44qhifswbhljlykxwsld7r"; }; buildInputs = [ diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix new file mode 100644 index 00000000000..0a5e0d17040 --- /dev/null +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, gcc }: + +buildGoPackage rec { + name = "cockroach-${version}"; + version = "beta-20160915"; + + goPackagePath = "github.com/cockroachdb/cockroach"; + subPackages = [ "." ]; + + src = fetchFromGitHub { + owner = "cockroachdb"; + repo = "cockroach"; + rev = version; + sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3"; + }; + + buildFlagsArray = '' + -ldflags= + -X github.com/cockroachdb/cockroach/build.tag=${version} + ''; + + buildInputs = [ gcc ]; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + homepage = https://www.cockroachlabs.com; + description = "A scalable, survivable, strongly-consistent SQL database"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.rushmorem ]; + }; +} diff --git a/pkgs/servers/sql/cockroachdb/deps.nix b/pkgs/servers/sql/cockroachdb/deps.nix new file mode 100644 index 00000000000..da2ab57f91a --- /dev/null +++ b/pkgs/servers/sql/cockroachdb/deps.nix @@ -0,0 +1,471 @@ +# This file was generated by go2nix. +[ + { + goPackagePath = "github.com/VividCortex/ewma"; + fetch = { + type = "git"; + url = "https://github.com/VividCortex/ewma"; + rev = "8b9f1311551e712ea8a06b494238b8a2351e1c33"; + sha256 = "1w8gf6310dxl57jdq1b04wbh4ssb0nvck3926bbd86mnw78z0byl"; + }; + } + { + goPackagePath = "github.com/backtrace-labs/go-bcd"; + fetch = { + type = "git"; + url = "https://github.com/backtrace-labs/go-bcd"; + rev = "c5383e2df7004f8b2fb2f10a33167d757bb0fbfb"; + sha256 = "0v7al14ql8vddj8bw2yp1pp47nfdhq6vglbv6fmpg5sf5yfsp9xa"; + }; + } + { + goPackagePath = "github.com/biogo/store"; + fetch = { + type = "git"; + url = "https://github.com/biogo/store"; + rev = "913427a1d5e89604e50ea1db0f28f34966d61602"; + sha256 = "0xgz1g9digvvw64rmzw90a6iyxlljiiz2i1x0x0d8mw4wyaxcipz"; + }; + } + { + goPackagePath = "github.com/cenk/backoff"; + fetch = { + type = "git"; + url = "https://github.com/cenk/backoff"; + rev = "cdf48bbc1eb78d1349cbda326a4a037f7ba565c6"; + sha256 = "0dg7hvpv0a1db8qriygz1jqgp16v8k505b197x9902z7z6lldgbh"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "a193146c91dea4b6cf30f355e99fb85f73d20f07"; + sha256 = "0amg5p3xadmj4p58f63f8kkggs9q3f3jhi7ijzb79grbg1lj2rj2"; + }; + } + { + goPackagePath = "github.com/cockroachdb/c-jemalloc"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/c-jemalloc"; + rev = "42e6a32cd7a4dff9c70d80323681d46d046181ef"; + sha256 = "16ddzw35xj2vz8324mac5bhhr9akvjrg14lgq2mn5nfw1zs42r7n"; + }; + } + { + goPackagePath = "github.com/cockroachdb/c-protobuf"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/c-protobuf"; + rev = "951f3e665896e7ba939fd1f2db9aeaae6ca988f8"; + sha256 = "032ncrq4p48riwk8zj6p3rp65p87k9793lg107ja6mf8nx0v3z3l"; + }; + } + { + goPackagePath = "github.com/cockroachdb/c-rocksdb"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/c-rocksdb"; + rev = "b5ca031b93fde49bfa2ba99aba423136aebf3c06"; + sha256 = "1vwq8fbcgwvq2mqv1vwm3b671iklg26s7zd3bgxr5rl076mhn6s5"; + }; + } + { + goPackagePath = "github.com/cockroachdb/c-snappy"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/c-snappy"; + rev = "d4e7b428fe7fc09e93573df3448567a62df8c9fa"; + sha256 = "09c1pnks51ypvqh97yf9mvi034cc3bb8dj3vkl9v959pg5ix91g4"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cmux"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cmux"; + rev = "b64f5908f4945f4b11ed4a0a9d3cc1e23350866d"; + sha256 = "1by4f3x7j3r3z1sdx1v04r494hn6jaag7lc03prrgx455j8i0jlh"; + }; + } + { + goPackagePath = "github.com/cockroachdb/cockroach"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/cockroach"; + rev = "3fff05767cd3eda2197ce102391c0de447fef606"; + sha256 = "11camp588vsccxlc138l7x4qws2fj5wpx1177irzayqdng8dilx3"; + }; + } + { + goPackagePath = "github.com/cockroachdb/pq"; + fetch = { + type = "git"; + url = "https://github.com/cockroachdb/pq"; + rev = "40c6b2414c76cdb84aacc955f79dc844e48ad0c0"; + sha256 = "16pnyndzlsk5rbbrimpkg6mf9w2qf0z64pk2k70ja4a65kihlw9g"; + }; + } + { + goPackagePath = "github.com/codahale/hdrhistogram"; + fetch = { + type = "git"; + url = "https://github.com/codahale/hdrhistogram"; + rev = "f8ad88b59a584afeee9d334eff879b104439117b"; + sha256 = "1y1llqaczhc5hqa71pwa1ns8nchizpl678lp23vl51c04swn8h8n"; + }; + } + { + goPackagePath = "github.com/coreos/etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/etcd"; + rev = "656167d760543d442eae62f0c8c4f92c05f59508"; + sha256 = "1v4bwfh7ziklfcdapnyky00gjivcn1n30b72pwmbdlk7283p555k"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + fetch = { + type = "git"; + url = "https://github.com/cpuguy83/go-md2man"; + rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; + sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8"; + sha256 = "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k"; + }; + } + { + goPackagePath = "github.com/elastic/gosigar"; + fetch = { + type = "git"; + url = "https://github.com/elastic/gosigar"; + rev = "7c0ce0d4814c8d4950d7e7f40ed3b6359e757875"; + sha256 = "1nar7jia3xfgwnvazp25m9b0kxxklarrq9fzdr63j3nqy2fnwvca"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + fetch = { + type = "git"; + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "e1a2a7ec64b07d04ac9ebb072404fe8b7b60de1b"; + sha256 = "0b6q8h9fwpgpkvml1j87wq9174g7px1dmskhm884drpvswda2djk"; + }; + } + { + goPackagePath = "github.com/facebookgo/clock"; + fetch = { + type = "git"; + url = "https://github.com/facebookgo/clock"; + rev = "600d898af40aa09a7a93ecb9265d87b0504b6f03"; + sha256 = "1z3jxwsqll65il7rcdx5j4dggg6w143z24h3agk09xvsc2iyj7a2"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "a4cceea7a401a73fefafd1a21fedbd4694124a82"; + sha256 = "1b23izdgxlz010qrqgazm5yg0bc3pkni1qdf8n3z3xcn58hcx2yg"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "2c1988e8c18d14b142c0b472624f71647cf39adb"; + sha256 = "176x3yv6l0i49ddv73r9v6w9qcmgrfzy8db26r01yk7sczq75nd5"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "7d79101e329e5a3adf994758c578dab82b90c017"; + sha256 = "1c1hsy5s2pfawg3l9954jmqmy4yc2zp3f7i87m00km2yqgb8xpd0"; + }; + } + { + goPackagePath = "github.com/grpc-ecosystem/grpc-gateway"; + fetch = { + type = "git"; + url = "https://github.com/grpc-ecosystem/grpc-gateway"; + rev = "ccd4e6b091a44f9f6b32848ffc63b3e8f8e26092"; + sha256 = "0nl9hddmxw2s4cqpg70k1913fna101lxrha6dgplw8g8rjikfna4"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + fetch = { + type = "git"; + url = "https://github.com/julienschmidt/httprouter"; + rev = "d8ff598a019f2c7bad0980917a588193cf26666e"; + sha256 = "11sdd5fi2w0szk850n4y35x4v2ndy62c3ss9alha5xcj4jh1j0yq"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "737b74a46c4bf788349f72cb256fed10aea4d0ac"; + sha256 = "13bip4vamvij8dx0v0nhrikz6qhsimd0w4i55424c76ws6ph84i8"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "7cafcd837844e784b526369c9bce262804aebc60"; + sha256 = "0br693pf6vdr1sfvzdz6zxq7hjpdgci0il4wj0v636r8lyy21vsx"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "80f8150043c80fb52dee6bc863a709cdac7ec8f8"; + sha256 = "0brk4di63f56x9fsidn8dk7c2azan1kjzrli79h262j9pd17c3jm"; + }; + } + { + goPackagePath = "github.com/lightstep/lightstep-tracer-go"; + fetch = { + type = "git"; + url = "https://github.com/lightstep/lightstep-tracer-go"; + rev = "f3c66066ce6023ad1bd721cfbd9fbd6292eb08cc"; + sha256 = "1ci38j6d3spy2279l6anxxvm7k85h4fr08pdfw9ghrv96ajmaizb"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8"; + sha256 = "17lf13ndnai9a6dlmykqkdyzf1z04q7kffs0l7kvd78wpv3l6rm5"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "c12348ce28de40eed0136aa2b644d0ee0650e56c"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "daf2955e742cf123959884fdff4685aa79b63135"; + sha256 = "1fvl251ms7qmzfbi853kdgghqkrmyy6n1605mfy50nhgvw03z203"; + }; + } + { + goPackagePath = "github.com/opentracing/basictracer-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/basictracer-go"; + rev = "c7c0202a8a77f658aeb2193a27b6c0cfcc821038"; + sha256 = "09mh7dlhr3lyw8kwpa07ywjzr3bg7847ky4hvx551lhyqk0bfv0l"; + }; + } + { + goPackagePath = "github.com/opentracing/opentracing-go"; + fetch = { + type = "git"; + url = "https://github.com/opentracing/opentracing-go"; + rev = "855519783f479520497c6b3445611b05fc42f009"; + sha256 = "15amxprc5n0dgr42jd1lkcn697m7pcvmksps9g1gw38ahyicxq8g"; + }; + } + { + goPackagePath = "github.com/petermattis/goid"; + fetch = { + type = "git"; + url = "https://github.com/petermattis/goid"; + rev = "208e1c5be6bf38853827abdc6290b5f6a0c404d5"; + sha256 = "0d511pdyrv9lkzq04agnm7019c1769vmdq8kyh66pq2np1x6jsl2"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "a22138067af1c4942683050411a841ade67fe1eb"; + sha256 = "0fay1zxi8y4kj1q33mqxdsbicg9cplknnmzz87c9saq7rb4k6f36"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "ebdfc6da46522d58825777cf1f90490a5b1ef1d8"; + sha256 = "0js62pj8600773wx6labpd772yyhz5ivim7dnl7b862wblbmc8mq"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "bdb33529eca3e55eac7328e07c57012a797af602"; + sha256 = "146hfddgdi8rkg25v1f25klz3sy5slp0gny2lwjyi63jwly07512"; + }; + } + { + goPackagePath = "github.com/rubyist/circuitbreaker"; + fetch = { + type = "git"; + url = "https://github.com/rubyist/circuitbreaker"; + rev = "7e3e7fbe9c62b943d487af023566a79d9eb22d3b"; + sha256 = "01fshh514bq2bk7f6xv7zr781m23d3k1mla1lh8azqw5874m7a07"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + fetch = { + type = "git"; + url = "https://github.com/russross/blackfriday"; + rev = "93622da34e54fb6529bfb7c57e710f37a8d9cbd8"; + sha256 = "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2"; + }; + } + { + goPackagePath = "github.com/satori/go.uuid"; + fetch = { + type = "git"; + url = "https://github.com/satori/go.uuid"; + rev = "0aa62d5ddceb50dbcb909d790b5345affd3669b6"; + sha256 = "1vfzfcspanxcbpdpv49580rh6kamzcs3lm70xnx724mkwi41zi8w"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + fetch = { + type = "git"; + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7c674d9e72017ed25f6d2b5e497a1368086b6a6f"; + sha256 = "0an935r7lc11a744mvdrsy56rs2w0ah3gdclvr4gzd5iqr9ap3dr"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "f676131e2660dc8cd88de99f7486d34aa8172635"; + sha256 = "0gj4fpary501n32ag49mkd0vymqw01am0lv78l9db9dvd2im0i4m"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a548aac93ed489257b9d959b40fe1e8c1e20778c"; + sha256 = "022vl9s6hf8qzdrxfivzd3dg1gsr1vns0j3a3xfdkgv5z9qyvy83"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "07b51741c1d6423d4a6abab1c49940ec09cb1aaf"; + sha256 = "12lvdj0k2gww4hw5f79qb9yswqpy4i3bgv1likmf3mllgdxfm20w"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "a646d33e2ee3172a661fc09bca23bb4889a41bc8"; + sha256 = "1jniqg2nv5zhdzfm9gwfx0s9q8mwxrgcxdbkd6cddk9w0qgji9dc"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "2910a502d2bf9e43193af9d68ca516529614eed3"; + sha256 = "1h2bxzsnqksnvrk2lplpqzzpp9m9zmd6f2aajyahc56bxb1804jq"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "79b7c349179cdd6efd8bac4a1ce7f01b98c16e9b"; + sha256 = "0w2g3pcxxgnp3fk0qy7ail8mxdxv3cf1yavdx8rrjn9idyd261df"; + }; + } + { + goPackagePath = "gopkg.in/inf.v0"; + fetch = { + type = "git"; + url = "https://gopkg.in/inf.v0"; + rev = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4"; + sha256 = "0rf3vwyb8aqnac9x9d6ax7z5526c45a16yjm2pvkijr6qgqz8b82"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v1"; + rev = "9f9df34309c04878acc86042b16630b0f696e1de"; + sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm"; + }; + } +] diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 699520a2df5..422715925b8 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -14,13 +14,12 @@ mariadb = everything // { lib = client; # compat. with the old mariadb split }; - common = rec { # attributes common to both builds - version = "10.1.16"; + version = "10.1.18"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "14s3wq1c25n62n75hkixl8n7cni4m73w055nsx4czm655k33bjv7"; + sha256 = "0wrvhyck95czhz553834i9im7ljvn8k2byakcinlji7zx43njcyp"; }; prePatch = '' @@ -155,6 +154,9 @@ everything = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' rm -r "$out"/{mysql-test,sql-bench,data} # Don't need testing data rm "$out"/share/man/man1/mysql-test-run.pl.1 + + # Don't install mysqlbug to prevent a dependency on gcc. + rm $out/bin/mysqlbug ''; }); diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix deleted file mode 100644 index 0e27211a060..00000000000 --- a/pkgs/servers/sql/monetdb/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ composableDerivation, fetchurl, pcre, openssl, readline, libxml2, geos, apacheAnt, jdk5 }: - -let inherit (composableDerivation) edf; in - -composableDerivation.composableDerivation {} { - - name = "monetdb-2009-05-01"; - - src = fetchurl { - url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2; - sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj"; - }; - - flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; } - // { - java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; }; - /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */ - }; - - buildInputs = [ pcre - openssl readline libxml2 ]; # optional python perl php java ? - - cfg = { - geomSupport = true; - javaSupport = true; - }; - - dontBuild = true; - - installPhase = '' - mkdir $TMP/build - sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery - ''; - - meta = { - description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval"; - homepage = http://monetdb.cwi.nl/; - license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html - }; -} diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 0849e25057b..d9e324efd44 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.50"; + version = "5.5.52"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "0lgr6badwnwbrzm6sbll4a25m02xfy85v4q6q0rq5cdjn745bb2y"; + sha256 = "1zb2h6nmmm42qcc808bwa3sdlhyyyglv44jy4pfxmx5kwqyy283q"; }; patches = if stdenv.isCygwin then [ diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix new file mode 100644 index 00000000000..a2052eca9c2 --- /dev/null +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -0,0 +1,64 @@ +{ stdenv, fetchurl, cmake, bison, ncurses, openssl, readline, zlib, perl +, boost, cctools, CoreServices }: + +# Note: zlib is not required; MySQL can use an internal zlib. + +stdenv.mkDerivation rec { + name = "mysql-${version}"; + version = "5.7.15"; + + src = fetchurl { + url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; + sha256 = "0mlrxcvkn6bf869hjw9fb6m24ak26ndffnd91b4mknmz8cqkb1ch"; + }; + + preConfigure = stdenv.lib.optional stdenv.isDarwin '' + ln -s /bin/ps $TMPDIR/ps + export PATH=$PATH:$TMPDIR + ''; + + buildInputs = [ cmake bison ncurses openssl readline zlib boost ] + ++ stdenv.lib.optionals stdenv.isDarwin [ perl cctools CoreServices ]; + + enableParallelBuilding = true; + + cmakeFlags = [ + "-DWITH_SSL=yes" + "-DWITH_READLINE=yes" + "-DWITH_EMBEDDED_SERVER=yes" + "-DWITH_ZLIB=yes" + "-DHAVE_IPV6=yes" + "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" + "-DMYSQL_DATADIR=/var/lib/mysql" + "-DINSTALL_SYSCONFDIR=etc/mysql" + "-DINSTALL_INFODIR=share/mysql/docs" + "-DINSTALL_MANDIR=share/man" + "-DINSTALL_PLUGINDIR=lib/mysql/plugin" + "-DINSTALL_SCRIPTDIR=bin" + "-DINSTALL_INCLUDEDIR=include/mysql" + "-DINSTALL_DOCREADMEDIR=share/mysql" + "-DINSTALL_SUPPORTFILESDIR=share/mysql" + "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_DOCDIR=share/mysql/docs" + "-DINSTALL_SHAREDIR=share/mysql" + ]; + + NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + + prePatch = '' + sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake + ''; + postInstall = '' + sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db + rm -r $out/mysql-test "$out"/lib/*.a + rm $out/share/man/man1/mysql-test-run.pl.1 + ''; + + passthru.mysqlVersion = "5.7"; + + meta = { + homepage = http://www.mysql.com/; + description = "The world's most popular open source database"; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 3fb0c1e86eb..046eb6cfca9 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: -stdenv.mkDerivation { - name = "mysql-connector-java-5.1.38"; +stdenv.mkDerivation rec { + name = "mysql-connector-java-5.1.39"; builder = ./builder.sh; src = fetchurl { - url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.38.zip; - sha256 = "0b1j2dylnpk6b17gn3168qdrrwq8kdil57nxrd08n1lnkirdsx33"; + url = "http://dev.mysql.com/get/Downloads/Connector-J/${name}.zip"; + sha256 = "0d0g51hfx7a2r6nbni8yramg4vpqk0sql0aaib6q576a0nnrq78r"; }; buildInputs = [ unzip ant ]; diff --git a/pkgs/servers/sql/postgresql/pg_repack/default.nix b/pkgs/servers/sql/postgresql/pg_repack/default.nix new file mode 100644 index 00000000000..9a6410490c5 --- /dev/null +++ b/pkgs/servers/sql/postgresql/pg_repack/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, postgresql, openssl, zlib, readline }: + +stdenv.mkDerivation rec { + name = "pg_repack-${version}"; + version = "1.3.4"; + + buildInputs = [ postgresql openssl zlib readline ]; + + src = fetchFromGitHub { + owner = "reorg"; + repo = "pg_repack"; + rev = "ver_${version}"; + sha256 = "1hig4x8iycchlp42q8565jzi6hkj8gpbhl9kpn73jvk7afl7z0c8"; + }; + + installPhase = '' + install -D bin/pg_repack -t $out/bin/ + install -D lib/pg_repack.so -t $out/lib/ + install -D lib/{pg_repack--${version}.sql,pg_repack.control} -t $out/share/extension + ''; + + meta = with stdenv.lib; { + description = "Reorganize tables in PostgreSQL databases with minimal locks"; + longDescription = '' + pg_repack is a PostgreSQL extension which lets you remove bloat from tables and indexes, and optionally restore + the physical order of clustered indexes. Unlike CLUSTER and VACUUM FULL it works online, without holding an + exclusive lock on the processed tables during processing. pg_repack is efficient to boot, + with performance comparable to using CLUSTER directly. + ''; + license = licenses.bsd3; + maintainers = with maintainers; [ danbst ]; + inherit (postgresql.meta) platforms; + inherit (src.meta) homepage; + }; +} diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 715720b335f..5f6b3904155 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dx0lp7cngdchi0772hp93zzn6sdap7z8s3vay3mzb9xgf0sdgy6"; }; + outputs = [ "out" "dev" "doc" ]; + buildInputs = [ libxml2 openssl readline gawk ]; CPP = "${stdenv.cc}/bin/gcc -E"; @@ -18,14 +20,22 @@ stdenv.mkDerivation rec { --enable-openssl=${openssl.dev} "; - postInstall='' + postInstall = '' echo Moving documentation mkdir -pv $out/share/doc mv -v $out/share/virtuoso/doc $out/share/doc/${name} + echo Removing jars and empty directories find $out -name "*.a" -delete -o -name "*.jar" -delete -o -type d -empty -delete - ''; - + + for f in $out/lib/*.la; do + echo "Fixing $f" + substituteInPlace $f \ + --replace "${readline.dev}" "${readline.out}/lib" \ + --replace "${openssl.dev}/lib" "${openssl.out}/lib" + done + ''; + meta = with stdenv.lib; { description = "SQL/RDF database used by, e.g., KDE-nepomuk"; homepage = http://virtuoso.openlinksw.com/dataspace/dav/wiki/Main/; diff --git a/pkgs/servers/udpt/default.nix b/pkgs/servers/udpt/default.nix new file mode 100644 index 00000000000..97938de74a5 --- /dev/null +++ b/pkgs/servers/udpt/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, boost, sqlite }: + +stdenv.mkDerivation rec { + name = "udpt-${version}"; + version = "2016-02-20"; # v2.0-rc0 with sample config + + enableParallelBuilding = true; + + # Suitable for a network facing daemon. + hardeningEnable = [ "pie" ]; + + src = fetchFromGitHub { + owner = "naim94a"; + repo = "udpt"; + rev = "0790558de8b5bb841bb10a9115bbf72c3b4711b5"; + sha256 = "0rgkjwvnqwbnqy7pm3dk176d3plb5lypaf12533yr0yfzcp6gnzk"; + }; + + buildInputs = [ boost sqlite ]; + + postPatch = '' + # Enabling optimization (implied by fortify hardening) causes htons + # to be re-defined as a macro, turning this use of :: into a syntax error. + sed -i '104a#undef htons' src/udpTracker.cpp + ''; + + installPhase = '' + mkdir -p $out/bin $out/etc/ + cp udpt $out/bin + cp udpt.conf $out/etc/ + # without this, the resulting binary is unstripped. + runHook postInstall + ''; + + meta = { + description = "A lightweight UDP torrent tracker"; + homepage = https://naim94a.github.io/udpt; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 56880b5b869..0ea5dfd1a0d 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "5.0.6"; + version = "5.2.9"; src = fetchurl { url = "https://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "0splrxgh1ppxnf4nynawbn8mwywqsvaib7m60wgnz4inpxhp3pp8"; + sha256 = "1521c5jdk5s4r57i7ajzdfq2l4fmvylqlhvddnxllqm6s4yij7fk"; }; buildInputs = [ unzip ]; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index dd6eeff616f..ac2130d2917 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -25,6 +25,10 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else path = "plugins/rack"; inputs = [ ruby ]; }) + (lib.nameValuePair "cgi" { + path = "plugins/cgi"; + inputs = [ ]; + }) ]; getPlugin = name: diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix new file mode 100644 index 00000000000..36815198d67 --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/composition.nix @@ -0,0 +1,16 @@ +# This file has been generated by node2nix 1.1.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs"}: + +let + nodeEnv = import ../../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv python utillinux runCommand writeTextFile; + inherit nodejs; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl fetchgit; + inherit nodeEnv; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/pump.io/default.nix b/pkgs/servers/web-apps/pump.io/default.nix index 2d376593662..f888566cad6 100644 --- a/pkgs/servers/web-apps/pump.io/default.nix +++ b/pkgs/servers/web-apps/pump.io/default.nix @@ -1,34 +1,19 @@ -{ stdenv, fetchFromGitHub, makeWrapper, callPackage, nodejs, python, utillinux, graphicsmagick }: +{ pkgs, system, stdenv, fetchurl, makeWrapper, nodejs, graphicsmagick }: with stdenv.lib; let - nodePackages = callPackage (import ../../../top-level/node-packages.nix) { - inherit stdenv nodejs fetchurl fetchgit; - neededNatives = [ python ] ++ optional stdenv.isLinux utillinux; - self = nodePackages; - generated = ./node-packages.nix; + # To regenerate composition.nix, run generate.sh. + nodePackages = import ./composition.nix { + inherit pkgs system nodejs; }; - -in nodePackages.buildNodePackage rec { - version = "git-2015-11-09"; - name = "pump.io-${version}"; - - src = fetchFromGitHub { - owner = "e14n"; - repo = "pump.io"; - rev = "2f8d6b3518607ed02b594aee0db6ccacbe631b2d"; - sha256 = "1xym3jzpxlni1n2i0ixwrnpkx5fbnd1p6sm1hf9n3w5m2lx6gdw5"; - }; - - deps = (filter (v: nixType v == "derivation") (attrValues nodePackages)); - - buildInputs = [ makeWrapper ]; +in +nodePackages.package.override (oldAttrs: { + buildInputs = oldAttrs.buildInputs ++ [ makeWrapper ]; postInstall = '' for prog in pump pump-authorize pump-follow pump-post-note pump-register-app pump-register-user pump-stop-following; do wrapProgram "$out/bin/$prog" \ - --set NODE_PATH "$out/lib/node_modules/pump.io/node_modules/" \ --prefix PATH : ${graphicsmagick}/bin:$out/bin done ''; @@ -65,4 +50,4 @@ in nodePackages.buildNodePackage rec { * Experimenting with social software ''; }; -} +}) diff --git a/pkgs/servers/web-apps/pump.io/generate.sh b/pkgs/servers/web-apps/pump.io/generate.sh new file mode 100755 index 00000000000..51e05ce37d6 --- /dev/null +++ b/pkgs/servers/web-apps/pump.io/generate.sh @@ -0,0 +1,29 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix curl jshon + +set -e + +# Normally, this node2nix invocation would be sufficient: +# exec node2nix --input node-packages.json --composition composition.nix +# +# But pump.io soft-depends on extra modules, which have to be *inside* +# its own node_modules, not beside them. +# +# So we hack these extra deps into package.json and feed that into +# node2nix. +# +# Also jshon does funny things with slashes in strings, which can be +# fixed with sed. + +curl https://raw.githubusercontent.com/e14n/pump.io/v1.0.0/package.json | \ + jshon -e dependencies \ + -s '*' -i databank-mongodb \ + -s '*' -i databank-redis \ + -s '*' -i databank-memcached \ + -s '*' -i databank-lrucache \ + -p | sed 's=\\/=/=g' > full-package.json + +node2nix --input full-package.json --composition composition.nix --node-env ../../../development/node-packages/node-env.nix + +# overriding nodePackages src doesn't seem to work, so... +sed -i 's|src = ./.|src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }|' node-packages.nix diff --git a/pkgs/servers/web-apps/pump.io/node-packages.json b/pkgs/servers/web-apps/pump.io/node-packages.json index 10d50a0c72e..294da7ab2f1 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.json +++ b/pkgs/servers/web-apps/pump.io/node-packages.json @@ -1,36 +1,7 @@ -{ - "name": "pump.io", - "dependencies": { - "bcrypt": "0.8.x", - "bunyan": "0.16.x", - "connect": "1.x", - "connect-auth": "0.5.3", - "connect-databank": "0.13.x", - "crypto-cacerts": "0.1.x", - "databank": "0.19.x", - "databank-lrucache": "^0.1.2", - "databank-memcached": "^0.15.0", - "databank-mongodb": "^0.18.10", - "databank-redis": "^0.19.6", - "dateformat": "1.x", - "dialback-client": "~0.1.5", - "emailjs": "0.3.x", - "express": "2.5.x", - "gm": "1.9.x", - "jankyqueue": "0.1.x", - "mkdirp": "0.3.x", - "node-uuid": "1.3.x", - "oauth-evanp": "~0.9.10-evanp.2", - "optimist": "0.3.x", - "schlock": "~0.2.1", - "set-immediate": "0.1.x", - "showdown": "0.3.x", - "sockjs": "0.3.x", - "step": "0.0.x", - "underscore": "1.4.x", - "underscore-contrib": "0.1.x", - "utml": "0.2.x", - "validator": "0.4.x", - "webfinger": "~0.4.2" - } -} +[ + "pump.io", + "databank-mongodb", + "databank-redis", + "databank-memcached", + "databank-lrucache" +] diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix index 4d6272511aa..ec05cc8c13b 100644 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ b/pkgs/servers/web-apps/pump.io/node-packages.nix @@ -1,2734 +1,4392 @@ -{ self, fetchurl, fetchgit ? null, lib }: +# This file has been generated by node2nix 1.1.0. Do not edit! +{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: + +let + sources = { + "bcrypt-0.8.7" = { + name = "bcrypt"; + packageName = "bcrypt"; + version = "0.8.7"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; + sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; + }; + }; + "bunyan-1.8.1" = { + name = "bunyan"; + packageName = "bunyan"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.1.tgz"; + sha1 = "68c6a4a502d5620bc9f72d6736810c1b1898097f"; + }; + }; + "connect-2.30.2" = { + name = "connect"; + packageName = "connect"; + version = "2.30.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz"; + sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; + }; + }; + "connect-auth-0.6.1" = { + name = "connect-auth"; + packageName = "connect-auth"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-auth/-/connect-auth-0.6.1.tgz"; + sha1 = "8d798153d6c8e78cb809de82a436f1de7c79868f"; + }; + }; + "connect-databank-1.0.3" = { + name = "connect-databank"; + packageName = "connect-databank"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-databank/-/connect-databank-1.0.3.tgz"; + sha1 = "dad24f08dc385d9c3a94f1a52730aec0c7d13b02"; + }; + }; + "crypto-cacerts-0.1.0" = { + name = "crypto-cacerts"; + packageName = "crypto-cacerts"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz"; + sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; + }; + }; + "databank-0.19.5" = { + name = "databank"; + packageName = "databank"; + version = "0.19.5"; + src = fetchurl { + url = "https://registry.npmjs.org/databank/-/databank-0.19.5.tgz"; + sha1 = "edcbd954b84730c0c5d0de551e004b92f1f53119"; + }; + }; + "dateformat-1.0.12" = { + name = "dateformat"; + packageName = "dateformat"; + version = "1.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; + sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; + }; + }; + "dialback-client-0.2.0" = { + name = "dialback-client"; + packageName = "dialback-client"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dialback-client/-/dialback-client-0.2.0.tgz"; + sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6"; + }; + }; + "dompurify-0.8.3" = { + name = "dompurify"; + packageName = "dompurify"; + version = "0.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.3.tgz"; + sha1 = "06bdc074b91306d09f7f150bfeb96a11e0be64c1"; + }; + }; + "emailjs-1.0.8" = { + name = "emailjs"; + packageName = "emailjs"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/emailjs/-/emailjs-1.0.8.tgz"; + sha1 = "d4240db7670dc78aff97352092d8460edc130f66"; + }; + }; + "express-2.5.11" = { + name = "express"; + packageName = "express"; + version = "2.5.11"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz"; + sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; + }; + }; + "express-session-1.14.1" = { + name = "express-session"; + packageName = "express-session"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.14.1.tgz"; + sha1 = "600364f0f6bf5dce32649e006770bdeee80aec99"; + }; + }; + "gm-1.23.0" = { + name = "gm"; + packageName = "gm"; + version = "1.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gm/-/gm-1.23.0.tgz"; + sha1 = "80a2fe9cbf131515024846444658461269f52661"; + }; + }; + "helmet-2.2.0" = { + name = "helmet"; + packageName = "helmet"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/helmet/-/helmet-2.2.0.tgz"; + sha1 = "fa0737d113fba4bd29d1b39650ac679ad673b948"; + }; + }; + "jankyqueue-0.1.1" = { + name = "jankyqueue"; + packageName = "jankyqueue"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz"; + sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2"; + }; + }; + "jsdom-7.2.2" = { + name = "jsdom"; + packageName = "jsdom"; + version = "7.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; + sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; + }; + }; + "mkdirp-0.5.1" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; + sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + }; + }; + "node-uuid-1.4.7" = { + name = "node-uuid"; + packageName = "node-uuid"; + version = "1.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; + sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; + }; + }; + "oauth-evanp-0.9.10-evanp.2" = { + name = "oauth-evanp"; + packageName = "oauth-evanp"; + version = "0.9.10-evanp.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz"; + sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; + }; + }; + "optimist-0.6.1" = { + name = "optimist"; + packageName = "optimist"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; + sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; + }; + }; + "rimraf-2.5.4" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.4.tgz"; + sha1 = "96800093cbf1a0c86bd95b4625467535c29dfa04"; + }; + }; + "sanitize-html-1.13.0" = { + name = "sanitize-html"; + packageName = "sanitize-html"; + version = "1.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.13.0.tgz"; + sha1 = "4ee17cbec516bfe32f2ce6686a569d7e6b4f3631"; + }; + }; + "schlock-0.2.1" = { + name = "schlock"; + packageName = "schlock"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz"; + sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99"; + }; + }; + "send-0.13.2" = { + name = "send"; + packageName = "send"; + version = "0.13.2"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; + sha1 = "765e7607c8055452bba6f0b052595350986036de"; + }; + }; + "showdown-1.4.3" = { + name = "showdown"; + packageName = "showdown"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/showdown/-/showdown-1.4.3.tgz"; + sha1 = "91d29f4728dbdf76034b7555355e9b30974df447"; + }; + }; + "sockjs-0.3.17" = { + name = "sockjs"; + packageName = "sockjs"; + version = "0.3.17"; + src = fetchurl { + url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.17.tgz"; + sha1 = "ef1b88f5d73e6278fad8e9476ac91064382f3b44"; + }; + }; + "step-0.0.6" = { + name = "step"; + packageName = "step"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz"; + sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; + }; + }; + "ua-parser-js-0.7.10" = { + name = "ua-parser-js"; + packageName = "ua-parser-js"; + version = "0.7.10"; + src = fetchurl { + url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.10.tgz"; + sha1 = "917559ddcce07cbc09ece7d80495e4c268f4ef9f"; + }; + }; + "underscore-1.8.3" = { + name = "underscore"; + packageName = "underscore"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; + sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; + }; + }; + "underscore-contrib-0.3.0" = { + name = "underscore-contrib"; + packageName = "underscore-contrib"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"; + sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; + }; + }; + "utml-0.2.0" = { + name = "utml"; + packageName = "utml"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utml/-/utml-0.2.0.tgz"; + sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48"; + }; + }; + "validator-4.4.0" = { + name = "validator"; + packageName = "validator"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/validator/-/validator-4.4.0.tgz"; + sha1 = "35e29555dd5f7826f970a4eaecff9e6df6df3da6"; + }; + }; + "webfinger-0.4.2" = { + name = "webfinger"; + packageName = "webfinger"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz"; + sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; + }; + }; + "databank-mongodb-0.19.0" = { + name = "databank-mongodb"; + packageName = "databank-mongodb"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.19.0.tgz"; + sha1 = "66ffa32848986d0e138403396506d64895fefc45"; + }; + }; + "databank-redis-0.19.6" = { + name = "databank-redis"; + packageName = "databank-redis"; + version = "0.19.6"; + src = fetchurl { + url = "https://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz"; + sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; + }; + }; + "databank-memcached-0.15.0" = { + name = "databank-memcached"; + packageName = "databank-memcached"; + version = "0.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz"; + sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2"; + }; + }; + "databank-lrucache-0.1.2" = { + name = "databank-lrucache"; + packageName = "databank-lrucache"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; + sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; + }; + }; + "bindings-1.2.1" = { + name = "bindings"; + packageName = "bindings"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; + sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; + }; + }; + "nan-2.3.5" = { + name = "nan"; + packageName = "nan"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; + sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; + }; + }; + "dtrace-provider-0.6.0" = { + name = "dtrace-provider"; + packageName = "dtrace-provider"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz"; + sha1 = "0b078d5517937d873101452d9146737557b75e51"; + }; + }; + "mv-2.1.1" = { + name = "mv"; + packageName = "mv"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; + sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; + }; + }; + "safe-json-stringify-1.0.3" = { + name = "safe-json-stringify"; + packageName = "safe-json-stringify"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz"; + sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e"; + }; + }; + "moment-2.15.0" = { + name = "moment"; + packageName = "moment"; + version = "2.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.15.0.tgz"; + sha1 = "cc9e33958bf4a99dea7111d5e62ed3c13fc96440"; + }; + }; + "nan-2.4.0" = { + name = "nan"; + packageName = "nan"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"; + sha1 = "fb3c59d45fe4effe215f0b890f8adf6eb32d2232"; + }; + }; + "ncp-2.0.0" = { + name = "ncp"; + packageName = "ncp"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; + sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; + }; + }; + "rimraf-2.4.5" = { + name = "rimraf"; + packageName = "rimraf"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; + sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; + }; + }; + "glob-6.0.4" = { + name = "glob"; + packageName = "glob"; + version = "6.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; + sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; + }; + }; + "inflight-1.0.5" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"; + sha1 = "db3204cd5a9de2e6cd890b85c6e2f66bcf4f620a"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "minimatch-3.0.3" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; + sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "path-is-absolute-1.0.0" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz"; + sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912"; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "brace-expansion-1.1.6" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; + sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; + }; + }; + "balanced-match-0.4.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; + sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "basic-auth-connect-1.0.0" = { + name = "basic-auth-connect"; + packageName = "basic-auth-connect"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; + sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; + }; + }; + "body-parser-1.13.3" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz"; + sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; + }; + }; + "bytes-2.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; + sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; + }; + }; + "cookie-0.1.3" = { + name = "cookie"; + packageName = "cookie"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; + sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; + }; + }; + "cookie-parser-1.3.5" = { + name = "cookie-parser"; + packageName = "cookie-parser"; + version = "1.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz"; + sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "compression-1.5.2" = { + name = "compression"; + packageName = "compression"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; + sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; + }; + }; + "connect-timeout-1.6.2" = { + name = "connect-timeout"; + packageName = "connect-timeout"; + version = "1.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz"; + sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e"; + }; + }; + "content-type-1.0.2" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"; + sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed"; + }; + }; + "csurf-1.8.3" = { + name = "csurf"; + packageName = "csurf"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz"; + sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a"; + }; + }; + "debug-2.2.0" = { + name = "debug"; + packageName = "debug"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; + sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; + }; + }; + "depd-1.0.1" = { + name = "depd"; + packageName = "depd"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; + sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; + }; + }; + "errorhandler-1.4.3" = { + name = "errorhandler"; + packageName = "errorhandler"; + version = "1.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz"; + sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; + }; + }; + "express-session-1.11.3" = { + name = "express-session"; + packageName = "express-session"; + version = "1.11.3"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; + sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; + }; + }; + "finalhandler-0.4.0" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; + sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; + }; + }; + "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"; + }; + }; + "http-errors-1.3.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; + sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; + }; + }; + "method-override-2.3.6" = { + name = "method-override"; + packageName = "method-override"; + version = "2.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-2.3.6.tgz"; + sha1 = "209261cc588d45d9d5a022ff20d7d5eb8e92179e"; + }; + }; + "morgan-1.6.1" = { + name = "morgan"; + packageName = "morgan"; + version = "1.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; + sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; + }; + }; + "multiparty-3.3.2" = { + name = "multiparty"; + packageName = "multiparty"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; + sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; + }; + }; + "on-headers-1.0.1" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; + sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; + }; + }; + "parseurl-1.3.1" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; + sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; + }; + }; + "pause-0.1.0" = { + name = "pause"; + packageName = "pause"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz"; + sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74"; + }; + }; + "qs-4.0.0" = { + name = "qs"; + packageName = "qs"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; + sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; + }; + }; + "response-time-2.3.1" = { + name = "response-time"; + packageName = "response-time"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz"; + sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797"; + }; + }; + "serve-favicon-2.3.0" = { + name = "serve-favicon"; + packageName = "serve-favicon"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz"; + sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39"; + }; + }; + "serve-index-1.7.3" = { + name = "serve-index"; + packageName = "serve-index"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"; + sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2"; + }; + }; + "serve-static-1.10.3" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"; + sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; + }; + }; + "type-is-1.6.13" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.13"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"; + sha1 = "6e83ba7bc30cd33a7bb0b7fb00737a2085bf9d08"; + }; + }; + "utils-merge-1.0.0" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; + sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; + }; + }; + "vhost-3.0.2" = { + name = "vhost"; + packageName = "vhost"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz"; + sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; + }; + }; + "iconv-lite-0.4.11" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.11"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; + sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "raw-body-2.1.7" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; + sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "bytes-2.4.0" = { + name = "bytes"; + packageName = "bytes"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; + sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; + }; + }; + "iconv-lite-0.4.13" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.13"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; + sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "accepts-1.2.13" = { + name = "accepts"; + packageName = "accepts"; + version = "1.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; + sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; + }; + }; + "compressible-2.0.8" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.8.tgz"; + sha1 = "7162e6c46d3b9d200ffb45cb4e4a0f7832732503"; + }; + }; + "vary-1.0.1" = { + name = "vary"; + packageName = "vary"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; + sha1 = "99e4981566a286118dfb2b817357df7993376d10"; + }; + }; + "mime-types-2.1.11" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"; + sha1 = "c259c471bda808a85d6cd193b430a5fae4473b3c"; + }; + }; + "negotiator-0.5.3" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; + sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; + }; + }; + "mime-db-1.23.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.23.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"; + sha1 = "a31b4070adaea27d732ea333740a64d0ec9a6659"; + }; + }; + "ms-0.7.1" = { + name = "ms"; + packageName = "ms"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; + sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; + }; + }; + "csrf-3.0.3" = { + name = "csrf"; + packageName = "csrf"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/csrf/-/csrf-3.0.3.tgz"; + sha1 = "69d13220de95762808bb120f7533a994fc4293b5"; + }; + }; + "base64-url-1.2.2" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz"; + sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3"; + }; + }; + "rndm-1.2.0" = { + name = "rndm"; + packageName = "rndm"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; + sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; + }; + }; + "tsscmp-1.0.5" = { + name = "tsscmp"; + packageName = "tsscmp"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; + sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; + }; + }; + "uid-safe-2.1.1" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.1.tgz"; + sha1 = "3dbf9436b528be9f52882c05a6216c3763db3666"; + }; + }; + "random-bytes-1.0.0" = { + name = "random-bytes"; + packageName = "random-bytes"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; + sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; + }; + }; + "accepts-1.3.3" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; + sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "negotiator-0.6.1" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; + sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; + }; + }; + "crc-3.3.0" = { + name = "crc"; + packageName = "crc"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz"; + sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba"; + }; + }; + "uid-safe-2.0.0" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz"; + sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137"; + }; + }; + "base64-url-1.2.1" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; + sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; + }; + }; + "escape-html-1.0.2" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; + sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; + }; + }; + "statuses-1.3.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"; + sha1 = "8e55758cb20e7682c1f4fce8dcab30bf01d1e07a"; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "vary-1.1.0" = { + name = "vary"; + packageName = "vary"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz"; + sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140"; + }; + }; + "basic-auth-1.0.4" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; + sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; + }; + }; + "readable-stream-1.1.14" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; + sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; + }; + }; + "stream-counter-0.2.0" = { + name = "stream-counter"; + packageName = "stream-counter"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; + sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; + }; + }; + "core-util-is-1.0.2" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + }; + "isarray-0.0.1" = { + name = "isarray"; + packageName = "isarray"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; + sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; + }; + }; + "string_decoder-0.10.31" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; + sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + }; + }; + "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"; + }; + }; + "batch-0.5.3" = { + name = "batch"; + packageName = "batch"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; + sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "connect-2.7.11" = { + name = "connect"; + packageName = "connect"; + version = "2.7.11"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-2.7.11.tgz"; + sha1 = "f561d5eef70b8d719c397f724d34ba4065c77a3e"; + }; + }; + "oauth-0.9.10" = { + name = "oauth"; + packageName = "oauth"; + version = "0.9.10"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth/-/oauth-0.9.10.tgz"; + sha1 = "7d356af319a16d889e581fa80f86bbd5ab454646"; + }; + }; + "openid-0.4.1" = { + name = "openid"; + packageName = "openid"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/openid/-/openid-0.4.1.tgz"; + sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; + }; + }; + "qs-0.6.5" = { + name = "qs"; + packageName = "qs"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz"; + sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef"; + }; + }; + "formidable-1.0.14" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz"; + sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a"; + }; + }; + "cookie-signature-1.0.1" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz"; + sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb"; + }; + }; + "buffer-crc32-0.2.1" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz"; + sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c"; + }; + }; + "cookie-0.0.5" = { + name = "cookie"; + packageName = "cookie"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz"; + sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81"; + }; + }; + "send-0.1.1" = { + name = "send"; + packageName = "send"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.1.1.tgz"; + sha1 = "0bcfcbd03def6e2d8612e1abf8f4895b450c60c8"; + }; + }; + "bytes-0.2.0" = { + name = "bytes"; + packageName = "bytes"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz"; + sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0"; + }; + }; + "fresh-0.1.0" = { + name = "fresh"; + packageName = "fresh"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz"; + sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850"; + }; + }; + "pause-0.0.1" = { + name = "pause"; + packageName = "pause"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz"; + sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"; + }; + }; + "mime-1.2.11" = { + name = "mime"; + packageName = "mime"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"; + sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10"; + }; + }; + "range-parser-0.0.4" = { + name = "range-parser"; + packageName = "range-parser"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz"; + sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b"; + }; + }; + "async-1.5.2" = { + name = "async"; + packageName = "async"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; + sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; + }; + }; + "set-immediate-0.1.1" = { + name = "set-immediate"; + packageName = "set-immediate"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz"; + sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; + }; + }; + "vows-0.7.0" = { + name = "vows"; + packageName = "vows"; + version = "0.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; + sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; + }; + }; + "setimmediate-1.0.5" = { + name = "setimmediate"; + packageName = "setimmediate"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; + sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + }; + }; + "eyes-0.1.8" = { + name = "eyes"; + packageName = "eyes"; + version = "0.1.8"; + src = fetchurl { + url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; + sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + }; + }; + "diff-1.0.8" = { + name = "diff"; + packageName = "diff"; + version = "1.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; + sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; + }; + }; + "get-stdin-4.0.1" = { + name = "get-stdin"; + packageName = "get-stdin"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; + sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; + }; + }; + "meow-3.7.0" = { + name = "meow"; + packageName = "meow"; + version = "3.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; + sha1 = "72cb668b425228290abbfa856892587308a801fb"; + }; + }; + "camelcase-keys-2.1.0" = { + name = "camelcase-keys"; + packageName = "camelcase-keys"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; + sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; + }; + }; + "decamelize-1.2.0" = { + name = "decamelize"; + packageName = "decamelize"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; + sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + }; + }; + "loud-rejection-1.6.0" = { + name = "loud-rejection"; + packageName = "loud-rejection"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; + sha1 = "5b46f80147edee578870f086d04821cf998e551f"; + }; + }; + "map-obj-1.0.1" = { + name = "map-obj"; + packageName = "map-obj"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; + sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; + }; + }; + "minimist-1.2.0" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; + sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + }; + }; + "normalize-package-data-2.3.5" = { + name = "normalize-package-data"; + packageName = "normalize-package-data"; + version = "2.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; + sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; + }; + }; + "object-assign-4.1.0" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"; + sha1 = "7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"; + }; + }; + "read-pkg-up-1.0.1" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; + sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + }; + }; + "redent-1.0.0" = { + name = "redent"; + packageName = "redent"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; + sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; + }; + }; + "trim-newlines-1.0.0" = { + name = "trim-newlines"; + packageName = "trim-newlines"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; + sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; + }; + }; + "camelcase-2.1.1" = { + name = "camelcase"; + packageName = "camelcase"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; + sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; + }; + }; + "currently-unhandled-0.4.1" = { + name = "currently-unhandled"; + packageName = "currently-unhandled"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; + sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; + }; + }; + "signal-exit-3.0.1" = { + name = "signal-exit"; + packageName = "signal-exit"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.1.tgz"; + sha1 = "5a4c884992b63a7acd9badb7894c3ee9cfccad81"; + }; + }; + "array-find-index-1.0.1" = { + name = "array-find-index"; + packageName = "array-find-index"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz"; + sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af"; + }; + }; + "hosted-git-info-2.1.5" = { + name = "hosted-git-info"; + packageName = "hosted-git-info"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"; + sha1 = "0ba81d90da2e25ab34a332e6ec77936e1598118b"; + }; + }; + "is-builtin-module-1.0.0" = { + name = "is-builtin-module"; + packageName = "is-builtin-module"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; + sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; + }; + }; + "semver-5.3.0" = { + name = "semver"; + packageName = "semver"; + version = "5.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; + sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; + }; + }; + "validate-npm-package-license-3.0.1" = { + name = "validate-npm-package-license"; + packageName = "validate-npm-package-license"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; + sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; + }; + }; + "builtin-modules-1.1.1" = { + name = "builtin-modules"; + packageName = "builtin-modules"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; + sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; + }; + }; + "spdx-correct-1.0.2" = { + name = "spdx-correct"; + packageName = "spdx-correct"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; + sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; + }; + }; + "spdx-expression-parse-1.0.3" = { + name = "spdx-expression-parse"; + packageName = "spdx-expression-parse"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.3.tgz"; + sha1 = "ca3c3828c4fea8aa44997884b398fc5d67436442"; + }; + }; + "spdx-license-ids-1.2.2" = { + name = "spdx-license-ids"; + packageName = "spdx-license-ids"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; + sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; + }; + }; + "find-up-1.1.2" = { + name = "find-up"; + packageName = "find-up"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; + sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + }; + }; + "read-pkg-1.1.0" = { + name = "read-pkg"; + packageName = "read-pkg"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; + sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + }; + }; + "path-exists-2.1.0" = { + name = "path-exists"; + packageName = "path-exists"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; + sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + }; + }; + "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"; + }; + }; + "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"; + }; + }; + "load-json-file-1.1.0" = { + name = "load-json-file"; + packageName = "load-json-file"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; + sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + }; + }; + "path-type-1.1.0" = { + name = "path-type"; + packageName = "path-type"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; + sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + }; + }; + "graceful-fs-4.1.6" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.6.tgz"; + sha1 = "514c38772b31bee2e08bedc21a0aeb3abf54c19e"; + }; + }; + "parse-json-2.2.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; + sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + }; + }; + "pify-2.3.0" = { + name = "pify"; + packageName = "pify"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; + sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + }; + }; + "strip-bom-2.0.0" = { + name = "strip-bom"; + packageName = "strip-bom"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; + sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + }; + }; + "error-ex-1.3.0" = { + name = "error-ex"; + packageName = "error-ex"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; + sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; + }; + }; + "is-arrayish-0.2.1" = { + name = "is-arrayish"; + packageName = "is-arrayish"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; + sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + }; + }; + "is-utf8-0.2.1" = { + name = "is-utf8"; + packageName = "is-utf8"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; + sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + }; + }; + "indent-string-2.1.0" = { + name = "indent-string"; + packageName = "indent-string"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; + sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; + }; + }; + "strip-indent-1.0.1" = { + name = "strip-indent"; + packageName = "strip-indent"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; + sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; + }; + }; + "repeating-2.0.1" = { + name = "repeating"; + packageName = "repeating"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; + sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; + }; + }; + "is-finite-1.0.1" = { + name = "is-finite"; + packageName = "is-finite"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; + sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; + }; + }; + "number-is-nan-1.0.0" = { + name = "number-is-nan"; + packageName = "number-is-nan"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; + sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; + }; + }; + "underscore-1.5.2" = { + name = "underscore"; + packageName = "underscore"; + version = "1.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; + sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; + }; + }; + "addressparser-0.3.2" = { + name = "addressparser"; + packageName = "addressparser"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; + sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; + }; + }; + "mimelib-0.2.14" = { + name = "mimelib"; + packageName = "mimelib"; + version = "0.2.14"; + src = fetchurl { + url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; + sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; + }; + }; + "moment-2.11.2" = { + name = "moment"; + packageName = "moment"; + version = "2.11.2"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.11.2.tgz"; + sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901"; + }; + }; + "starttls-1.0.1" = { + name = "starttls"; + packageName = "starttls"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/starttls/-/starttls-1.0.1.tgz"; + sha1 = "e6081c25de6b178f5a75f8f271c1487449183b42"; + }; + }; + "bufferjs-1.1.0" = { + name = "bufferjs"; + packageName = "bufferjs"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz"; + sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201"; + }; + }; + "encoding-0.1.12" = { + name = "encoding"; + packageName = "encoding"; + version = "0.1.12"; + src = fetchurl { + url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; + sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; + }; + }; + "addressparser-0.2.1" = { + name = "addressparser"; + packageName = "addressparser"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; + sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; + }; + }; + "connect-1.9.2" = { + name = "connect"; + packageName = "connect"; + version = "1.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; + sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; + }; + }; + "mime-1.2.4" = { + name = "mime"; + packageName = "mime"; + version = "1.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; + sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; + }; + }; + "qs-0.4.2" = { + name = "qs"; + packageName = "qs"; + version = "0.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; + sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; + }; + }; + "mkdirp-0.3.0" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; + sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; + }; + }; + "formidable-1.0.17" = { + name = "formidable"; + packageName = "formidable"; + version = "1.0.17"; + src = fetchurl { + url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; + sha1 = "ef5491490f9433b705faa77249c99029ae348559"; + }; + }; + "cookie-0.3.1" = { + name = "cookie"; + packageName = "cookie"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; + sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; + }; + }; + "crc-3.4.0" = { + name = "crc"; + packageName = "crc"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz"; + sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f"; + }; + }; + "depd-1.1.0" = { + name = "depd"; + packageName = "depd"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; + sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; + }; + }; + "uid-safe-2.1.2" = { + name = "uid-safe"; + packageName = "uid-safe"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.2.tgz"; + sha1 = "c934b3caead0fdcd0fb2cff3a8876d06fe0ee0fd"; + }; + }; + "base64-url-1.3.2" = { + name = "base64-url"; + packageName = "base64-url"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-url/-/base64-url-1.3.2.tgz"; + sha1 = "4b08113b49d23889f306be64372762d31412f7a8"; + }; + }; + "array-parallel-0.1.3" = { + name = "array-parallel"; + packageName = "array-parallel"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; + sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; + }; + }; + "array-series-0.1.5" = { + name = "array-series"; + packageName = "array-series"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; + sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; + }; + }; + "cross-spawn-4.0.0" = { + name = "cross-spawn"; + packageName = "cross-spawn"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.0.tgz"; + sha1 = "8254774ab4786b8c5b3cf4dfba66ce563932c252"; + }; + }; + "lru-cache-4.0.1" = { + name = "lru-cache"; + packageName = "lru-cache"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"; + sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be"; + }; + }; + "which-1.2.11" = { + name = "which"; + packageName = "which"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/which/-/which-1.2.11.tgz"; + sha1 = "c8b2eeea6b8c1659fa7c1dd4fdaabe9533dc5e8b"; + }; + }; + "pseudomap-1.0.2" = { + name = "pseudomap"; + packageName = "pseudomap"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; + sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + }; + }; + "yallist-2.0.0" = { + name = "yallist"; + packageName = "yallist"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz"; + sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4"; + }; + }; + "isexe-1.1.2" = { + name = "isexe"; + packageName = "isexe"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz"; + sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0"; + }; + }; + "connect-3.4.1" = { + name = "connect"; + packageName = "connect"; + version = "3.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz"; + sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d"; + }; + }; + "dns-prefetch-control-0.1.0" = { + name = "dns-prefetch-control"; + packageName = "dns-prefetch-control"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz"; + sha1 = "60ddb457774e178f1f9415f0cabb0e85b0b300b2"; + }; + }; + "dont-sniff-mimetype-1.0.0" = { + name = "dont-sniff-mimetype"; + packageName = "dont-sniff-mimetype"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz"; + sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58"; + }; + }; + "frameguard-2.0.0" = { + name = "frameguard"; + packageName = "frameguard"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/frameguard/-/frameguard-2.0.0.tgz"; + sha1 = "30c2c149e5e3505f9e156f9bc491a438420e487e"; + }; + }; + "helmet-csp-1.2.2" = { + name = "helmet-csp"; + packageName = "helmet-csp"; + version = "1.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-1.2.2.tgz"; + sha1 = "085c0307d57fc96cd97337f170ab8bfea99e5df7"; + }; + }; + "hide-powered-by-1.0.0" = { + name = "hide-powered-by"; + packageName = "hide-powered-by"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz"; + sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; + }; + }; + "hpkp-1.1.0" = { + name = "hpkp"; + packageName = "hpkp"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hpkp/-/hpkp-1.1.0.tgz"; + sha1 = "77bdff1f331847fb9f40839d00a45032baed4df4"; + }; + }; + "hsts-1.0.0" = { + name = "hsts"; + packageName = "hsts"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hsts/-/hsts-1.0.0.tgz"; + sha1 = "98e1039ef7aba554057b6b0e32584c0b1143a414"; + }; + }; + "ienoopen-1.0.0" = { + name = "ienoopen"; + packageName = "ienoopen"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz"; + sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b"; + }; + }; + "nocache-1.0.1" = { + name = "nocache"; + packageName = "nocache"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/nocache/-/nocache-1.0.1.tgz"; + sha1 = "695c9f736926a7554f7365fa25e087941065bd36"; + }; + }; + "referrer-policy-1.0.0" = { + name = "referrer-policy"; + packageName = "referrer-policy"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.0.0.tgz"; + sha1 = "f60eedc92f942b01a6118121ec932d66e8fd7e14"; + }; + }; + "x-xss-protection-1.0.0" = { + name = "x-xss-protection"; + packageName = "x-xss-protection"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.0.0.tgz"; + sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9"; + }; + }; + "finalhandler-0.4.1" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "0.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz"; + sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d"; + }; + }; + "camelize-1.0.0" = { + name = "camelize"; + packageName = "camelize"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"; + sha1 = "164a5483e630fa4321e5af07020e531831b2609b"; + }; + }; + "content-security-policy-builder-1.0.0" = { + name = "content-security-policy-builder"; + packageName = "content-security-policy-builder"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.0.0.tgz"; + sha1 = "11fd40c5cc298a6c725a35f9acf71e82ab5d3243"; + }; + }; + "lodash.reduce-4.5.0" = { + name = "lodash.reduce"; + packageName = "lodash.reduce"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.5.0.tgz"; + sha1 = "af7d2ec621062441e77d5bf408a1e071ef86691c"; + }; + }; + "platform-1.3.1" = { + name = "platform"; + packageName = "platform"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/platform/-/platform-1.3.1.tgz"; + sha1 = "492210892335bd3131c0a08dda2d93ec3543e423"; + }; + }; + "dashify-0.2.2" = { + name = "dashify"; + packageName = "dashify"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/dashify/-/dashify-0.2.2.tgz"; + sha1 = "6a07415a01c91faf4a32e38d9dfba71f61cb20fe"; + }; + }; + "abab-1.0.3" = { + name = "abab"; + packageName = "abab"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz"; + sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d"; + }; + }; + "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"; + }; + }; + "acorn-globals-1.0.9" = { + name = "acorn-globals"; + packageName = "acorn-globals"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; + sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; + }; + }; + "cssom-0.3.1" = { + name = "cssom"; + packageName = "cssom"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz"; + sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3"; + }; + }; + "cssstyle-0.2.37" = { + name = "cssstyle"; + packageName = "cssstyle"; + version = "0.2.37"; + src = fetchurl { + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz"; + sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; + }; + }; + "escodegen-1.8.1" = { + name = "escodegen"; + packageName = "escodegen"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; + sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; + }; + }; + "nwmatcher-1.3.8" = { + name = "nwmatcher"; + packageName = "nwmatcher"; + version = "1.3.8"; + src = fetchurl { + url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.8.tgz"; + sha1 = "34edb93de1aa6cb4448b573c9f2a059300241157"; + }; + }; + "parse5-1.5.1" = { + name = "parse5"; + packageName = "parse5"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz"; + sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; + }; + }; + "request-2.74.0" = { + name = "request"; + packageName = "request"; + version = "2.74.0"; + src = fetchurl { + url = "https://registry.npmjs.org/request/-/request-2.74.0.tgz"; + sha1 = "7693ca768bbb0ea5c8ce08c084a45efa05b892ab"; + }; + }; + "sax-1.2.1" = { + name = "sax"; + packageName = "sax"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz"; + sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a"; + }; + }; + "symbol-tree-3.1.4" = { + name = "symbol-tree"; + packageName = "symbol-tree"; + version = "3.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.1.4.tgz"; + sha1 = "02b279348d337debc39694c5c95f882d448a312a"; + }; + }; + "tough-cookie-2.3.1" = { + name = "tough-cookie"; + packageName = "tough-cookie"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.1.tgz"; + sha1 = "99c77dfbb7d804249e8a299d4cb0fd81fef083fd"; + }; + }; + "webidl-conversions-2.0.1" = { + name = "webidl-conversions"; + packageName = "webidl-conversions"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz"; + sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; + }; + }; + "whatwg-url-compat-0.6.5" = { + name = "whatwg-url-compat"; + packageName = "whatwg-url-compat"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz"; + sha1 = "00898111af689bb097541cd5a45ca6c8798445bf"; + }; + }; + "xml-name-validator-2.0.1" = { + name = "xml-name-validator"; + packageName = "xml-name-validator"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz"; + sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635"; + }; + }; + "estraverse-1.9.3" = { + name = "estraverse"; + packageName = "estraverse"; + version = "1.9.3"; + src = fetchurl { + url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; + sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; + }; + }; + "esutils-2.0.2" = { + name = "esutils"; + packageName = "esutils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; + sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; + }; + }; + "esprima-2.7.3" = { + name = "esprima"; + packageName = "esprima"; + version = "2.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; + sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; + }; + }; + "optionator-0.8.1" = { + name = "optionator"; + packageName = "optionator"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz"; + sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b"; + }; + }; + "source-map-0.2.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; + sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; + }; + }; + "prelude-ls-1.1.2" = { + name = "prelude-ls"; + packageName = "prelude-ls"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; + sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; + }; + }; + "deep-is-0.1.3" = { + name = "deep-is"; + packageName = "deep-is"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + }; + "wordwrap-1.0.0" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; + sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; + }; + }; + "type-check-0.3.2" = { + name = "type-check"; + packageName = "type-check"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; + sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; + }; + }; + "levn-0.3.0" = { + name = "levn"; + packageName = "levn"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; + sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; + }; + }; + "fast-levenshtein-1.1.4" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; + sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + }; + }; + "amdefine-1.0.0" = { + name = "amdefine"; + packageName = "amdefine"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz"; + sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33"; + }; + }; + "aws-sign2-0.6.0" = { + name = "aws-sign2"; + packageName = "aws-sign2"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; + sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; + }; + }; + "aws4-1.4.1" = { + name = "aws4"; + packageName = "aws4"; + version = "1.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/aws4/-/aws4-1.4.1.tgz"; + sha1 = "fde7d5292466d230e5ee0f4e038d9dfaab08fc61"; + }; + }; + "bl-1.1.2" = { + name = "bl"; + packageName = "bl"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"; + sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398"; + }; + }; + "caseless-0.11.0" = { + name = "caseless"; + packageName = "caseless"; + version = "0.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz"; + sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7"; + }; + }; + "combined-stream-1.0.5" = { + name = "combined-stream"; + packageName = "combined-stream"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; + sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; + }; + }; + "extend-3.0.0" = { + name = "extend"; + packageName = "extend"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; + sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; + }; + }; + "forever-agent-0.6.1" = { + name = "forever-agent"; + packageName = "forever-agent"; + version = "0.6.1"; + src = fetchurl { + url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; + sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + }; + }; + "form-data-1.0.1" = { + name = "form-data"; + packageName = "form-data"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz"; + sha1 = "ae315db9a4907fa065502304a66d7733475ee37c"; + }; + }; + "har-validator-2.0.6" = { + name = "har-validator"; + packageName = "har-validator"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz"; + sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"; + }; + }; + "hawk-3.1.3" = { + name = "hawk"; + packageName = "hawk"; + version = "3.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; + sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; + }; + }; + "http-signature-1.1.1" = { + name = "http-signature"; + packageName = "http-signature"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; + sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; + }; + }; + "is-typedarray-1.0.0" = { + name = "is-typedarray"; + packageName = "is-typedarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; + sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + }; + }; + "isstream-0.1.2" = { + name = "isstream"; + packageName = "isstream"; + version = "0.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; + sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + }; + }; + "json-stringify-safe-5.0.1" = { + name = "json-stringify-safe"; + packageName = "json-stringify-safe"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; + sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + }; + }; + "oauth-sign-0.8.2" = { + name = "oauth-sign"; + packageName = "oauth-sign"; + version = "0.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; + sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; + }; + }; + "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"; + }; + }; + "stringstream-0.0.5" = { + name = "stringstream"; + packageName = "stringstream"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; + sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; + }; + }; + "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"; + }; + }; + "readable-stream-2.0.6" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; + sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + }; + }; + "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"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; + sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "delayed-stream-1.0.0" = { + name = "delayed-stream"; + packageName = "delayed-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; + sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + }; + }; + "async-2.0.1" = { + name = "async"; + packageName = "async"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-2.0.1.tgz"; + sha1 = "b709cc0280a9c36f09f4536be823c838a9049e25"; + }; + }; + "lodash-4.15.0" = { + name = "lodash"; + packageName = "lodash"; + version = "4.15.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash/-/lodash-4.15.0.tgz"; + sha1 = "3162391d8f0140aa22cf8f6b3c34d6b7f63d3aa9"; + }; + }; + "chalk-1.1.3" = { + name = "chalk"; + packageName = "chalk"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"; + sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; + }; + }; + "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.13.1" = { + name = "is-my-json-valid"; + packageName = "is-my-json-valid"; + version = "2.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz"; + sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707"; + }; + }; + "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"; + version = "1.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; + sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + }; + }; + "has-ansi-2.0.0" = { + name = "has-ansi"; + packageName = "has-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; + sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + }; + }; + "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.0.0" = { + name = "ansi-regex"; + packageName = "ansi-regex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"; + sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107"; + }; + }; + "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"; + }; + }; + "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-2.0.0" = { + name = "jsonpointer"; + packageName = "jsonpointer"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz"; + sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9"; + }; + }; + "xtend-4.0.1" = { + name = "xtend"; + packageName = "xtend"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; + sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; + }; + }; + "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"; + }; + }; + "hoek-2.16.3" = { + name = "hoek"; + packageName = "hoek"; + version = "2.16.3"; + src = fetchurl { + url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; + sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; + }; + }; + "boom-2.10.1" = { + name = "boom"; + packageName = "boom"; + version = "2.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; + sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; + }; + }; + "cryptiles-2.0.5" = { + name = "cryptiles"; + packageName = "cryptiles"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; + sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; + }; + }; + "sntp-1.0.9" = { + name = "sntp"; + packageName = "sntp"; + version = "1.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; + sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; + }; + }; + "assert-plus-0.2.0" = { + name = "assert-plus"; + packageName = "assert-plus"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; + sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; + }; + }; + "jsprim-1.3.1" = { + name = "jsprim"; + packageName = "jsprim"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsprim/-/jsprim-1.3.1.tgz"; + sha1 = "2a7256f70412a29ee3670aaca625994c4dcff252"; + }; + }; + "sshpk-1.10.0" = { + name = "sshpk"; + packageName = "sshpk"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sshpk/-/sshpk-1.10.0.tgz"; + sha1 = "104d6ba2afb2ac099ab9567c0d193977f29c6dfa"; + }; + }; + "extsprintf-1.0.2" = { + name = "extsprintf"; + packageName = "extsprintf"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; + sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; + }; + }; + "json-schema-0.2.3" = { + name = "json-schema"; + packageName = "json-schema"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; + sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; + }; + }; + "verror-1.3.6" = { + name = "verror"; + packageName = "verror"; + version = "1.3.6"; + src = fetchurl { + url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; + sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; + }; + }; + "asn1-0.2.3" = { + name = "asn1"; + packageName = "asn1"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; + 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.0" = { + name = "dashdash"; + packageName = "dashdash"; + version = "1.14.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz"; + sha1 = "29e486c5418bf0f356034a993d51686a33e84141"; + }; + }; + "getpass-0.1.6" = { + name = "getpass"; + packageName = "getpass"; + version = "0.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; + sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; + }; + }; + "jsbn-0.1.0" = { + name = "jsbn"; + packageName = "jsbn"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz"; + sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd"; + }; + }; + "tweetnacl-0.13.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.13.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"; + sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56"; + }; + }; + "jodid25519-1.0.2" = { + name = "jodid25519"; + packageName = "jodid25519"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; + sha1 = "06d4912255093419477d425633606e0e90782967"; + }; + }; + "ecc-jsbn-0.1.1" = { + name = "ecc-jsbn"; + packageName = "ecc-jsbn"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; + sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; + }; + }; + "bcrypt-pbkdf-1.0.0" = { + name = "bcrypt-pbkdf"; + packageName = "bcrypt-pbkdf"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.0.tgz"; + sha1 = "3ca76b85241c7170bf7d9703e7b9aa74630040d4"; + }; + }; + "tweetnacl-0.14.3" = { + name = "tweetnacl"; + packageName = "tweetnacl"; + version = "0.14.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"; + sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d"; + }; + }; + "tr46-0.0.3" = { + name = "tr46"; + packageName = "tr46"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; + sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; + }; + }; + "minimist-0.0.8" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; + sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; + }; + }; + "wordwrap-0.0.3" = { + name = "wordwrap"; + packageName = "wordwrap"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; + sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; + }; + }; + "minimist-0.0.10" = { + name = "minimist"; + packageName = "minimist"; + version = "0.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; + sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; + }; + }; + "glob-7.0.6" = { + name = "glob"; + packageName = "glob"; + version = "7.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz"; + sha1 = "211bafaf49e525b8cd93260d14ab136152b3f57a"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "htmlparser2-3.9.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "3.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.1.tgz"; + sha1 = "621b7a58bc9acd003f7af0a2c9a00aa67c8505d2"; + }; + }; + "regexp-quote-0.0.0" = { + name = "regexp-quote"; + packageName = "regexp-quote"; + version = "0.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz"; + sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; + }; + }; + "domelementtype-1.3.0" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; + sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; + }; + }; + "domhandler-2.3.0" = { + name = "domhandler"; + packageName = "domhandler"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; + sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; + }; + }; + "domutils-1.5.1" = { + name = "domutils"; + packageName = "domutils"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; + sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; + }; + }; + "entities-1.1.1" = { + name = "entities"; + packageName = "entities"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; + sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; + }; + }; + "readable-stream-2.1.5" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; + sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; + }; + }; + "dom-serializer-0.1.0" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; + sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; + }; + }; + "domelementtype-1.1.3" = { + name = "domelementtype"; + packageName = "domelementtype"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; + sha1 = "bd28773e2642881aec51544924299c5cd822185b"; + }; + }; + "buffer-shims-1.0.0" = { + name = "buffer-shims"; + packageName = "buffer-shims"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; + sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "mime-1.3.4" = { + name = "mime"; + packageName = "mime"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; + sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; + }; + }; + "range-parser-1.0.3" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; + sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; + }; + }; + "statuses-1.2.1" = { + name = "statuses"; + packageName = "statuses"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; + sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; + }; + }; + "yargs-3.32.0" = { + name = "yargs"; + packageName = "yargs"; + version = "3.32.0"; + src = fetchurl { + url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz"; + sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995"; + }; + }; + "cliui-3.2.0" = { + name = "cliui"; + packageName = "cliui"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; + sha1 = "120601537a916d29940f934da3b48d585a39213d"; + }; + }; + "os-locale-1.4.0" = { + name = "os-locale"; + packageName = "os-locale"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; + sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + }; + }; + "string-width-1.0.2" = { + name = "string-width"; + packageName = "string-width"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; + sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + }; + }; + "window-size-0.1.4" = { + name = "window-size"; + packageName = "window-size"; + version = "0.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz"; + sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876"; + }; + }; + "y18n-3.2.1" = { + name = "y18n"; + packageName = "y18n"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; + sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; + }; + }; + "wrap-ansi-2.0.0" = { + name = "wrap-ansi"; + packageName = "wrap-ansi"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"; + sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f"; + }; + }; + "lcid-1.0.0" = { + name = "lcid"; + packageName = "lcid"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; + sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + }; + }; + "invert-kv-1.0.0" = { + name = "invert-kv"; + packageName = "invert-kv"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; + sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + }; + }; + "code-point-at-1.0.0" = { + name = "code-point-at"; + packageName = "code-point-at"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz"; + sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6"; + }; + }; + "is-fullwidth-code-point-1.0.0" = { + name = "is-fullwidth-code-point"; + packageName = "is-fullwidth-code-point"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; + sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + }; + }; + "faye-websocket-0.10.0" = { + name = "faye-websocket"; + packageName = "faye-websocket"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; + sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + }; + }; + "uuid-2.0.2" = { + name = "uuid"; + packageName = "uuid"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"; + sha1 = "48bd5698f0677e3c7901a1c46ef15b1643794726"; + }; + }; + "websocket-driver-0.6.5" = { + name = "websocket-driver"; + packageName = "websocket-driver"; + version = "0.6.5"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + }; + }; + "websocket-extensions-0.1.1" = { + name = "websocket-extensions"; + packageName = "websocket-extensions"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; + sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; + }; + }; + "underscore-1.6.0" = { + name = "underscore"; + packageName = "underscore"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; + sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; + }; + }; + "xml2js-0.1.14" = { + name = "xml2js"; + packageName = "xml2js"; + version = "0.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; + sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; + }; + }; + "mongodb-2.2.10" = { + name = "mongodb"; + packageName = "mongodb"; + version = "2.2.10"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.10.tgz"; + sha1 = "d11273a5a53b08e17bcc4c8a295ded0f151ccae6"; + }; + }; + "es6-promise-3.2.1" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; + sha1 = "ec56233868032909207170c39448e24449dd1fc4"; + }; + }; + "mongodb-core-2.0.12" = { + name = "mongodb-core"; + packageName = "mongodb-core"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.12.tgz"; + sha1 = "bb66aad550e252731f8ad49276815264a91c337c"; + }; + }; + "bson-0.5.5" = { + name = "bson"; + packageName = "bson"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/bson/-/bson-0.5.5.tgz"; + sha1 = "1d6725d400f0fbf0271bf6bafc8fa1126c29983b"; + }; + }; + "require_optional-1.0.0" = { + name = "require_optional"; + packageName = "require_optional"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz"; + sha1 = "52a86137a849728eb60a55533617f8f914f59abf"; + }; + }; + "resolve-from-2.0.0" = { + name = "resolve-from"; + packageName = "resolve-from"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; + sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; + }; + }; + "async-0.9.2" = { + name = "async"; + packageName = "async"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; + sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; + }; + }; + "redis-0.10.3" = { + name = "redis"; + packageName = "redis"; + version = "0.10.3"; + src = fetchurl { + url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; + sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; + }; + }; + "memcached-0.2.8" = { + name = "memcached"; + packageName = "memcached"; + version = "0.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz"; + sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212"; + }; + }; + "databank-0.18.2" = { + name = "databank"; + packageName = "databank"; + version = "0.18.2"; + src = fetchurl { + url = "https://registry.npmjs.org/databank/-/databank-0.18.2.tgz"; + sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed"; + }; + }; + "underscore-1.4.4" = { + name = "underscore"; + packageName = "underscore"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; + sha1 = "61a6a32010622afa07963bf325203cf12239d604"; + }; + }; + "hashring-0.0.8" = { + name = "hashring"; + packageName = "hashring"; + version = "0.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz"; + sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31"; + }; + }; + "jackpot-0.0.6" = { + name = "jackpot"; + packageName = "jackpot"; + version = "0.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz"; + sha1 = "3cff064285cbf66f4eab2593c90bce816a821849"; + }; + }; + "bisection-0.0.3" = { + name = "bisection"; + packageName = "bisection"; + version = "0.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz"; + sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db"; + }; + }; + "simple-lru-cache-0.0.2" = { + name = "simple-lru-cache"; + packageName = "simple-lru-cache"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; + sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; + }; + }; + "retry-0.6.0" = { + name = "retry"; + packageName = "retry"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; + sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; + }; + }; + "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"; + packageName = "pump.io"; + version = "1.0.0"; + src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-1.0.0.tgz"; sha1 = "404mzdqzknrv7pl9qasksi791cc00bbd"; }; + dependencies = [ + (sources."bcrypt-0.8.7" // { + dependencies = [ + sources."bindings-1.2.1" + sources."nan-2.3.5" + ]; + }) + (sources."bunyan-1.8.1" // { + dependencies = [ + (sources."dtrace-provider-0.6.0" // { + dependencies = [ + sources."nan-2.4.0" + ]; + }) + (sources."mv-2.1.1" // { + dependencies = [ + sources."ncp-2.0.0" + (sources."rimraf-2.4.5" // { + dependencies = [ + (sources."glob-6.0.4" // { + dependencies = [ + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.0" + ]; + }) + ]; + }) + ]; + }) + sources."safe-json-stringify-1.0.3" + sources."moment-2.15.0" + ]; + }) + (sources."connect-2.30.2" // { + dependencies = [ + sources."basic-auth-connect-1.0.0" + (sources."body-parser-1.13.3" // { + dependencies = [ + sources."iconv-lite-0.4.11" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + (sources."raw-body-2.1.7" // { + dependencies = [ + sources."bytes-2.4.0" + sources."iconv-lite-0.4.13" + sources."unpipe-1.0.0" + ]; + }) + ]; + }) + sources."bytes-2.1.0" + sources."cookie-0.1.3" + sources."cookie-parser-1.3.5" + sources."cookie-signature-1.0.6" + (sources."compression-1.5.2" // { + dependencies = [ + (sources."accepts-1.2.13" // { + dependencies = [ + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."negotiator-0.5.3" + ]; + }) + (sources."compressible-2.0.8" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."vary-1.0.1" + ]; + }) + (sources."connect-timeout-1.6.2" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."content-type-1.0.2" + (sources."csurf-1.8.3" // { + dependencies = [ + (sources."csrf-3.0.3" // { + dependencies = [ + sources."base64-url-1.2.2" + sources."rndm-1.2.0" + sources."tsscmp-1.0.5" + (sources."uid-safe-2.1.1" // { + dependencies = [ + sources."random-bytes-1.0.0" + ]; + }) + ]; + }) + ]; + }) + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."depd-1.0.1" + (sources."errorhandler-1.4.3" // { + dependencies = [ + (sources."accepts-1.3.3" // { + dependencies = [ + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."negotiator-0.6.1" + ]; + }) + sources."escape-html-1.0.3" + ]; + }) + (sources."express-session-1.11.3" // { + dependencies = [ + sources."crc-3.3.0" + (sources."uid-safe-2.0.0" // { + dependencies = [ + sources."base64-url-1.2.1" + ]; + }) + ]; + }) + (sources."finalhandler-0.4.0" // { + dependencies = [ + sources."escape-html-1.0.2" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."unpipe-1.0.0" + ]; + }) + sources."fresh-0.3.0" + (sources."http-errors-1.3.1" // { + dependencies = [ + sources."inherits-2.0.3" + sources."statuses-1.3.0" + ]; + }) + (sources."method-override-2.3.6" // { + dependencies = [ + sources."methods-1.1.2" + sources."vary-1.1.0" + ]; + }) + (sources."morgan-1.6.1" // { + dependencies = [ + sources."basic-auth-1.0.4" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + ]; + }) + (sources."multiparty-3.3.2" // { + dependencies = [ + (sources."readable-stream-1.1.14" // { + dependencies = [ + sources."core-util-is-1.0.2" + sources."isarray-0.0.1" + sources."string_decoder-0.10.31" + sources."inherits-2.0.3" + ]; + }) + sources."stream-counter-0.2.0" + ]; + }) + sources."on-headers-1.0.1" + sources."parseurl-1.3.1" + sources."pause-0.1.0" + sources."qs-4.0.0" + sources."response-time-2.3.1" + (sources."serve-favicon-2.3.0" // { + dependencies = [ + sources."etag-1.7.0" + sources."ms-0.7.1" + ]; + }) + (sources."serve-index-1.7.3" // { + dependencies = [ + (sources."accepts-1.2.13" // { + dependencies = [ + sources."negotiator-0.5.3" + ]; + }) + sources."batch-0.5.3" + sources."escape-html-1.0.3" + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + ]; + }) + (sources."serve-static-1.10.3" // { + dependencies = [ + sources."escape-html-1.0.3" + ]; + }) + (sources."type-is-1.6.13" // { + dependencies = [ + sources."media-typer-0.3.0" + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + ]; + }) + sources."utils-merge-1.0.0" + sources."vhost-3.0.2" + ]; + }) + (sources."connect-auth-0.6.1" // { + dependencies = [ + (sources."connect-2.7.11" // { + dependencies = [ + sources."qs-0.6.5" + sources."formidable-1.0.14" + sources."cookie-signature-1.0.1" + sources."buffer-crc32-0.2.1" + sources."cookie-0.0.5" + (sources."send-0.1.1" // { + dependencies = [ + sources."mime-1.2.11" + sources."range-parser-0.0.4" + ]; + }) + sources."bytes-0.2.0" + sources."fresh-0.1.0" + sources."pause-0.0.1" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + ]; + }) + sources."oauth-0.9.10" + sources."openid-0.4.1" + ]; + }) + (sources."connect-databank-1.0.3" // { + dependencies = [ + sources."async-1.5.2" + sources."set-immediate-0.1.1" + ]; + }) + sources."crypto-cacerts-0.1.0" + (sources."databank-0.19.5" // { + dependencies = [ + (sources."vows-0.7.0" // { + dependencies = [ + sources."eyes-0.1.8" + sources."diff-1.0.8" + ]; + }) + sources."setimmediate-1.0.5" + ]; + }) + (sources."dateformat-1.0.12" // { + dependencies = [ + sources."get-stdin-4.0.1" + (sources."meow-3.7.0" // { + dependencies = [ + (sources."camelcase-keys-2.1.0" // { + dependencies = [ + sources."camelcase-2.1.1" + ]; + }) + sources."decamelize-1.2.0" + (sources."loud-rejection-1.6.0" // { + dependencies = [ + (sources."currently-unhandled-0.4.1" // { + dependencies = [ + sources."array-find-index-1.0.1" + ]; + }) + sources."signal-exit-3.0.1" + ]; + }) + sources."map-obj-1.0.1" + sources."minimist-1.2.0" + (sources."normalize-package-data-2.3.5" // { + dependencies = [ + sources."hosted-git-info-2.1.5" + (sources."is-builtin-module-1.0.0" // { + dependencies = [ + sources."builtin-modules-1.1.1" + ]; + }) + sources."semver-5.3.0" + (sources."validate-npm-package-license-3.0.1" // { + dependencies = [ + (sources."spdx-correct-1.0.2" // { + dependencies = [ + sources."spdx-license-ids-1.2.2" + ]; + }) + sources."spdx-expression-parse-1.0.3" + ]; + }) + ]; + }) + sources."object-assign-4.1.0" + (sources."read-pkg-up-1.0.1" // { + dependencies = [ + (sources."find-up-1.1.2" // { + dependencies = [ + sources."path-exists-2.1.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."read-pkg-1.1.0" // { + dependencies = [ + (sources."load-json-file-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.6" + (sources."parse-json-2.2.0" // { + dependencies = [ + (sources."error-ex-1.3.0" // { + dependencies = [ + sources."is-arrayish-0.2.1" + ]; + }) + ]; + }) + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + (sources."strip-bom-2.0.0" // { + dependencies = [ + sources."is-utf8-0.2.1" + ]; + }) + ]; + }) + (sources."path-type-1.1.0" // { + dependencies = [ + sources."graceful-fs-4.1.6" + sources."pify-2.3.0" + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + ]; + }) + ]; + }) + (sources."redent-1.0.0" // { + dependencies = [ + (sources."indent-string-2.1.0" // { + dependencies = [ + (sources."repeating-2.0.1" // { + dependencies = [ + (sources."is-finite-1.0.1" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + ]; + }) + ]; + }) + sources."strip-indent-1.0.1" + ]; + }) + sources."trim-newlines-1.0.0" + ]; + }) + ]; + }) + (sources."dialback-client-0.2.0" // { + dependencies = [ + sources."underscore-1.5.2" + ]; + }) + sources."dompurify-0.8.3" + (sources."emailjs-1.0.8" // { + dependencies = [ + sources."addressparser-0.3.2" + (sources."mimelib-0.2.14" // { + dependencies = [ + (sources."encoding-0.1.12" // { + dependencies = [ + sources."iconv-lite-0.4.13" + ]; + }) + sources."addressparser-0.2.1" + ]; + }) + sources."moment-2.11.2" + sources."starttls-1.0.1" + sources."bufferjs-1.1.0" + ]; + }) + (sources."express-2.5.11" // { + dependencies = [ + (sources."connect-1.9.2" // { + dependencies = [ + sources."formidable-1.0.17" + ]; + }) + sources."mime-1.2.4" + sources."qs-0.4.2" + sources."mkdirp-0.3.0" + ]; + }) + (sources."express-session-1.14.1" // { + dependencies = [ + sources."cookie-0.3.1" + sources."cookie-signature-1.0.6" + sources."crc-3.4.0" + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + sources."depd-1.1.0" + sources."on-headers-1.0.1" + sources."parseurl-1.3.1" + (sources."uid-safe-2.1.2" // { + dependencies = [ + sources."base64-url-1.3.2" + sources."random-bytes-1.0.0" + ]; + }) + sources."utils-merge-1.0.0" + ]; + }) + (sources."gm-1.23.0" // { + dependencies = [ + sources."array-parallel-0.1.3" + sources."array-series-0.1.5" + (sources."cross-spawn-4.0.0" // { + dependencies = [ + (sources."lru-cache-4.0.1" // { + dependencies = [ + sources."pseudomap-1.0.2" + sources."yallist-2.0.0" + ]; + }) + (sources."which-1.2.11" // { + dependencies = [ + sources."isexe-1.1.2" + ]; + }) + ]; + }) + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + ]; + }) + (sources."helmet-2.2.0" // { + dependencies = [ + (sources."connect-3.4.1" // { + dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + (sources."finalhandler-0.4.1" // { + dependencies = [ + sources."escape-html-1.0.3" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."unpipe-1.0.0" + ]; + }) + sources."parseurl-1.3.1" + sources."utils-merge-1.0.0" + ]; + }) + sources."dns-prefetch-control-0.1.0" + sources."dont-sniff-mimetype-1.0.0" + sources."frameguard-2.0.0" + (sources."helmet-csp-1.2.2" // { + dependencies = [ + sources."camelize-1.0.0" + (sources."content-security-policy-builder-1.0.0" // { + dependencies = [ + sources."dashify-0.2.2" + ]; + }) + sources."lodash.reduce-4.5.0" + sources."platform-1.3.1" + ]; + }) + sources."hide-powered-by-1.0.0" + sources."hpkp-1.1.0" + (sources."hsts-1.0.0" // { + dependencies = [ + sources."core-util-is-1.0.2" + ]; + }) + sources."ienoopen-1.0.0" + (sources."nocache-1.0.1" // { + dependencies = [ + sources."depd-1.1.0" + ]; + }) + sources."referrer-policy-1.0.0" + sources."x-xss-protection-1.0.0" + ]; + }) + sources."jankyqueue-0.1.1" + (sources."jsdom-7.2.2" // { + dependencies = [ + sources."abab-1.0.3" + sources."acorn-2.7.0" + sources."acorn-globals-1.0.9" + sources."cssom-0.3.1" + sources."cssstyle-0.2.37" + (sources."escodegen-1.8.1" // { + dependencies = [ + sources."estraverse-1.9.3" + sources."esutils-2.0.2" + sources."esprima-2.7.3" + (sources."optionator-0.8.1" // { + dependencies = [ + sources."prelude-ls-1.1.2" + sources."deep-is-0.1.3" + sources."wordwrap-1.0.0" + sources."type-check-0.3.2" + sources."levn-0.3.0" + sources."fast-levenshtein-1.1.4" + ]; + }) + (sources."source-map-0.2.0" // { + dependencies = [ + sources."amdefine-1.0.0" + ]; + }) + ]; + }) + sources."nwmatcher-1.3.8" + sources."parse5-1.5.1" + (sources."request-2.74.0" // { + dependencies = [ + sources."aws-sign2-0.6.0" + sources."aws4-1.4.1" + (sources."bl-1.1.2" // { + dependencies = [ + (sources."readable-stream-2.0.6" // { + dependencies = [ + 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."caseless-0.11.0" + (sources."combined-stream-1.0.5" // { + dependencies = [ + sources."delayed-stream-1.0.0" + ]; + }) + sources."extend-3.0.0" + sources."forever-agent-0.6.1" + (sources."form-data-1.0.1" // { + dependencies = [ + (sources."async-2.0.1" // { + dependencies = [ + sources."lodash-4.15.0" + ]; + }) + ]; + }) + (sources."har-validator-2.0.6" // { + dependencies = [ + (sources."chalk-1.1.3" // { + dependencies = [ + sources."ansi-styles-2.2.1" + sources."escape-string-regexp-1.0.5" + (sources."has-ansi-2.0.0" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."supports-color-2.0.0" + ]; + }) + (sources."commander-2.9.0" // { + dependencies = [ + sources."graceful-readlink-1.0.1" + ]; + }) + (sources."is-my-json-valid-2.13.1" // { + dependencies = [ + sources."generate-function-2.0.0" + (sources."generate-object-property-1.2.0" // { + dependencies = [ + sources."is-property-1.0.2" + ]; + }) + sources."jsonpointer-2.0.0" + sources."xtend-4.0.1" + ]; + }) + (sources."pinkie-promise-2.0.1" // { + dependencies = [ + sources."pinkie-2.0.4" + ]; + }) + ]; + }) + (sources."hawk-3.1.3" // { + dependencies = [ + sources."hoek-2.16.3" + sources."boom-2.10.1" + sources."cryptiles-2.0.5" + sources."sntp-1.0.9" + ]; + }) + (sources."http-signature-1.1.1" // { + dependencies = [ + sources."assert-plus-0.2.0" + (sources."jsprim-1.3.1" // { + dependencies = [ + sources."extsprintf-1.0.2" + sources."json-schema-0.2.3" + sources."verror-1.3.6" + ]; + }) + (sources."sshpk-1.10.0" // { + dependencies = [ + sources."asn1-0.2.3" + sources."assert-plus-1.0.0" + sources."dashdash-1.14.0" + sources."getpass-0.1.6" + sources."jsbn-0.1.0" + sources."tweetnacl-0.13.3" + sources."jodid25519-1.0.2" + sources."ecc-jsbn-0.1.1" + (sources."bcrypt-pbkdf-1.0.0" // { + dependencies = [ + sources."tweetnacl-0.14.3" + ]; + }) + ]; + }) + ]; + }) + sources."is-typedarray-1.0.0" + sources."isstream-0.1.2" + sources."json-stringify-safe-5.0.1" + (sources."mime-types-2.1.11" // { + dependencies = [ + sources."mime-db-1.23.0" + ]; + }) + sources."oauth-sign-0.8.2" + sources."qs-6.2.1" + sources."stringstream-0.0.5" + sources."tunnel-agent-0.4.3" + ]; + }) + sources."sax-1.2.1" + sources."symbol-tree-3.1.4" + sources."tough-cookie-2.3.1" + sources."webidl-conversions-2.0.1" + (sources."whatwg-url-compat-0.6.5" // { + dependencies = [ + sources."tr46-0.0.3" + ]; + }) + sources."xml-name-validator-2.0.1" + ]; + }) + (sources."mkdirp-0.5.1" // { + dependencies = [ + sources."minimist-0.0.8" + ]; + }) + sources."node-uuid-1.4.7" + sources."oauth-evanp-0.9.10-evanp.2" + (sources."optimist-0.6.1" // { + dependencies = [ + sources."wordwrap-0.0.3" + sources."minimist-0.0.10" + ]; + }) + (sources."rimraf-2.5.4" // { + dependencies = [ + (sources."glob-7.0.6" // { + dependencies = [ + sources."fs.realpath-1.0.0" + (sources."inflight-1.0.5" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."inherits-2.0.3" + (sources."minimatch-3.0.3" // { + dependencies = [ + (sources."brace-expansion-1.1.6" // { + dependencies = [ + sources."balanced-match-0.4.2" + sources."concat-map-0.0.1" + ]; + }) + ]; + }) + (sources."once-1.4.0" // { + dependencies = [ + sources."wrappy-1.0.2" + ]; + }) + sources."path-is-absolute-1.0.0" + ]; + }) + ]; + }) + (sources."sanitize-html-1.13.0" // { + dependencies = [ + (sources."htmlparser2-3.9.1" // { + dependencies = [ + sources."domelementtype-1.3.0" + sources."domhandler-2.3.0" + (sources."domutils-1.5.1" // { + dependencies = [ + (sources."dom-serializer-0.1.0" // { + dependencies = [ + sources."domelementtype-1.1.3" + ]; + }) + ]; + }) + sources."entities-1.1.1" + sources."inherits-2.0.3" + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."buffer-shims-1.0.0" + sources."core-util-is-1.0.2" + 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."regexp-quote-0.0.0" + sources."xtend-4.0.1" + ]; + }) + sources."schlock-0.2.1" + (sources."send-0.13.2" // { + dependencies = [ + sources."debug-2.2.0" + sources."depd-1.1.0" + sources."destroy-1.0.4" + sources."escape-html-1.0.3" + sources."etag-1.7.0" + sources."fresh-0.3.0" + (sources."http-errors-1.3.1" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."mime-1.3.4" + sources."ms-0.7.1" + (sources."on-finished-2.3.0" // { + dependencies = [ + sources."ee-first-1.1.1" + ]; + }) + sources."range-parser-1.0.3" + sources."statuses-1.2.1" + ]; + }) + (sources."showdown-1.4.3" // { + dependencies = [ + (sources."yargs-3.32.0" // { + dependencies = [ + sources."camelcase-2.1.1" + (sources."cliui-3.2.0" // { + dependencies = [ + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + sources."wrap-ansi-2.0.0" + ]; + }) + sources."decamelize-1.2.0" + (sources."os-locale-1.4.0" // { + dependencies = [ + (sources."lcid-1.0.0" // { + dependencies = [ + sources."invert-kv-1.0.0" + ]; + }) + ]; + }) + (sources."string-width-1.0.2" // { + dependencies = [ + (sources."code-point-at-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + (sources."is-fullwidth-code-point-1.0.0" // { + dependencies = [ + sources."number-is-nan-1.0.0" + ]; + }) + (sources."strip-ansi-3.0.1" // { + dependencies = [ + sources."ansi-regex-2.0.0" + ]; + }) + ]; + }) + sources."window-size-0.1.4" + sources."y18n-3.2.1" + ]; + }) + ]; + }) + (sources."sockjs-0.3.17" // { + dependencies = [ + (sources."faye-websocket-0.10.0" // { + dependencies = [ + (sources."websocket-driver-0.6.5" // { + dependencies = [ + sources."websocket-extensions-0.1.1" + ]; + }) + ]; + }) + sources."uuid-2.0.2" + ]; + }) + sources."step-0.0.6" + sources."ua-parser-js-0.7.10" + sources."underscore-1.8.3" + (sources."underscore-contrib-0.3.0" // { + dependencies = [ + sources."underscore-1.6.0" + ]; + }) + sources."utml-0.2.0" + sources."validator-4.4.0" + (sources."webfinger-0.4.2" // { + dependencies = [ + (sources."xml2js-0.1.14" // { + dependencies = [ + sources."sax-1.2.1" + ]; + }) + ]; + }) + (sources."databank-mongodb-0.19.0" // { + dependencies = [ + (sources."debug-2.2.0" // { + dependencies = [ + sources."ms-0.7.1" + ]; + }) + (sources."mongodb-2.2.10" // { + dependencies = [ + sources."es6-promise-3.2.1" + (sources."mongodb-core-2.0.12" // { + dependencies = [ + sources."bson-0.5.5" + (sources."require_optional-1.0.0" // { + dependencies = [ + sources."semver-5.3.0" + sources."resolve-from-2.0.0" + ]; + }) + ]; + }) + (sources."readable-stream-2.1.5" // { + dependencies = [ + sources."buffer-shims-1.0.0" + 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."databank-redis-0.19.6" // { + dependencies = [ + sources."async-0.9.2" + sources."redis-0.10.3" + sources."underscore-1.6.0" + ]; + }) + (sources."databank-memcached-0.15.0" // { + dependencies = [ + (sources."memcached-0.2.8" // { + dependencies = [ + (sources."hashring-0.0.8" // { + dependencies = [ + sources."bisection-0.0.3" + sources."simple-lru-cache-0.0.2" + ]; + }) + (sources."jackpot-0.0.6" // { + dependencies = [ + sources."retry-0.6.0" + ]; + }) + ]; + }) + (sources."databank-0.18.2" // { + dependencies = [ + (sources."vows-0.7.0" // { + dependencies = [ + sources."eyes-0.1.8" + sources."diff-1.0.8" + ]; + }) + sources."set-immediate-0.1.1" + ]; + }) + sources."underscore-1.4.4" + ]; + }) + (sources."databank-lrucache-0.1.2" // { + dependencies = [ + sources."underscore-1.5.2" + sources."lru-cache-2.3.1" + sources."set-immediate-0.1.1" + ]; + }) + ]; + buildInputs = globalBuildInputs; + meta = { + homepage = http://pump.io/; + license = "Apache-2.0"; + }; + production = true; + }; +in { - by-spec."addressparser"."^0.3.2" = - self.by-version."addressparser"."0.3.2"; - by-version."addressparser"."0.3.2" = self.buildNodePackage { - name = "addressparser-0.3.2"; - version = "0.3.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; - name = "addressparser-0.3.2.tgz"; - sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."addressparser"."~0.2.0" = - self.by-version."addressparser"."0.2.1"; - by-version."addressparser"."0.2.1" = self.buildNodePackage { - name = "addressparser-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; - name = "addressparser-0.2.1.tgz"; - sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."array-parallel"."~0.1.0" = - self.by-version."array-parallel"."0.1.3"; - by-version."array-parallel"."0.1.3" = self.buildNodePackage { - name = "array-parallel-0.1.3"; - version = "0.1.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; - name = "array-parallel-0.1.3.tgz"; - sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."array-series"."~0.1.0" = - self.by-version."array-series"."0.1.5"; - by-version."array-series"."0.1.5" = self.buildNodePackage { - name = "array-series-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; - name = "array-series-0.1.5.tgz"; - sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.2.x" = - self.by-version."async"."0.2.10"; - by-version."async"."0.2.10" = self.buildNodePackage { - name = "async-0.2.10"; - version = "0.2.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz"; - name = "async-0.2.10.tgz"; - sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."async"."0.9.x" = - self.by-version."async"."0.9.2"; - by-version."async"."0.9.2" = self.buildNodePackage { - name = "async-0.9.2"; - version = "0.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.9.2.tgz"; - name = "async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bcrypt"."0.8.x" = - self.by-version."bcrypt"."0.8.5"; - by-version."bcrypt"."0.8.5" = self.buildNodePackage { - name = "bcrypt-0.8.5"; - version = "0.8.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.5.tgz"; - name = "bcrypt-0.8.5.tgz"; - sha1 = "8e5b81b4db80e944f440005979ca8d58a961861d"; - }; - deps = { - "bindings-1.2.1" = self.by-version."bindings"."1.2.1"; - "nan-2.0.5" = self.by-version."nan"."2.0.5"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "bcrypt" = self.by-version."bcrypt"."0.8.5"; - by-spec."bindings"."1.2.1" = - self.by-version."bindings"."1.2.1"; - by-version."bindings"."1.2.1" = self.buildNodePackage { - name = "bindings-1.2.1"; - version = "1.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - name = "bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bisection"."*" = - self.by-version."bisection"."0.0.3"; - by-version."bisection"."0.0.3" = self.buildNodePackage { - name = "bisection-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bisection/-/bisection-0.0.3.tgz"; - name = "bisection-0.0.3.tgz"; - sha1 = "9891d506d86ec7d50910c5157bb592dbb03f33db"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bson"."~0.2" = - self.by-version."bson"."0.2.22"; - by-version."bson"."0.2.22" = self.buildNodePackage { - name = "bson-0.2.22"; - version = "0.2.22"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.22.tgz"; - name = "bson-0.2.22.tgz"; - sha1 = "fcda103f26d0c074d5a52d50927db80fd02b4b39"; - }; - deps = { - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bufferjs"."=1.1.0" = - self.by-version."bufferjs"."1.1.0"; - by-version."bufferjs"."1.1.0" = self.buildNodePackage { - name = "bufferjs-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz"; - name = "bufferjs-1.1.0.tgz"; - sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."builtin-modules"."^1.0.0" = - self.by-version."builtin-modules"."1.1.0"; - by-version."builtin-modules"."1.1.0" = self.buildNodePackage { - name = "builtin-modules-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.0.tgz"; - name = "builtin-modules-1.1.0.tgz"; - sha1 = "1053955fd994a5746e525e4ac717b81caf07491c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."bunyan"."0.16.x" = - self.by-version."bunyan"."0.16.8"; - by-version."bunyan"."0.16.8" = self.buildNodePackage { - name = "bunyan-0.16.8"; - version = "0.16.8"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/bunyan/-/bunyan-0.16.8.tgz"; - name = "bunyan-0.16.8.tgz"; - sha1 = "3b3f6cdca262fa31aba43eb0eb6fb58e7bdde547"; - }; - deps = { - "dtrace-provider-0.2.4" = self.by-version."dtrace-provider"."0.2.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "bunyan" = self.by-version."bunyan"."0.16.8"; - by-spec."camelcase"."^2.0.0" = - self.by-version."camelcase"."2.0.1"; - by-version."camelcase"."2.0.1" = self.buildNodePackage { - name = "camelcase-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase/-/camelcase-2.0.1.tgz"; - name = "camelcase-2.0.1.tgz"; - sha1 = "57568d687b8da56c4c1d17b4c74a3cee26d73aeb"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."camelcase-keys"."^2.0.0" = - self.by-version."camelcase-keys"."2.0.0"; - by-version."camelcase-keys"."2.0.0" = self.buildNodePackage { - name = "camelcase-keys-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.0.0.tgz"; - name = "camelcase-keys-2.0.0.tgz"; - sha1 = "ab87e740d72a1ffcb12a43cc04c14b39d549eab9"; - }; - deps = { - "camelcase-2.0.1" = self.by-version."camelcase"."2.0.1"; - "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connect"."1.x" = - self.by-version."connect"."1.9.2"; - by-version."connect"."1.9.2" = self.buildNodePackage { - name = "connect-1.9.2"; - version = "1.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz"; - name = "connect-1.9.2.tgz"; - sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807"; - }; - deps = { - "qs-6.0.1" = self.by-version."qs"."6.0.1"; - "mime-1.3.4" = self.by-version."mime"."1.3.4"; - "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "connect" = self.by-version."connect"."1.9.2"; - by-spec."connect"."2.0.0" = - self.by-version."connect"."2.0.0"; - by-version."connect"."2.0.0" = self.buildNodePackage { - name = "connect-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.0.0.tgz"; - name = "connect-2.0.0.tgz"; - sha1 = "be0f8fcee7c1a0e2caa2e246a278dbbe250b9f27"; - }; - deps = { - "qs-0.4.2" = self.by-version."qs"."0.4.2"; - "mime-1.2.4" = self.by-version."mime"."1.2.4"; - "formidable-1.0.17" = self.by-version."formidable"."1.0.17"; - "debug-2.2.0" = self.by-version."debug"."2.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."connect-auth"."0.5.3" = - self.by-version."connect-auth"."0.5.3"; - by-version."connect-auth"."0.5.3" = self.buildNodePackage { - name = "connect-auth-0.5.3"; - version = "0.5.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-auth/-/connect-auth-0.5.3.tgz"; - name = "connect-auth-0.5.3.tgz"; - sha1 = "2af00ac6f67ac1c5f451a0ff841a8d20a725091e"; - }; - deps = { - "connect-2.0.0" = self.by-version."connect"."2.0.0"; - "oauth-0.9.7" = self.by-version."oauth"."0.9.7"; - "openid-0.4.1" = self.by-version."openid"."0.4.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "connect-auth" = self.by-version."connect-auth"."0.5.3"; - by-spec."connect-databank"."0.13.x" = - self.by-version."connect-databank"."0.13.0"; - by-version."connect-databank"."0.13.0" = self.buildNodePackage { - name = "connect-databank-0.13.0"; - version = "0.13.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/connect-databank/-/connect-databank-0.13.0.tgz"; - name = "connect-databank-0.13.0.tgz"; - sha1 = "0d5063e9402381073e0242fd7c6ef28b2d61676b"; - }; - deps = { - "async-0.2.10" = self.by-version."async"."0.2.10"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "databank-0.19.1" = self.by-version."databank"."0.19.1"; - "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "connect-databank" = self.by-version."connect-databank"."0.13.0"; - by-spec."core-util-is"."~1.0.0" = - self.by-version."core-util-is"."1.0.2"; - by-version."core-util-is"."1.0.2" = self.buildNodePackage { - name = "core-util-is-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - name = "core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."crypto-cacerts"."0.1.x" = - self.by-version."crypto-cacerts"."0.1.0"; - by-version."crypto-cacerts"."0.1.0" = self.buildNodePackage { - name = "crypto-cacerts-0.1.0"; - version = "0.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz"; - name = "crypto-cacerts-0.1.0.tgz"; - sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "crypto-cacerts" = self.by-version."crypto-cacerts"."0.1.0"; - by-spec."databank"."0.18.x" = - self.by-version."databank"."0.18.2"; - by-version."databank"."0.18.2" = self.buildNodePackage { - name = "databank-0.18.2"; - version = "0.18.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank/-/databank-0.18.2.tgz"; - name = "databank-0.18.2.tgz"; - sha1 = "b1f85bafa329cdb415589c0ee819a04c989a03ed"; - }; - deps = { - "vows-0.7.0" = self.by-version."vows"."0.7.0"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."databank"."0.19.x" = - self.by-version."databank"."0.19.1"; - by-version."databank"."0.19.1" = self.buildNodePackage { - name = "databank-0.19.1"; - version = "0.19.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank/-/databank-0.19.1.tgz"; - name = "databank-0.19.1.tgz"; - sha1 = "95c6f662927b891f62c6f07fefe5e690fbe666e0"; - }; - deps = { - "vows-0.7.0" = self.by-version."vows"."0.7.0"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank" = self.by-version."databank"."0.19.1"; - by-spec."databank"."~0.19.1" = - self.by-version."databank"."0.19.1"; - by-spec."databank-lrucache"."^0.1.2" = - self.by-version."databank-lrucache"."0.1.2"; - by-version."databank-lrucache"."0.1.2" = self.buildNodePackage { - name = "databank-lrucache-0.1.2"; - version = "0.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.2.tgz"; - name = "databank-lrucache-0.1.2.tgz"; - sha1 = "846d3bbc3d908ea2880baf9a611d86a28697c640"; - }; - deps = { - "databank-0.19.1" = self.by-version."databank"."0.19.1"; - "underscore-1.5.2" = self.by-version."underscore"."1.5.2"; - "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1"; - "set-immediate-0.1.1" = self.by-version."set-immediate"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank-lrucache" = self.by-version."databank-lrucache"."0.1.2"; - by-spec."databank-memcached"."^0.15.0" = - self.by-version."databank-memcached"."0.15.0"; - by-version."databank-memcached"."0.15.0" = self.buildNodePackage { - name = "databank-memcached-0.15.0"; - version = "0.15.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank-memcached/-/databank-memcached-0.15.0.tgz"; - name = "databank-memcached-0.15.0.tgz"; - sha1 = "0817452dfb2b09267cd1c8bbec95363ec14f14f2"; - }; - deps = { - "memcached-0.2.8" = self.by-version."memcached"."0.2.8"; - "databank-0.18.2" = self.by-version."databank"."0.18.2"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank-memcached" = self.by-version."databank-memcached"."0.15.0"; - by-spec."databank-mongodb"."^0.18.10" = - self.by-version."databank-mongodb"."0.18.10"; - by-version."databank-mongodb"."0.18.10" = self.buildNodePackage { - name = "databank-mongodb-0.18.10"; - version = "0.18.10"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank-mongodb/-/databank-mongodb-0.18.10.tgz"; - name = "databank-mongodb-0.18.10.tgz"; - sha1 = "5f9d37059d024f1116bdca05459f9c033b0d8ae5"; - }; - deps = { - "databank-0.19.1" = self.by-version."databank"."0.19.1"; - "mongodb-1.4.39" = self.by-version."mongodb"."1.4.39"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank-mongodb" = self.by-version."databank-mongodb"."0.18.10"; - by-spec."databank-redis"."^0.19.6" = - self.by-version."databank-redis"."0.19.6"; - by-version."databank-redis"."0.19.6" = self.buildNodePackage { - name = "databank-redis-0.19.6"; - version = "0.19.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz"; - name = "databank-redis-0.19.6.tgz"; - sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; - }; - deps = { - "async-0.9.2" = self.by-version."async"."0.9.2"; - "databank-0.19.1" = self.by-version."databank"."0.19.1"; - "redis-0.10.3" = self.by-version."redis"."0.10.3"; - "underscore-1.6.0" = self.by-version."underscore"."1.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "databank-redis" = self.by-version."databank-redis"."0.19.6"; - by-spec."dateformat"."1.x" = - self.by-version."dateformat"."1.0.12"; - by-version."dateformat"."1.0.12" = self.buildNodePackage { - name = "dateformat-1.0.12"; - version = "1.0.12"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - name = "dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; - }; - deps = { - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - "meow-3.6.0" = self.by-version."meow"."3.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "dateformat" = self.by-version."dateformat"."1.0.12"; - by-spec."debug"."*" = - self.by-version."debug"."2.2.0"; - by-version."debug"."2.2.0" = self.buildNodePackage { - name = "debug-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - name = "debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - deps = { - "ms-0.7.1" = self.by-version."ms"."0.7.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."debug"."0.7.0" = - self.by-version."debug"."0.7.0"; - by-version."debug"."0.7.0" = self.buildNodePackage { - name = "debug-0.7.0"; - version = "0.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/debug/-/debug-0.7.0.tgz"; - name = "debug-0.7.0.tgz"; - sha1 = "f5be05ec0434c992d79940e50b2695cfb2e01b08"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dialback-client"."~0.1.5" = - self.by-version."dialback-client"."0.1.5"; - by-version."dialback-client"."0.1.5" = self.buildNodePackage { - name = "dialback-client-0.1.5"; - version = "0.1.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dialback-client/-/dialback-client-0.1.5.tgz"; - name = "dialback-client-0.1.5.tgz"; - sha1 = "ff37f58554ac7dca79a219ba3e6e7c5ed4cc0745"; - }; - deps = { - "express-2.5.11" = self.by-version."express"."2.5.11"; - "underscore-1.4.4" = self.by-version."underscore"."1.4.4"; - "databank-0.18.2" = self.by-version."databank"."0.18.2"; - "step-0.0.6" = self.by-version."step"."0.0.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "dialback-client" = self.by-version."dialback-client"."0.1.5"; - by-spec."diff"."~1.0.3" = - self.by-version."diff"."1.0.8"; - by-version."diff"."1.0.8" = self.buildNodePackage { - name = "diff-1.0.8"; - version = "1.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz"; - name = "diff-1.0.8.tgz"; - sha1 = "343276308ec991b7bc82267ed55bc1411f971666"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."dtrace-provider"."0.2.4" = - self.by-version."dtrace-provider"."0.2.4"; - by-version."dtrace-provider"."0.2.4" = self.buildNodePackage { - name = "dtrace-provider-0.2.4"; - version = "0.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.4.tgz"; - name = "dtrace-provider-0.2.4.tgz"; - sha1 = "0719d4449c8994cc89e317cf0d732213f94653d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."emailjs"."0.3.x" = - self.by-version."emailjs"."0.3.16"; - by-version."emailjs"."0.3.16" = self.buildNodePackage { - name = "emailjs-0.3.16"; - version = "0.3.16"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/emailjs/-/emailjs-0.3.16.tgz"; - name = "emailjs-0.3.16.tgz"; - sha1 = "f162735352ce7b6615a5d811714051f90f23331d"; - }; - deps = { - "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2"; - "mimelib-0.2.14" = self.by-version."mimelib"."0.2.14"; - "moment-1.7.0" = self.by-version."moment"."1.7.0"; - "starttls-0.2.1" = self.by-version."starttls"."0.2.1"; - }; - optionalDependencies = { - "bufferjs-1.1.0" = self.by-version."bufferjs"."1.1.0"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "emailjs" = self.by-version."emailjs"."0.3.16"; - by-spec."encoding"."~0.1" = - self.by-version."encoding"."0.1.11"; - by-version."encoding"."0.1.11" = self.buildNodePackage { - name = "encoding-0.1.11"; - version = "0.1.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz"; - name = "encoding-0.1.11.tgz"; - sha1 = "52c65ac15aab467f1338451e2615f988eccc0258"; - }; - deps = { - "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."error-ex"."^1.2.0" = - self.by-version."error-ex"."1.3.0"; - by-version."error-ex"."1.3.0" = self.buildNodePackage { - name = "error-ex-1.3.0"; - version = "1.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz"; - name = "error-ex-1.3.0.tgz"; - sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9"; - }; - deps = { - "is-arrayish-0.2.1" = self.by-version."is-arrayish"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."express"."2.5.x" = - self.by-version."express"."2.5.11"; - by-version."express"."2.5.11" = self.buildNodePackage { - name = "express-2.5.11"; - version = "2.5.11"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz"; - name = "express-2.5.11.tgz"; - sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0"; - }; - deps = { - "connect-1.9.2" = self.by-version."connect"."1.9.2"; - "mime-1.2.4" = self.by-version."mime"."1.2.4"; - "qs-0.4.2" = self.by-version."qs"."0.4.2"; - "mkdirp-0.3.0" = self.by-version."mkdirp"."0.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "express" = self.by-version."express"."2.5.11"; - by-spec."eyes".">=0.1.6" = - self.by-version."eyes"."0.1.8"; - by-version."eyes"."0.1.8" = self.buildNodePackage { - name = "eyes-0.1.8"; - version = "0.1.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - name = "eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."faye-websocket"."^0.9.3" = - self.by-version."faye-websocket"."0.9.4"; - by-version."faye-websocket"."0.9.4" = self.buildNodePackage { - name = "faye-websocket-0.9.4"; - version = "0.9.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz"; - name = "faye-websocket-0.9.4.tgz"; - sha1 = "885934c79effb0409549e0c0a3801ed17a40cdad"; - }; - deps = { - "websocket-driver-0.6.3" = self.by-version."websocket-driver"."0.6.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."find-up"."^1.0.0" = - self.by-version."find-up"."1.1.0"; - by-version."find-up"."1.1.0" = self.buildNodePackage { - name = "find-up-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/find-up/-/find-up-1.1.0.tgz"; - name = "find-up-1.1.0.tgz"; - sha1 = "a63b0eec4625a2902534898a5f9eec8aaed046e9"; - }; - deps = { - "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0"; - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."formidable"."1.0.x" = - self.by-version."formidable"."1.0.17"; - by-version."formidable"."1.0.17" = self.buildNodePackage { - name = "formidable-1.0.17"; - version = "1.0.17"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz"; - name = "formidable-1.0.17.tgz"; - sha1 = "ef5491490f9433b705faa77249c99029ae348559"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."get-stdin"."^4.0.1" = - self.by-version."get-stdin"."4.0.1"; - by-version."get-stdin"."4.0.1" = self.buildNodePackage { - name = "get-stdin-4.0.1"; - version = "4.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - name = "get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."gm"."1.9.x" = - self.by-version."gm"."1.9.2"; - by-version."gm"."1.9.2" = self.buildNodePackage { - name = "gm-1.9.2"; - version = "1.9.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/gm/-/gm-1.9.2.tgz"; - name = "gm-1.9.2.tgz"; - sha1 = "00443279fe959a10fa23025e0c8401e710215845"; - }; - deps = { - "debug-0.7.0" = self.by-version."debug"."0.7.0"; - "array-series-0.1.5" = self.by-version."array-series"."0.1.5"; - "array-parallel-0.1.3" = self.by-version."array-parallel"."0.1.3"; - "through-2.3.8" = self.by-version."through"."2.3.8"; - "stream-to-buffer-0.0.1" = self.by-version."stream-to-buffer"."0.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "gm" = self.by-version."gm"."1.9.2"; - by-spec."graceful-fs"."^4.1.2" = - self.by-version."graceful-fs"."4.1.2"; - by-version."graceful-fs"."4.1.2" = self.buildNodePackage { - name = "graceful-fs-4.1.2"; - version = "4.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.2.tgz"; - name = "graceful-fs-4.1.2.tgz"; - sha1 = "fe2239b7574972e67e41f808823f9bfa4a991e37"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hashring"."0.0.x" = - self.by-version."hashring"."0.0.8"; - by-version."hashring"."0.0.8" = self.buildNodePackage { - name = "hashring-0.0.8"; - version = "0.0.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hashring/-/hashring-0.0.8.tgz"; - name = "hashring-0.0.8.tgz"; - sha1 = "203ab13c364119f10106526d2eaf7bd42b484c31"; - }; - deps = { - "bisection-0.0.3" = self.by-version."bisection"."0.0.3"; - "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."hosted-git-info"."^2.1.4" = - self.by-version."hosted-git-info"."2.1.4"; - by-version."hosted-git-info"."2.1.4" = self.buildNodePackage { - name = "hosted-git-info-2.1.4"; - version = "2.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"; - name = "hosted-git-info-2.1.4.tgz"; - sha1 = "d9e953b26988be88096c46e926494d9604c300f8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."iconv-lite"."~0.4.4" = - self.by-version."iconv-lite"."0.4.13"; - by-version."iconv-lite"."0.4.13" = self.buildNodePackage { - name = "iconv-lite-0.4.13"; - version = "0.4.13"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; - name = "iconv-lite-0.4.13.tgz"; - sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."indent-string"."^2.1.0" = - self.by-version."indent-string"."2.1.0"; - by-version."indent-string"."2.1.0" = self.buildNodePackage { - name = "indent-string-2.1.0"; - version = "2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - name = "indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - deps = { - "repeating-2.0.0" = self.by-version."repeating"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."inherits"."~2.0.1" = - self.by-version."inherits"."2.0.1"; - by-version."inherits"."2.0.1" = self.buildNodePackage { - name = "inherits-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - name = "inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-arrayish"."^0.2.1" = - self.by-version."is-arrayish"."0.2.1"; - by-version."is-arrayish"."0.2.1" = self.buildNodePackage { - name = "is-arrayish-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - name = "is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-builtin-module"."^1.0.0" = - self.by-version."is-builtin-module"."1.0.0"; - by-version."is-builtin-module"."1.0.0" = self.buildNodePackage { - name = "is-builtin-module-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - name = "is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - deps = { - "builtin-modules-1.1.0" = self.by-version."builtin-modules"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-finite"."^1.0.0" = - self.by-version."is-finite"."1.0.1"; - by-version."is-finite"."1.0.1" = self.buildNodePackage { - name = "is-finite-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz"; - name = "is-finite-1.0.1.tgz"; - sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b"; - }; - deps = { - "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."is-utf8"."^0.2.0" = - self.by-version."is-utf8"."0.2.0"; - by-version."is-utf8"."0.2.0" = self.buildNodePackage { - name = "is-utf8-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"; - name = "is-utf8-0.2.0.tgz"; - sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."isarray"."0.0.1" = - self.by-version."isarray"."0.0.1"; - by-version."isarray"."0.0.1" = self.buildNodePackage { - name = "isarray-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - name = "isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jackpot".">=0.0.6" = - self.by-version."jackpot"."0.0.6"; - by-version."jackpot"."0.0.6" = self.buildNodePackage { - name = "jackpot-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jackpot/-/jackpot-0.0.6.tgz"; - name = "jackpot-0.0.6.tgz"; - sha1 = "3cff064285cbf66f4eab2593c90bce816a821849"; - }; - deps = { - "retry-0.6.0" = self.by-version."retry"."0.6.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."jankyqueue"."0.1.x" = - self.by-version."jankyqueue"."0.1.1"; - by-version."jankyqueue"."0.1.1" = self.buildNodePackage { - name = "jankyqueue-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz"; - name = "jankyqueue-0.1.1.tgz"; - sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "jankyqueue" = self.by-version."jankyqueue"."0.1.1"; - by-spec."kerberos"."0.0.11" = - self.by-version."kerberos"."0.0.11"; - by-version."kerberos"."0.0.11" = self.buildNodePackage { - name = "kerberos-0.0.11"; - version = "0.0.11"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.11.tgz"; - name = "kerberos-0.0.11.tgz"; - sha1 = "cb29891c21c22ac195f3140b97dd12204fea7dc2"; - }; - deps = { - "nan-1.8.4" = self.by-version."nan"."1.8.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."load-json-file"."^1.0.0" = - self.by-version."load-json-file"."1.1.0"; - by-version."load-json-file"."1.1.0" = self.buildNodePackage { - name = "load-json-file-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - name = "load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - deps = { - "graceful-fs-4.1.2" = self.by-version."graceful-fs"."4.1.2"; - "parse-json-2.2.0" = self.by-version."parse-json"."2.2.0"; - "pify-2.3.0" = self.by-version."pify"."2.3.0"; - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."loud-rejection"."^1.0.0" = - self.by-version."loud-rejection"."1.2.0"; - by-version."loud-rejection"."1.2.0" = self.buildNodePackage { - name = "loud-rejection-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/loud-rejection/-/loud-rejection-1.2.0.tgz"; - name = "loud-rejection-1.2.0.tgz"; - sha1 = "f4f87db6abec3b7fe47834531ecf6a011143e58d"; - }; - deps = { - "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."lru-cache"."2.3.x" = - self.by-version."lru-cache"."2.3.1"; - by-version."lru-cache"."2.3.1" = self.buildNodePackage { - name = "lru-cache-2.3.1"; - version = "2.3.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz"; - name = "lru-cache-2.3.1.tgz"; - sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."map-obj"."^1.0.0" = - self.by-version."map-obj"."1.0.1"; - by-version."map-obj"."1.0.1" = self.buildNodePackage { - name = "map-obj-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - name = "map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."memcached"."0.2.x" = - self.by-version."memcached"."0.2.8"; - by-version."memcached"."0.2.8" = self.buildNodePackage { - name = "memcached-0.2.8"; - version = "0.2.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/memcached/-/memcached-0.2.8.tgz"; - name = "memcached-0.2.8.tgz"; - sha1 = "ffbf9498cbc30779625b77e77770bd50dc525212"; - }; - deps = { - "hashring-0.0.8" = self.by-version."hashring"."0.0.8"; - "jackpot-0.0.6" = self.by-version."jackpot"."0.0.6"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."meow"."^3.3.0" = - self.by-version."meow"."3.6.0"; - by-version."meow"."3.6.0" = self.buildNodePackage { - name = "meow-3.6.0"; - version = "3.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/meow/-/meow-3.6.0.tgz"; - name = "meow-3.6.0.tgz"; - sha1 = "e7a535295cb89db0e0782428e55fa8615bf9e150"; - }; - deps = { - "camelcase-keys-2.0.0" = self.by-version."camelcase-keys"."2.0.0"; - "loud-rejection-1.2.0" = self.by-version."loud-rejection"."1.2.0"; - "minimist-1.2.0" = self.by-version."minimist"."1.2.0"; - "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; - "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1"; - "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1"; - "redent-1.0.0" = self.by-version."redent"."1.0.0"; - "trim-newlines-1.0.0" = self.by-version."trim-newlines"."1.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime"."1.2.4" = - self.by-version."mime"."1.2.4"; - by-version."mime"."1.2.4" = self.buildNodePackage { - name = "mime-1.2.4"; - version = "1.2.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz"; - name = "mime-1.2.4.tgz"; - sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mime".">= 0.0.1" = - self.by-version."mime"."1.3.4"; - by-version."mime"."1.3.4" = self.buildNodePackage { - name = "mime-1.3.4"; - version = "1.3.4"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - name = "mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mimelib"."0.2.14" = - self.by-version."mimelib"."0.2.14"; - by-version."mimelib"."0.2.14" = self.buildNodePackage { - name = "mimelib-0.2.14"; - version = "0.2.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; - name = "mimelib-0.2.14.tgz"; - sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; - }; - deps = { - "encoding-0.1.11" = self.by-version."encoding"."0.1.11"; - "addressparser-0.2.1" = self.by-version."addressparser"."0.2.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."minimist"."^1.1.3" = - self.by-version."minimist"."1.2.0"; - by-version."minimist"."1.2.0" = self.buildNodePackage { - name = "minimist-1.2.0"; - version = "1.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - name = "minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.3.0" = - self.by-version."mkdirp"."0.3.0"; - by-version."mkdirp"."0.3.0" = self.buildNodePackage { - name = "mkdirp-0.3.0"; - version = "0.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz"; - name = "mkdirp-0.3.0.tgz"; - sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mkdirp"."0.3.x" = - self.by-version."mkdirp"."0.3.5"; - by-version."mkdirp"."0.3.5" = self.buildNodePackage { - name = "mkdirp-0.3.5"; - version = "0.3.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz"; - name = "mkdirp-0.3.5.tgz"; - sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "mkdirp" = self.by-version."mkdirp"."0.3.5"; - by-spec."moment"."= 1.7.0" = - self.by-version."moment"."1.7.0"; - by-version."moment"."1.7.0" = self.buildNodePackage { - name = "moment-1.7.0"; - version = "1.7.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/moment/-/moment-1.7.0.tgz"; - name = "moment-1.7.0.tgz"; - sha1 = "6f3d73a446c6bd6af1b993801d0b8071efad5e28"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."mongodb"."1.4.x" = - self.by-version."mongodb"."1.4.39"; - by-version."mongodb"."1.4.39" = self.buildNodePackage { - name = "mongodb-1.4.39"; - version = "1.4.39"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.39.tgz"; - name = "mongodb-1.4.39.tgz"; - sha1 = "f5b25c7f7df06c968cd5d3c68280adc9a6404591"; - }; - deps = { - "bson-0.2.22" = self.by-version."bson"."0.2.22"; - }; - optionalDependencies = { - "kerberos-0.0.11" = self.by-version."kerberos"."0.0.11"; - "readable-stream-2.0.4" = self.by-version."readable-stream"."2.0.4"; - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."ms"."0.7.1" = - self.by-version."ms"."0.7.1"; - by-version."ms"."0.7.1" = self.buildNodePackage { - name = "ms-0.7.1"; - version = "0.7.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - name = "ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."2.0.5" = - self.by-version."nan"."2.0.5"; - by-version."nan"."2.0.5" = self.buildNodePackage { - name = "nan-2.0.5"; - version = "2.0.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-2.0.5.tgz"; - name = "nan-2.0.5.tgz"; - sha1 = "365888014be1fd178db0cbfa258edf7b0cb1c408"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."nan"."~1.8" = - self.by-version."nan"."1.8.4"; - by-version."nan"."1.8.4" = self.buildNodePackage { - name = "nan-1.8.4"; - version = "1.8.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/nan/-/nan-1.8.4.tgz"; - name = "nan-1.8.4.tgz"; - sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."1.3.x" = - self.by-version."node-uuid"."1.3.3"; - by-version."node-uuid"."1.3.3" = self.buildNodePackage { - name = "node-uuid-1.3.3"; - version = "1.3.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz"; - name = "node-uuid-1.3.3.tgz"; - sha1 = "d3db4d7b56810d9e4032342766282af07391729b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "node-uuid" = self.by-version."node-uuid"."1.3.3"; - by-spec."node-uuid"."1.4.x" = - self.by-version."node-uuid"."1.4.7"; - by-version."node-uuid"."1.4.7" = self.buildNodePackage { - name = "node-uuid-1.4.7"; - version = "1.4.7"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz"; - name = "node-uuid-1.4.7.tgz"; - sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."node-uuid"."^1.4.1" = - self.by-version."node-uuid"."1.4.7"; - by-spec."normalize-package-data"."^2.3.2" = - self.by-version."normalize-package-data"."2.3.5"; - by-version."normalize-package-data"."2.3.5" = self.buildNodePackage { - name = "normalize-package-data-2.3.5"; - version = "2.3.5"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz"; - name = "normalize-package-data-2.3.5.tgz"; - sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df"; - }; - deps = { - "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4"; - "is-builtin-module-1.0.0" = self.by-version."is-builtin-module"."1.0.0"; - "semver-5.1.0" = self.by-version."semver"."5.1.0"; - "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."normalize-package-data"."^2.3.4" = - self.by-version."normalize-package-data"."2.3.5"; - by-spec."number-is-nan"."^1.0.0" = - self.by-version."number-is-nan"."1.0.0"; - by-version."number-is-nan"."1.0.0" = self.buildNodePackage { - name = "number-is-nan-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"; - name = "number-is-nan-1.0.0.tgz"; - sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth"."0.9.7" = - self.by-version."oauth"."0.9.7"; - by-version."oauth"."0.9.7" = self.buildNodePackage { - name = "oauth-0.9.7"; - version = "0.9.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz"; - name = "oauth-0.9.7.tgz"; - sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."oauth-evanp"."~0.9.10-evanp.2" = - self.by-version."oauth-evanp"."0.9.10-evanp.2"; - by-version."oauth-evanp"."0.9.10-evanp.2" = self.buildNodePackage { - name = "oauth-evanp-0.9.10-evanp.2"; - version = "0.9.10-evanp.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz"; - name = "oauth-evanp-0.9.10-evanp.2.tgz"; - sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "oauth-evanp" = self.by-version."oauth-evanp"."0.9.10-evanp.2"; - by-spec."object-assign"."^4.0.1" = - self.by-version."object-assign"."4.0.1"; - by-version."object-assign"."4.0.1" = self.buildNodePackage { - name = "object-assign-4.0.1"; - version = "4.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"; - name = "object-assign-4.0.1.tgz"; - sha1 = "99504456c3598b5cad4fc59c26e8a9bb107fe0bd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."openid"."0.4.1" = - self.by-version."openid"."0.4.1"; - by-version."openid"."0.4.1" = self.buildNodePackage { - name = "openid-0.4.1"; - version = "0.4.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/openid/-/openid-0.4.1.tgz"; - name = "openid-0.4.1.tgz"; - sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."optimist"."0.3.x" = - self.by-version."optimist"."0.3.7"; - by-version."optimist"."0.3.7" = self.buildNodePackage { - name = "optimist-0.3.7"; - version = "0.3.7"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - name = "optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }; - deps = { - "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "optimist" = self.by-version."optimist"."0.3.7"; - by-spec."parse-json"."^2.2.0" = - self.by-version."parse-json"."2.2.0"; - by-version."parse-json"."2.2.0" = self.buildNodePackage { - name = "parse-json-2.2.0"; - version = "2.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - name = "parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - deps = { - "error-ex-1.3.0" = self.by-version."error-ex"."1.3.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-exists"."^2.0.0" = - self.by-version."path-exists"."2.1.0"; - by-version."path-exists"."2.1.0" = self.buildNodePackage { - name = "path-exists-2.1.0"; - version = "2.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - name = "path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - deps = { - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."path-type"."^1.0.0" = - self.by-version."path-type"."1.1.0"; - by-version."path-type"."1.1.0" = self.buildNodePackage { - name = "path-type-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - name = "path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - deps = { - "graceful-fs-4.1.2" = self.by-version."graceful-fs"."4.1.2"; - "pify-2.3.0" = self.by-version."pify"."2.3.0"; - "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pify"."^2.0.0" = - self.by-version."pify"."2.3.0"; - by-version."pify"."2.3.0" = self.buildNodePackage { - name = "pify-2.3.0"; - version = "2.3.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - name = "pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pinkie"."^2.0.0" = - self.by-version."pinkie"."2.0.1"; - by-version."pinkie"."2.0.1" = self.buildNodePackage { - name = "pinkie-2.0.1"; - version = "2.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz"; - name = "pinkie-2.0.1.tgz"; - sha1 = "4236c86fc29f261c2045bbe81f78cbb2a5e8306c"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."pinkie-promise"."^2.0.0" = - self.by-version."pinkie-promise"."2.0.0"; - by-version."pinkie-promise"."2.0.0" = self.buildNodePackage { - name = "pinkie-promise-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz"; - name = "pinkie-promise-2.0.0.tgz"; - sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259"; - }; - deps = { - "pinkie-2.0.1" = self.by-version."pinkie"."2.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."process-nextick-args"."~1.0.0" = - self.by-version."process-nextick-args"."1.0.6"; - by-version."process-nextick-args"."1.0.6" = self.buildNodePackage { - name = "process-nextick-args-1.0.6"; - version = "1.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"; - name = "process-nextick-args-1.0.6.tgz"; - sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs"."0.4.x" = - self.by-version."qs"."0.4.2"; - by-version."qs"."0.4.2" = self.buildNodePackage { - name = "qs-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz"; - name = "qs-0.4.2.tgz"; - sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."qs".">= 0.4.0" = - self.by-version."qs"."6.0.1"; - by-version."qs"."6.0.1" = self.buildNodePackage { - name = "qs-6.0.1"; - version = "6.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-6.0.1.tgz"; - name = "qs-6.0.1.tgz"; - sha1 = "ee8b7fcd64fcbe6e36c922bd2c464ee7c54766c3"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."read-pkg"."^1.0.0" = - self.by-version."read-pkg"."1.1.0"; - by-version."read-pkg"."1.1.0" = self.buildNodePackage { - name = "read-pkg-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - name = "read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - deps = { - "load-json-file-1.1.0" = self.by-version."load-json-file"."1.1.0"; - "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5"; - "path-type-1.1.0" = self.by-version."path-type"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."read-pkg-up"."^1.0.1" = - self.by-version."read-pkg-up"."1.0.1"; - by-version."read-pkg-up"."1.0.1" = self.buildNodePackage { - name = "read-pkg-up-1.0.1"; - version = "1.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - name = "read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - deps = { - "find-up-1.1.0" = self.by-version."find-up"."1.1.0"; - "read-pkg-1.1.0" = self.by-version."read-pkg"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."readable-stream"."*" = - self.by-version."readable-stream"."2.0.4"; - by-version."readable-stream"."2.0.4" = self.buildNodePackage { - name = "readable-stream-2.0.4"; - version = "2.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.4.tgz"; - name = "readable-stream-2.0.4.tgz"; - sha1 = "2523ef27ffa339d7ba9da8603f2d0599d06edbd8"; - }; - deps = { - "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."redent"."^1.0.0" = - self.by-version."redent"."1.0.0"; - by-version."redent"."1.0.0" = self.buildNodePackage { - name = "redent-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - name = "redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - deps = { - "indent-string-2.1.0" = self.by-version."indent-string"."2.1.0"; - "strip-indent-1.0.1" = self.by-version."strip-indent"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."redis"."~0.10.3" = - self.by-version."redis"."0.10.3"; - by-version."redis"."0.10.3" = self.buildNodePackage { - name = "redis-0.10.3"; - version = "0.10.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - name = "redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."repeating"."^2.0.0" = - self.by-version."repeating"."2.0.0"; - by-version."repeating"."2.0.0" = self.buildNodePackage { - name = "repeating-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz"; - name = "repeating-2.0.0.tgz"; - sha1 = "fd27d6d264d18fbebfaa56553dd7b82535a5034e"; - }; - deps = { - "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."retry"."0.6.0" = - self.by-version."retry"."0.6.0"; - by-version."retry"."0.6.0" = self.buildNodePackage { - name = "retry-0.6.0"; - version = "0.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz"; - name = "retry-0.6.0.tgz"; - sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sax".">=0.1.1" = - self.by-version."sax"."1.1.4"; - by-version."sax"."1.1.4" = self.buildNodePackage { - name = "sax-1.1.4"; - version = "1.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz"; - name = "sax-1.1.4.tgz"; - sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."schlock"."~0.2.1" = - self.by-version."schlock"."0.2.1"; - by-version."schlock"."0.2.1" = self.buildNodePackage { - name = "schlock-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz"; - name = "schlock-0.2.1.tgz"; - sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "schlock" = self.by-version."schlock"."0.2.1"; - by-spec."semver"."2 || 3 || 4 || 5" = - self.by-version."semver"."5.1.0"; - by-version."semver"."5.1.0" = self.buildNodePackage { - name = "semver-5.1.0"; - version = "5.1.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz"; - name = "semver-5.1.0.tgz"; - sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."set-immediate"."0.1.x" = - self.by-version."set-immediate"."0.1.1"; - by-version."set-immediate"."0.1.1" = self.buildNodePackage { - name = "set-immediate-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz"; - name = "set-immediate-0.1.1.tgz"; - sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "set-immediate" = self.by-version."set-immediate"."0.1.1"; - by-spec."set-immediate"."~0.1.1" = - self.by-version."set-immediate"."0.1.1"; - by-spec."showdown"."0.3.x" = - self.by-version."showdown"."0.3.4"; - by-version."showdown"."0.3.4" = self.buildNodePackage { - name = "showdown-0.3.4"; - version = "0.3.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/showdown/-/showdown-0.3.4.tgz"; - name = "showdown-0.3.4.tgz"; - sha1 = "b056fa0209d44ac55c90331b44a934774976ac55"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "showdown" = self.by-version."showdown"."0.3.4"; - by-spec."signal-exit"."^2.1.2" = - self.by-version."signal-exit"."2.1.2"; - by-version."signal-exit"."2.1.2" = self.buildNodePackage { - name = "signal-exit-2.1.2"; - version = "2.1.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz"; - name = "signal-exit-2.1.2.tgz"; - sha1 = "375879b1f92ebc3b334480d038dc546a6d558564"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."simple-lru-cache"."0.0.x" = - self.by-version."simple-lru-cache"."0.0.2"; - by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage { - name = "simple-lru-cache-0.0.2"; - version = "0.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz"; - name = "simple-lru-cache-0.0.2.tgz"; - sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."sockjs"."0.3.x" = - self.by-version."sockjs"."0.3.15"; - by-version."sockjs"."0.3.15" = self.buildNodePackage { - name = "sockjs-0.3.15"; - version = "0.3.15"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.15.tgz"; - name = "sockjs-0.3.15.tgz"; - sha1 = "e19b577e59e0fbdb21a0ae4f46203ca24cad8db8"; - }; - deps = { - "faye-websocket-0.9.4" = self.by-version."faye-websocket"."0.9.4"; - "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "sockjs" = self.by-version."sockjs"."0.3.15"; - by-spec."spdx-correct"."~1.0.0" = - self.by-version."spdx-correct"."1.0.2"; - by-version."spdx-correct"."1.0.2" = self.buildNodePackage { - name = "spdx-correct-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - name = "spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - deps = { - "spdx-license-ids-1.1.0" = self.by-version."spdx-license-ids"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."spdx-exceptions"."^1.0.4" = - self.by-version."spdx-exceptions"."1.0.4"; - by-version."spdx-exceptions"."1.0.4" = self.buildNodePackage { - name = "spdx-exceptions-1.0.4"; - version = "1.0.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz"; - name = "spdx-exceptions-1.0.4.tgz"; - sha1 = "220b84239119ae9045a892db81a83f4ce16f80fd"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."spdx-expression-parse"."~1.0.0" = - self.by-version."spdx-expression-parse"."1.0.2"; - by-version."spdx-expression-parse"."1.0.2" = self.buildNodePackage { - name = "spdx-expression-parse-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz"; - name = "spdx-expression-parse-1.0.2.tgz"; - sha1 = "d52b14b5e9670771440af225bcb563122ac452f6"; - }; - deps = { - "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4"; - "spdx-license-ids-1.1.0" = self.by-version."spdx-license-ids"."1.1.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."spdx-license-ids"."^1.0.0" = - self.by-version."spdx-license-ids"."1.1.0"; - by-version."spdx-license-ids"."1.1.0" = self.buildNodePackage { - name = "spdx-license-ids-1.1.0"; - version = "1.1.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.1.0.tgz"; - name = "spdx-license-ids-1.1.0.tgz"; - sha1 = "28694acdf39fe27de45143fff81f21f6c66d44ac"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."spdx-license-ids"."^1.0.2" = - self.by-version."spdx-license-ids"."1.1.0"; - by-spec."starttls"."0.2.1" = - self.by-version."starttls"."0.2.1"; - by-version."starttls"."0.2.1" = self.buildNodePackage { - name = "starttls-0.2.1"; - version = "0.2.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/starttls/-/starttls-0.2.1.tgz"; - name = "starttls-0.2.1.tgz"; - sha1 = "b98d3e5e778d46f199c843a64f889f0347c6d19a"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."step"."0.0.x" = - self.by-version."step"."0.0.6"; - by-version."step"."0.0.6" = self.buildNodePackage { - name = "step-0.0.6"; - version = "0.0.6"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/step/-/step-0.0.6.tgz"; - name = "step-0.0.6.tgz"; - sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "step" = self.by-version."step"."0.0.6"; - by-spec."stream-to-buffer"."~0.0.1" = - self.by-version."stream-to-buffer"."0.0.1"; - by-version."stream-to-buffer"."0.0.1" = self.buildNodePackage { - name = "stream-to-buffer-0.0.1"; - version = "0.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.0.1.tgz"; - name = "stream-to-buffer-0.0.1.tgz"; - sha1 = "ab483d59a1ca71832de379a255f465b665af45c1"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."string_decoder"."~0.10.x" = - self.by-version."string_decoder"."0.10.31"; - by-version."string_decoder"."0.10.31" = self.buildNodePackage { - name = "string_decoder-0.10.31"; - version = "0.10.31"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - name = "string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-bom"."^2.0.0" = - self.by-version."strip-bom"."2.0.0"; - by-version."strip-bom"."2.0.0" = self.buildNodePackage { - name = "strip-bom-2.0.0"; - version = "2.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - name = "strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - deps = { - "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."strip-indent"."^1.0.1" = - self.by-version."strip-indent"."1.0.1"; - by-version."strip-indent"."1.0.1" = self.buildNodePackage { - name = "strip-indent-1.0.1"; - version = "1.0.1"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - name = "strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - deps = { - "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."through"."~2.3.1" = - self.by-version."through"."2.3.8"; - by-version."through"."2.3.8" = self.buildNodePackage { - name = "through-2.3.8"; - version = "2.3.8"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz"; - name = "through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."trim-newlines"."^1.0.0" = - self.by-version."trim-newlines"."1.0.0"; - by-version."trim-newlines"."1.0.0" = self.buildNodePackage { - name = "trim-newlines-1.0.0"; - version = "1.0.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - name = "trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."*" = - self.by-version."underscore"."1.8.3"; - by-version."underscore"."1.8.3" = self.buildNodePackage { - name = "underscore-1.8.3"; - version = "1.8.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - name = "underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."1.4.x" = - self.by-version."underscore"."1.4.4"; - by-version."underscore"."1.4.4" = self.buildNodePackage { - name = "underscore-1.4.4"; - version = "1.4.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz"; - name = "underscore-1.4.4.tgz"; - sha1 = "61a6a32010622afa07963bf325203cf12239d604"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "underscore" = self.by-version."underscore"."1.4.4"; - by-spec."underscore"."1.5.x" = - self.by-version."underscore"."1.5.2"; - by-version."underscore"."1.5.2" = self.buildNodePackage { - name = "underscore-1.5.2"; - version = "1.5.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - name = "underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore"."1.6.x" = - self.by-version."underscore"."1.6.0"; - by-version."underscore"."1.6.0" = self.buildNodePackage { - name = "underscore-1.6.0"; - version = "1.6.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - name = "underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."underscore".">=1.1.3" = - self.by-version."underscore"."1.8.3"; - by-spec."underscore"."^1.8.3" = - self.by-version."underscore"."1.8.3"; - by-spec."underscore-contrib"."0.1.x" = - self.by-version."underscore-contrib"."0.1.4"; - by-version."underscore-contrib"."0.1.4" = self.buildNodePackage { - name = "underscore-contrib-0.1.4"; - version = "0.1.4"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.1.4.tgz"; - name = "underscore-contrib-0.1.4.tgz"; - sha1 = "db40f37f2e66961d2e0326bf65fb76887a1ca1c6"; - }; - deps = { - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "underscore-contrib" = self.by-version."underscore-contrib"."0.1.4"; - by-spec."util-deprecate"."~1.0.1" = - self.by-version."util-deprecate"."1.0.2"; - by-version."util-deprecate"."1.0.2" = self.buildNodePackage { - name = "util-deprecate-1.0.2"; - version = "1.0.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - name = "util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."utml"."0.2.x" = - self.by-version."utml"."0.2.0"; - by-version."utml"."0.2.0" = self.buildNodePackage { - name = "utml-0.2.0"; - version = "0.2.0"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/utml/-/utml-0.2.0.tgz"; - name = "utml-0.2.0.tgz"; - sha1 = "6a546741823b2a9c17598a57e8eb4c08738dee48"; - }; - deps = { - "underscore-1.8.3" = self.by-version."underscore"."1.8.3"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "utml" = self.by-version."utml"."0.2.0"; - by-spec."validate-npm-package-license"."^3.0.1" = - self.by-version."validate-npm-package-license"."3.0.1"; - by-version."validate-npm-package-license"."3.0.1" = self.buildNodePackage { - name = "validate-npm-package-license-3.0.1"; - version = "3.0.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - name = "validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - deps = { - "spdx-correct-1.0.2" = self.by-version."spdx-correct"."1.0.2"; - "spdx-expression-parse-1.0.2" = self.by-version."spdx-expression-parse"."1.0.2"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."validator"."0.4.x" = - self.by-version."validator"."0.4.28"; - by-version."validator"."0.4.28" = self.buildNodePackage { - name = "validator-0.4.28"; - version = "0.4.28"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/validator/-/validator-0.4.28.tgz"; - name = "validator-0.4.28.tgz"; - sha1 = "311d439ae6cf3fbe6f85da6ebaccd0c7007986f4"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "validator" = self.by-version."validator"."0.4.28"; - by-spec."vows"."0.7.x" = - self.by-version."vows"."0.7.0"; - by-version."vows"."0.7.0" = self.buildNodePackage { - name = "vows-0.7.0"; - version = "0.7.0"; - bin = true; - src = fetchurl { - url = "http://registry.npmjs.org/vows/-/vows-0.7.0.tgz"; - name = "vows-0.7.0.tgz"; - sha1 = "dd0065f110ba0c0a6d63e844851c3208176d5867"; - }; - deps = { - "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "diff-1.0.8" = self.by-version."diff"."1.0.8"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."webfinger"."~0.4.2" = - self.by-version."webfinger"."0.4.2"; - by-version."webfinger"."0.4.2" = self.buildNodePackage { - name = "webfinger-0.4.2"; - version = "0.4.2"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz"; - name = "webfinger-0.4.2.tgz"; - sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; - }; - deps = { - "step-0.0.6" = self.by-version."step"."0.0.6"; - "xml2js-0.1.14" = self.by-version."xml2js"."0.1.14"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - "webfinger" = self.by-version."webfinger"."0.4.2"; - by-spec."websocket-driver".">=0.5.1" = - self.by-version."websocket-driver"."0.6.3"; - by-version."websocket-driver"."0.6.3" = self.buildNodePackage { - name = "websocket-driver-0.6.3"; - version = "0.6.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.3.tgz"; - name = "websocket-driver-0.6.3.tgz"; - sha1 = "fd21911bb46dee34ad85bdbc5676bf9024ed087b"; - }; - deps = { - "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."websocket-extensions".">=0.1.1" = - self.by-version."websocket-extensions"."0.1.1"; - by-version."websocket-extensions"."0.1.1" = self.buildNodePackage { - name = "websocket-extensions-0.1.1"; - version = "0.1.1"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; - name = "websocket-extensions-0.1.1.tgz"; - sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."wordwrap"."~0.0.2" = - self.by-version."wordwrap"."0.0.3"; - by-version."wordwrap"."0.0.3" = self.buildNodePackage { - name = "wordwrap-0.0.3"; - version = "0.0.3"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - name = "wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - deps = { - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; - by-spec."xml2js"."0.1.x" = - self.by-version."xml2js"."0.1.14"; - by-version."xml2js"."0.1.14" = self.buildNodePackage { - name = "xml2js-0.1.14"; - version = "0.1.14"; - bin = false; - src = fetchurl { - url = "http://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; - name = "xml2js-0.1.14.tgz"; - sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; - }; - deps = { - "sax-1.1.4" = self.by-version."sax"."1.1.4"; - }; - optionalDependencies = { - }; - peerDependencies = []; - os = [ ]; - cpu = [ ]; - }; -} + tarball = nodeEnv.buildNodeSourceDist args; + package = nodeEnv.buildNodePackage args; + shell = nodeEnv.buildNodeShell args; +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/selfoss/default.nix b/pkgs/servers/web-apps/selfoss/default.nix new file mode 100644 index 00000000000..9b11e126137 --- /dev/null +++ b/pkgs/servers/web-apps/selfoss/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "selfoss-${version}"; + version = "2.15"; + + src = fetchFromGitHub { + owner = "SSilence"; + repo = "selfoss"; + rev = version; + sha256 = "0ljpyd354yalpnqwj6xk9b9mq4h6p8jbqznapj7nvfybas8faq15"; + }; + + buildPhases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir $out + cp -ra * $out/ + ''; + + meta = with stdenv.lib; { + description = "Web-based news feed (RSS/Atom) aggregator"; + license = licenses.gpl3; + homepage = http://http://selfoss.aditu.de/; + platforms = platforms.all; + maintainers = [ maintainers.regnat ]; + }; +} + diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6d09116a867..d892135740c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -680,11 +680,11 @@ let }) // {inherit windowswmproto libX11 libXext xextproto ;}; libX11 = (mkDerivation "libX11" { - name = "libX11-1.6.3"; + name = "libX11-1.6.4"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libX11-1.6.3.tar.bz2; - sha256 = "04c1vj53xq2xgyxx5vhln3wm2d76hh1n95fvs3myhligkz1sfcfg"; + url = mirror://xorg/individual/lib/libX11-1.6.4.tar.bz2; + sha256 = "0hg46i6h92pmb7xp1cis2j43zq3fkdz89p0yv35w4vm17az4iixp"; }; buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ]; meta.platforms = stdenv.lib.platforms.unix; @@ -779,11 +779,11 @@ let }) // {inherit libX11 xextproto xproto ;}; libXfixes = (mkDerivation "libXfixes" { - name = "libXfixes-5.0.1"; + name = "libXfixes-5.0.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2; - sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3"; + url = mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2; + sha256 = "1slsk898386xii0r3l7szwwq3s6y2m4dsj0x93ninjh8xkghxllv"; }; buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -823,11 +823,11 @@ let }) // {inherit fontconfig freetype libX11 xproto libXrender ;}; libXi = (mkDerivation "libXi" { - name = "libXi-1.7.6"; + name = "libXi-1.7.7"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXi-1.7.6.tar.bz2; - sha256 = "1b5p0l19ynmd6blnqr205wyngh6fagl35nqb4v05dw60rr9aachz"; + url = mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2; + sha256 = "0c70n4aq0ba628wr88ih4740nci9d9f6y3v96sx376vvlm7q6vwr"; }; buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -889,22 +889,22 @@ let }) // {inherit presentproto libX11 xextproto xproto ;}; libXrandr = (mkDerivation "libXrandr" { - name = "libXrandr-1.5.0"; + name = "libXrandr-1.5.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2; - sha256 = "0n6ycs1arf4wb1cal9il6v7vbxbf21qhs9sbfl8xndgwnxclk1kg"; + url = mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2; + sha256 = "06pmphx8lp3iywqnh88fvbfb0d8xgkx0qpvan49akpja1vxfgy8z"; }; buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;}; libXrender = (mkDerivation "libXrender" { - name = "libXrender-0.9.9"; + name = "libXrender-0.9.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXrender-0.9.9.tar.bz2; - sha256 = "06myx7044qqdswxndsmd82fpp670klnizkgzdm194h51h1wyabzw"; + url = mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2; + sha256 = "0j89cnb06g8x79wmmnwzykgkkfdhin9j7hjpvsxwlr3fz1wmjvf0"; }; buildInputs = [pkgconfig renderproto libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -933,33 +933,33 @@ let }) // {inherit libICE kbproto libSM libX11 xproto ;}; libXtst = (mkDerivation "libXtst" { - name = "libXtst-1.2.2"; + name = "libXtst-1.2.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2; - sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg"; + url = mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2; + sha256 = "012jpyj7xfm653a9jcfqbzxyywdmwb2b5wr1dwylx14f3f54jma6"; }; buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;}; libXv = (mkDerivation "libXv" { - name = "libXv-1.0.10"; + name = "libXv-1.0.11"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2; - sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm"; + url = mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2; + sha256 = "125hn06bd3d8y97hm2pbf5j55gg4r2hpd3ifad651i4sr7m16v6j"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ]; meta.platforms = stdenv.lib.platforms.unix; }) // {inherit videoproto libX11 libXext xextproto xproto ;}; libXvMC = (mkDerivation "libXvMC" { - name = "libXvMC-1.0.9"; + name = "libXvMC-1.0.10"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/lib/libXvMC-1.0.9.tar.bz2; - sha256 = "0mjp1b21dvkaz7r0iq085r92nh5vkpmx99awfgqq9hgzyvgxf0q7"; + url = mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2; + sha256 = "0bpffxr5dal90a8miv2w0rif61byqxq2f5angj4z1bnznmws00g5"; }; buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1582,11 +1582,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.10.2"; + name = "xf86-input-evdev-2.10.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2; - sha256 = "07gybpiv33rymcq5l729agan7nzv5f97wdczja6p145b846n6fm7"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2; + sha256 = "18ijnclnylrr7vkvflalkw4bqfily3scg6baczjjgycdpsj1p8js"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1615,11 +1615,11 @@ let }) // {inherit inputproto xorgserver xproto ;}; xf86inputlibinput = (mkDerivation "xf86inputlibinput" { - name = "xf86-input-libinput-0.19.0"; + name = "xf86-input-libinput-0.19.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2; - sha256 = "0xzl3aiah9vma3pvi170g1847vxqrg4is3ilc51f72lbgkf30pbc"; + url = mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2; + sha256 = "0381rnahg8mbzcisify092jyjycxzswpqg7dnqldrwjadx0ckwf7"; }; buildInputs = [pkgconfig inputproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1681,11 +1681,11 @@ let }) // {inherit ;}; xf86videoamdgpu = (mkDerivation "xf86videoamdgpu" { - name = "xf86-video-amdgpu-1.1.0"; + name = "xf86-video-amdgpu-1.1.2"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.0.tar.bz2; - sha256 = "0cbrqpmi1hgbsi0i93v0yp7lv3wf4s0vbdlrj19cxmglv7gd1xb9"; + url = mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.tar.bz2; + sha256 = "0y87d4rhm5r71qpzcmmz4q37f3d3461jzh3sr99j7lbhdpnpzs3f"; }; buildInputs = [pkgconfig fontsproto mesa libdrm udev randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1714,11 +1714,11 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videoati = (mkDerivation "xf86videoati" { - name = "xf86-video-ati-7.7.0"; + name = "xf86-video-ati-7.7.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-ati-7.7.0.tar.bz2; - sha256 = "1hy1n8an98mflfbdcb3q7wv59x971j7nf9zhivf90p0lgdbiqkc4"; + url = mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2; + sha256 = "1387cn4b2wwawvzqmy17hrg9d394pl5r5if5jn831vk2vf48b980"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -1824,14 +1824,15 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2016-05-22"; + name = "xf86-video-intel-2016-09-08"; builder = ./builder.sh; src = fetchurl { - url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/8477615ae1bd284aca1221185ffefe0630d3f7ab.tar.gz; - sha256 = "1fnwcsg2kr32nv9x6z671g6amwcyhba2392d63kjl2avjyhjad79"; + url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/15c5ff12459a034b552c787047d1af6d61047cd6.tar.gz; + sha256 = "0nggdll6i5qddv9r2imip4hf6aw1nmfxjqg3i6gcbwmqp2w3f003"; }; buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; meta.platforms = stdenv.lib.platforms.unix; + configureFlags = "--with-default-dri=3"; }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { @@ -2242,11 +2243,11 @@ let }) // {inherit inputproto libX11 libXaw xproto libXt ;}; xkeyboardconfig = (mkDerivation "xkeyboardconfig" { - name = "xkeyboard-config-2.17"; + name = "xkeyboard-config-2.18"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2; - sha256 = "00878f1v3034ki78pjpf2db0bh7jsmszsnxr3bf5qxripm2bxiny"; + url = mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2; + sha256 = "1l6x2w357ja8vm94ns79s7yj9a5dlr01r9dxrjvzwncadiyr27f4"; }; buildInputs = [pkgconfig libX11 xproto ]; meta.platforms = stdenv.lib.platforms.unix; @@ -2362,21 +2363,6 @@ let meta.platforms = stdenv.lib.platforms.unix; }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms xcbutilrenderutil libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt ;}; - # TODO: - # With the current state of ./generate-expr-from-tarballs.pl, - # this will get overwritten when next invoked. - # Could add a special case to ./generate-expr-from-tarballs.pl, - # or perhaps there's a cleaner solution. - #xquartz = (mkDerivation "xquartz" { - # name = "xorg-server-1.14.6"; - # builder = ./builder.sh; - # src = fetchurl { - # url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2; - # sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8"; - # }; - # buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ]; - #}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;}; - xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 054e3f490e4..74c5ae9d9b8 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -239,7 +239,9 @@ let mkDerivation = name: attrs: let newAttrs = (overrides."\${name}" or (x: x)) attrs; stdenv = newAttrs.stdenv or args.stdenv; - in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]); + in stdenv.mkDerivation ((removeAttrs newAttrs [ "stdenv" ]) // { + hardeningDisable = [ "bindnow" "relro" ]; + }); overrides = import ./overrides.nix {inherit args xorg;}; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 1f2c616f1cf..930132bb071 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -192,6 +192,7 @@ in libXi = attrs: attrs // { outputs = [ "out" "dev" "doc" ]; + propagatedBuildInputs = [ xorg.libXfixes ]; }; libXinerama = attrs: attrs // { @@ -232,6 +233,10 @@ in buildInputs = attrs.buildInputs ++ [xorg.renderproto]; }; + libXp = attrs: attrs // { + outputs = [ "out" "dev" ]; + }; + libXpm = attrs: attrs // { outputs = [ "bin" "dev" "out" ]; # tiny man in $bin patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in"; @@ -421,7 +426,7 @@ in dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; # fix_segfault: https://bugs.freedesktop.org/show_bug.cgi?id=91316 - commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; + commonPatches = [ ]; # XQuartz requires two compilations: the first to get X / XQuartz, # and the second to get Xvfb, Xnest, etc. darwinOtherX = overrideDerivation xorgserver (oldAttrs: { @@ -449,16 +454,15 @@ in "--enable-xcsecurity" # enable SECURITY extension "--with-default-font-path=" # there were only paths containing "${prefix}", # and there are no fonts in this package anyway + "--with-xkb-bin-directory=${xorg.xkbcomp}/bin" "--enable-glamor" ]; postInstall = '' rm -fr $out/share/X11/xkb/compiled ln -s /var/tmp $out/share/X11/xkb/compiled wrapProgram $out/bin/Xephyr \ - --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" wrapProgram $out/bin/Xvfb \ - --set XKB_BINDIR "${xorg.xkbcomp}/bin" \ --set XORG_DRI_DRIVER_PATH ${args.mesa}/lib/dri \ --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb" ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others @@ -532,10 +536,6 @@ in configureFlags = "--with-cursordir=$(out)/share/icons"; }; - xinput = attrs: attrs // { - propagatedBuildInputs = [xorg.libXfixes]; - }; - xinit = attrs: attrs // { stdenv = if isDarwin then args.clangStdenv else stdenv; buildInputs = attrs.buildInputs ++ lib.optional isDarwin args.bootstrap_cmds; diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 8a512144fdc..5e7a9e81416 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -59,7 +59,7 @@ mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.13.4.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.3.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.4.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2 @@ -67,24 +67,24 @@ mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXdmcp-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2 -mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2 +mirror://xorg/individual/lib/libXfixes-5.0.2.tar.bz2 mirror://xorg/individual/lib/libXfont-1.5.1.tar.bz2 mirror://xorg/individual/lib/libXfont2-2.0.1.tar.bz2 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2 -mirror://xorg/individual/lib/libXi-1.7.6.tar.bz2 +mirror://xorg/individual/lib/libXi-1.7.7.tar.bz2 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2 mirror://xorg/individual/lib/libxkbfile-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2 mirror://xorg/individual/lib/libXpm-3.5.11.tar.bz2 mirror://xorg/individual/lib/libXpresent-1.0.0.tar.bz2 -mirror://xorg/individual/lib/libXrandr-1.5.0.tar.bz2 -mirror://xorg/individual/lib/libXrender-0.9.9.tar.bz2 +mirror://xorg/individual/lib/libXrandr-1.5.1.tar.bz2 +mirror://xorg/individual/lib/libXrender-0.9.10.tar.bz2 mirror://xorg/individual/lib/libXres-1.0.7.tar.bz2 mirror://xorg/X11R7.7/src/everything/libXScrnSaver-1.2.2.tar.bz2 mirror://xorg/individual/lib/libXt-1.1.5.tar.bz2 -mirror://xorg/individual/lib/libXtst-1.2.2.tar.bz2 -mirror://xorg/individual/lib/libXv-1.0.10.tar.bz2 -mirror://xorg/individual/lib/libXvMC-1.0.9.tar.bz2 +mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 +mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.10.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/luit-1.1.1.tar.bz2 @@ -119,18 +119,18 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.10.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.10.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.19.0.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.19.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.8.3.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.1.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-amdgpu-1.1.2.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.7.0.tar.bz2 +mirror://xorg/individual/driver/xf86-video-ati-7.7.1.tar.bz2 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.12.tar.bz2 mirror://xorg/individual/driver/xf86-video-chips-1.2.6.tar.bz2 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.3.tar.bz2 @@ -175,7 +175,7 @@ mirror://xorg/individual/app/xinput-1.6.2.tar.bz2 mirror://xorg/individual/app/xkbcomp-1.3.1.tar.bz2 mirror://xorg/individual/app/xkbevd-1.1.4.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 -mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.17.tar.bz2 +mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.18.tar.bz2 mirror://xorg/individual/app/xkill-1.0.4.tar.bz2 mirror://xorg/individual/app/xlsatoms-1.1.2.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch index 360768774db..66f45a410f7 100644 --- a/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch +++ b/pkgs/servers/x11/xorg/xkeyboard-config-eo.patch @@ -17,26 +17,24 @@ index ec321f8..e9c3546 100644 <_shortDescription>Irn <_description>Iran diff --git a/symbols/Makefile.am b/symbols/Makefile.am -index 97c816d..d7e3a4e 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -10,7 +10,7 @@ bt by braille \ - ca cd \ + ca cd ch \ ch cn cz \ - de dk \ + de dk dz \ -ee es et epo eu \ +ee eo es et epo eu \ fi fo fr \ gb ge gh gn \ gr hr hu \ diff --git a/symbols/Makefile.in b/symbols/Makefile.in -index b5be077..5cddcc7 100644 --- a/symbols/Makefile.in +++ b/symbols/Makefile.in @@ -222,7 +222,7 @@ bt by braille \ - ca cd \ + ca cd ch \ ch cn cz \ - de dk \ + de dk dz \ -ee es et epo eu \ +ee eo es et epo eu \ fi fo fr \ diff --git a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch b/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch deleted file mode 100644 index 69216ec7073..00000000000 --- a/pkgs/servers/x11/xorg/xorgserver-xkbcomp-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/os/utils.c b/os/utils.c -index ed7581e..6593455 100644 ---- a/os/utils.c -+++ b/os/utils.c -@@ -658,6 +658,10 @@ ProcessCommandLine(int argc, char *argv[]) - - defaultKeyboardControl.autoRepeat = TRUE; - -+ char *xkbBinDir = getenv("XKB_BINDIR"); -+ if (xkbBinDir) -+ XkbBinDirectory = Xstrdup(xkbBinDir); -+ - #ifdef NO_PART_NET - PartialNetwork = FALSE; - #else diff --git a/pkgs/servers/x11/xquartz/X11 b/pkgs/servers/x11/xquartz/X11 index 39bcce2c10b..e6bb87fab3f 100755 --- a/pkgs/servers/x11/xquartz/X11 +++ b/pkgs/servers/x11/xquartz/X11 @@ -1,4 +1,4 @@ -#!/bin/bash +#!@shell@ set "$(dirname "$0")"/X11.bin "${@}" diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix index 9b7844960a2..2fc012dc6c9 100644 --- a/pkgs/servers/x11/xquartz/default.nix +++ b/pkgs/servers/x11/xquartz/default.nix @@ -130,8 +130,7 @@ in stdenv.mkDerivation { --replace "@FONTCONFIG_FILE@" "$fontsConfPath" wrapProgram $out/bin/Xquartz \ - --set XQUARTZ_X11 $out/Applications/XQuartz.app/Contents/MacOS/X11 \ - --set XKB_BINDIR "${xorg.xkbcomp}/bin" + --set XQUARTZ_X11 $out/Applications/XQuartz.app/Contents/MacOS/X11 defaultStartX="$out/bin/startx -- $out/bin/Xquartz" @@ -141,7 +140,6 @@ in stdenv.mkDerivation { XQUARTZ_DEFAULT_SHELL = "${shell}"; XQUARTZ_DEFAULT_STARTX = "@STARTX@"; FONTCONFIG_FILE = "@FONTCONFIG_FILE@"; - XKB_BINDIR = "${xorg.xkbcomp}/bin"; })} \ $out/Applications/XQuartz.app/Contents/Info.plist substituteInPlace $out/Applications/XQuartz.app/Contents/Info.plist \ diff --git a/pkgs/servers/x11/xquartz/font_cache b/pkgs/servers/x11/xquartz/font_cache index 12858af8bc6..b1191980d77 100755 --- a/pkgs/servers/x11/xquartz/font_cache +++ b/pkgs/servers/x11/xquartz/font_cache @@ -1,4 +1,4 @@ -#!/bin/bash +#!@shell@ export PATH=@PATH@:$PATH @@ -83,7 +83,7 @@ get_fontdirs() { if [[ $osxfonts == 1 ]] ; then find {/System/,/}Library/Fonts -type d fi - else + else if [[ $osxfonts == 1 && -d "${HOME}/Library/Fonts" ]] ; then find "${HOME}/Library/Fonts" -type d fi diff --git a/pkgs/shells/bash-completion/bash-4.3.patch b/pkgs/shells/bash-completion/bash-4.3.patch deleted file mode 100644 index e893b501d31..00000000000 --- a/pkgs/shells/bash-completion/bash-4.3.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit a9c556ccad819869a6a5d932aac0a75a99372f08 -Author: Barry Warsaw -Date: Wed Sep 17 19:32:43 2014 +0300 - - _init_completion: Handle cword < 0 (LP: #1289597) - - Previously only bash 4.3 seemed to provoke this, but now with the - empty command consistency tweak it occurs with earlier as well. - -diff --git a/bash_completion b/bash_completion -index 7e01ae4..3bb4bc2 100644 ---- a/bash_completion -+++ b/bash_completion -@@ -727,7 +727,7 @@ _init_completion() - fi - done - -- [[ $cword -eq 0 ]] && return 1 -+ [[ $cword -le 0 ]] && return 1 - prev=${words[cword-1]} - - [[ ${split-} ]] && _split_longopt && split=true diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index 91d6b333541..ad4cc3d09d7 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -1,28 +1,21 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "bash-completion-2.1"; + name = "bash-completion-${version}"; + version = "2.4"; src = fetchurl { - url = "http://bash-completion.alioth.debian.org/files/${name}.tar.bz2"; - sha256 = "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"; + url = "https://github.com/scop/bash-completion/releases/download/${version}/${name}.tar.xz"; + sha256 = "1xlhd09sb2w3bw8qaypxgkr0782w082mcbx8zf7yzjgy0996pxy0"; }; - patches = [ ./bash-4.3.patch ]; - doCheck = true; - # nmcli is included in the network-manager package - postInstall = '' - rm $out/share/bash-completion/completions/nmcli - ''; - - meta = { - homepage = "http://bash-completion.alioth.debian.org/"; + meta = with stdenv.lib; { + homepage = https://github.com/scop/bash-completion; description = "Programmable completion for the bash shell"; - license = "GPL"; - - platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.peti ]; + license = licenses.gpl2Plus; + platforms = platforms.unix; + maintainers = [ maintainers.peti ]; }; } diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/4.3.nix similarity index 98% rename from pkgs/shells/bash/default.nix rename to pkgs/shells/bash/4.3.nix index c6868eedba6..76c24323fca 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/4.3.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { inherit sha256; }; in - import ./bash-4.3-patches.nix patch) + import ./bash-4.3-patches.nix patch) ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; crossAttrs = { diff --git a/pkgs/shells/bash/4.4.nix b/pkgs/shells/bash/4.4.nix new file mode 100644 index 00000000000..406ca4d08fd --- /dev/null +++ b/pkgs/shells/bash/4.4.nix @@ -0,0 +1,122 @@ +{ stdenv, fetchurl, readline70 ? null, interactive ? false, texinfo ? null +, binutils ? null, bison +}: + +assert interactive -> readline70 != null; +assert stdenv.isDarwin -> binutils != null; + +let + version = "4.4"; + realName = "bash-${version}"; + shortName = "bash44"; + baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; + sha256 = "1jyz6snd63xjn6skk7za6psgidsd53k05cr3lksqybi0q6936syq"; + + inherit (stdenv.lib) optional optionalString; +in + +stdenv.mkDerivation rec { + name = "${realName}-p${toString (builtins.length patches)}"; + + src = fetchurl { + url = "mirror://gnu/bash/${realName}.tar.gz"; + inherit sha256; + }; + + hardeningDisable = [ "format" ]; + + outputs = [ "out" "dev" "doc" "info" ]; + + # the man pages are small and useful enough + outputMan = if interactive then "out" else null; + + NIX_CFLAGS_COMPILE = '' + -DSYS_BASHRC="/etc/bashrc" + -DSYS_BASH_LOGOUT="/etc/bash_logout" + -DDEFAULT_PATH_VALUE="/no-such-path" + -DSTANDARD_UTILS_PATH="/no-such-path" + -DNON_INTERACTIVE_LOGIN_SHELLS + -DSSH_SOURCE_BASHRC + ''; + + patchFlags = "-p0"; + + patches = + (let + patch = nr: sha256: + fetchurl { + url = "mirror://gnu/bash/${realName}-patches/${shortName}-${nr}"; + inherit sha256; + }; + in + import ./bash-4.4-patches.nix patch) + ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch; + + crossAttrs = { + configureFlags = baseConfigureFlags + + " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" + + optionalString stdenv.isCygwin '' + --without-libintl-prefix --without-libiconv-prefix + --with-installed-readline + bash_cv_dev_stdin=present + bash_cv_dev_fd=standard + bash_cv_termcap_lib=libncurses + ''; + }; + + configureFlags = baseConfigureFlags; + + # Note: Bison is needed because the patches above modify parse.y. + nativeBuildInputs = [bison] + ++ optional (texinfo != null) texinfo + ++ optional stdenv.isDarwin binutils; + + buildInputs = optional interactive readline70; + + # Bash randomly fails to build because of a recursive invocation to + # build `version.h'. + enableParallelBuilding = false; + + postInstall = '' + ln -s bash "$out/bin/sh" + moveToOutput lib/bash/Makefile.inc "$dev" + ''; + + postFixup = if interactive + then '' + substituteInPlace "$out/bin/bashbug" \ + --replace '${stdenv.shell}' "$out/bin/bash" + '' + # most space is taken by locale data + else '' + rm -r "$out/share" "$out/bin/bashbug" + ''; + + meta = with stdenv.lib; { + homepage = http://www.gnu.org/software/bash/; + description = + "GNU Bourne-Again Shell, the de facto standard shell on Linux" + + (if interactive then " (for interactive use)" else ""); + + longDescription = '' + Bash is the shell, or command language interpreter, that will + appear in the GNU operating system. Bash is an sh-compatible + shell that incorporates useful features from the Korn shell + (ksh) and C shell (csh). It is intended to conform to the IEEE + POSIX P1003.2/ISO 9945.2 Shell and Tools standard. It offers + functional improvements over sh for both programming and + interactive use. In addition, most sh scripts can be run by + Bash without modification. + ''; + + license = licenses.gpl3Plus; + + platforms = platforms.all; + + maintainers = [ maintainers.peti ]; + }; + + passthru = { + shellPath = "/bin/bash"; + }; +} diff --git a/pkgs/shells/bash/bash-4.4-patches.nix b/pkgs/shells/bash/bash-4.4-patches.nix new file mode 100644 index 00000000000..b8019fb3350 --- /dev/null +++ b/pkgs/shells/bash/bash-4.4-patches.nix @@ -0,0 +1,4 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +] diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 021d4f074ed..884f34dcf02 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A Novel unix shell in go language"; diff --git a/pkgs/shells/elvish/deps.json b/pkgs/shells/elvish/deps.json deleted file mode 100644 index d1a4ceebe99..00000000000 --- a/pkgs/shells/elvish/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/elves/getopt", - "fetch": { - "type": "git", - "url": "https://github.com/elves/getopt", - "rev": "f91a7bf920995832d55a1182f26657bc975b9c24", - "sha256": "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za" - } - }, - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - } -] diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix new file mode 100644 index 00000000000..cff60bad0a9 --- /dev/null +++ b/pkgs/shells/elvish/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/elves/getopt"; + fetch = { + type = "git"; + url = "https://github.com/elves/getopt"; + rev = "f91a7bf920995832d55a1182f26657bc975b9c24"; + sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix index ac72de119b3..fe0e2d3c4b6 100644 --- a/pkgs/shells/oh-my-zsh/default.nix +++ b/pkgs/shells/oh-my-zsh/default.nix @@ -6,13 +6,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "oh-my-zsh-git-${version}"; - version = "2016-08-01"; + name = "oh-my-zsh-${version}"; + version = "2016-10-08"; src = fetchgit { url = "https://github.com/robbyrussell/oh-my-zsh"; - rev = "f5537241a4fe7f48a5f7f49fff52db9f0247a5cd"; - sha256 = "0g8wqq3m2qvacxwz6k2zir8vg80fbxccwxpcfs1ypcwp3689fjhk"; + rev = "cd37d19ddaf9cc5acbf443f93f88ca355f74090d"; + sha256 = "1vqgxbd09jhysjhp0xq48673xxry0xcs8mq2wrx5zs7chhq1w2y3"; }; phases = "installPhase"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { chmod -R +w templates # Change the path to oh-my-zsh dir and disable auto-updating. - sed -i -e "2c\\ZSH=$outdir/" \ + sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ $template diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index c6d3ad06df4..c118cea1172 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/shells/oh/deps.json b/pkgs/shells/oh/deps.json deleted file mode 100644 index 5aabd0e6dba..00000000000 --- a/pkgs/shells/oh/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "github.com/michaelmacinnis/adapted", - "fetch": { - "type": "git", - "url": "https://github.com/michaelmacinnis/adapted", - "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978", - "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner", - "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060", - "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317" - } - } -] diff --git a/pkgs/shells/oh/deps.nix b/pkgs/shells/oh/deps.nix new file mode 100644 index 00000000000..b4b98f10c3a --- /dev/null +++ b/pkgs/shells/oh/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "github.com/michaelmacinnis/adapted"; + fetch = { + type = "git"; + url = "https://github.com/michaelmacinnis/adapted"; + rev = "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978"; + sha256 = "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + fetch = { + type = "git"; + url = "https://github.com/peterh/liner"; + rev = "ad1edfd30321d8f006ccf05f1e0524adeb943060"; + sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"; + }; + } +] diff --git a/pkgs/shells/zsh-syntax-highlighting/default.nix b/pkgs/shells/zsh-syntax-highlighting/default.nix new file mode 100644 index 00000000000..792a8875db4 --- /dev/null +++ b/pkgs/shells/zsh-syntax-highlighting/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, zsh }: + +# To make use of this derivation, use the `programs.zsh.enableSyntaxHighlighting` option + +let + + pkgName = "zsh-syntax-highlighting"; + version = "0.4.1"; + +in + +stdenv.mkDerivation rec { + name = "${pkgName}-${version}"; + + src = fetchurl { + url = "https://github.com/zsh-users/${pkgName}/archive/${version}.tar.gz"; + sha256 = "15sih7blqz11d8wdybx38d91vgcq9jg3q0205r26138si0g9q6wp"; + }; + + buildInputs = [ zsh ]; + + installFlags="PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = "Fish shell like syntax highlighting for Zsh"; + homepage = "https://github.com/zsh-users/zsh-syntax-highlighting"; + license = licenses.bsd3; + platforms = platforms.unix; + maintainers = [ maintainers.loskutov ]; + }; +} diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 09d9ed23b3f..fc81d3fec8d 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -6,14 +6,14 @@ # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools , bootstrapFiles ? let fetch = { file, sha256, executable ? true }: import { - url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/4f07c88d467216d9692fefc951deb5cd3c4cc722/${file}"; + url = "http://tarballs.nixos.org/stdenv-darwin/x86_64/33f59c9d11b8d5014dfd18cc11a425f6393c884a/${file}"; inherit sha256 system executable; }; in { - sh = fetch { file = "sh"; sha256 = "1siix3wakzil31r2cydmh3v8a1nyq4605dwiabqc5lx73j4xzrzi"; }; - bzip2 = fetch { file = "bzip2"; sha256 = "0zvqm977k11b5cl4ixxb5h0ds24g6z0f8m28z4pqxzpa353lqbla"; }; - mkdir = fetch { file = "mkdir"; sha256 = "13frk8lsfgzlb65p9l26cvxf06aag43yjk7vg9msn7ix3v8cmrg1"; }; - cpio = fetch { file = "cpio"; sha256 = "0ms5i9m1vdksj575sf1djwgm7zhnvfrrb44dxnfh9avr793rc2w4"; }; - tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "1lz1b0grl4642h6n635xvi6imf0yyy1zyzdr9ing5aphzz0z5iic"; executable = false; }; + sh = fetch { file = "sh"; sha256 = "1rx4kg6358xdj05z0m139a0zn4f4zfmq4n4vimlmnwyfiyn4x7wk"; }; + bzip2 = fetch { file = "bzip2"; sha256 = "104qnhzk79vkbp2yi0kci6lszgfppvrwk3rgxhry842ly1xz2r7l"; }; + mkdir = fetch { file = "mkdir"; sha256 = "0d91c19xjzmqisncvldv79d7ddzai9l7vcmajhwlwwv74g6da5yl"; }; + cpio = fetch { file = "cpio"; sha256 = "0lw057bmcqls96j0gv1n3mgl66q31mba7i413cbkkaf0rfzz3dxj"; }; + tarball = fetch { file = "bootstrap-tools.cpio.bz2"; sha256 = "13ihbj002pis3fgy1d9c4fi7flca21z9brjsjkklm82h5b4nlwxl"; executable = false; }; } }: @@ -128,7 +128,7 @@ in rec { ln -s ${bootstrapTools}/include/c++ $out/include/c++ ''; linkCxxAbi = false; - setupHook = ../../development/compilers/llvm/3.6/libc++/setup-hook.sh; + setupHook = ../../development/compilers/llvm/3.9/libc++/setup-hook.sh; }; libcxxabi = stdenv.mkDerivation { diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix index 41c94bd1674..11a52eb423e 100644 --- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix +++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix @@ -1,8 +1,10 @@ -{ system ? builtins.currentSystem }: +{ pkgspath ? ../../.., test-pkgspath ? pkgspath, system ? builtins.currentSystem }: -with import ../../.. { inherit system; }; +with import pkgspath { inherit system; }; -rec { +let + llvmPackages = llvmPackages_37; +in rec { coreutils_ = coreutils.override (args: { # We want coreutils without ACL support. aclSupport = false; @@ -19,17 +21,15 @@ rec { buildInputs = [nukeReferences cpio]; buildCommand = '' - mkdir -p $out/bin $out/lib + mkdir -p $out/bin $out/lib $out/lib/system - # Our (fake) loader - cp -d ${darwin.dyld}/lib/dyld $out/lib/ - - # C standard library stuff - cp -d ${darwin.Libsystem}/lib/*.o $out/lib/ - cp -d ${darwin.Libsystem}/lib/*.dylib $out/lib/ + # We're not going to bundle the actual libSystem.dylib; instead we reconstruct it on + # the other side. See the notes in stdenv/darwin/default.nix for more information. + # We also need the .o files for various low-level boot stuff. + cp -d ${darwin.Libsystem}/lib/*.o $out/lib + cp -d ${darwin.Libsystem}/lib/system/*.dylib $out/lib/system # Resolv is actually a link to another package, so let's copy it properly - rm $out/lib/libresolv.9.dylib cp -L ${darwin.Libsystem}/lib/libresolv.9.dylib $out/lib cp -rL ${darwin.Libsystem}/include $out @@ -78,11 +78,11 @@ rec { cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib - cp -d ${libcxx}/lib/libc++*.dylib $out/lib - cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib + cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib + cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib mkdir $out/include - cp -rd ${libcxx}/include/c++ $out/include + cp -rd ${llvmPackages.libcxx}/include/c++ $out/include cp -d ${icu.out}/lib/libicu*.dylib $out/lib cp -d ${zlib.out}/lib/libz.* $out/lib @@ -107,33 +107,26 @@ rec { done } - fix_dyld() { - # This is clearly a hack. Once we have an install_name_tool-alike that can patch dyld, this will be nicer. - ${perl}/bin/perl -i -0777 -pe 's/\/nix\/store\/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-dyld-239\.4\/lib\/dyld/\/usr\/lib\/dyld\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00/sg' "$1" - } - # Strip executables even further for i in $out/bin/*; do if test -x $i -a ! -L $i; then chmod +w $i - - fix_dyld $i strip $i || true fi done for i in $out/bin/* $out/lib/*.dylib $out/lib/clang/*/lib/darwin/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do - if test -x $i -a ! -L $i; then + if test -x "$i" -a ! -L "$i"; then echo "Adding rpath to $i" rpathify $i fi done nuke-refs $out/lib/* + nuke-refs $out/lib/system/* nuke-refs $out/lib/clang/*/lib/darwin/* nuke-refs $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation - set -x mkdir $out/.pack mv $out/* $out/.pack mv $out/.pack $out/pack @@ -148,10 +141,6 @@ rec { strip $out/on-server/* nuke-refs $out/on-server/* - for i in $out/on-server/*; do - fix_dyld $i - done - (cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2 ''; @@ -294,8 +283,8 @@ rec { # The ultimate test: bootstrap a whole stdenv from the tools specified above and get a package set out of it test-pkgs = let - stdenv = import ./. { inherit system bootstrapFiles; }; - in import ../../.. { + stdenv = import (test-pkgspath + "/pkgs/stdenv/darwin") { inherit system bootstrapFiles; }; + in import test-pkgspath { inherit system; bootStdenv = stdenv.stdenvDarwin; }; diff --git a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh index 8033c7004d9..66c4e9ebeda 100644 --- a/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/darwin/unpack-bootstrap-tools.sh @@ -17,9 +17,44 @@ for i in $out/bin/*; do fi done +install_name_tool \ + -id $out/lib/system/libsystem_c.dylib \ + $out/lib/system/libsystem_c.dylib + +install_name_tool \ + -id $out/lib/system/libsystem_kernel.dylib \ + $out/lib/system/libsystem_kernel.dylib + +# TODO: this logic basically duplicates similar logic in the Libsystem expression. Deduplicate them! +libs=$(otool -arch x86_64 -L /usr/lib/libSystem.dylib | tail -n +3 | awk '{ print $1 }') + +for i in $libs; do + if [ "$i" != "/usr/lib/system/libsystem_kernel.dylib" ] && [ "$i" != "/usr/lib/system/libsystem_c.dylib" ]; then + args="$args -reexport_library $i" + fi +done + +ld -macosx_version_min 10.7 \ + -arch x86_64 \ + -dylib \ + -o $out/lib/libSystem.B.dylib \ + -compatibility_version 1.0 \ + -current_version 1226.10.1 \ + -reexport_library $out/lib/system/libsystem_c.dylib \ + -reexport_library $out/lib/system/libsystem_kernel.dylib \ + $args + +ln -s libSystem.B.dylib $out/lib/libSystem.dylib + +for name in c dbm dl info m mx poll proc pthread rpcsvc util gcc_s.10.4 gcc_s.10.5; do + ln -s libSystem.dylib $out/lib/lib$name.dylib +done + +ln -s libresolv.9.dylib $out/lib/libresolv.dylib + for i in $out/lib/*.dylib $out/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation; do - if ! test -L $i; then - echo patching $i + if test ! -L "$i" -a "$i" != "$out/lib/libSystem*.dylib"; then + echo "Patching $i" id=$(otool -D "$i" | tail -n 1) install_name_tool -id "$(dirname $i)/$(basename $id)" $i diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index e71c2f770b9..372fd3cfa52 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -89,8 +89,16 @@ let cc ]; - # Add a utility function to produce derivations that use this - # stdenv and its shell. + # `mkDerivation` wraps the builtin `derivation` function to + # produce derivations that use this stdenv and its shell. + # + # See also: + # + # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv + # Details on how to use this mkDerivation function + # + # * https://nixos.org/nix/manual/#ssec-derivation + # Explanation about derivations in general mkDerivation = { buildInputs ? [] , nativeBuildInputs ? [] diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index feb82fd9226..154fdefd789 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -490,12 +490,14 @@ dumpVars() { } -# Utility function: return the base name of the given path, with the +# Utility function: echo the base name of the given path, with the # prefix `HASH-' removed, if present. stripHash() { - strippedName=$(basename $1); + local strippedName="$(basename "$1")"; if echo "$strippedName" | grep -q '^[a-z0-9]\{32\}-'; then - strippedName=$(echo "$strippedName" | cut -c34-) + echo "$strippedName" | cut -c34- + else + echo "$strippedName" fi } @@ -506,12 +508,10 @@ _defaultUnpack() { if [ -d "$fn" ]; then - stripHash "$fn" - # We can't preserve hardlinks because they may have been # introduced by store optimization, which might break things # in the build. - cp -pr --reflink=auto "$fn" $strippedName + cp -pr --reflink=auto "$fn" "$(stripHash "$fn")" else diff --git a/pkgs/tools/X11/bumblebee/default.nix b/pkgs/tools/X11/bumblebee/default.nix index e58aa7042d0..480c929e941 100644 --- a/pkgs/tools/X11/bumblebee/default.nix +++ b/pkgs/tools/X11/bumblebee/default.nix @@ -122,7 +122,6 @@ in stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/sbin/bumblebeed" \ - --set XKB_BINDIR "${xkbcomp}/bin" \ --prefix PATH : "${bbdPath}" \ --prefix LD_LIBRARY_PATH : "${bbdLibs}" diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 197a7b80af3..de51e1ad25f 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1iqdagrq0j7sqxgsj31skgk73k2rbpbvj41v087af9103wf8h9z7"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ xorg.libX11 xorg.libXrandr ]; diff --git a/pkgs/tools/X11/go-sct/deps.json b/pkgs/tools/X11/go-sct/deps.json deleted file mode 100644 index 227db99338e..00000000000 --- a/pkgs/tools/X11/go-sct/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/cpucycle/astrotime", - "fetch": { - "type": "git", - "url": "https://github.com/cpucycle/astrotime", - "rev": "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca", - "sha256": "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1" - } - } -] diff --git a/pkgs/tools/X11/go-sct/deps.nix b/pkgs/tools/X11/go-sct/deps.nix new file mode 100644 index 00000000000..f808858e091 --- /dev/null +++ b/pkgs/tools/X11/go-sct/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/cpucycle/astrotime"; + fetch = { + type = "git"; + url = "https://github.com/cpucycle/astrotime"; + rev = "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca"; + sha256 = "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1"; + }; + } +] diff --git a/pkgs/tools/X11/nitrogen/default.nix b/pkgs/tools/X11/nitrogen/default.nix index dd8b496fe66..070152427f2 100644 --- a/pkgs/tools/X11/nitrogen/default.nix +++ b/pkgs/tools/X11/nitrogen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk2, gtkmm }: +{ stdenv, fetchurl, pkgconfig, glib, gtkmm2 }: let version = "1.5.2"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2"; }; - buildInputs = [ glib gtk2 gtkmm pkgconfig ]; + buildInputs = [ glib gtkmm2 pkgconfig ]; NIX_LDFLAGS = "-lX11"; diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 272143791f2..cb3749efb44 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libglade, openbox, +{ stdenv, fetchurl, pkgconfig, gtk2, libglade, openbox, imlib2, libstartup_notification, makeWrapper }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - pkgconfig gtk libglade openbox imlib2 libstartup_notification makeWrapper + pkgconfig gtk2 libglade openbox imlib2 libstartup_notification makeWrapper ]; postInstall = '' diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix index 767edbc47d5..90159d82c39 100644 --- a/pkgs/tools/X11/winswitch/default.nix +++ b/pkgs/tools/X11/winswitch/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, buildPythonApplication, pythonPackages +{ stdenv, fetchurl, pythonPackages , which, xpra, xmodmap }: let - base = buildPythonApplication rec { + base = pythonPackages.buildPythonApplication rec { name = "winswitch-${version}"; namePrefix = ""; version = "0.12.16"; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 43fa105e680..63abc31e007 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, libX11, xproto, libXext, xextproto, libXtst -, gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }: +, gtk2, libXi, inputproto, pkgconfig, recordproto, texinfo }: stdenv.mkDerivation rec { version = "3.19"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ libX11 xproto libXext xextproto libXtst gtk + [ libX11 xproto libXext xextproto libXtst gtk2 libXi inputproto pkgconfig recordproto texinfo ]; diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix index 1a84eaddda6..9d438dc84b3 100644 --- a/pkgs/tools/X11/xpra/default.nix +++ b/pkgs/tools/X11/xpra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pkgconfig -, xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk +, xorg, gtk2, glib, pango, cairo, gdk_pixbuf, atk , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config , ffmpeg, x264, libvpx, libwebp , libfakeXinerama }: @@ -22,7 +22,7 @@ in buildPythonApplication rec { xorg.xproto xorg.fixesproto xorg.libXtst xorg.libXfixes xorg.libXcomposite xorg.libXdamage xorg.libXrandr xorg.libxkbfile - pango cairo gdk_pixbuf atk gtk glib + pango cairo gdk_pixbuf atk gtk2 glib ffmpeg libvpx x264 libwebp @@ -30,7 +30,7 @@ in buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - pillow pygtk pygobject rencode pycrypto cryptography pycups lz4 dbus-python + pillow pygtk pygobject2 rencode pycrypto cryptography pycups lz4 dbus-python ]; preBuild = '' @@ -46,7 +46,6 @@ in buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/xpra \ - --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ --set XPRA_LOG_DIR "\$HOME/.xpra" \ --set XPRA_INSTALL_PREFIX "$out" \ @@ -58,7 +57,6 @@ in buildPythonApplication rec { #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though #postFixup = '' - # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra #''; diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix index aece94234a8..a9ba9350736 100644 --- a/pkgs/tools/X11/xpra/gtk3.nix +++ b/pkgs/tools/X11/xpra/gtk3.nix @@ -51,7 +51,6 @@ buildPythonApplication rec { postInstall = '' wrapProgram $out/bin/xpra \ - --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \ --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]} @@ -62,7 +61,6 @@ buildPythonApplication rec { #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though #postFixup = '' - # sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra # sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra # sed -i '4iexport PATH=${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux ]}\${PATH:+:}\$PATH' $out/bin/xpra #''; diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix index ce9f17b1a51..cfee6a8b94c 100644 --- a/pkgs/tools/admin/cli53/default.nix +++ b/pkgs/tools/admin/cli53/default.nix @@ -1,6 +1,6 @@ -{ lib, buildPythonApplication, pythonPackages, fetchurl }: +{ lib, pythonPackages, fetchurl }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "cli53-${version}"; namePrefix = ""; # Suppress "python27-" name prefix version = "0.4.4"; diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix index 9ef9755d6bc..b6185631551 100644 --- a/pkgs/tools/admin/gtk-vnc/default.nix +++ b/pkgs/tools/admin/gtk-vnc/default.nix @@ -1,34 +1,32 @@ { stdenv, fetchurl, gobjectIntrospection -, python, gtk, pygtk, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 +, gnutls, cairo, libtool, glib, pkgconfig, libtasn1 , libffi, cyrus_sasl, intltool, perl, perlPackages, libpulseaudio -, kbproto, libX11, libXext, xextproto, pygobject, libgcrypt, gtk3, vala_0_23 -, pygobject3, libogg, enableGTK3 ? false, libgpgerror }: +, kbproto, libX11, libXext, xextproto, libgcrypt, gtk3, vala_0_32 +, libogg, libgpgerror, pythonPackages }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) pygobject3 python; +in stdenv.mkDerivation rec { name = "gtk-vnc-${version}"; - version = "0.5.3"; + version = "0.6.0"; src = fetchurl { - url = "mirror://gnome/sources/gtk-vnc/0.5/${name}.tar.xz"; - sha256 = "1bww2ihxb3zzvifdrcsy1lifr664pvikq17hmr1hsm8fyk4ad46l"; + url = "mirror://gnome/sources/gtk-vnc/0.6/${name}.tar.xz"; + sha256 = "9559348805e64d130dae569fee466930175dbe150d2649bb868b5c095f130433"; }; buildInputs = [ python gnutls cairo libtool pkgconfig glib libffi libgcrypt intltool cyrus_sasl libpulseaudio perl perlPackages.TextCSV gobjectIntrospection libogg libgpgerror - ] ++ (if enableGTK3 then [ gtk3 vala_0_23 pygobject3 ] else [ gtk pygtk pygobject ]); + gtk3 vala_0_32 pygobject3 ]; NIX_CFLAGS_COMPILE = "-fstack-protector-all"; configureFlags = [ "--with-python" "--with-examples" - (if enableGTK3 then "--with-gtk=3.0" else "--with-gtk=2.0") ]; - makeFlags = stdenv.lib.optionalString (!enableGTK3) - "CODEGENDIR=${pygobject}/share/pygobject/2.0/codegen/ DEFSDIR=${pygtk}/share/pygtk/2.0/defs/"; - # Fix broken .la files preFixup = '' sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index be7d534b3d6..40647f73379 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lxc ]; diff --git a/pkgs/tools/admin/lxd/deps.json b/pkgs/tools/admin/lxd/deps.json deleted file mode 100644 index 1a0e2d3245f..00000000000 --- a/pkgs/tools/admin/lxd/deps.json +++ /dev/null @@ -1,173 +0,0 @@ -[ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "gopkg.in/tomb.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/tomb.v2", - "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", - "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/syndtr/gocapability", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/gocapability", - "rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852", - "sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/log15.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/inconshreveable/log15.v2", - "rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f", - "sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8" - } - }, - { - "goPackagePath": "github.com/gorilla/mux", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/mux", - "rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5", - "sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9" - } - }, - { - "goPackagePath": "github.com/pborman/uuid", - "fetch": { - "type": "git", - "url": "https://github.com/pborman/uuid", - "rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4", - "sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn" - } - }, - { - "goPackagePath": "gopkg.in/flosch/pongo2.v3", - "fetch": { - "type": "git", - "url": "https://gopkg.in/flosch/pongo2.v3", - "rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9", - "sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8" - } - }, - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "cca8bbc0798408af109aaaa239cbd2634846b340", - "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48" - } - }, - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - }, - { - "goPackagePath": "gopkg.in/lxc/go-lxc.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/lxc/go-lxc.v2", - "rev": "8f9e220b36393c03854c2d224c5a55644b13e205", - "sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1", - "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28" - } - }, - { - "goPackagePath": "github.com/dustinkirkland/golang-petname", - "fetch": { - "type": "git", - "url": "https://github.com/dustinkirkland/golang-petname", - "rev": "2182cecef7f257230fc998bc351a08a5505f5e6c", - "sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl" - } - }, - { - "goPackagePath": "github.com/gorilla/context", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/context", - "rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd", - "sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g" - } - }, - { - "goPackagePath": "github.com/mattn/go-colorable", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-colorable", - "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe", - "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6" - } - }, - { - "goPackagePath": "github.com/gosexy/gettext", - "fetch": { - "type": "git", - "url": "https://github.com/gosexy/gettext", - "rev": "305f360aee30243660f32600b87c3c1eaa947187", - "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09" - } - } -] diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix new file mode 100644 index 00000000000..7325100bb3a --- /dev/null +++ b/pkgs/tools/admin/lxd/deps.nix @@ -0,0 +1,173 @@ +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v2"; + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/syndtr/gocapability"; + fetch = { + type = "git"; + url = "https://github.com/syndtr/gocapability"; + rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"; + sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"; + }; + } + { + goPackagePath = "gopkg.in/inconshreveable/log15.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/inconshreveable/log15.v2"; + rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; + sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5"; + sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + fetch = { + type = "git"; + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "gopkg.in/flosch/pongo2.v3"; + fetch = { + type = "git"; + url = "https://gopkg.in/flosch/pongo2.v3"; + rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; + sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + fetch = { + type = "git"; + url = "https://github.com/olekukonko/tablewriter"; + rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; + sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } + { + goPackagePath = "gopkg.in/lxc/go-lxc.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/lxc/go-lxc.v2"; + rev = "8f9e220b36393c03854c2d224c5a55644b13e205"; + sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-systemd"; + rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; + sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + }; + } + { + goPackagePath = "github.com/dustinkirkland/golang-petname"; + fetch = { + type = "git"; + url = "https://github.com/dustinkirkland/golang-petname"; + rev = "2182cecef7f257230fc998bc351a08a5505f5e6c"; + sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd"; + sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; + sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + }; + } + { + goPackagePath = "github.com/gosexy/gettext"; + fetch = { + type = "git"; + url = "https://github.com/gosexy/gettext"; + rev = "305f360aee30243660f32600b87c3c1eaa947187"; + sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"; + }; + } +] diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 8ea3e648c31..0e927dfe1c7 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -8,13 +8,13 @@ pythonPackages.buildPythonApplication rec { name = "salt-${version}"; - version = "2015.8.8"; + version = "2016.3.3"; disabled = pythonPackages.isPy3k; src = fetchurl { url = "mirror://pypi/s/salt/${name}.tar.gz"; - sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j"; + sha256 = "1djjglnh6203y8dirziz5w6zh2lgszxp8ivi86nb7fgijj2h61jr"; }; propagatedBuildInputs = with pythonPackages; [ @@ -26,7 +26,6 @@ pythonPackages.buildPythonApplication rec { pyyaml pyzmq requests - salttesting tornado ] ++ extraInputs; diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix deleted file mode 100644 index 14105dc2f98..00000000000 --- a/pkgs/tools/admin/salt/testing.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pythonPackages }: - -pythonPackages.buildPythonApplication rec { - name = "SaltTesting-${version}"; - version = "2015.7.10"; - - disabled = pythonPackages.isPy3k; - - propagatedBuildInputs = with pythonPackages; [ - six - ]; - - src = fetchurl { - url = "mirror://pypi/S/SaltTesting/${name}.tar.gz"; - sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h"; - }; - - meta = with stdenv.lib; { - homepage = https://github.com/saltstack/salt-testing; - description = "Common testing tools used in the Salt Stack projects"; - maintainers = with maintainers; [ aneeshusa ]; - license = licenses.asl20; - }; -} diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index cac1b9b3c92..eeefd4d99b5 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { patchPhase = '' sed -i -e 's,$(includedir)/pixman-1,${if stdenv ? cross then pixman.crossDrv else pixman}/include/pixman-1,' unix/xserver/hw/vnc/Makefile.am - sed -i -e '/^$pidFile/a$ENV{XKB_BINDIR}="${if stdenv ? cross then xorg.xkbcomp.crossDrv else xorg.xkbcomp}/bin";' unix/vncserver sed -i -e '/^\$cmd \.= " -pn";/a$cmd .= " -xkbdir ${if stdenv ? cross then xkeyboard_config.crossDrv else xkeyboard_config}/etc/X11/xkb";' unix/vncserver fontPath= for i in $fontDirectories; do diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index b64b6e4ca0a..83a73eb388f 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ stdenv.lib.optional stdenv.isLinux [ attr e2fsprogs ]; + ++ stdenv.lib.optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-dar-static" ]; diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index e924a58d4d7..6ed6a7f2402 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk, pkgconfig, intltool }: +{ stdenv, fetchFromGitHub, gtk2, pkgconfig, intltool }: stdenv.mkDerivation rec { version = "0.5.4.7"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0w9lx8d8r50j48qfhn2r0dlcnwy3pjyy6xjvgpr0qagy5l1q1qj4"; }; - buildInputs = [ gtk pkgconfig intltool ]; + buildInputs = [ gtk2 pkgconfig intltool ]; meta = { description = "GTK+ frontend to 7z,zip,rar,tar,bzip2, gzip,arj, lha, rpm and deb (open and extract only)"; diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 44f318a0cc6..30b05b2b234 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, unzip }: stdenv.mkDerivation rec { name = "zpaq-${version}"; - version = "7.14"; + version = "715"; src = let mungedVersion = with stdenv.lib; concatStrings (splitString "." version); in fetchurl { - sha256 = "1xmmn5sy19yip8cbr3plhd7nh7x7k1b09lq2kqfcp6bndg7jxgby"; + sha256 = "066l94yyladlfzri877nh2dhkvspagjn3m5bmv725fmhkr9c4pp8"; url = "http://mattmahoney.net/dc/zpaq${mungedVersion}.zip"; }; @@ -37,5 +37,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin nckx ]; platforms = platforms.linux; + inherit version; }; } diff --git a/pkgs/tools/archivers/zpaq/default.upstream b/pkgs/tools/archivers/zpaq/default.upstream new file mode 100644 index 00000000000..84daee900ce --- /dev/null +++ b/pkgs/tools/archivers/zpaq/default.upstream @@ -0,0 +1,6 @@ +url http://mattmahoney.net/dc/zpaq.html +version_link 'zpaq[0-9]+[.]zip' +version "[^0-9]*([0-9]+)[^0-9]*" '\1' +name zpaq +attribute_name zpaq +minimize_overwrite diff --git a/pkgs/tools/archivers/zpaq/zpaqd.nix b/pkgs/tools/archivers/zpaq/zpaqd.nix index ff247f9e3f9..499bccaa425 100644 --- a/pkgs/tools/archivers/zpaq/zpaqd.nix +++ b/pkgs/tools/archivers/zpaq/zpaqd.nix @@ -3,10 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaqd"; - version="7.08"; + version="715"; name="${baseName}-${version}"; - url="http://mattmahoney.net/dc/zpaqd708.zip"; - sha256="18mkfz7v73rp5l712107m3x5a3v6y0vjf47a6s3di8x416kbcp2a"; + hash="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk"; + url="http://mattmahoney.net/dc/zpaqd715.zip"; + sha256="0868lynb45lm79yvx5f10lj5h6bfv0yck8whcls2j080vmk3n7rk"; }; isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD; isx86 = stdenv.isi686 || stdenv.isx86_64; diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 75f74e71be5..273b5d94c9f 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "beets-alternatives-${version}"; version = "0.8.2"; diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix new file mode 100644 index 00000000000..fa00d64f673 --- /dev/null +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, pythonPackages }: + +pythonPackages.buildPythonApplication rec { + name = "beets-copyartifacts"; + + src = fetchFromGitHub { + repo = "beets-copyartifacts"; + owner = "sbarakat"; + rev = "dac4a1605111e24bb5b498aa84cead7c87480834"; + sha256 = "0p5cskfgqinzh48a58hw56f96g9lar3k3g2p0ip1m9kawzf6axng"; + }; + + postPatch = '' + sed -i -e '/install_requires/,/\]/{/beets/d}' setup.py + sed -i -e '/namespace_packages/d' setup.py + printf 'from pkgutil import extend_path\n__path__ = extend_path(__path__, __name__)\n' >beetsplug/__init__.py + ''; + + meta = { + description = "Beets plugin to move non-music files during the import process"; + homepage = "https://github.com/sbarakat/beets-copyartifacts"; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 9dcfbd10b35..05d8bd0990f 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, writeScript, glibcLocales -, buildPythonApplication, pythonPackages, python, imagemagick +, pythonPackages, imagemagick , enableAcousticbrainz ? true , enableAcoustid ? true @@ -8,6 +8,7 @@ , enableDiscogs ? true , enableEmbyupdate ? true , enableFetchart ? true +, enableKeyfinder ? true, keyfinder-cli ? null , enableLastfm ? true , enableMpd ? true , enableReplaygain ? true, bs1770gain ? null @@ -15,9 +16,10 @@ , enableWeb ? true # External plugins -, enableAlternatives ? false +, enableAlternatives ? false +, enableCopyArtifacts ? false -, bashInteractive, bashCompletion +, bashInteractive, bash-completion }: assert enableAcoustid -> pythonPackages.pyacoustid != null; @@ -25,6 +27,7 @@ assert enableBadfiles -> flac != null && mp3val != null; assert enableConvert -> ffmpeg != null; assert enableDiscogs -> pythonPackages.discogs_client != null; assert enableFetchart -> pythonPackages.responses != null; +assert enableKeyfinder -> keyfinder-cli != null; assert enableLastfm -> pythonPackages.pylast != null; assert enableMpd -> pythonPackages.mpd != null; assert enableReplaygain -> bs1770gain != null; @@ -42,6 +45,7 @@ let discogs = enableDiscogs; embyupdate = enableEmbyupdate; fetchart = enableFetchart; + keyfinder = enableKeyfinder; lastgenre = enableLastfm; lastimport = enableLastfm; mpdstats = enableMpd; @@ -54,7 +58,7 @@ let pluginsWithoutDeps = [ "beatport" "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" "export" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "hook" "ihate" - "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics" + "importadded" "importfeeds" "info" "inline" "ipfs" "lyrics" "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "zero" @@ -66,12 +70,11 @@ let allEnabledPlugins = pluginsWithoutDeps ++ enabledOptionalPlugins; testShell = "${bashInteractive}/bin/bash --norc"; - completion = "${bashCompletion}/share/bash-completion/bash_completion"; + completion = "${bash-completion}/share/bash-completion/bash_completion"; -in buildPythonApplication rec { +in pythonPackages.buildPythonApplication rec { name = "beets-${version}"; version = "1.3.19"; - namePrefix = ""; src = fetchFromGitHub { owner = "sampsyo"; @@ -89,8 +92,8 @@ in buildPythonApplication rec { pythonPackages.pathlib pythonPackages.pyyaml pythonPackages.unidecode - python.modules.sqlite3 - python.modules.readline + pythonPackages.python.modules.sqlite3 + pythonPackages.python.modules.readline ] ++ optional enableAcoustid pythonPackages.pyacoustid ++ optional (enableFetchart || enableEmbyupdate @@ -98,12 +101,16 @@ in buildPythonApplication rec { pythonPackages.requests2 ++ optional enableConvert ffmpeg ++ optional enableDiscogs pythonPackages.discogs_client + ++ optional enableKeyfinder keyfinder-cli ++ optional enableLastfm pythonPackages.pylast ++ optional enableMpd pythonPackages.mpd ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { - inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; + inherit stdenv pythonPackages fetchFromGitHub; + }) + ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix { + inherit stdenv pythonPackages fetchFromGitHub; }); buildInputs = with pythonPackages; [ @@ -117,6 +124,7 @@ in buildPythonApplication rec { patches = [ ./replaygain-default-bs1770gain.patch + ./keyfinder-default-bin.patch ]; postPatch = '' diff --git a/pkgs/tools/audio/beets/keyfinder-default-bin.patch b/pkgs/tools/audio/beets/keyfinder-default-bin.patch new file mode 100644 index 00000000000..b0b573bbf31 --- /dev/null +++ b/pkgs/tools/audio/beets/keyfinder-default-bin.patch @@ -0,0 +1,35 @@ +diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py +index b6131a4..b493792 100644 +--- a/beetsplug/keyfinder.py ++++ b/beetsplug/keyfinder.py +@@ -30,7 +30,7 @@ class KeyFinderPlugin(BeetsPlugin): + def __init__(self): + super(KeyFinderPlugin, self).__init__() + self.config.add({ +- u'bin': u'KeyFinder', ++ u'bin': u'keyfinder-cli', + u'auto': True, + u'overwrite': False, + }) +@@ -59,7 +59,7 @@ class KeyFinderPlugin(BeetsPlugin): + continue + + try: +- output = util.command_output([bin, b'-f', ++ output = util.command_output([bin, + util.syspath(item.path)]) + except (subprocess.CalledProcessError, OSError) as exc: + self._log.error(u'execution failed: {0}', exc) +diff --git a/test/test_keyfinder.py b/test/test_keyfinder.py +index 00952fe..01ff8d4 100644 +--- a/test/test_keyfinder.py ++++ b/test/test_keyfinder.py +@@ -46,7 +46,7 @@ class KeyFinderTest(unittest.TestCase, TestHelper): + item.load() + self.assertEqual(item['initial_key'], 'C#m') + self.command_output.assert_called_with( +- ['KeyFinder', '-f', util.syspath(item.path)]) ++ ['keyfinder-cli', util.syspath(item.path)]) + + def test_add_key_on_import(self): + self.command_output.return_value = 'dbm' diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix index bd5a6b1d592..38df702cb16 100644 --- a/pkgs/tools/audio/playerctl/default.nix +++ b/pkgs/tools/audio/playerctl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome, glib, +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome2, glib, pkgconfig, gobjectIntrospection }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - which autoconf automake libtool gnome.gtkdoc glib pkgconfig + which autoconf automake libtool gnome2.gtkdoc glib pkgconfig gobjectIntrospection ]; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index b9c602dd767..34946355d10 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,36 +1,29 @@ -{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, intltool }: +{ stdenv, fetchFromGitHub, pkgconfig, intltool, autoconf, automake, alsaLib, gtk3, glibc, libnotify, libX11 }: stdenv.mkDerivation rec { name = "pnmixer-${version}"; - version = "2016-04-23"; + version = "0.7"; src = fetchFromGitHub { owner = "nicklan"; repo = "pnmixer"; - rev = "cb20096716dbb5440b6560d81108d9c8f7188c48"; - sha256 = "17gl5fb3hpdgxyys8h5k3nraw7qdyqv9k9kz8ykr5h7gg29nxy66"; + rev = "v${version}"; + sha256 = "077l28qhr82ifqfwc2nqi5q1hmi6dyqqbhmjcsn27p4y433f3rpb"; }; - nativeBuildInputs = [ - pkgconfig autoconf automake intltool - ]; + nativeBuildInputs = [ pkgconfig autoconf automake intltool ]; - buildInputs = [ - alsaLib gtk3 glibc libnotify libX11 - ]; + buildInputs = [ alsaLib gtk3 glibc libnotify libX11 ]; preConfigure = '' ./autogen.sh ''; - # work around a problem related to gtk3 updates - NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - meta = with stdenv.lib; { homepage = https://github.com/nicklan/pnmixer; description = "ALSA mixer for the system tray"; license = licenses.gpl3; - maintainers = with maintainers; [ campadrenalin ]; platforms = platforms.linux; + maintainers = with maintainers; [ campadrenalin romildo ]; }; } diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index efca158efc6..075f1653adf 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.26"; in +let version = "0.28.1"; in with stdenv.lib; @@ -16,18 +16,12 @@ stdenv.mkDerivation rec { repo = "bup"; owner = "bup"; rev = version; - sha256 = "0g7b0xl3kg0z6rn81fvzl1xnvva305i7pjih2hm68mcj0adk3v0d"; + sha256 = "1hsxzrjvqa3pd74vmz8agiiwynrzynp1i726h0fzdsakc4adya4l"; }; buildInputs = [ git pythonPackages.python ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; - patches = optional stdenv.isDarwin (fetchurl { - url = "https://github.com/bup/bup/commit/75d089e7cdb7a7eb4d69c352f56dad5ad3aa1f97.diff"; - sha256 = "05kp47p30a45ip0fg090vijvzc7ijr0alc3y8kjl6bvv3gliails"; - name = "darwin_10_10.patch"; - }); - postPatch = '' patchShebangs . substituteInPlace Makefile --replace "-Werror" "" @@ -49,7 +43,9 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/bup \ --prefix PATH : ${git}/bin \ --prefix PYTHONPATH : ${concatStringsSep ":" (map (x: "$(toPythonPath ${x})") - (with pythonPackages; [ pyxattr pylibacl setuptools fuse tornado ]))} + (with pythonPackages; + [ setuptools tornado ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ pyxattr pylibacl fuse ]))} ''; meta = { diff --git a/pkgs/tools/backup/rdup/default.nix b/pkgs/tools/backup/rdup/default.nix index 8ca07e2c823..33e3c77db88 100644 --- a/pkgs/tools/backup/rdup/default.nix +++ b/pkgs/tools/backup/rdup/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/miekg/rdup"; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.linux; - maintainers = with stdenv.lib.maintainers; [ lukasepple ]; + maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; }; } diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 730f8a90ce2..d0d220b1de8 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libcdio, zlib, bzip2, readline, acl, attr }: stdenv.mkDerivation rec { - name = "xorriso-1.4.4"; + name = "xorriso-1.4.6"; src = fetchurl { url = "mirror://gnu/xorriso/${name}.tar.gz"; - sha256 = "1izv8dvwacyh432vv1rm6lyjrq0v205kyakfra6iwa146c9m9fgr"; + sha256 = "112p0ghwzxrcjbsir1n2jxhq103ckrw93wzvd55qqvzfgs674vsj"; }; doCheck = true; diff --git a/pkgs/tools/compression/lhasa/default.nix b/pkgs/tools/compression/lhasa/default.nix new file mode 100644 index 00000000000..f270d29a694 --- /dev/null +++ b/pkgs/tools/compression/lhasa/default.nix @@ -0,0 +1,21 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "lhasa-0.3.1"; + src = fetchurl { + url = https://soulsphere.org/projects/lhasa/lhasa-0.3.1.tar.gz; + sha256 = "092zi9av18ma20c6h9448k0bapvx2plnp292741dvfd9hmgqxc1z"; + }; + meta = { + description = "Free Software replacement for the Unix LHA tool"; + longDescription = '' + Lhasa is a Free Software replacement for the Unix LHA tool, for + decompressing .lzh (LHA / LHarc) and .lzs (LArc) archives. The backend for + the tool is a library, so that it can be reused for other purposes. + ''; + license = stdenv.lib.licenses.isc; + homepage = http://fragglet.github.io/lhasa; + maintainers = with stdenv.lib; [ maintainers.sander ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/filesystems/afpfs-ng/default.nix b/pkgs/tools/filesystems/afpfs-ng/default.nix new file mode 100644 index 00000000000..bfa45c9930e --- /dev/null +++ b/pkgs/tools/filesystems/afpfs-ng/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, fuse, readline, libgcrypt, gmp }: + +stdenv.mkDerivation rec { + name = "afpfs-ng-${version}"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "simonvetter"; + repo = "afpfs-ng"; + rev = "f6e24eb73c9283732c3b5d9cb101a1e2e4fade3e"; + sha256 = "125jx1rsqkiifcffyjb05b2s36rllckdgjaf1bay15k9gzhwwldz"; + }; + + buildInputs = [ fuse readline libgcrypt gmp ]; + + meta = with stdenv.lib; { + homepage = https://github.com/simonvetter/afpfs-ng; + description = "A client implementation of the Apple Filing Protocol"; + license = licenses.gpl2; + maintainers = with maintainers; [ rnhmjoj ]; + platform = platforms.linux; + }; + +} diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 060247aa532..f1faf69ed58 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "avfs-${version}"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${name}.tar.bz2"; - sha256 = "1j7ysjkv0kbkwjagcdgwcnbii1smd58pwwlpz0l7amki5dxygpn6"; + sha256 = "005iw01ppjslfzbbx52dhmp1f7a8d071s5pxvjlk11zdv4h22rbb"; }; - buildInputs = [ pkgconfig fuse xz ]; + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ fuse xz ]; configureFlags = [ "--enable-library" diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 74e7686a3d1..7931df2cc57 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ]; - cmakeConfigureFlagFlags = ["-DCMAKE_BUILD_TYPE=RELEASE"]; - meta = { homepage = http://www.darlinghq.org/; description = "Darling lets you open OS X dmgs on Linux"; diff --git a/pkgs/tools/filesystems/davfs2/default.nix b/pkgs/tools/filesystems/davfs2/default.nix index a5cd54bf74d..b745652b15c 100644 --- a/pkgs/tools/filesystems/davfs2/default.nix +++ b/pkgs/tools/filesystems/davfs2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, neon, zlib }: stdenv.mkDerivation rec { - name = "davfs2-1.5.2"; + name = "davfs2-1.5.3"; src = fetchurl { url = "mirror://savannah/davfs2/${name}.tar.gz"; - sha256 = "0n5k2xxfxmbsavg5fhp65lmy30hq9jg3w242rdzafvksnnda2d5y"; + sha256 = "1x9ri19995ika89cmc56za7z3ipiizhh6zdhi4mf4p7chxzdnhrw"; }; buildInputs = [ neon zlib ]; diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix index c091158bff6..f00a80603f9 100644 --- a/pkgs/tools/filesystems/e2fsprogs/default.nix +++ b/pkgs/tools/filesystems/e2fsprogs/default.nix @@ -8,8 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1m72lk90b5i3h9qnmss6aygrzyn8x2avy3hyaq2fb0jglkrkz6ar"; }; - outputs = [ "bin" "out" "man" ]; - outputDev = "bin"; # just for *.pc + outputs = [ "bin" "dev" "out" "man" ]; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ libuuid ]; diff --git a/pkgs/tools/filesystems/f2fs-tools/default.nix b/pkgs/tools/filesystems/f2fs-tools/default.nix index 3173c13dc57..acc3b5183fe 100644 --- a/pkgs/tools/filesystems/f2fs-tools/default.nix +++ b/pkgs/tools/filesystems/f2fs-tools/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchurl, autoreconfHook, libuuid, pkgconfig }: +{ stdenv, fetchurl, autoreconfHook, libselinux, libuuid, pkgconfig }: stdenv.mkDerivation rec { name = "f2fs-tools-${version}"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/${name}.tar.gz"; - sha256 = "1fkq1iqr5kxs6ihhbmjk4i19q395azcl60mnslqwfrlbrd3p40gm"; + sha256 = "1m6bn1ibq0p53m0n97il91xqgjgn2pzlz74lb5bfzassx7159m1k"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libuuid pkgconfig ]; + buildInputs = [ libselinux libuuid pkgconfig ]; meta = with stdenv.lib; { homepage = "http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/"; diff --git a/pkgs/tools/filesystems/f3/default.nix b/pkgs/tools/filesystems/f3/default.nix new file mode 100644 index 00000000000..e7f20b1e6b3 --- /dev/null +++ b/pkgs/tools/filesystems/f3/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "f3-${version}"; + version = "6.0"; + + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "AltraMayor"; + repo = "f3"; + rev = "v${version}"; + sha256 = "1azi10ba0h9z7m0gmfnyymmfqb8380k9za8hn1rrw1s442hzgnz2"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + patchPhase = "sed -i 's/-oroot -groot//' Makefile"; + + meta = { + description = "Fight Flash Fraud"; + homepage = http://oss.digirati.com.br/f3/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 7ea5d581a59..7165789cf81 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,15 +1,35 @@ -{ stdenv, fetchurl, pkgconfig, fuse, zlib, glib }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }: stdenv.mkDerivation rec { name = "fuseiso-20070708"; src = fetchurl { url = "mirror://sourceforge/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2"; - sha1 = "fe142556ad35dd7e5dc31a16183232a6e2da7692"; + sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b"; }; buildInputs = [ pkgconfig fuse zlib glib ]; + patches = let fetchPatchFromDebian = { patch, sha256 }: + fetchpatch { + inherit sha256; + url = "https://sources.debian.net/data/main/f/fuseiso/20070708-3.2/debian/patches/${patch}"; + }; + in [ + (fetchPatchFromDebian { + patch = "00-support_large_iso.patch"; + sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw"; + }) + (fetchPatchFromDebian { # CVE-2015-8837 + patch = "02-prevent-buffer-overflow.patch"; + sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig"; + }) + (fetchPatchFromDebian { # CVE-2015-8836 + patch = "03-prevent-integer-overflow.patch"; + sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv"; + }) + ]; + meta = { homepage = http://sourceforge.net/projects/fuseiso; description = "FUSE module to mount ISO filesystem images"; diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix new file mode 100644 index 00000000000..06190a8f03d --- /dev/null +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -0,0 +1,25 @@ +# This file was generated by go2nix. +{ lib, buildGoPackage, fetchgit }: + +buildGoPackage rec { + name = "gcsfuse-${version}"; + version = "v0.19.0"; + rev = "81281027c0093e3f916a6e611a128ec5c3a12ece"; + + goPackagePath = "github.com/googlecloudplatform/gcsfuse"; + + src = fetchgit { + inherit rev; + url = "https://github.com/googlecloudplatform/gcsfuse"; + sha256 = "1lj9czippsgkhr8y3r7vwxgc8i952v76v1shdv10p43gsxwyyi9a"; + }; + + # TODO: add metadata https://nixos.org/nixpkgs/manual/#sec-standard-meta-attributes + meta = { + license = lib.licenses.asl20; + maintainers = []; + homepage = https://cloud.google.com/storage/docs/gcs-fuse; + description = + "A user-space file system for interacting with Google Cloud Storage"; + }; +} diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix index 9c44394697f..31c4ceccbc0 100644 --- a/pkgs/tools/filesystems/gitfs/default.nix +++ b/pkgs/tools/filesystems/gitfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, python, buildPythonApplication, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "gitfs-0.2.5"; src = fetchFromGitHub { diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 9da5332ce67..e97f246e70b 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -6,11 +6,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.8.1"; + version="3.8.4"; name="${baseName}-${version}"; - hash="1j3r2wnk1pwwwn02pfnrrgh1if92b5cl51dqg7284qxrkjiafb2k"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.8/3.8.1/glusterfs-3.8.1.tar.gz"; - sha256="1j3r2wnk1pwwwn02pfnrrgh1if92b5cl51dqg7284qxrkjiafb2k"; + hash="0f715r6bf12b37s1l3259qzfbz8l2g3mdsnnh2lflagzazn6jnap"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.8/3.8.4/glusterfs-3.8.4.tar.gz"; + sha256="0f715r6bf12b37s1l3259qzfbz8l2g3mdsnnh2lflagzazn6jnap"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 0bb92f14e15..028aef6024b 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -16,5 +16,5 @@ buildGoPackage rec { sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.json b/pkgs/tools/filesystems/go-mtpfs/deps.json deleted file mode 100644 index 9960293f090..00000000000 --- a/pkgs/tools/filesystems/go-mtpfs/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/hanwen/go-fuse", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/go-fuse", - "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e", - "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56" - } - }, - { - "goPackagePath": "github.com/hanwen/usb", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/usb", - "rev": "69aee4530ac705cec7c5344418d982aaf15cf0b1", - "sha256": "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky" - } - } -] diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/pkgs/tools/filesystems/go-mtpfs/deps.nix new file mode 100644 index 00000000000..4bba3f23739 --- /dev/null +++ b/pkgs/tools/filesystems/go-mtpfs/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "bd746dd8bcc8c059a9d953a786a6156eb83f398e"; + sha256 = "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56"; + }; + } + { + goPackagePath = "github.com/hanwen/usb"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/usb"; + rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; + sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; + }; + } +] diff --git a/pkgs/tools/filesystems/lizardfs/412.patch b/pkgs/tools/filesystems/lizardfs/412.patch deleted file mode 100644 index a2890cad399..00000000000 --- a/pkgs/tools/filesystems/lizardfs/412.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 26a27dedb7bee36f3ac5f48e22b977ea001d5903 Mon Sep 17 00:00:00 2001 -From: Maksymilian Paszkiewicz -Date: Mon, 23 May 2016 12:25:19 +0200 -Subject: [PATCH] common: Fix minor compile and copyright issues - -This commit adds include directive to -slice_read_planner.cc and fixes copyright -statement in filesystem_operations.cc - -Closes #411 -Closes #412 - -Change-Id: I3ac995708a09f64e1389871be2e961d594e4bc68 ---- - src/common/slice_read_planner.cc | 2 ++ - src/master/filesystem_operations.cc | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/common/slice_read_planner.cc b/src/common/slice_read_planner.cc -index 94c106c..d0284f1 100644 ---- a/src/common/slice_read_planner.cc -+++ b/src/common/slice_read_planner.cc -@@ -20,6 +20,8 @@ - - #include "common/slice_read_planner.h" - -+#include -+ - /*! - * Prepares read planner for serving selected parts of a slice type. - * Firstly, function checks if: -diff --git a/src/master/filesystem_operations.cc b/src/master/filesystem_operations.cc -index 69ff270..dc30b1f 100644 ---- a/src/master/filesystem_operations.cc -+++ b/src/master/filesystem_operations.cc -@@ -1,5 +1,6 @@ - /* -- Copyright 2013-2015 Skytechnology sp. z o.o.. -+ Copyright 2005-2010 Jakub Kruszona-Zawadzki, Gemius SA, 2013-2014 EditShare, -+ 2013-2016 Skytechnology sp. z o.o.. - - This file is part of LizardFS. - diff --git a/pkgs/tools/filesystems/lizardfs/default.nix b/pkgs/tools/filesystems/lizardfs/default.nix index 0301d2e18fb..a50d8341f6b 100644 --- a/pkgs/tools/filesystems/lizardfs/default.nix +++ b/pkgs/tools/filesystems/lizardfs/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { name = "lizardfs-${version}"; - version = "3.10.0"; + version = "3.10.2"; src = fetchFromGitHub { owner = "lizardfs"; repo = "lizardfs"; - rev = "v.${version}"; - sha256 = "18p2pj9crjqgxxxzdfcs3j3fqhinmwi7qxcf71jsw17syqwyygh8"; + rev = "v${version}"; + sha256 = "0xw6skprxw0wcbqh4yx8f8a4q00x0sfz42llqgd047bcbga1k5zg"; }; buildInputs = @@ -32,8 +32,6 @@ stdenv.mkDerivation rec { zlib boost pkgconfig judy pam makeWrapper ]; - patches = [ ./412.patch ]; - postInstall = '' wrapProgram $out/sbin/lizardfs-cgiserver \ --prefix PATH ":" "${python}/bin" diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix new file mode 100644 index 00000000000..81f82108995 --- /dev/null +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, fuse, pkgconfig, which, attr, pandoc, git }: + +stdenv.mkDerivation rec { + name = "mergerfs-${version}"; + version = "2.16.1"; + + # not using fetchFromGitHub because of changelog being built with git log + src = fetchgit { + url = "https://github.com/trapexit/mergerfs"; + rev = "refs/tags/${version}"; + sha256 = "12fqgk54fnnibqiq82p4g2k6qnw3iy6dd64csmlf73yi67za5iwf"; + deepClone = true; + }; + + buildInputs = [ fuse pkgconfig which attr pandoc git ]; + + makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; + + meta = { + description = "A FUSE based union filesystem"; + homepage = https://github.com/trapexit/mergerfs; + license = stdenv.lib.licenses.isc; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/tools/filesystems/nilfs-utils/default.nix b/pkgs/tools/filesystems/nilfs-utils/default.nix index f40c6e35f71..d71b6332321 100644 --- a/pkgs/tools/filesystems/nilfs-utils/default.nix +++ b/pkgs/tools/filesystems/nilfs-utils/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl, libuuid, libselinux }: let sourceInfo = rec { - version = "2.2.4"; + version = "2.2.5"; url = "http://nilfs.sourceforge.net/download/nilfs-utils-${version}.tar.bz2"; - sha256 = "1ywmhrf6dz5g3ik4wf3hlnzmv1qa0q2qrgh3ir1pmbdhlgmkxdhm"; + sha256 = "0a5iavbjj8c255mfl968ljmj3cb217k7803cc1sdaskacwnykdq2"; baseName = "nilfs-utils"; name = "${baseName}-${version}"; }; diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix index c4dc72644d9..3946d6fcef8 100644 --- a/pkgs/tools/filesystems/snapraid/default.nix +++ b/pkgs/tools/filesystems/snapraid/default.nix @@ -2,13 +2,15 @@ stdenv.mkDerivation rec { name = "snapraid-${version}"; - version = "8.1"; + version = "10.0"; src = fetchurl { url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz"; - sha256 = "0pafqn9ismn4j3fsx8fgf008qwh2c6f8mjfjijah6d5c349rmy3b"; + sha256 = "1mhs0gl285a5y2bw6k04lrnyg1pp2am7dfcsvg0w4vr5h2ag3p7p"; }; + doCheck = true; + meta = { homepage = http://www.snapraid.it/; description = "A backup program for disk arrays"; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index 5e1700af017..a2fc5bc3d40 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -1,21 +1,29 @@ -{ stdenv, fetchgit, zlib, xz }: +{ stdenv, fetchFromGitHub, zlib, xz +, lz4 ? null +, lz4Support ? false +}: + +assert lz4Support -> (lz4 != null); stdenv.mkDerivation rec { name = "squashfs-4.4dev"; - src = fetchgit { - url = https://github.com/plougher/squashfs-tools.git; + src = fetchFromGitHub { + owner = "plougher"; + repo = "squashfs-tools"; sha256 = "059pa2shdysr3zfmwrhq28s12zbi5nyzbpzyaf5lmspgfh1493ks"; rev = "9c1db6d13a51a2e009f0027ef336ce03624eac0d"; }; - buildInputs = [ zlib xz ]; + buildInputs = [ zlib xz ] + ++ stdenv.lib.optional lz4Support lz4; preBuild = "cd squashfs-tools"; installFlags = "INSTALL_DIR=\${out}/bin"; - makeFlags = "XZ_SUPPORT=1"; + makeFlags = [ "XZ_SUPPORT=1" ] + ++ stdenv.lib.optional lz4Support "LZ4_SUPPORT=1"; meta = { homepage = http://squashfs.sourceforge.net/; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 7d191ccaba5..2d73a268038 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -4,8 +4,6 @@ , python, zlib, perl, texLive, texinfo, xz }: -assert stdenv.isLinux; - let s = # Generated upstream information rec { @@ -17,10 +15,12 @@ let sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9"; }; buildInputs = [ - freeglut ghostscriptX imagemagick fftw - boehmgc mesa_glu mesa_noglu mesa_noglu.osmesa ncurses readline gsl libsigsegv - python zlib perl texLive texinfo xz - ]; + ghostscriptX imagemagick fftw + boehmgc ncurses readline gsl libsigsegv + python zlib perl texLive texinfo xz ] + ++ stdenv.lib.optionals stdenv.isLinux + [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ] + ; in stdenv.mkDerivation { inherit (s) name version; @@ -51,11 +51,11 @@ stdenv.mkDerivation { enableParallelBuilding = true; - meta = { + meta = with stdenv.lib; { inherit (s) version; description = "A tool for programming graphics intended to replace Metapost"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.peti]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3Plus; + maintainers = [ maintainers.raskin maintainers.peti ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/graphics/convchain/default.nix b/pkgs/tools/graphics/convchain/default.nix new file mode 100644 index 00000000000..12fc6934531 --- /dev/null +++ b/pkgs/tools/graphics/convchain/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchFromGitHub, mono}: +stdenv.mkDerivation rec { + name = "convchain-${version}"; + version = "0.0pre20160901"; + src = fetchFromGitHub { + owner = "mxgmn"; + repo = "ConvChain"; + rev = "8abb1e88a496fcae4c0ae31acd4eea55957dab68"; + sha256 = "0lnscljgbw0s90sfcahwvnxakml0f4d8jxi5ikm4ak8qgnvw6rql"; + }; + buildPhase = '' + mcs ConvChain.cs -out:convchain.exe -r:System.Drawing + mcs ConvChainFast.cs -out:convchainfast.exe -r:System.Drawing + grep -m1 -B999 '^[*][/]' ConvChainFast.cs > COPYING.MIT + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/convchain,share/convchain} + cp README.md COPYING.MIT "$out"/share/doc/convchain + cp convchain*.exe "$out"/bin + cp -r [Ss]amples samples.xml "$out/share/convchain" + + echo "#! ${stdenv.shell}" >> "$out/bin/convchain" + echo "chmod u+w ." >> "$out/bin/convchain" + echo "'${mono}/bin/mono' '$out/bin/convchain.exe' \"\$@\"" >> "$out/bin/convchain" + chmod a+x "$out/bin/convchain" + + echo "#! ${stdenv.shell}" >> "$out/bin/convchainfast" + echo "chmod u+w ." >> "$out/bin/convchainfast" + echo "'${mono}/bin/mono' '$out/bin/convchainfast.exe' \"\$@\"" >> "$out/bin/convchainfast" + chmod a+x "$out/bin/convchainfast" + ''; + buildInputs = [mono]; + meta = { + inherit version; + description = ''Bitmap generation from a single example with convolutions and MCMC''; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index a99e42891b6..03be1e90930 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibsWrapper, mesa}: +{ stdenv, fetchurl, xlibsWrapper, mesa_noglu }: let version = "8.3.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; - buildInputs = [xlibsWrapper mesa]; + buildInputs = [ xlibsWrapper mesa_noglu ]; configurePhase = "true"; diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 408539561c7..606e049703d 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "gmic-${version}"; - version = "1.7.4"; + version = "1.7.7"; src = fetchurl { url = "http://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "1k4swqi1adq479b6zdpvy5kdpkvjkfihkj9iwgw9mgi0xdqikjry"; + sha256 = "0shcxgq8nc391c0y0zh3l87g3p7fvsmgshi1x1jvvwwq1b9nf6vp"; }; buildInputs = [ fftw zlib libjpeg libtiff libpng ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preBuild = '' buildFlagsArray=( \ CURL_CFLAGS= CURL_LIBS= \ - EXR_CFLAGS= EXR_LIBS= \ + OPENEXR_CFLAGS= OPENEXR_LIBS= \ OPENCV_CFLAGS= OPENCV_LIBS= \ X11_CFLAGS="-Dcimg_display=0" X11_LIBS= \ cli \ @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { homepage = http://gmic.eu/; license = licenses.cecill20; maintainers = [ maintainers.rycee ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index 8fa7af3b1f8..3b537fad91d 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { ++ lib.optional withTeXLive (texlive.combine { inherit (texlive) scheme-small; }) ++ lib.optional withLua lua ++ lib.optionals withX [ libX11 libXpm libXt libXaw ] - ++ lib.optional withQt [ qt ] + ++ lib.optional withQt qt # compiling with wxGTK causes a malloc (double free) error on darwin ++ lib.optional (withWxGTK && !stdenv.isDarwin) wxGTK; diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index fb88a8c37d4..d0ad0c27f20 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome2, fftw, gsl, goffice, libgsf }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig glib libxml2 flex bison vips - gnome.gtk fftw gsl goffice libgsf + gnome2.gtk fftw gsl goffice libgsf ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index 52ca99b9764..dad611868bc 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig -, cairo, gtk, poppler }: +, cairo, gtk2, poppler }: stdenv.mkDerivation rec { name = "pdf2svg-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "14ffdm4y26imq99wjhkrhy9lp33165xci1l5ndwfia8hz53bl02k"; }; - buildInputs = [ autoreconfHook cairo pkgconfig poppler gtk ]; + buildInputs = [ autoreconfHook cairo pkgconfig poppler gtk2 ]; meta = with stdenv.lib; { description = "PDF converter to SVG format"; diff --git a/pkgs/tools/graphics/syntex/default.nix b/pkgs/tools/graphics/syntex/default.nix new file mode 100644 index 00000000000..0862293830d --- /dev/null +++ b/pkgs/tools/graphics/syntex/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchFromGitHub, mono}: +stdenv.mkDerivation rec { + name = "syntex-${version}"; + version = "0.0pre20160915"; + src = fetchFromGitHub { + owner = "mxgmn"; + repo = "SynTex"; + rev = "f499a7c8112be4a63eb44843ba72957c2c9a04db"; + sha256 = "13fz6frlxsdz8qq94fsvim27cd5klmdsax5109yxm9175vgvpa0a"; + }; + buildPhase = '' + mcs *.cs -out:syntex.exe -r:System.Drawing + grep -m1 -B999 '^[*][/]' SynTex.cs > COPYING.MIT + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/syntex,share/syntex} + cp README.md COPYING.MIT "$out"/share/doc/syntex + cp syntex.exe "$out"/bin + cp -r [Ss]amples samples.xml "$out/share/syntex" + + echo "#! ${stdenv.shell}" >> "$out/bin/syntex" + echo "chmod u+w ." >> "$out/bin/syntex" + echo "'${mono}/bin/mono' '$out/bin/syntex.exe' \"\$@\"" >> "$out/bin/syntex" + chmod a+x "$out/bin/syntex" + ''; + buildInputs = [mono]; + meta = { + inherit version; + description = ''Texture synthesis from examples''; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix index 6ff2ee5cd44..4fb16b49717 100644 --- a/pkgs/tools/graphics/vips/default.nix +++ b/pkgs/tools/graphics/vips/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, gnome, +{ stdenv, fetchurl, pkgconfig, glib, libxml2, flex, bison, vips, fftw, orc, lcms, imagemagick, openexr, libtiff, libjpeg, libgsf, libexif, python27, libpng, matio ? null, cfitsio ? null, libwebp ? null }: diff --git a/pkgs/tools/graphics/wavefunctioncollapse/default.nix b/pkgs/tools/graphics/wavefunctioncollapse/default.nix new file mode 100644 index 00000000000..32c2104c0f9 --- /dev/null +++ b/pkgs/tools/graphics/wavefunctioncollapse/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchFromGitHub, mono}: +stdenv.mkDerivation rec { + name = "wavefunctioncollapse-${version}"; + version = "0.0pre20160930"; + src = fetchFromGitHub { + owner = "mxgmn"; + repo = "WaveFunctionCollapse"; + rev = "333f592b6612da43ec475c988c09325378c662e9"; + sha256 = "1cpwn52ka1zsi2yc7rfg5r9ll2kjgzabx4a5axcp9c4ph5qzsza6"; + }; + buildPhase = '' + mcs *.cs -out:wavefunctioncollapse.exe -r:System.Drawing + grep -m1 -B999 '^[*][/]' Main.cs > COPYING.MIT + ''; + installPhase = '' + mkdir -p "$out"/{bin,share/doc/wavefunctioncollapse,share/wavefunctioncollapse} + cp README.md COPYING.MIT "$out"/share/doc/wavefunctioncollapse + cp wavefunctioncollapse.exe "$out"/bin + cp -r [Ss]amples samples.xml "$out/share/wavefunctioncollapse" + + echo "#! ${stdenv.shell}" >> "$out/bin/wavefunctioncollapse" + echo "chmod u+w ." >> "$out/bin/wavefunctioncollapse" + echo "'${mono}/bin/mono' '$out/bin/wavefunctioncollapse.exe' \"\$@\"" >> "$out/bin/wavefunctioncollapse" + chmod a+x "$out/bin/wavefunctioncollapse" + ''; + buildInputs = [mono]; + meta = { + inherit version; + description = ''A generator of bitmaps that are locally similar to the input bitmap''; + license = stdenv.lib.licenses.mit; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix index 9a181e7d087..66f61d9a459 100644 --- a/pkgs/tools/graphics/zbar/default.nix +++ b/pkgs/tools/graphics/zbar/default.nix @@ -1,8 +1,10 @@ -{ stdenv, fetchurl, imagemagickBig, pkgconfig, python, pygtk, perl +{ stdenv, fetchurl, imagemagickBig, pkgconfig, pythonPackages, perl , libX11, libv4l, qt4, lzma, gtk2, fetchpatch, autoreconfHook }: -stdenv.mkDerivation rec { +let + inherit (pythonPackages) pygtk python; +in stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "zbar"; version = "0.10"; diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix new file mode 100644 index 00000000000..c441a4964b8 --- /dev/null +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-libpinyin/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, cmake, pkgconfig, fcitx, gettext, libpinyin, glib, pcre, dbus, qt4 }: + +stdenv.mkDerivation rec { + name = "fcitx-libpinyin-${version}"; + version = "0.3.91"; + + src = fetchurl { + url = "http://download.fcitx-im.org/fcitx-libpinyin/${name}.tar.xz"; + sha256 = "19h0p1s8bkw24v7x6v19fg7dqpz2kkjlvvrqhypi5bkkvfswf7xn"; + }; + + buildInputs = [ cmake pkgconfig fcitx gettext libpinyin glib pcre dbus qt4 ]; + + preInstall = '' + substituteInPlace src/cmake_install.cmake \ + --replace ${fcitx} $out + substituteInPlace po/cmake_install.cmake \ + --replace ${fcitx} $out + substituteInPlace data/cmake_install.cmake \ + --replace ${fcitx} $out + substituteInPlace dictmanager/cmake_install.cmake \ + --replace ${fcitx} $out + ''; + + preBuild = let + store_path = fetchurl { + url = https://download.fcitx-im.org/data/model.text.20130308.tar.gz; + sha256 = "0s8sazix29z1ilxmkw2f0bv6i349awd89ibylf9ixy615s1vb5a5"; + }; + in + '' + cp -rv ${store_path} $NIX_BUILD_TOP/$name/data/model.text.20130308.tar.gz + ''; + + meta = with stdenv.lib; { + isFcitxEngine = true; + description = "Fcitx Wrapper for libpinyin, Library to deal with pinyin"; + homepage = https://github.com/fcitx/fcitx-libpinyin; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ ericsagnes ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix index 5366fe55877..cdd99cd7e9a 100644 --- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix +++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix @@ -1,5 +1,5 @@ { clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchsvn, gyp, which, ninja, - python, pkgconfig, protobuf, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese, + python, pkgconfig, protobuf, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese, fcitx, gettext }: let japanese_usage_dictionary = fetchsvn { @@ -23,7 +23,7 @@ in clangStdenv.mkDerivation rec { }; nativeBuildInputs = [ gyp which ninja python pkgconfig ]; - buildInputs = [ protobuf gtk zinnia qt4 libxcb fcitx gettext ]; + buildInputs = [ protobuf gtk2 zinnia qt4 libxcb fcitx gettext ]; postUnpack = '' rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/ diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix index 1cb849fa09b..799d66aac9b 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-libpinyin/default.nix @@ -1,29 +1,31 @@ -{ stdenv, fetchurl, intltool, pkgconfig, sqlite, libpinyin, db +{ stdenv, fetchFromGitHub, autoreconfHook +, intltool, pkgconfig, sqlite, libpinyin, db , ibus, glib, gtk3, python3, pygobject3 }: stdenv.mkDerivation rec { name = "ibus-libpinyin-${version}"; - version = "1.7.4"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "libpinyin"; + repo = "ibus-libpinyin"; + rev = version; + sha256 = "1d85kzlhav0ay798i88yqyrjbkv3y7w2aiadpmcjgscyd5ccsnnz"; + }; + + buildInputs = [ ibus glib sqlite libpinyin python3 gtk3 db ]; + nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; + + postAutoreconf = '' + intltoolize + ''; meta = with stdenv.lib; { isIbusEngine = true; description = "IBus interface to the libpinyin input method"; - homepage = https://github.com/libpinyin/ibus-libpinyin; license = licenses.gpl2; + maintainers = with maintainers; [ ericsagnes ]; platforms = platforms.linux; }; - - #configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t"; - - buildInputs = [ - ibus glib sqlite libpinyin python3 gtk3 db - ]; - - nativeBuildInputs = [ intltool pkgconfig ]; - - src = fetchurl { - url = "mirror://sourceforge/project/libpinyin/ibus-libpinyin/ibus-libpinyin-${version}.tar.gz"; - sha256 = "c2085992f76ca669ebe4b7e7c0170433bbfb61f764f8336b3b17490b9fb1c334"; - }; } diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix index e06d2b004ee..644725c2910 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, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: +{ clangStdenv, fetchFromGitHub, fetchsvn, gyp, which, ninja, python, pkgconfig, protobuf, ibus, gtk2, zinnia, qt4, libxcb, tegaki-zinnia-japanese }: let japanese_usage_dictionary = fetchsvn { @@ -20,7 +20,7 @@ in clangStdenv.mkDerivation rec { }; nativeBuildInputs = [ gyp which ninja python pkgconfig ]; - buildInputs = [ protobuf ibus gtk zinnia qt4 libxcb ]; + buildInputs = [ protobuf ibus gtk2 zinnia qt4 libxcb ]; src = fetchFromGitHub { owner = "google"; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix index b44bea9119a..c5090e5b949 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix @@ -1,13 +1,17 @@ -{ stdenv, fetchurl, pkgconfig -, gtk3, dconf, gobjectIntrospection, ibus, python3, pygobject3 }: +{ stdenv, fetchFromGitHub +, autoreconfHook, docbook2x, pkgconfig +, gtk3, dconf, gobjectIntrospection +, ibus, python3, pygobject3 }: stdenv.mkDerivation rec { name = "ibus-table-${version}"; - version = "1.9.11"; + version = "1.9.14"; - src = fetchurl { - url = "https://github.com/kaio/ibus-table/releases/download/${version}/${name}.tar.gz"; - sha256 = "14sb89z1inbbhcrbsm5nww8la04ncy2lk32mxfqpi4ghl22ixxqd"; + src = fetchFromGitHub { + owner = "kaio"; + repo = "ibus-table"; + rev = version; + sha256 = "1mkx03iqrq5yq57y7hjqcmxfh41dsjykyyl70d41dflcgp5q2nhw"; }; postPatch = '' @@ -28,7 +32,12 @@ stdenv.mkDerivation rec { dconf gtk3 gobjectIntrospection ibus python3 pygobject3 ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook docbook2x pkgconfig ]; + + postUnpack = '' + substituteInPlace $sourceRoot/engine/Makefile.am \ + --replace "docbook2man" "docbook2man --sgml" + ''; meta = with stdenv.lib; { isIbusEngine = true; diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix new file mode 100644 index 00000000000..3ca6f3ffcfe --- /dev/null +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-uniemoji/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub +, python3Packages +}: + +stdenv.mkDerivation rec { + name = "ibus-uniemoji-${version}"; + version = "2016-09-20"; + + src = fetchFromGitHub { + owner = "salty-horse"; + repo = "ibus-uniemoji"; + rev = "c8931a4807a721168e45463ecba00805adb3fe8d"; + sha256 = "0fydxkdjsbfbrbb8238rfnshmhp11c38hsa7y2gp1ii6mkjngb1j"; + }; + + propagatedBuildInputs = with python3Packages; [ pyxdg python-Levenshtein ]; + + makeFlags = [ "PREFIX=$(out)" "SYSCONFDIR=$(out)/etc" + "PYTHON=${python3Packages.python.interpreter}" ]; + + postPatch = '' + sed -i "s,/etc/xdg/,$out/etc/xdg/," uniemoji.py + sed -i "s,/usr/share/,$out/share/,g" uniemoji.xml.in + ''; + + meta = with stdenv.lib; { + isIbusEngine = true; + description = "Input method (ibus) for entering unicode symbols and emoji by name"; + homepage = "https://github.com/salty-horse/ibus-uniemoji"; + license = with licenses; [ gpl3 mit ]; + platforms = platforms.linux; + maintainers = with maintainers; [ aske ]; + }; +} diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 8720674d3af..58afb638b47 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, makeWrapper , intltool, isocodes, pkgconfig , python3, pygobject3 -, gtk2, gtk3, atk, dconf, glib +, gtk2, gtk3, atk, dconf, glib, json_glib , dbus, libnotify, gobjectIntrospection, wayland +, nodePackages }: stdenv.mkDerivation rec { name = "ibus-${version}"; - version = "1.5.13"; + version = "1.5.14"; src = fetchurl { url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz"; - sha256 = "1wd5azlsgdih8qw6gi15rv130s6d90846n3r1ccwmp6z882xhwzd"; + sha256 = "0g4x02d7j5w1lfn4zvmzsq93h17lajgn9d7hlvr6pws28vz40ax4"; }; postPatch = '' @@ -29,12 +30,14 @@ stdenv.mkDerivation rec { "--disable-memconf" "--enable-ui" "--enable-python-library" + "--with-emoji-json-file=${nodePackages.emojione}/lib/node_modules/emojione/emoji.json" ]; buildInputs = [ python3 pygobject3 intltool isocodes pkgconfig gtk2 gtk3 dconf + json_glib dbus libnotify gobjectIntrospection wayland ]; @@ -64,6 +67,9 @@ stdenv.mkDerivation rec { done ''; + doInstallCheck = true; + installCheckPhase = "$out/bin/ibus version"; + meta = with stdenv.lib; { homepage = https://github.com/ibus/ibus; description = "Intelligent Input Bus for Linux / Unix OS"; diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix index 74333c459e8..f38705cc9d1 100644 --- a/pkgs/tools/inputmethods/ibus/wrapper.nix +++ b/pkgs/tools/inputmethods/ibus/wrapper.nix @@ -21,7 +21,7 @@ let done done - for prog in ibus ibus-daemon ibus-setup; do + for prog in ibus ibus-setup; do wrapProgram "$out/bin/$prog" \ --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ @@ -39,6 +39,26 @@ let --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" done + + for prog in ibus-daemon; do + wrapProgram "$out/bin/$prog" \ + --set GDK_PIXBUF_MODULE_FILE ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \ + --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \ + --set IBUS_DATAROOTDIR "$out/share" \ + --set IBUS_LIBEXECDIR "$out/libexec" \ + --set IBUS_LOCALEDIR "$out/share/locale" \ + --set IBUS_PREFIX "$out" \ + --set IBUS_TABLE_BIN_PATH "$out/bin" \ + --set IBUS_TABLE_DATA_DIR "$out/share" \ + --set IBUS_TABLE_LIB_LOCATION "$out/libexec" \ + --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \ + --add-flags "--cache=refresh" + done ''; in runCommand name env command diff --git a/pkgs/tools/inputmethods/nabi/default.nix b/pkgs/tools/inputmethods/nabi/default.nix index 894c7b61760..cb33abc3213 100644 --- a/pkgs/tools/inputmethods/nabi/default.nix +++ b/pkgs/tools/inputmethods/nabi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk, libhangul }: +{ stdenv, fetchurl, pkgconfig, gtk2, libhangul }: stdenv.mkDerivation { name = "nabi-1.0.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "0craa24pw7b70sh253arv9bg9sy4q3mhsjwfss3bnv5nf0xwnncw"; }; - buildInputs = [ gtk libhangul pkgconfig ]; + buildInputs = [ gtk2 libhangul pkgconfig ]; meta = with stdenv.lib; { description = "The Easy Hangul XIM"; diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 9a3e0b905e1..b089240bcc6 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -2,7 +2,7 @@ , glib , gtk2 , gst_all_1 -, gnome +, gnome2 , libnotify , libxml2 , libunique @@ -29,17 +29,16 @@ stdenv.mkDerivation rec { glib gtk2 gst_all_1.gstreamer - gst_plugins - gnome.GConf - gnome.gnome_icon_theme + gnome2.GConf + gnome2.gnome_icon_theme libnotify libxml2 libunique intltool wrapGAppsHook - ]; + ] ++ gst_plugins; - propagatedUserEnvPkgs = [ gnome.GConf.out ]; + propagatedUserEnvPkgs = [ gnome2.GConf.out ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix index dc170bcd14b..ff146e60923 100644 --- a/pkgs/tools/misc/apt-offline/default.nix +++ b/pkgs/tools/misc/apt-offline/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, bash, buildPythonApplication }: +{ stdenv, fetchurl, bash, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { version = "1.3"; name = "apt-offline-${version}"; @@ -12,8 +12,6 @@ buildPythonApplication rec { sha256 = "1sp7ai2abzhbg9y84700qziybphvpzl2nk3mz1d1asivzyjvxlxy"; }; - buildInputs = [ ]; - doCheck = false; # Requires python-qt4 (feel free to get it working). diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix new file mode 100644 index 00000000000..577c0a33b3e --- /dev/null +++ b/pkgs/tools/misc/aspcud/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, + boost, clasp, cmake, gringo, re2c +}: + +let + version = "1.9.0"; +in + +stdenv.mkDerivation rec { + name = "aspcud-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/aspcud/${version}/aspcud-${version}-source.tar.gz"; + sha256 = "029035vcdk527ssf126i8ipi5zs73gqpbrg019pvm9r24rf0m373"; + }; + + buildInputs = [ boost clasp cmake gringo re2c ]; + + buildPhase = '' + cmake -DCMAKE_BUILD_TYPE=Release \ + -DGRINGO_LOC=${gringo}/bin/gringo \ + -DCLASP_LOC=${clasp}/bin/clasp \ + -DENCODING_LOC=$out/share/aspcud/specification.lp \ + . + + make + ''; + + installPhase = '' + mkdir -p $out/bin + cp bin/{aspcud,cudf2lp,lemon} $out/bin + + mkdir -p $out/share/aspcud + cp ../share/aspcud/specification.lp $out/share/aspcud + ''; + + meta = with stdenv.lib; { + description = "Solver for package problems in CUDF format using ASP"; + homepage = http://potasssco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix index be908b162c3..05c3d6a7819 100644 --- a/pkgs/tools/misc/bdf2psf/default.nix +++ b/pkgs/tools/misc/bdf2psf/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bdf2psf-${version}"; - version = "1.147"; + version = "1.148"; src = fetchurl { url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb"; - sha256 = "0nz1ymf9yn8aw2va7mhnzz2y5pf6r651sap8k09r92h1224i0wbj"; + sha256 = "1d0qqzln5w7f7kkw75cp8g8hg43f85xj0h68y6j6yw7d62q1406g"; }; buildInputs = [ dpkg ]; diff --git a/pkgs/tools/misc/byobu/default.nix b/pkgs/tools/misc/byobu/default.nix index a536321fc74..d00e1abc7a5 100644 --- a/pkgs/tools/misc/byobu/default.nix +++ b/pkgs/tools/misc/byobu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ncurses, python, perl, textual-window-manager }: stdenv.mkDerivation rec { - version = "5.98"; + version = "5.112"; name = "byobu-" + version; src = fetchurl { url = "https://launchpad.net/byobu/trunk/${version}/+download/byobu_${version}.orig.tar.gz"; - sha256 = "1s8nh4wbds1nh52i0d1hy1b308jjf4siwpq92lna1zh9ll4x71j5"; + sha256 = "0avv1s8dh3z6rzkf1mn1375v3im1qc9c63w09yvwxdlcq5xznrsd"; }; doCheck = true; diff --git a/pkgs/tools/misc/clasp/default.nix b/pkgs/tools/misc/clasp/default.nix new file mode 100644 index 00000000000..135eda554b3 --- /dev/null +++ b/pkgs/tools/misc/clasp/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +let + version = "3.1.4"; +in + +stdenv.mkDerivation { + name = "clasp-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/clasp/${version}/clasp-${version}-source.tar.gz"; + sha256 = "1zkjqc4gp4n9p2kf3k3z8x82g42any4p3shhhivny89z1jlxi9zn"; + }; + + preConfigure = "patchShebangs ./configure.sh"; + configureScript = "./configure.sh"; + + preBuild = "cd build/release"; + + installPhase = '' + mkdir -p $out/bin + cp bin/clasp $out/bin/clasp + ''; + + meta = with stdenv.lib; { + description = "Answer set solver for (extended) normal and disjunctive logic programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.all; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix index 7e6c3f30784..6dc2c371e46 100644 --- a/pkgs/tools/misc/colord/default.nix +++ b/pkgs/tools/misc/colord/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchgit, bashCompletion +{ stdenv, fetchzip, fetchgit, bash-completion , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus , automake, autoconf, libtool, gtk_doc, which, gobjectIntrospection, argyllcms , libgudev, sane-backends }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection - bashCompletion argyllcms automake autoconf libgudev sane-backends ]; + bash-completion argyllcms automake autoconf libgudev sane-backends ]; postInstall = '' mkdir -p $out/etc/bash_completion.d diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index fb11a3b8756..ddf9c38ec93 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, intltool, perl, perlPackages, libxml2 -, pciutils, pkgconfig, gtk, ddccontrol-db +, pciutils, pkgconfig, gtk2, ddccontrol-db }: let version = "0.4.2"; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ autoreconfHook intltool pkgconfig ]; buildInputs = [ - perl perlPackages.libxml_perl libxml2 pciutils gtk ddccontrol-db + perl perlPackages.libxml_perl libxml2 pciutils gtk2 ddccontrol-db ]; patches = [ ./automake.patch ]; diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 1687c9fffaf..4d5eabfebc9 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -30,9 +30,9 @@ pythonPackages.buildPythonApplication rec { # 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 pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++ - [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext + map lib.getBin ([ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz - ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]; + ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ]); doCheck = false; # Calls 'mknod' in squashfs tests, which needs root diff --git a/pkgs/tools/misc/docbook2mdoc/default.nix b/pkgs/tools/misc/docbook2mdoc/default.nix new file mode 100644 index 00000000000..fbe1cc22376 --- /dev/null +++ b/pkgs/tools/misc/docbook2mdoc/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, expat }: + +stdenv.mkDerivation rec { + name = "docbook2mdoc-${version}"; + version = "0.0.9"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/docbook2mdoc/snapshots/${name}.tgz"; + sha256 = "07il80sg89xf6ym4bry6hxdacfzqgbwkxzyf7bjaihmw5jj0lclk"; + }; + + buildInputs = [ expat.dev ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "converter from DocBook V4.x and v5.x XML into mdoc"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index d743a68c83b..0e3922d2928 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -6,6 +6,8 @@ buildRustPackage rec { name = "exa-${version}"; version = "2016-04-20"; + # NOTE: There is an impurity caused by `exa` depending on + # https://github.com/rust-datetime/zoneinfo-compiled.git depsSha256 = "0qsqkgc1wxigvskhaamgfp5pyc2kprsikhcfccysgs07w44nxkd0"; src = fetchFromGitHub { diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix index ba1154ab72d..2cccee0a4e3 100644 --- a/pkgs/tools/misc/fontforge/default.nix +++ b/pkgs/tools/misc/fontforge/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, lib -, autoconf, automake, gnum4, libtool, git, perl, gnulib, uthash, pkgconfig, gettext +, autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango , withGTK ? false, gtk2 , withPython ? true @@ -25,9 +25,8 @@ stdenv.mkDerivation rec { })]; patchFlags = "-p0"; - # FIXME: git isn't really used, but configuration fails without it buildInputs = [ - git autoconf automake gnum4 libtool perl pkgconfig gettext uthash + autoconf automake gnum4 libtool perl pkgconfig gettext uthash python freetype zlib glib libungif libpng libjpeg libtiff libxml2 ] ++ lib.optionals withGTK [ gtk2 pango ] @@ -38,7 +37,9 @@ stdenv.mkDerivation rec { ++ lib.optional withGTK "--enable-gtk2-use" ++ lib.optional (!withGTK) "--without-x"; + # work-around: git isn't really used, but configuration fails without it preConfigure = '' + export GIT="$(type -P true)" cp -r "${gnulib}" ./gnulib chmod +w -R ./gnulib ./bootstrap --skip-git --gnulib-srcdir=./gnulib diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 3eaf5ae5d1b..3cb5c568038 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.13.5"; + version = "0.15.1"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,24 +11,31 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "1zfl53nv0b2wsmgbsf850yafqkx9pplpx339iiw4037msdjqhi19"; + sha256 = "0wj5nhrrgx4nkiqwjp5wpfzdyikrjv4qr5x39s5094yc4p2k30b1"; }; buildInputs = [ ncurses ]; - goDeps = ./deps.json; + goDeps = ./deps.nix; patchPhase = '' sed -i -e "s|expand(':h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim sed -i -e "s|expand(':h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim ''; - postInstall= '' + postInstall = '' cp $src/bin/fzf-tmux $bin/bin mkdir -p $out/share/vim-plugins ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} ''; + preFixup = stdenv.lib.optionalString stdenv.isDarwin '' + # fixes cycle between $out and $bin + # otool -l shows that the binary includes an LC_RPATH to $out/lib + # it seems safe to remove that since but the directory does not exist. + install_name_tool -delete_rpath $out/lib $bin/bin/fzf + ''; + meta = with stdenv.lib; { homepage = https://github.com/junegunn/fzf; description = "A command-line fuzzy finder written in Go"; diff --git a/pkgs/tools/misc/fzf/deps.json b/pkgs/tools/misc/fzf/deps.json deleted file mode 100644 index a856d2d5fa8..00000000000 --- a/pkgs/tools/misc/fzf/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/junegunn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/junegunn/go-runewidth", - "rev": "63c378b851290989b19ca955468386485f118c65", - "sha256": "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d" - } - }, - { - "goPackagePath": "github.com/junegunn/go-shellwords", - "fetch": { - "type": "git", - "url": "https://github.com/junegunn/go-shellwords", - "rev": "35d512af75e283aae4ca1fc3d44b159ed66189a4", - "sha256": "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7" - } - } -] diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix new file mode 100644 index 00000000000..98530853832 --- /dev/null +++ b/pkgs/tools/misc/fzf/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/junegunn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/junegunn/go-runewidth"; + rev = "63c378b851290989b19ca955468386485f118c65"; + sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; + }; + } + { + goPackagePath = "github.com/junegunn/go-shellwords"; + fetch = { + type = "git"; + url = "https://github.com/junegunn/go-shellwords"; + rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; + sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"; + }; + } +] diff --git a/pkgs/tools/misc/fzy/default.nix b/pkgs/tools/misc/fzy/default.nix index 318de542bb2..66f02bcc7bc 100644 --- a/pkgs/tools/misc/fzy/default.nix +++ b/pkgs/tools/misc/fzy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "fzy-${version}"; - version = "0.4"; + version = "0.7"; src = fetchFromGitHub { owner = "jhawthorn"; repo = "fzy"; rev = version; - sha256 = "1sbwy4v5kz0fcl7kzf414phxv9cppvjvfq9jqkcda4bkzqh2xgia"; + sha256 = "11sc92j9fx23byxv5y4rq0jxp55vc9mrn5hx9lb162vdrl8a4222"; }; makeFlags = "PREFIX=$(out)"; diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 6e3fe1223fc..7c944ceaab3 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -15,5 +15,5 @@ buildGoPackage rec { sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/gawp/deps.json b/pkgs/tools/misc/gawp/deps.json deleted file mode 100644 index a51c1725353..00000000000 --- a/pkgs/tools/misc/gawp/deps.json +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "gopkg.in/fsnotify.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fsnotify.v1", - "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", - "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - } -] diff --git a/pkgs/tools/misc/gawp/deps.nix b/pkgs/tools/misc/gawp/deps.nix new file mode 100644 index 00000000000..cf577a30354 --- /dev/null +++ b/pkgs/tools/misc/gawp/deps.nix @@ -0,0 +1,29 @@ +[ + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } +] diff --git a/pkgs/tools/misc/geteltorito/default.nix b/pkgs/tools/misc/geteltorito/default.nix new file mode 100644 index 00000000000..ec011aaa007 --- /dev/null +++ b/pkgs/tools/misc/geteltorito/default.nix @@ -0,0 +1,48 @@ +{ stdenv, perl, ronn, fetchurl }: + +stdenv.mkDerivation rec { + name = "geteltorito-${version}"; + version = "0.6"; + + src = fetchurl { + url = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/geteltorito-${version}.tar.gz"; + sha256 = "1gkbm9ahj2mgqrkrfpibzclsriqgsbsvjh19fr815vpd9f6snkxv"; + }; + + buildInputs = [ perl ronn ]; + + unpackCmd = ""; + dontBuild = true; + configurePhase = ""; + installPhase = '' + # reformat README to ronn markdown + cat > README.new <> README.new + mkdir -p $out/man/man1 + ronn --roff README.new --pipe > $out/man/man1/geteltorito.1 + install -vD geteltorito $out/bin/geteltorito + ''; + + meta = with stdenv.lib; { + description = "Extract the initial/default boot image from a CD image if existent"; + homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/"; + maintainer = [ maintainers.profpatsch ]; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index d1551eb4ccd..adad66c9bfa 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez -, readline, pcsclite, libical, gtk, glib, libXpm }: +, readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { name = "gnokii-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl intltool gettext libusb - glib gtk pkgconfig bluez readline + glib gtk2 pkgconfig bluez readline libXpm pcsclite libical ]; diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix index d73def7ab9b..cdf2a4aca86 100644 --- a/pkgs/tools/misc/gparted/default.nix +++ b/pkgs/tools/misc/gparted/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gettext, makeWrapper -, parted, gtk, glib, libuuid, pkgconfig, gtkmm, libxml2, hicolor_icon_theme +, parted, glib, libuuid, pkgconfig, gtkmm2, libxml2, hicolor_icon_theme , gpart, hdparm, procps, utillinux }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; - buildInputs = [ parted gtk glib libuuid gtkmm libxml2 hicolor_icon_theme ]; + buildInputs = [ parted glib libuuid gtkmm2 libxml2 hicolor_icon_theme ]; nativeBuildInputs = [ intltool gettext makeWrapper pkgconfig ]; postInstall = '' diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index 5a007a0ac72..829c524113b 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "2.1.0"; + version = "2.1.1"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "09rcgjxnv235a9rvyfcfdjvmr3rjb0jg5sph8sqvzgspvas9pgvn"; + sha256 = "0p7vx6b4k6lzxi0v9x44wbrvplw93288lpixpwckc0xx0r7js07z"; }; dontBuild = true; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix new file mode 100644 index 00000000000..ae71c01314c --- /dev/null +++ b/pkgs/tools/misc/gringo/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, + bison, re2c, scons +}: + +let + version = "4.5.4"; +in + +stdenv.mkDerivation rec { + name = "gringo-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; + sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; + }; + + buildInputs = [ bison re2c scons ]; + + patches = [ + ./gringo-4.5.4-cmath.patch + ]; + + buildPhase = '' + scons --build-dir=release + ''; + + installPhase = '' + mkdir -p $out/bin + cp build/release/gringo $out/bin/gringo + ''; + + meta = with stdenv.lib; { + description = "Converts input programs with first-order variables to equivalent ground programs"; + homepage = http://potassco.sourceforge.net/; + platforms = platforms.linux; + maintainers = [ maintainers.hakuch ]; + license = licenses.gpl3Plus; + }; +} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch new file mode 100644 index 00000000000..7b5510e2344 --- /dev/null +++ b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch @@ -0,0 +1,11 @@ +--- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 ++++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 +@@ -22,6 +22,8 @@ + #include "gringo/logger.hh" + #include "gringo/graph.hh" + ++#include ++ + namespace Gringo { + + // {{{ definition of Defines diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix index 5f21559d471..f362e7c53a2 100644 --- a/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, smartmontools, gtk, gtkmm, libglademm, pkgconfig, pcre }: +{ fetchurl, stdenv, smartmontools, gtkmm2, libglademm, pkgconfig, pcre }: stdenv.mkDerivation rec { version="0.8.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh"; }; - buildInputs = [ smartmontools gtk gtkmm libglademm pkgconfig pcre ]; + buildInputs = [ smartmontools gtkmm2 libglademm pkgconfig pcre ]; #installTargets = "install datainstall"; diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 1cda3149bb4..52e7793d974 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json deleted file mode 100644 index 0db944a8361..00000000000 --- a/pkgs/tools/misc/i3cat/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/vincent-petithory/structfield", - "fetch": { - "type": "git", - "url": "https://github.com/vincent-petithory/structfield", - "rev": "01a738558a47fbf16712994d1737fb31c77e7d11", - "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw" - } - } -] diff --git a/pkgs/tools/misc/i3cat/deps.nix b/pkgs/tools/misc/i3cat/deps.nix new file mode 100644 index 00000000000..01e85cbd824 --- /dev/null +++ b/pkgs/tools/misc/i3cat/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/vincent-petithory/structfield"; + fetch = { + type = "git"; + url = "https://github.com/vincent-petithory/structfield"; + rev = "01a738558a47fbf16712994d1737fb31c77e7d11"; + sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"; + }; + } +] diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix index e51150d6876..0b26dbc06e2 100644 --- a/pkgs/tools/misc/i3minator/default.nix +++ b/pkgs/tools/misc/i3minator/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, buildPythonApplication, pythonPackages, python }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "i3minator-${version}"; version = "0.0.4"; diff --git a/pkgs/tools/misc/ipxe/default.nix b/pkgs/tools/misc/ipxe/default.nix index 6ee14a0ce93..1efac3b7844 100644 --- a/pkgs/tools/misc/ipxe/default.nix +++ b/pkgs/tools/misc/ipxe/default.nix @@ -1,23 +1,21 @@ -{ stdenv, fetchgit, perl, cdrkit, syslinux }: +{ stdenv, fetchgit, perl, cdrkit, syslinux, xz, openssl }: let - date = "20141124"; - rev = "5cbdc41778622c07429e00f5aee383b575532bf0"; + date = "20160831"; + rev = "827dd1bfee67daa683935ce65316f7e0f057fe1c"; in stdenv.mkDerivation { name = "ipxe-${date}-${builtins.substring 0 7 rev}"; - buildInputs = [ perl cdrkit syslinux ]; + buildInputs = [ perl cdrkit syslinux xz openssl ]; src = fetchgit { url = git://git.ipxe.org/ipxe.git; - sha256 = "0wiy3kag6x8a2a71pc9za9izmac8gdz90vaqp2mwgih6p2lz01zq"; + sha256 = "11w8b0vln3skfn8r1cvzngslz12njdkwmnacyq3qffb96k2dn2ww"; inherit rev; }; - preConfigure = "cd src"; - # not possible due to assembler code hardeningDisable = [ "pic" "stackprotector" ]; @@ -28,11 +26,17 @@ stdenv.mkDerivation { "ISOLINUX_BIN_LIST=${syslinux}/share/syslinux/isolinux.bin" ]; - installPhase = - '' - mkdir $out - cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out - ''; + + configurePhase = '' + echo "#define DOWNLOAD_PROTO_HTTPS" >> src/config/general.h + ''; + + preBuild = "cd src"; + + installPhase = '' + mkdir -p $out + cp bin/ipxe.dsk bin/ipxe.usb bin/ipxe.iso bin/ipxe.lkrn bin/undionly.kpxe $out + ''; meta = with stdenv.lib; { description = "Network boot firmware"; diff --git a/pkgs/tools/misc/kalibrate-hackrf/default.nix b/pkgs/tools/misc/kalibrate-hackrf/default.nix new file mode 100644 index 00000000000..0bd6f573ead --- /dev/null +++ b/pkgs/tools/misc/kalibrate-hackrf/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fftw, hackrf, libusb1 }: + +stdenv.mkDerivation rec { + name = "kalibrate-hackrf-unstable-20160827"; + + # There are no tags/releases, so use the latest commit from git master. + # Currently, the latest commit is from 2016-07-03. + src = fetchFromGitHub { + owner = "scateu"; + repo = "kalibrate-hackrf"; + rev = "2492c20822ca6a49dce97967caf394b1d4b2c43e"; + sha256 = "1jvn1qx7csgycxpx1k804sm9gk5a0c65z9gh8ybp9awq3pziv0nx"; + }; + + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ fftw hackrf libusb1 ]; + + postInstall = '' + mv $out/bin/kal $out/bin/kal-hackrf + ''; + + meta = with stdenv.lib; { + description = "Calculate local oscillator frequency offset in hackrf devices"; + longDescription = '' + Kalibrate, or kal, can scan for GSM base stations in a given frequency + band and can use those GSM base stations to calculate the local + oscillator frequency offset. + + This package is for hackrf devices. + ''; + homepage = https://github.com/scateu/kalibrate-hackrf; + license = licenses.bsd2; + platforms = platforms.linux; + maintainers = [ maintainers.mog ]; + }; +} diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix new file mode 100644 index 00000000000..80b8457f07f --- /dev/null +++ b/pkgs/tools/misc/lf/default.nix @@ -0,0 +1,31 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "lf-unstable-${version}"; + version = "2016-10-02"; + + goPackagePath = "github.com/gokcehan/lf"; + + src = fetchFromGitHub { + owner = "gokcehan"; + repo = "lf"; + rev = "7a851f6c720380a6b9f715542906a56334e7e98b"; # nightly + sha256 = "0hdxcibly3algz0hgy65xr3dxchf4aarpxdgxsgc67m1knizksjr"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "A terminal file manager written in Go and heavily inspired by ranger"; + longDescription = '' + lf (as in "list files") is a terminal file manager written in Go. It is + heavily inspired by ranger with some missing and extra features. Some of + the missing features are deliberately omitted since it is better if they + are handled by external tools. + ''; + homepage = "https://godoc.org/github.com/gokcehan/lf"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix new file mode 100644 index 00000000000..ebd11853291 --- /dev/null +++ b/pkgs/tools/misc/lf/deps.nix @@ -0,0 +1,20 @@ +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "b6acae516ace002cb8105a89024544a1480655a5"; # master + sha256 = "0zf95qdd5bif9rw03hqk87x7d905p373bvsj0bl4gi16spqjbdil"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; # v0.0.1 + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } +] diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix index e8f3ccf747d..079e5c7a93b 100644 --- a/pkgs/tools/misc/logstash/default.nix +++ b/pkgs/tools/misc/logstash/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.3.4"; + version = "2.4.0"; name = "logstash-${version}"; src = fetchurl { url = "https://download.elasticsearch.org/logstash/logstash/logstash-${version}.tar.gz"; - sha256 = "10wm4f5ygzifk84c1n9yyj285ccn2zd2m61y6hyf6wirvhys0qkz"; + sha256 = "1k27hb6q1r26rp3y9pb2ry92kicw83mi352dzl2y4h0gbif46b32"; }; dontBuild = true; @@ -14,10 +14,22 @@ stdenv.mkDerivation rec { dontStrip = true; dontPatchShebangs = true; + buildInputs = [ + makeWrapper jre + ]; + installPhase = '' mkdir -p $out cp -r {Gemfile*,vendor,lib,bin} $out - mv $out/bin/plugin $out/bin/logstash-plugin + + wrapProgram $out/bin/logstash \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/rspec \ + --set JAVA_HOME "${jre}" + + wrapProgram $out/bin/logstash-plugin \ + --set JAVA_HOME "${jre}" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/man-db/default.nix b/pkgs/tools/misc/man-db/default.nix index 9724278b608..9c1dabc7584 100644 --- a/pkgs/tools/misc/man-db/default.nix +++ b/pkgs/tools/misc/man-db/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff }: +{ stdenv, fetchurl, pkgconfig, libpipeline, db, groff, makeWrapper }: stdenv.mkDerivation rec { name = "man-db-2.7.5"; @@ -11,9 +11,14 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" ]; outputMan = "out"; # users will want `man man` to work - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ libpipeline db groff ]; - troff="${groff}/bin/groff"; + + postPatch = '' + substituteInPlace src/man_db.conf.in \ + --replace "/usr/local/share" "/run/current-system/sw/share" \ + --replace "/usr/share" "/run/current-system/sw/share" + ''; configureFlags = [ "--disable-setuid" @@ -21,14 +26,14 @@ stdenv.mkDerivation rec { # Don't try /etc/man_db.conf by default, so we avoid error messages. "--with-config-file=\${out}/etc/man_db.conf" "--with-systemdtmpfilesdir=\${out}/lib/tmpfiles.d" - "--with-eqn=${groff}/bin/eqn" - "--with-neqn=${groff}/bin/neqn" - "--with-nroff=${groff}/bin/nroff" - "--with-pic=${groff}/bin/pic" - "--with-refer=${groff}/bin/refer" - "--with-tbl=${groff}/bin/tbl" ]; + postInstall = '' + for i in "$out/bin/"*; do + wrapProgram "$i" --prefix PATH : "${groff}/bin" + done + ''; + enableParallelBuilding = true; doCheck = true; diff --git a/pkgs/tools/misc/mandoc/default.nix b/pkgs/tools/misc/mandoc/default.nix new file mode 100644 index 00000000000..297d6557f5e --- /dev/null +++ b/pkgs/tools/misc/mandoc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, zlib }: + +stdenv.mkDerivation rec { + name = "mandoc-${version}"; + version = "1.13.4"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/snapshots/mdocml-${version}.tar.gz"; + sha256 = "1vz0g5nvjbz1ckrg9cn6ivlnb13bcl1r6nc4yzb7300qvfnw2m8a"; + }; + + buildInputs = [ zlib ]; + + configureLocal = '' + HAVE_WCHAR=1 + MANPATH_DEFAULT="/run/current-system/sw/share/man" + OSNAME="NixOS" + PREFIX="$out" + HAVE_MANPATH=1 + LD_OHASH="-lutil" + BUILD_DB=0 + ''; + + preConfigure = '' + echo $configureLocal > configure.local + ''; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "suite of tools compiling mdoc and man"; + license = licenses.bsd3; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix index 8616a40df43..e840aa15ec2 100644 --- a/pkgs/tools/misc/mc/default.nix +++ b/pkgs/tools/misc/mc/default.nix @@ -1,23 +1,28 @@ { stdenv, fetchurl, pkgconfig, glib, gpm, file, e2fsprogs -, libX11, libICE, perl, zip, unzip, gettext, slang}: +, libX11, libICE, perl, zip, unzip, gettext, slang, libssh2, openssl}: stdenv.mkDerivation rec { name = "mc-${version}"; - version = "4.8.17"; + version = "4.8.18"; src = fetchurl { - url = "http://www.midnight-commander.org/downloads/${name}.tar.bz2"; - sha256 = "0fvqzffppj0aja9hi0k1xdjg5m6s99immlla1y9yzn5fp8vwpl36"; + url = "http://www.midnight-commander.org/downloads/${name}.tar.xz"; + sha256 = "1kmysm1x7smxs9k483nin6bx1rx0av8xrqjx9yf73hc7r4anhqzp"; }; - buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs ]; + buildInputs = [ pkgconfig perl glib gpm slang zip unzip file gettext libX11 libICE e2fsprogs + libssh2 openssl ]; + + configureFlags = [ "--enable-vfs-smb" ]; meta = { description = "File Manager and User Shell for the GNU Project"; homepage = http://www.midnight-commander.org; + downloadPage = "http://www.midnight-commander.org/downloads/"; repositories.git = git://github.com/MidnightCommander/mc.git; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.sander ]; platforms = stdenv.lib.platforms.linux; + updateWalker = true; }; } diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 113b8b2b4ce..f67fd383f18 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer diff --git a/pkgs/tools/misc/mongodb-tools/deps.json b/pkgs/tools/misc/mongodb-tools/deps.json deleted file mode 100644 index c1cc7f96f75..00000000000 --- a/pkgs/tools/misc/mongodb-tools/deps.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/howeyc/gopass", - "fetch": { - "type": "git", - "url": "https://github.com/howeyc/gopass", - "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", - "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" - } - }, - { - "goPackagePath": "gopkg.in/mgo.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/mgo.v2", - "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a", - "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj" - } - }, - { - "goPackagePath": "gopkg.in/tomb.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/tomb.v2", - "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", - "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" - } - }, - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - } -] diff --git a/pkgs/tools/misc/mongodb-tools/deps.nix b/pkgs/tools/misc/mongodb-tools/deps.nix new file mode 100644 index 00000000000..437dcd64937 --- /dev/null +++ b/pkgs/tools/misc/mongodb-tools/deps.nix @@ -0,0 +1,47 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/mgo.v2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; + sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v2"; + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } +] diff --git a/pkgs/tools/misc/mysqltuner/default.nix b/pkgs/tools/misc/mysqltuner/default.nix new file mode 100644 index 00000000000..38cfa8b19cd --- /dev/null +++ b/pkgs/tools/misc/mysqltuner/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, perl }: + +stdenv.mkDerivation rec { + name = "mysqltuner-${version}"; + version = "1.6.18"; + + src = fetchFromGitHub { + owner = "major"; + repo = "MySQLTuner-perl"; + rev = version; + sha256 = "14dblrjqciyx6k7yczfzbaflc7hdxnj0kyy6q0lqfz8imszdkpi2"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin + install -m0755 mysqltuner.pl $out/bin/mysqltuner + ''; + + meta = with stdenv.lib; { + description = "Make recommendations for increased performance and stability of MariaDB/MySQL"; + homepage = http://mysqltuner.com; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; +} diff --git a/pkgs/tools/misc/nixbot/default.nix b/pkgs/tools/misc/nixbot/default.nix new file mode 100644 index 00000000000..6fb0b9c8201 --- /dev/null +++ b/pkgs/tools/misc/nixbot/default.nix @@ -0,0 +1,25 @@ +{ stdenv, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication rec { + name = "nixbot-unstable-2016-10-09"; + + src = fetchFromGitHub { + owner = "domenkozar"; + repo = "nixbot"; + rev = "dc490e4954cb08f0eff97f74ad39dedb54670aa9"; + sha256 = "1l8rlhd2b7x5m79vb2vgszachygasv0pk8drnwgxyvsn0k88xcan"; + }; + + propagatedBuildInputs = with python3Packages; [ + pygit2 pyramid waitress github3_py + ]; + + doCheck = false; + + meta = with stdenv.lib; { + desciption = "Github bot for reviewing/testing pull requests with the help of Hydra"; + maintainers = with maintainers; [ domenkozar fpletz globin ]; + license = licenses.asl20; + homepage = https://github.com/domenkozar/nixbot; + }; +} diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 7d9d5545f40..4655331dbc1 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -7,8 +7,8 @@ let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "769522753c25537e520adc322fa62e5390272add"; - sha256 = "0gfc8dl63xpmf73dwb1plj7cymq7z6w6wq5m06yx8jymwhq7x1l8"; + rev = "36396b49ad6636c9959f3dfac5e04d41584b1a92"; + sha256 = "146flrpzybm2s12wg05rnglnfd2f2jx3xzvns2pq28kvg09bgcfn"; }; bsdiff-src = fetchFromGitHub { @@ -17,15 +17,16 @@ let rev = "1edf9f656850c0c64dae260960fabd8249ea9c60"; sha256 = "1h71d2h2d3anp4msvpaff445rnzdxii3id2yglqk7af9i43kdsn1"; }; -in stdenv.mkDerivation rec { - rev = "v2016.5"; - name = "ostree-${rev}"; + + version = "2016.11"; +in stdenv.mkDerivation { + name = "ostree-${version}"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "ostreedev"; repo = "ostree"; - sha256 = "1dfyhzgv94ldjv2l4jxf4xhks2z5ljljqa3k579qskds755n6kvg"; + sha256 = "19xmg01mxdykx74r9ra11hc15qd1fjqbxdn23jrn2pcvz8dw9zgc"; }; nativeBuildInputs = [ @@ -43,6 +44,8 @@ in stdenv.mkDerivation rec { preConfigure = '' env NOCONFIGURE=1 ./autogen.sh + + configureFlags+="--with-systemdsystemunitdir=$out/lib/systemd/system" ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/pod2mdoc/default.nix b/pkgs/tools/misc/pod2mdoc/default.nix new file mode 100644 index 00000000000..0c96908401b --- /dev/null +++ b/pkgs/tools/misc/pod2mdoc/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "pod2mdoc-${version}"; + version = "0.0.10"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/pod2mdoc/snapshots/${name}.tgz"; + sha256 = "0nwa9zv9gmfi5ysz1wfm60kahc7nv0133n3dfc2vh2y3gj8mxr4f"; + }; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + install -m 0755 pod2mdoc $out/bin + install -m 0444 pod2mdoc.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "converter from POD into mdoc"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index f96e70650b7..3e2953c5733 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -1,35 +1,60 @@ { stdenv, fetchFromGitHub, ostree, rpm, which, autoconf, automake, libtool, pkgconfig, - libcap, glib, libgsystem, json_glib, libarchive, libhif, librepo, gtk_doc, elfutils, - libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: + libcap, glib, libgsystem, json_glib, libarchive, libsolv, librepo, gtk_doc, elfutils, + gperf, cmake, pcre, check, python, libxslt, docbook_xsl, docbook_xml_dtd_42, acl }: let libglnx-src = fetchFromGitHub { owner = "GNOME"; repo = "libglnx"; - rev = "85c9dd5c073a8c0d74c4baa2e4a94f5535984e62"; - sha256 = "08m8wxlkymwq5hsc26k7ndwiqiw1ggaaxyi2qfhqznasgbp4g623"; + rev = "4ae5e3beaaa674abfabf7404ab6fafcc4ec547db"; + sha256 = "1npb9zbyb4bl0nxqf0pcqankcwzs3k1x8i2wkdwhgak4qcvxvfqn"; }; -in stdenv.mkDerivation rec { - rev = "v2016.1"; - name = "rpm-ostree"; + + libdnf-src = fetchFromGitHub { + owner = "rpm-software-management"; + repo = "libhif"; + rev = "b69552b3b3a42fd41698a925d5f5f623667bac63"; + sha256 = "0h6k09rb4imzbmsn7mspwl0js2awqdpb4ysdqq550vw2nr0dzszr"; + }; + + version = "2016.10"; +in stdenv.mkDerivation { + name = "rpm-ostree-${version}"; src = fetchFromGitHub { - inherit rev; + rev = "v${version}"; owner = "projectatomic"; repo = "rpm-ostree"; - sha256 = "19jvnmy9zinx0j5nvy3h5abfv9d988kvyza09gljx16gll8qkbbf"; + sha256 = "0a0wwklzk1kvk3bbxxfvxgk4ck5dn7a7v32shqidb674fr2d5pvb"; }; buildInputs = [ - which autoconf automake pkgconfig libtool libcap ostree rpm glib libgsystem - json_glib libarchive libhif librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + which autoconf automake pkgconfig libtool libcap ostree rpm glib libgsystem gperf + json_glib libarchive libsolv librepo gtk_doc libxslt docbook_xsl docbook_xml_dtd_42 + cmake pcre check python # FIXME: get rid of this once libarchive properly propagates this acl ]; + dontUseCmakeConfigure = true; + prePatch = '' - rmdir libglnx + rmdir libglnx libdnf cp --no-preserve=mode -r ${libglnx-src} libglnx + cp --no-preserve=mode -r ${libdnf-src} libdnf + + # According to #cmake on freenode, libdnf should bundle the FindLibSolv.cmake module + cp ${libsolv}/share/cmake/Modules/FindLibSolv.cmake libdnf/cmake/modules/ + + # See https://github.com/projectatomic/rpm-ostree/issues/480 + substituteInPlace src/libpriv/rpmostree-unpacker.c --replace 'include ' "" + + # libdnf normally wants sphinx to build its hawkey manpages, but we don't care about those manpages since we don't use hawkey + substituteInPlace configure.ac --replace 'cmake \' 'cmake -DWITH_MAN=off \' + + # Let's not hardcode the rpm-gpg path... + substituteInPlace libdnf/libdnf/dnf-keyring.c \ + --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBDNF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"' ''; preConfigure = '' diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index 3b6b7bde08d..5a5d8df26ce 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests2 mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.3"; + version = "1.6"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0cnhv9a6vdrp2wmyl69fb1yklbx1x5pblsy4a5a36gwxmaill05k"; + sha256 = "12r4yazsxk09sampiz9j1jqgzm3136h5fgbbdaiwg43b0y1sjg3d"; }; pythonPaths = [ pycrypto requests2 ]; diff --git a/pkgs/tools/misc/texi2mdoc/default.nix b/pkgs/tools/misc/texi2mdoc/default.nix new file mode 100644 index 00000000000..2404ab9da89 --- /dev/null +++ b/pkgs/tools/misc/texi2mdoc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "texi2mdoc-${version}"; + version = "0.1.2"; + + src = fetchurl { + url = "http://mdocml.bsd.lv/texi2mdoc/snapshots/${name}.tgz"; + sha256 = "1zjb61ymwfkw6z5g0aqmsn6qpw895zdxv7fv3059gj3wqa3zsibs"; + }; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "http://mdocml.bsd.lv/"; + description = "converter from Texinfo into mdoc"; + license = licenses.isc; + platforms = platforms.all; + maintainers = with maintainers; [ ramkromberg ]; + }; +} diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix new file mode 100644 index 00000000000..5d43679b6fe --- /dev/null +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, expat, libaio, boost }: + +stdenv.mkDerivation rec { + name = "thin-provisioning-tools-${version}"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "jthornber"; + repo = "thin-provisioning-tools"; + rev = "v${version}"; + sha256 = "0glwhfzwj9afbqdv59ppgfqy7rik8m0vcap7279fpnvwpr1c2p5n"; + }; + + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ expat libaio boost ]; + + meta = with stdenv.lib; { + homepage = https://github.com/jthornber/thin-provisioning-tools/; + description = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ globin ]; + }; +} diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index ccecd819948..9052c5ce6d5 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { name = "tmux-${version}"; - version = "2.2"; + version = "2.3"; outputs = [ "out" "man" ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "04k9yxjp357sdw6365z6qx87vmwygl3v3wpvd78pp63ky5hzbbay"; + sha256 = "14c6iw0p3adz7w8jm42w9f3s1zph9is10cbwdjgh5bvifrhxrary"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/misc/tmuxp/default.nix b/pkgs/tools/misc/tmuxp/default.nix index 91a55694f85..3ca01d7e5eb 100644 --- a/pkgs/tools/misc/tmuxp/default.nix +++ b/pkgs/tools/misc/tmuxp/default.nix @@ -2,16 +2,23 @@ pythonPackages.buildPythonApplication rec { name = "tmuxp-${version}"; - version = "1.2.0"; + version = "1.2.2"; namePrefix = ""; src = fetchurl { url = "mirror://pypi/t/tmuxp/${name}.tar.gz"; - sha256 = "05z5ssv9glsqmcy9fdq06bawy1274dnzqsqd3a4z4jd0w6j09smn"; + sha256 = "1g37pdxs0wmnskqm7qsqm0ygwpc1dxk1d7lrzpgs717zxaak8vln"; }; - buildInputs = with pythonPackages; [ pytest ]; + patchPhase = '' + sed -i 's/==.*$//' requirements/test.txt + ''; + + buildInputs = with pythonPackages; [ + pytest + pytest-rerunfailures + ]; propagatedBuildInputs = with pythonPackages; [ click colorama kaptan libtmux diff --git a/pkgs/tools/misc/togglesg-download/default.nix b/pkgs/tools/misc/togglesg-download/default.nix index 14b9b1fcd9d..e945e560f1b 100644 --- a/pkgs/tools/misc/togglesg-download/default.nix +++ b/pkgs/tools/misc/togglesg-download/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchFromGitHub, buildPythonApplication, makeWrapper, ffmpeg_3 }: +{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, ffmpeg_3 }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "togglesg-download-git-${version}"; version = "2016-05-31"; diff --git a/pkgs/tools/misc/umlet/default.nix b/pkgs/tools/misc/umlet/default.nix index cc51af22f85..8ef357f65eb 100644 --- a/pkgs/tools/misc/umlet/default.nix +++ b/pkgs/tools/misc/umlet/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, jre, unzip }: stdenv.mkDerivation rec { - major = "13"; - minor = "3"; + major = "14"; + minor = "2"; version = "${major}.${minor}"; name = "umlet-${version}"; src = fetchurl { - url = "http://www.umlet.com/umlet_${major}_${minor}/umlet_${version}.zip"; - sha256 = "0fbr51xknk98qz576lcl25qz0s1snns2yb0j54d77xkw7pnxmvzr"; + url = "http://www.umlet.com/umlet_${major}_${minor}/umlet-standalone-${version}.zip"; + sha256 = "1fcc7ms92vcc4b8jh56bd3zrqdb0bwhbbzdxycc952fb0j6m62fw"; }; buildInputs = [ unzip ]; diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index d02e2865c8f..ff8e7873839 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -19,5 +19,5 @@ buildGoPackage rec { sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/misc/upower-notify/deps.json b/pkgs/tools/misc/upower-notify/deps.json deleted file mode 100644 index 96db25d0c7d..00000000000 --- a/pkgs/tools/misc/upower-notify/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/godbus/dbus", - "fetch": { - "type": "git", - "url": "https://github.com/godbus/dbus", - "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15", - "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3" - } - } -] diff --git a/pkgs/tools/misc/upower-notify/deps.nix b/pkgs/tools/misc/upower-notify/deps.nix new file mode 100644 index 00000000000..8a729857b81 --- /dev/null +++ b/pkgs/tools/misc/upower-notify/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/godbus/dbus"; + fetch = { + type = "git"; + url = "https://github.com/godbus/dbus"; + rev = "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15"; + sha256 = "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3"; + }; + } +] diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index 51762006b62..998679e15eb 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchurl, pythonPackages, glibcLocales }: +{ stdenv, fetchurl, python3Packages, glibcLocales }: # Packaging documentation at: # https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst +let + pythonPackages = python3Packages; +in pythonPackages.buildPythonApplication rec { - version = "0.11.3"; + version = "0.13.1"; name = "vdirsyncer-${version}"; src = fetchurl { url = "mirror://pypi/v/vdirsyncer/${name}.tar.gz"; - sha256 = "10majl58vdpxgbddjqgwblvl7akvvr4c2c8iaxnf3kgyh01jq6k9"; + sha256 = "1c4kipcc7dx1rn5j1a1x7wckz09mm9ihwakf3ramwn1y78q5zanb"; }; propagatedBuildInputs = with pythonPackages; [ diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 56d16fbd905..408879a4534 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.gpl3; homepage = http://www.linux-mtd.infradead.org/; maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + platforms = stdenv.lib.platforms.x86_64; }; } diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix index 197b92295a8..79565af8e92 100644 --- a/pkgs/tools/misc/xclip/default.nix +++ b/pkgs/tools/misc/xclip/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchsvn, xlibsWrapper, libXmu, autoreconfHook }: +{ stdenv, fetchFromGitHub, autoreconfHook, libXmu }: stdenv.mkDerivation rec { - # The last release from 2012, 0.12, lacks '-targets' - name = "xclip-0.12-svn-20140209"; + name = "xclip-${version}"; + version = "0.13"; - src = fetchsvn { - url = "svn://svn.code.sf.net/p/xclip/code/trunk"; - rev = "87"; - sha256 = "1rbcdgr73916wvzfgqjs1jhgzk8qs1yw2iiqy7ifrkjafhi37w6b"; + src = fetchFromGitHub { + owner = "astrand"; + repo = "xclip"; + rev = version; + sha256 = "0q0hmvcjlv8arhh1pzhja2wglyj6n7z209jnpnzd281kqqv4czcs"; }; - buildInputs = [ xlibsWrapper libXmu autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; + + buildInputs = [ libXmu ]; meta = { description = "Tool to access the X clipboard from a console application"; - homepage = http://sourceforge.net/projects/xclip/; + homepage = https://github.com/astrand/xclip; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix index 1f4dbc86332..8a411d89da5 100644 --- a/pkgs/tools/misc/xdummy/default.nix +++ b/pkgs/tools/misc/xdummy/default.nix @@ -74,7 +74,6 @@ let in writeScriptBin "xdummy" '' #!${stdenv.shell} - export XKB_BINDIR="${xorg.xkbcomp}/bin" exec ${xorg.xorgserver.out}/bin/Xorg \ -noreset \ -logfile /dev/null \ diff --git a/pkgs/tools/misc/xdxf2slob/default.nix b/pkgs/tools/misc/xdxf2slob/default.nix new file mode 100644 index 00000000000..b5c3f937145 --- /dev/null +++ b/pkgs/tools/misc/xdxf2slob/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + name = "xdxf2slob-unstable-2015-06-30"; + + src = fetchFromGitHub { + owner = "itkach"; + repo = "xdxf2slob"; + rev = "6831b93c3db8c73200900fa4ddcb17350a677e1b"; + sha256 = "0m3dnc3816ja3kmik1wabb706dkqdf5sxvabwgf2rcrq891xcddd"; + }; + + propagatedBuildInputs = [ python3Packages.PyICU python3Packages.slob ]; + + meta = with stdenv.lib; { + description = "Tool to convert XDXF dictionary files to slob format"; + homepage = https://github.com/itkach/xdxf2slob/; + license = licenses.gpl3; + maintainer = [ maintainers.rycee ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/tools/misc/xflux/gui.nix b/pkgs/tools/misc/xflux/gui.nix index 0cf30942e73..1fd3b3d8371 100644 --- a/pkgs/tools/misc/xflux/gui.nix +++ b/pkgs/tools/misc/xflux/gui.nix @@ -1,40 +1,40 @@ -{ stdenv, pkgs, fetchFromGitHub, buildPythonPackage, - pexpect, - pyGtkGlade, - pygobject, - pyxdg, - gnome_python, +{ stdenv, fetchFromGitHub, pythonPackages +, gnome_python +, libappindicator-gtk2, xflux, librsvg, wrapGAppsHook }: -buildPythonPackage rec { - version = "1.1.1"; +pythonPackages.buildPythonApplication rec { name = "xflux-gui-${version}"; + version = "2016-09-21"; src = fetchFromGitHub { repo = "xflux-gui"; owner = "xflux-gui"; - rev = "d897dfd"; - sha256 = "1mx1r2hz3g3waafn4w8hql0gaasfizbzz60bk5llw007k4k8892r"; + rev = "0b56204477494b473a390e8b0db043437ec14f32"; + sha256 = "15pr8f31jnhqjlpvasnj6cmm6hw5gljphh2pxzav3zd9bp4yl56r"; }; - # remove messing with shipped binary - patches = [ ./setup.patch ]; - - # not sure if these need to be propagated or not? - propagatedBuildInputs = [ + propagatedBuildInputs = with pythonPackages; [ pexpect pyGtkGlade - pygobject + pygobject2 pyxdg - pkgs.libappindicator-gtk2 + libappindicator-gtk2 gnome_python ]; - buildInputs = [ - pkgs.xflux - ]; + buildInputs = [ xflux librsvg ]; + + nativeBuildInputs = [ wrapGAppsHook ]; postPatch = '' - substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${pkgs.xflux}/bin/xflux\"" + substituteInPlace src/fluxgui/xfluxcontroller.py --replace "pexpect.spawn(\"xflux\"" "pexpect.spawn(\"${xflux}/bin/xflux\"" + ''; + + postFixup = '' + wrapGAppsHook + makeWrapperArgs="''${gappsWrapperArgs[@]}" + wrapPythonPrograms + patchPythonScript $out/${pythonPackages.python.sitePackages}/fluxgui/fluxapp.py ''; meta = { diff --git a/pkgs/tools/misc/xflux/setup.patch b/pkgs/tools/misc/xflux/setup.patch deleted file mode 100644 index c36f81f7d80..00000000000 --- a/pkgs/tools/misc/xflux/setup.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/setup.py b/setup.py -index e11f199..b1cb0e5 100644 ---- a/setup.py -+++ b/setup.py -@@ -4,13 +4,6 @@ from distutils.core import setup - from sys import maxsize - from os import rename - --# Determines which is the appropriate executable for 32-bit --if maxsize == 2147483647: -- rename("xflux32", "xflux") --# ... or 64-bit processors --elif maxsize == 9223372036854775807: -- rename("xflux64", "xflux") -- - setup(name = "f.lux indicator applet", - version = "1.1.8", - description = "f.lux indicator applet - better lighting for your computer", -@@ -22,8 +15,7 @@ setup(name = "f.lux indicator applet", - packages = ["fluxgui",], - package_data = {"fluxgui" : ["*.glade"] }, - data_files=[('share/icons/hicolor/scalable/apps', ['fluxgui.svg', 'fluxgui-light.svg', 'fluxgui-dark.svg']), -- ('share/applications', ['desktop/fluxgui.desktop']), -- ('bin', ['xflux']),], -+ ('share/applications', ['desktop/fluxgui.desktop']),], - scripts = ["fluxgui"], - long_description = """f.lux indicator applet is an indicator applet to - control xflux, an application that makes the color of your computer's diff --git a/pkgs/tools/misc/xsel/default.nix b/pkgs/tools/misc/xsel/default.nix index b95b95e4379..0b78b9a0647 100644 --- a/pkgs/tools/misc/xsel/default.nix +++ b/pkgs/tools/misc/xsel/default.nix @@ -1,15 +1,29 @@ -{stdenv, fetchurl, xlibsWrapper}: +{stdenv, lib, fetchFromGitHub, libX11, autoreconfHook }: -stdenv.mkDerivation { - name = "xsel-1.2.0"; - src = fetchurl { - url = http://www.vergenet.net/~conrad/software/xsel/download/xsel-1.2.0.tar.gz; - sha256 = "070lbcpw77j143jrbkh0y1v10ppn1jwmjf92800w7x42vh4cw9xr"; +stdenv.mkDerivation rec { + name = "xsel-unstable-${version}"; + + version = "2016-09-02"; + + src = fetchFromGitHub { + owner = "kfish"; + repo = "xsel"; + rev = "aa7f57eed805adb09e9c59c8ea841870e8206b81"; + sha256 = "04mrc8j0rr7iy1k6brfxnx26pmxm800gh4nqrxn6j2lz6vd5y9m5"; }; - buildInputs = [xlibsWrapper]; + buildInputs = [ libX11 autoreconfHook ]; - meta = { - platforms = stdenv.lib.platforms.unix; + # We need a README file, otherwise autoconf complains. + postUnpack = '' + mv $sourceRoot/README{.md,} + ''; + + meta = with lib; { + description = "Command-line program for getting and setting the contents of the X selection"; + homepage = "http://www.kfish.org/software/xsel"; + license = licenses.mit; + maintainers = [ maintainers.cstrahan ]; + platforms = lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/xtitle/default.nix b/pkgs/tools/misc/xtitle/default.nix index 600f40a67b7..4be86399390 100644 --- a/pkgs/tools/misc/xtitle/default.nix +++ b/pkgs/tools/misc/xtitle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libxcb, xcbutil, xcbutilwm, git }: stdenv.mkDerivation rec { - name = "xtitle-0.2"; + name = "xtitle-0.3"; src = fetchurl { - url = "https://github.com/baskerville/xtitle/archive/0.2.tar.gz"; - sha256 = "1wyhfwbwqnq4rn6i789gydxlg25ylc37xjrkq758bp55sdgb8fk2"; + url = "https://github.com/baskerville/xtitle/archive/0.3.tar.gz"; + sha256 = "07r36f4ad1q0dpkx3ykd49xlmi24d8mjqwh40j228k81wsvzayl1"; }; diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix index 838831faaaf..c33f09529a5 100644 --- a/pkgs/tools/misc/xvfb-run/default.nix +++ b/pkgs/tools/misc/xvfb-run/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { chmod a+x $out/bin/xvfb-run wrapProgram $out/bin/xvfb-run \ - --set XKB_BINDIR "${xkbcomp}/bin" \ --set FONTCONFIG_FILE "${fontsConf}" \ --prefix PATH : ${stdenv.lib.makeBinPath [ getopt xorgserver xauth which utillinux gawk coreutils ]} ''; diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix index c6efac3ffe6..a7f2d445bca 100644 --- a/pkgs/tools/misc/yle-dl/default.nix +++ b/pkgs/tools/misc/yle-dl/default.nix @@ -2,20 +2,17 @@ stdenv.mkDerivation rec { name = "yle-dl-${version}"; - version = "2.9.1"; + version = "2.11"; src = fetchFromGitHub { owner = "aajanki"; repo = "yle-dl"; rev = version; - sha256 = "1irpcp9iw2cw85sj1kzndmrw8350p9q7cfghjx2xkh2czk9k7whq"; + sha256 = "1fa2a25j3wwk3m6q1alilklwhqf337ch8rj6bwricc5zqb58qivc"; }; patchPhase = '' substituteInPlace yle-dl --replace '/usr/local/share/' "$out/share/" - - # HACK: work around https://github.com/NixOS/nixpkgs/issues/9593 - substituteInPlace yle-dl --replace '/usr/bin/env python2' '/usr/bin/env python' ''; buildInputs = [ pythonPackages.wrapPython ]; diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index a4f837bf833..3f07ed87433 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 = "2016.07.16"; + version = "2016.10.07"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "017x2hqc2bacypjmn9ac9f91y9y6afydl0z7dich5l627494hvfg"; + sha256 = "56be6107275cbdc867e89caf9d20f351d184fdc4fb06d915945fef708086dbce"; }; buildInputs = [ makeWrapper zip ] ++ optional generateManPage pandoc; diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 105ddd1552f..19e87d3a88b 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "aria2-${version}"; - version = "1.26.1"; + version = "1.27.1"; src = fetchFromGitHub { owner = "aria2"; repo = "aria2"; rev = "release-${version}"; - sha256 = "1nf7z55cc6ljpz7zzb8ppg8ybg531gfbhyggya7lnr5ka74h87b5"; + sha256 = "003m80gdcqfxi5jjzwiszql5y8lrj7a59gjygy0ya72fa9j4l9mi"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix new file mode 100644 index 00000000000..6f7e4ba4b69 --- /dev/null +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, jre }: + +let + version = "1.7.06"; + jar = fetchurl { + name = "burpsuite.jar"; + url = "https://portswigger.net/Burp/Releases/Download?productId=100&version=${version}&type=Jar"; + sha256 = "13x3x0la2jmm7zr66mvczzlmsy1parfibnl9s4iwi1nls4ikv7kl"; + }; + launcher = '' + #!${stdenv.shell} + exec ${jre}/bin/java -jar ${jar} "$@" + ''; +in stdenv.mkDerivation { + name = "burpsuite-${version}"; + buildCommand = '' + mkdir -p $out/bin + echo "${launcher}" > $out/bin/burpsuite + chmod +x $out/bin/burpsuite + ''; + + meta = { + description = "An integrated platform for performing security testing of web applications"; + longDescription = '' + Burp Suite is an integrated platform for performing security testing of web applications. + Its various tools work seamlessly together to support the entire testing process, from + initial mapping and analysis of an application's attack surface, through to finding and + exploiting security vulnerabilities. + ''; + homepage = "https://portswigger.net/burp/"; + downloadPage = "https://portswigger.net/burp/freedownload"; + license = [ stdenv.lib.licenses.unfree ]; + preferLocalBuild = true; + platforms = jre.meta.platforms; + hydraPlatforms = []; + maintainers = [ stdenv.lib.maintainers.bennofs ]; + }; +} diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index f5b5893d543..d405d08e0ab 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { name = "chrony-${version}"; - version = "2.3"; + version = "2.4"; src = fetchurl { url = "http://download.tuxfamily.org/chrony/${name}.tar.gz"; - sha256 = "1cncjapm98hv1nyrqlanjpz8k5ny6rp4vnf0gjl0zyqj619gpgsq"; + sha256 = "07rrys5axrz4grfy7fj3ds0r9ny1qcwiswsb2318jciklb6yf14d"; }; buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap; diff --git a/pkgs/tools/networking/connman-notify/default.nix b/pkgs/tools/networking/connman-notify/default.nix index 4f70888fca6..42b0c37411c 100644 --- a/pkgs/tools/networking/connman-notify/default.nix +++ b/pkgs/tools/networking/connman-notify/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ pythonPackages.python pythonPackages.dbus-python - pythonPackages.pygobject + pythonPackages.pygobject2 pythonPackages.pygtk pythonPackages.notify ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Desktop notification integration for connman"; homepage = https://github.com/wavexx/connman-notify; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; } diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index c9380761f9f..565892181e4 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -4,10 +4,10 @@ stdenv.mkDerivation rec { name = "connman-${version}"; - version = "1.32"; + version = "1.33"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${name}.tar.xz"; - sha256 = "0k4kw2j78gwxf0rq79a099qkzl6wi4v5i7rfs4rn0si0fd68d19i"; + sha256 = "187mknq2i907gf8dz0i79359gn1qc9mryvqkcgb280d7dw1ld2dw"; }; buildInputs = [ openconnect polkit @@ -51,10 +51,9 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Provides a daemon for managing internet connections"; - homepage = "https://connman.net/"; + description = "A daemon for managing internet connections"; + homepage = https://connman.net/; maintainers = [ maintainers.matejc ]; - # tested only on linux, might work on others also platforms = platforms.linux; license = licenses.gpl2; }; diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix deleted file mode 100644 index c3c16cc08b4..00000000000 --- a/pkgs/tools/networking/curl/7.15.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv, fetchurl -, zlibSupport ? false, zlib ? null -, sslSupport ? false, openssl ? null -, scpSupport ? false, libssh2 ? null -, gssSupport ? false, gss ? null -, c-aresSupport ? false, c-ares ? null -, linkStatic ? false -}: - -assert zlibSupport -> zlib != null; -assert sslSupport -> openssl != null; -assert scpSupport -> libssh2 != null; -assert c-aresSupport -> c-ares != null; - -stdenv.mkDerivation rec { - name = "curl-7.15.0"; - - src = fetchurl { - url = "http://curl.haxx.se/download/archeology/${name}.tar.gz"; - sha256 = "061bgjm6rv0l9804vmm4jvr023l52qvmy9qq4zjv4lgqhlljvhz3"; - }; - - patches = [ ./disable-ca-install.patch ]; - - # Zlib and OpenSSL must be propagated because `libcurl.la' contains - # "-lz -lssl", which aren't necessary direct build inputs of - # applications that use Curl. - propagatedBuildInputs = with stdenv.lib; - optional zlibSupport zlib ++ - optional gssSupport gss ++ - optional c-aresSupport c-ares ++ - optional sslSupport openssl; - - preConfigure = '' - sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure - ''; - - configureFlags = [ - "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" - ( if sslSupport then "--with-ssl=${openssl.dev}" else "--without-ssl" ) - ( if scpSupport then "--with-libssh2=${libssh2.dev}" else "--without-libssh2" ) - ] - ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" - ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] - ; - - dontDisableStatic = linkStatic; - - LDFLAGS = if linkStatic then "-static" else ""; - CXX = "g++"; - CXXCPP = "g++ -E"; - - # libtool hack to get a static binary. Notice that to 'configure' I passed - # other LDFLAGS, because it doesn't use libtool for linking in the tests. - makeFlags = if linkStatic then "LDFLAGS=-all-static" else ""; - - crossAttrs = { - # We should refer to the cross built openssl - # For the 'urandom', maybe it should be a cross-system option - configureFlags = [ - ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) - "--with-random /dev/urandom" - ] - ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] - ; - }; - - passthru = { - inherit sslSupport openssl; - }; - - meta = { - homepage = "http://curl.haxx.se/"; - description = "A command line tool for transferring files with URL syntax"; - platforms = with stdenv.lib.platforms; allBut darwin; - broken = true; - }; -} diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 58f72615e8e..958bea34e7d 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null; assert c-aresSupport -> c-ares != null; stdenv.mkDerivation rec { - name = "curl-7.50.1"; + name = "curl-7.50.3"; src = fetchurl { url = "http://curl.haxx.se/download/${name}.tar.bz2"; - sha256 = "0mjidq4q0hikhis2d35kzkhx6xfcgl875mk5ph5d98fa9kswa4iw"; + sha256 = "1v6q83qsrf7dgp3y5fa5vkppgqyy82pnsk8z9b4047b6fvclfwvv"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 748e28407b2..37226d3dd7b 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, openssl, libxml2, boost }: stdenv.mkDerivation rec { - name = "davix-0.4.0"; + name = "davix-0.6.4"; buildInputs = [ stdenv pkgconfig cmake openssl libxml2 boost ]; src = fetchFromGitHub { owner = "cern-it-sdc-id"; repo = "davix"; - rev = "R_0_4_0-1"; - sha256 = "0i6ica7rmpc3hbybjql5mr500cd43w4qzc69cj1djkc6bqqb752v"; + rev = "R_0_6_4"; + sha256 = "10hg7rs6aams96d4ghldgkrrnikskdpmn8vy6hj5j0s17a2yms6q"; }; diff --git a/pkgs/tools/networking/dd-agent/default.nix b/pkgs/tools/networking/dd-agent/default.nix index 9f933cc9709..0e12c50d154 100644 --- a/pkgs/tools/networking/dd-agent/default.nix +++ b/pkgs/tools/networking/dd-agent/default.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation rec { python unzip makeWrapper + pythonPackages.requests2 pythonPackages.psycopg2 pythonPackages.psutil pythonPackages.ntplib pythonPackages.simplejson pythonPackages.pyyaml - pythonPackages.requests pythonPackages.pymongo pythonPackages.docker ]; diff --git a/pkgs/tools/networking/dhcp/default.nix b/pkgs/tools/networking/dhcp/default.nix index c3cdaffcc27..e7a593ff830 100644 --- a/pkgs/tools/networking/dhcp/default.nix +++ b/pkgs/tools/networking/dhcp/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl, file, nettools, iputils, iproute, makeWrapper -, coreutils, gnused, bind, openldap ? null +, coreutils, gnused, openldap ? null }: stdenv.mkDerivation rec { name = "dhcp-${version}"; - version = "4.3.3"; - + version = "4.3.4"; + src = fetchurl { url = "http://ftp.isc.org/isc/dhcp/${version}/${name}.tar.gz"; - sha256 = "1pjy4lylx7dww1fp2mk5ikya5vxaf97z70279j81n74vn12ljg2m"; + sha256 = "0zk0imll6bfyp9p4ndn8h6s4ifijnw5bhixswifr5rnk7pp5l4gm"; }; patches = @@ -23,21 +23,9 @@ stdenv.mkDerivation rec { ./set-hostname.patch ]; - # Fixes "socket.c:591: error: invalid application of 'sizeof' to - # incomplete type 'struct in6_pktinfo'". See - # http://www.mail-archive.com/blfs-book@linuxfromscratch.org/msg13013.html - # - # Also adds the ability to run dhcpd as a non-root user / group - NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE -DPARANOIA"; - - # It would automatically add -Werror, which disables build in gcc 4.4 - # due to an uninitialized variable. - CFLAGS = "-g -O2 -Wall"; - - buildInputs = [ perl makeWrapper openldap bind ]; + buildInputs = [ perl makeWrapper openldap ]; configureFlags = [ - "--with-libbind=${bind.dev}" "--enable-failover" "--enable-execute" "--enable-tracing" diff --git a/pkgs/tools/networking/fastd/default.nix b/pkgs/tools/networking/fastd/default.nix new file mode 100644 index 00000000000..3a99adb4a9e --- /dev/null +++ b/pkgs/tools/networking/fastd/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, cmake, bison, pkgconfig +, libuecc, libsodium, libcap, json_c }: + +stdenv.mkDerivation rec { + version = "18"; + name = "fastd-${version}"; + + src = fetchgit { + url = "git://git.universe-factory.net/fastd"; + rev = "refs/tags/v${version}"; + sha256 = "0c9v3igv3812b3jr7jk75a2np658yy00b3i4kpbpdjgvqzc1jrq8"; + }; + + nativeBuildInputs = [ pkgconfig bison cmake ]; + buildInputs = [ libuecc libsodium libcap json_c ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Fast and Secure Tunneling Daemon"; + homepage = https://projects.universe-factory.net/projects/fastd/wiki; + license = with licenses; [ bsd2 bsd3 ]; + platforms = platforms.linux; + maintainers = with maintainers; [ fpletz ]; + }; +} diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix index 2eea08b9238..732051d8ec7 100644 --- a/pkgs/tools/networking/flannel/default.nix +++ b/pkgs/tools/networking/flannel/default.nix @@ -1,8 +1,10 @@ { stdenv, lib, buildGoPackage, fetchFromGitHub }: +with lib; + buildGoPackage rec { name = "flannel-${version}"; - version = "0.5.5"; + version = "0.6.2"; rev = "v${version}"; goPackagePath = "github.com/coreos/flannel"; @@ -13,6 +15,14 @@ buildGoPackage rec { inherit rev; owner = "coreos"; repo = "flannel"; - sha256 = "19nrilcc41411rag2qm22vdna4kpqm933ry9m82wkd7sqzb50fpw"; + sha256 = "03l0zyv9ajda70zw7jgwlmilw26h849jbb9f4slbycphhvbmpvb9"; + }; + + meta = { + description = "Network fabric for containers, designed for Kubernetes"; + license = licenses.asl20; + homepage = https://github.com/coreos/flannel; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; }; } diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 6f280257692..9ffb9a31183 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, buildPythonApplication }: +{ stdenv, fetchurl, pythonPackages }: -buildPythonApplication rec { - version = "4.50.0"; +pythonPackages.buildPythonApplication rec { + version = "4.51.0"; name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "1hcb5079mkcx3gglfycrhglrgg4jsa499br50yjrh9sal6wpgg7w"; + sha256 = "1nzdjm62lrg7qbh8xz2irj9wxf2861s3ld6zd5fbcgpjy3v588mw"; }; doCheck = false; diff --git a/pkgs/tools/networking/gftp/default.nix b/pkgs/tools/networking/gftp/default.nix index 2b5aae72de4..b122f532630 100644 --- a/pkgs/tools/networking/gftp/default.nix +++ b/pkgs/tools/networking/gftp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, readline, ncurses, gettext, openssl, pkgconfig }: +{ stdenv, fetchurl, gtk2, readline, ncurses, gettext, openssl, pkgconfig }: stdenv.mkDerivation { name = "gftp-2.0.19"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1z8b26n23k0sjbxgrix646b06cnpndpq7cbcj0ilsvvdx5ms81jk"; }; - buildInputs = [ gtk readline ncurses gettext openssl pkgconfig ]; + buildInputs = [ gtk2 readline ncurses gettext openssl pkgconfig ]; meta = { description = "GTK+-based FTP client"; diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix index 4ccd09ac555..72efc703b10 100644 --- a/pkgs/tools/networking/gmvault/default.nix +++ b/pkgs/tools/networking/gmvault/default.nix @@ -1,19 +1,19 @@ -{ pkgs, fetchurl, buildPythonApplication, pythonPackages }: +{ pkgs, fetchurl, pythonPackages }: -buildPythonApplication rec { - version = "1.8.1-beta"; +pythonPackages.buildPythonApplication rec { + version = "1.9.1"; name = "gmvault-${version}"; src = fetchurl { url = "https://bitbucket.org/gaubert/gmvault-official-download/downloads/gmvault-v${version}-src.tar.gz"; name = "${name}.tar.bz"; - sha256 = "0b575cnrd6jzcpa05mbn2swzcy0r9ck09pkhs4ydj6d3ir52j80c"; + sha256 = "0ffp8df3gdf6lf3pj75hzsmxmvmscppb6bjda58my1n4ppxp1rji"; }; doCheck = false; propagatedBuildInputs = with pythonPackages; [ gdata IMAPClient Logbook - argparse ]; + argparse chardet ]; startScript = ./gmvault.py; diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix deleted file mode 100644 index 85f94ccba10..00000000000 --- a/pkgs/tools/networking/host/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ fetchurl, stdenv }: - -let version = "20000331"; in - -stdenv.mkDerivation { - name = "host-${version}"; - - src = fetchurl { - url = "mirror://debian/pool/main/h/host/host_${version}.orig.tar.gz"; - sha256 = "1g352k80arhwyidsa95nk28xjvzyypmwv3kga2451m3g7fmdqki1"; - }; - - preConfigure = '' - makeFlagsArray=(DESTBIN=$out/bin DESTMAN=$out/share/man OWNER=$(id -u) GROUP=$(id -g)) - mkdir -p "$out/bin" - mkdir -p "$out/share/man/man1" - ''; - - installTargets = "install man"; - - meta = { - description = "DNS resolution utility"; - license = "BSD-style"; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/tools/networking/hping/default.nix b/pkgs/tools/networking/hping/default.nix index 23322d5b8f2..4b14c9db963 100644 --- a/pkgs/tools/networking/hping/default.nix +++ b/pkgs/tools/networking/hping/default.nix @@ -40,10 +40,11 @@ stdenv.mkDerivation rec { ln -vs hping3.8.gz "$out/share/man/man8/hping2.8.gz" ''; - meta = { + meta = with stdenv.lib; { description = "A command-line oriented TCP/IP packet assembler/analyzer"; homepage = "http://www.hping.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl2; + platforms = platforms.all; + broken = stdenv.isDarwin; }; } diff --git a/pkgs/tools/networking/htpdate/default.nix b/pkgs/tools/networking/htpdate/default.nix new file mode 100644 index 00000000000..10ed8f34e3a --- /dev/null +++ b/pkgs/tools/networking/htpdate/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, coreutils, binutils }: + +stdenv.mkDerivation rec { + version = "1.1.3"; + name = "htpdate-${version}"; + + src = fetchurl { + url = "http://twekkel.home.xs4all.nl/htp/htpdate-${version}.tar.gz"; + sha256 = "0hfg4qrsmpqw03m9qwf3zgi4brbf65w6wd3w30nkamc7x8b4vn5i"; + }; + + installFlags = [ + "INSTALL=${coreutils}/bin/install" + "STRIP=${binutils}/bin/strip" + "prefix=$(out)" + ]; + + meta = { + description = "Utility to fetch time and set the system clock over HTTP"; + homepage = http://www.vervest.org/htp/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/tools/networking/httpstat/default.nix b/pkgs/tools/networking/httpstat/default.nix new file mode 100644 index 00000000000..49f71f44805 --- /dev/null +++ b/pkgs/tools/networking/httpstat/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, curl, python, pythonPackages, ... }: + +pythonPackages.buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "httpstat"; + version = "1.2.0"; + src = fetchFromGitHub { + owner = "reorx"; + repo = pname; + rev = "${version}"; + sha256 = "1zfbv3fz3g3wwvsgrcyrk2cp7pjhkpf7lmx57ry9b43c62gcd7yh"; + }; + doCheck = false; + propagatedBuildInputs = [ ]; + runtimeDeps = [ curl ]; + + installPhase = '' + mkdir -p $out/${python.sitePackages}/ + cp httpstat.py $out/${python.sitePackages}/ + mkdir -p $out/bin + ln -s $out/${python.sitePackages}/httpstat.py $out/bin/httpstat + chmod +x $out/bin/httpstat + ''; + + meta = { + description = "curl statistics made simple"; + homepage = https://github.com/reorx/httpstat; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ nequissimus ]; + }; + } diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 1963454f142..4f9e8b045b0 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -1,23 +1,18 @@ -{ stdenv, fetchurl, gnutls33, autoreconfHook }: +{ stdenv, fetchurl, gnutls, autoreconfHook, pkgconfig, libite, libconfuse }: let - version = "1.99.15"; + version = "2.0"; in stdenv.mkDerivation { name = "inadyn-${version}"; src = fetchurl { - url = "https://github.com/troglobit/inadyn/releases/download/${version}/inadyn-${version}.tar.xz"; - sha256 = "05f7k9wpr0fn44y0pvdrv8xyilygmq3kjhvrwlj6dgg9ackdhkmm"; + url = "https://github.com/troglobit/inadyn/releases/download/v${version}/inadyn-${version}.tar.xz"; + sha256 = "16nmbxj337vkqkk6f7vx7fa8mczjv6dl3ybaxy16c23h486y0mzh"; }; - preConfigure = '' - export makeFlags=prefix=$out - ''; - - buildInputs = [ gnutls33 autoreconfHook ]; - - NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ gnutls libite libconfuse ]; meta = { homepage = http://inadyn.sourceforge.net/; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 79566f12901..59699076a3a 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -1,26 +1,34 @@ -{ stdenv, lib, fetchurl, python2Packages }: +{ stdenv, lib, fetchurl, python2Packages, gettext }: python2Packages.buildPythonApplication rec { name = "LinkChecker-${version}"; version = "9.3"; - # LinkChecker 9.3 only works with requests 2.9.x - propagatedBuildInputs = with python2Packages ; [ requests2 ]; + buildInputs = with python2Packages ; [ pytest ]; + propagatedBuildInputs = with python2Packages ; [ requests2 ] ++ [ gettext ]; src = fetchurl { url = "mirror://pypi/L/LinkChecker/${name}.tar.gz"; sha256 = "0v8pavf0bx33xnz1kwflv0r7lxxwj7vg3syxhy2wzza0wh6sc2pf"; }; - # upstream refuses to support ignoring robots.txt + # 1. upstream refuses to support ignoring robots.txt + # 2. work around requests2 version detection - can be dropped >v9.3 patches = [ ./add-no-robots-flag.patch + ./no-version-check.patch ]; postInstall = '' rm $out/bin/linkchecker-gui ''; + checkPhase = '' + # the mime test fails for me... + rm tests/test_mimeutil.py + make test PYTESTOPTS="--tb=short" TESTS="tests/test_*.py tests/logger/test_*.py" + ''; + meta = { description = "Check websites for broken links"; homepage = "https://wummel.github.io/linkchecker/"; diff --git a/pkgs/tools/networking/linkchecker/no-version-check.patch b/pkgs/tools/networking/linkchecker/no-version-check.patch new file mode 100644 index 00000000000..49b674f3735 --- /dev/null +++ b/pkgs/tools/networking/linkchecker/no-version-check.patch @@ -0,0 +1,14 @@ +diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py +--- a/linkcheck/__init__.py 2014-07-16 13:34:58.000000000 +0800 ++++ b/linkcheck/__init__.py 2016-10-11 10:42:08.914085950 +0800 +@@ -26,8 +26,8 @@ + sys.version_info < (2, 7, 2, 'final', 0)): + raise SystemExit("This program requires Python 2.7.2 or later.") + import requests +-if requests.__version__ <= '2.2.0': +- raise SystemExit("This program requires Python requests 2.2.0 or later.") ++#if requests.__version__ <= '2.2.0': ++# raise SystemExit("This program requires Python requests 2.2.0 or later.") + + import os + # add the custom linkcheck_dns directory to sys.path diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix index 77c71f38331..9fe4b4421a7 100644 --- a/pkgs/tools/networking/modemmanager/default.nix +++ b/pkgs/tools/networking/modemmanager/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, udev, libgudev, polkit, dbus_glib, ppp, intltool, pkgconfig, libmbim, libqmi }: +{ stdenv, fetchurl, udev, libgudev, polkit, dbus_glib, ppp, intltool, pkgconfig +, libmbim, libqmi, systemd }: stdenv.mkDerivation rec { name = "ModemManager-${version}"; - version = "1.4.6"; + version = "1.6.2"; src = fetchurl { url = "http://www.freedesktop.org/software/ModemManager/${name}.tar.xz"; - sha256 = "1kd5nn5rm88c8rgmzwy2fsf3cr7fai7r85mi61kcby0hcgsapv8c"; + sha256 = "14v31j916h63z7af107rias1zbb2y94p3jg77zhzhrn1v6c46m74"; }; nativeBuildInputs = [ intltool pkgconfig ]; - buildInputs = [ udev libgudev polkit dbus_glib ppp libmbim libqmi ]; + buildInputs = [ udev libgudev polkit dbus_glib ppp libmbim libqmi systemd ]; configureFlags = [ "--with-polkit" @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { "--with-systemdsystemunitdir=$(out)/etc/systemd/system" "--sysconfdir=/etc" "--localstatedir=/var" + "--with-suspend-resume=systemd" ]; installFlags = [ "DESTDIR=\${out}" ]; diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix index af5155695f4..c96e5cac367 100644 --- a/pkgs/tools/networking/mtr/default.nix +++ b/pkgs/tools/networking/mtr/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ncurses, autoconf -, withGtk ? false, gtk ? null}: +, withGtk ? false, gtk2 ? null}: -assert withGtk -> gtk != null; +assert withGtk -> gtk2 != null; with stdenv.lib; stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = optionalString (!withGtk) "--without-gtk"; - buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk; + buildInputs = [ autoconf ncurses ] ++ optional withGtk gtk2; meta = { homepage = http://www.bitwizard.nl/mtr/; diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix index b8f88656671..4dea88190d4 100644 --- a/pkgs/tools/networking/nbd/default.nix +++ b/pkgs/tools/networking/nbd/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib }: stdenv.mkDerivation rec { - name = "nbd-3.12.1"; + name = "nbd-3.14"; src = fetchurl { url = "mirror://sourceforge/nbd/${name}.tar.xz"; - sha256 = "1pkkid657zgjymwxv3fm32cxnq9llfz29rl15vp6mn42vnzbj1di"; + sha256 = "0cc6wznvkgjv0fxsj3diy92qfsjrsw92m7yq13f044qarh726gad"; }; + patches = [ ./dont-run-make-in-broken-systemd-subdir.patch ]; + buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders; @@ -17,8 +19,7 @@ stdenv.mkDerivation rec { cp README.md "$out/share/doc/${name}/" ''; - # The test suite doesn't succeed in chroot builds. - doCheck = false; + doCheck = true; # Glib calls `clock_gettime', which is in librt. Linking that library # here ensures that a proper rpath is added to the executable so that diff --git a/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch new file mode 100644 index 00000000000..ad0a7a6f66d --- /dev/null +++ b/pkgs/tools/networking/nbd/dont-run-make-in-broken-systemd-subdir.patch @@ -0,0 +1,12 @@ +diff -ubr nbd-3.14-orig/Makefile.in nbd-3.14-new/Makefile.in +--- nbd-3.14-orig/Makefile.in 2016-09-19 15:37:30.904176475 +0200 ++++ nbd-3.14-new/Makefile.in 2016-09-19 15:39:43.813543062 +0200 +@@ -403,7 +403,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = . man doc tests systemd gznbd ++SUBDIRS = . man doc tests gznbd + sbin_PROGRAMS = @NBD_CLIENT_NAME@ + noinst_LTLIBRARIES = libnbdsrv.la libcliserv.la + libcliserv_la_SOURCES = cliserv.h cliserv.c diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix index 7f6620af4c9..0cb5c92abec 100644 --- a/pkgs/tools/networking/network-manager-applet/default.nix +++ b/pkgs/tools/networking/network-manager-applet/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, intltool, pkgconfig, libglade, networkmanager, gnome3 -, libnotify, libsecret, polkit, isocodes +, libnotify, libsecret, polkit, isocodes, modemmanager , mobile_broadband_provider_info, glib_networking, gsettings_desktop_schemas -, makeWrapper, udev, libgudev, hicolor_icon_theme }: +, makeWrapper, udev, libgudev, hicolor_icon_theme, jansson }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${name}.tar.xz"; - sha256 = "02b42e7c17c9cd6c840563750da92ce58da1ec621df7f0c2402016026e727756"; + sha256 = "431b7b4876638c6a537c8bf9c91a9250532b3d960b22b056df554695a81e4499"; }; configureFlags = [ "--sysconfdir=/etc" ]; @@ -18,6 +18,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 ]; nativeBuildInputs = [ intltool pkgconfig ]; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 57bf1a51a1a..608b9ea17fe 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -7,12 +7,12 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; pname = "NetworkManager"; - major = "1.2"; + major = "1.4"; version = "${major}.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; - sha256 = "41d8082e027f58bb5fa4181f93742606ab99c659794a18e2823eff22df0eecd9"; + sha256 = "a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204"; }; preConfigure = '' diff --git a/pkgs/tools/networking/network-manager/openconnect.nix b/pkgs/tools/networking/network-manager/openconnect.nix index b1b24bceb57..303ca70aace 100644 --- a/pkgs/tools/networking/network-manager/openconnect.nix +++ b/pkgs/tools/networking/network-manager/openconnect.nix @@ -4,10 +4,11 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openconnect"; - version = networkmanager.version; + major = "1.2"; + version = "${major}.2"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; sha256 = "522979593e21b4e884112816708db9eb66148b3491580dacfad53472b94aafec"; }; diff --git a/pkgs/tools/networking/network-manager/openvpn.nix b/pkgs/tools/networking/network-manager/openvpn.nix index 6fd1a666f0e..92dc45ac82c 100644 --- a/pkgs/tools/networking/network-manager/openvpn.nix +++ b/pkgs/tools/networking/network-manager/openvpn.nix @@ -4,11 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-openvpn"; - version = networkmanager.version; + major = "1.2"; + version = "${major}.6"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "47a6d219a781eff8491c7876b7fb95b12dcfb8f8a05f916f95afc65c7babddef"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0"; }; buildInputs = [ openvpn networkmanager libsecret ] diff --git a/pkgs/tools/networking/network-manager/pptp.nix b/pkgs/tools/networking/network-manager/pptp.nix index a9bee0c7481..6cc8107f2c8 100644 --- a/pkgs/tools/networking/network-manager/pptp.nix +++ b/pkgs/tools/networking/network-manager/pptp.nix @@ -4,11 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-pptp"; - version = networkmanager.version; + major = "1.2"; + version = "${major}.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "a72cb88ecc0a9edec836e8042c592d68b8b290c0d78082e6b25cf08b46c6be5d"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "bd97ce768c34cce6d5b5d43681149a8300bec754397a3f46a0d8d0aea7030c5e"; }; buildInputs = [ networkmanager pptp ppp libsecret ] diff --git a/pkgs/tools/networking/network-manager/vpnc.nix b/pkgs/tools/networking/network-manager/vpnc.nix index b760fe6e4f7..44233b35129 100644 --- a/pkgs/tools/networking/network-manager/vpnc.nix +++ b/pkgs/tools/networking/network-manager/vpnc.nix @@ -4,11 +4,12 @@ stdenv.mkDerivation rec { name = "${pname}${if withGnome then "-gnome" else ""}-${version}"; pname = "NetworkManager-vpnc"; - version = networkmanager.version; + major = "1.2"; + version = "${major}.4"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${networkmanager.major}/${pname}-${version}.tar.xz"; - sha256 = "e900f6500026f8c3ee4feb92e1d0a0c0abbee9ba507dad915b47a8ab7df9e1f3"; + url = "mirror://gnome/sources/${pname}/${major}/${pname}-${version}.tar.xz"; + sha256 = "39c7516418e90208cb534c19628ce40fd50eba0a08b2ebaef8da85720b10fb05"; }; buildInputs = [ vpnc networkmanager libsecret ] diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix index 9644fa06972..e354ad223b8 100644 --- a/pkgs/tools/networking/ngrok/default.nix +++ b/pkgs/tools/networking/ngrok/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; buildInputs = [ go-bindata ]; diff --git a/pkgs/tools/networking/ngrok/deps.json b/pkgs/tools/networking/ngrok/deps.json deleted file mode 100644 index 943967b7342..00000000000 --- a/pkgs/tools/networking/ngrok/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/inconshreveable/go-vhost", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-vhost", - "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c", - "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32" - } - }, - { - "goPackagePath": "code.google.com/p/log4go", - "fetch": { - "type": "git", - "url": "https://github.com/ccpaging/log4go", - "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8", - "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2" - } - }, - { - "goPackagePath": "github.com/daviddengcn/go-colortext", - "fetch": { - "type": "git", - "url": "https://github.com/daviddengcn/go-colortext", - "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57", - "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-yaml/yaml", - "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a", - "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy" - } - }, - { - "goPackagePath": "github.com/inconshreveable/mousetrap", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/mousetrap", - "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa", - "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b" - } - }, - { - "goPackagePath": "github.com/nsf/termbox-go", - "fetch": { - "type": "git", - "url": "https://github.com/nsf/termbox-go", - "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b", - "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/go-update.v0", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-update", - "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066", - "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/kr/binarydist", - "fetch": { - "type": "git", - "url": "https://github.com/kr/binarydist", - "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd", - "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3" - } - } -] diff --git a/pkgs/tools/networking/ngrok/deps.nix b/pkgs/tools/networking/ngrok/deps.nix new file mode 100644 index 00000000000..1db3c3e6519 --- /dev/null +++ b/pkgs/tools/networking/ngrok/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/inconshreveable/go-vhost"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-vhost"; + rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c"; + sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"; + }; + } + { + goPackagePath = "code.google.com/p/log4go"; + fetch = { + type = "git"; + url = "https://github.com/ccpaging/log4go"; + rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8"; + sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"; + }; + } + { + goPackagePath = "github.com/daviddengcn/go-colortext"; + fetch = { + type = "git"; + url = "https://github.com/daviddengcn/go-colortext"; + rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57"; + sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a"; + sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + fetch = { + type = "git"; + url = "https://github.com/nsf/termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } + { + goPackagePath = "gopkg.in/inconshreveable/go-update.v0"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-update"; + rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066"; + sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/kr/binarydist"; + fetch = { + type = "git"; + url = "https://github.com/kr/binarydist"; + rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; + sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"; + }; + } +] diff --git a/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch new file mode 100644 index 00000000000..665eff86453 --- /dev/null +++ b/pkgs/tools/networking/openssh/RH-1380296-NEWKEYS-null-pointer-deref.patch @@ -0,0 +1,37 @@ +diff --git a/kex.c b/kex.c +index 50c7a0f..823668b 100644 +--- a/kex.c ++++ b/kex.c +@@ -419,6 +419,8 @@ kex_input_newkeys(int type, u_int32_t seq, void *ctxt) + ssh_dispatch_set(ssh, SSH2_MSG_NEWKEYS, &kex_protocol_error); + if ((r = sshpkt_get_end(ssh)) != 0) + return r; ++ if ((r = ssh_set_newkeys(ssh, MODE_IN)) != 0) ++ return r; + kex->done = 1; + sshbuf_reset(kex->peer); + /* sshbuf_reset(kex->my); */ +diff --git a/packet.c b/packet.c +index d6dad2d..f96566b 100644 +--- a/packet.c ++++ b/packet.c +@@ -38,7 +38,7 @@ + */ + + #include "includes.h" +- ++ + #include /* MIN roundup */ + #include + #include "openbsd-compat/sys-queue.h" +@@ -1907,9 +1907,7 @@ ssh_packet_read_poll2(struct ssh *ssh, u_char *typep, u_int32_t *seqnr_p) + return r; + return SSH_ERR_PROTOCOL_ERROR; + } +- if (*typep == SSH2_MSG_NEWKEYS) +- r = ssh_set_newkeys(ssh, MODE_IN); +- else if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) ++ if (*typep == SSH2_MSG_USERAUTH_SUCCESS && !state->server_side) + r = ssh_packet_enable_delayed_compress(ssh); + else + r = 0; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 8f4c0aa54df..fabcda902be 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -17,9 +17,10 @@ let sha256 = "682b4a6880d224ee0b7447241b684330b731018585f1ba519f46660c10d63950"; }; + # **please** update this patch when you update to a new openssh release. gssapiSrc = fetchpatch { - url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=46961f5704f8e86cea3e99253faad55aef4d8f35"; - sha256 = "01mf2vx1gavypbdx06mcbmcrkm2smff0h3jfmr61k6h6j3xk88y5"; + url = "https://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?id=477bb7636238c106f8cd7c868a8c0c5eabcfb3db"; + sha256 = "1kcx2rw6z7y591vr60ww2m2civ0cx6f6awdpi66p1sric9b65si3"; }; in @@ -43,6 +44,7 @@ stdenv.mkDerivation rec { patches = [ + ./RH-1380296-NEWKEYS-null-pointer-deref.patch ./locale_archive.patch ./fix-host-key-algorithms-plus.patch @@ -52,7 +54,7 @@ stdenv.mkDerivation rec { ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] - ++ optional withKerberos [ kerberos ]; + ++ optional withKerberos kerberos; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index e666cf7f605..13e1c68befd 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -1,25 +1,31 @@ -{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig }: +{ stdenv, fetchurl, iproute, lzo, openssl, pam, systemd, pkgconfig +, pkcs11Support ? false, pkcs11helper ? null, +}: + +assert pkcs11Support -> (pkcs11helper != null); with stdenv.lib; stdenv.mkDerivation rec { - name = "openvpn-2.3.11"; + name = "openvpn-2.3.12"; src = fetchurl { url = "http://swupdate.openvpn.net/community/releases/${name}.tar.gz"; - sha256 = "0qv1flcz4q4mb7zpkxsnlmpvrv3s9gw7xvprjk7n2pnk9x1s85wi"; + sha256 = "1zqwq19xg6yf90nv35yr8r0ljas5f42v4n9hjjmhlnzpan69plzm"; }; patches = optional stdenv.isLinux ./systemd-notify.patch; buildInputs = [ lzo openssl pkgconfig ] - ++ optionals stdenv.isLinux [ pam systemd iproute ]; + ++ optionals stdenv.isLinux [ pam systemd iproute ] + ++ optional pkcs11Support pkcs11helper; - configureFlags = optionalString stdenv.isLinux '' - --enable-systemd - --enable-iproute2 - IPROUTE=${iproute}/sbin/ip - ''; + configureFlags = optionals stdenv.isLinux [ + "--enable-systemd" + "--enable-iproute2" + "IPROUTE=${iproute}/sbin/ip" ] + ++ optional pkcs11Support "--enable-pkcs11" + ++ optional stdenv.isDarwin "--disable-plugin-auth-pam"; postInstall = '' mkdir -p $out/share/doc/openvpn/examples @@ -35,6 +41,6 @@ stdenv.mkDerivation rec { homepage = http://openvpn.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.viric ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index a29503aba1e..901d84b4692 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bison, pkgconfig -, glib, gtk, libxml2, gettext, zlib, binutils, gnutls }: +, glib, gtk2, libxml2, gettext, zlib, binutils, gnutls }: let name = "gtk-gnutella"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ bison binutils gettext pkgconfig ]; - buildInputs = [ glib gnutls gtk libxml2 zlib ]; + buildInputs = [ glib gnutls gtk2 libxml2 zlib ]; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 6231d5005dc..a13d6599ffb 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/networking/s3gof3r/deps.json b/pkgs/tools/networking/s3gof3r/deps.json deleted file mode 100644 index e73edde322f..00000000000 --- a/pkgs/tools/networking/s3gof3r/deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - } -] diff --git a/pkgs/tools/networking/s3gof3r/deps.nix b/pkgs/tools/networking/s3gof3r/deps.nix new file mode 100644 index 00000000000..49c5d600be2 --- /dev/null +++ b/pkgs/tools/networking/s3gof3r/deps.nix @@ -0,0 +1,11 @@ +[ + { + goPackagePath = "github.com/jessevdk/go-flags"; + fetch = { + type = "git"; + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } +] diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix index 95212b00beb..f87cecaf4d2 100644 --- a/pkgs/tools/networking/sshpass/default.nix +++ b/pkgs/tools/networking/sshpass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "sshpass-${version}"; - version = "1.05"; - + version = "1.06"; + src = fetchurl { url = "mirror://sourceforge/sshpass/sshpass-${version}.tar.gz"; - sha256 = "0gj8r05h1hy01vh4csygyw21z2hcxb72qcxkxxi3y34alr98gxy3"; + sha256 = "0q7fblaczb7kwbsz0gdy9267z0sllzgmf0c7z5c9mf88wv74ycn6"; }; - + meta = { homepage = http://sourceforge.net/projects/sshpass/; description = "Non-interactive ssh password auth"; diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 114247682c7..a01c39743fe 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "stunnel-${version}"; - version = "5.31"; + version = "5.36"; src = fetchurl { url = "http://www.stunnel.org/downloads/${name}.tar.gz"; - sha256 = "1dz0p85ha78vxc2hjhrkr4xf8w3q8r177bqdrgm26v6wncdbfim7"; + sha256 = "1smmwkzr0i6w4jwrjxazbyf82jq1qlg8x9zil5b51pzwzpy552gb"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 851af6f24f6..5b7f8f114df 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper perl LWP URI HTMLParser ] - ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ]; + ++ stdenv.lib.optionals doCheck [ HTTPServerSimple Parent ]; configurePhase = '' for i in swec tests/{runTests,testServer} diff --git a/pkgs/tools/networking/tinc/default.nix b/pkgs/tools/networking/tinc/default.nix index f7085e8f5c5..813290494e2 100644 --- a/pkgs/tools/networking/tinc/default.nix +++ b/pkgs/tools/networking/tinc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, lzo, openssl, zlib}: stdenv.mkDerivation rec { - version = "1.0.28"; + version = "1.0.29"; name = "tinc-${version}"; src = fetchurl { url = "http://www.tinc-vpn.org/packages/tinc-${version}.tar.gz"; - sha256 = "0i5kx3hza359nclyhb60kxlzqyx0phmg175350hww28g6scjcl0b"; + sha256 = "0y1alzxgds067m83qdkg12hsy6disa2ad3y2i0h1pgpvdxy02mq3"; }; buildInputs = [ lzo openssl zlib ]; diff --git a/pkgs/tools/networking/wicd/default.nix b/pkgs/tools/networking/wicd/default.nix index 59bbd918d64..d693b8db953 100644 --- a/pkgs/tools/networking/wicd/default.nix +++ b/pkgs/tools/networking/wicd/default.nix @@ -4,7 +4,7 @@ , locale ? "C" }: let - inherit (pythonPackages) python pygobject dbus-python pyGtkGlade pycairo; + inherit (pythonPackages) python pygobject2 dbus-python pyGtkGlade pycairo; in stdenv.mkDerivation rec { name = "wicd-${version}"; version = "1.7.2.4"; @@ -38,15 +38,15 @@ in stdenv.mkDerivation rec { substituteInPlace in/scripts=wicd.in --subst-var-by TEMPLATE-DEFAULT $out/share/other/dhclient.conf.template.default sed -i "2iexport PATH=${stdenv.lib.makeBinPath [ python wpa_supplicant dhcpcd dhcp wirelesstools nettools nettools iputils openresolv iproute ]}\$\{PATH:+:\}\$PATH" in/scripts=wicd.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pygobject2}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-client.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-client.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-gtk.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pygobject})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pygobject2})/gtk-2.0:$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.notify})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-gtk.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-cli.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-cli.in sed -i "2iexport PATH=${python}/bin\$\{PATH:+:\}\$PATH" in/scripts=wicd-curses.in - sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in + sed -i "3iexport PYTHONPATH=$(toPythonPath $out):$(toPythonPath ${pyGtkGlade})/gtk-2.0:$(toPythonPath ${pygobject2}):$(toPythonPath ${pycairo}):$(toPythonPath ${dbus-python}):$(toPythonPath ${pythonPackages.urwid}):$(toPythonPath ${pythonPackages.curses})\$\{PYTHONPATH:+:\}\$PYTHONPATH" in/scripts=wicd-curses.in rm po/ast.po ''; diff --git a/pkgs/tools/networking/wol/default.nix b/pkgs/tools/networking/wol/default.nix new file mode 100644 index 00000000000..5349abec161 --- /dev/null +++ b/pkgs/tools/networking/wol/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "wol-${version}"; + version = "0.7.1"; + proj = "wake-on-lan"; + + enableParallelBuilding = true; + + src = fetchurl { + url = "mirror://sourceforge/${proj}/${name}.tar.gz"; + sha256 = "08i6l5lr14mh4n3qbmx6kyx7vjqvzdnh3j9yfvgjppqik2dnq270"; + }; + + meta = { + description = "Implements Wake On LAN functionality in a small program"; + homepage = https://sourceforge.net/projects/wake-on-lan/; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ makefu ]; + }; +} diff --git a/pkgs/tools/package-management/createrepo_c/default.nix b/pkgs/tools/package-management/createrepo_c/default.nix index eed1ed1e526..8d27dc8aef0 100644 --- a/pkgs/tools/package-management/createrepo_c/default.nix +++ b/pkgs/tools/package-management/createrepo_c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bashCompletion }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, bzip2, expat, glib, curl, libxml2, python, rpm, openssl, sqlite, file, xz, pcre, bash-completion }: stdenv.mkDerivation rec { rev = "0.10.0"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "set (PYTHON_INSTALL_DIR "$out/${python.sitePackages}")" ''; - buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bashCompletion ]; + buildInputs = [ cmake pkgconfig bzip2 expat glib curl libxml2 python rpm openssl sqlite file xz pcre bash-completion ]; meta = with stdenv.lib; { description = "C implementation of createrepo"; diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix index 5ace2ad618f..45bd2abe8ec 100644 --- a/pkgs/tools/package-management/disnix/default.nix +++ b/pkgs/tools/package-management/disnix/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }: stdenv.mkDerivation { - name = "disnix-0.6"; + name = "disnix-0.6.1"; src = fetchurl { - url = http://hydra.nixos.org/build/36897417/download/4/disnix-0.6.tar.gz; - sha256 = "1i3wxp7zn765gg0sri2jsdabkj0l7aqi8cxp46pyybdf4852d6gd"; + url = http://hydra.nixos.org/build/40497264/download/4/disnix-0.6.1.tar.gz; + sha256 = "123y8vp31sl394rl7pg2xy13ng9i3pk4s7skyqhngjbqzjl72lhj"; }; buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ]; diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix index 25df812254c..08f58f668ec 100644 --- a/pkgs/tools/package-management/disnix/dysnomia/default.nix +++ b/pkgs/tools/package-management/disnix/dysnomia/default.nix @@ -20,10 +20,10 @@ assert enableEjabberdDump -> ejabberd != null; assert enableMongoDatabase -> (mongodb != null && mongodb-tools != null); stdenv.mkDerivation { - name = "dysnomia-0.6"; + name = "dysnomia-0.6.1"; src = fetchurl { - url = http://hydra.nixos.org/build/36895408/download/1/dysnomia-0.6.tar.gz; - sha256 = "1gg2avj57amxf2qi5zjk0rjyakvy5bqaar2r2151cvjlas1z1alw"; + url = http://hydra.nixos.org/build/40438996/download/1/dysnomia-0.6.1.tar.gz; + sha256 = "0apwh80hi09bvmzy0cs7sljzjd5ximj1smhrdi3hvhm3wr48jvbi"; }; preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else ""; diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 89d795c8e50..b879ef002b1 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random" ''; - goDeps = ./deps.json; + goDeps = ./deps.nix; meta = with stdenv.lib; { description = "A packaging tool built around IPFS"; diff --git a/pkgs/tools/package-management/gx/deps.json b/pkgs/tools/package-management/gx/deps.json deleted file mode 100644 index 3dd8e8f6ab3..00000000000 --- a/pkgs/tools/package-management/gx/deps.json +++ /dev/null @@ -1,200 +0,0 @@ -[ - { - "goPackagePath": "github.com/anacrolix/missinggo", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/missinggo", - "rev": "e40875155efce3d98562ca9e265e152c364ada3e", - "sha256": "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg" - } - }, - { - "goPackagePath": "github.com/anacrolix/sync", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/sync", - "rev": "812602587b72df6a2a4f6e30536adc75394a374b", - "sha256": "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l" - } - }, - { - "goPackagePath": "github.com/anacrolix/utp", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/utp", - "rev": "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0", - "sha256": "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "aea32c919a18e5ef4537bbd283ff29594b1b0165", - "sha256": "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd" - } - }, - { - "goPackagePath": "github.com/bradfitz/iter", - "fetch": { - "type": "git", - "url": "https://github.com/bradfitz/iter", - "rev": "454541ec3da2a73fc34fd049b19ee5777bf19345", - "sha256": "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "e5bef42c62aa7d25aba4880dc02b7624f01e9e19", - "sha256": "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq" - } - }, - { - "goPackagePath": "github.com/ipfs/go-ipfs-api", - "fetch": { - "type": "git", - "url": "https://github.com/ipfs/go-ipfs-api", - "rev": "7c354892da3abdaafb6ac576c100b259b1a73dac", - "sha256": "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc" - } - }, - { - "goPackagePath": "github.com/jbenet/go-base58", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-base58", - "rev": "6237cf65f3a6f7111cd8a42be3590df99a66bc7d", - "sha256": "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multiaddr", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multiaddr", - "rev": "f3dff105e44513821be8fbe91c89ef15eff1b4d4", - "sha256": "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multiaddr-net", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multiaddr-net", - "rev": "d4cfd691db9f50e430528f682ca603237b0eaae0", - "sha256": "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multihash", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multihash", - "rev": "e8d2374934f16a971d1e94a864514a21ac74bf7f", - "sha256": "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp" - } - }, - { - "goPackagePath": "github.com/jbenet/go-os-rename", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-os-rename", - "rev": "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2", - "sha256": "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr" - } - }, - { - "goPackagePath": "github.com/jbenet/go-random", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-random", - "rev": "384f606e91f542a98e779e652eed88051618f0f7", - "sha256": "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa" - } - }, - { - "goPackagePath": "github.com/jbenet/go-random-files", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-random-files", - "rev": "737479700b40b4b50e914e963ce8d9d44603e3c8", - "sha256": "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1111e456ffea841564ac0fa5f69c26ef44dafec9", - "sha256": "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23" - } - }, - { - "goPackagePath": "github.com/sabhiram/go-git-ignore", - "fetch": { - "type": "git", - "url": "https://github.com/sabhiram/go-git-ignore", - "rev": "228fcfa2a06e870a3ef238d54c45ea847f492a37", - "sha256": "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/go-multipart-files", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/go-multipart-files", - "rev": "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2", - "sha256": "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/json-filter", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/json-filter", - "rev": "e9937f5649231265a56d0a419f062530425401a1", - "sha256": "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/stump", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/stump", - "rev": "206f8f13aae1697a6fc1f4a55799faf955971fc5", - "sha256": "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/tar-utils", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/tar-utils", - "rev": "beab27159606f5a7c978268dd1c3b12a0f1de8a7", - "sha256": "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "f3241ce8505855877cc8a9717bd61a0f7c4ea83c", - "sha256": "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq" - } - } -] diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix new file mode 100644 index 00000000000..19372f807c2 --- /dev/null +++ b/pkgs/tools/package-management/gx/deps.nix @@ -0,0 +1,200 @@ +[ + { + goPackagePath = "github.com/anacrolix/missinggo"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/missinggo"; + rev = "e40875155efce3d98562ca9e265e152c364ada3e"; + sha256 = "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg"; + }; + } + { + goPackagePath = "github.com/anacrolix/sync"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/sync"; + rev = "812602587b72df6a2a4f6e30536adc75394a374b"; + sha256 = "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l"; + }; + } + { + goPackagePath = "github.com/anacrolix/utp"; + fetch = { + type = "git"; + url = "https://github.com/anacrolix/utp"; + rev = "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0"; + sha256 = "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "aea32c919a18e5ef4537bbd283ff29594b1b0165"; + sha256 = "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"; + }; + } + { + goPackagePath = "github.com/bradfitz/iter"; + fetch = { + type = "git"; + url = "https://github.com/bradfitz/iter"; + rev = "454541ec3da2a73fc34fd049b19ee5777bf19345"; + sha256 = "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + fetch = { + type = "git"; + url = "https://github.com/codegangsta/cli"; + rev = "e5bef42c62aa7d25aba4880dc02b7624f01e9e19"; + sha256 = "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"; + }; + } + { + goPackagePath = "github.com/ipfs/go-ipfs-api"; + fetch = { + type = "git"; + url = "https://github.com/ipfs/go-ipfs-api"; + rev = "7c354892da3abdaafb6ac576c100b259b1a73dac"; + sha256 = "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"; + }; + } + { + goPackagePath = "github.com/jbenet/go-base58"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-base58"; + rev = "6237cf65f3a6f7111cd8a42be3590df99a66bc7d"; + sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multiaddr"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multiaddr"; + rev = "f3dff105e44513821be8fbe91c89ef15eff1b4d4"; + sha256 = "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multiaddr-net"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multiaddr-net"; + rev = "d4cfd691db9f50e430528f682ca603237b0eaae0"; + sha256 = "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multihash"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-multihash"; + rev = "e8d2374934f16a971d1e94a864514a21ac74bf7f"; + sha256 = "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp"; + }; + } + { + goPackagePath = "github.com/jbenet/go-os-rename"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-os-rename"; + rev = "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2"; + sha256 = "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-random"; + rev = "384f606e91f542a98e779e652eed88051618f0f7"; + sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random-files"; + fetch = { + type = "git"; + url = "https://github.com/jbenet/go-random-files"; + rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; + sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + fetch = { + type = "git"; + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "1111e456ffea841564ac0fa5f69c26ef44dafec9"; + sha256 = "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"; + }; + } + { + goPackagePath = "github.com/sabhiram/go-git-ignore"; + fetch = { + type = "git"; + url = "https://github.com/sabhiram/go-git-ignore"; + rev = "228fcfa2a06e870a3ef238d54c45ea847f492a37"; + sha256 = "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-multipart-files"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/go-multipart-files"; + rev = "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2"; + sha256 = "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/json-filter"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/json-filter"; + rev = "e9937f5649231265a56d0a419f062530425401a1"; + sha256 = "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/stump"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/stump"; + rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5"; + sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/tar-utils"; + fetch = { + type = "git"; + url = "https://github.com/whyrusleeping/tar-utils"; + rev = "beab27159606f5a7c978268dd1c3b12a0f1de8a7"; + sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "f3241ce8505855877cc8a9717bd61a0f7c4ea83c"; + sha256 = "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"; + }; + } +] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 912c870c27b..877d5c6540a 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l"; }; - goDeps = ../deps.json; + goDeps = ../deps.nix; extraSrcs = [ { diff --git a/pkgs/tools/package-management/libhif/default.nix b/pkgs/tools/package-management/libhif/default.nix deleted file mode 100644 index 7736c67007a..00000000000 --- a/pkgs/tools/package-management/libhif/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, autoconf, automake, libtool, expat, python, sphinx, gobjectIntrospection, librepo, check, rpm, libsolv, pcre, curl, gtk_doc, zlib, xz, elfutils }: - -stdenv.mkDerivation rec { - rev = "87e4cb247f5982fd48636691a955cc566d3110a3"; - name = "libhif-${stdenv.lib.strings.substring 0 7 rev}"; - - src = fetchFromGitHub { - inherit rev; - owner = "rpm-software-management"; - repo = "libhif"; - sha256 = "1g8hrqjawzwcx1gjcnv9sxg5i8l13dab3rr3i641k5vi76vv8miq"; - }; - - postPatch = '' - for file in python/hawkey/CMakeLists.txt python/hawkey/tests/module/CMakeLists.txt; do - substituteInPlace $file --replace ' ''${PYTHON_INSTALL_DIR}' " $out/${python.sitePackages}" - done - - # Until https://github.com/rpm-software-management/libhif/issues/43 is implemented, let's not force users to have this path - substituteInPlace libhif/hif-keyring.c \ - --replace '"/etc/pki/rpm-gpg"' 'getenv("LIBHIF_RPM_GPG_PATH_OVERRIDE") ? getenv("LIBHIF_RPM_GPG_PATH_OVERRIDE") : "/etc/pki/rpm-gpg"' - ''; - - buildInputs = [ cmake pkgconfig pcre expat python sphinx gobjectIntrospection gtk_doc librepo check rpm curl ]; - - # ibhif/hif-packagedelta.h includes solv/pool.h - propagatedBuildInputs = [ libsolv ]; - - meta = with stdenv.lib; { - description = "A library that provides a high level package-manager. It uses librepo and hawkey under the hood."; - license = licenses.lgpl2Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ copumpkin ]; - }; -} - diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 1563af1374c..71938e37bfe 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -41,7 +41,7 @@ let installFlags = "sysconfdir=$(out)/etc"; - doInstallCheck = false; + doInstallCheck = true; separateDebugInfo = stdenv.isLinux; diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index af8a162357b..68d13f7f17f 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -3,7 +3,7 @@ , gobjectIntrospection, vala_0_23, gtk_doc, autoreconfHook, autoconf-archive , nix, boost , enableCommandNotFound ? false -, enableBashCompletion ? false, bashCompletion ? null }: +, enableBashCompletion ? false, bash-completion ? null }: stdenv.mkDerivation rec { name = "packagekit-${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ glib polkit systemd python gobjectIntrospection vala_0_23 ] - ++ lib.optional enableBashCompletion bashCompletion; + ++ lib.optional enableBashCompletion bash-completion; propagatedBuildInputs = [ sqlite nix boost ]; nativeBuildInputs = [ intltool pkgconfig autoreconfHook autoconf-archive gtk_doc ]; diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index f4a7273d8cc..6c3a63119b0 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, cpio, zlib, bzip2, file, elfutils, libarchive, nspr, nss, popt, db, xz, python, lua, pkgconfig, autoreconfHook }: stdenv.mkDerivation rec { - name = "rpm-4.12.0"; + name = "rpm-4.13.0-rc1"; src = fetchurl { - url = "http://rpm.org/releases/rpm-4.12.x/${name}.tar.bz2"; - sha256 = "18hk47hc755nslvb7xkq4jb095z7va0nlcyxdpxayc4lmb8mq3bp"; + url = "http://www.rpm.org/releases/testing/rpm-4.13.0-rc1.tar.bz2"; + sha256 = "097mc0kkrf09c01hrgi71df7maahmvayfgsvspnxigvl3xysv8hp"; }; + outputs = [ "out" "dev" "man" ]; + buildInputs = [ cpio zlib bzip2 file libarchive nspr nss db xz python lua pkgconfig autoreconfHook ]; # rpm/rpmlib.h includes popt.h, and then the pkg-config file mentions these as linkage requirements @@ -15,6 +17,14 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss"; + configureFlags = [ + "--with-external-db" + "--with-lua" + "--enable-python" + "--localstatedir=/var" + "--sharedstatedir=/com" + ]; + postPatch = '' # For Python3, the original expression evaluates as 'python3.4' but we want 'python3.4m' here substituteInPlace configure.ac --replace 'python''${PYTHON_VERSION}' ${python.executable} @@ -22,7 +32,18 @@ stdenv.mkDerivation rec { substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; - configureFlags = "--with-external-db --with-lua --enable-python --localstatedir=/var --sharedstatedir=/com"; + preFixup = '' + # Don't keep a reference to RPM headers or manpages + for f in $out/lib/rpm/platform/*/macros; do + substituteInPlace $f --replace "$dev" "/rpm-dev-path-was-here" + substituteInPlace $f --replace "$man" "/rpm-man-path-was-here" + done + + # Avoid macros like '%__ld' pointing to absolute paths + for tool in ld nm objcopy objdump strip; do + sed -i $out/lib/rpm/macros -e "s/^%__$tool.*/%__$tool $tool/" + done + ''; meta = with stdenv.lib; { homepage = http://www.rpm.org/; diff --git a/pkgs/tools/security/enpass/data.json b/pkgs/tools/security/enpass/data.json new file mode 100644 index 00000000000..4e245d1c80f --- /dev/null +++ b/pkgs/tools/security/enpass/data.json @@ -0,0 +1,12 @@ +{ + "amd64": { + "path": "pool/main/e/enpass/enpass_5.3.0_amd64.deb", + "sha256": "d9da061c6456281da836bdd78bdb7baeced4b7f1805bb2495e4f1d15038cf86b", + "version": "5.3.0" + }, + "i386": { + "path": "pool/main/e/enpass/enpass_5.3.0_i386.deb", + "sha256": "58d9f3b83c2da477c13976e1826d112236eabd46a389de7e8767ee99ac41f469", + "version": "5.3.0" + } +} \ No newline at end of file diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix new file mode 100644 index 00000000000..b7f7282d292 --- /dev/null +++ b/pkgs/tools/security/enpass/default.nix @@ -0,0 +1,106 @@ +{stdenv, system, fetchurl, dpkg, openssl, xorg +, glib, mesa, libpulseaudio, zlib, dbus, fontconfig, freetype +, gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig +, makeWrapper , makeDesktopItem, python, pythonPackages, lib}: +assert system == "i686-linux" || system == "x86_64-linux"; +let + all_data = (with builtins; fromJSON (readFile ./data.json)); + system_map = { + i686-linux = "i386"; + x86_64-linux = "amd64"; + }; + + data = (with builtins; getAttr (getAttr system system_map) all_data); + + baseUrl = http://repo.sinew.in; + + # used of both wrappers and libpath + libPath = lib.makeLibraryPath (with xorg; [ + openssl + mesa + fontconfig + freetype + libpulseaudio + zlib + dbus + libX11 + libXi + libSM + libICE + libXext + libXrender + libXScrnSaver + glib + gtk2 + pango + cairo + atk + gdk_pixbuf + jasper + stdenv.cc.cc + ]); + package = stdenv.mkDerivation rec { + + inherit (data) version; + name = "enpass-${version}"; + + desktopItem = makeDesktopItem { + name = "Enpass"; + exec = "$out/bin/Enpass"; + #icon = "Enpass"; + desktopName = "Enpass"; + genericName = "Password manager"; + categories = "Application;Security;"; + }; + + + src = fetchurl { + inherit (data) sha256; + url = "${baseUrl}/${data.path}"; + }; + + meta = { + description = "a well known password manager"; + homepage = https://www.enpass.io/; + maintainer = lib.maintainers.ronny; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; + }; + + buildInputs = [makeWrapper dpkg]; + phases = [ "unpackPhase" "installPhase" ]; + + unpackPhase = "dpkg -X $src ."; + installPhase='' + mkdir $out + cp -r opt/Enpass/* $out + + # Make desktop item + mkdir -p "$out"/share/applications + cp "$desktopItem"/share/applications/* "$out"/share/applications/ + mkdir -p "$out"/share/icons + + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + $out/bin/Enpass + + wrapProgram $out/bin/Enpass \ + --set LD_LIBRARY_PATH "${libPath}:$out/lib:$out/plugins/sqldrivers" \ + --set QT_PLUGIN_PATH "$out/plugins" \ + --set QT_QPA_PLATFORM_PLUGIN_PATH "$out/plugins/platforms" \ + --set QT_XKB_CONFIG_ROOT "${xkeyboardconfig}/share/X11/xkb" + ''; + }; + updater = { + update = stdenv.mkDerivation rec { + name = "enpass-update-script"; + SCRIPT =./update_script.py; + + buildInputs = with pythonPackages; [python requests pathlib2 six attrs ]; + shellHook = '' + exec python $SCRIPT --target pkgs/tools/security/enpass/data.json --repo ${baseUrl} + ''; + + }; + }; +in (package // {refresh = updater;}) diff --git a/pkgs/tools/security/enpass/update_script.py b/pkgs/tools/security/enpass/update_script.py new file mode 100644 index 00000000000..f8ec715cb5e --- /dev/null +++ b/pkgs/tools/security/enpass/update_script.py @@ -0,0 +1,95 @@ +from __future__ import print_function + + +import argparse +import bz2 +import email +import json +import logging + +from itertools import product +from operator import itemgetter + +import attr +import pkg_resources + +from pathlib2 import Path +from requests import Session +from six.moves.urllib_parse import urljoin + + +@attr.s +class ReleaseElement(object): + sha256 = attr.ib(repr=False) + size = attr.ib(convert=int) + path = attr.ib() + +log = logging.getLogger('enpass.updater') + + +parser = argparse.ArgumentParser() +parser.add_argument('--repo') +parser.add_argument('--target', type=Path) + + +session = Session() + + +def parse_bz2_msg(msg): + msg = bz2.decompress(msg) + if '\n\n' in msg: + parts = msg.split('\n\n') + return list(map(email.message_from_string, parts)) + return email.message_from_string(msg) + + +def fetch_meta(repo, name, parse=email.message_from_string, split=False): + url = urljoin(repo, 'dists/stable', name) + response = session.get("{repo}/dists/stable/{name}".format(**locals())) + return parse(response.content) + + +def fetch_filehashes(repo, path): + meta = fetch_meta(repo, path, parse=parse_bz2_msg) + for item in meta: + yield { + 'version': pkg_resources.parse_version(str(item['Version'])), + 'path': item['Filename'], + 'sha256': item['sha256'], + } + + +def fetch_archs(repo): + m = fetch_meta(repo, 'Release') + + architectures = m['Architectures'].split() + elements = [ReleaseElement(*x.split()) for x in m['SHA256'].splitlines()] + elements = [x for x in elements if x.path.endswith('bz2')] + + for arch, elem in product(architectures, elements): + if arch in elem.path: + yield arch, max(fetch_filehashes(repo, elem.path), + key=itemgetter('version')) + + +class OurVersionEncoder(json.JSONEncoder): + def default(self, obj): + # the other way around to avoid issues with + # newer setuptools having strict/legacy versions + if not isinstance(obj, (dict, str)): + return str(obj) + return json.JSONEncoder.default(self, obj) + + +def main(repo, target): + logging.basicConfig(level=logging.DEBUG) + with target.open(mode='wb') as fp: + json.dump( + dict(fetch_archs(repo)), fp, + cls=OurVersionEncoder, + indent=2, + sort_keys=True) + + +opts = parser.parse_args() +main(opts.repo, opts.target) diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 5e8d260d693..e7673cf5842 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/security/hologram/deps.json b/pkgs/tools/security/hologram/deps.json deleted file mode 100644 index 3d40bfd2cee..00000000000 --- a/pkgs/tools/security/hologram/deps.json +++ /dev/null @@ -1,101 +0,0 @@ -[ - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/howeyc/gopass", - "fetch": { - "type": "git", - "url": "https://github.com/howeyc/gopass", - "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", - "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" - } - }, - { - "goPackagePath": "github.com/aybabtme/rgbterm", - "fetch": { - "type": "git", - "url": "https://github.com/aybabtme/rgbterm", - "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283", - "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam" - } - }, - { - "goPackagePath": "github.com/vaughan0/go-ini", - "fetch": { - "type": "git", - "url": "https://github.com/vaughan0/go-ini", - "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1", - "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4", - "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9" - } - }, - { - "goPackagePath": "github.com/goamz/goamz", - "fetch": { - "type": "git", - "url": "https://github.com/goamz/goamz", - "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7", - "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b" - } - }, - { - "goPackagePath": "github.com/nmcclain/asn1-ber", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "gopkg.in/asn1-ber.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "github.com/peterbourgon/g2s", - "fetch": { - "type": "git", - "url": "https://github.com/peterbourgon/g2s", - "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc", - "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj" - } - }, - { - "goPackagePath": "github.com/nmcclain/ldap", - "fetch": { - "type": "git", - "url": "https://github.com/go-ldap/ldap", - "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29", - "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz" - } - } -] diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix new file mode 100644 index 00000000000..2c4cdbe84f0 --- /dev/null +++ b/pkgs/tools/security/hologram/deps.nix @@ -0,0 +1,101 @@ +[ + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + fetch = { + type = "git"; + url = "https://github.com/howeyc/gopass"; + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + } + { + goPackagePath = "github.com/aybabtme/rgbterm"; + fetch = { + type = "git"; + url = "https://github.com/aybabtme/rgbterm"; + rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; + sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + fetch = { + type = "git"; + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4"; + sha256 = "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"; + }; + } + { + goPackagePath = "github.com/goamz/goamz"; + fetch = { + type = "git"; + url = "https://github.com/goamz/goamz"; + rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; + sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"; + }; + } + { + goPackagePath = "github.com/nmcclain/asn1-ber"; + fetch = { + type = "git"; + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; + sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + fetch = { + type = "git"; + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; + sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; + }; + } + { + goPackagePath = "github.com/peterbourgon/g2s"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/g2s"; + rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; + sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"; + }; + } + { + goPackagePath = "github.com/nmcclain/ldap"; + fetch = { + type = "git"; + url = "https://github.com/go-ldap/ldap"; + rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; + sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"; + }; + } +] diff --git a/pkgs/tools/security/jd-gui/default.nix b/pkgs/tools/security/jd-gui/default.nix index f247f8c4e89..106fbf0a150 100644 --- a/pkgs/tools/security/jd-gui/default.nix +++ b/pkgs/tools/security/jd-gui/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, gtk, atk, gdk_pixbuf, pango, makeWrapper }: +{ stdenv, fetchurl, gtk2, atk, gdk_pixbuf, pango, makeWrapper }: let dynlibPath = stdenv.lib.makeLibraryPath - [ gtk atk gdk_pixbuf pango ]; + [ gtk2 atk gdk_pixbuf pango ]; in stdenv.mkDerivation rec { name = "jd-gui-${version}"; diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix index 7e4ff32e880..5ff93ae6a03 100644 --- a/pkgs/tools/security/knockknock/default.nix +++ b/pkgs/tools/security/knockknock/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication, hping }: +{ stdenv, fetchFromGitHub, pythonPackages, hping }: pythonPackages.buildPythonApplication rec { rev = "bf14bbff"; diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix index bfd1343f5e5..88b7316e9d8 100644 --- a/pkgs/tools/security/lastpass-cli/default.nix +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "lastpass-cli-${version}"; - version = "0.9.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "lastpass"; repo = "lastpass-cli"; rev = "v${version}"; - sha256 = "1iaz36bcyss2kahhlm92l7yh26rxvs12wnkkh1289yarl5wi0yld"; + sha256 = "0hidx2qfr52bwjb6as4fbfa34jqh3zwvrcx590vbsji3bq4g7avb"; }; buildInputs = [ diff --git a/pkgs/tools/security/nmap/default.nix b/pkgs/tools/security/nmap/default.nix index f9c7dba5660..847faa2479e 100644 --- a/pkgs/tools/security/nmap/default.nix +++ b/pkgs/tools/security/nmap/default.nix @@ -1,15 +1,25 @@ { stdenv, fetchurl, libpcap, pkgconfig, openssl , graphicalSupport ? false +, gtk2 ? null , libX11 ? null -, gtk ? null -, pythonPackages -, makeWrapper ? null +, withPython ? false # required for the `ndiff` binary +, python2 ? null }: +assert withPython -> python2 != null; + with stdenv.lib; let - inherit (pythonPackages) python pygtk pygobject pycairo pysqlite; + + # Zenmap (the graphical program) also requires Python, + # so automatically enable pythonSupport if graphicalSupport is requested. + pythonSupport = withPython || graphicalSupport; + + pythonEnv = python2.withPackages(ps: with ps; [] + ++ optionals graphicalSupport [ pycairo pygobject2 pygtk pysqlite ] + ); + in stdenv.mkDerivation rec { name = "nmap${optionalString graphicalSupport "-graphical"}-${version}"; version = "7.12"; @@ -21,18 +31,15 @@ in stdenv.mkDerivation rec { patches = ./zenmap.patch; - configureFlags = optionalString (!graphicalSupport) "--without-zenmap"; + configureFlags = [] + ++ optional (!pythonSupport) "--without-ndiff" + ++ optional (!graphicalSupport) "--without-zenmap" + ; - postInstall = '' - wrapProgram $out/bin/ndiff --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" - '' + optionalString graphicalSupport '' - wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0 - ''; - - buildInputs = [ libpcap pkgconfig openssl makeWrapper python ] - ++ optionals graphicalSupport [ - libX11 gtk pygtk pysqlite pygobject pycairo - ]; + buildInputs = [ libpcap pkgconfig openssl ] + ++ optional pythonSupport pythonEnv + ++ optionals graphicalSupport [ gtk2 libX11 ] + ; meta = { description = "A free and open source utility for network discovery and security auditing"; diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 79f6a6c1c28..b0137619f0c 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, coreutils, gnused, getopt, pwgen, git, tree, gnupg, which +, coreutils, gnused, getopt, pwgen, git, tree, gnupg, which, procps , makeWrapper , xclip ? null, xdotool ? null, dmenu ? null @@ -64,14 +64,15 @@ stdenv.mkDerivation rec { wrapperPath = with stdenv.lib; makeBinPath ([ coreutils - gnused getopt git gnupg + gnused pwgen tree which - ] ++ ifEnable x11Support [ dmenu xclip xdotool ]); + ] ++ stdenv.lib.optional stdenv.isLinux procps + ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' # Fix program name in --help diff --git a/pkgs/tools/security/pass/rofi-pass.nix b/pkgs/tools/security/pass/rofi-pass.nix index b834cc6adc5..64c12dc6e5e 100644 --- a/pkgs/tools/security/pass/rofi-pass.nix +++ b/pkgs/tools/security/pass/rofi-pass.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchgit -, pass, rofi, coreutils, utillinux, xdotool, gnugrep, pwgen, findutils, gawk -, makeWrapper }: +{ stdenv, fetchFromGitHub, pass, rofi, coreutils, utillinux, xdotool, gnugrep +, libnotify, pwgen, findutils, gawk, gnused, xclip, makeWrapper +}: stdenv.mkDerivation rec { name = "rofi-pass-${version}"; - version = "1.3.2"; + version = "1.4.3"; - src = fetchgit { - url = "https://github.com/carnager/rofi-pass"; - rev = "refs/tags/${version}"; - sha256 = "1xqp8s0yyjs2ca9mf8lbz8viwl9xzxf5kk1v68v9hqdgxj26wgls"; + src = fetchFromGitHub { + owner = "carnager"; + repo = "rofi-pass"; + rev = version; + sha256 = "09wpkxg5b7xicdisgbhlfr8vs1iv7z9sc58pjl0p198yap57khq5"; }; buildInputs = [ makeWrapper ]; @@ -18,22 +19,25 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp -a $src/rofi-pass $out/bin/rofi-pass + cp -a rofi-pass $out/bin/rofi-pass mkdir -p $out/share/doc/rofi-pass/ - cp -a $src/config.example $out/share/doc/rofi-pass/config.example + cp -a config.example $out/share/doc/rofi-pass/config.example ''; wrapperPath = with stdenv.lib; makeBinPath [ coreutils findutils + gawk gnugrep + gnused + libnotify pass pwgen rofi utillinux + xclip xdotool - gawk ]; fixupPhase = '' diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix new file mode 100644 index 00000000000..1e33c18753a --- /dev/null +++ b/pkgs/tools/security/pgpdump/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "pgpdump-${version}"; + version = "0.31"; + + src = fetchFromGitHub { + owner = "kazu-yamamoto"; + repo = "pgpdump"; + rev = "v${version}"; + sha256 = "05ywdgxzq3976dsy95vgdx3nnhd9i9vypzyrkabpmnxphfnjfrb4"; + }; + + meta = with stdenv.lib; { + description = "A PGP packet visualizer"; + longDescription = '' + pgpdump is a PGP packet visualizer which displays the packet format of + OpenPGP (RFC 4880) and PGP version 2 (RFC 1991). + ''; + homepage = "http://www.mew.org/~kazu/proj/pgpdump/en/"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ primeos ]; + }; +} + diff --git a/pkgs/tools/security/ssdeep/default.nix b/pkgs/tools/security/ssdeep/default.nix index 4f2cf551816..b581d800794 100644 --- a/pkgs/tools/security/ssdeep/default.nix +++ b/pkgs/tools/security/ssdeep/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation rec { sha256 = "1igqy0j7jrklb8fdlrm6ald4cyl1fda5ipfl8crzyl6bax2ajk3f"; }; - buildInputs = stdenv.lib.optional (!stdenv.isDarwin) [ patchelf ]; - # For some reason (probably a build system bug), the binary isn't # properly linked to $out/lib to find libfuzzy.so postFixup = stdenv.lib.optionalString (!stdenv.isDarwin) '' diff --git a/pkgs/tools/security/sslscan/default.nix b/pkgs/tools/security/sslscan/default.nix index f6777a0e979..6b205d84534 100644 --- a/pkgs/tools/security/sslscan/default.nix +++ b/pkgs/tools/security/sslscan/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, openssl }: +{ stdenv, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { name = "sslscan-${version}"; version = "1.11.7"; - src = fetchurl { - url = "https://github.com/rbsec/sslscan/archive/${version}-rbsec.tar.gz"; - sha256 = "0wygz2gm9asvhpfy44333y4pkdja1sbr41hc6mhkxg7a4ys8f9qs"; + src = fetchFromGitHub { + owner = "rbsec"; + repo = "sslscan"; + rev = "${version}-rbsec"; + sha256 = "007lf3rxcn9nz6jrki3mavgd9sd2hmm9nzp2g13h0ri51yc3bkp0"; }; buildInputs = [ openssl ]; @@ -23,4 +25,3 @@ stdenv.mkDerivation rec { platforms = platforms.all; }; } - diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index e2c69377df5..b31d60247d8 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.17p1"; + name = "sudo-1.8.18"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "c690d707fb561b3ecdf6a6de5563bc0b769388eff201c851edbace408bb155cc"; + sha256 = "04xywg2f9x2kfw81abdf8gsraldaz5v0w0x2zi8aqlgsjygfj6c5"; }; configureFlags = [ diff --git a/pkgs/tools/security/sudolikeaboss/default.nix b/pkgs/tools/security/sudolikeaboss/default.nix new file mode 100644 index 00000000000..6e2d6888f2e --- /dev/null +++ b/pkgs/tools/security/sudolikeaboss/default.nix @@ -0,0 +1,33 @@ +{ stdenv, buildGoPackage, fetchFromGitHub, fixDarwinDylibNames, darwin }: +buildGoPackage rec { + name = "sudolikeaboss-${version}"; + version = "0.2.1"; + + goPackagePath = "github.com/ravenac95/sudolikeaboss"; + src = fetchFromGitHub { + owner = "ravenac95"; + repo = "sudolikeaboss"; + rev = "v${version}"; + sha256 = "1zsmy67d334nax76sq0g2sczp4zi19d94d3xfwgadzk7sxvw1z0m"; + }; + goDeps = ./deps.nix; + + propagatedBuildInputs = with darwin.apple_sdk.frameworks; [ + Cocoa + fixDarwinDylibNames + ]; + + postInstall = '' + install_name_tool -delete_rpath $out/lib -add_rpath $bin $bin/bin/sudolikeaboss + ''; + + meta = with stdenv.lib; { + inherit version; + inherit (src.meta) homepage; + description = "Get 1password access from iterm2"; + license = licenses.mit; + maintainers = [ maintainers.grahamc ]; + platforms = platforms.darwin; + }; + +} diff --git a/pkgs/tools/security/sudolikeaboss/deps.nix b/pkgs/tools/security/sudolikeaboss/deps.nix new file mode 100644 index 00000000000..04f831675fa --- /dev/null +++ b/pkgs/tools/security/sudolikeaboss/deps.nix @@ -0,0 +1,22 @@ +# This file was generated by go2nix: https://github.com/kamilchm/go2nix +# v1.1.0 or 1.1.1, not 100% sure +[ + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "55f715e28c46073d0e217e2ce8eb46b0b45e3db6"; + sha256 = "0fvqxh1dx4f189y90fhrjapb4g51d7cp203jahxfb19k1k8c3942"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "2a824cf9226006580a06d9fa8f10901c17b49ed5"; + sha256 = "19hc83dsa8k1zbzb16v9yc44grscl9r4fxlpwqi3f6zqfrv0qk4n"; + }; + } +] diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 533cb0dcd8e..0e69729a226 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "tor-0.2.8.7"; + name = "tor-0.2.8.8"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "1iigfi8ljl88s8b5y1g4ak8im57simazscl467zvfbg8k6vf4i5f"; + sha256 = "1pp3h0a1cl25fv04b3j6wp8aw1sfpbd2lmag397dpp2k2b305bxi"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index da45866ed2f..900ad39ecb2 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -1,24 +1,24 @@ { stdenv, fetchurl, makeDesktopItem -, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk +, libXrender, libX11, libXext, libXt, alsaLib, dbus, dbus_glib, glib, gtk2 , atk, pango, freetype, fontconfig, gdk_pixbuf, cairo, zlib }: let libPath = stdenv.lib.makeLibraryPath [ - stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype + stdenv.cc.cc zlib glib alsaLib dbus dbus_glib gtk2 atk pango freetype fontconfig gdk_pixbuf cairo libXrender libX11 libXext libXt ]; in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "6.0.4"; + version = "6.0.5"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz"; sha256 = if stdenv.is64bit then - "14ds39frkg4hbim0icb372crink902f7i6mqj6dmbaiz2fi88y8q" else - "1d2mg46dg5y16h5lwzq0ilv3zk8aqy3vg3j4a5c3wzsxj0hpl4v5"; + "fc917bd702b1275cae3f7fa8036c3c44af9b4f003f3d4a8fbb9f6c0974277ad4" else + "e0c3ce406b6de082692ce3db52b6e04053e205194b26fbf0eee9014be543d98d"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 4ede689bf97..9118bd3c18f 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,15 +2,26 @@ buildGoPackage rec { name = "vault-${version}"; - version = "0.6.0"; - rev = "v${version}"; + version = "0.6.1"; goPackagePath = "github.com/hashicorp/vault"; src = fetchFromGitHub { - inherit rev; owner = "hashicorp"; repo = "vault"; - sha256 = "0byb91nqrhl7w0rq0ilml1ybamh8w1qga47a790kggsmjhcj9ybx"; + rev = "v${version}"; + sha256 = "06xf2dpn0q398qb6wbh9j1wjl5smqq9nrrn2039g48haqm8853jx"; + }; + + buildFlagsArray = '' + -ldflags= + -X github.com/hashicorp/vault/version.GitCommit=${version} + ''; + + meta = with stdenv.lib; { + homepage = https://www.vaultproject.io; + description = "A tool for managing secrets"; + license = licenses.mpl20; + maintainers = [ maintainers.rushmorem ]; }; } diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix index 518fb4944f4..b5f1af6dfed 100644 --- a/pkgs/tools/system/bootchart/default.nix +++ b/pkgs/tools/system/bootchart/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, lib, pkgconfig, glib, gtk, python27, pythonPackages }: +{stdenv, fetchurl, lib, pkgconfig, glib, gtk2, python27, pythonPackages }: stdenv.mkDerivation rec { version = "0.14.7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb"; }; - buildInputs = [ pkgconfig glib gtk python27 pythonPackages.wrapPython pythonPackages.pygtk ]; + buildInputs = [ pkgconfig glib gtk2 python27 pythonPackages.wrapPython pythonPackages.pygtk ]; pythonPath = with pythonPackages; [ pygtk pycairo ]; installPhase = '' diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index b0c6b073029..fb2a66ecf37 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -30,21 +30,28 @@ , varnish ? null , yajl ? null , net_snmp ? null +, hiredis ? null +, libmnl ? null }: stdenv.mkDerivation rec { - version = "5.5.2"; + version = "5.6.0"; name = "collectd-${version}"; src = fetchurl { url = "http://collectd.org/files/${name}.tar.bz2"; - sha256 = "03w2pawbshl2wrl4cmyw8alsi0pvamb6ibxni96mjzhqc903lzq1"; + sha256 = "08w6fjzczi2psk7va0xkjh9pigpar6sbjx2a6ayq4dmc3zcvpzzh"; }; buildInputs = [ pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool - varnish yajl jdk libtool python udev net_snmp + varnish yajl jdk libtool python udev net_snmp hiredis libmnl + ]; + + patches = [ + # Replace deprecated readdir_r() with readdir() to avoid a fatal warning. + ./readdir-fix.patch ]; # for some reason libsigrok isn't auto-detected @@ -52,14 +59,11 @@ stdenv.mkDerivation rec { stdenv.lib.optional (libsigrok != null) "--with-libsigrok" ++ stdenv.lib.optional (python != null) "--with-python=${python}/bin/python"; - # Fix build on Glibc 2.24. - NIX_CFLAGS_COMPILE = "-Wno-error=cpp -Wno-error=deprecated-declarations"; - meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = http://collectd.org; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor fpletz ]; }; } diff --git a/pkgs/tools/system/collectd/readdir-fix.patch b/pkgs/tools/system/collectd/readdir-fix.patch new file mode 100644 index 00000000000..171dfc689a4 --- /dev/null +++ b/pkgs/tools/system/collectd/readdir-fix.patch @@ -0,0 +1,55 @@ +diff -Naur collectd-5.6.0/src/vserver.c collectd-5.6.0/src/vserver.c +--- collectd-5.6.0/src/vserver.c 2016-09-11 01:10:25.279038699 -0700 ++++ collectd-5.6.0/src/vserver.c 2016-09-25 07:44:40.771177458 -0700 +@@ -132,15 +132,8 @@ + + static int vserver_read (void) + { +-#if NAME_MAX < 1024 +-# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + 1024 + 1) +-#else +-# define DIRENT_BUFFER_SIZE (sizeof (struct dirent) + NAME_MAX + 1) +-#endif +- + DIR *proc; + struct dirent *dent; /* 42 */ +- char dirent_buffer[DIRENT_BUFFER_SIZE]; + + errno = 0; + proc = opendir (PROCDIR); +@@ -165,19 +158,23 @@ + + int status; + +- status = readdir_r (proc, (struct dirent *) dirent_buffer, &dent); +- if (status != 0) +- { +- char errbuf[4096]; +- ERROR ("vserver plugin: readdir_r failed: %s", +- sstrerror (errno, errbuf, sizeof (errbuf))); +- closedir (proc); +- return (-1); +- } +- else if (dent == NULL) ++ errno = 0; ++ dent = readdir (proc); ++ if (dent == NULL) + { +- /* end of directory */ +- break; ++ if (errno != 0) ++ { ++ char errbuf[4096]; ++ ERROR ("vserver plugin: readdir failed: %s", ++ sstrerror (errno, errbuf, sizeof (errbuf))); ++ closedir (proc); ++ return (-1); ++ } ++ else ++ { ++ /* end of directory */ ++ break; ++ } + } + + if (dent->d_name[0] == '.') diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index 5da87f4ce46..ebe654d946e 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -15,5 +15,5 @@ buildGoPackage rec { sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr"; }; - goDeps = ./deps.json; + goDeps = ./deps.nix; } diff --git a/pkgs/tools/system/confd/deps.json b/pkgs/tools/system/confd/deps.json deleted file mode 100644 index 407870efdaa..00000000000 --- a/pkgs/tools/system/confd/deps.json +++ /dev/null @@ -1,74 +0,0 @@ -[ - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/coreos/go-etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-etcd", - "rev": "9847b93751a5fbaf227b893d172cee0104ac6427", - "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper", - "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4", - "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/kelseyhightower/memkv", - "fetch": { - "type": "git", - "url": "https://github.com/kelseyhightower/memkv", - "rev": "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580", - "sha256": "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540" - } - }, - { - "goPackagePath": "github.com/armon/consul-api", - "fetch": { - "type": "git", - "url": "https://github.com/armon/consul-api", - "rev": "f79efe463cdbb62f6d5a55f879a63ec554eb13e5", - "sha256": "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp" - } - }, - { - "goPackagePath": "github.com/garyburd/redigo", - "fetch": { - "type": "git", - "url": "https://github.com/garyburd/redigo", - "rev": "535138d7bcd717d6531c701ef5933d98b1866257", - "sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v" - } - } -] diff --git a/pkgs/tools/system/confd/deps.nix b/pkgs/tools/system/confd/deps.nix new file mode 100644 index 00000000000..74467ddf9cc --- /dev/null +++ b/pkgs/tools/system/confd/deps.nix @@ -0,0 +1,74 @@ +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + fetch = { + type = "git"; + url = "https://github.com/coreos/go-etcd"; + rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; + sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + fetch = { + type = "git"; + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + fetch = { + type = "git"; + url = "https://github.com/samuel/go-zookeeper"; + rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/memkv"; + fetch = { + type = "git"; + url = "https://github.com/kelseyhightower/memkv"; + rev = "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580"; + sha256 = "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + fetch = { + type = "git"; + url = "https://github.com/armon/consul-api"; + rev = "f79efe463cdbb62f6d5a55f879a63ec554eb13e5"; + sha256 = "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + fetch = { + type = "git"; + url = "https://github.com/garyburd/redigo"; + rev = "535138d7bcd717d6531c701ef5933d98b1866257"; + sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; + }; + } +] diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 76f640711a8..cd8485e2573 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.5.3"; + version = "1.5.4"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0s4q7imc4r3g9lkd92bnvw70679q83b0irrlw895i5nc05dj4djx"; + sha256 = "1m8zvnyjyjap07vvc5z90nyghabbb6bjcyyc7qswj66qsmssf135"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index 7800bfa0831..1d33e5fb09f 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk, pkgconfig, libxml2, intltool, gettext }: +{ stdenv, fetchurl, gtk2, pkgconfig, libxml2, intltool, gettext }: stdenv.mkDerivation rec { name = "gdmap-0.8.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0nr8l88cg19zj585hczj8v73yh21k7j13xivhlzl8jdk0j0cj052"; }; - buildInputs = [ gtk pkgconfig libxml2 intltool gettext ]; + buildInputs = [ gtk2 pkgconfig libxml2 intltool gettext ]; patches = [ ./get_sensitive.patch ./set_flags.patch ]; diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix index 7c33d2e166d..6946862422b 100644 --- a/pkgs/tools/system/honcho/default.nix +++ b/pkgs/tools/system/honcho/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pythonPackages, buildPythonApplication }: +{ stdenv, fetchFromGitHub, pythonPackages }: -let honcho = buildPythonApplication rec { +let honcho = pythonPackages.buildPythonApplication rec { name = "honcho-${version}"; version = "0.6.6"; namePrefix = ""; diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index 41b51aa4177..37f5131a037 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "2.9.9"; + version = "3.0.0"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1xi5d49zmcczya4iq662wkx39slrk3d4p2dzpfjcc0m0hs1y1b5y"; + sha256 = "0r986mvh6q1f7369qry2vq4rqc6kc4kq957s2g5qsl8m1pyw2mvx"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/system/lshw/default.nix b/pkgs/tools/system/lshw/default.nix index 02b331a36de..dc5b75b0f4a 100644 --- a/pkgs/tools/system/lshw/default.nix +++ b/pkgs/tools/system/lshw/default.nix @@ -1,27 +1,33 @@ -{ stdenv, fetchurl -, withGUI? false, gtk? null, pkgconfig? null, sqlite? null # compile GUI - }: -stdenv.mkDerivation rec { +{ stdenv, lib, fetchurl, fetchpatch +, withGUI ? false, gtk2, pkgconfig, sqlite # compile GUI +}: - name = "lshw-${version}"; - version = "02.17b"; +let numVersion = "02.18"; # :( +in +stdenv.mkDerivation rec { + name = "lshw-${numVersion}b"; + version = "B.${numVersion}"; src = fetchurl { - url = http://ezix.org/software/files/lshw-B.02.17.tar.gz; - sha256 = "1728b96gyjmrp31knzips9azn6wkfdp5k5dnbil7h7hgz99w177b"; + url = "http://ezix.org/software/files/lshw-${version}.tar.gz"; + sha256 = "0brwra4jld0d53d7jsgca415ljglmmx1l2iazpj4ndilr48yy8mf"; }; - buildInputs = [] ++ stdenv.lib.optional withGUI [ gtk pkgconfig sqlite ]; + patches = [ (fetchpatch { + # fix crash in scan_dmi_sysfs() when run as non-root + url = "https://github.com/lyonel/lshw/commit/fbdc6ab15f7eea0ddcd63da355356ef156dd0d96.patch"; + sha256 = "147wyr5m185f8swsmb4q1ahs9r1rycapbpa2548aqbv298bbish3"; + })]; - postBuild = if withGUI then "make gui" else ""; + buildInputs = lib.optionals withGUI [ gtk2 pkgconfig sqlite ]; - installPhase = '' - make DESTDIR="$out" install - ${if withGUI then "make DESTDIR=$out install-gui" else ""} - mv $out/usr/* $out - rmdir $out/usr - mv $out/sbin $out/bin - ''; + makeFlags = [ "PREFIX=$(out)" ]; + + buildFlags = [ "all" ] ++ lib.optional withGUI "gui"; + + installTargets = [ "install" ] ++ lib.optional withGUI "install-gui"; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://ezix.org/project/wiki/HardwareLiSter; diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index e2786ea77fe..eed5c06552b 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: stdenv.mkDerivation rec { - name = "monit-5.10"; - + name = "monit-5.19.0"; + src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "0lwlils6b59kr6zg328q113c7mrpggqydpq4l6j52sqv3dd1b49p"; + sha256 = "1f32dz7zzp575d35m8xkgjgrqs2vbls0q6vdzm7wwashcm1xbz5y"; }; nativeBuildInputs = [ bison flex ]; diff --git a/pkgs/tools/system/r10k/Gemfile b/pkgs/tools/system/r10k/Gemfile new file mode 100644 index 00000000000..c9363ff3dbd --- /dev/null +++ b/pkgs/tools/system/r10k/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true +# A sample Gemfile +source "https://rubygems.org" + +gem "r10k" diff --git a/pkgs/tools/system/r10k/Gemfile.lock b/pkgs/tools/system/r10k/Gemfile.lock new file mode 100644 index 00000000000..e095d48fb63 --- /dev/null +++ b/pkgs/tools/system/r10k/Gemfile.lock @@ -0,0 +1,49 @@ +GEM + remote: https://rubygems.org/ + specs: + colored (1.2) + cri (2.6.1) + colored (~> 1.2) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.10.0) + faraday (>= 0.7.4, < 0.10) + fast_gettext (1.1.0) + gettext (3.2.2) + locale (>= 2.0.5) + text (>= 1.3.0) + gettext-setup (0.7) + fast_gettext (~> 1.1.0) + gettext (>= 3.0.2) + locale (2.1.2) + log4r (1.1.10) + minitar (0.5.4) + multi_json (1.12.1) + multipart-post (2.0.0) + puppet_forge (2.2.2) + faraday (~> 0.9.0) + faraday_middleware (>= 0.9.0, < 0.11.0) + gettext-setup (>= 0.3) + minitar + semantic_puppet (~> 0.1.0) + r10k (2.4.3) + colored (= 1.2) + cri (~> 2.6.1) + gettext-setup (~> 0.5) + log4r (= 1.1.10) + minitar + multi_json (~> 1.10) + puppet_forge (~> 2.2) + semantic_puppet (~> 0.1.0) + semantic_puppet (0.1.4) + gettext-setup (>= 0.3) + text (1.3.1) + +PLATFORMS + ruby + +DEPENDENCIES + r10k + +BUNDLED WITH + 1.12.5 diff --git a/pkgs/tools/system/r10k/default.nix b/pkgs/tools/system/r10k/default.nix new file mode 100644 index 00000000000..0695504cc01 --- /dev/null +++ b/pkgs/tools/system/r10k/default.nix @@ -0,0 +1,33 @@ +{ stdenv, lib, bundlerEnv, makeWrapper, git, gnutar, gzip, ruby }: + +stdenv.mkDerivation rec { + name = "r10k-${version}"; + + version = "2.4.3"; + + env = bundlerEnv { + name = "${name}-gems"; + + gemfile = ./Gemfile; + lockfile = ./Gemfile.lock; + gemset = ./gemset.nix; + inherit ruby; + }; + + phases = ["installPhase"]; + + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + makeWrapper ${env}/bin/r10k $out/bin/r10k \ + --set PATH ${stdenv.lib.makeBinPath [ git gnutar gzip ]} + ''; + + meta = with lib; { + description = "Puppet environment and module deployment"; + homepage = https://github.com/puppetlabs/r10k; + license = licenses.asl20; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/pkgs/tools/system/r10k/gemset.nix b/pkgs/tools/system/r10k/gemset.nix new file mode 100644 index 00000000000..5dfad45f5c8 --- /dev/null +++ b/pkgs/tools/system/r10k/gemset.nix @@ -0,0 +1,130 @@ +{ + colored = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx"; + type = "gem"; + }; + version = "1.2"; + }; + cri = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zzwvwzrrlmx6c5j7bqc63ib952h37i357xn97m3h8bjd7zyv79l"; + type = "gem"; + }; + version = "2.6.1"; + }; + faraday = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6"; + type = "gem"; + }; + version = "0.9.2"; + }; + faraday_middleware = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h"; + type = "gem"; + }; + version = "0.10.0"; + }; + fast_gettext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mxahyywhml3c206am11h6d93rk358l2vl0j764i8ndzir5z5h75"; + type = "gem"; + }; + version = "1.1.0"; + }; + gettext = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1d2i1zfqvaxqi01g9vvkfkf5r85c5nfj2zwpd2ib9vvkjavhn9cx"; + type = "gem"; + }; + version = "3.2.2"; + }; + gettext-setup = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "116frghrvcpzqhgi6skpmr56lzk35z44sbjkjn3lnlpr33sav03l"; + type = "gem"; + }; + version = "0.7"; + }; + locale = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x"; + type = "gem"; + }; + version = "2.1.2"; + }; + log4r = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ri90q0frfmigkirqv5ihyrj59xm8pq5zcmf156cbdv4r4l2jicv"; + type = "gem"; + }; + version = "1.1.10"; + }; + minitar = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka"; + type = "gem"; + }; + version = "0.5.4"; + }; + multi_json = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wpc23ls6v2xbk3l1qncsbz16npvmw8p0b38l8czdzri18mp51xk"; + type = "gem"; + }; + version = "1.12.1"; + }; + multipart-post = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x"; + type = "gem"; + }; + version = "2.0.0"; + }; + puppet_forge = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m2npid04dvli2r9h5cm2ccjmq0275xn4swi3x8wx5yzrixw98wv"; + type = "gem"; + }; + version = "2.2.2"; + }; + r10k = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cqwci30r2566xcf8wz7dgamj6i4q9cblgkgmmdm9w2klqzx30j7"; + type = "gem"; + }; + version = "2.4.3"; + }; + semantic_puppet = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zs19rsyv3f2zwhqi8cqbs87a6fzyl30aw2zqcxb8iz5m7xkd4kc"; + type = "gem"; + }; + version = "0.1.4"; + }; + text = { + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x6kkmsr49y3rnrin91rv8mpc3dhrf3ql08kbccw8yffq61brfrg"; + type = "gem"; + }; + version = "1.3.1"; + }; +} \ No newline at end of file diff --git a/pkgs/tools/system/systemd-journal2gelf/default.nix b/pkgs/tools/system/systemd-journal2gelf/default.nix new file mode 100644 index 00000000000..59df5ee90a4 --- /dev/null +++ b/pkgs/tools/system/systemd-journal2gelf/default.nix @@ -0,0 +1,24 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + name = "SystemdJournal2Gelf-${version}"; + version = "20160414"; + + goPackagePath = "github.com/parse-nl/SystemdJournal2Gelf"; + + src = fetchFromGitHub { + rev = "aba2f24e59f190ab8830bf40f92f890e62a9ec9f"; + owner = "parse-nl"; + repo = "SystemdJournal2Gelf"; + sha256 = "012fmnb44681dgz21n1dlb6vh923bpk5lkqir1q40kfz6pacq64n"; + }; + + goDeps = ./deps.nix; + + meta = with stdenv.lib; { + description = "Export entries from systemd's journal and send them to a graylog server using gelf"; + license = licenses.bsd2; + maintainers = with maintainers; [ fadenb fpletz globin ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/system/systemd-journal2gelf/deps.nix b/pkgs/tools/system/systemd-journal2gelf/deps.nix new file mode 100644 index 00000000000..2e0988e8105 --- /dev/null +++ b/pkgs/tools/system/systemd-journal2gelf/deps.nix @@ -0,0 +1,11 @@ +[ +{ + goPackagePath = "github.com/DECK36/go-gelf"; + fetch = { + type = "git"; + url = "https://github.com/DECK36/go-gelf"; + rev = "4bc6123df0946a1c23fd54e0c1d0ed68b44fd99f"; + sha256 = "071zdwcl8ld05gv88yym1p7xq72igd6jj05n5d7v01hn6rvj48ay"; + }; +} +] diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index c7476d9f339..e38de5e6bd8 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libpaper, gperf, file }: +{ stdenv, fetchurl, fetchpatch, libpaper, gperf, file, perl }: stdenv.mkDerivation rec { name = "a2ps-4.14"; @@ -7,14 +7,28 @@ stdenv.mkDerivation rec { sha256 = "195k78m1h03m961qn7jr120z815iyb93gwi159p1p9348lyqvbpk"; }; + patches = [ + (fetchpatch { + url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/09_CVE-2001-1593.diff"; + sha256 = "1hrfmvb21zlklmg2fqikgywhqgc4qnvbhx517w87faafrhzhlnh0"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/CVE-2014-0466.diff"; + sha256 = "0grqqsc3m45niac56m19m5gx7gc0m8zvia5iman1l4rlq31shf8s"; + }) + (fetchpatch { + url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/fix-format-security.diff"; + sha256 = "0pq7zl41gf2kc6ahwyjnzn93vbxb4jc2c5g8j20isp4vw6dqrnwv"; + }) + ]; + postPatch = '' substituteInPlace afm/make_fonts_map.sh --replace "/bin/rm" "rm" substituteInPlace tests/defs.in --replace "/bin/rm" "rm" ''; - buildInputs = [ libpaper gperf file ]; - - hardeningDisable = [ "format" ]; + nativeBuildInputs = [ file perl ]; + buildInputs = [ libpaper gperf ]; meta = with stdenv.lib; { description = "An Anything to PostScript converter and pretty-printer"; diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index 728e9de8b48..df6a1119800 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchurl, ghostscript, perl, groff }: +{ stdenv, fetchurl, perl, groff +, ghostscript #for postscript and html output +, psutils, netpbm #for html output +}: stdenv.mkDerivation rec { name = "groff-1.22.3"; @@ -12,7 +15,21 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; - buildInputs = [ ghostscript ]; + postPatch = stdenv.lib.optionalString (psutils != null) '' + substituteInPlace src/preproc/html/pre-html.cpp \ + --replace "psselect" "${psutils}/bin/psselect" + '' + stdenv.lib.optionalString (netpbm != null) '' + substituteInPlace src/preproc/html/pre-html.cpp \ + --replace "pnmcut" "${netpbm}/bin/pnmcut" \ + --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \ + --replace "pnmtopng" "${netpbm}/bin/pnmtopng" + substituteInPlace tmac/www.tmac \ + --replace "pnmcrop" "${netpbm}/bin/pnmcrop" \ + --replace "pngtopnm" "${netpbm}/bin/pngtopnm" \ + --replace "@PNMTOPS_NOSETPAGE@" "${netpbm}/bin/pnmtops -nosetpage" + ''; + + buildInputs = [ ghostscript psutils netpbm ]; nativeBuildInputs = [ perl ]; # Builds running without a chroot environment may detect the presence @@ -20,7 +37,11 @@ stdenv.mkDerivation rec { # package. To avoid this issue, X11 support is explicitly disabled. # Note: If we ever want to *enable* X11 support, then we'll probably # have to pass "--with-appresdir", too. - configureFlags = "--without-x"; + configureFlags = [ + "--without-x" + ] ++ stdenv.lib.optionals (ghostscript != null) [ + "--with-gs=${ghostscript}/bin/gs" + ]; doCheck = true; diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix new file mode 100644 index 00000000000..d2929ab90f4 --- /dev/null +++ b/pkgs/tools/text/languagetool/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchurl, unzip, jdk }: + +stdenv.mkDerivation rec { + pname = "LanguageTool"; + version = "3.5"; + name = pname + "-" + version; + src = fetchurl { + url = "https://www.languagetool.org/download/${name}.zip"; + sha256 = "1axw8fqg2wlkmv45s71q5pg44sg1s06szpkjhyscy704i7d2jc34"; + }; + buildInputs = [ unzip jdk ]; + installPhase = + '' + mkdir -p $out/{bin,share} + mv * $out/share/. + for lt in languagetool{,-commandline,-server};do + cat > $out/bin/$lt < $targetName done diff --git a/pkgs/tools/typesetting/tex/nix/default.nix b/pkgs/tools/typesetting/tex/nix/default.nix index ce5c025475a..0566e511870 100644 --- a/pkgs/tools/typesetting/tex/nix/default.nix +++ b/pkgs/tools/typesetting/tex/nix/default.nix @@ -185,7 +185,7 @@ rec { if test -d $postscript; then input=$(ls $postscript/*.ps) else - input=$(stripHash $postscript; echo $strippedName) + input=$(stripHash $postscript) ln -s $postscript $input fi diff --git a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh index c416bf235a1..71cf601dfac 100644 --- a/pkgs/tools/typesetting/tex/nix/dot2pdf.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2pdf.sh @@ -4,7 +4,7 @@ mkdir -p $out dot2pdf() { sourceFile=$1 - targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .dot).pdf + targetName=$out/$(basename $(stripHash $sourceFile) .dot).pdf echo "converting $sourceFile to $targetName..." export FONTCONFIG_FILE=$fontsConf dot -Tpdf $sourceFile > $targetName diff --git a/pkgs/tools/typesetting/tex/nix/dot2ps.sh b/pkgs/tools/typesetting/tex/nix/dot2ps.sh index c70e76ce4c7..dd8de4a23db 100644 --- a/pkgs/tools/typesetting/tex/nix/dot2ps.sh +++ b/pkgs/tools/typesetting/tex/nix/dot2ps.sh @@ -4,7 +4,7 @@ mkdir -p $out dot2ps() { sourceFile=$1 - targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .dot).ps + targetName=$out/$(basename $(stripHash $sourceFile) .dot).ps echo "converting $sourceFile to $targetName..." dot -Tps $sourceFile > $targetName } diff --git a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh index f34b3944c8e..bfef3df6b0e 100644 --- a/pkgs/tools/typesetting/tex/nix/lhs2tex.sh +++ b/pkgs/tools/typesetting/tex/nix/lhs2tex.sh @@ -10,7 +10,7 @@ cd $startDir lhstex() { sourceFile=$1 - targetName=$out/$(basename $(stripHash $sourceFile; echo $strippedName) .lhs).tex + targetName=$out/$(basename $(stripHash $sourceFile) .lhs).tex echo "converting $sourceFile to $targetName..." lhs2TeX -o "$targetName" $flags "$sourceFile" } diff --git a/pkgs/tools/typesetting/tex/nix/run-latex.sh b/pkgs/tools/typesetting/tex/nix/run-latex.sh index fa27520d11c..3941fdcac4a 100644 --- a/pkgs/tools/typesetting/tex/nix/run-latex.sh +++ b/pkgs/tools/typesetting/tex/nix/run-latex.sh @@ -16,11 +16,11 @@ for i in $extraFiles; do if test -d $i; then ln -s $i/* . else - ln -s $i $(stripHash $i; echo $strippedName) + ln -s $i $(stripHash $i) fi done -rootName=$(basename $(stripHash "$rootFile"; echo $strippedName)) +rootName=$(basename $(stripHash "$rootFile")) rootNameBase=$(echo "$rootName" | sed 's/\..*//') diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 8d410a6bdb2..fe3c0b71b9b 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -107,7 +107,28 @@ core = stdenv.mkDerivation rec { mv ./texmf.cnf "$out/share/texmf-dist/web2c/" cp ../texk/tests/TeXLive/*.pm "$out/share/texmf-dist/scripts/texlive/TeXLive/" cp ../texk/texlive/linked_scripts/scripts.lst "$out/share/texmf-dist/scripts/texlive/" - '' + /* doc location identical with individual TeX pkgs */ '' + '' + + (let extraScripts = + '' + tex4ht/ht.sh + tex4ht/htcontext.sh + tex4ht/htcopy.pl + tex4ht/htlatex.sh + tex4ht/htmex.sh + tex4ht/htmove.pl + tex4ht/httex.sh + tex4ht/httexi.sh + tex4ht/htxelatex.sh + tex4ht/htxetex.sh + tex4ht/mk4ht.pl + tex4ht/xhlatex.sh + ''; + in + '' + echo -e 'texmf_scripts="$texmf_scripts\n${extraScripts}"' \ + >> "$out/share/texmf-dist/scripts/texlive/scripts.lst" + '') + + /* doc location identical with individual TeX pkgs */ '' mkdir -p "$doc/doc" mv "$doc"/share/{man,info} "$doc"/doc rmdir "$doc"/share diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index daa79d8e352..05ce5057347 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl -, glib, pango, pangoxsl, gtk, libtool, autoconf, automake }: +, glib, pango, pangoxsl, gtk2, libtool, autoconf, automake }: stdenv.mkDerivation rec { name = "xmlroff-${version}"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { glib pango pangoxsl - gtk + gtk2 popt ]; diff --git a/pkgs/tools/video/atomicparsley/default.nix b/pkgs/tools/video/atomicparsley/default.nix index bb44fe044e8..835cacf0098 100644 --- a/pkgs/tools/video/atomicparsley/default.nix +++ b/pkgs/tools/video/atomicparsley/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = with pkgs; [ unzip ] - ++ stdenv.lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; patches = [ ./casts.patch ]; setSourceRoot = "sourceRoot=${product}-source-${version}"; buildPhase = "bash build"; diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix index ebfff5dbabc..1ab0a9ae273 100644 --- a/pkgs/tools/video/mjpegtools/default.nix +++ b/pkgs/tools/video/mjpegtools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, gtk, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx +{ stdenv, lib, fetchurl, gtk2, libdv, libjpeg, libpng, libX11, pkgconfig, SDL, SDL_gfx , withMinimal ? false }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; buildInputs = [ libdv libjpeg libpng pkgconfig ] - ++ lib.optional (!withMinimal) [ gtk libX11 SDL SDL_gfx ]; + ++ lib.optionals (!withMinimal) [ gtk2 libX11 SDL SDL_gfx ]; NIX_CFLAGS_COMPILE = lib.optional (!withMinimal) "-I${SDL.dev}/include/SDL"; diff --git a/pkgs/tools/virtualization/nixos-container/default.nix b/pkgs/tools/virtualization/nixos-container/default.nix index 0763536533f..19394ea45d3 100644 --- a/pkgs/tools/virtualization/nixos-container/default.nix +++ b/pkgs/tools/virtualization/nixos-container/default.nix @@ -6,8 +6,6 @@ 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 1dfe4567d8d..5cb7e3b560b 100755 --- a/pkgs/tools/virtualization/nixos-container/nixos-container.pl +++ b/pkgs/tools/virtualization/nixos-container/nixos-container.pl @@ -8,9 +8,6 @@ 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; @@ -220,22 +217,6 @@ 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. # @@ -309,14 +290,14 @@ elsif ($action eq "login") { } elsif ($action eq "root-login") { - runInContainer("@su@", "root", "-l"); + exec("machinectl", "shell", $containerName, "/bin/sh", "-l"); } elsif ($action eq "run") { shift @ARGV; shift @ARGV; # Escape command. my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV); - runInContainer("@su@", "root", "-l", "-c", "exec " . $s); + exec("machinectl", "--quiet", "shell", $containerName, "/bin/sh", "-l", "-c", $s); } elsif ($action eq "show-ip") { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ee3aaa70b24..14c3e513d6c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -24,9 +24,9 @@ doNotDisplayTwice rec { asciidocFull = asciidoc-full; # added 2014-06-22 bar = lemonbar; # added 2015-01-16 bar-xft = lemonbar-xft; # added 2015-01-16 + bashCompletion = bash-completion; # Added 2016-09-28 bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 - buildbotSlave = buildbot-slave; # added 2014-12-09 bundler_HEAD = bundler; # added 2015-11-15 checkbashism = checkbashisms; # added 2016-08-16 cheetahTemplate = pythonPackages.cheetah; # 2015-06-15 @@ -100,6 +100,7 @@ doNotDisplayTwice rec { spaceOrbit = space-orbit; # addewd 2016-05-23 speedtest_cli = speedtest-cli; # added 2015-02-17 sqliteInteractive = sqlite-interactive; # added 2014-12-06 + sshfsFuse = sshfs-fuse; # added 2016-09 system_config_printer = system-config-printer; # added 2016-01-03 telepathy_qt5 = qt5.telepathy; # added 2015-12-19 tftp_hpa = tftp-hpa; # added 2015-04-03 @@ -114,4 +115,20 @@ doNotDisplayTwice rec { xlibs = xorg; # added 2015-09 youtubeDL = youtube-dl; # added 2014-10-26 m3d-linux = m33-linux; # added 2016-08-13 -} + + inherit (ocaml-ng) # added 2016-09-14 + ocamlPackages_3_10_0 ocamlPackages_3_11_2 ocamlPackages_3_12_1 + ocamlPackages_4_00_1 ocamlPackages_4_01_0 ocamlPackages_4_02 + ocamlPackages_4_03 + ocamlPackages_latest; +} // (with ocaml-ng; { # added 2016-09-14 + ocaml_3_08_0 = ocamlPackages_3_08_0.ocaml; + ocaml_3_10_0 = ocamlPackages_3_10_0.ocaml; + ocaml_3_11_2 = ocamlPackages_3_11_2.ocaml; + ocaml_3_12_1 = ocamlPackages_3_12_1.ocaml; + ocaml_4_00_1 = ocamlPackages_4_00_1.ocaml; + ocaml_4_01_0 = ocamlPackages_4_01_0.ocaml; + ocaml_4_02 = ocamlPackages_4_02.ocaml; + ocaml_4_03 = ocamlPackages_4_03.ocaml; + ocaml = ocamlPackages.ocaml; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9262c8c144a..9450ef9915e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -74,6 +74,8 @@ in else stdenv); + stdenvNoCC = stdenv.override { cc = null; }; + # For convenience, allow callers to get the path to Nixpkgs. path = ../..; @@ -285,7 +287,7 @@ in inherit kernel rootModules allowMissing; }; - nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; }; + nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; }; pathsFromGraph = ../build-support/kernel/paths-from-graph.pl; @@ -375,6 +377,8 @@ in afl = callPackage ../tools/security/afl { }; + afpfs-ng = callPackage ../tools/filesystems/afpfs-ng/default.nix { }; + aha = callPackage ../tools/text/aha { }; ahcpd = callPackage ../tools/networking/ahcpd { }; @@ -417,7 +421,7 @@ in arcanist = callPackage ../development/tools/misc/arcanist {}; - arduino = self.arduino-core.override { withGui = true; }; + arduino = arduino-core.override { withGui = true; }; arduino-core = callPackage ../development/arduino/arduino-core { jdk = jdk; @@ -471,12 +475,12 @@ in amule = callPackage ../tools/networking/p2p/amule { }; - amuleDaemon = appendToName "daemon" (self.amule.override { + amuleDaemon = appendToName "daemon" (amule.override { monolithic = false; daemon = true; }); - amuleGui = appendToName "gui" (self.amule.override { + amuleGui = appendToName "gui" (amule.override { monolithic = false; client = true; }); @@ -497,6 +501,8 @@ in elvish = callPackage ../shells/elvish { }; + enpass = callPackage ../tools/security/enpass { }; + genymotion = callPackage ../development/mobile/genymotion { }; grc = callPackage ../tools/misc/grc { }; @@ -505,6 +511,8 @@ in SDL = SDL_sixel; }; + gcsfuse = callPackage ../tools/filesystems/gcsfuse { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; pass = callPackage ../tools/security/pass { }; @@ -521,9 +529,9 @@ in pkgs_i686 = pkgsi686Linux; }; - inherit (self.androidenv) androidsdk_4_4 androidndk; + inherit (androidenv) androidsdk_4_4 androidndk; - androidsdk = self.androidenv.androidsdk_6_0; + androidsdk = androidenv.androidsdk_6_0; androidsdk_extras = self.androidenv.androidsdk_6_0_extras; @@ -534,7 +542,11 @@ in aria2 = callPackage ../tools/networking/aria2 { inherit (darwin.apple_sdk.frameworks) Security; }; - aria = self.aria2; + aria = aria2; + + aspcud = callPackage ../tools/misc/aspcud { + boost = boost155; + }; at = callPackage ../tools/system/at { }; @@ -600,9 +612,7 @@ in bitbucket-cli = pythonPackages.bitbucket-cli; - blink = callPackage ../applications/networking/instant-messengers/blink { - gnutls = gnutls33; - }; + blink = callPackage ../applications/networking/instant-messengers/blink { }; blink1-tool = callPackage ../tools/misc/blink1-tool { }; @@ -662,15 +672,17 @@ in btfs = callPackage ../os-specific/linux/btfs { }; - cabal2nix = self.haskell.lib.overrideCabal self.haskellPackages.cabal2nix (drv: { + burpsuite = callPackage ../tools/networking/burpsuite {}; + + cabal2nix = haskell.lib.overrideCabal haskellPackages.cabal2nix (drv: { isLibrary = false; enableSharedExecutables = false; - executableToolDepends = [ self.makeWrapper ]; + executableToolDepends = [ makeWrapper ]; postInstall = '' exe=$out/libexec/${drv.pname}-${drv.version}/${drv.pname} install -D $out/bin/${drv.pname} $exe rm -rf $out/{bin,lib,share} - makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${self.nix-prefetch-scripts}/bin" + makeWrapper $exe $out/bin/${drv.pname} --prefix PATH ":" "${nix-prefetch-scripts}/bin" mkdir -p $out/share/bash-completion/completions $exe --bash-completion-script $exe >$out/share/bash-completion/completions/${drv.pname} ''; @@ -710,6 +722,8 @@ in ckbcomp = callPackage ../tools/X11/ckbcomp { }; + clasp = callPackage ../tools/misc/clasp { }; + cli53 = callPackage ../tools/admin/cli53 { }; cli-visualizer = callPackage ../applications/misc/cli-visualizer { }; @@ -728,6 +742,8 @@ in consul-template = callPackage ../tools/system/consul-template { }; + corebird = callPackage ../applications/networking/corebird { }; + corosync = callPackage ../servers/corosync { }; cherrytree = callPackage ../applications/misc/cherrytree { }; @@ -809,6 +825,8 @@ in ent = callPackage ../tools/misc/ent { }; + f3 = callPackage ../tools/filesystems/f3 { }; + facter = callPackage ../tools/system/facter { ruby = ruby_2_1; }; @@ -841,16 +859,26 @@ in glide = callPackage ../development/tools/glide { }; + glock = callPackage ../development/tools/glock { }; + gmic = callPackage ../tools/graphics/gmic { }; + goa = callPackage ../development/tools/goa { }; + + gringo = callPackage ../tools/misc/gringo { }; + gti = callPackage ../tools/misc/gti { }; heatseeker = callPackage ../tools/misc/heatseeker { }; + hexio = callPackage ../development/tools/hexio { }; + interlock = callPackage ../servers/interlock {}; kapacitor = callPackage ../servers/monitoring/kapacitor { }; + languagetool = callPackage ../tools/text/languagetool { }; + long-shebang = callPackage ../misc/long-shebang {}; mathics = pythonPackages.mathics; @@ -919,24 +947,26 @@ in appdata-tools = callPackage ../tools/misc/appdata-tools { }; asciidoc = callPackage ../tools/typesetting/asciidoc { - inherit (pythonPackages) matplotlib numpy aafigure recursivePthLoader; + inherit (python2Packages) matplotlib numpy aafigure recursivePthLoader; w3m = w3m-batch; enableStandardFeatures = false; }; - asciidoc-full = appendToName "full" (self.asciidoc.override { - inherit (pythonPackages) pygments; + asciidoc-full = appendToName "full" (asciidoc.override { + inherit (python2Packages) pygments; enableStandardFeatures = true; }); - asciidoc-full-with-plugins = appendToName "full-with-plugins" (self.asciidoc.override { - inherit (pythonPackages) pygments; + asciidoc-full-with-plugins = appendToName "full-with-plugins" (asciidoc.override { + inherit (python2Packages) pygments; enableStandardFeatures = true; enableExtraPlugins = true; }); asciidoctor = callPackage ../tools/typesetting/asciidoctor { }; + asunder = callPackage ../applications/audio/asunder { }; + autossh = callPackage ../tools/networking/autossh { }; asynk = callPackage ../tools/networking/asynk { }; @@ -1032,9 +1062,9 @@ in mdf2iso = callPackage ../tools/cd-dvd/mdf2iso { }; - libceph = self.ceph.lib; + libceph = ceph.lib; ceph = callPackage ../tools/filesystems/ceph { boost = boost159; }; - ceph-dev = self.ceph; + ceph-dev = ceph; #ceph-dev = lowPrio (callPackage ../tools/filesystems/ceph/dev.nix { }); cfdg = callPackage ../tools/graphics/cfdg { @@ -1066,7 +1096,7 @@ in gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_ugly gst_ffmpeg ]; }; - clementineFree = self.clementine.free; + clementineFree = clementine.free; ciopfs = callPackage ../tools/filesystems/ciopfs { }; @@ -1097,7 +1127,6 @@ in convertlit = callPackage ../tools/text/convertlit { }; collectd = callPackage ../tools/system/collectd { - rabbitmq-c = rabbitmq-c_0_4; libmysql = mysql.lib; libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet }; @@ -1123,8 +1152,6 @@ in libpinyin = callPackage ../development/libraries/libpinyin { }; - ibus-libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { }; - m17n_db = callPackage ../tools/inputmethods/m17n-db { }; m17n_lib = callPackage ../tools/inputmethods/m17n-lib { }; @@ -1168,6 +1195,7 @@ in ibus-table = ibus-engines.table; }; + uniemoji = callPackage ../tools/inputmethods/ibus-engines/ibus-uniemoji { }; }; ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix { @@ -1183,6 +1211,8 @@ in biosdevname = callPackage ../tools/networking/biosdevname { }; + c14 = callPackage ../applications/networking/c14 { }; + checkbashisms = callPackage ../development/tools/misc/checkbashisms { }; clamav = callPackage ../tools/security/clamav { }; @@ -1236,15 +1266,15 @@ in cudatoolkit7 cudatoolkit75; - cudatoolkit = self.cudatoolkit7; + cudatoolkit = cudatoolkit7; cudnn = callPackage ../development/libraries/science/math/cudnn/default.nix {}; cudnn5_cudatoolkit75 = callPackage ../development/libraries/science/math/cudnn/7.5-5.0 { - cudatoolkit = self.cudatoolkit75; + cudatoolkit = cudatoolkit75; }; - curlFull = self.curl.override { + curlFull = curl.override { idnSupport = true; ldapSupport = true; gssSupport = true; @@ -1258,11 +1288,6 @@ in scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin; }; - curl3 = callPackage ../tools/networking/curl/7.15.nix rec { - zlibSupport = true; - sslSupport = zlibSupport; - }; - curl_unix_socket = callPackage ../tools/networking/curl-unix-socket rec { }; cunit = callPackage ../tools/misc/cunit { }; @@ -1384,6 +1409,8 @@ in inherit (perlPackages) XMLSAX XMLParser XMLNamespaceSupport; }; + docbook2mdoc = callPackage ../tools/misc/docbook2mdoc { }; + dog = callPackage ../tools/system/dog { }; dosfstools = callPackage ../tools/filesystems/dosfstools { }; @@ -1540,6 +1567,8 @@ in pillow; }; + fastd = callPackage ../tools/networking/fastd { }; + fatsort = callPackage ../tools/filesystems/fatsort { }; fcitx = callPackage ../tools/inputmethods/fcitx { @@ -1566,6 +1595,8 @@ in table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { }; cloudpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-cloudpinyin { }; + + libpinyin = callPackage ../tools/inputmethods/fcitx-engines/fcitx-libpinyin { }; }; fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { }; @@ -1663,6 +1694,8 @@ in fprint_demo = callPackage ../tools/security/fprint_demo { }; + franz = callPackage ../applications/networking/instant-messengers/franz { }; + freeipmi = callPackage ../tools/system/freeipmi {}; freetalk = callPackage ../applications/networking/instant-messengers/freetalk { }; @@ -1750,6 +1783,8 @@ in gengetopt = callPackage ../development/tools/misc/gengetopt { }; + geteltorito = callPackage ../tools/misc/geteltorito { }; + getmail = callPackage ../tools/networking/getmail { }; getopt = callPackage ../tools/misc/getopt { }; @@ -1772,6 +1807,8 @@ in ruby = ruby_2_2; }; + gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { }; + gitlab-shell = callPackage ../applications/version-management/gitlab-shell { ruby = ruby_2_2; }; @@ -1810,17 +1847,17 @@ in gnupg1orig = callPackage ../tools/security/gnupg/1.nix { }; gnupg1compat = callPackage ../tools/security/gnupg/1compat.nix { }; - gnupg1 = self.gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 + gnupg1 = gnupg1compat; # use config.packageOverrides if you prefer original gnupg1 gnupg20 = callPackage ../tools/security/gnupg/20.nix { }; gnupg21 = callPackage ../tools/security/gnupg/21.nix { }; - gnupg = self.gnupg21; + gnupg = gnupg21; gnuplot = callPackage ../tools/graphics/gnuplot { qt = qt4; }; - gnuplot_qt = self.gnuplot.override { withQt = true; }; + gnuplot_qt = gnuplot.override { withQt = true; }; # must have AquaTerm installed separately - gnuplot_aquaterm = self.gnuplot.override { aquaterm = true; }; + gnuplot_aquaterm = gnuplot.override { aquaterm = true; }; gnused = callPackage ../tools/text/gnused { }; @@ -1888,6 +1925,7 @@ in graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { }; grin = callPackage ../tools/text/grin { }; + ripgrep = callPackage ../tools/text/ripgrep { }; grive = callPackage ../tools/filesystems/grive { json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable @@ -1897,6 +1935,8 @@ in groff = callPackage ../tools/text/groff { ghostscript = null; + psutils = null; + netpbm = null; }; groonga = callPackage ../servers/search/groonga { }; @@ -1909,15 +1949,15 @@ in trustedGrub-for-HP = callPackage_i686 ../tools/misc/grub/trusted.nix { for_HP_laptop = true; }; - grub2 = self.grub2_full; + grub2 = grub2_full; grub2_full = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = self.grub2_full.override { + grub2_efi = grub2_full.override { efiSupport = true; }; - grub2_light = self.grub2_full.override { + grub2_light = grub2_full.override { zfsSupport = false; }; @@ -1931,11 +1971,11 @@ in sbsigntool = callPackage ../tools/security/sbsigntool { }; gsmartcontrol = callPackage ../tools/misc/gsmartcontrol { - inherit (gnome) libglademm; + inherit (gnome2) libglademm; }; gssdp = callPackage ../development/libraries/gssdp { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; gt5 = callPackage ../tools/system/gt5 { }; @@ -1958,7 +1998,7 @@ in gup = callPackage ../development/tools/build-managers/gup {}; gupnp = callPackage ../development/libraries/gupnp { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; gupnp_av = callPackage ../development/libraries/gupnp-av {}; @@ -2018,16 +2058,16 @@ in mpi = null; }; - hdf5-mpi = appendToName "mpi" (self.hdf5.override { + hdf5-mpi = appendToName "mpi" (hdf5.override { szip = null; mpi = pkgs.openmpi; }); - hdf5-cpp = appendToName "cpp" (self.hdf5.override { + hdf5-cpp = appendToName "cpp" (hdf5.override { cpp = true; }); - hdf5-fortran = appendToName "fortran" (self.hdf5.override { + hdf5-fortran = appendToName "fortran" (hdf5.override { inherit gfortran; }); @@ -2049,10 +2089,12 @@ in horst = callPackage ../tools/networking/horst { }; - host = callPackage ../tools/networking/host { }; + host = bind.host; hping = callPackage ../tools/networking/hping { }; + htpdate = callPackage ../tools/networking/htpdate { }; + http-prompt = callPackage ../tools/networking/http-prompt { }; httpie = callPackage ../tools/networking/httpie { }; @@ -2061,6 +2103,8 @@ in httpfs2 = callPackage ../tools/filesystems/httpfs { }; + httpstat = callPackage ../tools/networking/httpstat { }; + httptunnel = callPackage ../tools/networking/httptunnel { }; hubicfuse = callPackage ../tools/filesystems/hubicfuse { }; @@ -2145,7 +2189,7 @@ in iperf2 = callPackage ../tools/networking/iperf/2.nix { }; iperf3 = callPackage ../tools/networking/iperf/3.nix { }; - iperf = self.iperf3; + iperf = iperf3; ipfs = callPackage ../applications/networking/ipfs { }; @@ -2165,7 +2209,7 @@ in ised = callPackage ../tools/misc/ised {}; - isl = self.isl_0_15; + isl = isl_0_15; isl_0_11 = callPackage ../development/libraries/isl/0.11.1.nix { }; isl_0_12 = callPackage ../development/libraries/isl/0.12.2.nix { }; isl_0_14 = callPackage ../development/libraries/isl/0.14.1.nix { }; @@ -2222,6 +2266,8 @@ in kalibrate-rtl = callPackage ../tools/misc/kalibrate-rtl { }; + kalibrate-hackrf = callPackage ../tools/misc/kalibrate-hackrf { }; + kakoune = callPackage ../applications/editors/kakoune { }; kbdd = callPackage ../applications/window-managers/kbdd { }; @@ -2260,6 +2306,10 @@ in less = callPackage ../tools/misc/less { }; + lf = callPackage ../tools/misc/lf {}; + + lhasa = callPackage ../tools/compression/lhasa {}; + libcpuid = callPackage ../tools/misc/libcpuid { }; lesspipe = callPackage ../tools/misc/lesspipe { }; @@ -2369,10 +2419,6 @@ in libtool = darwin.cctools; }; - nodejs-5_x = callPackage ../development/web/nodejs/v5.nix { - libtool = darwin.cctools; - }; - nodejs-6_x = callPackage ../development/web/nodejs/v6.nix { libtool = darwin.cctools; }; @@ -2386,10 +2432,6 @@ in nodejs = pkgs.nodejs-6_x; }; - nodePackages_5_x = callPackage ../development/node-packages/default-v5.nix { - nodejs = pkgs.nodejs-5_x; - }; - nodePackages_4_x = callPackage ../development/node-packages/default-v4.nix { nodejs = pkgs.nodejs-4_x; }; @@ -2436,6 +2478,8 @@ in libircclient = callPackage ../development/libraries/libircclient { }; + libite = callPackage ../development/libraries/libite { }; + liboauth = callPackage ../development/libraries/liboauth { }; libsidplayfp = callPackage ../development/libraries/libsidplayfp { }; @@ -2460,6 +2504,10 @@ in libmongo-client = callPackage ../development/libraries/libmongo-client { }; + libnabo = callPackage ../development/libraries/libnabo { }; + + libpointmatcher = callPackage ../development/libraries/libpointmatcher { }; + libtorrent = callPackage ../tools/networking/p2p/libtorrent { }; libmpack = callPackage ../development/libraries/libmpack { }; @@ -2558,6 +2606,8 @@ in man-db = callPackage ../tools/misc/man-db { }; + mandoc = callPackage ../tools/misc/mandoc { }; + mawk = callPackage ../tools/text/mawk { }; mbox = callPackage ../tools/security/mbox { }; @@ -2593,7 +2643,7 @@ in mdbtools = callPackage ../tools/misc/mdbtools { }; mdbtools_git = callPackage ../tools/misc/mdbtools/git.nix { - inherit (gnome) scrollkeeper; + inherit (gnome2) scrollkeeper; }; mdk = callPackage ../development/tools/mdk { }; @@ -2711,6 +2761,8 @@ in mysql2pgsql = callPackage ../tools/misc/mysql2pgsql { }; + mysqltuner = callPackage ../tools/misc/mysqltuner { }; + nabi = callPackage ../tools/inputmethods/nabi { }; namazu = callPackage ../tools/text/namazu { }; @@ -2780,12 +2832,16 @@ in networkmanager_openconnect = callPackage ../tools/networking/network-manager/openconnect.nix { }; - networkmanagerapplet = newScope gnome ../tools/networking/network-manager-applet { }; + networkmanagerapplet = newScope gnome2 ../tools/networking/network-manager-applet { }; newsbeuter = callPackage ../applications/networking/feedreaders/newsbeuter { }; newsbeuter-dev = callPackage ../applications/networking/feedreaders/newsbeuter/dev.nix { }; + nextcloud = callPackage ../servers/nextcloud { }; + + nextcloud-news-updater = callPackage ../servers/nextcloud/news-updater.nix { }; + ngrep = callPackage ../tools/networking/ngrep { }; ngrok = callPackage ../tools/networking/ngrok { }; @@ -2815,6 +2871,8 @@ in nitrogen = callPackage ../tools/X11/nitrogen {}; + nixbot = callPackage ../tools/misc/nixbot {}; + nkf = callPackage ../tools/text/nkf {}; nlopt = callPackage ../development/libraries/nlopt {}; @@ -2886,9 +2944,7 @@ in obnam = callPackage ../tools/backup/obnam { }; - odpdown = callPackage ../tools/typesetting/odpdown { - inherit (pythonPackages) lpod lxml mistune pillow pygments; - }; + odpdown = callPackage ../tools/typesetting/odpdown { }; odt2txt = callPackage ../tools/text/odt2txt { }; @@ -2981,7 +3037,8 @@ in owncloud80 owncloud81 owncloud82 - owncloud90; + owncloud90 + owncloud91; owncloud-client = callPackage ../applications/networking/owncloud-client { }; @@ -2993,6 +3050,8 @@ in nix = nixUnstable; }; + pakcs = callPackage ../development/compilers/pakcs {}; + pal = callPackage ../tools/misc/pal { }; pandoc = haskell.lib.overrideCabal haskellPackages.pandoc (drv: { @@ -3183,6 +3242,8 @@ in podiff = callPackage ../tools/text/podiff { }; + pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; + poedit = callPackage ../tools/text/poedit { }; polipo = callPackage ../servers/polipo { }; @@ -3231,6 +3292,8 @@ in progress = callPackage ../tools/misc/progress { }; + ps3netsrv = callPackage ../servers/ps3netsrv { }; + psmisc = callPackage ../os-specific/linux/psmisc { }; pstoedit = callPackage ../tools/graphics/pstoedit { }; @@ -3249,11 +3312,9 @@ in pygmentex = callPackage ../tools/typesetting/pygmentex { }; - pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pythonIRClib = pythonPackages.pythonIRClib; - pythonSexy = callPackage ../development/python-modules/libsexy { }; + pythonSexy = pythonPackages.libsexy; pytrainer = callPackage ../applications/misc/pytrainer { }; @@ -3311,6 +3372,8 @@ in radvd = callPackage ../tools/networking/radvd { }; + rambox = callPackage ../applications/networking/instant-messengers/rambox { }; + ranger = callPackage ../applications/misc/ranger { }; rarcrack = callPackage ../tools/security/rarcrack { }; @@ -3353,7 +3416,7 @@ in reiserfsprogs = callPackage ../tools/filesystems/reiserfsprogs { }; relfs = callPackage ../tools/filesystems/relfs { - inherit (gnome) gnome_vfs GConf; + inherit (gnome2) gnome_vfs GConf; }; remarkjs = callPackage ../development/web/remarkjs { }; @@ -3461,6 +3524,8 @@ in safe-rm = callPackage ../tools/system/safe-rm { }; + salt = callPackage ../tools/admin/salt {}; + salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {}; samplicator = callPackage ../tools/networking/samplicator { }; @@ -3589,6 +3654,8 @@ in storebrowse = callPackage ../tools/system/storebrowse { }; + syntex = callPackage ../tools/graphics/syntex {}; + fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; sl = callPackage ../tools/misc/sl { }; @@ -3605,7 +3672,7 @@ in squashfsTools = callPackage ../tools/filesystems/squashfs { }; - sshfsFuse = callPackage ../tools/filesystems/sshfs-fuse { }; + sshfs-fuse = callPackage ../tools/filesystems/sshfs-fuse { }; sshuttle = callPackage ../tools/security/sshuttle { }; @@ -3631,7 +3698,9 @@ in sshpass = callPackage ../tools/networking/sshpass { }; - sslscan = callPackage ../tools/security/sslscan { }; + sslscan = callPackage ../tools/security/sslscan { + openssl = openssl_1_0_1.override { enableSSL2 = true; }; + }; sslmate = callPackage ../development/tools/sslmate { }; @@ -3686,7 +3755,7 @@ in stricat = callPackage ../tools/security/stricat { }; - staruml = callPackage ../tools/misc/staruml { inherit (gnome) GConf; libgcrypt = libgcrypt_1_5; }; + staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; privoxy = callPackage ../tools/networking/privoxy { w3m = w3m-batch; @@ -3722,6 +3791,8 @@ in telnet = callPackage ../tools/networking/telnet { }; + telegraf = callPackage ../servers/monitoring/telegraf { }; + texmacs = callPackage ../applications/editors/texmacs { tex = texlive.combined.scheme-small; extraFonts = true; @@ -3735,6 +3806,8 @@ in thc-hydra = callPackage ../tools/security/thc-hydra { }; + thin-provisioning-tools = callPackage ../tools/misc/thin-provisioning-tools { }; + tiled = qt5.callPackage ../applications/editors/tiled { }; timemachine = callPackage ../applications/audio/timemachine { }; @@ -3847,6 +3920,8 @@ in udftools = callPackage ../tools/filesystems/udftools {}; + udpt = callPackage ../servers/udpt { }; + udptunnel = callPackage ../tools/networking/udptunnel { }; ufraw = callPackage ../applications/graphics/ufraw { }; @@ -3904,7 +3979,7 @@ in vifm = callPackage ../applications/misc/vifm { }; viking = callPackage ../applications/misc/viking { - inherit (gnome) scrollkeeper; + inherit (gnome2) scrollkeeper; inherit (gnome3) gexiv2; }; @@ -3952,6 +4027,8 @@ in watchman = callPackage ../development/tools/watchman { }; + wavefunctioncollapse = callPackage ../tools/graphics/wavefunctioncollapse {}; + wbox = callPackage ../tools/networking/wbox {}; welkin = callPackage ../tools/graphics/welkin {}; @@ -4146,6 +4223,8 @@ in wml = callPackage ../development/web/wml { }; + wol = callPackage ../tools/networking/wol { }; + wring = nodePackages.wring; wrk = callPackage ../tools/networking/wrk { }; @@ -4154,9 +4233,7 @@ in wv2 = callPackage ../tools/misc/wv2 { }; - wyrd = callPackage ../tools/misc/wyrd { - inherit (ocamlPackages) camlp4; - }; + inherit (ocamlPackages) wyrd; x86info = callPackage ../os-specific/linux/x86info { }; @@ -4203,19 +4280,17 @@ in xdummy = callPackage ../tools/misc/xdummy { }; + xdxf2slob = callPackage ../tools/misc/xdxf2slob { }; + xe-guest-utilities = callPackage ../tools/virtualization/xe-guest-utilities { }; xflux = callPackage ../tools/misc/xflux { }; xflux-gui = callPackage ../tools/misc/xflux/gui.nix { - pexpect = pythonPackages.pexpect; - pyGtkGlade = pythonPackages.pyGtkGlade; - pygobject = pythonPackages.pygobject; - pyxdg = pythonPackages.pyxdg; - gnome_python = gnome.gnome_python; + gnome_python = gnome2.gnome_python; }; xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; - libxfs = self.xfsprogs.dev; # outputs TODO + libxfs = xfsprogs.dev; # outputs TODO xml2 = callPackage ../tools/text/xml/xml2 { }; @@ -4262,11 +4337,7 @@ in zbackup = callPackage ../tools/backup/zbackup {}; - zbar = callPackage ../tools/graphics/zbar { - pygtk = lib.overrideDerivation pygtk (x: { - gtk = gtk2; - }); - }; + zbar = callPackage ../tools/graphics/zbar { }; zdelta = callPackage ../tools/compression/zdelta { }; @@ -4296,6 +4367,8 @@ in zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { }; + zsh-syntax-highlighting = callPackage ../shells/zsh-syntax-highlighting { }; + zstd = callPackage ../tools/compression/zstd { }; zsync = callPackage ../tools/compression/zsync { }; @@ -4305,16 +4378,16 @@ in ### SHELLS - bash = lowPrio (callPackage ../shells/bash { + bash = lowPrio (callPackage ../shells/bash/4.3.nix { texinfo = null; interactive = stdenv.isCygwin; # patch for cygwin requires readline support }); - bashInteractive = appendToName "interactive" (callPackage ../shells/bash { + bashInteractive = appendToName "interactive" (callPackage ../shells/bash/4.4.nix { interactive = true; }); - bashCompletion = callPackage ../shells/bash-completion { }; + bash-completion = callPackage ../shells/bash-completion { }; dash = callPackage ../shells/dash { }; @@ -4377,7 +4450,7 @@ in }; boo = callPackage ../development/compilers/boo { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; colm = callPackage ../development/compilers/colm { }; @@ -4400,17 +4473,20 @@ in clang = llvmPackages.clang; + clang_39 = llvmPackages_39.clang; clang_38 = llvmPackages_38.clang; clang_37 = llvmPackages_37.clang; clang_36 = llvmPackages_36.clang; clang_35 = wrapCC llvmPackages_35.clang; clang_34 = wrapCC llvmPackages_34.clang; + clang-tools = callPackage ../development/tools/clang-tools { }; + clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { }; clangUnwrapped = llvm: pkg: callPackage pkg { inherit llvm; }; - clangSelf = self.clangWrapSelf llvmPackagesSelf.clang; + clangSelf = clangWrapSelf llvmPackagesSelf.clang; clangWrapSelf = build: callPackage ../build-support/cc-wrapper { cc = build; @@ -4434,14 +4510,7 @@ in cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { }; - compcert = callPackage ../development/compilers/compcert (( - if system == "x86_64-linux" - then { tools = pkgsi686Linux.stdenv.cc; } - else {} - ) // { - ocamlPackages = ocamlPackages_4_02; - coq = coq_8_5; - }); + inherit (ocaml-ng.ocamlPackages_4_02) compcert; # Users installing via `nix-env` will likely be using the REPL, # which has a hard dependency on Z3, so make sure it is available. @@ -4562,7 +4631,9 @@ in cross = null; libcCross = if crossSystem != null then libcCross else null; - isl = isl_0_14; + isl = if !stdenv.isDarwin then isl_0_14 else null; + cloog = if !stdenv.isDarwin then cloog else null; + texinfo = texinfo5; # doesn't validate since 6.1 -> 6.3 bump })); gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { @@ -4577,9 +4648,9 @@ in cross = null; libcCross = if crossSystem != null then libcCross else null; - isl = isl_0_11; + isl = if !stdenv.isDarwin then isl_0_11 else null; - cloog = cloog_0_18_0; + cloog = if !stdenv.isDarwin then cloog_0_18_0 else null; })); gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 { @@ -4594,7 +4665,7 @@ in cross = null; libcCross = if crossSystem != null then libcCross else null; - isl = isl_0_14; + isl = if !stdenv.isDarwin then isl_0_14 else null; })); gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 { @@ -4609,7 +4680,7 @@ in cross = null; libcCross = if crossSystem != null then libcCross else null; - isl = isl_0_14; + isl = if !stdenv.isDarwin then isl_0_14 else null; })); gfortran = if !stdenv.isDarwin then gfortran5 @@ -4658,8 +4729,7 @@ in langC = false; profiledCompiler = false; inherit zip unzip zlib boehmgc gettext pkgconfig perl; - inherit gtk; - inherit (gnome) libart_lgpl; + inherit (gnome2) libart_lgpl; }); gnat = gnat45; # failed to make 4.6 or 4.8 build @@ -4693,7 +4763,13 @@ in profiledCompiler = false; }); - ghdl_mcode = callPackage ../development/compilers/ghdl { }; + ghdl_mcode = callPackage_i686 ../development/compilers/ghdl { + flavour = "mcode"; + }; + + ghdl_llvm = callPackage ../development/compilers/ghdl { + flavour = "llvm"; + }; gcl = callPackage ../development/compilers/gcl { gmp = gmp4; @@ -4721,7 +4797,7 @@ in releaseType = "update"; sha256 = "1r0rqbnw7rf94f5bsa3gi8bick4xb7qnp1dkvdjfbvqjvysvc44r"; }; - gcc-arm-embedded = self.gcc-arm-embedded-5; + gcc-arm-embedded = gcc-arm-embedded-5; gforth = callPackage ../development/compilers/gforth {}; @@ -4735,7 +4811,7 @@ in overrides = config.haskellPackageOverrides or (self: super: {}); }; - inherit (self.haskellPackages) ghc; + inherit (haskellPackages) ghc; cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install; @@ -4746,9 +4822,7 @@ in postFixup = "rm -rf $out/lib $out/nix-support $out/share/doc"; }); - haxe = callPackage ../development/compilers/haxe { - inherit (ocamlPackages) camlp4; - }; + inherit (ocamlPackages) haxe; hxcpp = callPackage ../development/compilers/haxe/hxcpp.nix { }; @@ -4758,10 +4832,10 @@ in falcon = callPackage ../development/interpreters/falcon { }; - fsharp = callPackage ../development/compilers/fsharp {}; + fsharp = callPackage ../development/compilers/fsharp { }; fstar = callPackage ../development/compilers/fstar { - ocamlPackages = ocamlPackages_4_02; + ocamlPackages = ocaml-ng.ocamlPackages_4_02; }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); @@ -4780,7 +4854,7 @@ in stdenv = stdenvAdapters.overrideCC pkgs.stdenv pkgs.clang_38; }); - go = self.go_1_7; + go = go_1_7; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -4798,7 +4872,7 @@ in jdk = jdk8; }; - icedtea_web = self.icedtea8_web; + icedtea_web = icedtea8_web; idrisPackages = callPackage ../development/idris-modules { inherit (haskellPackages) idris; @@ -4824,71 +4898,52 @@ in else callPackage ../development/compilers/openjdk/8.nix { bootjdk = callPackage ../development/compilers/openjdk/bootstrap.nix { version = "8"; }; + inherit (gnome2) GConf gnome_vfs; }; - openjdk = if stdenv.isDarwin then self.openjdk7 else self.openjdk8; + openjdk = if stdenv.isDarwin then openjdk7 else openjdk8; - jdk7 = self.openjdk7 // { outputs = [ "out" ]; }; + jdk7 = openjdk7 // { outputs = [ "out" ]; }; jre7 = lib.setName "openjre-${lib.getVersion pkgs.openjdk7.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (self.openjdk7.jre // { outputs = [ "jre" ]; })); + (openjdk7.jre // { outputs = [ "jre" ]; })); - jdk8 = self.openjdk8 // { outputs = [ "out" ]; }; + jdk8 = openjdk8 // { outputs = [ "out" ]; }; jre8 = lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}" (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } - (self.openjdk8.jre // { outputs = [ "jre" ]; })); + (openjdk8.jre // { outputs = [ "jre" ]; })); + jre8_headless = + if stdenv.isDarwin then jre8 else + lib.setName "openjre-${lib.getVersion pkgs.openjdk8.jre}-headless" + (lib.addMetaAttrs { outputsToInstall = [ "jre" ]; } + ((openjdk8.override { minimal = true; }).jre // { outputs = [ "jre" ]; })); - jdk = if stdenv.isDarwin then self.jdk7 else self.jdk8; - jre = if stdenv.isDarwin then self.jre7 else self.jre8; + jdk = if stdenv.isDarwin then jdk7 else jdk8; + jre = if stdenv.isDarwin then jre7 else jre8; openshot-qt = callPackage ../applications/video/openshot-qt { }; - oraclejdk = self.jdkdistro true false; + oraclejdk = pkgs.jdkdistro true false; - oraclejdk7 = self.oraclejdk7distro true false; + oraclejdk8 = pkgs.oraclejdk8distro true false; - oraclejdk7psu = self.oraclejdk7psu_distro true false; + oraclejdk8psu = pkgs.oraclejdk8psu_distro true false; - oraclejdk8 = self.oraclejdk8distro true false; + oraclejre = lowPrio (pkgs.jdkdistro false false); - oraclejdk8psu = self.oraclejdk8psu_distro true false; + oraclejre8 = lowPrio (pkgs.oraclejdk8distro false false); - oraclejre = lowPrio (self.jdkdistro false false); + oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false); - oraclejre7 = lowPrio (self.oraclejdk7distro false false); + jrePlugin = jre8Plugin; - oraclejre7psu = lowPrio (self.oraclejdk7psu_distro false false); - - oraclejre8 = lowPrio (self.oraclejdk8distro false false); - - oraclejre8psu = lowPrio (self.oraclejdk8psu_distro false false); - - jrePlugin = self.jre8Plugin; - - jre6Plugin = lowPrio (self.jdkdistro false true); - - jre7Plugin = lowPrio (self.oraclejdk7distro false true); - - jre8Plugin = lowPrio (self.oraclejdk8distro false true); + jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true); supportsJDK = system == "i686-linux" || system == "x86_64-linux"; - jdkdistro = installjdk: pluginSupport: - assert supportsJDK; - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk6-linux.nix { }); - - oraclejdk7distro = installjdk: pluginSupport: - assert supportsJDK; - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk7-linux.nix { inherit installjdk; }); - - oraclejdk7psu_distro = installjdk: pluginSupport: - assert supportsJDK; - (if pluginSupport then appendToName "with-plugin" else x: x) - (callPackage ../development/compilers/oraclejdk/jdk7psu-linux.nix { inherit installjdk; }); + jdkdistro = oraclejdk8distro; oraclejdk8distro = installjdk: pluginSupport: assert supportsJDK; @@ -4925,17 +4980,18 @@ in lizardfs = callPackage ../tools/filesystems/lizardfs { }; - llvm = self.llvmPackages.llvm; + llvm = llvmPackages.llvm; - llvm_38 = self.llvmPackages_38.llvm; - llvm_37 = self.llvmPackages_37.llvm; - llvm_36 = self.llvmPackages_36.llvm; - llvm_35 = self.llvmPackages_35.llvm; - llvm_34 = self.llvmPackages_34.llvm; + llvm_39 = llvmPackages_39.llvm; + llvm_38 = llvmPackages_38.llvm; + llvm_37 = llvmPackages_37.llvm; + llvm_36 = llvmPackages_36.llvm; + llvm_35 = llvmPackages_35.llvm; + llvm_34 = llvmPackages_34.llvm; - llvmPackages = recurseIntoAttrs self.llvmPackages_37; + llvmPackages = recurseIntoAttrs llvmPackages_37; - llvmPackagesSelf = self.llvmPackages_34.override { + llvmPackagesSelf = llvmPackages_34.override { stdenv = libcxxStdenv; }; @@ -5013,21 +5069,11 @@ in nvidia_cg_toolkit = callPackage ../development/compilers/nvidia-cg-toolkit { }; - ocaml = ocamlPackages.ocaml; + obliv-c = callPackage ../development/compilers/obliv-c {}; - ocaml_3_08_0 = callPackage ../development/compilers/ocaml/3.08.0.nix { }; + ocaml-ng = callPackage ./ocaml-packages.nix { }; - ocaml_3_10_0 = callPackage ../development/compilers/ocaml/3.10.0.nix { }; - - ocaml_3_11_2 = callPackage ../development/compilers/ocaml/3.11.2.nix { }; - - ocaml_3_12_1 = callPackage ../development/compilers/ocaml/3.12.1.nix { }; - - ocaml_4_00_1 = callPackage ../development/compilers/ocaml/4.00.1.nix { }; - - ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { }; - - ocaml_4_02 = callPackage ../development/compilers/ocaml/4.02.nix { }; + ocamlPackages = recurseIntoAttrs ocaml-ng.ocamlPackages; orc = callPackage ../development/compilers/orc { }; @@ -5035,493 +5081,17 @@ in ber_metaocaml_003 = callPackage ../development/compilers/ocaml/ber-metaocaml-003.nix { }; - mkOcamlPackages = ocaml: self: - let - callPackage = newScope self; - ocaml_version = (builtins.parseDrvName ocaml.name).version; - in rec { - inherit ocaml; - buildOcaml = callPackage ../build-support/ocaml { }; - - acgtk = callPackage ../applications/science/logic/acgtk { }; - - alcotest = callPackage ../development/ocaml-modules/alcotest {}; - - ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; - - asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; - - async_extra = callPackage ../development/ocaml-modules/async_extra { }; - - async_find = callPackage ../development/ocaml-modules/async_find { }; - - async_kernel = callPackage ../development/ocaml-modules/async_kernel { }; - - async_shell = callPackage ../development/ocaml-modules/async_shell { }; - - async_ssl = callPackage ../development/ocaml-modules/async_ssl { }; - - async_unix = callPackage ../development/ocaml-modules/async_unix { }; - - async = - if lib.versionOlder "4.02" ocaml_version - then callPackage ../development/ocaml-modules/async { } - else null; - - atd = callPackage ../development/ocaml-modules/atd { }; - - atdgen = callPackage ../development/ocaml-modules/atdgen { }; - - base64 = callPackage ../development/ocaml-modules/base64 { }; - - bolt = callPackage ../development/ocaml-modules/bolt { }; - - bitstring_2_0_4 = callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { }; - bitstring_git = callPackage ../development/ocaml-modules/bitstring { }; - - bitstring = - if lib.versionOlder "4.02" ocaml_version - then bitstring_git - else bitstring_2_0_4; - - camlidl = callPackage ../development/tools/ocaml/camlidl { }; - - camlp4 = - if lib.versionOlder "4.02" ocaml_version - then callPackage ../development/tools/ocaml/camlp4 { } - else null; - - camlp5_old_strict = - if lib.versionOlder "4.00" ocaml_version - then camlp5_6_strict - else callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; - - camlp5_old_transitional = - if lib.versionOlder "4.00" ocaml_version - then camlp5_6_transitional - else callPackage ../development/tools/ocaml/camlp5/5.15.nix { - transitional = true; - }; - - camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; - - camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 { - transitional = true; - }; - - camlp5_strict = camlp5_6_strict; - - camlp5_transitional = camlp5_6_transitional; - - camlpdf = callPackage ../development/ocaml-modules/camlpdf { }; - - calendar = callPackage ../development/ocaml-modules/calendar { }; - - camlzip = callPackage ../development/ocaml-modules/camlzip { }; - - camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; - camomile = callPackage ../development/ocaml-modules/camomile { }; - - camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix { - libpng = libpng12; - giflib = giflib_4_1; - }; - camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix { - giflib = giflib_4_1; - }; - camlimages = camlimages_4_1; - - conduit = callPackage ../development/ocaml-modules/conduit { - lwt = ocaml_lwt; - }; - - biniou = callPackage ../development/ocaml-modules/biniou { }; - - bin_prot = callPackage ../development/ocaml-modules/bin_prot { }; - - ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; - - ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; - - cil = callPackage ../development/ocaml-modules/cil { }; - - cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; - - cohttp = callPackage ../development/ocaml-modules/cohttp { - lwt = ocaml_lwt; - }; - - config-file = callPackage ../development/ocaml-modules/config-file { }; - - containers = callPackage ../development/ocaml-modules/containers { }; - - cpdf = callPackage ../development/ocaml-modules/cpdf { }; - - cppo = callPackage ../development/tools/ocaml/cppo { }; - - cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; - - cstruct = callPackage ../development/ocaml-modules/cstruct { - lwt = ocaml_lwt; - }; - - csv = callPackage ../development/ocaml-modules/csv { }; - - custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; - - ctypes = callPackage ../development/ocaml-modules/ctypes { }; - - dolog = callPackage ../development/ocaml-modules/dolog { }; - - easy-format = callPackage ../development/ocaml-modules/easy-format { }; - - eff = callPackage ../development/interpreters/eff { }; - - eliom = callPackage ../development/ocaml-modules/eliom { }; - - enumerate = callPackage ../development/ocaml-modules/enumerate { }; - - erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; - - erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; - - estring = callPackage ../development/ocaml-modules/estring { }; - - ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { - lwt = ocaml_lwt; - }; - - faillib = callPackage ../development/ocaml-modules/faillib { }; - - fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; - - fileutils = callPackage ../development/ocaml-modules/fileutils { }; - - findlib = callPackage ../development/tools/ocaml/findlib { }; - - fix = callPackage ../development/ocaml-modules/fix { }; - - fontconfig = callPackage ../development/ocaml-modules/fontconfig { - inherit (pkgs) fontconfig; - }; - - functory = callPackage ../development/ocaml-modules/functory { }; - - gen = callPackage ../development/ocaml-modules/gen { }; - - herelib = callPackage ../development/ocaml-modules/herelib { }; - - io-page = callPackage ../development/ocaml-modules/io-page { }; - - ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; - - iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; - - javalib = callPackage ../development/ocaml-modules/javalib { - extlib = ocaml_extlib_maximal; - }; - - dypgen = callPackage ../development/ocaml-modules/dypgen { }; - - gapi_ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; - - gg = callPackage ../development/ocaml-modules/gg { }; - - gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; - - gtktop = callPackage ../development/ocaml-modules/gtktop { }; - - hex = callPackage ../development/ocaml-modules/hex { }; - - jingoo = callPackage ../development/ocaml-modules/jingoo { - batteries = ocaml_batteries; - pcre = ocaml_pcre; - }; - - js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; - - jsonm = callPackage ../development/ocaml-modules/jsonm { }; - - lablgl = callPackage ../development/ocaml-modules/lablgl { }; - - lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { - inherit (gnome) libgnomecanvas libglade gtksourceview; - }; - lablgtk = callPackage ../development/ocaml-modules/lablgtk { - inherit (gnome) libgnomecanvas libglade gtksourceview; - }; - - lablgtk-extras = - if lib.versionOlder "4.02" ocaml_version - then callPackage ../development/ocaml-modules/lablgtk-extras { } - else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; - - lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { - gtkmathview = callPackage ../development/libraries/gtkmathview { }; - }; - - lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; - lambdaTerm = - if lib.versionOlder "4.01" ocaml_version - then callPackage ../development/ocaml-modules/lambda-term { } - else lambdaTerm-1_6; - - llvm = callPackage ../development/ocaml-modules/llvm { - llvm = pkgs.llvm_37; - }; - - macaque = callPackage ../development/ocaml-modules/macaque { }; - - magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; - - magick = callPackage ../development/ocaml-modules/magick { }; - - markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; - - menhir = callPackage ../development/ocaml-modules/menhir { }; - - merlin = callPackage ../development/tools/ocaml/merlin { }; - - mezzo = callPackage ../development/compilers/mezzo { }; - - mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; - - nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; - - ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; - - comparelib = callPackage ../development/ocaml-modules/comparelib { }; - - core_extended = callPackage ../development/ocaml-modules/core_extended { }; - - core_kernel = callPackage ../development/ocaml-modules/core_kernel { }; - - core = callPackage ../development/ocaml-modules/core { }; - - ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; - - ocaml_data_notation = callPackage ../development/ocaml-modules/odn { }; - - ocaml_expat = callPackage ../development/ocaml-modules/expat { }; - - ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; - - ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; - - ocaml_http = callPackage ../development/ocaml-modules/http { }; - - ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; - - ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; - - ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; - - ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; - - ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { }; - - ocaml_oasis = callPackage ../development/tools/ocaml/oasis { }; - - ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { }; - - ocaml_pcre = callPackage ../development/ocaml-modules/pcre {}; - - pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; - - ocaml_react = callPackage ../development/ocaml-modules/react { }; - reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; - - ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; - - ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; - - ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; - - ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; - - ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; - - ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; - - ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; - - ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; - - ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; - - ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; - - ojquery = callPackage ../development/ocaml-modules/ojquery { }; - - otfm = callPackage ../development/ocaml-modules/otfm { }; - - ounit = callPackage ../development/ocaml-modules/ounit { }; - - piqi = callPackage ../development/ocaml-modules/piqi { }; - piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; - - re2 = callPackage ../development/ocaml-modules/re2 { }; - - result = callPackage ../development/ocaml-modules/ocaml-result { }; - - sequence = callPackage ../development/ocaml-modules/sequence { }; - - sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; - - tuntap = callPackage ../development/ocaml-modules/tuntap { }; - - tyxml = callPackage ../development/ocaml-modules/tyxml { }; - - ulex = callPackage ../development/ocaml-modules/ulex { }; - - ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { - camlp5 = camlp5_transitional; - }; - - textutils = callPackage ../development/ocaml-modules/textutils { }; - - type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; - type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; - type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; - type_conv = - if lib.versionOlder "4.02" ocaml_version - then type_conv_112_01_01 - else if lib.versionOlder "4.00" ocaml_version - then type_conv_109_60_01 - else if lib.versionOlder "3.12" ocaml_version - then type_conv_108_08_00 - else null; - - sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { }; - sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; - sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; - - sexplib = - if lib.versionOlder "4.02" ocaml_version - then sexplib_112_24_01 - else if lib.versionOlder "4.00" ocaml_version - then sexplib_111_25_00 - else if lib.versionOlder "3.12" ocaml_version - then sexplib_108_08_00 - else null; - - ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; - ocaml_extlib_maximal = callPackage ../development/ocaml-modules/extlib { - minimal = false; - }; - - ocurl = callPackage ../development/ocaml-modules/ocurl { }; - - pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { }; - - pa_bench = callPackage ../development/ocaml-modules/pa_bench { }; - - pa_test = callPackage ../development/ocaml-modules/pa_test { }; - - pipebang = callPackage ../development/ocaml-modules/pipebang { }; - - pprint = callPackage ../development/ocaml-modules/pprint { }; - - ppx_blob = - if lib.versionAtLeast ocaml_version "4.02" - then callPackage ../development/ocaml-modules/ppx_blob {} - else null; - - ppx_tools = - if lib.versionAtLeast ocaml_version "4.02" - then callPackage ../development/ocaml-modules/ppx_tools {} - else null; - - pycaml = callPackage ../development/ocaml-modules/pycaml { }; - - qcheck = callPackage ../development/ocaml-modules/qcheck { - oasis = ocaml_oasis; - }; - - qtest = callPackage ../development/ocaml-modules/qtest { - oasis = ocaml_oasis; - }; - - re = callPackage ../development/ocaml-modules/re { }; - - safepass = callPackage ../development/ocaml-modules/safepass { }; - - sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; - - stringext = callPackage ../development/ocaml-modules/stringext { }; - - topkg = callPackage ../development/ocaml-modules/topkg { }; - - tsdl = callPackage ../development/ocaml-modules/tsdl { }; - - twt = callPackage ../development/ocaml-modules/twt { }; - - typerep = callPackage ../development/ocaml-modules/typerep { }; - - utop = callPackage ../development/tools/ocaml/utop { }; - - uuidm = callPackage ../development/ocaml-modules/uuidm { }; - - sawja = callPackage ../development/ocaml-modules/sawja { }; - - uucd = callPackage ../development/ocaml-modules/uucd { }; - uucp = callPackage ../development/ocaml-modules/uucp { }; - uunf = callPackage ../development/ocaml-modules/uunf { }; - - uri = callPackage ../development/ocaml-modules/uri { }; - - uuseg = callPackage ../development/ocaml-modules/uuseg { }; - uutf = callPackage ../development/ocaml-modules/uutf { }; - - variantslib = callPackage ../development/ocaml-modules/variantslib { }; - - vg = callPackage ../development/ocaml-modules/vg { }; - - x509 = callPackage ../development/ocaml-modules/x509 { }; - - xmlm = callPackage ../development/ocaml-modules/xmlm { }; - - xml-light = callPackage ../development/ocaml-modules/xml-light { }; - - yojson = callPackage ../development/ocaml-modules/yojson { }; - - zarith = callPackage ../development/ocaml-modules/zarith { }; - - zed = callPackage ../development/ocaml-modules/zed { }; - - ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { - oasis = ocaml_oasis; - }; - - }; - - ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; - ocamlPackages_3_10_0 = (mkOcamlPackages ocaml_3_10_0 pkgs.ocamlPackages_3_10_0) - // { lablgtk = ocamlPackages_3_10_0.lablgtk_2_14; }; - ocamlPackages_3_11_2 = (mkOcamlPackages ocaml_3_11_2 pkgs.ocamlPackages_3_11_2) - // { lablgtk = ocamlPackages_3_11_2.lablgtk_2_14; }; - ocamlPackages_3_12_1 = (mkOcamlPackages ocaml_3_12_1 pkgs.ocamlPackages_3_12_1) - // { camlimages = ocamlPackages_3_12_1.camlimages_4_0; }; - ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; - ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; - ocamlPackages_4_02 = mkOcamlPackages ocaml_4_02 pkgs.ocamlPackages_4_02; - ocamlPackages_latest = ocamlPackages_4_02; - ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; + inherit (ocamlPackages) ocaml-top; opa = callPackage ../development/compilers/opa { nodejs = nodejs-0_10; }; - opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; - opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { - inherit (ocamlPackages_4_01_0) ocaml; - }; - opam = callPackage ../development/tools/ocaml/opam { }; - - ocamlnat = newScope pkgs.ocamlPackages_3_12_1 ../development/ocaml-modules/ocamlnat { }; + inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_0_0; + inherit (ocaml-ng.ocamlPackages_4_01_0) opam_1_1; + inherit (ocamlPackages) opam; picat = callPackage ../development/compilers/picat { stdenv = overrideCC stdenv gcc49; @@ -5529,6 +5099,8 @@ in ponyc = callPackage ../development/compilers/ponyc { }; + pony-stable = callPackage ../development/compilers/ponyc/pony-stable.nix { }; + rgbds = callPackage ../development/compilers/rgbds { }; rtags = callPackage ../development/tools/rtags/default.nix {}; @@ -5557,6 +5129,7 @@ in }; }); + rainicorn = callPackage ../development/tools/rust/rainicorn { }; rustfmt = callPackage ../development/tools/rust/rustfmt { }; rustracer = callPackage ../development/tools/rust/racer { }; rustracerd = callPackage ../development/tools/rust/racerd { }; @@ -5614,28 +5187,26 @@ in }; thrust = callPackage ../development/tools/thrust { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; tinycc = callPackage ../development/compilers/tinycc { }; - trv = callPackage ../development/tools/misc/trv { - inherit (ocamlPackages_4_02) findlib camlp4 core async async_unix - async_extra sexplib async_shell core_extended async_find cohttp uri; - ocaml = ocaml_4_02; - }; + inherit (ocaml-ng.ocamlPackages_4_01_0) trv; bupc = callPackage ../development/compilers/bupc { }; urweb = callPackage ../development/compilers/urweb { }; - vala_0_23 = callPackage ../development/compilers/vala/0.23.nix { }; + inherit (callPackage ../development/compilers/vala { }) + vala_0_23 + vala_0_26 + vala_0_28 + vala_0_32 + vala_0_34 + vala; - vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { }; - - vala_0_28 = callPackage ../development/compilers/vala/0.28.nix { }; - - vala_0_32 = callPackage ../development/compilers/vala/0.32.nix { }; + valadoc = callPackage ../development/tools/valadoc { }; vs90wrapper = callPackage ../development/compilers/vs90wrapper { }; @@ -5710,7 +5281,10 @@ in erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; - erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; + erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { + inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; + odbcSupport = true; + }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; }; @@ -5756,10 +5330,10 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; javacSupport = true; odbcSupport = true; }; - erlang = self.erlangR18; - erlang_odbc = self.erlangR18_odbc; - erlang_javac = self.erlangR18_javac; - erlang_odbc_javac = self.erlangR18_odbc_javac; + erlang = erlangR18; + erlang_odbc = erlangR18_odbc; + erlang_javac = erlangR18_javac; + erlang_odbc_javac = erlangR18_odbc_javac; rebar = callPackage ../development/tools/build-managers/rebar { }; rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; }; @@ -5783,7 +5357,7 @@ in guile_2_0 = callPackage ../development/interpreters/guile { }; - guile = self.guile_2_0; + guile = guile_2_0; hadoop = callPackage ../applications/networking/cluster/hadoop { }; @@ -5799,7 +5373,7 @@ in kanif = callPackage ../applications/networking/cluster/kanif { }; - lxappearance = callPackage ../applications/misc/lxappearance {}; + lxappearance = callPackage ../desktops/lxde/core/lxappearance {}; lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; @@ -5811,7 +5385,7 @@ in love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; }; love_0_9 = callPackage ../development/interpreters/love/0.9.nix { }; love_0_10 = callPackage ../development/interpreters/love/0.10.nix { }; - love = self.love_0_10; + love = love_0_10; ### LUA MODULES @@ -5826,22 +5400,23 @@ in lua5_3_compat = callPackage ../development/interpreters/lua-5/5.3.nix { compat = true; }; - lua5 = self.lua5_2_compat; - lua = self.lua5; + lua5 = lua5_2_compat; + lua = lua5; lua51Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_1; }); lua52Packages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = lua5_2; }); + luajitPackages = recurseIntoAttrs (callPackage ./lua-packages.nix { lua = luajit; }); - luaPackages = self.lua52Packages; + luaPackages = lua52Packages; - lua5_1_sockets = self.lua51Packages.luasocket; + lua5_1_sockets = lua51Packages.luasocket; lua5_expat = callPackage ../development/interpreters/lua-5/expat.nix {}; lua5_sec = callPackage ../development/interpreters/lua-5/sec.nix { }; luajit = callPackage ../development/interpreters/luajit {}; - luarocks = self.luaPackages.luarocks; + luarocks = luaPackages.luarocks; toluapp = callPackage ../development/tools/toluapp { lua = lua5_1; # doesn't work with any other :( @@ -6070,7 +5645,7 @@ in version = "2.8"; }; - amdappsdk = self.amdappsdk28; + amdappsdk = amdappsdk28; amdappsdkFull = callPackage ../development/misc/amdapp-sdk { version = "2.8"; @@ -6094,8 +5669,8 @@ in guileCairo = callPackage ../development/guile-modules/guile-cairo { }; guileGnome = callPackage ../development/guile-modules/guile-gnome { - gconf = gnome.GConf; - inherit (gnome) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; + gconf = gnome2.GConf; + inherit (gnome2) gnome_vfs libglade libgnome libgnomecanvas libgnomeui; }; guile_lib = callPackage ../development/guile-modules/guile-lib { }; @@ -6141,7 +5716,7 @@ in antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { }; - ant = self.apacheAnt; + ant = apacheAnt; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; @@ -6150,6 +5725,8 @@ in apacheKafka_0_9 = callPackage ../servers/apache-kafka { majorVersion = "0.9"; }; apacheKafka_0_10 = callPackage ../servers/apache-kafka { majorVersion = "0.10"; }; + asn2quickder = callPackage ../development/tools/asn2quickder {}; + astyle = callPackage ../development/tools/misc/astyle { }; electron = callPackage ../development/tools/electron { }; @@ -6165,7 +5742,7 @@ in autocutsel = callPackage ../tools/X11/autocutsel{ }; - automake = self.automake115x; + automake = automake115x; automake111x = callPackage ../development/tools/misc/automake/automake-1.11.x.nix { }; @@ -6189,13 +5766,13 @@ in bam = callPackage ../development/tools/build-managers/bam {}; - bazel = callPackage ../development/tools/build-managers/bazel { jdk = openjdk8; }; + bazel = callPackage ../development/tools/build-managers/bazel { }; bear = callPackage ../development/tools/build-managers/bear { }; bin_replace_string = callPackage ../development/tools/misc/bin_replace_string { }; - binutils = if stdenv.isDarwin then self.darwin.binutils else self.binutils-raw; + binutils = if stdenv.isDarwin then darwin.binutils else binutils-raw; binutils-raw = callPackage ../development/tools/misc/binutils { inherit noSysDirs; }; @@ -6213,17 +5790,13 @@ in bison2 = callPackage ../development/tools/parsing/bison/2.x.nix { }; bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; - bison = self.bison3; + bison = bison3; bossa = callPackage ../development/tools/misc/bossa { wxGTK = wxGTK30; }; - buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave { - inherit (pythonPackages) twisted; - }; - - buildbot = callPackage ../development/tools/build-managers/buildbot/9.nix { }; + buildbot = callPackage ../development/tools/build-managers/buildbot { }; buildbot-worker = callPackage ../development/tools/build-managers/buildbot/worker.nix { }; buildbot-plugins = callPackage ../development/tools/build-managers/buildbot/plugins.nix { }; buildbot-ui = self.buildbot.override { @@ -6273,6 +5846,8 @@ in cgdb = callPackage ../development/tools/misc/cgdb { }; + cheat = callPackage ../applications/misc/cheat { }; + chefdk = callPackage ../development/tools/chefdk { ruby = ruby_2_0; }; @@ -6283,7 +5858,7 @@ in checkstyle = callPackage ../development/tools/analysis/checkstyle { }; - chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome.GConf; }; + chromedriver = callPackage ../development/tools/selenium/chromedriver { gconf = gnome2.GConf; }; chrpath = callPackage ../development/tools/misc/chrpath { }; @@ -6305,7 +5880,7 @@ in ctodo = callPackage ../applications/misc/ctodo { }; - cmake-2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { + cmake_2_8 = callPackage ../development/tools/build-managers/cmake/2.8.nix { wantPS = stdenv.isDarwin; inherit (darwin) ps; }; @@ -6315,9 +5890,9 @@ in inherit (darwin) ps; }; - cmakeCurses = self.cmake.override { useNcurses = true; }; + cmakeCurses = cmake.override { useNcurses = true; }; - cmakeWithGui = self.cmakeCurses.override { useQt4 = true; }; + cmakeWithGui = cmakeCurses.override { useQt4 = true; }; # Does not actually depend on Qt 5 extra-cmake-modules = qt5.ecmNoHooks; @@ -6343,6 +5918,8 @@ in libcxx = llvmPackages.libcxx; libcxxabi = llvmPackages.libcxxabi; + libstdcxx5 = callPackage ../development/libraries/libstdc++5 { }; + libsigrok = callPackage ../development/tools/libsigrok { }; # old version: libsigrok-0-3-0 = libsigrok.override { @@ -6356,9 +5933,7 @@ in dejagnu = callPackage ../development/tools/misc/dejagnu { }; - dfeet = callPackage ../development/tools/misc/d-feet { - inherit (pythonPackages) pep8; - }; + dfeet = callPackage ../development/tools/misc/d-feet { }; dfu-programmer = callPackage ../development/tools/misc/dfu-programmer { }; @@ -6405,7 +5980,7 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; - doxygen_gui = lowPrio (self.doxygen.override { inherit qt4; }); + doxygen_gui = lowPrio (doxygen.override { inherit qt4; }); drush = callPackage ../development/tools/misc/drush { }; @@ -6468,11 +6043,11 @@ in gnumake380 = callPackage ../development/tools/build-managers/gnumake/3.80 { }; gnumake381 = callPackage ../development/tools/build-managers/gnumake/3.81 { }; gnumake382 = callPackage ../development/tools/build-managers/gnumake/3.82 { }; - gnumake3 = self.gnumake382; + gnumake3 = gnumake382; gnumake40 = callPackage ../development/tools/build-managers/gnumake/4.0 { }; gnumake41 = callPackage ../development/tools/build-managers/gnumake/4.1 { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; - gnumake = self.gnumake42; + gnumake = gnumake42; gnustep = recurseIntoAttrs (callPackage ../desktops/gnustep {}); @@ -6559,7 +6134,7 @@ in lenmus = callPackage ../applications/misc/lenmus { }; - libtool = self.libtool_2; + libtool = libtool_2; libtool_1_5 = callPackage ../development/tools/misc/libtool { }; @@ -6578,6 +6153,8 @@ in maven = maven3; maven3 = callPackage ../development/tools/build-managers/apache-maven { }; + go-md2man = callPackage ../development/tools/misc/md2man {}; + minify = callPackage ../development/web/minify { }; minizinc = callPackage ../development/tools/minizinc { }; @@ -6610,22 +6187,21 @@ in node_webkit = node_webkit_0_9; nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; node_webkit_0_11 = callPackage ../development/tools/node-webkit/nw11.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; node_webkit_0_9 = callPackage ../development/tools/node-webkit/nw9.nix { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; }; noweb = callPackage ../development/tools/literate-programming/noweb { }; nuweb = callPackage ../development/tools/literate-programming/nuweb { tex = texlive.combined.scheme-small; }; - omake = callPackage ../development/tools/ocaml/omake { }; - omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; + inherit (ocamlPackages) omake omake_rc1; omniorb = callPackage ../development/tools/omniorb { }; @@ -6641,6 +6217,8 @@ in patchelf = callPackage ../development/tools/misc/patchelf { }; + patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); + peg = callPackage ../development/tools/parsing/peg { }; phantomjs = callPackage ../development/tools/phantomjs { }; @@ -6674,8 +6252,10 @@ in withDocumentation = false; # 'true' is currently broken with qt>=5.5 }; + r10k = callPackage ../tools/system/r10k { }; + radare = callPackage ../development/tools/analysis/radare { - inherit (gnome) vte; + inherit (gnome2) vte; lua = lua5; useX11 = config.radare.useX11 or false; pythonBindings = config.radare.pythonBindings or false; @@ -6683,7 +6263,7 @@ in luaBindings = config.radare.luaBindings or false; }; radare2 = callPackage ../development/tools/analysis/radare2 { - inherit (gnome) vte; + inherit (gnome2) vte; lua = lua5; useX11 = config.radare.useX11 or false; pythonBindings = config.radare.pythonBindings or false; @@ -6792,7 +6372,7 @@ in texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; - texinfo6 = callPackage ../development/tools/misc/texinfo/6.1.nix { }; + texinfo6 = callPackage ../development/tools/misc/texinfo/6.3.nix { }; texinfo = texinfo6; texinfoInteractive = appendToName "interactive" ( texinfo.override { interactive = true; } @@ -6800,6 +6380,8 @@ in texi2html = callPackage ../development/tools/misc/texi2html { }; + texi2mdoc = callPackage ../tools/misc/texi2mdoc { }; + travis = callPackage ../development/tools/misc/travis { }; tweak = callPackage ../applications/editors/tweak { }; @@ -6822,7 +6404,7 @@ in inherit (gnu) mig; }; - gdbGuile = lowPrio (self.gdb.override { inherit guile; }); + gdbGuile = lowPrio (gdb.override { inherit guile; }); gdbCross = lowPrio (callPackage ../development/tools/misc/gdb { target = crossSystem; @@ -6834,18 +6416,14 @@ in valkyrie = callPackage ../development/tools/analysis/valkyrie { }; - verasco = callPackage ../development/tools/analysis/verasco (( - if system == "x86_64-linux" - then { tools = pkgsi686Linux.stdenv.cc; } - else {} - ) // { - ocamlPackages = ocamlPackages_4_02; - }); + inherit (ocaml-ng.ocamlPackages_4_02) verasco; visualvm = callPackage ../development/tools/java/visualvm { }; xc3sprog = callPackage ../development/tools/misc/xc3sprog { }; + xcbuild = callPackage ../development/tools/xcbuild { inherit (darwin.apple_sdk.frameworks) CoreServices CoreGraphics ImageIO; }; + xmlindent = callPackage ../development/web/xmlindent {}; xpwn = callPackage ../development/mobile/xpwn {}; @@ -6860,9 +6438,7 @@ in yodl = callPackage ../development/tools/misc/yodl { }; - winpdb = callPackage ../development/tools/winpdb { - inherit (pythonPackages) wxPython; - }; + winpdb = callPackage ../development/tools/winpdb { }; grabserial = callPackage ../development/tools/grabserial { }; @@ -6970,7 +6546,7 @@ in boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost159 = callPackage ../development/libraries/boost/1.59.nix { }; boost160 = callPackage ../development/libraries/boost/1.60.nix { }; - boost = self.boost160; + boost = boost160; boost_process = callPackage ../development/libraries/boost-process { }; @@ -7040,7 +6616,7 @@ in classpath = callPackage ../development/libraries/java/classpath { javac = gcj; jvm = gcj; - gconf = gnome.GConf; + gconf = gnome2.GConf; }; clearsilver = callPackage ../development/libraries/clearsilver { }; @@ -7051,36 +6627,14 @@ in clucene_core_1 = callPackage ../development/libraries/clucene-core { }; - clucene_core = self.clucene_core_1; + clucene_core = clucene_core_1; clutter = callPackage ../development/libraries/clutter { }; - clutter_1_22 = callPackage ../development/libraries/clutter/1.22.nix { - cogl = cogl_1_20; - }; - - clutter_1_24 = callPackage ../development/libraries/clutter/1.24.nix { - cogl = cogl_1_22; - }; - - clutter_1_26 = callPackage ../development/libraries/clutter/1.26.nix { - cogl = cogl_1_22; - }; - - clutter-gst = callPackage ../development/libraries/clutter-gst { }; - - clutter-gst_3_0 = callPackage ../development/libraries/clutter-gst/3.0.nix { - clutter = clutter_1_22; + clutter-gst = callPackage ../development/libraries/clutter-gst { }; clutter_gtk = callPackage ../development/libraries/clutter-gtk { }; - clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { }; - clutter_gtk_1_6 = callPackage ../development/libraries/clutter-gtk/1.6.nix { - clutter = clutter_1_22; - }; - clutter_gtk_1_8 = callPackage ../development/libraries/clutter-gtk/1.8.nix { - clutter = clutter_1_26; - }; cminpack = callPackage ../development/libraries/cminpack { }; @@ -7088,10 +6642,6 @@ in cogl = callPackage ../development/libraries/cogl { }; - cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { }; - - cogl_1_22 = callPackage ../development/libraries/cogl/1.22.nix { }; - coin3d = callPackage ../development/libraries/coin3d { }; CoinMP = callPackage ../development/libraries/CoinMP { }; @@ -7113,6 +6663,7 @@ in cpp-hocon = callPackage ../development/libraries/cpp-hocon { }; cpp-netlib = callPackage ../development/libraries/cpp-netlib { }; + uri = callPackage ../development/libraries/uri { }; cppcms = callPackage ../development/libraries/cppcms { }; @@ -7142,15 +6693,15 @@ in # Make bdb5 the default as it is the last release under the custom # bsd-like license - db = self.db5; - db4 = self.db48; + db = db5; + db4 = db48; db44 = callPackage ../development/libraries/db/db-4.4.nix { }; db45 = callPackage ../development/libraries/db/db-4.5.nix { }; db47 = callPackage ../development/libraries/db/db-4.7.nix { }; db48 = callPackage ../development/libraries/db/db-4.8.nix { }; - db5 = self.db53; + db5 = db53; db53 = callPackage ../development/libraries/db/db-5.3.nix { }; - db6 = self.db60; + db6 = db60; db60 = callPackage ../development/libraries/db/db-6.0.nix { }; dbus = callPackage ../development/libraries/dbus { }; @@ -7165,9 +6716,9 @@ in dbus-sharp-glib-2_0 = callPackage ../development/libraries/dbus-sharp-glib { }; # FIXME: deprecate these. - dbus_tools = self.dbus.out; - dbus_libs = self.dbus; - dbus_daemon = self.dbus.daemon; + dbus_tools = dbus.out; + dbus_libs = dbus; + dbus_daemon = dbus.daemon; dee = callPackage ../development/libraries/dee { }; @@ -7222,7 +6773,7 @@ in faad2 = callPackage ../development/libraries/faad2 { }; factor-lang = callPackage ../development/compilers/factor-lang { - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; farbfeld = callPackage ../development/libraries/farbfeld { }; @@ -7251,11 +6802,11 @@ in inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia; }; # Aliases - ffmpeg_0 = self.ffmpeg_0_10; - ffmpeg_1 = self.ffmpeg_1_2; - ffmpeg_2 = self.ffmpeg_2_8; - ffmpeg_3 = self.ffmpeg_3_1; - ffmpeg = self.ffmpeg_3; + ffmpeg_0 = ffmpeg_0_10; + ffmpeg_1 = ffmpeg_1_2; + ffmpeg_2 = ffmpeg_2_8; + ffmpeg_3 = ffmpeg_3_1; + ffmpeg = ffmpeg_3; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { # The following need to be fixed on Darwin @@ -7271,8 +6822,8 @@ in x265 = if stdenv.isDarwin then null else x265; xavs = if stdenv.isDarwin then null else xavs; inherit (darwin) CF; - inherit (darwin.apple_sdk.frameworks) - Cocoa CoreServices CoreAudio AVFoundation MediaToolbox + inherit (darwin.apple_sdk.frameworks) + Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; }; @@ -7287,9 +6838,9 @@ in }; fftw = callPackage ../development/libraries/fftw { }; - fftwSinglePrec = self.fftw.override { precision = "single"; }; - fftwFloat = self.fftwSinglePrec; # the configure option is just an alias - fftwLongDouble = self.fftw.override { precision = "long-double"; }; + fftwSinglePrec = fftw.override { precision = "single"; }; + fftwFloat = fftwSinglePrec; # the configure option is just an alias + fftwLongDouble = fftw.override { precision = "long-double"; }; filter-audio = callPackage ../development/libraries/filter-audio {}; @@ -7342,7 +6893,7 @@ in funambol = callPackage ../development/libraries/funambol { }; - fam = self.gamin; + fam = gamin; gamin = callPackage ../development/libraries/gamin { }; @@ -7351,14 +6902,14 @@ in gcab = callPackage ../development/libraries/gcab { }; gdome2 = callPackage ../development/libraries/gdome2 { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; gdbm = callPackage ../development/libraries/gdbm { }; gecode_3 = callPackage ../development/libraries/gecode/3.nix { }; gecode_4 = callPackage ../development/libraries/gecode { }; - gecode = self.gecode_4; + gecode = gecode_4; gephi = callPackage ../applications/science/misc/gephi { }; @@ -7366,13 +6917,15 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { }; + gegl_0_3 = callPackage ../development/libraries/gegl/3.0.nix { + gtk = self.gtk2; + }; geoclue = callPackage ../development/libraries/geoclue {}; geoclue2 = callPackage ../development/libraries/geoclue/2.0.nix {}; - geoipWithDatabase = self.geoip.override { + geoipWithDatabase = makeOverridable (callPackage ../development/libraries/geoip) { drvName = "geoip-tools"; geoipDatabase = geolite-legacy; }; @@ -7421,7 +6974,7 @@ in inherit (darwin.apple_sdk.frameworks) AGL; }; - glfw = self.glfw3; + glfw = glfw3; glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; @@ -7471,12 +7024,7 @@ in glpk = callPackage ../development/libraries/glpk { }; - glsurf = callPackage ../applications/science/math/glsurf { - inherit (ocamlPackages) lablgl findlib ocaml_mysql mlgmp; - libpng = libpng12; - giflib = giflib_4_1; - camlimages = ocamlPackages.camlimages_4_0; - }; + inherit (ocamlPackages) glsurf; glui = callPackage ../development/libraries/glui {}; @@ -7487,7 +7035,7 @@ in gmp4 = callPackage ../development/libraries/gmp/4.3.2.nix { }; # required by older GHC versions gmp5 = callPackage ../development/libraries/gmp/5.1.x.nix { }; gmp6 = callPackage ../development/libraries/gmp/6.x.nix { }; - gmp = self.gmp6; + gmp = gmp6; gmpxx = appendToName "with-cxx" (gmp.override { cxx = true; }); #GMP ex-satellite, so better keep it near gmp @@ -7550,7 +7098,7 @@ in gnonlin = callPackage ../development/libraries/gstreamer/legacy/gnonlin {}; gusb = callPackage ../development/libraries/gusb { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; qt-mobility = callPackage ../development/libraries/qt-mobility {}; @@ -7563,7 +7111,7 @@ in gnu-efi = callPackage ../development/libraries/gnu-efi { }; - gnutls = self.gnutls34; + gnutls = gnutls34; gnutls33 = callPackage ../development/libraries/gnutls/3.3.nix { guileBindings = config.gnutls.guile or false; @@ -7583,6 +7131,8 @@ in gnupg1 = gnupg1orig; }; + pgpdump = callPackage ../tools/security/pgpdump { }; + gpgstats = callPackage ../tools/security/gpgstats { }; gpshell = callPackage ../development/tools/misc/gpshell { }; @@ -7606,7 +7156,7 @@ in gtkmathview = callPackage ../development/libraries/gtkmathview { }; glib = callPackage ../development/libraries/glib { }; - glib-tested = self.glib.override { # checked version separate to break cycles + glib-tested = glib.override { # checked version separate to break cycles doCheck = true; libffi = libffi.override { doCheck = true; }; }; @@ -7649,32 +7199,28 @@ in gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { }; - gtk = self.gtk2; - - gtkmm = callPackage ../development/libraries/gtkmm/2.x.nix { }; + gtkmm2 = callPackage ../development/libraries/gtkmm/2.x.nix { }; gtkmm3 = callPackage ../development/libraries/gtkmm/3.x.nix { }; gtkmozembedsharp = callPackage ../development/libraries/gtkmozembed-sharp { - gtksharp = gtk-sharp; + gtksharp = gtk-sharp-2_0; }; gtk-sharp-2_0 = callPackage ../development/libraries/gtk-sharp/2.0.nix { - inherit (gnome) libglade libgtkhtml gtkhtml + inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf; }; gtk-sharp-3_0 = callPackage ../development/libraries/gtk-sharp/3.0.nix { - inherit (gnome) libglade libgtkhtml gtkhtml + inherit (gnome2) libglade libgtkhtml gtkhtml libgnomecanvas libgnomeui libgnomeprint libgnomeprintui GConf; }; - gtk-sharp = self.gtk-sharp-2_0; - gtk-sharp-beans = callPackage ../development/libraries/gtk-sharp-beans { }; - gtkspell = callPackage ../development/libraries/gtkspell { }; + gtkspell2 = callPackage ../development/libraries/gtkspell { }; gtkspell3 = callPackage ../development/libraries/gtkspell/3.nix { }; @@ -7682,7 +7228,9 @@ in gts = callPackage ../development/libraries/gts { }; - gvfs = callPackage ../development/libraries/gvfs { gconf = gnome.GConf; }; + gvfs = callPackage ../development/libraries/gvfs { + gnome = self.gnome2; + }; gwenhywfar = callPackage ../development/libraries/aqbanking/gwenhywfar.nix { }; @@ -7690,10 +7238,10 @@ in # TODO : Let admin choose. # We are using mit-krb5 because it is better maintained - kerberos = self.libkrb5; + kerberos = libkrb5; heimdalFull = callPackage ../development/libraries/kerberos/heimdal.nix { }; - libheimdal = self.heimdalFull.override { type = "lib"; }; + libheimdal = heimdalFull.override { type = "lib"; }; harfbuzz = callPackage ../development/libraries/harfbuzz { }; harfbuzz-icu = callPackage ../development/libraries/harfbuzz { @@ -7707,7 +7255,7 @@ in herqq = callPackage ../development/libraries/herqq { }; - heyefi = self.haskellPackages.heyefi; + heyefi = haskellPackages.heyefi; hidapi = callPackage ../development/libraries/hidapi { libusb = libusb1; @@ -7766,6 +7314,8 @@ in imlib2 = callPackage ../development/libraries/imlib2 { }; + imlibsetroot = callPackage ../applications/graphics/imlibsetroot { libXinerama = xorg.libXinerama; } ; + ijs = callPackage ../development/libraries/ijs { }; incrtcl = callPackage ../development/libraries/incrtcl { }; @@ -7843,13 +7393,13 @@ in krb5Full = callPackage ../development/libraries/kerberos/krb5.nix { inherit (darwin) bootstrap_cmds; }; - libkrb5 = self.krb5Full.override { type = "lib"; }; + libkrb5 = krb5Full.override { type = "lib"; }; lasso = callPackage ../development/libraries/lasso { }; LASzip = callPackage ../development/libraries/LASzip { }; - lcms = self.lcms1; + lcms = lcms1; lcms1 = callPackage ../development/libraries/lcms { }; @@ -7881,6 +7431,9 @@ in libaccounts-glib = callPackage ../development/libraries/libaccounts-glib { }; + libagar = callPackage ../development/libraries/libagar { }; + libagar_test = callPackage ../development/libraries/libagar/libagar_test.nix { }; + libao = callPackage ../development/libraries/libao { usePulseAudio = config.pulseaudio or true; inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit; @@ -7909,8 +7462,9 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; - libav = self.libav_11; # branch 11 is API-compatible with branch 10 - inherit (callPackages ../development/libraries/libav { }) libav_0_8 libav_11; + libav = libav_11; # branch 11 is API-compatible with branch 10 + libav_all = callPackage ../development/libraries/libav { }; + inherit (libav_all) libav_0_8 libav_11; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -7928,13 +7482,18 @@ in libburn = callPackage ../development/libraries/libburn { }; - libcaca = callPackage ../development/libraries/libcaca { }; + libcaca = callPackage ../development/libraries/libcaca { + inherit (xlibs) libX11 libXext; + }; + + libcanberra_gtk3 = callPackage ../development/libraries/libcanberra { + gtk = pkgs.gtk3; + }; + libcanberra_gtk2 = pkgs.libcanberra_gtk3.override { gtk = pkgs.gtk2; }; - libcanberra = callPackage ../development/libraries/libcanberra { }; - libcanberra_gtk3 = self.libcanberra.override { gtk = gtk3; }; libcanberra_kde = if (config.kde_runtime.libcanberraWithoutGTK or true) - then self.libcanberra.override { gtk = null; } - else self.libcanberra; + then pkgs.libcanberra_gtk2.override { gtk = null; } + else pkgs.libcanberra_gtk2; libcec = callPackage ../development/libraries/libcec { }; libcec_platform = callPackage ../development/libraries/libcec/platform.nix { }; @@ -7951,7 +7510,7 @@ in libcdr = callPackage ../development/libraries/libcdr { lcms = lcms2; }; libchamplain = callPackage ../development/libraries/libchamplain { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; libchardet = callPackage ../development/libraries/libchardet { }; @@ -8009,7 +7568,7 @@ in sqlite = null; }; - libdbiDrivers = self.libdbiDriversBase.override { + libdbiDrivers = libdbiDriversBase.override { inherit sqlite libmysql; }; @@ -8027,7 +7586,7 @@ in inherit (darwin.apple_sdk.frameworks) OpenGL; }; - libdevil-nox = self.libdevil.override { + libdevil-nox = libdevil.override { libX11 = null; mesa = null; }; @@ -8052,7 +7611,9 @@ in libdwg = callPackage ../development/libraries/libdwg { }; - libdvdcss = callPackage ../development/libraries/libdvdcss { }; + libdvdcss = callPackage ../development/libraries/libdvdcss { + inherit (darwin) IOKit; + }; libdvdnav = callPackage ../development/libraries/libdvdnav { }; libdvdnav_4_2_1 = callPackage ../development/libraries/libdvdnav/4.2.1.nix { @@ -8101,6 +7662,8 @@ in libgee_0_6 = callPackage ../development/libraries/libgee/0.6.nix { }; + libgee_0_8 = callPackage ../development/libraries/libgee/0.8.nix { }; + libgig = callPackage ../development/libraries/libgig { }; libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { }; @@ -8128,7 +7691,7 @@ in liblo = callPackage ../development/libraries/liblo { }; - liblrdf = self.librdf; + liblrdf = librdf; liblscp = callPackage ../development/libraries/liblscp { }; @@ -8205,7 +7768,7 @@ in libharu = callPackage ../development/libraries/libharu { }; - libhif = callPackage ../tools/package-management/libhif { sphinx = python27Packages.sphinx; }; + libhttpseverywhere = callPackage ../development/libraries/libhttpseverywhere { }; libHX = callPackage ../development/libraries/libHX { }; @@ -8245,6 +7808,8 @@ in libltc = callPackage ../development/libraries/libltc { }; + libmaxminddb = callPackage ../development/libraries/libmaxminddb { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; libmediainfo = callPackage ../development/libraries/libmediainfo { }; @@ -8259,6 +7824,10 @@ in libmsgpack_0_5 = callPackage ../development/libraries/libmsgpack/0.5.nix { }; libmsgpack_1_4 = callPackage ../development/libraries/libmsgpack/1.4.nix { }; + libmysqlconnectorcpp = callPackage ../development/libraries/libmysqlconnectorcpp { + mysql = mysql57; + }; + libnatspec = callPackage ../development/libraries/libnatspec ( stdenv.lib.optionalAttrs stdenv.isDarwin { inherit (darwin) libiconv; @@ -8333,7 +7902,7 @@ in libiec61883 = callPackage ../development/libraries/libiec61883 { }; libinfinity = callPackage ../development/libraries/libinfinity { - inherit (gnome) gtkdoc; + inherit (gnome2) gtkdoc; }; libinput = callPackage ../development/libraries/libinput { @@ -8349,7 +7918,7 @@ in libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; - libjpeg = if stdenv.isLinux then self.libjpeg_turbo else self.libjpeg_original; # some problems, both on FreeBSD and Darwin + libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin libjpeg62 = callPackage ../development/libraries/libjpeg/62.nix { libtool = libtool_1_5; @@ -8419,7 +7988,7 @@ in libmusicbrainz5 = callPackage ../development/libraries/libmusicbrainz/5.x.nix { }; - libmusicbrainz = self.libmusicbrainz3; + libmusicbrainz = libmusicbrainz3; libmwaw = callPackage ../development/libraries/libmwaw { }; @@ -8473,6 +8042,8 @@ in libosip_3 = callPackage ../development/libraries/osip/3.nix {}; + libosmocore = callPackage ../applications/misc/libosmocore { }; + libosmpbf = callPackage ../development/libraries/libosmpbf {}; libotr = callPackage ../development/libraries/libotr { }; @@ -8488,7 +8059,7 @@ in libpgf = callPackage ../development/libraries/libpgf { }; libpng = callPackage ../development/libraries/libpng { }; - libpng_apng = self.libpng.override { apngSupport = true; }; + libpng_apng = libpng.override { apngSupport = true; }; libpng12 = callPackage ../development/libraries/libpng/12.nix { }; libpaper = callPackage ../development/libraries/libpaper { }; @@ -8578,14 +8149,7 @@ in libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; - libtorrentRasterbar_1_09 = callPackage ../development/libraries/libtorrent-rasterbar/1.09.nix { }; - - libtorrentRasterbar_0_16 = callPackage ../development/libraries/libtorrent-rasterbar/0.16.nix { - # fix "unrecognized option -arch" error - stdenv = if stdenv.isDarwin - then clangStdenv - else stdenv; - }; + libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { }; @@ -8609,6 +8173,8 @@ in libu2f-server = callPackage ../development/libraries/libu2f-server { }; + libuecc = callPackage ../development/libraries/libuecc { }; + libui = callPackage ../development/libraries/libui { }; libunity = callPackage ../development/libraries/libunity { }; @@ -8617,7 +8183,7 @@ in libupnp = callPackage ../development/libraries/pupnp { }; - giflib = self.giflib_5_1; + giflib = giflib_5_1; giflib_4_1 = callPackage ../development/libraries/giflib/4.1.nix { }; giflib_5_0 = callPackage ../development/libraries/giflib/5.0.nix { }; giflib_5_1 = callPackage ../development/libraries/giflib/5.1.nix { }; @@ -8627,7 +8193,7 @@ in libunibreak = callPackage ../development/libraries/libunibreak { }; libunique = callPackage ../development/libraries/libunique/default.nix { }; - libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome) gtkdoc; }; + libunique3 = callPackage ../development/libraries/libunique/3.x.nix { inherit (gnome2) gtkdoc; }; liburcu = callPackage ../development/libraries/liburcu { }; @@ -8649,7 +8215,7 @@ in inherit (darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - libv4l = lowPrio (self.v4l_utils.override { + libv4l = lowPrio (v4l_utils.override { alsaLib = null; libX11 = null; qt4 = null; @@ -8688,7 +8254,7 @@ in libwmf = callPackage ../development/libraries/libwmf { }; - libwnck = self.libwnck2; + libwnck = libwnck2; libwnck2 = callPackage ../development/libraries/libwnck { }; libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { }; @@ -8715,16 +8281,17 @@ in libxml2 = callPackage ../development/libraries/libxml2 { }; libxml2Python = pkgs.buildEnv { # slightly hacky name = "libxml2+py-${self.libxml2.version}"; - paths = with self.libxml2; [ dev bin py ]; - inherit (self.libxml2) passthru; + paths = with libxml2; [ dev bin py ]; + inherit (libxml2) passthru; # the hook to find catalogs is hidden by buildEnv postBuild = '' mkdir "$out/nix-support" - cp '${self.libxml2.dev}/nix-support/propagated-native-build-inputs' "$out/nix-support/" + cp '${libxml2.dev}/nix-support/propagated-native-build-inputs' "$out/nix-support/" ''; }; libxmlxx = callPackage ../development/libraries/libxmlxx { }; + libxmlxx3 = callPackage ../development/libraries/libxmlxx/v3.nix { }; libxmp = callPackage ../development/libraries/libxmp { }; @@ -8754,6 +8321,8 @@ in lightlocker = callPackage ../misc/screensavers/light-locker { }; + linenoise = callPackage ../development/libraries/linenoise { }; + lirc = callPackage ../development/libraries/lirc { }; liquidfun = callPackage ../development/libraries/liquidfun { }; @@ -8793,6 +8362,8 @@ in menu-cache = callPackage ../development/libraries/menu-cache { }; + mergerfs = callPackage ../tools/filesystems/mergerfs { }; + mesaSupported = lib.elem system lib.platforms.mesaPlatforms; mesaDarwinOr = alternative: if stdenv.isDarwin @@ -8941,6 +8512,8 @@ in non = callPackage ../applications/audio/non { }; + ntl = callPackage ../development/libraries/ntl { }; + nspr = callPackage ../development/libraries/nspr { inherit (darwin.apple_sdk.frameworks) CoreServices; }; @@ -9026,20 +8599,21 @@ in openjpeg_2_1 = callPackage ../development/libraries/openjpeg/2.1.nix { }; openjpeg = openjpeg_2_1; - openscenegraph = callPackage ../development/libraries/openscenegraph { - giflib = giflib_4_1; - ffmpeg = ffmpeg_0; - }; + openscenegraph = callPackage ../development/libraries/openscenegraph { }; openslp = callPackage ../development/libraries/openslp {}; - libressl = self.libressl_2_4; + libressl = libressl_2_5; libressl_2_3 = callPackage ../development/libraries/libressl/2.3.nix { fetchurl = fetchurlBoot; }; libressl_2_4 = callPackage ../development/libraries/libressl/2.4.nix { fetchurl = fetchurlBoot; }; + libressl_2_5 = callPackage ../development/libraries/libressl/2.5.nix { + fetchurl = fetchurlBoot; + }; + boringssl = callPackage ../development/libraries/boringssl { }; @@ -9090,7 +8664,7 @@ in pcl = callPackage ../development/libraries/pcl { vtk = vtkWithQt4; inherit (darwin) cf-private; - inherit (darwin.apple_sdk.frameworks) Cocoa AGL; + inherit (darwin.apple_sdk.frameworks) Cocoa AGL OpenGL; }; pcre = callPackage ../development/libraries/pcre { }; @@ -9102,6 +8676,8 @@ in pdf2xml = callPackage ../development/libraries/pdf2xml {} ; + pg_repack = callPackage ../servers/sql/postgresql/pg_repack {}; + phonon = callPackage ../development/libraries/phonon {}; phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {}; @@ -9193,7 +8769,7 @@ in libpng = libpng12; }; - qt4 = self.kde4.qt4; + qt4 = pkgs.kde4.qt4; qt4_clang = lowPrio (self.qt4.override { stdenv = clangStdenv; }); @@ -9240,7 +8816,7 @@ in let imported = import ../development/libraries/qt-5/5.7 { inherit pkgs; }; in recurseIntoAttrs (imported.override (super: qt5LibsFun)); - qt5 = self.qt56; + qt5 = qt56; qt5ct = qt5.callPackage ../tools/misc/qt5ct { }; @@ -9322,6 +8898,8 @@ in quesoglc = callPackage ../development/libraries/quesoglc { }; + quickder = callPackage ../development/libraries/quickder {}; + quicksynergy = callPackage ../applications/misc/quicksynergy { }; qwt = callPackage ../development/libraries/qwt {}; @@ -9330,8 +8908,6 @@ in rabbitmq-c = callPackage ../development/libraries/rabbitmq-c {}; - rabbitmq-c_0_4 = callPackage ../development/libraries/rabbitmq-c/0.4.nix {}; - rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {}; raul = callPackage ../development/libraries/audio/raul { }; @@ -9345,6 +8921,8 @@ in readline63 = callPackage ../development/libraries/readline/6.3.nix { }; + readline70 = callPackage ../development/libraries/readline/7.0.nix { }; + readosm = callPackage ../development/libraries/readosm { }; lambdabot = callPackage ../development/tools/haskell/lambdabot { @@ -9461,6 +9039,8 @@ in silgraphite = callPackage ../development/libraries/silgraphite {}; graphite2 = callPackage ../development/libraries/silgraphite/graphite2.nix {}; + simavr = callPackage ../development/tools/simavr { }; + simgear = callPackage ../development/libraries/simgear { }; simp_le = callPackage ../tools/admin/simp_le { }; @@ -9559,6 +9139,8 @@ in stlport = callPackage ../development/libraries/stlport { }; + streamlink = callPackage ../applications/video/streamlink { pythonPackages = python3Packages; }; + strigi = callPackage ../development/libraries/strigi { clucene_core = clucene_core_2; }; subtitleeditor = callPackage ../applications/video/subtitleeditor { }; @@ -9753,7 +9335,15 @@ in vrpn = callPackage ../development/libraries/vrpn { }; - vtk = callPackage ../development/libraries/vtk { }; + vsqlite = callPackage ../development/libraries/vsqlite { }; + + vtk = callPackage ../development/libraries/vtk { + inherit (darwin) cf-private libobjc; + inherit (darwin.apple_sdk.libs) xpc; + inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration + IOKit CFNetwork Security ApplicationServices + CoreText IOSurface ImageIO OpenGL GLUT; + }; vtkWithQt4 = vtk.override { qtLib = qt4; }; @@ -9769,6 +9359,10 @@ in graphviz = graphviz-nox; }; + wayland_1_9 = callPackage ../development/libraries/wayland/1.9.nix { + graphviz = graphviz-nox; + }; + wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { }; webkit = webkitgtk; @@ -9783,12 +9377,12 @@ in inherit (darwin) libobjc; }; - webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix { + webkitgtk214x = callPackage ../development/libraries/webkitgtk/2.14.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; - webkitgtk210x = callPackage ../development/libraries/webkitgtk/2.10.nix { + webkitgtk212x = callPackage ../development/libraries/webkitgtk/2.12.nix { harfbuzz = harfbuzz-icu; gst-plugins-base = gst_all_1.gst-plugins-base; }; @@ -9813,18 +9407,18 @@ in wxGTK = wxGTK28; wxGTK28 = callPackage ../development/libraries/wxGTK-2.8 { - inherit (gnome) GConf; + inherit (gnome2) GConf; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK29 = callPackage ../development/libraries/wxGTK-2.9/default.nix { - inherit (gnome) GConf; + inherit (gnome2) GConf; inherit (darwin.stubs) setfile; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; wxGTK30 = callPackage ../development/libraries/wxGTK-3.0/default.nix { - inherit (gnome) GConf; + inherit (gnome2) GConf; inherit (darwin.stubs) setfile; withMesa = lib.elem system lib.platforms.mesaPlatforms; }; @@ -9934,6 +9528,8 @@ in czmq = callPackage ../development/libraries/czmq { }; + czmqpp = callPackage ../development/libraries/czmqpp { }; + zimlib = callPackage ../development/libraries/zimlib { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; @@ -10039,7 +9635,7 @@ in smack = callPackage ../development/libraries/java/smack { }; swt = callPackage ../development/libraries/java/swt { - inherit (gnome) libsoup; + inherit (gnome2) libsoup; }; @@ -10114,10 +9710,6 @@ in ### DEVELOPMENT / PYTHON MODULES - # python function with default python interpreter - buildPythonPackage = pythonPackages.buildPythonPackage; - buildPythonApplication = pythonPackages.buildPythonApplication; - # `nix-env -i python-nose` installs for 2.7, the default python. # Therefore we do not recurse into attributes here, in contrast to # python27Packages. `nix-env -iA python26Packages.nose` works @@ -10157,44 +9749,6 @@ in self = pypyPackages; }; - pycapnp = pythonPackages.pycapnp; - - pyexiv2 = pythonPackages.pyexiv2; - - pygobject = pythonPackages.pygobject; - - pygobject3 = pythonPackages.pygobject3; - - pygtk = pythonPackages.pygtk; - - pygtksourceview = pythonPackages.pygtksourceview; - - pyGtkGlade = pythonPackages.pyGtkGlade; - - rhpl = pythonPackages.rhpl; - - pysideApiextractor = pythonPackages.pysideApiextractor; - - pysideGeneratorrunner = pythonPackages.pysideGeneratorrunner; - - pyside = pythonPackages.pyside; - - pysideTools = pythonPackages.pysideTools; - - pysideShiboken = pythonPackages.pysideShiboken; - - pyxml = pythonPackages.pyxml; - - rbtools = pythonPackages.rbtools; - - rebol = callPackage ../development/interpreters/rebol { }; - - slowaes = pythonPackages.slowaes; - - yolk = callPackage ../development/python-modules/yolk {}; - - ZopeInterface = pythonPackages.zope_interface; - ### DEVELOPMENT / R MODULES R = callPackage ../applications/science/math/R { @@ -10229,7 +9783,7 @@ in rdf4store = callPackage ../servers/http/4store { }; - apacheHttpd = self.apacheHttpd_2_4; + apacheHttpd = pkgs.apacheHttpd_2_4; apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix { sslSupport = true; @@ -10266,13 +9820,17 @@ in archiveopteryx = callPackage ../servers/mail/archiveopteryx/default.nix { }; + atlassian-confluence = callPackage ../servers/atlassian/confluence.nix { }; + atlassian-crowd = callPackage ../servers/atlassian/crowd.nix { }; + atlassian-jira = callPackage ../servers/atlassian/jira.nix { }; + cadvisor = callPackage ../servers/monitoring/cadvisor { }; cassandra_1_2 = callPackage ../servers/nosql/cassandra/1.2.nix { }; cassandra_2_0 = callPackage ../servers/nosql/cassandra/2.0.nix { }; cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { }; cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { }; - cassandra = self.cassandra_3_0; + cassandra = cassandra_3_0; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { java = jdk; @@ -10282,7 +9840,7 @@ in java = jdk; }; - fuseki = self.apache-jena-fuseki; + fuseki = apache-jena-fuseki; apcupsd = callPackage ../servers/apcupsd { }; @@ -10291,6 +9849,7 @@ in sabnzbd = callPackage ../servers/sabnzbd { }; bind = callPackage ../servers/dns/bind { }; + dnsutils = bind.dnsutils; bird = callPackage ../servers/bird { }; bird6 = bird.override { enableIPv6 = true; }; @@ -10504,6 +10063,8 @@ in pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { }; pflogsumm = callPackage ../servers/mail/postfix/pflogsumm.nix { }; + postgrey = callPackage ../servers/mail/postgrey { }; + pshs = callPackage ../servers/http/pshs { }; libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; }; @@ -10531,8 +10092,6 @@ in rpcbind = callPackage ../servers/rpcbind { }; - #monetdb = callPackage ../servers/sql/monetdb { }; - mariadb = callPackage ../servers/sql/mariadb { inherit (darwin) cctools; inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; @@ -10541,6 +10100,7 @@ in mongodb = callPackage ../servers/nosql/mongodb { sasl = cyrus_sasl; + inherit (darwin.apple_sdk.frameworks) Security; }; mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { }; @@ -10556,6 +10116,12 @@ in inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix { + inherit (darwin) cctools; + inherit (darwin.apple_sdk.frameworks) CoreServices; + boost = boost159; + }; + mysql = mariadb; libmysql = mysql.client; # `libmysql` is a slight misnomer ATM @@ -10648,6 +10214,8 @@ in inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa; }; + radicale = callPackage ../servers/radicale { }; + rake = callPackage ../development/tools/build-managers/rake { }; redis = callPackage ../servers/nosql/redis { }; @@ -10675,6 +10243,10 @@ in HTTPDate MailDKIM LWP IOSocketSSL; }; + deadpixi-sam-unstable = callPackage ../applications/editors/deadpixi-sam { }; + deadpixi-sam = deadpixi-sam-unstable; + sam = deadpixi-sam; + samba3 = callPackage ../servers/samba/3.x.nix { }; samba4 = callPackage ../servers/samba/4.x.nix { @@ -10741,10 +10313,12 @@ in storm = callPackage ../servers/computing/storm { }; - slurm-llnl = callPackage ../servers/computing/slurm { gtk = null; }; + slurm-llnl = callPackage ../servers/computing/slurm { gtk2 = null; }; slurm-llnl-full = appendToName "full" (callPackage ../servers/computing/slurm { }); + systemd-journal2gelf = callPackage ../tools/system/systemd-journal2gelf { }; + inherit (callPackages ../servers/http/tomcat { }) tomcat6 tomcat7 @@ -10758,6 +10332,8 @@ in tt-rss = callPackage ../servers/tt-rss { }; + selfoss = callPackage ../servers/web-apps/selfoss { }; + axis2 = callPackage ../servers/http/tomcat/axis2 { }; unifi = callPackage ../servers/unifi { }; @@ -10853,7 +10429,7 @@ in atop = callPackage ../os-specific/linux/atop { }; audit = callPackage ../os-specific/linux/audit { }; - libaudit = self.audit; + libaudit = audit; b43Firmware_5_1_138 = callPackage ../os-specific/linux/firmware/b43-firmware/5.1.138.nix { }; @@ -10870,9 +10446,9 @@ in # Needed for LibreOffice bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { }); - bluez = self.bluez5; + bluez = bluez5; - inherit (pythonPackages) bedup; + inherit (python3Packages) bedup; bridge-utils = callPackage ../os-specific/linux/bridge-utils { }; @@ -10886,12 +10462,18 @@ in cifs-utils = callPackage ../os-specific/linux/cifs-utils { }; + cockroachdb = callPackage ../servers/sql/cockroachdb { + gcc = gcc6; # needs gcc 6.0 and above + }; + conky = callPackage ../os-specific/linux/conky ({ lua = lua5_1; # conky can use 5.2, but toluapp can not } // config.conky or {}); conntrack_tools = callPackage ../os-specific/linux/conntrack-tools { }; + coredns = callPackage ../servers/dns/coredns { }; + cpufrequtils = callPackage ../os-specific/linux/cpufrequtils { }; cryopid = callPackage ../os-specific/linux/cryopid { }; @@ -10914,7 +10496,10 @@ in xctoolchain = xcode.toolchain; }; - cctools = (callPackage ../os-specific/darwin/cctools/port.nix { inherit libobjc; }).native; + cctools = (callPackage ../os-specific/darwin/cctools/port.nix { + inherit libobjc; + stdenv = if stdenv.isDarwin then stdenv else libcxxStdenv; + }).native; cf-private = callPackage ../os-specific/darwin/cf-private { inherit (apple-source-releases) CF; @@ -10948,9 +10533,11 @@ in libobjc = apple-source-releases.objc4; stubs = callPackages ../os-specific/darwin/stubs {}; + + usr-include = callPackage ../os-specific/darwin/usr-include {}; }; - devicemapper = self.lvm2; + devicemapper = lvm2; disk_indicator = callPackage ../os-specific/linux/disk-indicator { }; @@ -10999,7 +10586,7 @@ in ebtables = callPackage ../os-specific/linux/ebtables { }; - eject = self.utillinux; + eject = utillinux; facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { }; @@ -11012,7 +10599,7 @@ in ffadoFull = callPackage ../os-specific/linux/ffado { inherit (pythonPackages) python pyqt4 dbus-python; }; - libffado = self.ffadoFull.override { prefix = "lib"; }; + libffado = ffadoFull.override { prefix = "lib"; }; fbterm = callPackage ../os-specific/linux/fbterm { }; @@ -11040,7 +10627,7 @@ in ncurses = null; # Keep curses disabled for lack of value }; - gpm-ncurses = self.gpm.override { inherit ncurses; }; + gpm-ncurses = gpm.override { inherit ncurses; }; gradm = callPackage ../os-specific/linux/gradm { flex = flex_2_5_35; @@ -11133,7 +10720,7 @@ in # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders = self.linuxHeaders_4_4; + linuxHeaders = linuxHeaders_4_4; linuxHeaders24Cross = forceNativeDrv (callPackage ../os-specific/linux/kernel-headers/2.4.nix { cross = assert crossSystem != null; crossSystem; @@ -11148,12 +10735,12 @@ in linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { }; # We can choose: - linuxHeadersCrossChooser = ver : if ver == "2.4" then self.linuxHeaders24Cross - else if ver == "2.6" then self.linuxHeaders26Cross + linuxHeadersCrossChooser = ver : if ver == "2.4" then linuxHeaders24Cross + else if ver == "2.6" then linuxHeaders26Cross else throw "Unknown linux kernel version"; linuxHeadersCross = assert crossSystem != null; - self.linuxHeadersCrossChooser crossSystem.platform.kernelMajor; + linuxHeadersCrossChooser crossSystem.platform.kernelMajor; kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { }; @@ -11178,7 +10765,7 @@ in }; linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix { - kernelPatches = with kernelPatches; [ bridge_stp_helper link_lguest link_apm ] + kernelPatches = with kernelPatches; [ bridge_stp_helper lguest_entry-linkage ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -11187,16 +10774,7 @@ in }; linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix { - kernelPatches = with kernelPatches; [ bridge_stp_helper crc_regression link_lguest ] - ++ lib.optionals ((platform.kernelArch or null) == "mips") - [ kernelPatches.mips_fpureg_emu - kernelPatches.mips_fpu_sigill - kernelPatches.mips_ext3_n32 - ]; - }; - - linux_3_14 = callPackage ../os-specific/linux/kernel/linux-3.14.nix { - kernelPatches = [ kernelPatches.bridge_stp_helper ] + kernelPatches = with kernelPatches; [ bridge_stp_helper crc_regression ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu kernelPatches.mips_fpu_sigill @@ -11236,10 +10814,12 @@ in ]; }; - linux_4_6 = callPackage ../os-specific/linux/kernel/linux-4.6.nix { + linux_4_7 = callPackage ../os-specific/linux/kernel/linux-4.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper - kernelPatches.cpu-cgroup-v2."4.6" + # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md + # when adding a new linux version + kernelPatches.cpu-cgroup-v2."4.7" ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11248,12 +10828,14 @@ in ]; }; - linux_4_7 = callPackage ../os-specific/linux/kernel/linux-4.7.nix { + linux_4_8 = callPackage ../os-specific/linux/kernel/linux-4.8.nix { kernelPatches = [ kernelPatches.bridge_stp_helper # See pkgs/os-specific/linux/kernel/cpu-cgroup-v2-patches/README.md # when adding a new linux version - kernelPatches.cpu-cgroup-v2."4.7" + # !!! 4.7 patch doesn't apply, 4.8 patch not up yet, will keep checking + # kernelPatches.cpu-cgroup-v2."4.7" + kernelPatches.modinst_arg_list_too_long ] ++ lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -11288,7 +10870,7 @@ in ]; }; - linux_chromiumos_latest = self.linux_chromiumos_3_18; + linux_chromiumos_latest = linux_chromiumos_3_18; /* Linux kernel modules are inherently tied to a specific kernel. So rather than provide specific instances of those packages for a @@ -11296,13 +10878,17 @@ in for a specific kernel. This function can then be called for whatever kernel you're using. */ - linuxPackagesFor = kernel: self: let callPackage = newScope self; in rec { + linuxPackagesFor = kernel: lib.makeExtensible (self: with self; { + callPackage = newScope self; + inherit kernel; accelio = callPackage ../development/libraries/accelio { }; acpi_call = callPackage ../os-specific/linux/acpi-call {}; + amdgpu-pro = callPackage ../os-specific/linux/amdgpu-pro { }; + batman_adv = callPackage ../os-specific/linux/batman-adv {}; bcc = callPackage ../os-specific/linux/bcc { }; @@ -11317,6 +10903,8 @@ in cpupower = callPackage ../os-specific/linux/cpupower { }; + displaylink = callPackage ../os-specific/linux/displaylink { }; + dpdk = callPackage ../os-specific/linux/dpdk { }; pktgen = callPackage ../os-specific/linux/pktgen { }; @@ -11352,6 +10940,8 @@ in rtl8812au = callPackage ../os-specific/linux/rtl8812au { }; + rtlwifi_new = callPackage ../os-specific/linux/rtlwifi_new { }; + openafsClient = callPackage ../servers/openafs-client { }; facetimehd = callPackage ../os-specific/linux/facetimehd { }; @@ -11384,29 +10974,21 @@ in sysdig = callPackage ../os-specific/linux/sysdig {}; + systemtap = callPackage ../development/tools/profiling/systemtap { }; + tp_smapi = callPackage ../os-specific/linux/tp_smapi { }; v86d = callPackage ../os-specific/linux/v86d { }; vhba = callPackage ../misc/emulators/cdemu/vhba.nix { }; - virtualbox = callPackage ../applications/virtualization/virtualbox { - stdenv = stdenv_32bit; - inherit (gnome) libIDL; - enableExtensionPack = config.virtualbox.enableExtensionPack or false; - pulseSupport = config.pulseaudio or false; + virtualbox = callPackage ../os-specific/linux/virtualbox { + virtualbox = pkgs.virtualboxHardened; }; - virtualboxHardened = lowPrio (virtualbox.override { - enableHardening = true; - }); - - virtualboxHeadless = lowPrio (virtualbox.override { - enableHardening = true; - headless = true; - }); - - virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { }; + virtualboxGuestAdditions = callPackage ../applications/virtualization/virtualbox/guest-additions { + virtualbox = pkgs.virtualboxHardened; + }; wireguard = callPackage ../os-specific/linux/wireguard { }; @@ -11416,41 +10998,40 @@ in configFile = "kernel"; inherit kernel spl; }; - }; + }); # The current default kernel / kernel modules. - linuxPackages = self.linuxPackages_4_4; - linux = self.linuxPackages.kernel; + linuxPackages = linuxPackages_4_4; + linux = linuxPackages.kernel; # Update this when adding the newest kernel major version! - linuxPackages_latest = self.linuxPackages_4_7; - linux_latest = self.linuxPackages_latest.kernel; + linuxPackages_latest = linuxPackages_4_8; + linux_latest = linuxPackages_latest.kernel; # Build the kernel modules for the some of the kernels. - linuxPackages_mptcp = self.linuxPackagesFor self.linux_mptcp linuxPackages_mptcp; - linuxPackages_rpi = self.linuxPackagesFor self.linux_rpi linuxPackages_rpi; - linuxPackages_3_10 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_10 linuxPackages_3_10); - linuxPackages_3_10_tuxonice = self.linuxPackagesFor self.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; - linuxPackages_3_12 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_12 linuxPackages_3_12); - linuxPackages_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_14 linuxPackages_3_14); - linuxPackages_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_3_18 linuxPackages_3_18); - linuxPackages_4_1 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_1 linuxPackages_4_1); - linuxPackages_4_4 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_4 linuxPackages_4_4); - linuxPackages_4_6 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_6 linuxPackages_4_6); - linuxPackages_4_7 = recurseIntoAttrs (self.linuxPackagesFor self.linux_4_7 linuxPackages_4_7); + linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; + linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi; + linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10); + linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice; + linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12); + linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18); + linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1); + linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); + linuxPackages_4_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_7); + linuxPackages_4_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_8); # Don't forget to update linuxPackages_latest! # Intentionally lacks recurseIntoAttrs, as -rc kernels will quite likely break out-of-tree modules and cause failed Hydra builds. - linuxPackages_testing = self.linuxPackagesFor self.linux_testing linuxPackages_testing; + linuxPackages_testing = linuxPackagesFor pkgs.linux_testing; - linuxPackages_custom = {version, src, configfile}: - let linuxPackages_self = (self.linuxPackagesFor (self.linuxManualConfig {inherit version src configfile; - allowImportFromDerivation=true;}) - linuxPackages_self); - in recurseIntoAttrs linuxPackages_self; + linuxPackages_custom = { version, src, configfile }: + recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig { + inherit version src configfile; + allowImportFromDerivation = true; + })); # Build a kernel for Xen dom0 - linuxPackages_latest_xen_dom0 = recurseIntoAttrs (self.linuxPackagesFor (self.linux_latest.override { features.xen_dom0=true; }) linuxPackages_latest); + linuxPackages_latest_xen_dom0 = recurseIntoAttrs (linuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); # Grsecurity packages @@ -11470,14 +11051,11 @@ in }; linuxPackages_grsec_nixos = - let self = linuxPackagesFor linux_grsec_nixos self; - in recurseIntoAttrs self; + recurseIntoAttrs (linuxPackagesFor linux_grsec_nixos); # An unsupported grsec xen guest kernel linux_grsec_server_xen = linux_grsec_nixos.override { extraConfig = '' - GRKERNSEC y - PAX y GRKERNSEC_CONFIG_AUTO y GRKERNSEC_CONFIG_PRIORITY_SECURITY y GRKERNSEC_CONFIG_SERVER y @@ -11487,13 +11065,13 @@ in }; # ChromiumOS kernels - linuxPackages_chromiumos_3_14 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14); - linuxPackages_chromiumos_3_18 = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18); - linuxPackages_chromiumos_latest = recurseIntoAttrs (self.linuxPackagesFor self.linux_chromiumos_latest linuxPackages_chromiumos_latest); + linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14); + linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18); + linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest); # A function to build a manually-configured kernel linuxManualConfig = pkgs.buildLinux; - buildLinux = callPackage ../os-specific/linux/kernel/manual-config.nix {}; + buildLinux = makeOverridable (callPackage ../os-specific/linux/kernel/manual-config.nix {}); keyutils = callPackage ../os-specific/linux/keyutils { }; @@ -11578,8 +11156,10 @@ in numad = callPackage ../os-specific/linux/numad { }; + nvme-cli = callPackage ../os-specific/linux/nvme-cli { }; + open-vm-tools = callPackage ../applications/virtualization/open-vm-tools { - inherit (gnome) gtk gtkmm; + inherit (gnome2) gtk gtkmm; }; go-bindata = callPackage ../development/tools/go-bindata { }; @@ -11655,6 +11235,8 @@ in policycoreutils = callPackage ../os-specific/linux/policycoreutils { }; + powerdns = callPackage ../servers/dns/powerdns { }; + powertop = callPackage ../os-specific/linux/powertop { }; prayer = callPackage ../servers/prayer { }; @@ -11687,6 +11269,8 @@ in rtl8723bs-firmware = callPackage ../os-specific/linux/firmware/rtl8723bs-firmware { }; + rtlwifi_new-firmware = callPackage ../os-specific/linux/firmware/rtlwifi_new-firmware { }; + s3ql = callPackage ../tools/backup/s3ql { }; sass = callPackage ../development/tools/sass { }; @@ -11725,12 +11309,12 @@ in sysfsutils = callPackage ../os-specific/linux/sysfsutils { }; sysprof = callPackage ../development/tools/profiling/sysprof { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; # Provided with sysfsutils. - libsysfs = self.sysfsutils; - systool = self.sysfsutils; + libsysfs = sysfsutils; + systool = sysfsutils; sysklogd = callPackage ../os-specific/linux/sysklogd { }; @@ -12005,9 +11589,15 @@ in docbook_xsl docbook_xsl_ns; - docbook_xml_xslt = self.docbook_xsl; + docbook_xml_xslt = docbook_xsl; - docbook5_xsl = self.docbook_xsl_ns; + docbook5_xsl = docbook_xsl_ns; + + cabin = callPackage ../data/fonts/cabin { }; + + camingo-code = callPackage ../data/fonts/camingo-code { }; + + dosis = callPackage ../data/fonts/dosis { }; dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { }; @@ -12022,6 +11612,8 @@ in inherit (pythonPackages) scfbuild; }; + encode-sans = callPackage ../data/fonts/encode-sans { }; + fantasque-sans-mono = callPackage ../data/fonts/fantasque-sans-mono {}; fira = callPackage ../data/fonts/fira { }; @@ -12063,6 +11655,8 @@ in inconsolata = callPackage ../data/fonts/inconsolata {}; inconsolata-lgc = callPackage ../data/fonts/inconsolata/lgc.nix {}; + input-fonts = callPackage ../data/fonts/input-fonts { }; + iosevka = callPackage ../data/fonts/iosevka { }; ipafont = callPackage ../data/fonts/ipafont {}; @@ -12076,17 +11670,27 @@ in kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + lato = callPackage ../data/fonts/lato {}; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; - liberation_ttf = self.liberation_ttf_binary; + liberation_ttf = liberation_ttf_binary; liberationsansnarrow = callPackage ../data/fonts/liberationsansnarrow { }; liberationsansnarrow_binary = callPackage ../data/fonts/liberationsansnarrow/binary.nix { }; libertine = callPackage ../data/fonts/libertine { }; + libre-baskerville = callPackage ../data/fonts/libre-baskerville { }; + + libre-bodoni = callPackage ../data/fonts/libre-bodoni { }; + + libre-caslon = callPackage ../data/fonts/libre-caslon { }; + + libre-franklin = callPackage ../data/fonts/libre-franklin { }; + lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {}; lmodern = callPackage ../data/fonts/lmodern { }; @@ -12099,6 +11703,8 @@ in # lohit-fonts.kashmiri lohit-fonts.konkani lohit-fonts.maithili lohit-fonts.sindhi lohit-fonts = recurseIntoAttrs ( callPackages ../data/fonts/lohit-fonts { } ); + maia-icon-theme = callPackage ../data/icons/maia-icon-theme { }; + marathi-cursive = callPackage ../data/fonts/marathi-cursive { }; man-pages = callPackage ../data/documentation/man-pages { }; @@ -12219,7 +11825,9 @@ in inherit (callPackages ../data/fonts/tai-languages { }) tai-ahom; - tango-icon-theme = callPackage ../data/icons/tango-icon-theme { }; + tango-icon-theme = callPackage ../data/icons/tango-icon-theme { + gtk = self.gtk2; + }; themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) {}; @@ -12263,7 +11871,7 @@ in xlsx2csv = pythonPackages.xlsx2csv; - zeal = qt55.callPackage ../data/documentation/zeal { }; + zeal = qt5.callPackage ../data/documentation/zeal { }; ### APPLICATIONS @@ -12301,7 +11909,7 @@ in }; abiword = callPackage ../applications/office/abiword { - inherit (gnome) libglade libgnomecanvas; + inherit (gnome2) libglade libgnomecanvas; iconTheme = gnome3.defaultIconTheme; }; @@ -12358,15 +11966,20 @@ in ao = callPackage ../applications/graphics/ao {}; - ardour = self.ardour4; + ardour = ardour5; ardour3 = callPackage ../applications/audio/ardour/ardour3.nix { - inherit (gnome) libgnomecanvas libgnomecanvasmm; + inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; }; - ardour4 = callPackage ../applications/audio/ardour { - inherit (gnome) libgnomecanvas libgnomecanvasmm; + ardour4 = callPackage ../applications/audio/ardour/ardour4.nix { + inherit (gnome2) libgnomecanvas libgnomecanvasmm; + inherit (vamp) vampSDK; + }; + + ardour5 = callPackage ../applications/audio/ardour { + inherit (gnome2) libgnomecanvas libgnomecanvasmm; inherit (vamp) vampSDK; }; @@ -12377,7 +11990,7 @@ in artha = callPackage ../applications/misc/artha { }; atomEnv = callPackage ../applications/editors/atom/env.nix { - gconf = gnome.GConf; + gconf = gnome2.GConf; }; atom = callPackage ../applications/editors/atom { }; @@ -12399,8 +12012,8 @@ in altcoins = recurseIntoAttrs ( callPackage ../applications/altcoins { callPackage = newScope { boost = boost155; }; } ); - bitcoin = self.altcoins.bitcoin; - bitcoin-xt = self.altcoins.bitcoin-xt; + bitcoin = altcoins.bitcoin; + bitcoin-xt = altcoins.bitcoin-xt; go-ethereum = self.altcoins.go-ethereum; ethabi = self.altcoins.ethabi; @@ -12436,7 +12049,7 @@ in cairo = cairo.override { xcbSupport = true; }; luaPackages = luaPackages.override { inherit lua; }; }; - awesome = self.awesome-3-5; + awesome = awesome-3-5; awesomebump = qt5.callPackage ../applications/graphics/awesomebump { }; @@ -12446,7 +12059,7 @@ in backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; - backintime = self.backintime-qt4; + backintime = backintime-qt4; bandwidth = callPackage ../tools/misc/bandwidth { }; @@ -12455,7 +12068,7 @@ in }; banshee = callPackage ../applications/audio/banshee { - gconf = pkgs.gnome.GConf; + gconf = pkgs.gnome2.GConf; libgpod = pkgs.libgpod.override { monoSupport = true; }; }; @@ -12473,7 +12086,7 @@ in bazaarTools = callPackage ../applications/version-management/bazaar/tools.nix { }; beast = callPackage ../applications/audio/beast { - inherit (gnome) libgnomecanvas libart_lgpl; + inherit (gnome2) libgnomecanvas libart_lgpl; guile = guile_1_8; }; @@ -12528,7 +12141,7 @@ in bviplus = callPackage ../applications/editors/bviplus { }; calf = callPackage ../applications/audio/calf { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; calcurse = callPackage ../applications/misc/calcurse { }; @@ -12563,7 +12176,7 @@ in inherit (darwin) IOKit; }; - cdparanoia = self.cdparanoiaIII; + cdparanoia = cdparanoiaIII; cdparanoiaIII = callPackage ../applications/audio/cdparanoia { inherit (darwin) IOKit; @@ -12594,13 +12207,14 @@ in enablePepperFlash = config.chromium.enablePepperFlash or false; enableWideVine = config.chromium.enableWideVine or false; hiDPISupport = config.chromium.hiDPISupport or false; + gnome = gnome2; }; chronos = callPackage ../applications/networking/cluster/chronos { }; - chromiumBeta = lowPrio (self.chromium.override { channel = "beta"; }); + chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - chromiumDev = lowPrio (self.chromium.override { channel = "dev"; }); + chromiumDev = lowPrio (chromium.override { channel = "dev"; }); chuck = callPackage ../applications/audio/chuck { }; @@ -12632,7 +12246,7 @@ in CompBus = callPackage ../applications/audio/CompBus { }; compiz = callPackage ../applications/window-managers/compiz { - inherit (gnome) GConf ORBit2 metacity; + inherit (gnome2) GConf ORBit2 metacity; }; constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { }; @@ -12640,7 +12254,7 @@ in copyq = callPackage ../applications/misc/copyq { }; coriander = callPackage ../applications/video/coriander { - inherit (gnome) libgnomeui GConf; + inherit (gnome2) libgnomeui GConf; }; cortex = callPackage ../applications/misc/cortex { }; @@ -12650,7 +12264,7 @@ in cinepaint = callPackage ../applications/graphics/cinepaint { fltk = fltk13; libpng = libpng12; - cmake = cmake-2_8; + cmake = cmake_2_8; }; codeblocks = callPackage ../applications/editors/codeblocks { }; @@ -12659,17 +12273,13 @@ in comical = callPackage ../applications/graphics/comical { }; conkeror-unwrapped = callPackage ../applications/networking/browsers/conkeror { }; - conkeror = self.wrapFirefox conkeror-unwrapped { }; + conkeror = wrapFirefox conkeror-unwrapped { }; - cpp_ethereum = callPackage ../applications/misc/webthree-umbrella { - withOpenCL = true; + containerd = callPackage ../applications/virtualization/containerd { }; - # withEVMJIT = true; - # inherit (pkgs.llvmPackages_38) llvm; + convchain = callPackage ../tools/graphics/convchain {}; - # withGUI = true; - # inherit (pkgs.qt5) qtwebengine qtbase qtdeclarative; - }; + cpp_ethereum = callPackage ../applications/misc/cpp-ethereum { }; csdp = callPackage ../applications/science/math/csdp { liblapack = liblapackWithoutAtlas; @@ -12710,7 +12320,7 @@ in }); darktable = callPackage ../applications/graphics/darktable { - inherit (gnome) GConf libglade; + inherit (gnome2) GConf libglade; pugixml = pugixml.override { shared = true; }; }; @@ -12735,7 +12345,7 @@ in dfilemanager = qt5.callPackage ../applications/misc/dfilemanager { }; dia = callPackage ../applications/graphics/dia { - inherit (pkgs.gnome) libart_lgpl libgnomeui; + inherit (pkgs.gnome2) libart_lgpl libgnomeui; }; diffuse = callPackage ../applications/version-management/diffuse { }; @@ -12751,7 +12361,7 @@ in djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { }; djview = callPackage ../applications/graphics/djview { }; - djview4 = self.djview; + djview4 = pkgs.djview; dmenu = callPackage ../applications/misc/dmenu { }; @@ -12759,16 +12369,19 @@ in dmenu2 = callPackage ../applications/misc/dmenu2 { }; - dmtx = self.dmtx-utils; + dmtx = dmtx-utils; - dmtx-utils = callPackage ../tools/graphics/dmtx-utils { }; - - docker = callPackage ../applications/virtualization/docker { - btrfs-progs = btrfs-progs_4_4_1; + dmtx-utils = callPackage (callPackage ../tools/graphics/dmtx-utils) { }; + docker = callPackage ../applications/virtualization/docker { }; + docker-gc = callPackage ../applications/virtualization/docker/gc.nix { }; + docker-machine = callPackage ../applications/networking/cluster/docker-machine { }; + + docker-distribution = callPackage ../applications/virtualization/docker-distribution { }; + doodle = callPackage ../applications/search/doodle { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; @@ -12816,12 +12429,12 @@ in elvis = callPackage ../applications/editors/elvis { }; - emacs = self.emacs24; - emacsPackages = self.emacs24Packages; - emacsPackagesNg = self.emacs24PackagesNg; - emacsMelpa = self.emacs24PackagesNg; # for backward compatibility + emacs = emacs25; + emacsPackages = emacs25Packages; + emacsPackagesNg = emacs25PackagesNg; + emacsMelpa = emacs25PackagesNg; # for backward compatibility - emacs24 = callPackage ../applications/editors/emacs-24 { + emacs25 = callPackage ../applications/editors/emacs { # use override to enable additional features libXaw = xorg.libXaw; Xaw3d = null; @@ -12833,30 +12446,25 @@ in inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; }; - emacs24-nox = lowPrio (appendToName "nox" (self.emacs24.override { + emacs25-nox = lowPrio (appendToName "nox" (emacs25.override { withX = false; withGTK2 = false; withGTK3 = false; })); - emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs-24/macport-24.5.nix { + emacs24Macport_24_5 = lowPrio (callPackage ../applications/editors/emacs/macport-24.5.nix { inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit ImageCaptureCore GSS ImageIO; }); emacs24Macport = self.emacs24Macport_24_5; - emacs25pre = lowPrio (callPackage ../applications/editors/emacs-25 { - # use override to enable additional features - libXaw = xorg.libXaw; - Xaw3d = null; - gconf = null; - alsaLib = null; - imagemagick = null; - acl = null; - gpm = null; - inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO; + 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; emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec { inherit emacs; @@ -12965,19 +12573,13 @@ in prologMode = callPackage ../applications/editors/emacs-modes/prolog { }; - proofgeneral_4_2 = callPackage ../applications/editors/emacs-modes/proofgeneral/4.2.nix { - texinfo = texinfo4 ; - texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; - }; - proofgeneral_4_3_pre = callPackage ../applications/editors/emacs-modes/proofgeneral/4.3pre.nix { - texinfo = texinfo4 ; + proofgeneral = callPackage ../applications/editors/emacs-modes/proofgeneral/4.4.nix { texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; }; proofgeneral_HEAD = callPackage ../applications/editors/emacs-modes/proofgeneral/HEAD.nix { texinfo = texinfo4 ; texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; }; }; - proofgeneral = self.proofgeneral_4_2; quack = callPackage ../applications/editors/emacs-modes/quack { }; @@ -13011,7 +12613,7 @@ in cask = callPackage ../applications/editors/emacs-modes/cask { }; }; - emacs24Packages = emacsPackagesGen emacs24 pkgs.emacs24Packages; + emacs25Packages = emacsPackagesGen emacs25 pkgs.emacs25Packages; emacsPackagesNgGen = emacs: import ./emacs-packages.nix { overrides = (config.emacsPackageOverrides or (p: {})) pkgs; @@ -13036,9 +12638,9 @@ in }; }; - emacs24PackagesNg = emacsPackagesNgGen emacs24; + emacs25PackagesNg = emacsPackagesNgGen emacs25; - emacs24WithPackages = emacs24PackagesNg.emacsWithPackages; + emacs25WithPackages = emacs25PackagesNg.emacsWithPackages; emacsWithPackages = emacsPackagesNg.emacsWithPackages; # inherit (gnome3) empathy; @@ -13067,7 +12669,7 @@ in eterm = callPackage ../applications/misc/eterm { }; etherape = callPackage ../applications/networking/sniffers/etherape { - inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper; + inherit (gnome2) gnomedocutils libgnome libglade libgnomeui scrollkeeper; }; evilvte = callPackage ../applications/misc/evilvte { @@ -13089,6 +12691,8 @@ in keepass-keefox = callPackage ../applications/misc/keepass-plugins/keefox { }; + keepass-keepasshttp = callPackage ../applications/misc/keepass-plugins/keepasshttp { }; + exrdisplay = callPackage ../applications/graphics/exrdisplay { }; exrtools = callPackage ../applications/graphics/exrtools { }; @@ -13135,21 +12739,27 @@ in gksu = callPackage ../applications/misc/gksu { }; gnuradio = callPackage ../applications/misc/gnuradio { - inherit (pythonPackages) lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython; + inherit (pythonPackages) lxml matplotlib numpy python pyopengl pyqt4 scipy wxPython pygtk; fftw = fftwFloat; }; gnuradio-with-packages = callPackage ../applications/misc/gnuradio/wrapper.nix { - extraPackages = [ gnuradio-nacl gnuradio-osmosdr ]; + extraPackages = [ gnuradio-nacl gnuradio-osmosdr gnuradio-gsm gnuradio-ais gnuradio-rds ]; }; gnuradio-nacl = callPackage ../applications/misc/gnuradio-nacl { }; + gnuradio-gsm = callPackage ../applications/misc/gnuradio-gsm { }; + + gnuradio-ais = callPackage ../applications/misc/gnuradio-ais { }; + + gnuradio-rds = callPackage ../applications/misc/gnuradio-rds { }; + gnuradio-osmosdr = callPackage ../applications/misc/gnuradio-osmosdr { }; goldendict = qt55.callPackage ../applications/misc/goldendict { }; - google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; + inherit (ocamlPackages) google-drive-ocamlfuse; google-musicmanager = callPackage ../applications/audio/google-musicmanager { }; @@ -13164,7 +12774,7 @@ in grepm = callPackage ../applications/search/grepm { }; grip = callPackage ../applications/misc/grip { - inherit (gnome) libgnome libgnomeui vte; + inherit (gnome2) libgnome libgnomeui vte; }; gsimplecal = callPackage ../applications/misc/gsimplecal { }; @@ -13210,22 +12820,22 @@ in filezilla = callPackage ../applications/networking/ftp/filezilla { }; inherit (callPackages ../applications/networking/browsers/firefox { - inherit (gnome) libIDL; + inherit (gnome2) libIDL; inherit (pythonPackages) pysqlite; libpng = libpng_apng; enableGTK3 = false; }) firefox-unwrapped firefox-esr-unwrapped; - firefox = self.wrapFirefox firefox-unwrapped { }; - firefox-esr = self.wrapFirefox firefox-esr-unwrapped { }; + firefox = wrapFirefox firefox-unwrapped { }; + firefox-esr = wrapFirefox firefox-esr-unwrapped { }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; inherit (pkgs.gnome3) defaultIconTheme; }; - firefox-bin = self.wrapFirefox firefox-bin-unwrapped { + firefox-bin = wrapFirefox firefox-bin-unwrapped { browserName = "firefox"; name = "firefox-bin-" + (builtins.parseDrvName firefox-bin-unwrapped.name).version; @@ -13234,8 +12844,8 @@ in firefox-beta-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { generated = import ../applications/networking/browsers/firefox-bin/beta_sources.nix; - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; inherit (pkgs.gnome3) defaultIconTheme; }; @@ -13256,14 +12866,14 @@ in debug = config.flashplayer.debug or false; }; - flashplayer-standalone = self.pkgsi686Linux.flashplayer.sa; + flashplayer-standalone = pkgsi686Linux.flashplayer.sa; - flashplayer-standalone-debugger = (self.pkgsi686Linux.flashplayer.override { debug = true; }).sa; + flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa; fluxbox = callPackage ../applications/window-managers/fluxbox { }; fme = callPackage ../applications/misc/fme { - inherit (gnome) libglademm; + inherit (gnome2) libglademm; }; fomp = callPackage ../applications/audio/fomp { }; @@ -13271,7 +12881,6 @@ in freecad = callPackage ../applications/graphics/freecad { boost = boost155; opencascade = opencascade_oce; - inherit (pythonPackages) matplotlib pycollada pivy; }; freemind = callPackage ../applications/misc/freemind { }; @@ -13283,14 +12892,14 @@ in xfontsel = callPackage ../applications/misc/xfontsel { }; inherit (xorg) xlsfonts; - freerdp = callPackage ../applications/networking/remote/freerdp { + freerdpStable = callPackage ../applications/networking/remote/freerdp { ffmpeg = ffmpeg_1; }; - freerdpUnstable = callPackage ../applications/networking/remote/freerdp/unstable.nix { ffmpeg = ffmpeg_2; - cmake = cmake-2_8; + cmake = cmake_2_8; }; + freerdp = freerdpUnstable; # freerdpStable is marked broken, please switch back to it once fixed freicoin = callPackage ../applications/misc/freicoin { boost = boost155; @@ -13303,13 +12912,12 @@ in get_iplayer = callPackage ../applications/misc/get_iplayer {}; gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix { - inherit (gnome) libart_lgpl; + inherit (gnome2) libart_lgpl; webkit = null; lcms = lcms2; - wrapPython = pythonPackages.wrapPython; }; - gimp = self.gimp_2_8; + gimp = gimp_2_8; gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix { gimp = gimp_2_8; @@ -13330,7 +12938,7 @@ in gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {}); - inherit (self.gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; + inherit (gitAndTools) git gitFull gitSVN git-cola svn2git git-radar transcrypt git-crypt; gitMinimal = git.override { withManual = false; @@ -13408,12 +13016,12 @@ in gmu = callPackage ../applications/audio/gmu { }; gnash = callPackage ../applications/video/gnash { - inherit (gnome) gtkglext; + inherit (gnome2) gtkglext; xulrunner = firefox-unwrapped; }; gnome_mplayer = callPackage ../applications/video/gnome-mplayer { - inherit (gnome) GConf; + inherit (gnome2) GConf; }; gnumeric = callPackage ../applications/office/gnumeric { }; @@ -13425,7 +13033,7 @@ in gocr = callPackage ../applications/graphics/gocr { }; gobby5 = callPackage ../applications/editors/gobby { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; gphoto2 = callPackage ../applications/misc/gphoto2 { }; @@ -13439,7 +13047,7 @@ in gtkpod = callPackage ../applications/audio/gtkpod { gnome = gnome3; - inherit (gnome) libglade; + inherit (gnome2) libglade; }; jbidwatcher = callPackage ../applications/misc/jbidwatcher { @@ -13449,7 +13057,7 @@ in qrencode = callPackage ../tools/graphics/qrencode { }; gecko_mediaplayer = callPackage ../applications/networking/browsers/mozilla-plugins/gecko-mediaplayer { - inherit (gnome) GConf; + inherit (gnome2) GConf; browser = firefox-unwrapped; }; @@ -13462,18 +13070,18 @@ in gmpc = callPackage ../applications/audio/gmpc {}; gmtk = callPackage ../applications/networking/browsers/mozilla-plugins/gmtk { - inherit (gnome) GConf; + inherit (gnome2) GConf; }; gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; - google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; }; + google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; - google-chrome-beta = self.google-chrome.override { channel = "beta"; }; + google-chrome-beta = google-chrome.override { chromium = chromiumBeta; channel = "beta"; }; - google-chrome-dev = self.google-chrome.override { channel = "dev"; }; + google-chrome-dev = google-chrome.override { chromium = chromiumDev; channel = "dev"; }; googleearth = callPackage_i686 ../applications/misc/googleearth { }; @@ -13498,8 +13106,8 @@ in }; guake = callPackage ../applications/misc/guake { - gconf = gnome.GConf; - vte = gnome.vte.override { pythonSupport = true; }; + gconf = gnome2.GConf; + vte = gnome2.vte.override { pythonSupport = true; }; }; guitone = callPackage ../applications/version-management/guitone { @@ -13520,7 +13128,7 @@ in hakuneko = callPackage ../tools/misc/hakuneko { }; hamster-time-tracker = callPackage ../applications/misc/hamster-time-tracker { - inherit (gnome) gnome_python; + inherit (gnome2) gnome_python; }; hello = callPackage ../applications/misc/hello { }; @@ -13555,7 +13163,7 @@ in hydrogen = callPackage ../applications/audio/hydrogen { }; - hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome) GConf; }; + hyperterm = callPackage ../applications/misc/hyperterm { inherit (gnome2) GConf; }; slack = callPackage ../applications/networking/instant-messengers/slack { }; @@ -13615,7 +13223,7 @@ in inherit (perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig;}; }) PerlMagick; }; - imagemagick_light = self.imagemagick.override { + imagemagick_light = imagemagick.override { bzip2 = null; zlib = null; libX11 = null; @@ -13635,7 +13243,7 @@ in libwebp = null; }; - imagemagick = self.imagemagickBig.override { + imagemagick = imagemagickBig.override { ghostscript = null; }; @@ -13649,7 +13257,6 @@ in inginious = callPackage ../servers/inginious {}; inkscape = callPackage ../applications/graphics/inkscape { - inherit (pythonPackages) python pyxml lxml numpy; lcms = lcms2; }; @@ -13691,7 +13298,7 @@ in jackmeter = callPackage ../applications/audio/jackmeter { }; jackmix = callPackage ../applications/audio/jackmix { }; - jackmix_jack1 = self.jackmix.override { jack = jack1; }; + jackmix_jack1 = jackmix.override { jack = jack1; }; jalv = callPackage ../applications/audio/jalv { }; @@ -13735,9 +13342,7 @@ in kdevplatform = kde5.callPackage ../applications/editors/kdevelop5/kdevplatform.nix {}; - keepnote = callPackage ../applications/office/keepnote { - pygtk = pyGtkGlade; - }; + keepnote = callPackage ../applications/office/keepnote { }; kermit = callPackage ../tools/misc/kermit { }; @@ -13758,7 +13363,7 @@ in kile = kde5.callPackage ../applications/editors/kile/frameworks.nix { }; kino = callPackage ../applications/video/kino { - inherit (gnome) libglade; + inherit (gnome2) libglade; ffmpeg = ffmpeg_2; }; @@ -13814,7 +13419,7 @@ in lci = callPackage ../applications/science/logic/lci {}; ldcpp = callPackage ../applications/networking/p2p/ldcpp { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; lemonbar = callPackage ../applications/window-managers/lemonbar { }; @@ -13826,13 +13431,13 @@ in libowfat = callPackage ../development/libraries/libowfat { }; librecad = callPackage ../applications/misc/librecad { }; - librecad2 = self.librecad; # backwards compatibility alias, added 2015-10 + librecad2 = librecad; # backwards compatibility alias, added 2015-10 libreoffice = hiPrio libreoffice-still; libreoffice-fresh = lowPrio (callPackage ../applications/office/libreoffice { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; zip = zip.override { enableNLS = false; }; bluez5 = bluez5_28; @@ -13850,7 +13455,7 @@ in libreoffice-still = lowPrio (callPackage ../applications/office/libreoffice/still.nix { inherit (perlPackages) ArchiveZip CompressZlib; - inherit (gnome) GConf ORBit2 gnome_vfs; + inherit (gnome2) GConf ORBit2 gnome_vfs; inherit (gnome3) gsettings_desktop_schemas defaultIconTheme; zip = zip.override { enableNLS = false; }; #glm = glm_0954; @@ -13874,14 +13479,14 @@ in }; lingot = callPackage ../applications/audio/lingot { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; linuxband = callPackage ../applications/audio/linuxband { }; ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { }; ledger3 = callPackage ../applications/office/ledger { }; - ledger = self.ledger3; + ledger = ledger3; ledger-web = callPackage ../applications/office/ledger-web { }; lighthouse = callPackage ../applications/misc/lighthouse { }; @@ -13898,10 +13503,7 @@ in bison = bison2; }; - llpp = callPackage ../applications/misc/llpp { - inherit (ocamlPackages_4_02) lablgl findlib; - ocaml = ocaml_4_02; - }; + inherit (ocaml-ng.ocamlPackages_4_02) llpp; lmms = callPackage ../applications/audio/lmms { }; @@ -13925,7 +13527,7 @@ in }; lilyterm = callPackage ../applications/misc/lilyterm { - inherit (gnome) vte; + inherit (gnome2) vte; gtk = gtk2; }; @@ -13994,10 +13596,7 @@ in mimms = callPackage ../applications/audio/mimms {}; - mirage = callPackage ../applications/graphics/mirage { - inherit (pythonPackages) pygtk; - inherit (pythonPackages) pillow; - }; + mirage = callPackage ../applications/graphics/mirage { }; mixxx = callPackage ../applications/audio/mixxx { inherit (vamp) vampSDK; @@ -14029,10 +13628,7 @@ in lua = lua5; }; - monotoneViz = callPackage ../applications/version-management/monotone-viz { - inherit (ocamlPackages_4_01_0) lablgtk ocaml camlp4; - inherit (gnome) libgnomecanvas glib; - }; + inherit (ocaml-ng.ocamlPackages_4_01_0) monotoneViz; moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; @@ -14125,14 +13721,14 @@ in multimon-ng = callPackage ../applications/misc/multimon-ng { }; multisync = callPackage ../applications/misc/multisync { - inherit (gnome) ORBit2 libbonobo libgnomeui GConf; + inherit (gnome2) ORBit2 libbonobo libgnomeui GConf; }; inherit (callPackages ../applications/networking/mumble { avahi = avahi.override { withLibdnssdCompat = true; }; - qt5 = qt55; # Mumble is not compatible with qt55 yet + qt5 = qt55; # Mumble doesn't work with newer Qt versions. jackSupport = config.mumble.jackSupport or false; speechdSupport = config.mumble.speechdSupport or false; pulseSupport = config.pulseaudio or false; @@ -14173,7 +13769,7 @@ in pcmanfm = callPackage ../applications/misc/pcmanfm { }; - pcmanfm-qt = callPackage ../applications/misc/pcmanfm-qt { }; + pcmanfm-qt = lxqt.pcmanfm-qt; pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { }; @@ -14193,6 +13789,8 @@ in smtube = qt55.callPackage ../applications/video/smtube {}; + sudolikeaboss = callPackage ../tools/security/sudolikeaboss { }; + sup = callPackage ../applications/networking/mailreaders/sup { ruby = ruby_2_3.override { cursesSupport = true; }; }; @@ -14256,9 +13854,13 @@ in nedit = callPackage ../applications/editors/nedit { }; + notepadqq = callPackage ../applications/editors/notepadqq { + qtbase = qt55; + }; + notmuch = callPackage ../applications/networking/mailreaders/notmuch { # No need to build Emacs - notmuch.el works just fine without - # byte-compilation. Use emacs24Packages.notmuch if you want to + # byte-compilation. Use emacsPackages.notmuch if you want to # byte-compiled files emacs = null; sphinx = pythonPackages.sphinx; @@ -14281,7 +13883,7 @@ in nvpy = callPackage ../applications/editors/nvpy { }; obconf = callPackage ../tools/X11/obconf { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; obs-studio = qt5.callPackage ../applications/video/obs-studio { @@ -14325,6 +13927,8 @@ in vivaldi = callPackage ../applications/networking/browsers/vivaldi {}; + openmpt123 = callPackage ../applications/audio/openmpt123 {}; + opusfile = callPackage ../applications/audio/opusfile { }; opusTools = callPackage ../applications/audio/opus-tools { }; @@ -14344,7 +13948,7 @@ in panotools = callPackage ../applications/graphics/panotools { }; paprefs = callPackage ../applications/audio/paprefs { - inherit (gnome) libglademm gconfmm GConf; + inherit (gnome2) libglademm gconfmm GConf; }; pavucontrol = callPackage ../applications/audio/pavucontrol { }; @@ -14367,7 +13971,7 @@ in perseus = callPackage ../applications/science/math/perseus {}; petrifoo = callPackage ../applications/audio/petrifoo { - inherit (gnome) libgnomecanvas; + inherit (gnome2) libgnomecanvas; }; pdftk = callPackage ../tools/typesetting/pdftk { }; @@ -14434,6 +14038,8 @@ in pidgin-opensteamworks = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks { }; + purple-facebook = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-facebook { }; + pithos = callPackage ../applications/audio/pithos { pythonPackages = python3Packages; }; @@ -14441,12 +14047,11 @@ in pinfo = callPackage ../applications/misc/pinfo { }; pinpoint = callPackage ../applications/office/pinpoint { - clutter = clutter_1_24; - clutter_gtk = clutter_gtk_1_6; + inherit (gnome3) clutter clutter_gtk; }; pinta = callPackage ../applications/graphics/pinta { - gtksharp = gtk-sharp; + gtksharp = gtk-sharp-2_0; }; plugin-torture = callPackage ../applications/audio/plugin-torture { }; @@ -14497,7 +14102,7 @@ in qbittorrent = qt5.callPackage ../applications/networking/p2p/qbittorrent { boost = boost; - libtorrentRasterbar = libtorrentRasterbar_1_09; + libtorrentRasterbar = libtorrentRasterbar_1_0; }; eiskaltdcpp = callPackage ../applications/networking/p2p/eiskaltdcpp { lua5 = lua5_1; }; @@ -14601,9 +14206,16 @@ in rawtherapee = callPackage ../applications/graphics/rawtherapee { fftw = fftwSinglePrec; - cmake = cmake-2_8; # problems after 3.4 -> 3.6.0 + cmake = cmake_2_8; # problems after 3.4 -> 3.6.0 }; + rawtherapee-git = lowPrio (callPackage ../applications/graphics/rawtherapee/dev.nix { + fftw = fftwSinglePrec; + cmake = cmake_2_8; # problems after 3.4 -> 3.6.0 + }); + + rclone = callPackage ../applications/networking/sync/rclone { }; + rcs = callPackage ../applications/version-management/rcs { }; rdesktop = callPackage ../applications/networking/remote/rdesktop { }; @@ -14650,6 +14262,8 @@ in rubyripper = callPackage ../applications/audio/rubyripper {}; + runc = callPackage ../applications/virtualization/runc {}; + rxvt = callPackage ../applications/misc/rxvt { }; # urxvt @@ -14676,8 +14290,12 @@ in urxvt_font_size = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-font-size { }; urxvt_theme_switch = callPackage ../applications/misc/rxvt_unicode-plugins/urxvt-theme-switch { }; + uade123 = callPackage ../applications/audio/uade123 {}; + udevil = callPackage ../applications/misc/udevil {}; + udiskie = callPackage ../applications/misc/udiskie { }; + sakura = callPackage ../applications/misc/sakura { vte = gnome3.vte; }; @@ -14693,7 +14311,7 @@ in scite = callPackage ../applications/editors/scite { }; scribus = callPackage ../applications/office/scribus { - inherit (gnome) libart_lgpl; + inherit (gnome2) libart_lgpl; }; seafile-client = callPackage ../applications/networking/seafile-client { }; @@ -14750,8 +14368,14 @@ in spideroak = callPackage ../applications/networking/spideroak { }; + squishyball = callPackage ../applications/audio/squishyball { }; + ssvnc = callPackage ../applications/networking/remote/ssvnc { }; + styx = callPackage ../applications/misc/styx { }; + + tecoc = callPackage ../applications/editors/tecoc { }; + viber = callPackage ../applications/networking/instant-messengers/viber { }; sonic-pi = callPackage ../applications/audio/sonic-pi { @@ -14790,7 +14414,7 @@ in sxiv = callPackage ../applications/graphics/sxiv { }; - bittorrentSync = self.bittorrentSync14; + bittorrentSync = bittorrentSync14; bittorrentSync14 = callPackage ../applications/networking/bittorrentsync/1.4.x.nix { }; bittorrentSync20 = callPackage ../applications/networking/bittorrentsync/2.0.x.nix { }; @@ -14803,7 +14427,7 @@ in withQt5 = false; }; - lightdm_qt = self.lightdm.override { withQt5 = true; }; + lightdm_qt = lightdm.override { withQt5 = true; }; lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; @@ -14849,7 +14473,9 @@ in inherit (pkgs.vamp) vampSDK; }; - sox = callPackage ../applications/misc/audio/sox { }; + sox = callPackage ../applications/misc/audio/sox { + enableLame = config.sox.enableLame or false; + }; soxr = callPackage ../applications/misc/audio/soxr { }; @@ -14858,7 +14484,7 @@ in }; spotify = callPackage ../applications/audio/spotify { - inherit (gnome) GConf; + inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; libpng = libpng12; }; @@ -14953,7 +14579,7 @@ in tailor = callPackage ../applications/version-management/tailor {}; tangogps = callPackage ../applications/misc/tangogps { - gconf = gnome.GConf; + gconf = gnome2.GConf; }; teamspeak_client = qt55.callPackage ../applications/networking/instant-messengers/teamspeak/client.nix { }; @@ -14994,8 +14620,7 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; terminator = callPackage ../applications/misc/terminator { - vte = gnome.vte.override { pythonSupport = true; }; - inherit (pythonPackages) notify; + vte = gnome2.vte.override { pythonSupport = true; }; }; termite = callPackage ../applications/misc/termite { @@ -15009,14 +14634,14 @@ in thinkingRock = callPackage ../applications/misc/thinking-rock { }; thunderbird = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (gnome) libIDL; + inherit (gnome2) libIDL; inherit (pythonPackages) pysqlite; libpng = libpng_apng; }; thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin { - gconf = pkgs.gnome.GConf; - inherit (pkgs.gnome) libgnome libgnomeui; + gconf = pkgs.gnome2.GConf; + inherit (pkgs.gnome2) libgnome libgnomeui; }; tig = gitAndTools.tig; @@ -15104,10 +14729,7 @@ in umurmur = callPackage ../applications/networking/umurmur { }; - unison = callPackage ../applications/networking/sync/unison { - inherit (ocamlPackages) lablgtk; - enableX11 = config.unison.enableX11 or true; - }; + inherit (ocamlPackages) unison; unpaper = callPackage ../tools/graphics/unpaper { }; @@ -15131,7 +14753,7 @@ in vcprompt = callPackage ../applications/version-management/vcprompt { }; - vdirsyncer = callPackage ../tools/misc/vdirsyncer { pythonPackages = python3Packages; }; + vdirsyncer = callPackage ../tools/misc/vdirsyncer { }; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; @@ -15159,7 +14781,9 @@ in qpdfview = callPackage ../applications/misc/qpdfview {}; - qtile = callPackage ../applications/window-managers/qtile { }; + qtile = callPackage ../applications/window-managers/qtile { + inherit (xorg) libxcb; + }; qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { features = "huge"; # one of tiny, small, normal, big or huge @@ -15183,21 +14807,35 @@ in }; virt-viewer = callPackage ../applications/virtualization/virt-viewer { - gtkvnc = gtkvnc.override { enableGTK3 = true; }; - spice_gtk = spice_gtk.override { enableGTK3 = true; }; + spice_gtk = spice_gtk; }; virtmanager = callPackage ../applications/virtualization/virt-manager { - inherit (gnome) gnome_python; + inherit (gnome2) gnome_python; vte = gnome3.vte; dconf = gnome3.dconf; - gtkvnc = gtkvnc.override { enableGTK3 = true; }; - spice_gtk = spice_gtk.override { enableGTK3 = true; }; + spice_gtk = spice_gtk; system-libvirt = libvirt; }; virtinst = callPackage ../applications/virtualization/virtinst {}; + virtualbox = callPackage ../applications/virtualization/virtualbox { + stdenv = stdenv_32bit; + inherit (gnome2) libIDL; + enableExtensionPack = config.virtualbox.enableExtensionPack or false; + pulseSupport = config.pulseaudio or true; + }; + + virtualboxHardened = lowPrio (virtualbox.override { + enableHardening = true; + }); + + virtualboxHeadless = lowPrio (virtualbox.override { + enableHardening = true; + headless = true; + }); + virtualglLib = callPackage ../tools/X11/virtualgl/lib.nix { fltk = fltk13; }; @@ -15324,7 +14962,7 @@ in wordnet = callPackage ../applications/misc/wordnet { }; workrave = callPackage ../applications/misc/workrave { - inherit (gnome) GConf gconfmm; + inherit (gnome2) GConf gconfmm; inherit (python27Packages) cheetah; }; @@ -15387,7 +15025,7 @@ in wxhexeditor = callPackage ../applications/editors/wxhexeditor { }; wxcam = callPackage ../applications/video/wxcam { - inherit (gnome) libglade; + inherit (gnome2) libglade; wxGTK = wxGTK28; gtk = gtk2; }; @@ -15414,24 +15052,26 @@ in gtk = gtk2; }; - kodiPlain = callPackage ../applications/video/kodi { }; - xbmcPlain = self.kodiPlain; + kodiPlain = callPackage ../applications/video/kodi { + libva = libva-full; + }; + xbmcPlain = kodiPlain; kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix { kodi = kodiPlain; }); - xbmcPlugins = self.kodiPlugins; + xbmcPlugins = kodiPlugins; - kodi = self.wrapKodi { + kodi = wrapKodi { kodi = kodiPlain; }; - xbmc = self.kodi; + xbmc = kodi; kodi-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/kodi-advanced-launchers.nix { cores = retroArchCores; }; - xbmc-retroarch-advanced-launchers = self.kodi-retroarch-advanced-launchers; + xbmc-retroarch-advanced-launchers = kodi-retroarch-advanced-launchers; xca = callPackage ../applications/misc/xca { }; @@ -15480,6 +15120,8 @@ in xineUI = callPackage ../applications/video/xine-ui { }; + xmind = callPackage ../applications/misc/xmind { }; + xneur_0_13 = callPackage ../applications/misc/xneur { }; xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { }; @@ -15487,7 +15129,7 @@ in xneur = xneur_0_13; gxneur = callPackage ../applications/misc/gxneur { - inherit (gnome) libglade GConf; + inherit (gnome2) libglade GConf; }; xiphos = callPackage ../applications/misc/xiphos { @@ -15498,7 +15140,7 @@ in }; xournal = callPackage ../applications/graphics/xournal { - inherit (gnome) libgnomeprint libgnomeprintui libgnomecanvas; + inherit (gnome2) libgnomeprint libgnomeprintui libgnomecanvas; }; apvlv = callPackage ../applications/misc/apvlv { }; @@ -15551,7 +15193,7 @@ in xsd = callPackage ../development/libraries/xsd { }; xscreensaver = callPackage ../misc/screensavers/xscreensaver { - inherit (gnome) libglade; + inherit (gnome2) libglade; }; xss-lock = callPackage ../misc/screensavers/xss-lock { }; @@ -15560,7 +15202,11 @@ in xterm = callPackage ../applications/misc/xterm { }; - mlterm = callPackage ../applications/misc/mlterm { }; + mlterm = callPackage ../applications/misc/mlterm { + vte = gnome3.vte; + libssh2 = null; + openssl = null; + }; finalterm = callPackage ../applications/misc/finalterm { }; @@ -15583,7 +15229,7 @@ in xnee = callPackage ../tools/X11/xnee { }; xvidcap = callPackage ../applications/video/xvidcap { - inherit (gnome) scrollkeeper libglade; + inherit (gnome2) scrollkeeper libglade; }; xzgv = callPackage ../applications/graphics/xzgv { }; @@ -15629,9 +15275,7 @@ in SDL = SDL_sixel; }; - zim = callPackage ../applications/office/zim { - pygtk = pyGtkGlade; - }; + zim = callPackage ../applications/office/zim { }; zotero = callPackage ../applications/office/zotero { firefox = firefox-esr-unwrapped; @@ -15686,6 +15330,8 @@ in pythonPackages = python3Packages; }; + bean-add = callPackage ../applications/office/beancount/bean-add.nix { }; + beret = callPackage ../games/beret { }; bitsnbots = callPackage ../games/bitsnbots { @@ -15727,16 +15373,15 @@ in freeglut = null; }); - construo = self.construoBase.override { + construo = construoBase.override { inherit mesa freeglut; }; crack_attack = callPackage ../games/crack-attack { }; crafty = callPackage ../games/crafty { }; - craftyFull = appendToName "full" (self.crafty.override { fullVariant = true; }); - crawlTiles = self.crawl.override { + crawlTiles = crawl.override { tileMode = true; }; @@ -15748,13 +15393,17 @@ in dhewm3 = callPackage ../games/dhewm3 {}; + digikam5 = kde5.callPackage ../applications/graphics/digikam/5.1.nix {}; + drumkv1 = callPackage ../applications/audio/drumkv1 { }; duckmarines = callPackage ../games/duckmarines { love = love_0_9; }; dwarf-fortress-packages = recurseIntoAttrs (callPackage ../games/dwarf-fortress { }); - inherit (self.dwarf-fortress-packages) - dwarf-fortress dwarf-therapist; + + dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { }; + + dwarf-therapist = dwarf-fortress-packages.dwarf-therapist; d1x_rebirth = callPackage ../games/d1x-rebirth { }; @@ -15829,8 +15478,6 @@ in gnugo = callPackage ../games/gnugo { }; - gsb = callPackage ../games/gsb { }; - gtypist = callPackage ../games/gtypist { }; gzdoom = callPackage ../games/gzdoom { }; @@ -15931,6 +15578,8 @@ in openlierox = callPackage ../games/openlierox { }; + openclonk = callPackage ../games/openclonk { }; + openmw = callPackage ../games/openmw { }; openra = callPackage ../games/openra { lua = lua5_1; }; @@ -16049,7 +15698,7 @@ in spring = callPackage ../games/spring { boost = boost155; - cmake = cmake-2_8; + cmake = cmake_2_8; }; springLobby = callPackage ../games/spring/springlobby.nix { }; @@ -16079,7 +15728,7 @@ in }; }; - superTux = callPackage ../games/super-tux { }; + superTux = callPackage ../games/supertux { }; superTuxKart = callPackage ../games/super-tux-kart { }; @@ -16105,6 +15754,8 @@ in tintin = callPackage ../games/tintin { }; + tinyfugue = callPackage ../games/tinyfugue { }; + tome4 = callPackage ../games/tome4 { }; trackballs = callPackage ../games/trackballs { @@ -16147,7 +15798,9 @@ in ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { }); - ut2004demo = callPackage_i686 ../games/ut2004demo { }; + ut2004Packages = callPackage ../games/ut2004 { }; + + ut2004demo = self.ut2004Packages.ut2004 [ self.ut2004Packages.ut2004-demo ]; vapor = callPackage ../games/vapor { love = love_0_8; }; @@ -16217,7 +15870,7 @@ in zandronum = callPackage ../games/zandronum { fmod = fmod42416; - cmake = cmake-2_8; + cmake = cmake_2_8; }; zandronum-server = zandronum.override { @@ -16246,29 +15899,31 @@ in callPackage = newScope pkgs.enlightenment; }); - gnome2 = callPackage ../desktops/gnome-2 { + gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { callPackage = pkgs.newScope pkgs.gnome2; self = pkgs.gnome2; } // { inherit (pkgs) # GTK Libs - glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtk gtkmm + glib glibmm atk atkmm cairo pango pangomm gdk_pixbuf gtkmm2 # Included for backwards compatibility libsoup libwnck gtk_doc gnome_doc_utils; - }; + + gtk = self.gtk2; + gtkmm = self.gtkmm2; + libcanberra = self.libcanberra_gtk2; + }); gnome3_20 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.20 { }); - gnome3 = self.gnome3_20; - - gnome = recurseIntoAttrs self.gnome2; + gnome3 = gnome3_20; hsetroot = callPackage ../tools/X11/hsetroot { }; kakasi = callPackage ../tools/text/kakasi { }; - kde4 = recurseIntoAttrs self.kde414; + kde4 = recurseIntoAttrs pkgs.kde414; kde414 = kdePackagesFor @@ -16477,6 +16132,8 @@ in in makeOverridable makePackages extra; + lxqt = recurseIntoAttrs (callPackage ../desktops/lxqt { }); + mate = recurseIntoAttrs (callPackage ../desktops/mate { callPackage = newScope pkgs.mate; }); @@ -16534,7 +16191,7 @@ in ### SCIENCE/GEOMETRY drgeo = callPackage ../applications/science/geometry/drgeo { - inherit (gnome) libglade; + inherit (gnome2) libglade; guile = guile_1_8; }; @@ -16595,7 +16252,7 @@ in withLapack = false; }; - atlasWithLapack = self.atlas.override { withLapack = true; }; + atlasWithLapack = atlas.override { withLapack = true; }; blas = callPackage ../development/libraries/science/math/blas { }; @@ -16612,11 +16269,11 @@ in # with atlas. Atlas, when built with liblapack as a dependency, uses 3.5.0 # without atlas. Etc. liblapackWithAtlas = callPackage ../development/libraries/science/math/liblapack {}; - liblapackWithoutAtlas = self.liblapackWithAtlas.override { atlas = null; }; + liblapackWithoutAtlas = liblapackWithAtlas.override { atlas = null; }; liblapack_3_5_0WithAtlas = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix {}; - liblapack_3_5_0WithoutAtlas = self.liblapack_3_5_0WithAtlas.override { atlas = null; }; - liblapack = self.liblapackWithAtlas; - liblapack_3_5_0 = self.liblapack_3_5_0WithAtlas; + liblapack_3_5_0WithoutAtlas = liblapack_3_5_0WithAtlas.override { atlas = null; }; + liblapack = liblapackWithAtlas; + liblapack_3_5_0 = liblapack_3_5_0WithAtlas; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; @@ -16704,27 +16361,13 @@ in aspino = callPackage ../applications/science/logic/aspino {}; - coq = callPackage ../applications/science/logic/coq { - inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_01_0.camlp5_transitional; - }; + inherit (ocaml-ng.ocamlPackages_4_01_0) coq; - coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { - inherit (ocamlPackages) findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; - }; + inherit (ocamlPackages) coq_HEAD; - coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { - inherit (ocamlPackages) findlib lablgtk; - camlp5 = ocamlPackages.camlp5_transitional; - }; + inherit (ocamlPackages) coq_8_5; - coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { - make = gnumake3; - inherit (ocamlPackages_3_12_1) ocaml findlib; - camlp5 = ocamlPackages_3_12_1.camlp5_transitional; - lablgtk = ocamlPackages_3_12_1.lablgtk_2_14; - }; + inherit (ocaml-ng.ocamlPackages_3_12_1) coq_8_3; mkCoqPackages_8_4 = self: let callPackage = newScope self; in { @@ -16817,9 +16460,7 @@ in hol = callPackage ../applications/science/logic/hol { }; - hol_light = callPackage ../applications/science/logic/hol_light { - camlp5 = ocamlPackages.camlp5_strict; - }; + inherit (ocamlPackages) hol_light; hologram = callPackage ../tools/security/hologram { }; @@ -16845,17 +16486,9 @@ in ltl2ba = callPackage ../applications/science/logic/ltl2ba {}; - matita = callPackage ../applications/science/logic/matita { - ocaml = ocaml_3_11_2; - inherit (ocamlPackages_3_11_2) findlib lablgtk ocaml_expat gmetadom ocaml_http - lablgtkmathview ocaml_mysql ocaml_sqlite3 ocamlnet camlzip ocaml_pcre; - ulex08 = ocamlPackages_3_11_2.ulex08.override { camlp5 = ocamlPackages_3_11_2.camlp5_old_transitional; }; - }; + inherit (ocaml-ng.ocamlPackages_3_11_2) matita; - matita_130312 = lowPrio (callPackage ../applications/science/logic/matita/130312.nix { - inherit (ocamlPackages) findlib lablgtk ocaml_expat gmetadom ocaml_http - ocaml_mysql ocamlnet ulex08 camlzip ocaml_pcre; - }); + matita_130312 = lowPrio ocamlPackages.matita_130312; metis-prover = callPackage ../applications/science/logic/metis-prover { }; @@ -16865,18 +16498,13 @@ in opensmt = callPackage ../applications/science/logic/opensmt { }; - ott = callPackage ../applications/science/logic/ott { - camlp5 = ocamlPackages.camlp5_transitional; - }; + inherit (ocamlPackages) ott; otter = callPackage ../applications/science/logic/otter {}; picosat = callPackage ../applications/science/logic/picosat {}; - prooftree = callPackage ../applications/science/logic/prooftree { - inherit (ocamlPackages_4_01_0) ocaml findlib lablgtk; - camlp5 = ocamlPackages_4_01_0.camlp5_transitional; - }; + inherit (ocaml-ng.ocamlPackages_4_01_0) prooftree; prover9 = callPackage ../applications/science/logic/prover9 { }; @@ -16911,7 +16539,7 @@ in z3 = callPackage ../applications/science/logic/z3 {}; z3_opt = callPackage ../applications/science/logic/z3_opt {}; - boolector = self.boolector15; + boolector = boolector15; boolector15 = callPackage ../applications/science/logic/boolector {}; boolector16 = lowPrio (callPackage ../applications/science/logic/boolector { useV16 = true; @@ -16972,7 +16600,7 @@ in pcalc = callPackage ../applications/science/math/pcalc { }; pspp = callPackage ../applications/science/math/pssp { - inherit (gnome) libglade gtksourceview; + inherit (gnome2) libglade gtksourceview; }; singular = callPackage ../applications/science/math/singular {}; @@ -17009,7 +16637,7 @@ in celestia = callPackage ../applications/science/astronomy/celestia { lua = lua5_1; - inherit (pkgs.gnome) gtkglext; + inherit (pkgs.gnome2) gtkglext; }; cytoscape = callPackage ../applications/science/misc/cytoscape { }; @@ -17022,7 +16650,9 @@ in megam = callPackage ../applications/science/misc/megam { }; - root = callPackage ../applications/science/misc/root { }; + root = callPackage ../applications/science/misc/root { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; simgrid = callPackage ../applications/science/misc/simgrid { }; @@ -17031,7 +16661,7 @@ in stellarium = qt5.callPackage ../applications/science/astronomy/stellarium { }; tulip = callPackage ../applications/science/misc/tulip { - cmake = cmake-2_8; + cmake = cmake_2_8; }; vite = callPackage ../applications/science/misc/vite { }; @@ -17094,6 +16724,8 @@ in cups-pk-helper = callPackage ../misc/cups/cups-pk-helper.nix { }; + cups-kyocera = callPackage ../misc/cups/drivers/kyocera {}; + crashplan = callPackage ../applications/backup/crashplan { }; epson-escpr = callPackage ../misc/drivers/epson-escpr { }; @@ -17114,7 +16746,7 @@ in darling-dmg = callPackage ../tools/filesystems/darling-dmg { }; - desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome) gtkglext libglade; }; + desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome2) gtkglext libglade; }; dbacl = callPackage ../tools/misc/dbacl { }; @@ -17122,7 +16754,7 @@ in enableAllFeatures = false; }; - dblatexFull = appendToName "full" (self.dblatex.override { + dblatexFull = appendToName "full" (dblatex.override { enableAllFeatures = true; }); @@ -17134,7 +16766,7 @@ in dpkg = callPackage ../tools/package-management/dpkg { }; - ekiga = newScope pkgs.gnome ../applications/networking/instant-messengers/ekiga { }; + ekiga = newScope pkgs.gnome2 ../applications/networking/instant-messengers/ekiga { }; emulationstation = callPackage ../misc/emulators/emulationstation { }; @@ -17142,7 +16774,7 @@ in fakenes = callPackage ../misc/emulators/fakenes { }; - faust = self.faust2; + faust = faust2; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; @@ -17195,7 +16827,7 @@ in cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); }; - ghostscriptX = appendToName "with-X" (self.ghostscript.override { + ghostscriptX = appendToName "with-X" (ghostscript.override { x11Support = true; }); @@ -17221,11 +16853,11 @@ in hplip = callPackage ../misc/drivers/hplip { }; - hplipWithPlugin = self.hplip.override { withPlugin = true; }; + hplipWithPlugin = hplip.override { withPlugin = true; }; hplip_3_15_9 = callPackage ../misc/drivers/hplip/3.15.9.nix { }; - hplipWithPlugin_3_15_9 = self.hplip_3_15_9.override { withPlugin = true; }; + hplipWithPlugin_3_15_9 = hplip_3_15_9.override { withPlugin = true; }; # using the new configuration style proposal which is unstable jack1 = callPackage ../misc/jackaudio/jack1.nix { }; @@ -17233,11 +16865,13 @@ in jack2Full = callPackage ../misc/jackaudio { libopus = libopus.override { withCustomModes = true; }; }; - libjack2 = self.jack2Full.override { prefix = "lib"; }; + libjack2 = jack2Full.override { prefix = "lib"; }; libjack2-git = callPackage ../misc/jackaudio/git.nix { }; keynav = callPackage ../tools/X11/keynav { }; + kops = callPackage ../applications/networking/cluster/kops { }; + lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; mailcore2 = callPackage ../development/libraries/mailcore2 { }; @@ -17245,7 +16879,7 @@ in martyr = callPackage ../development/libraries/martyr { }; mess = callPackage ../misc/emulators/mess { - inherit (pkgs.gnome) GConf; + inherit (pkgs.gnome2) GConf; }; moltengamepad = callPackage ../misc/drivers/moltengamepad { }; @@ -17319,10 +16953,12 @@ in mnemonicode = callPackage ../misc/mnemonicode { }; - mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench { - lua = lua5_1; - libctemplate = libctemplate_2_2; - }; + mysqlWorkbench = newScope gnome2 ../applications/misc/mysql-workbench (let mysql = mysql57; in { + automake = automake113x; + gdal = gdal.override {mysql = mysql // {lib = {dev = mysql;};};}; + mysql = mysql; + pcre = pcre-cpp; + }); redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { }; @@ -17366,6 +17002,8 @@ in putty = callPackage ../applications/networking/remote/putty { }; + redprl = callPackage ../applications/science/logic/redprl { }; + retroarchBare = callPackage ../misc/emulators/retroarch { }; retroarch = wrapRetroArch { retroarch = retroarchBare; }; @@ -17396,7 +17034,8 @@ in canon-cups-ufr2 = callPackage ../misc/cups/drivers/canon { }; - mfcj470dw = callPackage_i686 ../misc/cups/drivers/mfcj470dw { }; + mfcj470dw-cupswrapper = callPackage ../misc/cups/drivers/mfcj470dwcupswrapper { }; + mfcj470dwlpr = callPackage_i686 ../misc/cups/drivers/mfcj470dwlpr { }; samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { }; samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { }; @@ -17509,7 +17148,7 @@ in }; vimprobable2 = wrapFirefox vimprobable2-unwrapped { }; - inherit (self.kde4) rekonq; + inherit (kde4) rekonq; vimb-unwrapped = callPackage ../applications/networking/browsers/vimb { webkit = webkitgtk2; @@ -17658,7 +17297,7 @@ in snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; higan = callPackage ../misc/emulators/higan { - inherit (gnome) gtksourceview; + inherit (gnome2) gtksourceview; }; misc = callPackage ../misc/misc.nix { }; diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 87813571d9a..2eb7fb34b4d 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -82,7 +82,7 @@ let trivialBuilders = self: super: (import ../build-support/trivial-builders.nix { - inherit lib; inherit (self) stdenv; inherit (self.xorg) lndir; + inherit lib; inherit (self) stdenv stdenvNoCC; inherit (self.xorg) lndir; }); stdenvDefault = self: super: (import ./stdenv.nix topLevelArguments) {} pkgs; diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index f287a35bdc4..3508f1a1547 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -580,7 +580,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { sha256 = "1hnn0a2qsjcjprsxas424bzvhsdwy0yc2jj5xbp698c0m9kfk24y"; }; - buildInputs = [ pkgs.gtk-sharp ]; + buildInputs = [ pkgs.gtk-sharp-2_0 ]; meta = { description = "A generic framework for creating extensible applications"; diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 62fb9407ee5..430da89fc22 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -75,22 +75,6 @@ let ## START HERE - ac-haskell-process = melpaBuild rec { - pname = "ac-haskell-process"; - version = "0.5"; - src = fetchFromGitHub { - owner = "purcell"; - repo = pname; - rev = version; - sha256 = "0dlrhc1dmzgrjvcnlqvm6clyv0r6zray6qqliqngy14880grghbm"; - }; - packageRequires = [ auto-complete haskell-mode ]; - meta = { - description = "Haskell code completion for auto-complete Emacs framework"; - license = gpl3Plus; - }; - }; - tablist = melpaBuild rec { pname = "tablist"; inherit (pdf-tools) src version; @@ -120,22 +104,6 @@ let }; }; - ag = melpaBuild rec { - pname = "ag"; - version = "0.44"; - src = fetchFromGitHub { - owner = "Wilfred"; - repo = "${pname}.el"; - rev = version; - sha256 = "19y5w9m2flp4as54q8yfngrkri3kd7fdha9pf2xjgx6ryflqx61k"; - }; - packageRequires = [ dash s ]; - meta = { - description = "Search using ag from inside Emacs"; - license = gpl3Plus; - }; - }; - elisp-ffi = melpaBuild rec { pname = "elisp-ffi"; version = "1.0.0"; @@ -183,256 +151,6 @@ let }; }; - alert = melpaBuild rec { - pname = "alert"; - version = "1.2"; - src = fetchFromGitHub { - owner = "jwiegley"; - repo = pname; - rev = "v${version}"; - sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26"; - }; - packageRequires = [ gntp log4e ]; - meta = { - description = "A Growl-like alerts notifier for Emacs"; - license = gpl2Plus; - }; - }; - - anzu = melpaBuild rec { - pname = "anzu"; - version = "0.52"; - src = fetchFromGitHub { - owner = "syohex"; - repo = "emacs-anzu"; - rev = "f41db6225d8fb983324765aa42c94d3ee379a49f"; - sha256 = "1mn20swasrl8kr557r1850vr1q0gcnwlxxafnc6lq5g01kjfcdxd"; - }; - meta = { - description = "Show number of matches in Emacs mode-line while searching"; - longDescription = '' - anzu.el is an Emacs port of anzu.vim. anzu.el provides a minor - mode which displays current match and total matches information - in the mode-line in various search mode. - ''; - license = gpl3Plus; - }; - }; - - apel = melpaBuild rec { - pname = "apel"; - version = "10.8"; - src = fetchFromGitHub { - owner = "wanderlust"; - repo = pname; - rev = "8402e59eadb580f59969114557b331b4d9364f95"; - sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m"; - }; - files = [ - "alist.el" "apel-ver.el" "broken.el" "calist.el" - "emu.el" "filename.el" "install.el" "inv-23.el" "invisible.el" - "mcharset.el" "mcs-20.el" "mcs-e20.el" "mule-caesar.el" - "path-util.el" "pccl-20.el" "pccl.el" "pces-20.el" "pces-e20.el" - "pces.el" "pcustom.el" "poe.el" "poem-e20.el" "poem-e20_3.el" - "poem.el" "product.el" "pym.el" "richtext.el" "static.el" - ]; - meta = { - description = "A Portable Emacs Library"; - license = gpl3Plus; # probably - }; - }; - - autotetris = melpaBuild { - pname = "autotetris-mode"; - version = "20141114.846"; - src = fetchFromGitHub { - owner = "skeeto"; - repo = "autotetris-mode"; - rev = "7d348d33829bc89ddbd2b4d5cfe5073c3b0cbaaa"; - sha256 = "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc"; - }; - files = [ "autotetris-mode.el" ]; - meta = { - description = "For those who are too busy to play Emacs tetris"; - license = unlicense; - }; - }; - - avy = melpaBuild rec { - pname = "avy"; - version = "0.3.0"; - src = fetchFromGitHub { - owner = "abo-abo"; - repo = pname; - rev = version; - sha256 = "15xfgmsy4sqs3cmk7dwmj21g3r9dqb3fra7n7ly306bwgzh4vm8k"; - }; - meta = { - description = "Advanced cursor movement for Emacs that uses decision-trees for navigation"; - license = gpl3Plus; - }; - }; - - bind-key = melpaBuild { - pname = "bind-key"; - version = "20150321"; - src = fetchFromGitHub { - owner = "jwiegley"; - repo = "use-package"; - rev = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01"; - sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0"; - }; - files = [ "bind-key.el" ]; - meta = { - description = "A simple way to manage personal keybindings"; - license = gpl3Plus; - }; - }; - - browse-kill-ring = melpaBuild rec { - pname = "browse-kill-ring"; - version = "20140104"; - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "f81ca5f14479fa9e938f89bf8f6baa3c4bdfb755"; - sha256 = "149g4qs5dqy6yzdj5smb39id5f72bz64qfv5bjf3ssvhwl2rfba8"; - }; - meta = { - description = "Interactively insert items from Emacs kill-ring"; - license = gpl2Plus; - }; - }; - - button-lock = melpaBuild rec { - pname = "button-lock"; - version = "1.0.2"; - src = fetchFromGitHub { - owner = "rolandwalker"; - repo = pname; - rev = "v${version}"; - sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2"; - }; - meta = { - description = "Mouseable text in Emacs"; - license = bsd2; - }; - }; - - caml = melpaBuild rec { - pname = "caml"; - version = "4.2.1"; # TODO: emacs doesn't seem to like 02 as a version component.. - src = fetchFromGitHub { - owner = "ocaml"; - repo = "ocaml"; - rev = "4.02.1"; - sha256 = "05lms9qhcnwgi7k034kiiic58c9da22r32mpak0ahmvp5fylvjpb"; - }; - fileSpecs = [ "emacs/*.el" ]; - configurePhase = "true"; - meta = { - description = "OCaml code editing commands for Emacs"; - license = gpl2Plus; - }; - }; - - change-inner = melpaBuild rec { - pname = "change-inner"; - version = "20130208"; - src = fetchFromGitHub { - owner = "magnars"; - repo = "${pname}.el"; - rev = "6374b745ee1fd0302ad8596cdb7aca1bef33a730"; - sha256 = "1fv8630bqbmfr56zai08f1q4dywksmghhm70084bz4vbs6rzdsbq"; - }; - packageRequires = [ expand-region ]; - meta = { - description = "Change contents based on semantic units in Emacs"; - license = gpl3Plus; - }; - }; - - circe = melpaBuild rec { - pname = "circe"; - version = "2.1"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = "circe"; - rev = "v${version}"; - sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q"; - }; - packageRequires = [ lcs lui ]; - fileSpecs = [ "circe*.el" "irc.el" "make-tls-process.el" ]; - meta = { - description = "IRC client for Emacs"; - license = gpl3Plus; - }; - }; - - company = melpaBuild rec { - pname = "company"; - version = "0.8.12"; - src = fetchFromGitHub { - owner = "company-mode"; - repo = "company-mode"; - rev = version; - sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0"; - }; - meta = { - description = "Modular text completion framework for Emacs"; - license = gpl3Plus; - }; - }; - - company-ghc = melpaBuild rec { - pname = "company-ghc"; - version = "0.1.10"; - src = fetchFromGitHub { - owner = "iquiw"; - repo = "company-ghc"; - rev = "v${version}"; - sha256 = "0lzwmjf91fxhkknk4z9m2v6whk1fzpa7n1rspp61lwmyh5gakj3x"; - }; - packageRequires = [ company ghc-mod ]; - meta = { - description = "Company-mode completion backend for haskell-mode via ghc-mod"; - license = gpl3Plus; - }; - }; - - dash-functional = melpaBuild rec { - pname = "dash-functional"; - version = "2.11.0"; - src = fetchFromGitHub { - owner = "magnars"; - repo = "dash.el"; - rev = version; - sha256 = "02gfrcda7gj3j5yx71dz40xylrafl4pcaj7bgfajqi9by0w2nrnx"; - }; - packageRequires = [ dash ]; - files = [ "dash-functional.el" ]; - meta = { - description = "Collection of useful combinators for Emacs Lisp"; - license = gpl3Plus; - }; - }; - - diminish = melpaBuild rec { - pname = "diminish"; - version = "0.45"; - src = fetchFromGitHub { - owner = "myrjola"; - repo = "${pname}.el"; - rev = "v${version}"; - sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6"; - }; - meta = { - description = "Diminishes the amount of space taken on the mode-line by Emacs minor modes"; - homepage = http://www.eskimo.com/~seldon/; - license = gpl3Plus; - }; - }; - elpy = melpaBuild rec { pname = "elpy"; version = external.elpy.version; @@ -471,96 +189,6 @@ let }; }; - emacs-source-directory = stdenv.mkDerivation { - name = "emacs-source-directory-1.0.0"; - src = emacs.src; - - # We don't want accidentally start bulding emacs one more time - phases = "unpackPhase buildPhase"; - - buildPhase = '' - mkdir -p $out/share/emacs/site-lisp/elpa/emacs-source-directory - cp -a src $out/src - (cd $out/src && ${emacs}/bin/etags *.c *.h) - cat < $out/share/emacs/site-lisp/elpa/emacs-source-directory/emacs-source-directory-autoloads.el - (setq source-directory "$out") - (setq find-function-C-source-directory (expand-file-name "src" source-directory)) - EOF - cat < $out/share/emacs/site-lisp/elpa/emacs-source-directory/emacs-source-directory-pkg.el - (define-package "emacs-source-directory" "1.0.0" "Make emacs C source code available inside emacs. To use with emacsWithPackages in NixOS" '()) - EOF - ''; - meta = { - description = "Make emacs C source code available inside emacs. To use with emacsWithPackages in NixOS"; - }; - }; - - engine-mode = melpaBuild rec { - pname = "engine-mode"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "hrs"; - repo = "engine-mode"; - rev = "v${version}"; - sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw"; - }; - meta = { - description = "Minor mode for defining and querying search engines through Emacs"; - license = gpl3Plus; - }; - }; - - epl = melpaBuild rec { - pname = "epl"; - version = "20140823"; - src = fetchFromGitHub { - owner = "cask"; - repo = pname; - rev = "63c78c08e345455f3d4daa844fdc551a2c18024e"; - sha256 = "04a2aq8dj2cmy77vw142wcmnjvqdbdsp6z0psrzz2qw0b0am03li"; - }; - meta = { - description = "Emacs Package Library"; - longDescription = '' - The purpose of this library is to wrap all the quirks and hassle of - package.el into a sane API. - ''; - license = gpl3Plus; - }; - }; - - evil-god-state = melpaBuild rec { - pname = "evil-god-state"; - version = "20140830"; - src = fetchFromGitHub { - owner = "gridaphobe"; - repo = pname; - rev = "234a9b6f500ece89c3dfb5c1df5baef6963e4566"; - sha256 = "16v6dpw1hibrkf9hga88gv5axvp1pajd67brnh5h4wpdy9qvwgyy"; - }; - packageRequires = [ evil god-mode ]; - meta = { - description = "An evil-mode state for using Emacs god-mode"; - license = gpl3Plus; - }; - }; - - evil-indent-textobject = melpaBuild rec { - pname = "evil-indent-textobject"; - version = "0.2"; - src = fetchFromGitHub { - owner = "cofi"; - repo = pname; - rev = "70a1154a531b7cfdbb9a31d6922482791e20a3a7"; - sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz"; - }; - packageRequires = [ evil ]; - meta = { - description = "Textobject for evil based on indentation"; - license = gpl2Plus; - }; - }; - evil-jumper = melpaBuild rec { pname = "evil-jumper"; version = "20151017"; @@ -577,115 +205,6 @@ let }; }; - evil-leader = melpaBuild rec { - pname = "evil-leader"; - version = "0.4.3"; - src = fetchFromGitHub { - owner = "cofi"; - repo = pname; - rev = version; - sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5"; - }; - packageRequires = [ evil ]; - meta = { - description = " key for evil"; - license = gpl3Plus; - }; - }; - - evil-mc = melpaBuild rec { - pname = "evil-mc"; - version = "20150117"; - src = fetchFromGitHub { - owner = "gabesoft"; - repo = "evil-mc"; - rev = "80471ba1173775e706c2043afd7d20ace652df7d"; - sha256 = "1j23avcxj79plba99yfpmj9rfpdb527d7qfp4mx658y837vji1zm"; - }; - packageRequires = [ evil ]; - meta = { - description = "Multiple cursors implementation for evil-mode"; - license = gpl3Plus; - }; - }; - - evil-surround = melpaBuild rec { - pname = "evil-surround"; - version = "20140616"; - src = fetchFromGitHub { - owner = "timcharper"; - repo = pname; - rev = "71f380b6b6ed38f739c0a4740b3d6de0c52f915a"; - sha256 = "0wrmlmgr4mwxlmmh8blplddri2lpk4g8k3l1vpb5c6a975420qvn"; - }; - packageRequires = [ evil ]; - meta = { - description = "surround.vim emulation for Emacs evil mode"; - license = gpl3Plus; - }; - }; - - evil-visualstar = melpaBuild rec { - pname = "evil-visualstar"; - version = "20151017"; - src = fetchFromGitHub { - owner = "bling"; - repo = pname; - rev = "bd9e1b50c03b37c57355d387f291c2ec8ce51eec"; - sha256 = "17m4kdz1is4ipnyiv9n3vss49faswbbd6v57df9npzsbn5jyydd0"; - }; - packageRequires = [ evil ]; - meta = { - description = "Start a * or # search from the visual selection"; - license = gpl3Plus; - }; - }; - - evil = melpaBuild { - pname = "evil"; - version = "1.2.5"; - src = fetchhg { - url = "https://bitbucket.org/lyro/evil"; - rev = "72593d8e83a3"; - sha256 = "1pv055qlc3vawzdik29d6zbbv8fa2ygwylm04wa46qr5sj53v0i8"; - }; - packageRequires = [ goto-chg undo-tree ]; - meta = { - description = "Extensible vi layer for Emacs"; - license = gpl3Plus; - }; - }; - - exec-path-from-shell = melpaBuild rec { - pname = "exec-path-from-shell"; - version = "20141022"; - src = fetchFromGitHub { - owner = "purcell"; - repo = pname; - rev = "e4af0e9b44738e7474c89ed895200b42e6541515"; - sha256 = "0lxikiqf1jik88lf889q4f4f8kdgg3npciz298x605nhbfd5snbd"; - }; - meta = { - description = "Slurp environment variables from shell to Emacs"; - license = gpl3Plus; - }; - }; - - expand-region = melpaBuild rec { - pname = "expand-region"; - version = "20150902"; - src = fetchFromGitHub { - owner = "magnars"; - repo = "${pname}.el"; - rev = "59f67115263676de5345581216640019975c4fda"; - sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1"; - }; - meta = { - description = "Increases the selected region by semantic units in Emacs"; - license = gpl3Plus; - }; - }; - find-file-in-project = melpaBuild rec { pname = "find-file-in-project"; version = "3.5"; @@ -706,22 +225,6 @@ let }; }; - flim = melpaBuild rec { - pname = "flim"; - version = "1.14.9"; # 20141216 - src = fetchFromGitHub { - owner = "wanderlust"; - repo = pname; - rev = "488a4d70fb4ae57bdd30dc75c2d75579894e28a2"; - sha256 = "178fhpbyffksr4v3m8jmx4rx2vqyz23qhbyvic5afabxi6lahjfs"; - }; - packageRequires = [ apel ]; - meta = { - description = "Email message encoding library for Emacs"; - license = gpl3Plus; # probably - }; - }; - ghc-mod = melpaBuild rec { pname = "ghc"; version = external.ghc-mod.version; @@ -757,328 +260,6 @@ let inherit (external.rtags) meta; }; - git-auto-commit-mode = melpaBuild rec { - pname = "git-auto-commit-mode"; - version = "4.4.0"; - src = fetchFromGitHub { - owner = "ryuslash"; - repo = pname; - rev = version; - sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh"; - }; - meta = { - description = "Automatically commit to Git after each save"; - license = gpl3Plus; - }; - }; - - git-gutter = melpaBuild rec { - pname = "git-gutter"; - version = "20150930"; - src = fetchFromGitHub { - owner = "syohex"; - repo = "emacs-git-gutter"; - rev = "df7fb13481bea2b1476ca8a20bc958b17d1e06ae"; - sha256 = "1xwdyjh13lp06yy9477013nj6idpsjr4ifg7hmyk5ai80axkgly7"; - }; - files = [ "git-gutter.el" ]; - meta = { - description = "Show diff status of lines in a buffer relative to Git, mercurial, svn or bazaar repo's HEAD"; - license = gpl3Plus; - }; - }; - - #TODO git-gutter-fringe - - git-timemachine = melpaBuild rec { - pname = "git-timemachine"; - version = "2.3"; - src = fetchFromGitHub { - owner = "pidu"; - repo = pname; - rev = version; - sha256 = "1lm6rgbzbxnwfn48xr6bg05lb716grfr4nqm8lvjm64nabh5y9bh"; - }; - meta = { - description = "Step through historic revisions of Git controlled files"; - license = gpl3Plus; - }; - }; - - gitattributes-mode = melpaBuild rec { - pname = "gitattributes-mode"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "magit"; - repo = "git-modes"; - rev = version; - sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; - }; - files = [ "gitattributes-mode.el" ]; - meta = { - description = "Emacs major-mode for editing gitattributes files"; - license = gpl3Plus; - }; - }; - - gitconfig-mode = melpaBuild rec { - pname = "gitconfig-mode"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "magit"; - repo = "git-modes"; - rev = version; - sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; - }; - files = [ "gitconfig-mode.el" ]; - meta = { - description = "Emacs major-mode for editing gitconfig files"; - license = gpl3Plus; - }; - }; - - gitignore-mode = melpaBuild rec { - pname = "gitignore-mode"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "magit"; - repo = "git-modes"; - rev = version; - sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0"; - }; - files = [ "gitignore-mode.el" ]; - meta = { - description = "Emacs major-mode for editing gitignore files"; - license = gpl3Plus; - }; - }; - - gntp = melpaBuild rec { - pname = "gntp"; - version = "0.1"; - src = fetchFromGitHub { - owner = "tekai"; - repo = "${pname}.el"; - rev = "v${version}"; - sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a"; - }; - meta = { - description = "GNTP protocol implementation for Emacs"; - license = gpl2Plus; - }; - }; - - gnus = melpaBuild rec { - pname = "gnus"; - version = "20140501"; - src = fetchgit { - url = "http://git.gnus.org/gnus.git"; - rev = "4228cffcb7afb77cf39678e4a8988a57753502a5"; - sha256 = "0qd0wpxkz47irxghmdpa524c9626164p8vgqs26wlpbdwyvm64a0"; - }; - fileSpecs = [ "lisp/*.el" "texi/*.texi" ]; - preBuild = '' - (cd lisp && make gnus-load.el) - ''; - meta = { - description = "News and mail reader for Emacs"; - license = gpl3Plus; - }; - }; - - go-mode = melpaBuild rec { - pname = "go-mode"; - version = "20150817"; - src = fetchFromGitHub { - owner = "dominikh"; - repo = "go-mode.el"; - rev = "5d53a13bd193653728e74102c81aa931b780c9a9"; - sha256 = "0hvssmvzvn13j18282nsq8fclyjs0x103gj9bp6fhmzxmzl56l7g"; - }; - meta = { - description = "Go language support for Emacs"; - license = bsd3; - }; - }; - - god-mode = melpaBuild rec { - pname = "god-mode"; - version = "20140811"; - src = fetchFromGitHub { - owner = "chrisdone"; - repo = pname; - rev = "6b7ae259a58ca1d7776aa4eca9f1092e4c0033e6"; - sha256 = "1amr98nq82g2d3f3f5wlqm9g38j64avygnsi9rrlbfqz4f71vq7x"; - }; - meta = { - description = "A global minor mode for entering Emacs commands without modifier keys"; - license = gpl3Plus; - }; - }; - - goto-chg = melpaBuild rec { - pname = "goto-chg"; - version = "1.6"; - src = fetchhg { - url = "https://bitbucket.org/lyro/evil"; - rev = "e5588e50c0e40a66c099868ea825755e348311fb"; - sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8"; - }; - files = [ "lib/goto-chg.el" ]; - meta = { - description = "Goto last change in current buffer using Emacs undo information"; - license = gpl3Plus; - }; - }; - - haskell-mode = melpaBuild rec { - pname = "haskell-mode"; - version = "13.16"; - src = fetchFromGitHub { - owner = "haskell"; - repo = pname; - rev = "v${version}"; - sha256 = "1gmpmfkr54sfzrif87zf92a1i13wx75bhp66h1rxhflg216m62yv"; - }; - meta = { - description = "Haskell language support for Emacs"; - license = gpl3Plus; - }; - }; - - helm-bibtex = melpaBuild rec { - pname = "helm-bibtex"; - version = "20151125"; - src = fetchFromGitHub { - owner = "tmalsburg"; - repo = pname; - rev = "bfcd5064dcc7c0ac62c46985832b2a73082f96e0"; - sha256 = "1nvc4ha9wj5j47qg7hdbv1xpjy8a8idc9vc2myl3xa33ywllwdwi"; - }; - packageRequires = [ dash f helm parsebib s ]; - meta = { - description = "Bibliography Manager for Emacs"; - license = gpl2; - }; - }; - - helm-swoop = melpaBuild rec { - pname = "helm-swoop"; - version = "20141224"; - src = fetchFromGitHub { - owner = "ShingoFukuyama"; - repo = pname; - rev = "06a251f7d7fce2a5719e0862e5855972cd8ab1ae"; - sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m"; - }; - packageRequires = [ helm ]; - meta = { - description = "An Emacs mode which constructs an editable grep for a buffer"; - license = gpl3Plus; - }; - }; - - # deprecated, part of haskell-mode now - hi2 = melpaBuild rec { - pname = "hi2"; - version = "1.0"; - src = fetchFromGitHub { - owner = "nilcons"; - repo = pname; - rev = version; - sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf"; - }; - meta = { - description = "Minor haskell-indentation mode for haskell-mode, 2nd try"; - license = gpl3Plus; - }; - }; - - highlight-indentation = melpaBuild rec { - pname = "highlight-indentation"; - version = "0.7.0"; - src = fetchFromGitHub { - owner = "antonj"; - repo = "Highlight-Indentation-for-Emacs"; - rev = "v${version}"; - sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k"; - }; - meta = { - description = "Minor modes to highlight indentation guides in emacs"; - longDescription = '' - Provides two minor modes highlight-indentation-mode and - highlight-indentation-current-column-mode - - - highlight-indentation-mode displays guidelines indentation - (space indentation only). - - highlight-indentation-current-column-mode displays guidelines for the - current-point indentation (space indentation only). - ''; - license = gpl2Plus; - }; - }; - - hydra = melpaBuild rec { - pname = "hydra"; - version = "0.13.3"; - src = fetchFromGitHub { - owner = "abo-abo"; - repo = pname; - rev = version; - sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f"; - }; - meta = { - description = "Tie related Emacs commands into a family of short bindings with a common prefix"; - license = gpl3Plus; - }; - }; - - ibuffer-vc = melpaBuild rec { - pname = "ibuffer-vc"; - version = "0.10"; - src = fetchFromGitHub { - owner = "purcell"; - repo = pname; - rev = version; - sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8"; - }; - meta = { - description = "Version control aware Emacs ibuffer mode"; - license = gpl3Plus; - }; - }; - - ido-ubiquitous = melpaBuild rec { - pname = "ido-ubiquitous"; - version = "2.17"; - src = fetchFromGitHub { - owner = "DarwinAwardWinner"; - repo = pname; - rev = "323e4cddc05d5a4546c1b64132b2b1e9f8896452"; - sha256 = "0wdjz3cqzrxhrk68g5gyvc9j2rb6f4yw00xbjgw9ldwlhmkwy5ja"; - }; - meta = { - description = "Does what you expected ido-everywhere should do in Emacs"; - license = gpl3Plus; - }; - }; - - idris-mode = melpaBuild rec { - pname = "idris-mode"; - version = "0.9.19"; - src = fetchFromGitHub { - owner = "idris-hackers"; - repo = "idris-mode"; - rev = version; - sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92"; - }; - packageRequires = [ prop-menu ]; - meta = { - description = "Idris language support for Emacs"; - license = gpl3Plus; - }; - }; - lcs = melpaBuild rec { pname = "lcs"; version = circe.version; @@ -1090,21 +271,6 @@ let }; }; - log4e = melpaBuild rec { - pname = "log4e"; - version = "0.3.0"; - src = fetchFromGitHub { - owner = "aki2o"; - repo = pname; - rev = "v${version}"; - sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022"; - }; - meta = { - description = "Logging for elisp"; - license = gpl2Plus; - }; - }; - lui = melpaBuild rec { pname = "lui"; version = circe.version; @@ -1117,341 +283,10 @@ let }; }; - markdown-toc = melpaBuild rec { - pname = "markdown-toc"; - version = "0.0.8"; - src = fetchFromGitHub { - owner = "ardumont"; - repo = pname; - rev = "06903e24457460a8964a978ace709c69afc36692"; - sha256 = "07w0w9g81c6c404l3j7gb420wc2kjmah728w84mdymscdl5w3qyl"; - }; - packageRequires = [ markdown-mode dash s ]; - files = [ "${pname}.el" ]; - meta = { - description = "Generate a TOC in markdown file"; - longDescription = '' - A simple mode to create TOC in a markdown file. - ''; - license = gpl3Plus; - }; - }; - - moe-theme = melpaBuild rec { - pname = "moe-theme"; - version = "1.0"; - src = fetchFromGitHub { - owner = "kuanyui"; - repo = "${pname}.el"; - rev = "39384a7a9e6886f3a3d79efac4009fcd800a4a14"; - sha256 = "0i7m15x9sij5wh0gwbijsis8a4jm8izywj7xprk21644ndskvfiz"; - }; - meta = { - description = "A set of Emacs themes optimized for terminals with 256 colors"; - license = gpl3Plus; - }; - }; - - monokai-theme = melpaBuild rec { - pname = "monokai-theme"; - version = "1.0.0"; - src = fetchFromGitHub { - owner = "oneKelvinSmith"; - repo = "monokai-emacs"; - rev = "v${version}"; - sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz"; - }; - meta = { - description = "An Emacs port of TextMate' Monokai theme inspired by Zenburn theme"; - license = gpl3Plus; - }; - }; - - multiple-cursors = melpaBuild rec { - pname = "multiple-cursors"; - version = "20150627"; - src = fetchFromGitHub { - owner = "magnars"; - repo = "multiple-cursors.el"; - rev = "9b53e892e6167f930763a3c5aedf8773110a8ae9"; - sha256 = "0wcrdb137a9aq6dynlqbvypb6m2dj48m899xwy7ilnf2arrmipid"; - }; - meta = { - description = "Edit text in many places simultaneously in Emacs"; - license = gpl3Plus; # TODO - }; - }; - nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode { inherit lib; }; - org2jekyll = melpaBuild rec { - pname = "org2jekyll"; - version = "0.1.8"; - src = fetchFromGitHub { - owner = "ardumont"; - repo = pname; - rev = "a12173b9507b3ef54dfebb5751503ba1ee93c6aa"; - sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf"; - }; - packageRequires = [ dash-functional s deferred ]; - files = [ "${pname}.el" ]; - meta = { - description = "Blogging with org-mode and jekyll without alien yaml headers"; - license = gpl3Plus; - }; - }; - - org-trello = melpaBuild rec { - pname = "org-trello"; - version = "0.7.5"; - src = fetchFromGitHub { - owner = "org-trello"; - repo = pname; - rev = "3718ed704094e5e5a491749f1f722d76ba4b7d73"; - sha256 = "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86"; - }; - packageRequires = [ request-deferred deferred dash-functional s ]; - files = [ "org-trello*.el" ]; - meta = { - description = "Org minor mode - 2-way sync org & trello"; - longDescription = '' - Org-trello is an emacs minor mode that extends org-mode with - Trello abilities. - ''; - homepage = https://org-trello.github.io/; - license = gpl3Plus; - }; - }; - - parsebib = melpaBuild rec { - pname = "parsebib"; - version = "20151006"; - src = fetchFromGitHub { - owner = "joostkremers"; - repo = pname; - rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"; - sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml"; - }; - meta = { - description = "Emacs library for reading .bib files"; - license = bsd3; - }; - }; - - perspective = melpaBuild rec { - pname = "perspective"; - version = "1.12"; - src = fetchFromGitHub { - owner = "nex3"; - repo = "${pname}-el"; - rev = version; - sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q"; - }; - meta = { - description = "Tagged workspaces like in most tiling window managers, but in Emacs"; - license = gpl3Plus; - }; - }; - - pkg-info = melpaBuild rec { - pname = "pkg-info"; - version = "20140610"; - src = fetchFromGitHub { - owner = "lunaryorn"; - repo = "${pname}.el"; - rev = "475cdeb0b8d44f9854e506c429eeb445787014ec"; - sha256 = "0x4nz54f2shgcw3gx66d265vxwdpdirn64gzii8dpxhsi7v86n0p"; - }; - packageRequires = [ epl ]; - meta = { - description = "Provide information about Emacs packages"; - license = gpl3Plus; - }; - }; - - projectile = melpaBuild rec { - pname = "projectile"; - version = "0.13.0"; - src = fetchFromGitHub { - owner = "bbatsov"; - repo = pname; - rev = "v${version}"; - sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf"; - }; - fileSpecs = [ "projectile.el" ]; - packageRequires = [ dash helm pkg-info ]; - meta = { - description = "A project interaction library for Emacs"; - license = gpl3Plus; - }; - }; - helm-projectile = melpaBuild rec { - pname = "helm-projectile"; - version = projectile.version; - src = projectile.src; - fileSpecs = [ "helm-projectile.el" ]; - packageRequires = [ helm projectile ]; - meta = projectile.meta; - }; - persp-projectile = melpaBuild rec { - pname = "persp-projectile"; - version = projectile.version; - src = projectile.src; - fileSpecs = [ "persp-projectile.el" ]; - packageRequires = [ perspective projectile ]; - meta = projectile.meta; - }; - - prop-menu = melpaBuild rec { - pname = "prop-menu"; - version = "0.1.2"; - src = fetchFromGitHub { - owner = "david-christiansen"; - repo = "${pname}-el"; - rev = version; - sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc"; - }; - meta = { - description = "Library for computing context menus based on text properties and overlays in Emacs"; - license = gpl3Plus; - }; - }; - - pyvenv = melpaBuild rec { - pname = "pyvenv"; - version = "1.7"; - src = fetchFromGitHub { - owner = "jorgenschaefer"; - repo = pname; - rev = "e4f2fa7a32cf480f34d628d8eb5b9b60374d0e8e"; - sha256 = "1669id1p69kpq8zzldxj1p6iyz68701snn462g22k2acfzc2bfha"; - }; - meta = { - description = "Python virtual environment interface for Emacs"; - longDescription = '' - This is a simple global minor mode which will replicate the changes done - by virtualenv activation inside Emacs. - ''; - license = gpl2Plus; - }; - }; - - rainbow-delimiters = melpaBuild rec { - pname = "rainbow-delimiters"; - version = "2.1.1"; - src = fetchFromGitHub { - owner = "Fanael"; - repo = pname; - rev = version; - sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd"; - }; - meta = { - description = "Highlight delimiters with colors according to their depth"; - license = gpl3Plus; - }; - }; - - request = melpaBuild rec { - pname = "request"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "tkf"; - repo = "emacs-${pname}"; - rev = "adf7de452f9914406bfb693541f1d280093c4efd"; - sha256 = "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92"; - }; - - files = [ "request.el" ]; - - meta = { - description = "Easy HTTP request for Emacs Lisp"; - longDescription = '' - Request.el is a HTTP request library with multiple backends. It supports - url.el which is shipped with Emacs and curl command line program. User - can use curl when s/he has it, as curl is more reliable than url.el. - Library author can use request.el to avoid imposing external dependencies - such as curl to users while giving richer experience for users who have curl. - ''; - license = gpl3Plus; - }; - }; - - request-deferred = melpaBuild rec { - pname = "request-deferred"; - version = request.version; - src = request.src; - packageRequires = [ request deferred ]; - files = [ "request-deferred.el" ]; - meta = request.meta - // { description = "${request.meta.description} (deferred)"; }; - }; - - rich-minority = melpaBuild rec { - pname = "rich-minority"; - version = "0.1.1"; - src = fetchFromGitHub { - owner = "Bruce-Connor"; - repo = pname; - rev = version; - sha256 = "0kvhy4mgs9llihwsb1a9n5a85xzjiyiyawxnz0axy2bvwcxnp20k"; - }; - packageRequires = [ dash ]; - meta = { - description = "Hiding and/or highlighting the list of minor modes in the Emacs mode-line"; - license = gpl3Plus; - }; - }; - - rust-mode = melpaBuild rec { - pname = "rust-mode"; - version = "20151026"; - - src = fetchFromGitHub { - owner = "rust-lang"; - repo = pname; - rev = "1761a9c212cdbc46cab5377c0ce90f96e33b2fbb"; - sha256 = "1wvjisi26lb4g5rjq80kq9jmf1r2m3isy47nwrnahfzxk886qfbq"; - }; - meta = { - description = "A major mode for editing rust code"; - license = asl20; - }; - }; - - s = melpaBuild rec { - pname = "s"; - version = "20151023"; - src = fetchFromGitHub { - owner = "magnars"; - repo = "${pname}.el"; - rev = "372e94c1a28031686d75d6c52bfbe833a118a72a"; - sha256 = "1zn8n3mv0iscs242dbkf5vmkkizfslq5haw9z0d0g3wknq18286h"; - }; - meta = { - description = "String manipulation library for Emacs"; - license = gpl3Plus; - }; - }; - - semi = melpaBuild rec { - pname = "semi"; - version = "1.14.7"; # 20150203 - src = fetchFromGitHub { - owner = "wanderlust"; - repo = pname; - rev = "9976269556c5bcc021e4edf1b0e1accd39929528"; - sha256 = "1g1xg57pz4msd3f998af5gq28qhmvi410faygzspra6y6ygaka68"; - }; - packageRequires = [ apel flim ]; - meta = { - description = "MIME library for Emacs"; - license = gpl3Plus; # probably - }; - }; - shorten = melpaBuild rec { pname = "shorten"; version = circe.version; @@ -1463,60 +298,6 @@ let }; }; - smart-mode-line = melpaBuild rec { - pname = "smart-mode-line"; - version = "2.6"; - src = fetchFromGitHub { - owner = "Bruce-Connor"; - repo = pname; - rev = version; - sha256 = "17nav2jbvbd13xzgp29x396mc617n2dh6whjk4wnyvsyv7r0s9f6"; - }; - packageRequires = [ dash rich-minority ]; - meta = { - description = "Sexy mode-line for Emacs"; - license = gpl3Plus; - }; - }; - - smartparens = melpaBuild rec { - pname = "smartparens"; - version = "20151025"; - src = fetchFromGitHub { - owner = "Fuco1"; - repo = pname; - rev = "85583f9570be58f17ccd68388d9d4e58234d8ae9"; - sha256 = "1pvzcrnzvksx1rzrr19256x1qhidr2acz6yipijlfx2zfjx2gxa7"; - }; - packageRequires = [ dash ]; - meta = { - description = "Minor mode for Emacs that deals with parens pairs"; - longDescription = '' - It started as a unification effort to combine functionality of - several existing packages in a single, compatible and - extensible way to deal with parentheses, delimiters, tags and - the like. Some of these packages include autopair, textmate, - wrap-region, electric-pair-mode, paredit and others. - ''; - license = gpl3Plus; - }; - }; - - smex = melpaBuild rec { - pname = "smex"; - version = "20141210"; - src = fetchFromGitHub { - owner = "nonsequitur"; - repo = pname; - rev = "aff8d4485139ac28f1c7e62912c0d0d480995831"; - sha256 = "0017f1ji7rxad2n49dhn5g0pmw6lmw80cqk6dynszizj46xpbqfp"; - }; - meta = { - description = "M-x enhancement for Emacs build on top of Ido"; - license = emacs.meta.license; # should be "same as Emacs" - }; - }; - structured-haskell-mode = melpaBuild rec { pname = "shm"; version = external.structured-haskell-mode.version; @@ -1532,136 +313,7 @@ let }; }; - swiper = melpaBuild rec { - pname = "swiper"; - version = "0.7.0"; - src = fetchFromGitHub { - owner = "abo-abo"; - repo = pname; - rev = version; - sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm"; - }; - fileSpecs = [ "swiper.el" "ivy.el" "colir.el" "counsel.el" ]; - meta = { - description = "Overview as you search for a regex in Emacs"; - license = gpl3Plus; - }; - }; - ivy = swiper; - - #TODO: swiper-helm - - switch-window = melpaBuild rec { - pname = "switch-window"; - version = "20140919"; - src = fetchFromGitHub { - owner = "dimitri"; - repo = pname; - rev = "3ffbe68e584f811e891f96afa1de15e0d9c1ebb5"; - sha256 = "09221128a0f55a575ed9addb3a435cfe01ab6bdd0cca5d589ccd37de61ceccbd"; - }; - meta = { - description = "Visual replacement for C-x o in Emacs"; - license = gpl3Plus; - }; - }; - - tracking = melpaBuild rec { - pname = "tracking"; - version = circe.version; - src = circe.src; - packageRequires = [ shorten ]; - fileSpecs = [ "tracking.el" ]; - meta = { - description = "Register buffers for user review library for Emacs"; - license = gpl3Plus; - }; - }; - - tuareg = melpaBuild rec { - pname = "tuareg"; - version = "2.0.9"; - src = fetchFromGitHub { - owner = "ocaml"; - repo = pname; - rev = version; - sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb"; - }; - packageRequires = [ caml ]; - meta = { - description = "Extension of OCaml mode for Emacs"; - license = gpl3Plus; - }; - }; - - use-package = melpaBuild rec { - pname = "use-package"; - version = "20151112"; - src = fetchFromGitHub { - owner = "jwiegley"; - repo = pname; - rev = "77a77c8b03044f0279e00cadd6a6d1a7ae97b01"; - sha256 = "14v6wzqn2jhjdbr7nwqilxy9l79m1f2rdrz2c6c6pcla5yjpd1k0"; - }; - packageRequires = [ bind-key diminish ]; - files = [ "use-package.el" ]; - meta = { - description = "Isolate package configuration in your .emacs file"; - license = gpl3Plus; - }; - }; - - volatile-highlights = melpaBuild rec { - pname = "volatile-highlights"; - version = "1.11"; - src = fetchFromGitHub { - owner = "k-talo"; - repo = "${pname}.el"; - rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24"; - sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf"; - }; - meta = { - description = "Brings visual feedback to some operations in Emacs"; - license = gpl3Plus; - }; - }; - - wanderlust = melpaBuild rec { - pname = "wanderlust"; - version = "2.15.9"; # 20150301 - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "13fb4f6519490d4ac7138f3bcf76707654348071"; - sha256 = "1l48xfcwkm205prspa1rns6lqfizik5gpdwmlfgyb5mabm9x53zn"; - }; - packageRequires = [ apel flim semi ]; - fileSpecs = [ - "doc/wl.texi" "doc/wl-ja.texi" - "elmo/*.el" "wl/*.el" - "etc/icons" - ]; - meta = { - description = "E-Mail client for Emacs"; - license = gpl3Plus; # probably - }; - }; - - web-mode = melpaBuild rec { - pname = "web-mode"; - version = "11.1.12"; - src = fetchFromGitHub { - owner = "fxbois"; - repo = pname; - rev = "67259f16bfaec5c006a53533b8feeba7771e1365"; - sha256 = "16zcnwm7wnbl1xbsx7rr5rr697ax141akfx2lknwirx18vqmkijj"; - }; - - meta = { - description = "Web template editing mode for Emacs"; - license = gpl2; - }; - }; + tramp = callPackage ../applications/editors/emacs-modes/tramp { }; weechat = melpaBuild rec { pname = "weechat.el"; @@ -1682,36 +334,6 @@ let }; }; - wgrep = melpaBuild rec { - pname = "wgrep"; - version = "20141017"; - src = fetchFromGitHub { - owner = "mhayashi1120"; - repo = "Emacs-wgrep"; - rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c"; - sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4"; - }; - meta = { - description = "Writable grep buffer mode for Emacs"; - license = gpl3Plus; - }; - }; - - zenburn-theme = melpaBuild rec { - pname = "zenburn-theme"; - version = "2.2"; - src = fetchFromGitHub { - owner = "bbatsov"; - repo = "zenburn-emacs"; - rev = "v${version}"; - sha256 = "1zspqpwgyv3969irg8p7zj3g4hww4bmnlvx33bvjyvvv5c4mg5wv"; - }; - meta = { - description = "An Emacs port of Vim's low contrast Zerburn theme"; - license = gpl3Plus; - }; - }; - }; in diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 23737ca0ff7..e1079f354d1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -238,11 +238,22 @@ rec { lts-6_4 = packages.ghc7103; lts-6_5 = packages.ghc7103; lts-6_6 = packages.ghc7103; - lts-6_7 = packages.ghc7103.override { - packageSetConfig = callPackage ../development/haskell-modules/configuration-lts.nix { }; - }; - lts-6 = packages.lts-6_7; + lts-6_7 = packages.ghc7103; + lts-6_8 = packages.ghc7103; + lts-6_9 = packages.ghc7103; + lts-6_10 = packages.ghc7103; + lts-6_11 = packages.ghc7103; + lts-6_12 = packages.ghc7103; + lts-6_13 = packages.ghc7103; + lts-6_14 = packages.ghc7103; + lts-6_15 = packages.ghc7103; + lts-6_16 = packages.ghc7103; + lts-6_17 = packages.ghc7103; + lts-6 = packages.lts-6_17; - lts = packages.lts-6; + lts-7_0 = packages.ghc801; + lts-7 = packages.lts-7_0; + + lts = packages.lts-7; }; } diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index c065ac8290a..4087edd2127 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -7,7 +7,7 @@ { fetchurl, fetchzip, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool , pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo -, perl, gtk, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook +, perl, gtk2, python, glib, gobjectIntrospection, libevent, zlib, autoreconfHook , fetchFromGitHub, libmpack }: @@ -189,14 +189,26 @@ let sha256 = "0j8jx8bjicvp9khs26xjya8c495wrpb7parxfnabdqa5nnsxjrwb"; }; - patchPhase = '' - sed -e "s,^LUAPREFIX_linux.*,LUAPREFIX_linux=$out," \ - -i src/makefile + patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace src/makefile --replace gcc cc \ + --replace 10.3 10.5 ''; - meta = { + preBuild = '' + makeFlagsArray=( + LUAV=${lua.luaversion} + PLAT=${if stdenv.isDarwin then "macosx" + else if stdenv.isFreeBSD then "freebsd" + else if stdenv.isLinux then "linux" + else if stdenv.isSunOS then "solaris" + else throw "unsupported platform"} + prefix=$out + ); + ''; + + meta = with stdenv.lib; { homepage = "http://w3.impa.br/~diego/software/luasocket/"; - hydraPlatforms = stdenv.lib.platforms.linux; + hydraPlatforms = with platforms; [darwin linux freebsd illumos]; maintainers = with maintainers; [ mornfall ]; }; }; diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 2fe69390ec5..8b3b67f4b05 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -63,12 +63,15 @@ releaseTools.sourceTarball rec { fi # Check that all-packages.nix evaluates on a number of platforms without any warnings. + # Filter out MD5 warnings for now for platform in i686-linux x86_64-linux x86_64-darwin; do header "checking Nixpkgs on $platform" NIXPKGS_ALLOW_BROKEN=1 nix-env -f . \ --show-trace --argstr system "$platform" \ - -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | tee eval-warnings.log + -qa --drv-path --system-filter \* --system 2>&1 >/dev/null | + (grep -v '^trace: INFO: Deprecated use of MD5 hash in fetch' || true) | + tee eval-warnings.log if [ -s eval-warnings.log ]; then echo "Nixpkgs on $platform evaluated with warnings, aborting" diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index dbaa35cf7a6..432a367d153 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -5381,15 +5381,15 @@ cpu = [ ]; }; by-spec."bower2nix"."*" = - self.by-version."bower2nix"."3.0.1"; - by-version."bower2nix"."3.0.1" = self.buildNodePackage { - name = "bower2nix-3.0.1"; - version = "3.0.1"; + self.by-version."bower2nix"."3.1.1"; + by-version."bower2nix"."3.1.1" = self.buildNodePackage { + name = "bower2nix-3.1.1"; + version = "3.1.1"; bin = true; src = fetchurl { - url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz"; - name = "bower2nix-3.0.1.tgz"; - sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44"; + url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.1.1.tgz"; + name = "bower2nix-3.1.1.tgz"; + sha1 = "wfzj1k6jkfnk1bkgbmpni59mdab8zk3p"; }; deps = { "argparse-1.0.4" = self.by-version."argparse"."1.0.4"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix new file mode 100644 index 00000000000..bda35e9383f --- /dev/null +++ b/pkgs/top-level/ocaml-packages.nix @@ -0,0 +1,713 @@ +{ lib, callPackage, newScope, pkgs, config, system }: + +let + mkOcamlPackages = ocaml: overrides: + let + packageSet = self: + with self; let inherit (self) callPackage; in + { + callPackage = newScope self; + + inherit ocaml; + + # Libs + + buildOcaml = callPackage ../build-support/ocaml { }; + + acgtk = callPackage ../applications/science/logic/acgtk { }; + + alcotest = callPackage ../development/ocaml-modules/alcotest {}; + + ansiterminal = callPackage ../development/ocaml-modules/ansiterminal { }; + + asn1-combinators = callPackage ../development/ocaml-modules/asn1-combinators { }; + + async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; + + async_find = callPackage ../development/ocaml-modules/async_find { }; + + async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; + + 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 = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/async { } + else null; + + atd = callPackage ../development/ocaml-modules/atd { }; + + atdgen = callPackage ../development/ocaml-modules/atdgen { }; + + base64 = callPackage ../development/ocaml-modules/base64 { }; + + bolt = callPackage ../development/ocaml-modules/bolt { }; + + bitstring_2_0_4 = callPackage ../development/ocaml-modules/bitstring/2.0.4.nix { }; + bitstring_git = callPackage ../development/ocaml-modules/bitstring { }; + + bitstring = + if lib.versionOlder "4.02" ocaml.version + then bitstring_git + else bitstring_2_0_4; + + camlidl = callPackage ../development/tools/ocaml/camlidl { }; + + camlp4 = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/tools/ocaml/camlp4 { } + else null; + + camlp5_old_strict = + if lib.versionOlder "4.00" ocaml.version + then camlp5_6_strict + else callPackage ../development/tools/ocaml/camlp5/5.15.nix { }; + + camlp5_old_transitional = + if lib.versionOlder "4.00" ocaml.version + then camlp5_6_transitional + else callPackage ../development/tools/ocaml/camlp5/5.15.nix { + transitional = true; + }; + + camlp5_6_strict = callPackage ../development/tools/ocaml/camlp5 { }; + + camlp5_6_transitional = callPackage ../development/tools/ocaml/camlp5 { + transitional = true; + }; + + camlp5_strict = camlp5_6_strict; + + camlp5_transitional = camlp5_6_transitional; + + camlpdf = callPackage ../development/ocaml-modules/camlpdf { }; + + calendar = callPackage ../development/ocaml-modules/calendar { }; + + camlzip = callPackage ../development/ocaml-modules/camlzip { }; + + camomile_0_8_2 = callPackage ../development/ocaml-modules/camomile/0.8.2.nix { }; + camomile = callPackage ../development/ocaml-modules/camomile { }; + + camlimages_4_0 = callPackage ../development/ocaml-modules/camlimages/4.0.nix { + libpng = pkgs.libpng12; + giflib = pkgs.giflib_4_1; + }; + camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix { + giflib = pkgs.giflib_4_1; + }; + camlimages = camlimages_4_1; + + conduit = callPackage ../development/ocaml-modules/conduit { + lwt = ocaml_lwt; + }; + + biniou = callPackage ../development/ocaml-modules/biniou { }; + + bin_prot_p4 = callPackage ../development/ocaml-modules/bin_prot { }; + + ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + + ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; + + cil = callPackage ../development/ocaml-modules/cil { }; + + cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; + + cohttp = callPackage ../development/ocaml-modules/cohttp { + lwt = ocaml_lwt; + }; + + config-file = callPackage ../development/ocaml-modules/config-file { }; + + containers = callPackage ../development/ocaml-modules/containers { }; + + cpdf = callPackage ../development/ocaml-modules/cpdf { }; + + cppo = callPackage ../development/tools/ocaml/cppo { }; + + cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + + cstruct = callPackage ../development/ocaml-modules/cstruct { + lwt = ocaml_lwt; + }; + + csv = callPackage ../development/ocaml-modules/csv { }; + + custom_printf = callPackage ../development/ocaml-modules/custom_printf { }; + + ctypes = callPackage ../development/ocaml-modules/ctypes { }; + + dolog = callPackage ../development/ocaml-modules/dolog { }; + + easy-format = callPackage ../development/ocaml-modules/easy-format { }; + + eff = callPackage ../development/interpreters/eff { }; + + eliom = callPackage ../development/ocaml-modules/eliom { }; + + enumerate = callPackage ../development/ocaml-modules/enumerate { }; + + erm_xml = callPackage ../development/ocaml-modules/erm_xml { }; + + erm_xmpp = callPackage ../development/ocaml-modules/erm_xmpp { }; + + estring = callPackage ../development/ocaml-modules/estring { }; + + ezjsonm = callPackage ../development/ocaml-modules/ezjsonm { + lwt = ocaml_lwt; + }; + + faillib = callPackage ../development/ocaml-modules/faillib { }; + + fieldslib_p4 = callPackage ../development/ocaml-modules/fieldslib { }; + + fileutils = callPackage ../development/ocaml-modules/fileutils { }; + + findlib = callPackage ../development/tools/ocaml/findlib { }; + + fix = callPackage ../development/ocaml-modules/fix { }; + + fontconfig = callPackage ../development/ocaml-modules/fontconfig { + inherit (pkgs) fontconfig; + }; + + functory = callPackage ../development/ocaml-modules/functory { }; + + gen = callPackage ../development/ocaml-modules/gen { }; + + herelib = callPackage ../development/ocaml-modules/herelib { }; + + io-page = callPackage ../development/ocaml-modules/io-page { }; + + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; + + iso8601 = callPackage ../development/ocaml-modules/iso8601 { }; + + javalib = callPackage ../development/ocaml-modules/javalib { + extlib = ocaml_extlib_maximal; + }; + + dypgen = callPackage ../development/ocaml-modules/dypgen { }; + + gapi_ocaml = callPackage ../development/ocaml-modules/gapi-ocaml { }; + + gg = callPackage ../development/ocaml-modules/gg { }; + + gmetadom = callPackage ../development/ocaml-modules/gmetadom { }; + + gtktop = callPackage ../development/ocaml-modules/gtktop { }; + + hex = callPackage ../development/ocaml-modules/hex { }; + + jingoo = callPackage ../development/ocaml-modules/jingoo { + batteries = ocaml_batteries; + pcre = ocaml_pcre; + }; + + js_of_ocaml = callPackage ../development/tools/ocaml/js_of_ocaml { }; + + jsonm = callPackage ../development/ocaml-modules/jsonm { }; + + lablgl = callPackage ../development/ocaml-modules/lablgl { }; + + lablgtk_2_14 = callPackage ../development/ocaml-modules/lablgtk/2.14.0.nix { + inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; + }; + lablgtk = callPackage ../development/ocaml-modules/lablgtk { + inherit (pkgs.gnome2) libgnomecanvas libglade gtksourceview; + }; + + lablgtk-extras = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/lablgtk-extras { } + else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; + + lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { + gtkmathview = callPackage ../development/libraries/gtkmathview { }; + }; + + lambdaTerm-1_6 = callPackage ../development/ocaml-modules/lambda-term/1.6.nix { }; + lambdaTerm = + if lib.versionOlder "4.01" ocaml.version + then callPackage ../development/ocaml-modules/lambda-term { } + else lambdaTerm-1_6; + + llvm = callPackage ../development/ocaml-modules/llvm { + llvm = pkgs.llvm_37; + }; + + macaque = callPackage ../development/ocaml-modules/macaque { }; + + magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; + + magick = callPackage ../development/ocaml-modules/magick { }; + + markup = callPackage ../development/ocaml-modules/markup { lwt = ocaml_lwt; }; + + menhir = callPackage ../development/ocaml-modules/menhir { }; + + merlin = callPackage ../development/tools/ocaml/merlin { }; + + mezzo = callPackage ../development/compilers/mezzo { }; + + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; + + nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + + ocaml_batteries = callPackage ../development/ocaml-modules/batteries { }; + + comparelib = callPackage ../development/ocaml-modules/comparelib { }; + + core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { }; + + core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; + + core_p4 = callPackage ../development/ocaml-modules/core { }; + + ocamlbuild = + if lib.versionOlder "4.03" ocaml.version then + callPackage ../development/tools/ocaml/ocamlbuild { } + else + null; + + ocaml_cryptgps = callPackage ../development/ocaml-modules/cryptgps { }; + + ocaml_data_notation = callPackage ../development/ocaml-modules/odn { }; + + ocaml_expat = callPackage ../development/ocaml-modules/expat { }; + + frontc = callPackage ../development/ocaml-modules/frontc { }; + + ocamlfuse = callPackage ../development/ocaml-modules/ocamlfuse { }; + + ocamlgraph = callPackage ../development/ocaml-modules/ocamlgraph { }; + + ocaml_http = callPackage ../development/ocaml-modules/http { }; + + ocamlify = callPackage ../development/tools/ocaml/ocamlify { }; + + ocaml_lwt = callPackage ../development/ocaml-modules/lwt { }; + + ocamlmod = callPackage ../development/tools/ocaml/ocamlmod { }; + + ocaml_mysql = callPackage ../development/ocaml-modules/mysql { }; + + ocamlnet = callPackage ../development/ocaml-modules/ocamlnet { }; + + ocaml_oasis = callPackage ../development/tools/ocaml/oasis { }; + ocaml_oasis_46 = callPackage ../development/tools/ocaml/oasis/0.4.6.nix { }; + + ocaml_optcomp = callPackage ../development/ocaml-modules/optcomp { }; + + ocaml_pcre = callPackage ../development/ocaml-modules/pcre {}; + + pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; + + ocaml_react = callPackage ../development/ocaml-modules/react { }; + reactivedata = callPackage ../development/ocaml-modules/reactivedata {}; + + ocamlscript = callPackage ../development/tools/ocaml/ocamlscript { }; + + ocamlsdl= callPackage ../development/ocaml-modules/ocamlsdl { }; + + ocaml_sqlite3 = callPackage ../development/ocaml-modules/sqlite3 { }; + + ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; + + ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; + + ocpBuild = callPackage ../development/tools/ocaml/ocp-build { }; + + ocpIndent = callPackage ../development/tools/ocaml/ocp-indent { }; + + ocp-index = callPackage ../development/tools/ocaml/ocp-index { }; + + ocplib-endian = callPackage ../development/ocaml-modules/ocplib-endian { }; + + ocsigen_server = callPackage ../development/ocaml-modules/ocsigen-server { }; + + ojquery = callPackage ../development/ocaml-modules/ojquery { }; + + otfm = callPackage ../development/ocaml-modules/otfm { }; + + ounit = callPackage ../development/ocaml-modules/ounit { }; + + piqi = callPackage ../development/ocaml-modules/piqi { }; + piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + + re2_p4 = callPackage ../development/ocaml-modules/re2 { }; + + result = callPackage ../development/ocaml-modules/ocaml-result { }; + + sequence = callPackage ../development/ocaml-modules/sequence { }; + + sqlexpr = callPackage ../development/ocaml-modules/sqlexpr { }; + + tuntap = callPackage ../development/ocaml-modules/tuntap { }; + + tyxml = callPackage ../development/ocaml-modules/tyxml { }; + + ulex = callPackage ../development/ocaml-modules/ulex { }; + + ulex08 = callPackage ../development/ocaml-modules/ulex/0.8 { + camlp5 = camlp5_transitional; + }; + + textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; + + type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; + type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; + type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; + type_conv = + if lib.versionOlder "4.02" ocaml.version + then type_conv_112_01_01 + else if lib.versionOlder "4.00" ocaml.version + then type_conv_109_60_01 + else if lib.versionOlder "3.12" ocaml.version + then type_conv_108_08_00 + else null; + + sexplib_108_08_00 = callPackage ../development/ocaml-modules/sexplib/108.08.00.nix { }; + sexplib_111_25_00 = callPackage ../development/ocaml-modules/sexplib/111.25.00.nix { }; + sexplib_112_24_01 = callPackage ../development/ocaml-modules/sexplib/112.24.01.nix { }; + + sexplib_p4 = + if lib.versionOlder "4.02" ocaml.version + then sexplib_112_24_01 + else if lib.versionOlder "4.00" ocaml.version + then sexplib_111_25_00 + else if lib.versionOlder "3.12" ocaml.version + then sexplib_108_08_00 + else null; + + ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; + ocaml_extlib_maximal = callPackage ../development/ocaml-modules/extlib { + minimal = false; + }; + + ocurl = callPackage ../development/ocaml-modules/ocurl { }; + + pa_ounit = callPackage ../development/ocaml-modules/pa_ounit { }; + + pa_bench = callPackage ../development/ocaml-modules/pa_bench { }; + + pa_test = callPackage ../development/ocaml-modules/pa_test { }; + + pipebang = callPackage ../development/ocaml-modules/pipebang { }; + + pprint = callPackage ../development/ocaml-modules/pprint { }; + + ppx_blob = + if lib.versionAtLeast ocaml.version "4.02" + then callPackage ../development/ocaml-modules/ppx_blob {} + else null; + + ppx_deriving = + if lib.versionAtLeast ocaml.version "4.02" + then callPackage ../development/ocaml-modules/ppx_deriving {} + else null; + + ppx_tools = + if lib.versionAtLeast ocaml.version "4.02" + then callPackage ../development/ocaml-modules/ppx_tools {} + else null; + + pycaml = callPackage ../development/ocaml-modules/pycaml { }; + + qcheck = callPackage ../development/ocaml-modules/qcheck { + oasis = ocaml_oasis; + }; + + qtest = callPackage ../development/ocaml-modules/qtest { }; + + re = callPackage ../development/ocaml-modules/re { }; + + safepass = callPackage ../development/ocaml-modules/safepass { }; + + sqlite3EZ = callPackage ../development/ocaml-modules/sqlite3EZ { }; + + stringext = callPackage ../development/ocaml-modules/stringext { }; + + topkg = callPackage ../development/ocaml-modules/topkg { }; + + tsdl = callPackage ../development/ocaml-modules/tsdl { }; + + twt = callPackage ../development/ocaml-modules/twt { }; + + typerep_p4 = callPackage ../development/ocaml-modules/typerep { }; + + utop = callPackage ../development/tools/ocaml/utop { }; + + uuidm = callPackage ../development/ocaml-modules/uuidm { }; + + sawja = callPackage ../development/ocaml-modules/sawja { }; + + uucd = callPackage ../development/ocaml-modules/uucd { }; + uucp = callPackage ../development/ocaml-modules/uucp { }; + uunf = callPackage ../development/ocaml-modules/uunf { }; + + uri = callPackage ../development/ocaml-modules/uri { }; + + uuseg = callPackage ../development/ocaml-modules/uuseg { }; + uutf = callPackage ../development/ocaml-modules/uutf { }; + + variantslib_p4 = callPackage ../development/ocaml-modules/variantslib { }; + + vg = callPackage ../development/ocaml-modules/vg { }; + + x509 = callPackage ../development/ocaml-modules/x509 { }; + + xmlm = callPackage ../development/ocaml-modules/xmlm { }; + + xml-light = callPackage ../development/ocaml-modules/xml-light { }; + + yojson = callPackage ../development/ocaml-modules/yojson { }; + + zarith = callPackage ../development/ocaml-modules/zarith { }; + + zed = callPackage ../development/ocaml-modules/zed { }; + + ocsigen_deriving = callPackage ../development/ocaml-modules/ocsigen-deriving { + oasis = ocaml_oasis; + }; + + # Jane Street + js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {}; + + buildOcamlJane = callPackage ../development/ocaml-modules/janestreet/buildOcamlJane.nix {}; + + ppx_core = callPackage ../development/ocaml-modules/janestreet/ppx-core.nix {}; + + ppx_optcomp = callPackage ../development/ocaml-modules/janestreet/ppx-optcomp.nix {}; + + ppx_driver = callPackage ../development/ocaml-modules/janestreet/ppx-driver.nix {}; + + ppx_type_conv = callPackage ../development/ocaml-modules/janestreet/ppx-type-conv.nix {}; + + ppx_compare = callPackage ../development/ocaml-modules/janestreet/ppx-compare.nix {}; + + ppx_here = callPackage ../development/ocaml-modules/janestreet/ppx-here.nix {}; + + ppx_sexp_conv = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-conv.nix {}; + + ppx_assert = callPackage ../development/ocaml-modules/janestreet/ppx-assert.nix {}; + + ppx_inline_test = callPackage ../development/ocaml-modules/janestreet/ppx-inline-test.nix {}; + + ppx_bench = callPackage ../development/ocaml-modules/janestreet/ppx-bench.nix {}; + + ppx_bin_prot = callPackage ../development/ocaml-modules/janestreet/ppx-bin-prot.nix {}; + + ppx_custom_printf = callPackage ../development/ocaml-modules/janestreet/ppx-custom-printf.nix {}; + + ppx_enumerate = callPackage ../development/ocaml-modules/janestreet/ppx-enumerate.nix {}; + + ppx_fail = callPackage ../development/ocaml-modules/janestreet/ppx-fail.nix {}; + + ppx_fields_conv = callPackage ../development/ocaml-modules/janestreet/ppx-fields-conv.nix {}; + + ppx_let = callPackage ../development/ocaml-modules/janestreet/ppx-let.nix {}; + + ppx_pipebang = callPackage ../development/ocaml-modules/janestreet/ppx-pipebang.nix {}; + + ppx_sexp_message = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-message.nix {}; + + ppx_sexp_value = callPackage ../development/ocaml-modules/janestreet/ppx-sexp-value.nix {}; + + ppx_typerep_conv = callPackage ../development/ocaml-modules/janestreet/ppx-typerep-conv.nix {}; + + ppx_variants_conv = callPackage ../development/ocaml-modules/janestreet/ppx-variants-conv.nix {}; + + ppx_expect = callPackage ../development/ocaml-modules/janestreet/ppx-expect.nix {}; + + ppx_jane = callPackage ../development/ocaml-modules/janestreet/ppx-jane.nix {}; + + + # Core sublibs + typerep = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/typerep.nix {} + else typerep_p4; + + fieldslib = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/fieldslib.nix {} + else fieldslib_p4; + + sexplib = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/sexplib.nix {} + else sexplib_p4; + + variantslib = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/variantslib.nix {} + else variantslib_p4; + + bin_prot = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/bin_prot.nix {} + else bin_prot_p4; + + core_kernel = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/core_kernel.nix {} + else core_kernel_p4; + + core = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/core.nix {} + else core_p4; + + re2 = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/re2.nix {} + else re2_p4; + + textutils = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} + else textutils_p4; + + core_extended = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} + else core_extended_p4; + + async_kernel = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/async-kernel.nix {} + else async_kernel_p4; + + async_rpc_kernel = callPackage ../development/ocaml-modules/janestreet/async-rpc-kernel.nix {}; + + async_unix = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} + else async_unix_p4; + + async_extra = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} + else async_extra_p4; + + async = + if lib.versionOlder "4.02" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/async.nix {} + else async_p4; + + # Apps / from all-packages + + wyrd = callPackage ../tools/misc/wyrd { }; + + compcert = callPackage ../development/compilers/compcert (( + if system == "x86_64-linux" + then { tools = pkgs.pkgsi686Linux.stdenv.cc; } + else {} + ) // { + coq = coq_8_5; + }); + + haxe = callPackage ../development/compilers/haxe { }; + + ocaml-top = callPackage ../development/tools/ocaml/ocaml-top { }; + + opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; + opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; + opam = callPackage ../development/tools/ocaml/opam { }; + + ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; + + trv = callPackage ../development/tools/misc/trv { }; + + omake = callPackage ../development/tools/ocaml/omake { }; + omake_rc1 = callPackage ../development/tools/ocaml/omake/0.9.8.6-rc1.nix { }; + + verasco = callPackage ../development/tools/analysis/verasco ( + if system == "x86_64-linux" + then { tools = pkgs.pkgsi686Linux.stdenv.cc; } + else {} + ); + + glsurf = callPackage ../applications/science/math/glsurf { + libpng = pkgs.libpng12; + giflib = pkgs.giflib_4_1; + camlimages = camlimages_4_0; + }; + + google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { }; + + llpp = callPackage ../applications/misc/llpp { }; + + monotoneViz = callPackage ../applications/version-management/monotone-viz { + inherit (pkgs.gnome2) libgnomecanvas glib; + }; + + unison = callPackage ../applications/networking/sync/unison { + enableX11 = config.unison.enableX11 or true; + }; + + coq = callPackage ../applications/science/logic/coq { + camlp5 = camlp5_transitional; + }; + + coq_HEAD = callPackage ../applications/science/logic/coq/HEAD.nix { + camlp5 = camlp5_transitional; + }; + + coq_8_5 = callPackage ../applications/science/logic/coq/8.5.nix { + camlp5 = camlp5_transitional; + }; + + coq_8_3 = callPackage ../applications/science/logic/coq/8.3.nix { + make = pkgs.gnumake3; + camlp5 = camlp5_transitional; + lablgtk = lablgtk_2_14; + }; + + hol_light = callPackage ../applications/science/logic/hol_light { + camlp5 = camlp5_strict; + }; + + matita = callPackage ../applications/science/logic/matita { + ulex08 = ulex08.override { camlp5 = camlp5_old_transitional; }; + }; + + matita_130312 = callPackage ../applications/science/logic/matita/130312.nix { }; + + ott = callPackage ../applications/science/logic/ott { + camlp5 = camlp5_transitional; + }; + + prooftree = callPackage ../applications/science/logic/prooftree { + camlp5 = camlp5_transitional; + }; + }; + in lib.fix' (lib.extends overrides packageSet); +in rec +{ + ocamlPackages_3_08_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.08.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); + + ocamlPackages_3_10_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.10.0.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); + + ocamlPackages_3_11_2 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.11.2.nix { }) (self: super: { lablgtk = self.lablgtk_2_14; }); + + ocamlPackages_3_12_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/3.12.1.nix { }) (self: super: { camlimages = self.camlimages_4_0; }); + + ocamlPackages_4_00_1 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.00.1.nix { }) (self: super: { }); + + ocamlPackages_4_01_0 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.01.0.nix { }) (self: super: { }); + + ocamlPackages_4_02 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.02.nix { }) (self: super: { }); + + ocamlPackages_4_03 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.03.nix { }) (self: super: { }); + + ocamlPackages_latest = ocamlPackages_4_03; + + ocamlPackages = ocamlPackages_4_01_0; +} diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8b04e1ea06a..d7b0108ce69 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -32,7 +32,7 @@ let self = _self // overrides; _self = with self; { }; outputs = ["out" "doc"]; # use gnused so that the preCheck command passes - buildInputs = stdenv.lib.optional stdenv.isDarwin [ gnused ]; + buildInputs = stdenv.lib.optional stdenv.isDarwin gnused; propagatedBuildInputs = [ FileNext ]; meta = with stdenv.lib; { description = "A grep-like tool tailored to working with large trees of source code"; @@ -130,6 +130,31 @@ let self = _self // overrides; _self = with self; { }; }; + AnyEventCacheDNS = buildPerlModule rec { + name = "AnyEvent-CacheDNS-0.08"; + src = fetchurl { + url = "mirror://cpan/authors/id/P/PO/POTYL/${name}.tar.gz"; + sha256 = "41c1faf183b61806b55889ceea1237750c1f61b9ce2735fdf33dc05536712dae"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ AnyEvent ]; + doCheck = false; # does an DNS lookup + meta = { + homepage = http://github.com/potyl/perl-AnyEvent-CacheDNS; + description = "Simple DNS resolver with caching"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + AnyEventHTTP = buildPerlPackage rec { + name = "AnyEvent-HTTP-2.23"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + sha256 = "2e3376d03bfa5f172f43d4c615ba496281c9ffe3093a828c539683e17e2fbbcb"; + }; + propagatedBuildInputs = [ AnyEvent CommonSense ]; + }; + AnyEventI3 = buildPerlPackage rec { name = "AnyEvent-I3-0.16"; src = fetchurl { @@ -481,13 +506,11 @@ let self = _self // overrides; _self = with self; { }; }; - autobox = pkgs.perlPackages.Autobox; - - Autobox = buildPerlPackage rec { - name = "autobox-2.83"; + autobox = buildPerlPackage rec { + name = "autobox-2.84"; src = fetchurl { url = "mirror://cpan/authors/id/C/CH/CHOCOLATE/${name}.tar.gz"; - sha256 = "1i493ss5nr0hp3wncn0s31gyka4r09wx65b8g2f8av2nm4zs70rz"; + sha256 = "98dd2754f226684a72ccba3a95956b7eaff2871568e4dd9746e6fb6daae0b96b"; }; propagatedBuildInputs = [ ScopeGuard ]; meta = { @@ -496,6 +519,8 @@ let self = _self // overrides; _self = with self; { }; }; + Autobox = self.autobox; + Autodia = buildPerlPackage rec { name = "Autodia-2.14"; src = fetchurl { @@ -2733,15 +2758,16 @@ let self = _self // overrides; _self = with self; { }; CryptX = buildPerlPackage rec { - name = "CryptX-0.038"; + name = "CryptX-0.040"; src = fetchurl { url = "mirror://cpan/authors/id/M/MI/MIK/${name}.tar.gz"; - sha256 = "f98d4ee3bfd0a985077912501b32777c551f0782aa050b4dfbcb3d654e303eb8"; + sha256 = "0e1e44811e951fa04971912a8b03cf41de540d8cf8d464c5655aaf3bf976db50"; }; propagatedBuildInputs = [ JSONMaybeXS ]; meta = { description = "Crypto toolkit"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.rycee ]; }; }; @@ -3578,11 +3604,11 @@ let self = _self // overrides; _self = with self; { DBIxClass = buildPerlPackage rec { name = "DBIx-Class-0.082840"; - # UPGRADE Note: Please remove workaround in DBDSQLite above src = fetchurl { url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; sha256 = "4049afd175e315ebcab945b19030aec40bcec46cc5611b0286a5a267ca7181ef"; }; + patches = [ ../development/perl-modules/dbiclassx-fix.patch ]; # Remove after next release buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ]; propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName TryTiny namespaceclean ]; meta = { @@ -6583,6 +6609,14 @@ let self = _self // overrides; _self = with self; { }; }; + IOMultiplex = buildPerlPackage { + name = "IO-Multiplex-1.16"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BB/BBB/IO-Multiplex-1.16.tar.gz; + sha256 = "74d22c44b5ad2e7190e2786e8a17d74bbf4cef89b4d1157ba33598b5a2720dad"; + }; + }; + IOPager = buildPerlPackage { name = "IO-Pager-0.06"; src = fetchurl { @@ -9359,23 +9393,18 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DBI DBDSQLite ]; }; - NetAmazonS3 = buildPerlPackage { - name = "Net-Amazon-S3-0.60"; + NetAmazonS3 = buildPerlPackage rec { + name = "Net-Amazon-S3-0.80"; src = fetchurl { - url = mirror://cpan/authors/id/P/PF/PFIG/Net-Amazon-S3-0.60.tar.gz; - sha256 = "628937132268e501fb82410f96636e01b183423ea133b6c362894da109d6ac81"; + url = "mirror://cpan/authors/id/R/RC/RCONOVER/${name}.tar.gz"; + sha256 = "efb73dd9a96078742cb8564f7b58f5abe5168277342c7634961d63b4ef278848"; }; buildInputs = [ LWP TestException ]; - propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI XMLLibXML JSON ]; - # See https://github.com/pfig/net-amazon-s3/pull/25 - patches = - [ ../development/perl-modules/net-amazon-s3-credentials-provider.patch - ../development/perl-modules/net-amazon-s3-moose-warning.patch - ]; + propagatedBuildInputs = [ DataStreamBulk DateTimeFormatHTTP DigestHMAC DigestMD5File FileFindRule HTTPDate HTTPMessage LWPUserAgentDetermined MIMETypes Moose MooseXStrictConstructor MooseXTypesDateTimeMoreCoercions PathClass RegexpCommon TermEncoding TermProgressBarSimple URI VMEC2SecurityCredentialCache XMLLibXML ]; meta = { + homepage = http://search.cpan.org/dist/Net-Amazon-S3/; description = "Use the Amazon S3 - Simple Storage Service"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; }; }; @@ -9472,10 +9501,10 @@ let self = _self // overrides; _self = with self; { }; NetDomainTLD = buildPerlPackage rec { - name = "Net-Domain-TLD-1.74"; + name = "Net-Domain-TLD-1.75"; src = fetchurl { url = "mirror://cpan/authors/id/A/AL/ALEXP/${name}.tar.gz"; - sha256 = "bf936cc20834d5b9497e33dc41c2da6a58536b7a1e0df0b8f6ce7ed5111ca868"; + sha256 = "4c37f811184d68ac4179d48c10ea31922dd5fca2c1bffcdcd95c5a2a3b4002ee"; }; meta = { description = "Work with TLD names"; @@ -9618,7 +9647,7 @@ let self = _self // overrides; _self = with self; { ''; meta = { description = "Perl extension for using OpenSSL"; - license = "SSLeay"; + license = stdenv.lib.licenses.artistic2; }; }; @@ -9642,7 +9671,7 @@ let self = _self // overrides; _self = with self; { }; meta = { description = "Interact with TELNET port or other TCP ports"; - license = "unknown"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9671,10 +9700,14 @@ let self = _self // overrides; _self = with self; { }; NumberFormat = buildPerlPackage rec { - name = "Number-Format-1.73"; + name = "Number-Format-1.75"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Number/${name}.tar.gz"; - sha256 = "0v74hscnc807kf65x0am0rddk74nz7nfk3gf16yr5ar1xwibg8l4"; + url = "mirror://cpan/authors/id/W/WR/WRW/${name}.tar.gz"; + sha256 = "82d659cb16461764fd44d11a9ce9e6a4f5e8767dc1069eb03467c6e55de257f3"; + }; + meta = { + description = "Perl extension for formatting numbers"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9711,6 +9744,10 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/A/AD/ADAMK/Object-Signature-1.07.tar.gz; sha256 = "0c8l7195bjvx0v6zmkgdnxvwg7yj2zq8hi7xd25a3iikd12dc4f6"; }; + meta = { + description = "Generate cryptographic signatures for objects"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; }; # For backwards compatibility. Please use OLEStorage_Lite instead. @@ -9781,15 +9818,15 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CGI NetOpenIDCommon JSON LWP ]; }; - NetOpenSSH = buildPerlPackage { - name = "Net-OpenSSH-0.70"; + NetOpenSSH = buildPerlPackage rec { + name = "Net-OpenSSH-0.73"; src = fetchurl { - url = mirror://cpan/authors/id/S/SA/SALVA/Net-OpenSSH-0.70.tar.gz; - sha256 = "3fcb36a5a2fc296c1d0def54f3201cecffe7d81157ef5fa2bac9868875f63b95"; + url = "mirror://cpan/authors/id/S/SA/SALVA/${name}.tar.gz"; + sha256 = "f45a54b3c6015d4dc44cbff9f9be57bc9d54dfb104fb38bcf3c4eb04789582d9"; }; meta = { description = "Perl SSH client package implemented on top of OpenSSH"; - license = "perl"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -9972,6 +10009,14 @@ let self = _self // overrides; _self = with self; { }; }; + ParseSyslog = buildPerlPackage { + name = "Parse-Syslog-1.10"; + src = fetchurl { + url = mirror://cpan/authors/id/D/DS/DSCHWEI/Parse-Syslog-1.10.tar.gz; + sha256 = "659a2145441ef36d9835decaf83da308fcd03f49138cb3d90928e8bfc9f139d9"; + }; + }; + PathClass = buildPerlPackage { name = "Path-Class-0.33"; src = fetchurl { @@ -10505,16 +10550,16 @@ let self = _self // overrides; _self = with self; { }; }; - PodElemental = buildPerlPackage { - name = "Pod-Elemental-0.103000"; + PodElemental = buildPerlPackage rec { + name = "Pod-Elemental-0.103004"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Pod-Elemental-0.103000.tar.gz; - sha256 = "0ykf49n6ysm7ab5zwm8a009zzrzsnhxw94a9jvbq80yywzhnm847"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "43625cde7241fb174ad9c7eb45387fba410dc141d7de2323855eeab3590072c9"; }; buildInputs = [ TestDeep TestDifferences ]; - propagatedBuildInputs = [ MixinLinewise Moose MooseAutobox MooseXTypes PodEventual StringRewritePrefix StringTruncate SubExporter SubExporterForMethods TestDeep TestDifferences namespaceautoclean ]; + propagatedBuildInputs = [ ClassLoad MixinLinewise Moose MooseXTypes PodEventual StringRewritePrefix StringTruncate SubExporter SubExporterForMethods namespaceautoclean ]; meta = { - homepage = https://github.com/rjbs/pod-elemental; + homepage = https://github.com/rjbs/Pod-Elemental; description = "Work with nestable Pod elements"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -10708,13 +10753,13 @@ let self = _self // overrides; _self = with self; { }; PodWeaver = buildPerlPackage rec { - name = "Pod-Weaver-4.013"; + name = "Pod-Weaver-4.014"; src = fetchurl { url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; - sha256 = "5f12c5f11d313294520b0a1ab5c0775ef56e222d9181c8dac520cdc77af309e0"; + sha256 = "5ca76396710e077b91e12ce32de82514d4785c49eb1ad95b9278045d77c260f5"; }; buildInputs = [ PPI SoftwareLicense TestDifferences ]; - propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise Moose PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; + propagatedBuildInputs = [ ConfigMVP ConfigMVPReaderINI DateTime ListMoreUtils LogDispatchouli MixinLinewise ModuleRuntime Moose ParamsUtil PodElemental StringFlogger StringFormatter StringRewritePrefix namespaceautoclean ]; meta = { homepage = https://github.com/rjbs/Pod-Weaver; description = "Weave together a Pod document from an outline"; @@ -11414,6 +11459,14 @@ let self = _self // overrides; _self = with self; { }; }; + StringApprox = buildPerlPackage rec { + name = "String-Approx-3.27"; + src = fetchurl { + url = "mirror://cpan/authors/id/J/JH/JHI/${name}.tar.gz"; + sha256 = "2b8c1acd24fa9681ebba0ccb3c49f16289de1d579af8a0c898ea8f8d1baf5d36"; + }; + }; + StringCamelCase = buildPerlPackage rec { name = "String-CamelCase-0.02"; src = fetchurl { @@ -11460,15 +11513,15 @@ let self = _self // overrides; _self = with self; { }; }; - StringFlogger = buildPerlPackage { - name = "String-Flogger-1.101244"; + StringFlogger = buildPerlPackage rec { + name = "String-Flogger-1.101245"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/String-Flogger-1.101244.tar.gz; - sha256 = "0cx3d85sz1dqjvbczpf9wx0i1b05jwbxcg7lpq5qygdkblq85nzd"; + url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz"; + sha256 = "aa03c08e01f802a358c175c6093c02adf9688659a087a8ddefdc3e9cef72640b"; }; - propagatedBuildInputs = [ JSON ParamsUtil SubExporter ]; + propagatedBuildInputs = [ JSONMaybeXS ParamsUtil SubExporter ]; meta = { - homepage = https://github.com/rjbs/string-flogger; + homepage = https://github.com/rjbs/String-Flogger; description = "String munging for loggers"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; @@ -11686,10 +11739,14 @@ let self = _self // overrides; _self = with self; { }; SubIdentify = buildPerlPackage rec { - name = "Sub-Identify-0.04"; + name = "Sub-Identify-0.12"; src = fetchurl { url = "mirror://cpan/authors/id/R/RG/RGARCIA/${name}.tar.gz"; - sha256 = "16g4dkmb4h5hh15jsq0kvsf3irrlrlqdv7qk6605wh5gjjwbcjxy"; + sha256 = "83bb785a66113b4a966db0a4186fd1dd07987acdacb4502b1e1558f817dde825"; + }; + meta = { + description = "Retrieve names of code references"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; }; @@ -12841,10 +12898,10 @@ let self = _self // overrides; _self = with self; { TestSimple = null; TestSimple13 = buildPerlPackage rec { - name = "Test-Simple-1.302037"; + name = "Test-Simple-1.302056"; src = fetchurl { url = "mirror://cpan/authors/id/E/EX/EXODIST/${name}.tar.gz"; - sha256 = "fbeba16906ef534e2334acad2020941b6705ab98543536900e588e93409f23b8"; + sha256 = "7ba4d821545051f3bc2a6a3308cc43a45f242eec0121a6c85394601785f2e2e8"; }; meta = { description = "Basic utilities for writing tests"; @@ -13507,15 +13564,15 @@ let self = _self // overrides; _self = with self; { }; TestVersion = buildPerlPackage rec { - name = "Test-Version-2.03"; + name = "Test-Version-2.05"; src = fetchurl { url = "mirror://cpan/authors/id/P/PL/PLICEASE/${name}.tar.gz"; - sha256 = "02nbi7iqab1b0ngkiim9kbvnnr9bhi17bq54vm8hn9ridzgbj1vj"; + sha256 = "39c0ec02663da0e56962bdafaef6790cf83d12b4d90e8a4cdc971d57d869d63f"; }; - buildInputs = [ TestException TestRequires TestTester ]; + buildInputs = [ TestException ]; propagatedBuildInputs = [ FileFindRulePerl ]; meta = { - homepage = http://search.cpan.org/dist/Test-Version/; + homepage = https://metacpan.org/dist/Test-Version; description = "Check to see that version's in modules are sane"; license = stdenv.lib.licenses.artistic2; }; @@ -14140,6 +14197,34 @@ let self = _self // overrides; _self = with self; { }; }; + VMEC2 = buildPerlModule rec { + name = "VM-EC2-1.28"; + src = fetchurl { + url = "mirror://cpan/authors/id/L/LD/LDS/${name}.tar.gz"; + sha256 = "b2b6b31745c57431fca0efb9b9d0b8f168d6081755e048fd9d6c4469bd108acd"; + }; + buildInputs = [ ModuleBuild ]; + propagatedBuildInputs = [ AnyEvent AnyEventCacheDNS AnyEventHTTP JSON LWP StringApprox URI XMLSimple ]; + meta = { + description = "Perl interface to Amazon EC2, Virtual Private Cloud, Elastic Load Balancing, Autoscaling, and Relational Database services"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + + VMEC2SecurityCredentialCache = buildPerlPackage rec { + name = "VM-EC2-Security-CredentialCache-0.25"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RC/RCONOVER/${name}.tar.gz"; + sha256 = "fc7e9c152ff2b721ccb221ac40089934775cf58366aedb5cc1693609f840937b"; + }; + propagatedBuildInputs = [ DateTimeFormatISO8601 VMEC2 ]; + meta = { + homepage = http://search.cpan.org/dist/VM-EC2-Security-CredentialCache/; + description = "Cache credentials respecting expiration time for IAM roles"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + W3CLinkChecker = buildPerlPackage rec { name = "W3C-LinkChecker-4.81"; src = fetchurl { @@ -14161,12 +14246,14 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/S/SZ/SZBALINT/${name}.tar.gz"; sha256 = "1fmp9aib1kaps9vhs4dwxn7b15kgnlz9f714bxvqsd1j1q8spzsj"; }; + patches = [ ../development/perl-modules/WWW-Curl-4.17-Skip-preprocessor-symbol-only-CURL_STRICTER.patch ]; buildInputs = [ pkgs.curl ]; preConfigure = '' substituteInPlace Makefile.PL --replace '"cpp"' '"gcc -E"' substituteInPlace Makefile.PL --replace '_LASTENTRY\z' '_LASTENTRY\z|CURL_DID_MEMORY_FUNC_TYPEDEFS\z' ''; + NIX_CFLAGS_COMPILE = "-DCURL_STRICTER"; doCheck = false; # performs network access }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9bebfa3d915..74d4e1707a1 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -23,20 +23,11 @@ let sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd"; }; - imagick = if isPhp7 then imagick34 else imagick31; - - imagick31 = assert !isPhp7; buildPecl { - name = "imagick-3.1.2"; - sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj"; + imagick = buildPecl { + name = "imagick-3.4.3RC1"; + sha256 = "0siyxpszjz6s095s2g2854bhprjq49rf22v6syjiwvndg1pc9fsh"; configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; - buildInputs = [ pkgs.pkgconfig ]; - }; - - imagick34 = buildPecl { - name = "imagick-3.4.0RC4"; - sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i"; - configureFlags = "--with-imagick=${pkgs.imagemagick.dev}"; - buildInputs = [ pkgs.pkgconfig ]; + nativeBuildInputs = [ pkgs.pkgconfig ]; }; # No support for PHP 7 yet diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9573e25ab4..df27eb0221f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -232,8 +232,7 @@ in modules // { pygame-git = callPackage ../development/python-modules/pygame/git.nix { }; - pygobject = callPackage ../development/python-modules/pygobject { }; - + pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { }; pygtk = callPackage ../development/python-modules/pygtk { libglade = null; }; @@ -241,7 +240,7 @@ in modules // { pygtksourceview = callPackage ../development/python-modules/pygtksourceview { }; pyGtkGlade = self.pygtk.override { - libglade = pkgs.gnome.libglade; + libglade = pkgs.gnome2.libglade; }; pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { @@ -291,6 +290,27 @@ in modules // { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + unifi = buildPythonPackage rec { + name = "unifi-1.2.5"; + + propagatedBuildInputs = with self; [ urllib3 ]; + + # upstream has no tests + doCheck = false; + + meta = { + description = "An API towards the Ubiquity Networks UniFi controller"; + homepage = https://pypi.python.org/pypi/unifi/; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + }; + + src = pkgs.fetchurl { + url = "mirror://pypi/u/unifi/${name}.tar.gz"; + sha256 = "0prgx01hzs49prrazgxrinm7ivqzy57ch06qm2h7s1p957sazds8"; + }; + }; + pyunbound = callPackage ../tools/networking/unbound/python.nix { }; # packages defined here @@ -589,6 +609,63 @@ in modules // { }; }; + asgiref = buildPythonPackage rec { + name = "asgiref-${version}"; + version = "0.14.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/asgiref/${name}.tar.gz"; + sha256 = "1ww4z14pd7g2mwz5nyvxm4rif0rsm9h8i0lwk78v58b2j45r43lc"; + }; + + propagatedBuildInputs = with self ; [ six ]; + + meta = { + description = "Reference ASGI adapters and channel layers"; + license = licenses.bsd3; + homepage = https://github.com/django/asgiref; + }; + }; + + asgi_ipc = buildPythonPackage rec { + name = "asgi_ipc-${version}"; + version = "1.1.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz"; + sha256 = "16q5x2cvx3rpnikmqv8l4clkfib8baqy7diy18rsmzj6hqqli3xy"; + }; + + propagatedBuildInputs = with self ; [ asgiref msgpack posix_ipc ]; + + meta = { + description = "Posix IPC-backed ASGI channel layer implementation"; + license = licenses.bsd3; + homepage = http://github.com/django/asgi_ipc/; + }; + }; + + asgi_redis = buildPythonPackage rec { + name = "asgi_redis-${version}"; + version = "0.14.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/asgi_redis/${name}.tar.gz"; + sha256 = "13ixh1nwgla7wm2xa42inwrd3g5lri89gd31xl62zhs8m6jmg122"; + }; + + # Requires a redis server available + doCheck = false; + + propagatedBuildInputs = with self ; [ asgiref asgi_ipc msgpack six redis cryptography ]; + + meta = { + description = "Redis-backed ASGI channel layer implementation"; + license = licenses.bsd3; + homepage = http://github.com/django/asgi_redis/; + }; + }; + python-editor = buildPythonPackage rec { name = "python-editor-${version}"; version = "0.4"; @@ -812,13 +889,13 @@ in modules // { }; ansible2 = buildPythonPackage rec { - version = "2.1.1.0"; + version = "2.1.2.0"; name = "ansible-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "http://releases.ansible.com/ansible/${name}.tar.gz"; - sha256 = "12v7smivjz8d2skk5qxl83nmkxqxypjm8b7ld40sjfwj4g0kkrv1"; + sha256 = "1sr12ryn2dc28009bkfl6f8rp94ychbr9i7wlf6an1bw76ysfdww"; }; prePatch = '' @@ -1083,6 +1160,28 @@ in modules // { }; }; + asn1ate = buildPythonPackage rec { + pname = "asn1ate"; + date = "20160810"; + name = "${pname}-unstable-${date}"; + + src = pkgs.fetchFromGitHub { + sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w"; + rev = "c56104e8912400135509b584d84423ee05a5af6b"; + owner = "kimgr"; + repo = pname; + }; + + propagatedBuildInputs = with self; [ pyparsing ]; + + meta = with stdenv.lib; { + description = "Python library for translating ASN.1 into other forms"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ leenaars ]; + }; +}; + atomiclong = buildPythonPackage rec { version = "0.1.1"; name = "atomiclong-${version}"; @@ -1193,12 +1292,11 @@ in modules // { }); attrs = buildPythonPackage (rec { - pname = "attrs"; - version = "16.0.0"; - name = "attrs-16.0.0"; + name = "attrs-${version}"; + version = "16.2.0"; src = pkgs.fetchurl { url = "mirror://pypi/a/attrs/${name}.tar.gz"; - sha256 = "1g4asv3hbx5aqz7hjzq3q6ss2cpv1rdv66sp5d21cdyjajj2fs6y"; + sha256 = "136f2ec0f94ec77ff2990830feee965d608cab1e8922370e3abdded383d52001"; }; # Mac OS X needs clang for testing @@ -1813,11 +1911,11 @@ in modules // { }); beautifulsoup4 = buildPythonPackage (rec { - name = "beautifulsoup4-4.4.1"; + name = "beautifulsoup4-4.5.1"; src = pkgs.fetchurl { url = "mirror://pypi/b/beautifulsoup4/${name}.tar.gz"; - sha256 = "1d36lc4pfkvl74fmzdib2nqnvknm0jddgf2n9yd7im150qyh3m47"; + sha256 = "1qgmhw65ncsgccjhslgkkszif47q6gvxwqv4mim17agxd81p951w"; }; buildInputs = [ self.nose ]; @@ -1939,7 +2037,7 @@ in modules // { }; propagatedBuildInputs = with stdenv.lib; with pkgs; [ modules.curses zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma self.pycrypto ] - ++ optional visualizationSupport [ pyqtgraph ]; + ++ optional visualizationSupport pyqtgraph; meta = with stdenv.lib; { homepage = "http://binwalk.org"; @@ -1980,14 +2078,43 @@ in modules // { }; }; + biopython = buildPythonPackage rec { + name = "biopython-${version}"; + version = "1.68"; + + src = pkgs.fetchurl { + url = "mirror://pypi/b/biopython/${name}.tar.gz"; + sha256 = "07qc7nz0k77y8hf8s18rscvibvm91zw0kkq7ylrhisf8vp8hkp6i"; + }; + + propagatedBuildInputs = with self; [ numpy ]; + # Checks try to write to $HOME, which does not work with nix + doCheck = false; + meta = { + description = "Python library for bioinformatics"; + + longDescription = '' + Biopython is a set of freely available tools for biological computation + written in Python by an international team of developers. It is a + distributed collaborative effort to develop Python libraries and + applications which address the needs of current and future work in + bioinformatics. + ''; + + homepage = http://biopython.org/wiki/Documentation; + maintainers = with maintainers; [ luispedro ]; + }; + }; + bedup = buildPythonPackage rec { - version = "0.10"; + version = "0.10.1"; name = "bedup-${version}"; - src = pkgs.fetchgit { - url = "https://github.com/g2p/bedup.git"; - rev = "598fd4b"; - sha256 = "0cwnifv5mk5rgil0rcibqchz7y8nzpdpi3k2s9wbqcynjl7l49ln"; + src = pkgs.fetchFromGitHub { + owner = "g2p"; + repo = "bedup"; + rev = "v${version}"; + sha256 = "0sp8pmjkxcqq0alianfp41mwq7qj10rk1qy31pjjp9kiph1rn0x6"; }; buildInputs = with self; [ pkgs.btrfs-progs ]; @@ -1996,9 +2123,6 @@ in modules // { disabled = pythonOlder "3.3"; - # No proper test suite. Included tests cannot be run because of relative import - doCheck = false; - meta = { description = "Deduplication for Btrfs"; longDescription = '' @@ -2061,6 +2185,31 @@ in modules // { }; }; + capstone = buildPythonPackage rec { + name = "capstone-3.0.4"; + src = pkgs.fetchurl { + url = "mirror://pypi/c/capstone/${name}.tar.gz"; + sha256 = "945d3b8c3646a1c3914824c416439e2cf2df8969dd722c8979cdcc23b40ad225"; + }; + patches = [ + (pkgs.fetchpatch { + stripLen = 2; + url = "https://patch-diff.githubusercontent.com/raw/aquynh/capstone/pull/783/commits/23fe9f36622573c747e2bab6119ff245437bf276.patch"; + sha256 = "0yizqrdlxqxn16873593kdx2vrr7gvvilhgcf9xy6hr0603d3m5r"; + }) + ]; + postPatch = '' + patchShebangs src/make.sh + ''; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "http://www.capstone-engine.org/"; + license = licenses.bsdOriginal; + description = "Capstone disassembly engine"; + maintainers = with maintainers; [ bennofs ]; + }; + }; + cgroup-utils = buildPythonPackage rec { version = "0.6"; name = "cgroup-utils-${version}"; @@ -2084,6 +2233,27 @@ in modules // { }; }; + channels = buildPythonPackage rec { + name = "channels-${version}"; + version = "0.17.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/c/channels/${name}.tar.gz"; + sha256 = "1a7fzm25sm3qqgxf7j3hml2lkipvf0yapdg4rkk7x3m11zm0xgv9"; + }; + + # Files are missing in the distribution + doCheck = false; + + propagatedBuildInputs = with self ; [ asgiref django daphne ]; + + meta = { + description = "Brings event-driven capabilities to Django with a channel system"; + license = licenses.bsd3; + homepage = https://github.com/django/channels; + }; + }; + circus = buildPythonPackage rec { name = "circus-0.11.1"; @@ -2494,7 +2664,7 @@ in modules // { blaze = buildPythonPackage rec { name = "blaze-${version}"; - version = "0.10.1"; + version = "0.10.2"; src = pkgs.fetchurl { url = "mirror://pypi/b/blaze/${name}.tar.gz"; @@ -2718,11 +2888,11 @@ in modules // { boto = buildPythonPackage rec { name = "boto-${version}"; - version = "2.41.0"; + version = "2.42.0"; src = pkgs.fetchurl { url = "https://github.com/boto/boto/archive/${version}.tar.gz"; - sha256 = "1n33bfbkpijyy6awjq7a8lrw4hw2lmwv5l7j0am6d34gpa8my75l"; + sha256 = "04ywn8xszk57s87jnkv4j1hswc6ra7z811y9lawfvhvnfshrpx5d"; }; checkPhase = '' @@ -3199,18 +3369,26 @@ in modules // { sha256 = "1aqmy3psn12lxgp659d0zsxkirxzy5lnbnzxf9xjq1a93s3qm704"; }; - propagatedBuildInputs = with self; [ - futures - nose - six - sure - pytz - pyyaml - ]; + buildInputs = with self; [ pkgs.libev cython ] ++ optionals doCheck [ scales eventlet twisted mock gevent nose pytz pyyaml sure ]; + + propagatedBuildInputs = with self; [ futures six ]; + + postPatch = '' + sed -i "s/<=1.0.1//" setup.py + ''; + + checkPhase = '' + ${python.interpreter} setup.py gevent_nosetests + ${python.interpreter} setup.py eventlet_nosetests + ''; + + # Could not get tests running + doCheck = false; meta = { homepage = http://datastax.github.io/python-driver/; description = "A Python client driver for Apache Cassandra"; + license = licenses.asl20; }; }; @@ -3868,20 +4046,20 @@ in modules // { }; cookiecutter = buildPythonPackage rec { - version = "1.3.0"; + version = "1.4.0"; name = "cookiecutter-${version}"; - # dependency problems, next release of cookiecutter should unblock these - disabled = isPy3k || isPyPy; + # not sure why this is broken + disabled = isPyPy; src = pkgs.fetchurl { url = "https://github.com/audreyr/cookiecutter/archive/${version}.tar.gz"; - sha256 = "1vchjvh7591nczz2zz55aghk9mhpm6kqgm62d05d4mjrx9xjkdcg"; + sha256 = "1clxnabmc5s4b519r1sxyj1163x833ir8xcypmdfpf6r9kbb35vn"; }; - buildInputs = with self; [ itsdangerous ]; + buildInputs = with self; [ itsdangerous pytest freezegun docutils ]; propagatedBuildInputs = with self; [ - jinja2 future binaryornot click whichcraft ruamel_yaml ]; + jinja2 future binaryornot click whichcraft poyo jinja2_time ]; meta = { homepage = https://github.com/audreyr/cookiecutter; @@ -4040,11 +4218,11 @@ in modules // { cryptography = buildPythonPackage rec { # also bump cryptography_vectors name = "cryptography-${version}"; - version = "1.5"; + version = "1.5.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography/${name}.tar.gz"; - sha256 = "52f47ec9a57676043f88e3ca133638790b6b71e56e8890d9d7f3ae4fcd75fa24"; + sha256 = "1d8da8xbx51m4dqpy51crvcmjakmfcxpx14hh2izppifrh1fs35d"; }; buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors @@ -4061,11 +4239,11 @@ in modules // { cryptography_vectors = buildPythonPackage rec { # also bump cryptography name = "cryptography_vectors-${version}"; - version = "1.5"; + version = "1.5.1"; src = pkgs.fetchurl { url = "mirror://pypi/c/cryptography-vectors/${name}.tar.gz"; - sha256 = "ad19a2b98a475785c3b2ec8a8c9c974e0c48d00db0c23e79d776a2c489ad812d"; + sha256 = "1z74mqwlvxlxz6b1xlflphqhgby1k77shl94zw5ncw3x3cqwbccl"; }; }; @@ -4262,11 +4440,11 @@ in modules // { mahotas = buildPythonPackage rec { name = "python-mahotas-${version}"; - version = "1.4.1"; + version = "1.4.2"; src = pkgs.fetchurl { - url = "https://github.com/luispedro/mahotas/archive/release-${version}.tar.gz"; - sha256 = "a684d339a3a4135f6f7161851161174755e9ea643b856b0bb48abd5515041ab6"; + url = "https://github.com/luispedro/mahotas/archive/v${version}.tar.gz"; + sha256 = "1mvsxh0pa5vdvbknlv1m68n7gw2cv4pyqgqp3r770rnmf6nxbp7m"; }; buildInputs = with self; [ @@ -4283,7 +4461,7 @@ in modules // { meta = with stdenv.lib; { description = "Computer vision package based on numpy"; - homepage = https://readthedocs.org/projects/mahotas/; + homepage = http://mahotas.readthedocs.io/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; platforms = platforms.linux; @@ -4394,15 +4572,23 @@ in modules // { detox = self.buildPythonPackage rec { - name = "detox-0.9.3"; + name = "detox-0.10.0"; + buildInputs = with self; [ pytest ]; propagatedBuildInputs = with self; [ tox py eventlet ]; src = pkgs.fetchurl { - url = "mirror://pypi/d/detox/detox-0.9.3.tar.gz"; - sha256 = "39d48b6758c43ba579f694507d54da96931195eb1b72ad79b46f50af9520b2f3"; + url = "mirror://pypi/d/detox/${name}.tar.gz"; + sha256 = "33b704c2a5657366850072fb2aa839df14dd2e692c0c1c2642c3ac30d5c0baec"; }; + checkPhase = '' + py.test + ''; + + # eventlet timeout, and broken invokation 3.5 + doCheck = false; + meta = { description = "What is detox?"; homepage = http://bitbucket.org/hpk42/detox; @@ -4671,6 +4857,31 @@ in modules // { }; }; + pytest-rerunfailures = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "pytest-rerunfailures"; + version = "2.0.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/${pname}/${name}.tar.gz"; + sha256 = "1zzxlswbny8dp3c1sbhpyms1xkknxb6qfji3y3azc7gc95324xsv"; + }; + + propagatedBuildInputs = with self; [ pytest ]; + + checkPhase = '' + py.test + ''; + + meta = { + description = "pytest plugin to re-run tests to eliminate flaky failures."; + homepage = https://github.com/pytest-dev/pytest-rerunfailures; + license = licenses.mpl20; + maintainers = with maintainers; [ jgeerds ]; + platforms = platforms.all; + }; + }; + pytestflakes = buildPythonPackage rec { name = "pytest-flakes-${version}"; version = "1.0.0"; @@ -5104,16 +5315,16 @@ in modules // { libtmux = buildPythonPackage rec { name = "libtmux-${version}"; - version = "0.5.0"; + version = "0.6.0"; src = pkgs.fetchurl { url = "mirror://pypi/l/libtmux/${name}.tar.gz"; - sha256 = "0fwydaahgflz9w753v1cmkfzrlfq1vb8zp4i20m2d3lvkm4crv93"; + sha256 = "117savw47c2givq9vxr5m02nyxmsk34l2ihxyy5axlaiqyxyf20s"; }; buildInputs = with self; [ pytest ]; patchPhase = '' - sed -i 's/==2.9.1//' requirements/test.txt + sed -i 's/==.*$//' requirements/test.txt ''; meta = with stdenv.lib; { @@ -5333,6 +5544,24 @@ in modules // { }; }); + daphne = buildPythonPackage rec { + name = "daphne-${version}"; + version = "0.15.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/d/daphne/${name}.tar.gz"; + sha256 = "095xdh10v8sqwyas02q72ij3ivd5qjg5ki5cvha0fpzd361izdnp"; + }; + + propagatedBuildInputs = with self; [ asgiref autobahn ]; + + meta = { + description = "Django ASGI (HTTP/WebSocket) server"; + license = licenses.bsd3; + homepage = https://github.com/django/daphne; + }; + }; + dateparser = buildPythonPackage rec { name = "dateparser-${version}"; version = "0.3.2-pre-2016-01-21"; # Fix assert year 2016 == 2015 @@ -5464,11 +5693,11 @@ in modules // { decorator = buildPythonPackage rec { name = "decorator-${version}"; - version = "4.0.9"; + version = "4.0.10"; src = pkgs.fetchurl { url = "mirror://pypi/d/decorator/${name}.tar.gz"; - sha256 = "1a5vwhflfd9sh3rfb40xlyipldgdzfff6brman57hqv3661jw0lh"; + sha256 = "9c6e98edcb33499881b86ede07d9968c81ab7c769e28e9af24075f0a5379f070"; }; meta = { @@ -6026,6 +6255,31 @@ in modules // { }; }; + EditorConfig = buildPythonPackage rec { + name = "EditorConfig-${version}"; + version = "0.12.0"; + + # fetchgit used to ensure test submodule is available + src = pkgs.fetchgit { + url = "https://github.com/editorconfig/editorconfig-core-py"; + rev = "refs/tags/v${version}"; + sha256 = "0svk7id7ncygj2rnxhm7602xizljyidk4xgrl6i0xgq3829cz4bl"; + }; + + buildInputs = [ pkgs.cmake ]; + checkPhase = '' + cmake . + # utf_8_char fails with python3 + ctest -E "utf_8_char" . + ''; + + meta = { + homepage = "http://editorconfig.org"; + description = "EditorConfig File Locator and Interpreter for Python"; + license = stdenv.lib.licenses.psfl; + }; + }; + elasticsearch = buildPythonPackage (rec { name = "elasticsearch-1.9.0"; @@ -6457,7 +6711,7 @@ in modules // { description = "High-level FTP client library (virtual file system and more)"; homepage = https://pypi.python.org/pypi/ftputil; platforms = platforms.linux; - license = licenses.bsd2; # "Modified BSD licence, says pypi" + license = licenses.bsd2; # "Modified BSD license, says pypi" }; }; @@ -6696,7 +6950,7 @@ in modules // { propagatedBuildInputs = with self; [ pkgs.gnutls ]; patchPhase = '' - substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls33.out}/lib" + substituteInPlace gnutls/library/__init__.py --replace "/usr/local/lib" "${pkgs.gnutls.out}/lib" ''; }; @@ -6756,12 +7010,12 @@ in modules // { }; GitPython = buildPythonPackage rec { - version = "2.0.2"; + version = "2.0.8"; name = "GitPython-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/G/GitPython/GitPython-${version}.tar.gz"; - sha256 = "18842123a88rihgh84rmjabmbn3zq1jv0227ypcpsxc5smxzws6i"; + sha256 = "7c03d1130f903aafba6ae5b89ccf8eb433a995cd3120cbb781370e53fc4eb222"; }; buildInputs = with self; [ mock nose ]; @@ -6861,6 +7115,33 @@ in modules // { }; }; + grip = buildPythonPackage rec { + version = "4.3.2"; + name = "grip-${version}"; + + src = pkgs.fetchFromGitHub { + owner = "joeyespo"; + repo = "grip"; + rev = "v${version}"; + sha256 = "05a169sfaj280k7gibbc1rznjn43l5m6l1gpl6a5cmp5r8827khs"; + }; + buildInputs = with self; [ pytest responses ]; + + propagatedBuildInputs = with self; [ docopt flask markdown path-and-address pygments requests2 ]; + + checkPhase = '' + export PATH="$PATH:$out/bin" + py.test -xm "not assumption" + ''; + + meta = with stdenv.lib; { + description = "Preview GitHub Markdown files like Readme locally before committing them"; + homepage = https://github.com/joeyespo/grip; + license = licenses.mit; + maintainers = with maintainers; [ koral ]; + }; + }; + gst-python = callPackage ../development/libraries/gstreamer/python { gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; }; @@ -7032,11 +7313,11 @@ in modules // { imread = buildPythonPackage rec { name = "python-imread-${version}"; - version = "0.5.1"; + version = "0.6"; src = pkgs.fetchurl { url = "https://github.com/luispedro/imread/archive/release-${version}.tar.gz"; - sha256 = "12d7ba3523ba50d67d526e9797e041021dd9cd4acf9567a9bf73c8ae0b689d4a"; + sha256 = "0i14bc67200zhzxc41g5dfp2m0pr1zaa2gv59p2va1xw0ji2dc0f"; }; buildInputs = with self; [ @@ -7051,7 +7332,7 @@ in modules // { meta = with stdenv.lib; { description = "Python package to load images as numpy arrays"; - homepage = https://readthedocs.org/projects/imread/; + homepage = https://imread.readthedocs.io/en/latest/; maintainers = with maintainers; [ luispedro ]; license = licenses.mit; platforms = platforms.linux; @@ -7158,6 +7439,26 @@ in modules // { }; }; + jsbeautifier = buildPythonApplication rec { + name = "jsbeautifier-1.6.4"; + + propagatedBuildInputs = with self; [ six ]; + + buildInputs = with self; [ EditorConfig pytest six ]; + + src = pkgs.fetchurl { + url = "mirror://pypi/j/jsbeautifier/${name}.tar.gz"; + sha256 = "074n8f4ncz5pf0jkkf6i6by30qnaj5208sszaf9p86kgdigcdaf8"; + }; + + meta = { + homepage = "http://jsbeautifier.org"; + description = "JavaScript unobfuscator and beautifier."; + license = stdenv.lib.licenses.mit; + maintainers = with maintainers; [ apeyroux ]; + }; + }; + jug = buildPythonPackage rec { version = "1.2.2"; name = "jug-${version}"; @@ -7196,7 +7497,7 @@ in modules // { meta = { description = "Library to apply JSON Patches according to RFC 6902"; homepage = "https://github.com/stefankoegl/python-json-patch"; - license = stdenv.lib.licenses.bsd2; # "Modified BSD licence, says pypi" + license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi" }; }; @@ -7211,7 +7512,28 @@ in modules // { meta = { description = "Resolve JSON Pointers in Python"; homepage = "https://github.com/stefankoegl/python-json-pointer"; - license = stdenv.lib.licenses.bsd2; # "Modified BSD licence, says pypi" + license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi" + }; + }; + + jsonrpclib = buildPythonPackage rec { + name = "jsonrpclib-${version}"; + version = "0.1.7"; + + disabled = !isPy27; + + src = pkgs.fetchurl { + url = "mirror://pypi/j/jsonrpclib/${name}.tar.gz"; + sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z"; + }; + + propagatedBuildInputs = with self; [ cjson ]; + + meta = { + description = "JSON RPC client library"; + homepage = https://pypi.python.org/pypi/jsonrpclib/; + license = stdenv.lib.licenses.asl20; + maintainers = [ stdenv.lib.maintainers.joachifm ]; }; }; @@ -7272,6 +7594,9 @@ in modules // { }; }; + libsexy = callPackage ../development/python-modules/libsexy { + libsexy = pkgs.libsexy; + }; libthumbor = buildPythonPackage rec { name = "libthumbor-${version}"; @@ -7395,11 +7720,11 @@ in modules // { jupyterlab = buildPythonPackage rec { name = "jupyterlab-${version}"; - version = "0.1.1"; + version = "0.4.1"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyterlab/${name}.tar.gz"; - sha256 = "c1a08f4d1b2bb1bf06db090db30df988a22ffbfa05606e7eb026e364969388da"; + sha256 = "91dc4d7dfb1e6ab97e28d6e3a2fc38f5f65d368201c00fd0ed077519258e67bb"; }; propagatedBuildInputs = with self; [ notebook ]; @@ -7505,17 +7830,19 @@ in modules // { }; python-mapnik = buildPythonPackage { - name = "python-mapnik-fae6388"; + name = "python-mapnik-git-2016-08-30"; - src = pkgs.fetchgit { - url = https://github.com/mapnik/python-mapnik.git; - rev = "fae63881ed0945829e73f711d52740240b740936"; - sha256 = "04k78l0xxb9cy8dbvmgldg8fgzz701gks14199h8zs2xvyi4gqd2"; + src = pkgs.fetchFromGitHub { + owner = "mapnik"; + repo = "python-mapnik"; + rev = "541fd962d4fc99d50ec472af6ddccfdbf98cff37"; + sha256 = "1d93qjnzggdpbhnmxlmk5jh0zd2jnpfl4n4aip5ypd39ilqibhf3"; }; disabled = isPyPy; doCheck = false; # doesn't find needed test data files - buildInputs = with pkgs; [ boost harfbuzz icu mapnik ]; + buildInputs = with pkgs; + [ boost harfbuzz icu libjpeg libpng libtiff libwebp mapnik proj zlib ]; propagatedBuildInputs = with self; [ pillow pycairo ]; meta = with stdenv.lib; { @@ -7817,6 +8144,30 @@ in modules // { }; }; + path-and-address = buildPythonPackage rec { + version = "2.0.1"; + name = "path-and-address-${version}"; + + buildInputs = with self; [ pytest ]; + + checkPhase = "py.test"; + + src = pkgs.fetchFromGitHub { + owner = "joeyespo"; + repo = "path-and-address"; + rev = "v${version}"; + sha256 = "0b0afpsaim06mv3lhbpm8fmawcraggc11jhzr6h72kdj1cqjk5h6"; + }; + + meta = { + description = "Functions for server CLI applications used by humans"; + homepage = https://github.com/joeyespo/path-and-address; + license = licenses.mit; + maintainers = with maintainers; [ koral]; + }; + }; + + pdfminer = buildPythonPackage rec { version = "20140328"; name = "pdfminer-${version}"; @@ -7984,6 +8335,22 @@ in modules // { }; }; + poyo = buildPythonPackage rec { + version = "0.4.0"; + name = "poyo-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/poyo/${name}.tar.gz"; + sha256 = "1f48ffl0j1f2lmgabajps7v8w90ppxbp5168gh8kh27bjd8xk5ca"; + }; + + meta = { + homepage = https://github.com/hackebrot/poyo; + description = "A lightweight YAML Parser for Python"; + license = licenses.mit; + }; + }; + pudb = buildPythonPackage rec { name = "pudb-2013.3.6"; @@ -8075,6 +8442,37 @@ in modules // { inherit pythonOlder; }; + pypoppler = buildPythonPackage rec { + name = "pypoppler-${version}"; + version = "0.12.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pypoppler/${name}.tar.gz"; + sha256 = "47e6ac99e5b114b9abf2d1dd1bca06f22c028d025432512989f659142470810f"; + }; + + NIX_CFLAGS_COMPILE="-I${pkgs.poppler.dev}/include/poppler/"; + buildInputs = [ pkgs.pkgconfig pkgs.poppler.dev ]; + propagatedBuildInputs = with self; [ pycairo pygobject2 ]; + + patches = [ + ../development/python-modules/pypoppler-0.39.0.patch + ../development/python-modules/pypoppler-poppler.c.patch + ]; + + # Not supported. + disabled = isPy3k; + + # No tests in archive + doCheck = false; + + meta = { + homepage = https://code.launchpad.net/~mriedesel/poppler-python/main; + description = "Python bindings for poppler-glib, unofficial branch including bug fixes, and removal of gtk dependencies"; + license = licenses.gpl2; + }; + }; + python-axolotl = buildPythonPackage rec { name = "python-axolotl-${version}"; version = "0.1.7"; @@ -8370,39 +8768,6 @@ in modules // { }; - radicale = buildPythonPackage rec { - name = "radicale-${version}"; - namePrefix = ""; - version = "1.1.1"; - - src = pkgs.fetchurl { - url = "mirror://pypi/R/Radicale/Radicale-${version}.tar.gz"; - sha256 = "1c5lv8qca21mndkx350wxv34qypqh6gb4rhzms4anr642clq3jg2"; - }; - - propagatedBuildInputs = with self; [ - flup - ldap - sqlalchemy - ]; - - doCheck = true; - - meta = { - homepage = http://www.radicale.org/; - description = "CalDAV CardDAV server"; - longDescription = '' - The Radicale Project is a complete CalDAV (calendar) and CardDAV - (contact) server solution. Calendars and address books are available for - both local and remote access, possibly limited through authentication - policies. They can be viewed and edited by calendar and contact clients - on mobile phones or computers. - ''; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ edwtjo pSub ]; - }; - }; - raven = buildPythonPackage rec { name = "raven-3.4.1"; @@ -9137,7 +9502,7 @@ in modules // { }; propagatedBuildInputs = with self; [ - pyGtkGlade pkgs.libtorrentRasterbar_1_09 twisted Mako chardet pyxdg self.pyopenssl modules.curses service-identity + pyGtkGlade pkgs.libtorrentRasterbar_1_0 twisted Mako chardet pyxdg self.pyopenssl modules.curses service-identity ]; nativeBuildInputs = [ pkgs.intltool ]; @@ -9197,12 +9562,12 @@ in modules // { django_1_10 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.10.1"; + version = "1.10.2"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.10/${name}.tar.gz"; - sha256 = "1wr438yykg0m5s9xini36hc826di55jm6by8syplczxnbjrcbrnn"; + sha256 = "1qdwgkwlq5wl0wn247d9gid49xpz4qggk0lcdqxq8d7v1cmg29z1"; }; patches = [ @@ -9229,12 +9594,12 @@ in modules // { django_1_9 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.9.9"; + version = "1.9.10"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz"; - sha256 = "136ypwacj4av6xqmbfp6lhlr0171ws2knv74h0r59ssaaffznh73"; + sha256 = "007w2pshbk1s6gfgp8717fwz01l8mcmd2lkxdgqqgd11bag7qfjv"; }; # patch only $out/bin to avoid problems with starter templates (see #3134) @@ -9253,12 +9618,12 @@ in modules // { django_1_8 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.8.14"; + version = "1.8.15"; disabled = pythonOlder "2.7"; src = pkgs.fetchurl { url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz"; - sha256 = "0ka6slangri68qaf91gl10l9m14f6waj4ncz543rbcpvj25w90jj"; + sha256 = "1kga849ixd6sz6svhv8dysyjr03wphqgl4wjw2yczmc5r4x58gl6"; }; # too complicated to setup @@ -10311,17 +10676,49 @@ in modules // { }; }; + pycodestyle = buildPythonPackage rec { + name = "pycodestyle-${version}"; + version = "2.0.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/pycodestyle/${name}.tar.gz"; + sha256 = "1rz2v8506mdjdyxcnv9ygiw6v0d4dqx8z5sjyjm0w2v32h5l5w1p"; + }; + + meta = { + description = "Python style guide checker (formerly called pep8)"; + homepage = https://pycodestyle.readthedocs.io; + license = licenses.mit; + maintainers = with maintainers; [ garbas ]; + }; + }; + + filebytes = buildPythonPackage rec { + name = "filebytes-0.9.12"; + src = pkgs.fetchurl { + url = "mirror://pypi/f/filebytes/${name}.tar.gz"; + sha256 = "6cd1c4ca823f6541c963a317e55382609789802dedad08209f4d038369e3f0ac"; + }; + propagatedBuildInputs = [ ]; + meta = with pkgs.stdenv.lib; { + homepage = "https://scoding.de/filebytes-introduction"; + license = licenses.gpl2; + description = "Scripts to parse ELF, PE, Mach-O and OAT (Android Runtime)"; + maintainers = with maintainers; [ bennofs ]; + }; + }; + flake8 = buildPythonPackage rec { name = "flake8-${version}"; - version = "2.5.4"; + version = "2.6.2"; src = pkgs.fetchurl { url = "mirror://pypi/f/flake8/${name}.tar.gz"; - sha256 = "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc"; + sha256 = "0y57hzal0j84dh9i1g1g6dc4aywvrnhy2fjmmbglpv5ajihxh713"; }; buildInputs = with self; [ nose mock ]; - propagatedBuildInputs = with self; [ pyflakes pep8 mccabe ]; + propagatedBuildInputs = with self; [ pyflakes pycodestyle mccabe ]; meta = { description = "Code checking using pep8 and pyflakes"; @@ -10331,6 +10728,35 @@ in modules // { }; }; + flake8_3 = buildPythonPackage rec { + name = "flake8-${version}"; + version = "3.0.4"; + + src = pkgs.fetchurl { + url = "mirror://pypi/f/flake8/${name}.tar.gz"; + sha256 = "03cpdrjxh0fyi2qpdxbbrmxw7whiq3xr3p958gr6yzghk34i1hml"; + }; + + buildInputs = with self; [ nose mock pytestrunner pytest ]; + propagatedBuildInputs = with self; [ pyflakes mccabe_0_5 enum34 configparser pycodestyle ]; + + patches = [ + ../development/python-modules/flake8/move-pytest-config-to-pytest-ini.patch + ]; + + # Tests fail due to missing ini file. + preCheck = '' + touch tox.ini + ''; + + meta = { + description = "Code checking using pep8 and pyflakes"; + homepage = http://pypi.python.org/pypi/flake8; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; + }; + flaky = buildPythonPackage rec { name = "flaky-${version}"; version = "3.1.0"; @@ -10754,27 +11180,20 @@ in modules // { }; falcon = buildPythonPackage (rec { - name = "falcon-0.3.0"; + name = "falcon-1.0.0"; src = pkgs.fetchurl { url = "mirror://pypi/f/falcon/${name}.tar.gz"; - sha256 = "10ivzk88m8nn3bqbg6xgv6yfy2dgp6yzbcvr645y93pzlash4xpj"; + sha256 = "ddce23a2dd0abba6d19775e9bf7ba64e184b15a0e7163e65f62af63354193f63"; }; - propagatedBuildInputs = with self; [ coverage ddt nose pyyaml requests2 six testtools python_mimeparse ]; + buildInputs = with self; stdenv.lib.optionals doCheck [coverage ddt nose pyyaml requests2 testtools]; + propagatedBuildInputs = with self; [ six python_mimeparse ]; # The travis build fails since the migration from multiprocessing to threading for hosting the API under test. # OSError: [Errno 98] Address already in use doCheck = false; - # This patch is required if the tests are enabled - # See https://github.com/falconry/falcon/issues/572 - #patches = singleton (pkgs.fetchurl { - # name = "falcon-572.patch"; - # url = "https://github.com/desiderius/falcon/commit/088bd3f2204eb6368acb3a1bf6c6b54c415225c2.patch"; - # sha256 = "19102dlzc4890skmam2v20va2vk5xr56fi4nzibzfvl7vyq68060"; - #}); - meta = { description = "An unladen web framework for building APIs and app backends"; homepage = http://falconframework.org; @@ -10782,7 +11201,24 @@ in modules // { maintainers = with maintainers; [ desiderius ]; }; }); + hug = buildPythonPackage rec { + name = "hug-2.1.2"; + src = pkgs.fetchurl { + url = "mirror://pypi/h/hug/${name}.tar.gz"; + sha256 = "93325e13706594933a9afb0d4f0b0748134494299038f07df41152baf6f89f4c"; + }; + propagatedBuildInputs = with self; [ falcon requests2 ]; + + # tests are not shipped in the tarball + doCheck = false; + + meta = { + description = "A Python framework that makes developing APIs as simple as possible, but no simpler"; + homepage = https://github.com/timothycrosley/hug; + license = licenses.mit; + }; + }; flup = buildPythonPackage (rec { name = "flup-1.0.2"; disabled = isPy3k; @@ -11104,22 +11540,30 @@ in modules // { }; gevent = buildPythonPackage rec { - name = "gevent-1.0.2"; - disabled = isPy3k || isPyPy; # see https://github.com/surfly/gevent/issues/248 + name = "gevent-1.1.2"; src = pkgs.fetchurl { url = "mirror://pypi/g/gevent/${name}.tar.gz"; - sha256 = "0cds7yvwdlqmd590i59vzxaviwxk4js6dkhnmdxb3p1xac7wmq9s"; + sha256 = "cb15cf73d69a2eeefed330858f09634e2c50bf46da9f9e7635730fcfb872c02c"; }; - patchPhase = '' + # Why do we have this patch? + postPatch = '' substituteInPlace libev/ev.c --replace \ "ecb_inline void ecb_unreachable (void) ecb_noreturn" \ "ecb_inline ecb_noreturn void ecb_unreachable (void)" ''; buildInputs = with self; [ pkgs.libev ]; - propagatedBuildInputs = optionals (!isPyPy) [ self.greenlet ]; + propagatedBuildInputs = with self; optionals (!isPyPy) [ greenlet ]; + + checkPhase = '' + cd greentest + ${python.interpreter} testrunner.py + ''; + + # Bunch of failures. + doCheck = false; meta = { description = "Coroutine-based networking library"; @@ -11132,14 +11576,21 @@ in modules // { geventhttpclient = buildPythonPackage rec { name = "geventhttpclient-${version}"; - version = "1.2.0"; + version = "1.3.1"; src = pkgs.fetchurl { url = "mirror://pypi/g/geventhttpclient/${name}.tar.gz"; - sha256 = "0s1qd1qz0zyzksd5h38ynw06d1012h0k7z8522zhb6mzaq4144yz"; + sha256 = "bd87af8854f5fb05738916c8973671f7035568aec69b7c842887d6faf9c0a01d"; }; - propagatedBuildInputs = with self; [ gevent certifi backports_ssl_match_hostname_3_4_0_2 ]; + buildInputs = with self; [ pytest ]; + propagatedBuildInputs = with self; [ gevent certifi six backports_ssl_match_hostname ]; + + # Several tests fail that require network + doCheck = false; + checkPhase = '' + py.test $out + ''; meta = { homepage = http://github.com/gwik/geventhttpclient; @@ -11281,11 +11732,11 @@ in modules // { github3_py = buildPythonPackage rec { name = "github3.py-${version}"; - version = "1.0.0a2"; + version = "1.0.0a4"; src = pkgs.fetchurl { url = "mirror://pypi/g/github3.py/${name}.tar.gz"; - sha256 = "11xvwbzfy04vwbjnpc8wcrjjzghbrbdzffrdfk70v0zdnxqg8hc5"; + sha256 = "0rhnrhb7qc60h82hkd4wnj1jh544yzrf4pjmn4rqacdi59p7f3jp"; }; buildInputs = with self; [ unittest2 pytest mock betamax betamax-matchers ]; @@ -11387,14 +11838,16 @@ in modules // { greenlet = buildPythonPackage rec { name = "greenlet-${version}"; - version = "0.4.7"; + version = "0.4.10"; disabled = isPyPy; # builtin for pypy src = pkgs.fetchurl { - url = "mirror://pypi/g/greenlet/${name}.zip"; - sha256 = "1zlmsygjw69xlq56vz1z5ivzy9bwc7knjaykn2yy2hv4w2j4yb7k"; + url = "mirror://pypi/g/greenlet/${name}.tar.gz"; + sha256 = "c4417624aa88380cdf0fe110a8a6e0dbcc26f80887197fe5df0427dfa348ae62"; }; + propagatedBuildInputs = with self; [ six ]; + # see https://github.com/python-greenlet/greenlet/issues/85 preCheck = '' rm tests/test_leaks.py @@ -11694,18 +12147,18 @@ in modules // { # If you need these, you can just add them to your environment. name = "hypothesis-${version}"; - version = "3.1.0"; + version = "3.5.2"; # Upstream prefers github tarballs src = pkgs.fetchFromGitHub { - owner = "DRMacIver"; + owner = "HypothesisWorks"; repo = "hypothesis"; rev = "${version}"; - sha256 = "1fhdb2vwc4blas5fvcly6pmha8psqm4bhi67jz32ypjryzk09iyf"; + sha256 = "030rf4gn4b0hylr90wazilwa3bc038fcqng0wibcx67mqaq035n4"; }; buildInputs = with self; [ flake8 pytest flaky ]; - propagatedBuildInputs = with self; ([] ++ optionals isPy27 [ enum34 modules.sqlite3 ]); + propagatedBuildInputs = with self; ([ uncompyle6 ] ++ optionals isPy27 [ enum34 modules.sqlite3 ]); # https://github.com/DRMacIver/hypothesis/issues/300 checkPhase = '' @@ -11729,6 +12182,36 @@ in modules // { }; + xdis = buildPythonPackage rec { + name = "xdis-${version}"; + version = "2.3.1"; + src = pkgs.fetchurl { + url = "mirror://pypi/x/xdis/${name}.tar.gz"; + sha256 = "1bi53n9fifjz2ja5inm546vzhjpgwx6n0qrhp106fss7bdm44a4v"; + }; + propagatedBuildInputs = with self; [ nose ]; + meta = { + description = "Python cross-version byte-code disassembler and marshal routines"; + homepage = https://github.com/rocky/python-xdis/; + license = licenses.mit; + }; + }; + + uncompyle6 = buildPythonPackage rec { + name = "uncompyle6-${version}"; + version = "2.8.3"; + src = pkgs.fetchurl { + url = "mirror://pypi/u/uncompyle6/${name}.tar.gz"; + sha256 = "0hx5sji6qjvnq1p0zhvyk5hgracpv2w6iar1j59qwllxv115ffi1"; + }; + propagatedBuildInputs = with self; [ spark_parser xdis ]; + meta = { + description = "Python cross-version byte-code deparser"; + homepage = http://github.com/rocky/python-uncompyle6/; + license = licenses.mit; + }; + }; + lsi = buildPythonPackage rec { name = "lsi-${version}"; version = "0.2.2"; @@ -11953,12 +12436,12 @@ in modules // { }; ipykernel = buildPythonPackage rec { - version = "4.3.1"; + version = "4.5.0"; name = "ipykernel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipykernel/${name}.tar.gz"; - sha256 = "0gycnxzq3nnmh6xlc24n3b4qc28gli0lw4a9yg2yzm74lgmd66c2"; + sha256 = "245a798edb8fd751b95750d8645d736dd739a020e7fc7d5627dac4d1c35d8295"; }; buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; @@ -11983,12 +12466,12 @@ in modules // { }; ipyparallel = buildPythonPackage rec { - version = "5.0.1"; + version = "5.2.0"; name = "ipyparallel-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipyparallel/${name}.tar.gz"; - sha256 = "1cpydbm1k02y5m4grp0c1z5lbgkpp5f4xp3j5v49g9lmd70ikqs8"; + sha256 = "d99e760f1a136b1c402755a4ab51a8d7cb87c892cccadf641948a5e886c8a455"; }; buildInputs = with self; [ nose ]; @@ -12069,16 +12552,16 @@ in modules // { ipywidgets = buildPythonPackage rec { - version = "4.1.1"; + version = "5.2.2"; name = "ipywidgets-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/i/ipywidgets/${name}.tar.gz"; - sha256 = "ceeb325e45ade9537c2d115fed9d522e5c6e90bb161592e2f0807375dc661028"; + sha256 = "baf6098f054dd5eacc2934b8ea3bef908b81ca8660d839f1f940255a72c660d2"; }; buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook]; + propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook widgetsnbextension ]; meta = { description = "IPython HTML widgets for Jupyter"; @@ -12309,6 +12792,23 @@ in modules // { }; }; + jinja2_time = buildPythonPackage rec { + version = "0.2.0"; + name = "jinja2-time-${version}"; + + src = pkgs.fetchurl { + url = "mirror://pypi/j/jinja2-time/${name}.tar.gz"; + sha256 = "0h0dr7cfpjnjj8bgl2vk9063a53649pn37wnlkd8hxjy656slkni"; + }; + + propagatedBuildInputs = with self; [ arrow jinja2 ]; + + meta = { + homepage = https://github.com/hackebrot/jinja2-time; + description = "Jinja2 Extension for Dates and Times"; + license = licenses.mit; + }; + }; jmespath = buildPythonPackage rec { name = "jmespath-0.7.1"; @@ -12355,12 +12855,12 @@ in modules // { }; jupyter_client = buildPythonPackage rec { - version = "4.3.0"; + version = "4.4.0"; name = "jupyter_client-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_client/${name}.tar.gz"; - sha256 = "70b2e88403835a1d54b83858783d9e5e5771fa4bb6f6904e0b5bb8cfde4b99dd"; + sha256 = "c99a52fac2e5b7a3b714e9252ebf72cbf97536d556ae2b5082baccc3e5cd52ee"; }; buildInputs = with self; [ nose ]; @@ -12382,12 +12882,12 @@ in modules // { }; jupyter_core = buildPythonPackage rec { - version = "4.1.1"; + version = "4.2.0"; name = "jupyter_core-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/j/jupyter_core/${name}.tar.gz"; - sha256 = "ae0e69435258126466c86cd989e465a9c334c50107ef4f257decc8693650bf4c"; + sha256 = "44ec837a53bebf4e937112d3f9ccf31fee4f8db3e406dd0dd4f0378a354bed9c"; }; buildInputs = with self; [ pytest mock ]; @@ -12686,12 +13186,32 @@ in modules // { ]; }; - libcloud = buildPythonPackage (rec { - name = "libcloud-0.18.0"; + python-Levenshtein = buildPythonPackage rec { + name = "python-Levenshtein-${version}"; + version = "0.12.0"; src = pkgs.fetchurl { - url = mirror://pypi/a/apache-libcloud/apache-libcloud-0.18.0.tar.bz2; - sha256 = "0ahdp14ddly074qg5cksxdhqaws0kj445xmhz1y7lzspsp6fk1xg"; + url = "mirror://pypi/p/python-Levenshtein/${name}.tar.gz"; + sha256 = "1c9ybqcja31nghfcc8xxbbz9h60s9qi12b9hr4jyl69xbvg12fh3"; + }; + + # No tests included in archive + doCheck = false; + + meta = { + description = "Functions for fast computation of Levenshtein distance and string similarity"; + homepage = "https://github.com/ztane/python-Levenshtein"; + license = licenses.gpl2; + maintainers = with maintainers; [ aske ]; + }; + }; + + libcloud = buildPythonPackage (rec { + name = "libcloud-1.2.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/a/apache-libcloud/apache-${name}.tar.bz2"; + sha256 = "0qlhyz5f32xg8i10biyzqscks8d28vklk63hvj45vzy1amw60kqz"; }; buildInputs = with self; [ mock ]; @@ -13048,14 +13568,14 @@ in modules // { Mako = buildPythonPackage rec { - name = "Mako-1.0.2"; + name = "Mako-1.0.4"; src = pkgs.fetchurl { url = "mirror://pypi/M/Mako/${name}.tar.gz"; - sha256 = "17k7jy3byi4hj6ksszib6gxbf6n7snnnirnbrdldn848abjc4l15"; + sha256 = "0nchpw6akfcsg8w6irjlx0gyzadc123hv4g47sijgnqd9nz9vngy"; }; - buildInputs = with self; [ markupsafe nose mock ]; + buildInputs = with self; [ markupsafe nose mock pytest ]; propagatedBuildInputs = with self; [ markupsafe ]; doCheck = !isPyPy; # https://bitbucket.org/zzzeek/mako/issue/238/2-tests-failed-on-pypy-24-25 @@ -13140,6 +13660,11 @@ in modules // { substituteInPlace setup.py --replace "sympy==0.7.6" "sympy" ''; + postFixup = '' + wrapPythonProgramsIn $out/bin $out + patchPythonScript $out/${python.sitePackages}/mathics/manage.py + ''; + propagatedBuildInputs = with self; [ cython sympy @@ -13198,6 +13723,23 @@ in modules // { }; }); + mccabe_0_5 = buildPythonPackage (rec { + name = "mccabe-0.5.2"; + + src = pkgs.fetchurl { + url = "mirror://pypi/m/mccabe/${name}.tar.gz"; + sha256 = "1zss8c5cn8wvxsbjzv70dxymybh3cjzrjl19vxfbnyvmidng0wrl"; + }; + + buildInputs = with self; [ pytestrunner pytest ]; + + meta = { + description = "McCabe checker, plugin for flake8"; + homepage = "https://github.com/flintwork/mccabe"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; + }); mechanize = buildPythonPackage (rec { name = "mechanize-0.2.5"; @@ -13500,29 +14042,22 @@ in modules // { mitmproxy = buildPythonPackage rec { baseName = "mitmproxy"; name = "${baseName}-${version}"; - version = "0.14"; + version = "0.17.1"; src = pkgs.fetchFromGitHub { owner = "mitmproxy"; repo = "mitmproxy"; rev = "v${version}"; - sha256 = "1zxw4yviryy0v53vhccgqb7f5d3fga16dy9kp1xwp6b59w0fcc2g"; + sha256 = "0a50mkvm3zf9cbs0pf6bwy00bhmy4d1l9as8c9m0bgrk6hq7h53p"; }; propagatedBuildInputs = with self; [ - pyopenssl pyasn1 urwid pillow lxml flask protobuf netlib click + pyopenssl pyasn1 urwid pillow lxml flask protobuf click ConfigArgParse pyperclip blinker construct pyparsing html2text tornado ]; doCheck = false; - postInstall = '' - for prog in "$out/bin/"*; do - wrapProgram "$prog" \ - --prefix PYTHONPATH : "$PYTHONPATH" - done - ''; - meta = { description = ''Man-in-the-middle proxy''; homepage = "http://mitmproxy.org/"; @@ -13573,11 +14108,11 @@ in modules // { moinmoin = buildPythonPackage (rec { name = "moinmoin-${ver}"; disabled = isPy3k; - ver = "1.9.7"; + ver = "1.9.8"; src = pkgs.fetchurl { url = "http://static.moinmo.in/files/moin-${ver}.tar.gz"; - sha256 = "f4ba1b5c956bd96d2a61e27e68d297aa63d1afbc80d5740e139dcdf0affb4db5"; + sha256 = "19hi16iy75lpx9ch799djc4hr4gai5rmvi542n29x6zhikysfjx7"; }; meta = { @@ -14040,7 +14575,6 @@ in modules // { description = "OpenSteno Plover stenography software"; maintainers = with maintainers; [ twey kovirobi ]; license = licenses.gpl2; - broken = true; }; src = pkgs.fetchurl { @@ -14048,8 +14582,14 @@ in modules // { sha256 = "1jja37nhiypdx1z6cazp8ffsf0z3yqmpdbprpdzf668lcb422rl0"; }; - buildInputs = with self; [ pytest ]; - propagatedBuildInputs = with self; [ wxPython pyserial hidapi xlib appdirs pkgs.wmctrl mock ]; + # This is a fix for https://github.com/pypa/pip/issues/3624 causing regression https://github.com/pypa/pip/issues/3781 + postPatch = '' + substituteInPlace setup.py --replace " in sys_platform" " == sys_platform" + ''; + + buildInputs = with self; [ pytest mock ]; + propagatedBuildInputs = with self; [ six setuptools pyserial appdirs hidapi + wxPython xlib pkgs.wmctrl ]; }; pygal = buildPythonPackage rec { @@ -14428,37 +14968,13 @@ in modules // { }; }; - - netlib = buildPythonPackage rec { - baseName = "netlib"; - name = "${baseName}-${version}"; - disabled = (!isPy27); - version = "0.14.0"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/netlib/${name}.tar.gz"; - sha256 = "0xcfjym780wjr32p3g50w2gifqy3589898idzd3fwgj93akv04ng"; - }; - - propagatedBuildInputs = with self; [ pyopenssl pyasn1 certifi passlib - ipaddress backports_ssl_match_hostname_3_4_0_2 hpack ]; - - doCheck = false; - - meta = { - description = "Man-in-the-middle proxy"; - homepage = "https://github.com/cortesi/netlib"; - license = licenses.mit; - }; - }; - nevow = buildPythonPackage (rec { name = "nevow-${version}"; - version = "0.11.1"; + version = "0.14.2"; src = pkgs.fetchurl { url = "mirror://pypi/N/Nevow/Nevow-${version}.tar.gz"; - sha256 = "1z0y8a5q4fa2nmh0dap7cs9pp5xs3jm6q0g4vpwcw77q7jagdmw9"; + sha256 = "0wsh40ysj5gvfc777nrdvf5vbkr606r1gh7ibvw7x8b5g8afdy3y"; name = "${name}.tar.gz"; }; @@ -14772,12 +15288,12 @@ in modules // { }; notebook = buildPythonPackage rec { - version = "4.2.2"; + version = "4.2.3"; name = "notebook-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "418ba230c9b2e7e739940cae9fb4625e10a63f038e9c95cf1a9b7a244256ba38"; + sha256 = "39a9603d3fe88b60de2903680c965cf643acf2c16fb2c6bac1d905e1042b5851"; }; LC_ALL = "en_US.UTF-8"; @@ -14821,7 +15337,7 @@ in modules // { configure ''; - buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject pygtk pkgs.glib pkgs.gtk pkgs.dbus_glib ]; + buildInputs = with self; [ python pkgs.pkgconfig pkgs.libnotify pygobject2 pygtk pkgs.glib pkgs.gtk2 pkgs.dbus_glib ]; postInstall = "cd $out/lib/python*/site-packages && ln -s gtk-*/pynotify ."; @@ -15043,10 +15559,10 @@ in modules // { }; numpy_1_11 = self.buildNumpyPackage rec { - version = "1.11.1"; + version = "1.11.2"; src = pkgs.fetchurl { url = "mirror://pypi/n/numpy/numpy-${version}.tar.gz"; - sha256 = "1kbpsnqfabpbczh3ly2d4jrwq2d1gqlshlpk5dm8bk3r77284h6w"; + sha256 = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69"; }; }; @@ -16115,11 +16631,11 @@ in modules // { Kajiki = buildPythonPackage rec { name = "Kajiki-${version}"; - version = "0.5.2"; + version = "0.5.5"; src = pkgs.fetchurl { url = "mirror://pypi/K/Kajiki/${name}.tar.gz"; - sha256 = "1ayhr4g5q2hhh50fd33dkb7l8z8n2hnnx3lmhivzg3paf47b3ssz"; + sha256 = "effcae388e25c3358eb0bbd733448509d11a1ec500e46c69241fc673021f0517"; }; propagatedBuildInputs = with self; [ @@ -16304,12 +16820,11 @@ in modules // { sha256 = "1rp4xxy7qp0s0wnq3ig4ji8xsl31g901qkdp339ndxn466cqal2s"; }; - propagatedBuildInputs = with self; [ - kazoo six - ]; - buildInputs = with self; [ - - ]; + propagatedBuildInputs = with self; [ kazoo six ]; + buildInputs = with self; [ testtools ]; + checkPhase = '' + ${python.interpreter} -m unittest discover zake/tests + ''; meta = with stdenv.lib; { homepage = "https://github.com/yahoo/Zake"; @@ -16831,17 +17346,18 @@ in modules // { inherit (pkgs.stdenv) isDarwin; in buildPythonPackage rec { name = "pandas-${version}"; - version = "0.18.1"; + version = "0.19.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pandas/${name}.tar.gz"; - sha256 = "1ckpxrvvjj6zxmn68icd9hib8qcpx9b35f6izxnr25br5ilq7r6j"; + sha256 = "4697606cdf023c6b7fcb74e48aaf25cf282a1a00e339d2d274cf1b663748805b"; }; LC_ALL = "en_US.UTF-8"; buildInputs = with self; [ nose pkgs.glibcLocales ] ++ optional isDarwin pkgs.libcxx; propagatedBuildInputs = with self; [ + cython dateutil scipy numexpr @@ -17012,6 +17528,29 @@ in modules // { }; }; + parsel = buildPythonPackage rec { + name = "parsel-${version}"; + version = "1.0.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/parsel/${name}.tar.gz"; + sha256 = "9c12c370feda864c2f541cecce9bfb3a2a682c6c59c097a852e7b040dc6b8431"; + }; + + buildInputs = with self; [ pytest pytestrunner ]; + propagatedBuildInputs = with self; [ six w3lib lxml cssselect ]; + + checkPhase = '' + py.test + ''; + + meta = { + homepage = "https://github.com/scrapy/parsel"; + description = "Parsel is a library to extract data from HTML and XML using XPath and CSS selectors"; + license = licenses.bsd3; + }; + }; + partd = buildPythonPackage rec { name = "partd-${version}"; version = "0.3.3"; @@ -17502,7 +18041,7 @@ in modules // { meta = { description = "Meta-commands handler for Postgres Database"; homepage = https://pypi.python.org/pypi/pgspecial; - licence = licenses.bsd3; + license = licenses.bsd3; maintainers = with maintainers; [ nckx ]; }; }; @@ -17594,8 +18133,14 @@ in modules // { buildInputs = with self; [ mock scripttest virtualenv pretend pytest ]; # Pip wants pytest, but tests are not distributed doCheck = false; - }; + meta = { + description = "The PyPA recommended tool for installing Python packages"; + license = licenses.mit; + homepage = https://pip.pypa.io/; + priority = 10; + }; + }; pika = buildPythonPackage rec { name = "pika-${version}"; @@ -17768,6 +18313,8 @@ in modules // { }; }; + pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pillow = buildPythonPackage rec { name = "Pillow-3.3.1"; @@ -17886,6 +18433,21 @@ in modules // { }; }; + posix_ipc = buildPythonPackage rec { + name = "posix_ipc-${version}"; + version = "1.0.0"; + + src = pkgs.fetchurl { + url = "mirror://pypi/p/posix_ipc/${name}.tar.gz"; + sha256 = "1jzg66708pi5n9w07fbz6rlxx30cjds9hp2yawjjfryafh1hg4ww"; + }; + + meta = { + description = "POSIX IPC primitives (semaphores, shared memory and message queues)"; + license = licenses.bsd3; + homepage = http://semanchuk.com/philip/posix_ipc/; + }; + }; powerline = buildPythonPackage rec { rev = "2.1.4"; @@ -18142,6 +18704,23 @@ in modules // { }; }; + ptpython = buildPythonPackage rec { + name = "ptpython-0.35"; + propagatedBuildInputs = with self; + [ wcwidth six prompt_toolkit docopt jedi pygments]; + src = pkgs.fetchurl { + url = "mirror://pypi/p/ptpython/${name}.tar.gz"; + sha256 = "e0d380fbccb03ed33a7f33d96988e66fbd286bc813c9ceea84a1b3b5615a5660"; + }; + + meta = { + description = "An advanced Python REPL"; + license = licenses.bsd3; + maintainers = with maintainers; [ mlieberman85 ]; + platforms = platforms.all; + }; + }; + publicsuffix = buildPythonPackage rec { name = "publicsuffix-${version}"; version = "1.0.2"; @@ -18723,13 +19302,18 @@ in modules // { pydispatcher = buildPythonPackage (rec { version = "2.0.5"; - disabled = isPy35; name = "pydispatcher-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/P/PyDispatcher/PyDispatcher-${version}.tar.gz"; sha256 = "1bswbmhlbqdxlgbxlb6xrlm4k253sg8nvpl1whgsys8p3fg0cw2m"; }; + buildInputs = with self; [ pytest ]; + + checkPhase = '' + py.test + ''; + meta = { homepage = http://pydispatcher.sourceforge.net/; description = "Signal-registration and routing infrastructure for use in multiple contexts"; @@ -19003,6 +19587,24 @@ in modules // { }; }; + pyftgl = buildPythonPackage rec { + name = "pyftgl-0.4b"; + + src = pkgs.fetchFromGitHub { + owner = "umlaeute"; + repo = "pyftgl"; + rev = "0.4b"; + sha256 = "12zcjv4cwwjihiaf74kslrdmmk4bs47h7006gyqfwdfchfjdgg4r"; + }; + + buildInputs = with self; [ pkgs.boost pkgs.freetype pkgs.ftgl pkgs.mesa ]; + + meta = { + description = "Python bindings for FTGL (FreeType for OpenGL)"; + license = licenses.gpl2Plus; + }; + }; + pygeoip = buildPythonPackage rec { name = "pygeoip-0.3.2"; @@ -19294,6 +19896,33 @@ in modules // { }; }; + PyICU = buildPythonPackage rec { + name = "PyICU-1.9.3"; + + src = pkgs.fetchurl { + url = "mirror://pypi/P/PyICU/${name}.tar.gz"; + sha256 = "0hps2314w7ddiwhqgw249m3hgqnny7qn542vz26jxr5k5hhrcyhs"; + }; + + buildInputs = [ pkgs.icu ]; + + patches = [ + # Fixes a bug in the test suite. + (pkgs.fetchpatch { + url = "https://github.com/ovalhub/pyicu/commit/6ab20d48d85638acb3a811c8676f713bd26f0df9.patch"; + sha256 = "0z4585r6bi0xxvrr93n450ka43vixx9zd063qna078vck0i3bkjg"; + }) + ]; + + meta = { + homepage = https://pypi.python.org/pypi/PyICU/; + description = "Python extension wrapping the ICU C++ API"; + license = licenses.mit; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + pyinotify = buildPythonPackage rec { name = "pyinotify"; version = "0.9.6"; @@ -19655,11 +20284,11 @@ in modules // { pysocks = buildPythonPackage rec { name = "pysocks-${version}"; - version = "1.5.0"; + version = "1.5.7"; src = pkgs.fetchurl { url = "mirror://pypi/P/PySocks/PySocks-${version}.tar.gz"; - sha256 = "10wq5311qrnk8rvzsh6gwzxi7h51pgvzw3d7s1mb39fsvf0vyjdk"; + sha256 = "124bydbcspzhkb6ynckvgqra1b79rh5mrq98kbyyd202n6a7c775"; }; doCheck = false; @@ -20008,16 +20637,25 @@ in modules // { pyopenssl = buildPythonPackage rec { name = "pyopenssl-${version}"; - version = "16.0.0"; + version = "16.1.0"; src = pkgs.fetchurl { url = "mirror://pypi/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; - sha256 = "0zfijaxlq4vgi6jz0d4i5xq9ygqnyps6br7lmigjhqnh8gp10g9n"; + sha256 = "88f7ada2a71daf2c78a4f139b19d57551b4c8be01f53a1cb5c86c2f3bf01355f"; }; - # 12 tests failing, 26 error out - doCheck = false; + preCheck = '' + sed -i 's/test_set_default_verify_paths/noop/' tests/test_ssl.py + ''; + checkPhase = '' + runHook preCheck + export LANG="en_US.UTF-8"; + py.test; + runHook postCheck + ''; + + buildInputs = [ pkgs.openssl self.pytest pkgs.glibcLocales ]; propagatedBuildInputs = [ self.cryptography self.pyasn1 self.idna ]; }; @@ -20250,8 +20888,8 @@ in modules // { preConfigure = '' cd Source - python setup.py backport - python setup.py configure \ + ${python.interpreter} setup.py backport + ${python.interpreter} setup.py configure \ --apr-inc-dir=${pkgs.apr.dev}/include \ --apu-inc-dir=${pkgs.aprutil.dev}/include \ --apr-lib-dir=${pkgs.apr.out}/lib \ @@ -20264,6 +20902,8 @@ in modules // { checkPhase = "make -C ../Tests"; + disabled = isPy3k; + installPhase = '' dest=$(toPythonPath $out)/pysvn mkdir -p $dest @@ -20504,11 +21144,11 @@ in modules // { pyyaml = buildPythonPackage (rec { - name = "PyYAML-3.11"; + name = "PyYAML-3.12"; src = pkgs.fetchurl { url = "http://pyyaml.org/download/pyyaml/${name}.zip"; - sha256 = "19bb3ac350ef878dda84a62d37c7d5c17a137386dde9c2ce7249c7a21d7f6ac9"; + sha256 = "19s1lxi0idq4a0bpvld866pv5b16lqxypyswmsdi5ys4210jxj2s"; }; buildInputs = with self; [ pkgs.pyrex ]; @@ -21296,6 +21936,25 @@ in modules // { }; }; + rootpy = buildPythonPackage rec { + version = "0.8.3"; + name = "rootpy-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/d5/40/feddb2c9d1cadfe05d1d9aea1a71be093dc700879c9f6af40a10b1330f34/rootpy-0.8.3.tar.gz"; + sha256 = "14q9bhs2a53598571x8yikj68x2iyl6090wbvdrpbwr238799b0z"; + }; + + disabled = isPy3k; + + propagatedBuildInputs = with self; [ pkgs.root readline numpy matplotlib ]; + + meta = { + homepage = "http://www.rootpy.org"; + license = licenses.gpl3; + description = "Pythonic interface to the ROOT framework"; + }; + }; rope = buildPythonPackage rec { version = "0.10.2"; @@ -21354,6 +22013,20 @@ in modules // { }; }; + ropper = buildPythonApplication rec { + name = "ropper-1.10.10"; + src = pkgs.fetchurl { + url = "mirror://pypi/r/ropper/${name}.tar.gz"; + sha256 = "1676e07947a19df9d17002307a7555c2647a4224d6f2869949e8fc4bd18f2e87"; + }; + propagatedBuildInputs = with self; [ capstone filebytes readline ]; + meta = with pkgs.stdenv.lib; { + homepage = "https://scoding.de/ropper/"; + license = licenses.gpl2; + description = "Show information about files in different file formats"; + maintainers = with maintainers; [ bennofs ]; + }; + }; routes = buildPythonPackage rec { @@ -21699,10 +22372,10 @@ in modules // { }; scipy_0_18 = self.buildScipyPackage rec { - version = "0.18.0"; + version = "0.18.1"; src = pkgs.fetchurl { url = "mirror://pypi/s/scipy/scipy-${version}.tar.gz"; - sha256 = "f01784fb1c2bc246d4211f2482ecf4369db5abaecb9d5afb9d94f6c59663286a"; + sha256 = "8ab6e9c808bf2fb3e8576cd8cf07226d9cdc18b012c06d9708429a821ac6634e"; }; numpy = self.numpy; }; @@ -21730,12 +22403,12 @@ in modules // { scikitlearn = buildPythonPackage rec { name = "scikit-learn-${version}"; - version = "0.17.1"; + version = "0.18"; disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = pkgs.fetchurl { url = "mirror://pypi/s/scikit-learn/${name}.tar.gz"; - sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0"; + sha256 = "240009789d6495240b332e059cbd2499f4d2981c93873983c9e1d5189f90315f"; }; buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ]; @@ -22069,6 +22742,31 @@ in modules // { }; }; + slob = buildPythonPackage rec { + name = "slob-unstable-2016-03-04"; + + disabled = !isPy3k; + + src = pkgs.fetchFromGitHub { + owner = "itkach"; + repo = "slob"; + rev = "31ad0e769360a5b10a4893f686587bb8e48c3895"; + sha256 = "06yn510178awhjsvy88cpjz7rlmyviqd5g58gc8gf4ivyqdlqbsl"; + }; + + propagatedBuildInputs = [ self.PyICU ]; + + checkPhase = "python3 -m unittest slob"; + + meta = { + homepage = https://github.com/itkach/slob/; + description = "Reference implementation of the slob (sorted list of blobs) format"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; + }; + slowaes = buildPythonPackage rec { name = "slowaes-${version}"; version = "0.1a1"; @@ -22143,6 +22841,24 @@ in modules // { }; }; + sqlmap = buildPythonPackage { + name = "sqlmap-1.0.9.post5"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/sqlmap/sqlmap-1.0.9.post5.tar.gz"; + sha256 = "0g8sjky8anrmcisc697b5qndp88qmay35kng9sz9x46wd3agm9pa"; + }; + + propagatedBuildInputs = with self; [ modules.sqlite3 ]; + + meta = with pkgs.stdenv.lib; { + homepage = "http://sqlmap.org"; + license = licenses.gpl2; + description = "Automatic SQL injection and database takeover tool"; + maintainers = with stdenv.lib.maintainers; [ bennofs ]; + }; + }; + pgpdump = self.buildPythonPackage rec { name = "pgpdump-1.5"; @@ -22207,26 +22923,7 @@ in modules // { }; }; - sockjs-tornado = buildPythonPackage rec { - name = "sockjs-tornado-${version}"; - version = "1.0.2"; - src = pkgs.fetchurl { - url = "mirror://pypi/s/sockjs-tornado/${name}.tar.gz"; - sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv"; - }; - - # This is needed for compatibility with OctoPrint - propagatedBuildInputs = with self; [ tornado_4_0_1 ]; - - meta = { - description = "SockJS python server implementation on top of Tornado framework"; - homepage = http://github.com/mrjoes/sockjs-tornado/; - license = licenses.mit; - platforms = platforms.all; - maintainers = with maintainers; [ abbradar ]; - }; - }; sopel = buildPythonPackage rec { name = "sopel-6.3.1"; @@ -22299,13 +22996,13 @@ in modules // { }; Theano = buildPythonPackage rec { - name = "Theano-0.8.1"; + name = "Theano-0.8.2"; disabled = isPyPy || pythonOlder "2.6" || (isPy3k && pythonOlder "3.3"); src = pkgs.fetchurl { url = "mirror://pypi/T/Theano/${name}.tar.gz"; - sha256 = "17dikk94r8bzkxg976srqlhj5c7phs9gl837iabyfdpixkbrl79g"; + sha256 = "7463c8f7ed1a787bf881f36d38a38607150186697e7ce7e78bfb94b7c6af8930"; }; #preCheck = '' @@ -22643,10 +23340,6 @@ in modules // { }; }; - salt = callPackage ../tools/admin/salt {}; - - salttesting = callPackage ../tools/admin/salt/testing.nix {}; - sandboxlib = buildPythonPackage rec { name = "sandboxlib-${version}"; version = "0.31"; @@ -22667,6 +23360,28 @@ in modules // { }; }; + scales = buildPythonPackage rec { + name = "scales-${version}"; + version = "1.0.9"; + + src = pkgs.fetchurl { + url = "mirror://pypi/s/scales/${name}.tar.gz"; + sha256 = "8b6930f7d4bf115192290b44c757af5e254e3fcfcb75ff9a51f5c96a404e2753"; + }; + + buildInputs = with self; optionals doCheck [ nose ]; + # No tests included + doCheck = false; + + propagatedBuildInputs = with self; [ six ]; + + meta = { + description = "Stats for Python processes"; + homepage = https://www.github.com/Cue/scales; + license = licenses.asl20; + }; + }; + secp256k1 = buildPythonPackage rec { name = "secp256k1-${version}"; version = "0.12.1"; @@ -22802,7 +23517,7 @@ in modules // { # error: invalid command 'test' doCheck = false; - propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject ]; + propagatedBuildInputs = with self; [ pkgs.xorg.libX11 dbus-python pygobject2 ]; meta = { description = "High-level, platform independent Skype API wrapper for Python"; @@ -22914,14 +23629,32 @@ in modules // { }; }; + spark_parser = buildPythonPackage (rec { + name = "${pname}-${version}"; + pname = "spark_parser"; + version = "1.4.0"; + src = pkgs.fetchurl { + url = "mirror://pypi/s/${pname}/${name}.tar.gz"; + sha256 = "1r7d07kw4asgajvhq1gzln4g1qi2r13jw0s8c7d5z3g4kp8y0br8"; + }; + buildInputs = with self; [nose]; + propagatedBuildInputs = []; + meta = { + description = ''An Early-Algorithm Context-free grammar Parser''; + homepage = "https://github.com/rocky/python-spark"; + license = licenses.mit; + maintainers = with maintainers; [raskin]; + platforms = platforms.all; + }; + }); sphinx = buildPythonPackage (rec { name = "${pname}-${version}"; pname = "Sphinx"; - version = "1.3.6"; + version = "1.4.6"; src = pkgs.fetchurl { url = "mirror://pypi/S/${pname}/${name}.tar.gz"; - sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb"; + sha256 = "1lvr39ab5sjp894jshk39xidlxw9vc735882cgcfr4dlm4546hwy"; }; LC_ALL = "en_US.UTF-8"; buildInputs = with self; [ nose simplejson mock pkgs.glibcLocales ]; @@ -24319,44 +25052,35 @@ in modules // { }; }; - twisted_11 = buildPythonPackage rec { - # NOTE: When updating please check if new versions still cause issues - # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) - disabled = isPy3k; + twine = buildPythonPackage rec { + name = "twine-${version}"; + version = "1.8.1"; - name = "Twisted-13.2.0"; src = pkgs.fetchurl { - url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89"; + url = "mirror://pypi/t/twine/${name}.tar.gz"; + sha256 = "68b663691a947b844f92853c992d42bb68b6333bffc9ab7f661346b001c1da82"; }; - propagatedBuildInputs = with self; [ zope_interface ]; + propagatedBuildInputs = with self; [ clint pkginfo requests2 requests_toolbelt ]; - # Generate Twisted's plug-in cache. Twited users must do it as well. See - # http://twistedmatrix.com/documents/current/core/howto/plugin.html#auto3 - # and http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=477103 for - # details. - postInstall = "$out/bin/twistd --help > /dev/null"; + # Requires network + doCheck = false; meta = { - homepage = http://twistedmatrix.com/; - description = "Twisted, an event-driven networking engine written in Python"; - longDescription = '' - Twisted is an event-driven networking engine written in Python - and licensed under the MIT license. - ''; - license = licenses.mit; - maintainers = [ ]; + description = "Collection of utilities for interacting with PyPI"; + homepage = https://github.com/pypa/twine; + license = licenses.asl20; + maintainer = with maintainers; [ fridh ]; }; }; twisted = buildPythonPackage rec { name = "Twisted-${version}"; - version = "16.4.0"; + version = "16.4.1"; src = pkgs.fetchurl { url = "mirror://pypi/T/Twisted/${name}.tar.bz2"; - sha256 = "cd8820901900542d21fb1dee2cd4d4d334fff130e3fc30b777f81dd7d7f2836e"; + sha256 = "1d8d73f006c990744effb35588359fd44d43608649ac0b6b7edc71176e88e816"; }; propagatedBuildInputs = with self; [ zope_interface ]; @@ -25113,15 +25837,42 @@ in modules // { }; }; - willie = buildPythonPackage rec { - name = "willie-5.2.0"; + widgetsnbextension = buildPythonPackage rec { + name = "widgetsnbextension-${version}"; + version = "1.2.6"; src = pkgs.fetchurl { - url = "mirror://pypi/w/willie/willie-5.2.0.tar.gz"; - sha256 = "2da2e91b65c471b4c8e5e5e11471b25887635258d24aaf76b5354147b3ab577d"; + url = "mirror://pypi/w/widgetsnbextension/${name}.tar.gz"; + sha256 = "c618cfb32978c9517caf0b4ef3aec312f8dd138577745e7b0d4abfcc7315ce51"; }; - propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname_3_4_0_2 ]; + propagatedBuildInputs = with self; [ notebook ]; + + # No tests in archive + doCheck = false; + + meta = { + description = "IPython HTML widgets for Jupyter"; + homepage = http://ipython.org/; + license = self.ipywidgets.meta.license; # Build from same repo + maintainers = with maintainers; [ fridh ]; + }; + }; + + willie = buildPythonPackage rec { + name = "willie-${version}"; + version = "5.5.1"; + + src = pkgs.fetchurl { + url = "mirror://pypi/w/willie/${name}.tar.gz"; + sha256 = "e03dd26ea694b877a2b3b7b4dcca8e79420e7f346abab34292bff43d992a8cc5"; + }; + + buildInputs = with self; [ pytest modules.sqlite3 ]; + propagatedBuildInputs = with self; [ feedparser pytz lxml praw pyenchant pygeoip backports_ssl_match_hostname ]; + checkPhase = '' + py.test test + ''; meta = { description = "A simple, lightweight, open source, easy-to-use IRC utility bot, written in Python"; @@ -26066,9 +26817,9 @@ in modules // { tornado = buildPythonPackage rec { name = "tornado-${version}"; - version = "4.4.1"; + version = "4.4.2"; - propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname_3_4_0_2 certifi singledispatch ]; + propagatedBuildInputs = with self; [ backports_abc backports_ssl_match_hostname certifi singledispatch ]; # We specify the name of the test files to prevent # https://github.com/NixOS/nixpkgs/issues/14634 @@ -26078,19 +26829,7 @@ in modules // { src = pkgs.fetchurl { url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "371d0cf3d56c47accc66116a77ad558d76eebaa8458a6b677af71ca606522146"; - }; - }; - - tornado_4_0_1 = buildPythonPackage rec { - name = "tornado-${version}"; - version = "4.0.1"; - - propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ]; - - src = pkgs.fetchurl { - url = "mirror://pypi/t/tornado/${name}.tar.gz"; - sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df"; + sha256 = "1k7d90afm5pivam90a37nqiz9wlmakvnsfymp3p43kcqz29gk618"; }; }; @@ -26178,7 +26917,8 @@ in modules // { }; - libarchive = buildPythonPackage rec { + libarchive = self.python-libarchive; # The latter is the name upstream uses + python-libarchive = buildPythonPackage rec { version = "3.1.2-1"; name = "libarchive-${version}"; disabled = isPy3k; @@ -26188,23 +26928,30 @@ in modules // { sha256 = "0j4ibc4mvq64ljya9max8832jafi04jciff9ia9qy0xhhlwkcx8x"; }; - propagatedBuildInputs = with self; [ pkgs.libarchive ]; + propagatedBuildInputs = with self; [ pkgs.libarchive.lib ]; + meta.broken = true; }; libarchive-c = buildPythonPackage rec { - name = "libarchive-c-2.1"; + name = "libarchive-c-${version}"; + version = "2.5"; src = pkgs.fetchurl { url = "mirror://pypi/l/libarchive-c/${name}.tar.gz"; - sha256 = "089lrz6xyrfnk55v35vis6jyqyyl77w093057djyspnd2744wi2n"; + sha256 = "98660daa2501d2da51ab6f39893dc24e88916e72b2d80c205641faa5bce66859"; }; - patchPhase = '' + LC_ALL="en_US.UTF-8"; + + postPatch = '' substituteInPlace libarchive/ffi.py --replace \ - "find_library('archive')" "'${pkgs.libarchive}/lib/libarchive.so'" + "find_library('archive')" "'${pkgs.libarchive.lib}/lib/libarchive.so'" + ''; + checkPhase = '' + py.test tests -k 'not test_check_archiveentry_with_unicode_entries_and_name_zip' ''; - buildInputs = [ pkgs.libarchive ]; + buildInputs = with self; [ pytest pkgs.glibcLocales ]; }; pybrowserid = buildPythonPackage rec { @@ -26435,6 +27182,8 @@ in modules // { sha256 = "1xqp66knzlb01k30qic40vzwl51jmlsb8r96iv60m2ca6623abbv"; }; + buildInputs = with self; [ pytest ]; + meta = { homepage = https://github.com/pydanny/whichcraft; description = "Cross-platform cross-python shutil.which functionality"; @@ -26942,12 +27691,12 @@ in modules // { IMAPClient = buildPythonPackage rec { name = "IMAPClient-${version}"; - version = "0.11"; + version = "0.13"; disabled = isPy34 || isPy35; src = pkgs.fetchurl { url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; - sha256 = "1w54h8gz25qf6ggazzp6xf7kvsyiadsjfkkk17gm0p6pmzvvccbn"; + sha256 = "0v7kd1crdbff0rmh4ddm5qszkis6hpk9084qh94al8h7g4y9l3is"; }; buildInputs = with self; [ mock ]; @@ -27013,32 +27762,28 @@ in modules // { searx = buildPythonPackage rec { name = "searx-${version}"; - version = "0.9.0"; + version = "0.10.0"; src = pkgs.fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "030qkrsj4as9anr8xfpk5n41qzg7w4yyjasb4cqislvyl1l1dvvs"; + sha256 = "0j9pnifcrm4kzziip43w2fgadsg1sqlcm7dfxhnshdx03nby2dy2"; }; - postPatch = '' - substituteInPlace requirements.txt \ - --replace 'certifi==2015.11.20.1' 'certifi==2016.2.28' \ - --replace 'pyopenssl==0.15.1' 'pyopenssl==16.0.0' - ''; + patches = [ ../development/python-modules/searx.patch ]; propagatedBuildInputs = with self; [ pyyaml lxml_3_5 grequests flaskbabel flask requests2 gevent speaklater Babel pytz dateutil pygments_2_0 - pyasn1 pyasn1-modules ndg-httpsclient certifi + pyasn1 pyasn1-modules ndg-httpsclient certifi pysocks ]; meta = { homepage = https://github.com/asciimoo/searx; description = "A privacy-respecting, hackable metasearch engine"; license = licenses.agpl3Plus; - maintainers = with maintainers; [ matejc fpletz ]; + maintainers = with maintainers; [ matejc fpletz profpatsch ]; }; }; @@ -27140,47 +27885,8 @@ in modules // { }; }; - udiskie = buildPythonPackage rec { - version = "1.4.8"; - name = "udiskie-${version}"; - - src = pkgs.fetchurl { - url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz"; - sha256 = "0fj1kh6pmwyyy54ybc5fa625lhrxzhzmfx1nwz2lym5cpm4b21fl"; - }; - - preConfigure = '' - export XDG_RUNTIME_DIR=/tmp - ''; - - buildInputs = [ - pkgs.asciidoc-full # For building man page. - ]; - - propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; - - postBuild = "make -C doc"; - - postInstall = '' - mkdir -p $out/share/man/man8 - cp -v doc/udiskie.8 $out/share/man/man8/ - ''; - - preFixup = '' - wrapProgram "$out/bin/"* \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" - ''; - - # tests require dbusmock - doCheck = false; - - meta = { - description = "Removable disk automounter for udisks"; - license = licenses.mit; - homepage = https://github.com/coldfix/udiskie; - maintainers = with maintainers; [ AndersonTorres ]; - }; - }; + # For backwards compatibility. Please use nixpkgs.udiskie instead. + udiskie = pkgs.udiskie.override { pythonPackages = self; }; # Should be bumped along with EFL! pythonefl = buildPythonPackage rec { @@ -27317,11 +28023,11 @@ in modules // { uncertainties = buildPythonPackage rec { name = "uncertainties-${version}"; - version = "2.4.8.1"; + version = "3.0.1"; src = pkgs.fetchurl { - url = "https://github.com/lebigot/uncertainties/archive/${version}.tar.gz"; - sha256 = "1j5z0h5l3plsywsmwjpaggkr6rn5cjxw0lhkwgl6a8a25f8bz4pz"; + url = "mirror://pypi/u/uncertainties/${name}.tar.gz"; + sha256 = "de0765cac6911e5afa93ee941063a07b4a98dbd9c314c5eea4ab14bfff0054a4"; }; buildInputs = with self; [ nose numpy ]; @@ -27743,16 +28449,17 @@ in modules // { }; html2text = buildPythonPackage rec { - name = "html2text-2015.11.4"; - disabled = ! isPy27; + name = "html2text-2016.9.19"; src = pkgs.fetchurl { url = "mirror://pypi/h/html2text/${name}.tar.gz"; - sha256 = "021pqcshxajhdy4whkawz95v98m8njv5lknzgac0sp8jzl01qls4"; + sha256 = "554ef5fd6c6cf6e3e4f725a62a3e9ec86a0e4d33cd0928136d1c79dbeb7b2d55"; }; meta = { + description = "Turn HTML into equivalent Markdown-structured text"; homepage = https://github.com/Alir3z4/html2text/; + license = licenses.gpl3; }; }; @@ -28121,7 +28828,7 @@ in modules // { propagatedBuildInputs = with self; [ msgpack ] ++ optional (!isPyPy) greenlet - ++ optional (!isPy34) trollius; + ++ optional (pythonOlder "3.4") trollius; meta = { description = "Python client for Neovim"; @@ -28235,6 +28942,9 @@ in modules // { sha256 = "0v8ziaam2r637v94ra4dbjw6jzxz99gs5x4i585kgag1v204yb9b"; }; + #https://bitbucket.org/fdik/pypeg/issues/36/test-failures-on-py35 + doCheck = !isPy3k; + meta = { description = "PEG parser interpreter in Python"; homepage = http://fdik.org/pyPEG; @@ -28416,11 +29126,11 @@ in modules // { pafy = buildPythonPackage rec { name = "pafy-${version}"; - version = "0.5.0"; + version = "0.5.2"; src = pkgs.fetchurl { url = "mirror://pypi/p/pafy/${name}.tar.gz"; - sha256 = "1q699dcnq34nfgm0bg8mp5krhzk9cyirqdcadhs9al4fa5410igw"; + sha256 = "1ckvrypyvb7jbqlgwdz0y337ajagjv7dgxyns326nqwypn1wpq0i"; }; # No tests included in archive @@ -28501,15 +29211,25 @@ in modules // { mps-youtube = buildPythonPackage rec { name = "mps-youtube-${version}"; - version = "0.2.6"; + version = "0.2.7.1"; disabled = (!isPy3k); + # disabled due to error in loading unittest + # don't know how to make test from: + doCheck = false; + + # before check create a directory and redirect XDG_CONFIG_HOME to it + preCheck = '' + mkdir -p check-phase + export XDG_CONFIG_HOME=$(pwd)/check-phase + ''; + src = pkgs.fetchFromGitHub { owner = "mps-youtube"; repo = "mps-youtube"; rev = "v${version}"; - sha256 = "1vbf60z2birbm7wc9irxy0jf5x3y32ncl8fw52v19xyx7fq10jrm"; + sha256 = "16zn5gwb3568w95lr21b88zkqlay61p1541sa9c3x69zpi8v0pys"; }; propagatedBuildInputs = with self; [ pafy ]; @@ -28823,12 +29543,12 @@ in modules // { }; hidapi = buildPythonPackage rec{ - version = "0.7.99.post12"; + version = "0.7.99.post15"; name = "hidapi-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/h/hidapi/${name}.tar.gz"; - sha256 = "1jaj0y5vn5yk033q01wacsz379mf3sy66d6gz072ycfr5rahcp59"; + sha256 = "09wlr1d7mx80974bsq62j4pk80234jgl7ip4br0y43q6999dpcr0"; }; propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ]; @@ -28870,15 +29590,15 @@ in modules // { }; trezor = buildPythonPackage rec{ - version = "0.6.11"; + version = "0.7.4"; name = "trezor-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/trezor/${name}.tar.gz"; - sha256 = "0nqbjj0mvkp314hpq36px12hxbyidmhsdflq3121l4g9y3scfbnx"; + sha256 = "18nr76jkdg24sb3r8cfbiq12b95gnh0amc0r1wx9mmg3pwq6jx6y"; }; - propagatedBuildInputs = with self; [ protobuf2_6 hidapi ]; + propagatedBuildInputs = with self; [ protobuf3_0 hidapi ]; buildInputs = with self; [ ecdsa mnemonic ]; @@ -28894,15 +29614,15 @@ in modules // { }; keepkey = buildPythonPackage rec{ - version = "0.7.0"; + version = "0.7.3"; name = "keepkey-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/k/keepkey/${name}.tar.gz"; - sha256 = "1ikyp4jpydskznsrlwmxh9sn7b64aldwj2lf0phmb19r5kk06qmp"; + sha256 = "14d2r8dlx997ypgma2k8by90acw7i3l7hfq4gar9lcka0lqfj714"; }; - propagatedBuildInputs = with self; [ protobuf2_6 hidapi ]; + propagatedBuildInputs = with self; [ protobuf3_0 hidapi ]; buildInputs = with self; [ ecdsa mnemonic ]; @@ -28952,12 +29672,12 @@ in modules // { }; trezor_agent = buildPythonPackage rec{ - version = "0.6.5"; + version = "0.7.0"; name = "trezor_agent-${version}"; src = pkgs.fetchurl { url = "mirror://pypi/t/trezor_agent/${name}.tar.gz"; - sha256 = "074vzy5qrx7fa2svqdwj1p6nbpxa8xmhfych9qa2kpcq32dg7a8s"; + sha256 = "1x1gwih6w8kxhpgmcp0v1k7mpmfsqiikkjca291sd0v2if24x7q1"; }; propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ]; @@ -29017,7 +29737,7 @@ in modules // { meta = { description = "Python test runner"; homepage = "https://github.com/CleanCut/green"; - licence = licenses.mit; + license = licenses.mit; }; }; @@ -29115,16 +29835,23 @@ in modules // { scrapy = buildPythonPackage rec { name = "Scrapy-${version}"; - version = "1.0.5"; + version = "1.1.2"; - disabled = isPy3k; + buildInputs = with self; [ pkgs.glibcLocales mock pytest botocore testfixtures pillow ]; + propagatedBuildInputs = with self; [ + six twisted w3lib lxml cssselect queuelib pyopenssl service-identity parsel pydispatcher + ]; - buildInputs = with self ; [ pytest ]; - propagatedBuildInputs = with self ; [ six twisted w3lib lxml cssselect queuelib pyopenssl service-identity ]; + LC_ALL="en_US.UTF-8"; + + checkPhase = '' + py.test --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py + # The ignored tests require mitmproxy, which depends on protobuf, but it's disabled on Python3 + ''; src = pkgs.fetchurl { url = "mirror://pypi/S/Scrapy/${name}.tar.gz"; - sha256 = "0a51c785a310d65f6e70285a2da56d48ef7d049bd7fd60a08eef05c52328ca96"; + sha256 = "a0a8c7bccbd598d2731ec9f267b8efbd8fb99767f826f8f2924a5610707a03d4"; }; meta = { @@ -29880,8 +30607,8 @@ in modules // { url = "mirror://pypi/a/${pname}/${name}.tar.gz"; sha256 = "1158ml8h3g0vlsgw2jmy579glbg7dn0mjij8xibdl509b8qv9p51"; }; - buildInputs = with self; [ unittest2 mock pytest txaio trollius ]; - propagatedBuildInputs = with self; [ six twisted ]; + buildInputs = with self; [ unittest2 mock pytest trollius ]; + propagatedBuildInputs = with self; [ six twisted txaio ]; checkPhase = '' py.test $out ''; @@ -29946,4 +30673,22 @@ in modules // { }; }; + packet-python = buildPythonPackage rec { + name = "${pname}-${version}"; + pname = "packet-python"; + version = "1.31"; + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/c3/1b/ea71ec9d6eeab92b783d23dd62e71e9296f9699bc7d457450859803929f0/${name}.tar.gz"; + sha256 = "1z1zmrajfw01jr3mafimq7dvsb1rs978zln9xfd6fbqkp3vm9hc0"; + }; + propagatedBuildInputs = with self; [ requests ]; + + meta = { + description = "A Python client for the Packet API."; + homepage = "https://github.com/packethost/packet-python"; + license = licenses.lgpl3; + maintainers = with maintainers; [ dipinhora ]; + platforms = platforms.all; + }; + }; } diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 430c03f5190..ad7d07f44cc 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -39,7 +39,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; dhcp = linux; diffutils = all; e2fsprogs = linux; - emacs24 = gtkSupported; + emacs25 = gtkSupported; enscript = all; file = all; findutils = all; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 160c19b1d85..d3fb4e646c3 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -90,7 +90,7 @@ let # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 - #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg; + #emacsPackagesNg = packagePlatforms pkgs.emacsPackagesNg; #rPackages = packagePlatforms pkgs.rPackages; ocamlPackages = { }; perlPackages = { }; diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix index 815ad81dc1e..20cc1396653 100644 --- a/pkgs/top-level/rust-packages.nix +++ b/pkgs/top-level/rust-packages.nix @@ -7,9 +7,9 @@ { runCommand, fetchFromGitHub, git }: let - version = "2016-08-23"; - rev = "e98ce679ed90bb5b8a64ad9f5bd82f87fd6b641f"; - sha256 = "0dpl071ic3ddknsy98dxm99mznlblhmgjqi9ha6rlbldbjp3gf8j"; + version = "2016-09-29"; + rev = "12dc47026cadf5aa2823c9d0fdd055b9f2c0f52c"; + sha256 = "0la6wlnbiwjixcxbq6k0d8m5js8lk5wz5f3mvdx8hwl5car20w6m"; src = fetchFromGitHub { inherit rev;